Merge branch 'refs/heads/Alpha' into Meta

# Conflicts:
#	.github/workflows/docker.yaml
#	.github/workflows/prerelease.yml

.github/mihomo.service

@@ -1,17 +1,17 @@
 [Unit]
 Description=mihomo Daemon, Another Clash Kernel.
-Documentation=https://wiki.metacubex.one
+After=network.target NetworkManager.service systemd-networkd.service iwd.service
-After=network.target nss-lookup.target network-online.target
 
 [Service]
 Type=simple
+LimitNPROC=500
+LimitNOFILE=1000000
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SYS_TIME CAP_SYS_PTRACE CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE
 AmbientCapabilities=CAP_NET_ADMIN CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SYS_TIME CAP_SYS_PTRACE CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE
+Restart=always
+ExecStartPre=/usr/bin/sleep 2s
 ExecStart=/usr/bin/mihomo -d /etc/mihomo
 ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-failure
-RestartSec=10
-LimitNOFILE=infinity
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

.github/release/.fpm_systemd

@@ -1,18 +0,0 @@
--s dir
---name mihomo
---category net
---license GPL-3.0-or-later
---description "The universal proxy platform."
---url "https://wiki.metacubex.one/"
---maintainer "MetaCubeX <none@example.com>"
---deb-field "Bug: https://github.com/MetaCubeX/mihomo/issues"
---no-deb-generate-changes
---config-files /etc/mihomo/config.yaml
-
-.github/release/config.yaml=/etc/mihomo/config.yaml
-
-.github/release/mihomo.service=/usr/lib/systemd/system/mihomo.service
-.github/release/mihomo@.service=/usr/lib/systemd/system/mihomo@.service
-
-
-LICENSE=/usr/share/licenses/mihomo/LICENSE

.github/release/config.yaml

@@ -1,15 +0,0 @@
-mixed-port: 7890
-
-dns:
-  enable: true
-  ipv6: true
-  enhanced-mode: fake-ip
-  fake-ip-filter:
-    - "*"
-    - "+.lan"
-    - "+.local"
-  nameserver:
-    - system
-
-rules:
-  - MATCH,DIRECT

.github/release/mihomo@.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=mihomo Daemon, Another Clash Kernel.
-Documentation=https://wiki.metacubex.one
-After=network.target nss-lookup.target network-online.target
-
-[Service]
-Type=simple
-CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SYS_TIME CAP_SYS_PTRACE CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE
-AmbientCapabilities=CAP_NET_ADMIN CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SYS_TIME CAP_SYS_PTRACE CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE
-ExecStart=/usr/bin/mihomo -d /etc/mihomo
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-failure
-RestartSec=10
-LimitNOFILE=infinity
-
-[Install]
-WantedBy=multi-user.target

.github/workflows/Delete.yml

@@ -0,0 +1,16 @@
+name: Delete old workflow runs
+on:
+  schedule:
+    - cron: '0 0 1 * *'
+# Run monthly, at 00:00 on the 1st day of month.
+
+jobs:
+  del_runs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete workflow runs
+        uses: GitRML/delete-workflow-runs@main
+        with:
+          token: ${{ secrets.AUTH_PAT }}
+          repository: ${{ github.repository }}
+          retain_days: 30

.github/workflows/build.yml

@@ -1,10 +1,6 @@
 name: Build
 on:
   workflow_dispatch:
-    inputs:
-      version:
-        description: "Tag version to release"
-        required: true
   push:
     paths-ignore:
       - "docs/**"
@@ -14,11 +10,12 @@ on:
       - Alpha
     tags:
       - "v*"
-  pull_request:
+  pull_request_target:
     branches:
       - Alpha
+      
 concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
   
 env:
@@ -33,29 +30,28 @@ jobs:
           - { goos: darwin, goarch: amd64, goamd64: v1, output: amd64-compatible }
           - { goos: darwin, goarch: amd64, goamd64: v3, output: amd64 }
 
-          - { goos: linux, goarch: '386', go386: sse2, output: '386', debian: i386, rpm: i386}
+          - { goos: linux, goarch: '386', output: '386' }
-          - { goos: linux, goarch: '386', go386: softfloat, output: '386-softfloat' }
           - { goos: linux, goarch: amd64, goamd64: v1, output: amd64-compatible, test: test }
-          - { goos: linux, goarch: amd64, goamd64: v3, output: amd64, debian: amd64, rpm: x86_64, pacman: x86_64}
+          - { goos: linux, goarch: amd64, goamd64: v3, output: amd64 }
-          - { goos: linux, goarch: arm64, output: arm64, debian: arm64, rpm: aarch64, pacman: aarch64}  
+          - { goos: linux, goarch: arm64, output: arm64 }
           - { goos: linux, goarch: arm, goarm: '5', output: armv5 }
-          - { goos: linux, goarch: arm, goarm: '6', output: armv6, debian: armel, rpm: armv6hl} 
+          - { goos: linux, goarch: arm, goarm: '6', output: armv6 }
-          - { goos: linux, goarch: arm, goarm: '7', output: armv7, debian: armhf, rpm: armv7hl, pacman: armv7hl}
+          - { goos: linux, goarch: arm, goarm: '7', output: armv7 }
-          - { goos: linux, goarch: mips, gomips: hardfloat, output: mips-hardfloat }
+          - { goos: linux, goarch: mips, mips: hardfloat, output: mips-hardfloat }
-          - { goos: linux, goarch: mips, gomips: softfloat, output: mips-softfloat }
+          - { goos: linux, goarch: mips, mips: softfloat, output: mips-softfloat }
-          - { goos: linux, goarch: mipsle, gomips: hardfloat, output: mipsle-hardfloat }
+          - { goos: linux, goarch: mipsle, mips: hardfloat, output: mipsle-hardfloat }
-          - { goos: linux, goarch: mipsle, gomips: softfloat, output: mipsle-softfloat }
+          - { goos: linux, goarch: mipsle, mips: softfloat, output: mipsle-softfloat }
           - { goos: linux, goarch: mips64, output: mips64 }
-          - { goos: linux, goarch: mips64le, output: mips64le, debian: mips64el, rpm: mips64el }
+          - { goos: linux, goarch: mips64le, output: mips64le }
-          - { goos: linux, goarch: loong64, output: loong64-abi1, abi: '1', debian: loongarch64, rpm: loongarch64 }
+          - { goos: linux, goarch: loong64, output: loong64-abi1, abi: '1' }
-          - { goos: linux, goarch: loong64, output: loong64-abi2, abi: '2', debian: loong64, rpm: loong64 }
+          - { goos: linux, goarch: loong64, output: loong64-abi2, abi: '2' }
-          - { goos: linux, goarch: riscv64, output: riscv64, debian: riscv64, rpm: riscv64 }
+          - { goos: linux, goarch: riscv64, output: riscv64 }
-          - { goos: linux, goarch: s390x, output: s390x, debian: s390x, rpm: s390x }
+          - { goos: linux, goarch: s390x, output: s390x }
-          - { goos: linux, goarch: ppc64le, output: ppc64le, debian: ppc64el, rpm: ppc64le }
 
           - { goos: windows, goarch: '386', output: '386' }
           - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-compatible }
           - { goos: windows, goarch: amd64, goamd64: v3, output: amd64 }
+          - { goos: windows, goarch: arm, goarm: '7', output: armv7 }
           - { goos: windows, goarch: arm64, output: arm64 }
 
           - { goos: freebsd, goarch: '386', output: '386' }
@@ -68,45 +64,16 @@ jobs:
           - { goos: android, goarch: arm, ndk: armv7a-linux-androideabi34, output: armv7 }
           - { goos: android, goarch: arm64, ndk: aarch64-linux-android34, output: arm64-v8 }
 
-          # Go 1.23 with special patch can work on Windows 7
-          # https://github.com/MetaCubeX/go/commits/release-branch.go1.23/
-          - { goos: windows, goarch: '386', output: '386-go123', goversion: '1.23' }
-          - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-compatible-go123, goversion: '1.23' }
-          - { goos: windows, goarch: amd64, goamd64: v3, output: amd64-go123, goversion: '1.23' }
-
-          # Go 1.22 with special patch can work on Windows 7
-          # https://github.com/MetaCubeX/go/commits/release-branch.go1.22/
-          - { goos: windows, goarch: '386', output: '386-go122', goversion: '1.22' }
-          - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-compatible-go122, goversion: '1.22' }
-          - { goos: windows, goarch: amd64, goamd64: v3, output: amd64-go122, goversion: '1.22' }
-
-          # Go 1.21 can revert commit `9e4385` to work on Windows 7
-          # https://github.com/golang/go/issues/64622#issuecomment-1847475161
-          # (OR we can just use golang1.21.4 which unneeded any patch)
-          - { goos: windows, goarch: '386', output: '386-go121', goversion: '1.21' }
-          - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-compatible-go121, goversion: '1.21' }
-          - { goos: windows, goarch: amd64, goamd64: v3, output: amd64-go121, goversion: '1.21' }
-
           # Go 1.20 is the last release that will run on any release of Windows 7, 8, Server 2008 and Server 2012. Go 1.21 will require at least Windows 10 or Server 2016.
           - { goos: windows, goarch: '386', output: '386-go120', goversion: '1.20' }
           - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-compatible-go120, goversion: '1.20' }
           - { goos: windows, goarch: amd64, goamd64: v3, output: amd64-go120, goversion: '1.20' }
 
-          # Go 1.22 is the last release that will run on macOS 10.15 Catalina. Go 1.23 will require macOS 11 Big Sur or later.
-          - { goos: darwin, goarch: arm64, output: arm64-go122, goversion: '1.22' }
-          - { goos: darwin, goarch: amd64, goamd64: v1, output: amd64-compatible-go122, goversion: '1.22' }
-          - { goos: darwin, goarch: amd64, goamd64: v3, output: amd64-go122, goversion: '1.22' }
-
           # Go 1.20 is the last release that will run on macOS 10.13 High Sierra or 10.14 Mojave. Go 1.21 will require macOS 10.15 Catalina or later.
           - { goos: darwin, goarch: arm64, output: arm64-go120, goversion: '1.20' }
           - { goos: darwin, goarch: amd64, goamd64: v1, output: amd64-compatible-go120, goversion: '1.20' }
           - { goos: darwin, goarch: amd64, goamd64: v3, output: amd64-go120, goversion: '1.20' }
 
-          # Go 1.23 is the last release that requires Linux kernel version 2.6.32 or later. Go 1.24 will require Linux kernel version 3.2 or later.
-          - { goos: linux, goarch: '386', output: '386-go123', goversion: '1.23' }
-          - { goos: linux, goarch: amd64, goamd64: v1, output: amd64-compatible-go123, goversion: '1.23', test: test }
-          - { goos: linux, goarch: amd64, goamd64: v3, output: amd64-go123, goversion: '1.23' }
-
           # only for test
           - { goos: linux, goarch: '386', output: '386-go120', goversion: '1.20' }
           - { goos: linux, goarch: amd64, goamd64: v1, output: amd64-compatible-go120, goversion: '1.20', test: test }
@@ -116,107 +83,53 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Go
-      if: ${{ matrix.jobs.goversion == '' && matrix.jobs.abi != '1' }}
+      if: ${{ matrix.jobs.goversion == '' && matrix.jobs.goarch != 'loong64' }}
       uses: actions/setup-go@v5
       with:
-        go-version: '1.24'
+        go-version: '1.22'
 
     - name: Set up Go
-      if: ${{ matrix.jobs.goversion != '' && matrix.jobs.abi != '1' }}
+      if: ${{ matrix.jobs.goversion != '' && matrix.jobs.goarch != 'loong64' }}
       uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.jobs.goversion }}
 
-    - name: Set up Go1.24 loongarch abi1
+    - name: Set up Go1.21 loongarch abi1
       if: ${{ matrix.jobs.goarch == 'loong64' && matrix.jobs.abi == '1' }}
       run: |
-        wget -q https://github.com/MetaCubeX/loongarch64-golang/releases/download/1.24.0/go1.24.0.linux-amd64-abi1.tar.gz
+        wget -q https://github.com/xishang0128/loongarch64-golang/releases/download/1.21.5/go1.21.5.linux-amd64-abi1.tar.gz
-        sudo tar zxf go1.24.0.linux-amd64-abi1.tar.gz -C /usr/local
+        sudo tar zxf go1.21.5.linux-amd64-abi1.tar.gz -C /usr/local
         echo "/usr/local/go/bin" >> $GITHUB_PATH
 
-      # modify from https://github.com/restic/restic/issues/4636#issuecomment-1896455557
+    - name: Set up Go1.21 loongarch abi2
-      # this patch file only works on golang1.24.x
+      if: ${{ matrix.jobs.goarch == 'loong64' && matrix.jobs.abi == '2' }}
-      # that means after golang1.25 release it must be changed
-      # see: https://github.com/MetaCubeX/go/commits/release-branch.go1.24/
-      # revert:
-      # 693def151adff1af707d82d28f55dba81ceb08e1: "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
-      # 7c1157f9544922e96945196b47b95664b1e39108: "net: remove sysSocket fallback for Windows 7"
-      # 48042aa09c2f878c4faa576948b07fe625c4707a: "syscall: remove Windows 7 console handle workaround"
-      # a17d959debdb04cd550016a3501dd09d50cd62e7: "runtime: always use LoadLibraryEx to load system libraries"
-    - name: Revert Golang1.24 commit for Windows7/8
-      if: ${{ matrix.jobs.goos == 'windows' && matrix.jobs.goversion == '' }}
       run: |
-        cd $(go env GOROOT)
+        wget -q https://github.com/xishang0128/loongarch64-golang/releases/download/1.21.5/go1.21.5.linux-amd64-abi2.tar.gz
-        curl https://github.com/MetaCubeX/go/commit/2a406dc9f1ea7323d6ca9fccb2fe9ddebb6b1cc8.diff | patch --verbose -p 1
+        sudo tar zxf go1.21.5.linux-amd64-abi2.tar.gz -C /usr/local
-        curl https://github.com/MetaCubeX/go/commit/7b1fd7d39c6be0185fbe1d929578ab372ac5c632.diff | patch --verbose -p 1
+        echo "/usr/local/go/bin" >> $GITHUB_PATH
-        curl https://github.com/MetaCubeX/go/commit/979d6d8bab3823ff572ace26767fd2ce3cf351ae.diff | patch --verbose -p 1
-        curl https://github.com/MetaCubeX/go/commit/ac3e93c061779dfefc0dd13a5b6e6f764a25621e.diff | patch --verbose -p 1
-
-      # modify from https://github.com/restic/restic/issues/4636#issuecomment-1896455557
-      # this patch file only works on golang1.23.x
-      # that means after golang1.24 release it must be changed
-      # see: https://github.com/MetaCubeX/go/commits/release-branch.go1.23/
-      # revert:
-      # 693def151adff1af707d82d28f55dba81ceb08e1: "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
-      # 7c1157f9544922e96945196b47b95664b1e39108: "net: remove sysSocket fallback for Windows 7"
-      # 48042aa09c2f878c4faa576948b07fe625c4707a: "syscall: remove Windows 7 console handle workaround"
-      # a17d959debdb04cd550016a3501dd09d50cd62e7: "runtime: always use LoadLibraryEx to load system libraries"
-    - name: Revert Golang1.23 commit for Windows7/8
-      if: ${{ matrix.jobs.goos == 'windows' && matrix.jobs.goversion == '1.23' }}
-      run: |
-        cd $(go env GOROOT)
-        curl https://github.com/MetaCubeX/go/commit/9ac42137ef6730e8b7daca016ece831297a1d75b.diff | patch --verbose -p 1
-        curl https://github.com/MetaCubeX/go/commit/21290de8a4c91408de7c2b5b68757b1e90af49dd.diff | patch --verbose -p 1
-        curl https://github.com/MetaCubeX/go/commit/6a31d3fa8e47ddabc10bd97bff10d9a85f4cfb76.diff | patch --verbose -p 1
-        curl https://github.com/MetaCubeX/go/commit/69e2eed6dd0f6d815ebf15797761c13f31213dd6.diff | patch --verbose -p 1
-
-      # modify from https://github.com/restic/restic/issues/4636#issuecomment-1896455557
-      # this patch file only works on golang1.22.x
-      # that means after golang1.23 release it must be changed
-      # see: https://github.com/MetaCubeX/go/commits/release-branch.go1.22/
-      # revert:
-      # 693def151adff1af707d82d28f55dba81ceb08e1: "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
-      # 7c1157f9544922e96945196b47b95664b1e39108: "net: remove sysSocket fallback for Windows 7"
-      # 48042aa09c2f878c4faa576948b07fe625c4707a: "syscall: remove Windows 7 console handle workaround"
-      # a17d959debdb04cd550016a3501dd09d50cd62e7: "runtime: always use LoadLibraryEx to load system libraries"
-    - name: Revert Golang1.22 commit for Windows7/8
-      if: ${{ matrix.jobs.goos == 'windows' && matrix.jobs.goversion == '1.22' }}
-      run: |
-        cd $(go env GOROOT)
-        curl https://github.com/MetaCubeX/go/commit/9779155f18b6556a034f7bb79fb7fb2aad1e26a9.diff | patch --verbose -p 1
-        curl https://github.com/MetaCubeX/go/commit/ef0606261340e608017860b423ffae5c1ce78239.diff | patch --verbose -p 1
-        curl https://github.com/MetaCubeX/go/commit/7f83badcb925a7e743188041cb6e561fc9b5b642.diff | patch --verbose -p 1
-        curl https://github.com/MetaCubeX/go/commit/83ff9782e024cb328b690cbf0da4e7848a327f4f.diff | patch --verbose -p 1
-
-      # modify from https://github.com/restic/restic/issues/4636#issuecomment-1896455557
-    - name: Revert Golang1.21 commit for Windows7/8
-      if: ${{ matrix.jobs.goos == 'windows' && matrix.jobs.goversion == '1.21' }}
-      run: |
-        cd $(go env GOROOT)
-        curl https://github.com/golang/go/commit/9e43850a3298a9b8b1162ba0033d4c53f8637571.diff | patch --verbose -R -p 1
 
     - 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=='' || github.ref_type=='tag'}}
+      run: echo "VERSION=$(git describe --tags)" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Set Time Variable
       run: |
-        VERSION="${GITHUB_REF_NAME,,}-$(git rev-parse --short HEAD)"
-        PackageVersion="$(curl -s "https://api.github.com/repos/MetaCubeX/mihomo/releases/latest" | jq -r '.tag_name' | sed 's/v//g' | awk -F '.' '{$NF = $NF + 1; print}' OFS='.').${VERSION/-/.}"
-        if [ -n "${{ github.event.inputs.version }}" ]; then
-          VERSION=${{ github.event.inputs.version }}
-          PackageVersion="${VERSION#v}" >> $GITHUB_ENV
-        fi
-        echo "VERSION=${VERSION}" >> $GITHUB_ENV
-        echo "PackageVersion=${PackageVersion}" >> $GITHUB_ENV
-      
         echo "BUILDTIME=$(date)" >> $GITHUB_ENV
         echo "CGO_ENABLED=0" >> $GITHUB_ENV
         echo "BUILDTAG=-extldflags --static" >> $GITHUB_ENV
-        echo "GOTOOLCHAIN=local" >> $GITHUB_ENV
 
     - name: Setup NDK
       if: ${{ matrix.jobs.goos == 'android' }}
       uses: nttld/setup-ndk@v1
       id: setup-ndk
       with:
-        ndk-version: r29-beta1
+        ndk-version: r26c
 
     - name: Set NDK path
       if: ${{ matrix.jobs.goos == 'android' }}
@@ -229,12 +142,10 @@ jobs:
       if: ${{ matrix.jobs.test == 'test' }}
       run: |
         go test ./...
-        echo "---test with_gvisor---"
-        go test ./... -tags "with_gvisor" -count=1
 
     - name: Update CA
       run: |
-        sudo apt-get update && sudo apt-get install ca-certificates
+        sudo apt-get install ca-certificates
         sudo update-ca-certificates
         cp -f /etc/ssl/certs/ca-certificates.crt component/ca/ca-certificates.crt
 
@@ -243,11 +154,10 @@ jobs:
         GOOS: ${{matrix.jobs.goos}}
         GOARCH: ${{matrix.jobs.goarch}}
         GOAMD64: ${{matrix.jobs.goamd64}}
-        GO386: ${{matrix.jobs.go386}}
+        GOARM: ${{matrix.jobs.arm}}
-        GOARM: ${{matrix.jobs.goarm}}
+        GOMIPS: ${{matrix.jobs.mips}}
-        GOMIPS: ${{matrix.jobs.gomips}}
       run: |
-        go env
+        echo $CGO_ENABLED
         go build -v -tags "with_gvisor" -trimpath -ldflags "${BUILDTAG} -X 'github.com/metacubex/mihomo/constant.Version=${VERSION}' -X 'github.com/metacubex/mihomo/constant.BuildTime=${BUILDTIME}' -w -s -buildid="
         if [ "${{matrix.jobs.goos}}" = "windows" ]; then
           cp mihomo.exe mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}.exe
@@ -258,45 +168,67 @@ jobs:
           rm mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}
         fi
 
-    - name: Package DEB
+    - name: Create DEB package
-      if: matrix.jobs.debian != ''
+      if: ${{ matrix.jobs.goos == 'linux' && !contains(matrix.jobs.goarch, 'mips') }}
       run: |
-        set -xeuo pipefail
+        sudo apt-get install dpkg
-        sudo gem install fpm
+        if [ "${{matrix.jobs.abi}}" = "1" ]; then
-        cp .github/release/.fpm_systemd .fpm
+          ARCH=loongarch64
+        else
+          ARCH=${{matrix.jobs.goarch}}
+        fi
+        PackageVersion=$(curl -s "https://api.github.com/repos/MetaCubeX/mihomo/releases/latest" | grep -o '"tag_name": "[^"]*' | grep -o '[^"]*$' | sed 's/v//g' )
+        if [ $(git branch | awk -F ' ' '{print $2}') = "Alpha" ]; then
+          PackageVersion="$(echo "${PackageVersion}" | awk -F '.' '{$NF = $NF + 1; print}' OFS='.')-${VERSION}"
+        fi
 
-        fpm -t deb \
+        mkdir -p mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}/DEBIAN
-          -v "${PackageVersion}" \
+        mkdir -p mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}/usr/bin
-          -p "mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}.deb" \
+        mkdir -p mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}/etc/mihomo
-          --architecture ${{ matrix.jobs.debian }} \
+        mkdir -p mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}/etc/systemd/system/
-          mihomo=/usr/bin/mihomo
+        mkdir -p mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}/usr/share/licenses/mihomo
 
-    - name: Package RPM
+        cp mihomo mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}/usr/bin/mihomo
-      if: matrix.jobs.rpm != ''
+        cp LICENSE mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}/usr/share/licenses/mihomo/
+        cp .github/mihomo.service mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}/etc/systemd/system/
+
+        cat > mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}/etc/mihomo/config.yaml <<EOF
+        mixed-port: 7890
+        external-controller: 127.0.0.1:9090
+        EOF
+
+        cat > mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}/DEBIAN/control <<EOF
+        Package: mihomo
+        Version: ${PackageVersion}
+        Section:
+        Priority: extra
+        Architecture: ${ARCH}
+        Maintainer: MetaCubeX <none@example.com>
+        Homepage: https://wiki.metacubex.one/
+        Description: The universal proxy platform.
+        EOF
+
+        dpkg-deb -Z gzip --build mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}
+
+    - name: Convert DEB to RPM
+      if: ${{ matrix.jobs.goos == 'linux' && !contains(matrix.jobs.goarch, 'mips') }}
       run: |
-        set -xeuo pipefail
+        sudo apt-get install -y alien
-        sudo gem install fpm
+        alien --to-rpm --scripts mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}.deb
-        cp .github/release/.fpm_systemd .fpm
+        mv mihomo*.rpm mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}.rpm
 
-        fpm -t rpm \
+    # - name: Convert DEB to PKG
-          -v "${PackageVersion}" \
+    #   if: ${{ matrix.jobs.goos == 'linux' && !contains(matrix.jobs.goarch, 'mips') && !contains(matrix.jobs.goarch, 'loong64') }}
-          -p "mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}.rpm" \
+    #   run: |
-          --architecture ${{ matrix.jobs.rpm }} \
+    #     docker pull archlinux
-          mihomo=/usr/bin/mihomo
+    #     docker run --rm -v ./:/mnt archlinux bash -c "
-
+    #       pacman -Syu pkgfile base-devel --noconfirm
-    - name: Package Pacman
+    #       curl -L https://github.com/helixarch/debtap/raw/master/debtap > /usr/bin/debtap
-      if: matrix.jobs.pacman != ''
+    #       chmod 755 /usr/bin/debtap
-      run: |
+    #       debtap -u 
-        set -xeuo pipefail
+    #       debtap -Q /mnt/mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}.deb
-        sudo gem install fpm
+    #     "
-        sudo apt-get update && sudo apt-get install -y libarchive-tools
+    #     mv mihomo*.pkg.tar.zst mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}.pkg.tar.zst
-        cp .github/release/.fpm_systemd .fpm
-
-        fpm -t pacman \
-          -v "${PackageVersion}" \
-          -p "mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}.pkg.tar.zst" \
-          --architecture ${{ matrix.jobs.pacman }} \
-          mihomo=/usr/bin/mihomo
 
     - name: Save version
       run: |
@@ -306,19 +238,17 @@ jobs:
     - name: Archive production artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: "${{ matrix.jobs.goos }}-${{ matrix.jobs.output }}"
+        name: ${{ matrix.jobs.goos }}-${{ matrix.jobs.output }}
         path: |
           mihomo*.gz
           mihomo*.deb
           mihomo*.rpm
-          mihomo*.pkg.tar.zst
           mihomo*.zip
           version.txt
-          checksums.txt
 
   Upload-Prerelease:
     permissions: write-all
-    if: ${{ github.event_name != 'workflow_dispatch' && github.ref_type == 'branch' && !startsWith(github.event_name, 'pull_request') }}
+    if: ${{ github.ref_type == 'branch' && !startsWith(github.event_name, 'pull_request') }}
     needs: [build]
     runs-on: ubuntu-latest
     steps:
@@ -328,13 +258,6 @@ jobs:
         path: bin/
         merge-multiple: true
 
-    - name: Calculate checksums
-      run: |
-        cd bin/
-        find . -type f -not -name "checksums.*" -not -name "version.txt" | sort | xargs sha256sum > checksums.txt
-        cat checksums.txt
-      shell: bash
-
     - name: Delete current release assets
       uses: 8Mi-Tech/delete-release-assets-action@main
       with:
@@ -376,62 +299,44 @@ jobs:
 
   Upload-Release:
     permissions: write-all
-    if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version != '' }}
+    if: ${{ github.ref_type=='tag' }}
     needs: [build]
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+    - name: Checkout
-        uses: actions/checkout@v4
+      uses: actions/checkout@v4
-        with:
+      with:
-          ref: Meta
+        fetch-depth: 0
-          fetch-depth: '0'
-          fetch-tags: 'true'
 
-      - name: Get tags
+    - name: Get tags
-        run: |
+      run: |
-          echo "CURRENTVERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
+        echo "CURRENTVERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-          git fetch --tags
+        git fetch --tags
-          echo "PREVERSION=$(git describe --tags --abbrev=0 HEAD)" >> $GITHUB_ENV
+        echo "PREVERSION=$(git describe --tags --abbrev=0 HEAD^)" >> $GITHUB_ENV
 
-      - name: Force push Alpha branch to Meta
+    - name: Generate release notes
-        run: |
+      run: |
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          cp ./.github/genReleaseNote.sh ./
-          git config --global user.name "github-actions[bot]"
+          bash ./genReleaseNote.sh -v ${PREVERSION}...${CURRENTVERSION}
-          git fetch origin Alpha:Alpha
+          rm ./genReleaseNote.sh
-          git push origin Alpha:Meta --force
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Tag the commit on Alpha
+    - uses: actions/download-artifact@v4
-        run: |
+      with:
-          git checkout Alpha 
+        path: bin/
-          git tag ${{ github.event.inputs.version }}
+        merge-multiple: true
-          git push origin ${{ github.event.inputs.version }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Generate release notes
+    - name: Display structure of downloaded files
-        run: |
+      run: ls -R
-            cp ./.github/genReleaseNote.sh ./
+      working-directory: bin
-            bash ./genReleaseNote.sh -v ${PREVERSION}...${CURRENTVERSION}
+
-            rm ./genReleaseNote.sh
+    - name: Upload Release
-  
+      uses: softprops/action-gh-release@v1
-      - uses: actions/download-artifact@v4
+      if: ${{  success() }}
-        with:
+      with:
-          path: bin/
+        tag_name: ${{ github.ref_name }}
-          merge-multiple: true
+        files: bin/*
-  
+        generate_release_notes: true
-      - name: Display structure of downloaded files
+        body_path: release.md
-        run: ls -R
-        working-directory: bin
-  
-      - name: Upload Release
-        uses: softprops/action-gh-release@v2
-        if: ${{ success() }}
-        with:
-          tag_name: ${{ github.event.inputs.version }}
-          files: bin/*
-          body_path: release.md
 
   Docker:
     if: ${{ !startsWith(github.event_name, 'pull_request') }}
@@ -460,35 +365,20 @@ jobs:
         uses: docker/setup-buildx-action@v3
         with:
           version: latest
-      
+
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
-        if: ${{ github.event_name != 'workflow_dispatch' }}
+        id: meta
-        id: meta_alpha
         uses: docker/metadata-action@v5
         with:
-          images: '${{ env.REGISTRY }}/${{ github.repository }}'
+          images: ${{ env.REGISTRY }}/${{ github.repository }}
-      
+
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version != '' }}
-        id: meta_release
-        uses: docker/metadata-action@v5
-        with:
-          images: '${{ env.REGISTRY }}/${{ github.repository }}'
-          tags: |
-            ${{ github.event.inputs.version }}
-          flavor: |
-            latest=true
-          labels: org.opencontainers.image.version=${{ github.event.inputs.version }}
-      
       - name: Show files
         run: |
           ls .
           ls bin/
-      
+
       - name: login to docker REGISTRY
         uses: docker/login-action@v3
         with:
@@ -499,7 +389,7 @@ jobs:
       # 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
-        if: ${{ github.event_name != 'workflow_dispatch' }}
+        id: build-and-push
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -510,20 +400,5 @@ jobs:
             linux/amd64
             linux/arm64
             linux/arm/v7
-          tags: ${{ steps.meta_alpha.outputs.tags }}
+          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta_alpha.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}
-      
-      - name: Build and push Docker image
-        if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version != '' }}
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          platforms: |
-            linux/386
-            linux/amd64
-            linux/arm64
-            linux/arm/v7
-          tags: ${{ steps.meta_release.outputs.tags }}
-          labels: ${{ steps.meta_release.outputs.labels }}

.github/workflows/test.yml

@@ -1,115 +0,0 @@
-name: Test
-on:
-  push:
-    paths-ignore:
-      - "docs/**"
-      - "README.md"
-      - ".github/ISSUE_TEMPLATE/**"
-    branches:
-      - Alpha
-    tags:
-      - "v*"
-  pull_request:
-    branches:
-      - Alpha
-
-jobs:
-  test:
-    strategy:
-      matrix:
-        os:
-          - 'ubuntu-latest' # amd64 linux
-          - 'windows-latest' # amd64 windows
-          - 'macos-latest' # arm64 macos
-          - 'ubuntu-24.04-arm' # arm64 linux
-          - 'macos-13' # amd64 macos
-        go-version:
-          - '1.24'
-          - '1.23'
-          - '1.22'
-          - '1.21'
-          - '1.20'
-      fail-fast: false
-    runs-on: ${{ matrix.os }}
-    defaults:
-      run:
-        shell: bash
-    env:
-      CGO_ENABLED: 0
-      GOTOOLCHAIN: local
-      # Fix mingw trying to be smart and converting paths https://github.com/moby/moby/issues/24029#issuecomment-250412919
-      MSYS_NO_PATHCONV: true
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ matrix.go-version }}
-
-      # modify from https://github.com/restic/restic/issues/4636#issuecomment-1896455557
-      # this patch file only works on golang1.24.x
-      # that means after golang1.25 release it must be changed
-      # see: https://github.com/MetaCubeX/go/commits/release-branch.go1.24/
-      # revert:
-      # 693def151adff1af707d82d28f55dba81ceb08e1: "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
-      # 7c1157f9544922e96945196b47b95664b1e39108: "net: remove sysSocket fallback for Windows 7"
-      # 48042aa09c2f878c4faa576948b07fe625c4707a: "syscall: remove Windows 7 console handle workaround"
-      # a17d959debdb04cd550016a3501dd09d50cd62e7: "runtime: always use LoadLibraryEx to load system libraries"
-      - name: Revert Golang1.24 commit for Windows7/8
-        if: ${{ runner.os == 'Windows' && matrix.go-version == '1.24' }}
-        run: |
-          cd $(go env GOROOT)
-          curl https://github.com/MetaCubeX/go/commit/2a406dc9f1ea7323d6ca9fccb2fe9ddebb6b1cc8.diff | patch --verbose -p 1
-          curl https://github.com/MetaCubeX/go/commit/7b1fd7d39c6be0185fbe1d929578ab372ac5c632.diff | patch --verbose -p 1
-          curl https://github.com/MetaCubeX/go/commit/979d6d8bab3823ff572ace26767fd2ce3cf351ae.diff | patch --verbose -p 1
-          curl https://github.com/MetaCubeX/go/commit/ac3e93c061779dfefc0dd13a5b6e6f764a25621e.diff | patch --verbose -p 1
-
-        # modify from https://github.com/restic/restic/issues/4636#issuecomment-1896455557
-        # this patch file only works on golang1.23.x
-        # that means after golang1.24 release it must be changed
-        # see: https://github.com/MetaCubeX/go/commits/release-branch.go1.23/
-        # revert:
-        # 693def151adff1af707d82d28f55dba81ceb08e1: "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
-        # 7c1157f9544922e96945196b47b95664b1e39108: "net: remove sysSocket fallback for Windows 7"
-        # 48042aa09c2f878c4faa576948b07fe625c4707a: "syscall: remove Windows 7 console handle workaround"
-        # a17d959debdb04cd550016a3501dd09d50cd62e7: "runtime: always use LoadLibraryEx to load system libraries"
-      - name: Revert Golang1.23 commit for Windows7/8
-        if: ${{ runner.os == 'Windows' && matrix.go-version == '1.23' }}
-        run: |
-          cd $(go env GOROOT)
-          curl https://github.com/MetaCubeX/go/commit/9ac42137ef6730e8b7daca016ece831297a1d75b.diff | patch --verbose -p 1
-          curl https://github.com/MetaCubeX/go/commit/21290de8a4c91408de7c2b5b68757b1e90af49dd.diff | patch --verbose -p 1
-          curl https://github.com/MetaCubeX/go/commit/6a31d3fa8e47ddabc10bd97bff10d9a85f4cfb76.diff | patch --verbose -p 1
-          curl https://github.com/MetaCubeX/go/commit/69e2eed6dd0f6d815ebf15797761c13f31213dd6.diff | patch --verbose -p 1
-
-        # modify from https://github.com/restic/restic/issues/4636#issuecomment-1896455557
-        # this patch file only works on golang1.22.x
-        # that means after golang1.23 release it must be changed
-        # see: https://github.com/MetaCubeX/go/commits/release-branch.go1.22/
-        # revert:
-        # 693def151adff1af707d82d28f55dba81ceb08e1: "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
-        # 7c1157f9544922e96945196b47b95664b1e39108: "net: remove sysSocket fallback for Windows 7"
-        # 48042aa09c2f878c4faa576948b07fe625c4707a: "syscall: remove Windows 7 console handle workaround"
-        # a17d959debdb04cd550016a3501dd09d50cd62e7: "runtime: always use LoadLibraryEx to load system libraries"
-      - name: Revert Golang1.22 commit for Windows7/8
-        if: ${{ runner.os == 'Windows' && matrix.go-version == '1.22' }}
-        run: |
-          cd $(go env GOROOT)
-          curl https://github.com/MetaCubeX/go/commit/9779155f18b6556a034f7bb79fb7fb2aad1e26a9.diff | patch --verbose -p 1
-          curl https://github.com/MetaCubeX/go/commit/ef0606261340e608017860b423ffae5c1ce78239.diff | patch --verbose -p 1
-          curl https://github.com/MetaCubeX/go/commit/7f83badcb925a7e743188041cb6e561fc9b5b642.diff | patch --verbose -p 1
-          curl https://github.com/MetaCubeX/go/commit/83ff9782e024cb328b690cbf0da4e7848a327f4f.diff | patch --verbose -p 1
-
-        # modify from https://github.com/restic/restic/issues/4636#issuecomment-1896455557
-      - name: Revert Golang1.21 commit for Windows7/8
-        if: ${{ runner.os == 'Windows' && matrix.go-version == '1.21' }}
-        run: |
-          cd $(go env GOROOT)
-          curl https://github.com/golang/go/commit/9e43850a3298a9b8b1162ba0033d4c53f8637571.diff | patch --verbose -R -p 1
-
-      - name: Test
-        run: go test ./... -v -count=1
-
-      - name: Test with tag with_gvisor
-        run: go test ./... -v -count=1 -tags "with_gvisor"

Dockerfile

@@ -13,7 +13,7 @@ WORKDIR /mihomo
 COPY bin/ bin/
 RUN FILE_NAME=`sh file-name.sh` && echo $FILE_NAME && \
     FILE_NAME=`ls bin/ | egrep "$FILE_NAME.gz"|awk NR==1` && echo $FILE_NAME && \
-    mv bin/$FILE_NAME mihomo.gz && gzip -d mihomo.gz && chmod +x mihomo && echo "$FILE_NAME" > /mihomo-config/test
+    mv bin/$FILE_NAME mihomo.gz && gzip -d mihomo.gz && echo "$FILE_NAME" > /mihomo-config/test
 FROM alpine:latest
 LABEL org.opencontainers.image.source="https://github.com/MetaCubeX/mihomo"
 
@@ -23,4 +23,5 @@ VOLUME ["/root/.config/mihomo/"]
 
 COPY --from=builder /mihomo-config/ /root/.config/mihomo/
 COPY --from=builder /mihomo/mihomo /mihomo
+RUN chmod +x /mihomo
 ENTRYPOINT [ "/mihomo" ]

Makefile

@@ -163,3 +163,7 @@ clean:
 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

@@ -98,4 +98,4 @@ API.
 
 This software is released under the GPL-3.0 license.
 
-**In addition, any downstream projects not affiliated with `MetaCubeX` shall not contain the word `mihomo` in their names.**
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FMetaCubeX%2Fmihomo.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2FMetaCubeX%2Fmihomo?ref=badge_large)

adapter/adapter.go

@@ -2,7 +2,6 @@ package adapter
 
 import (
 	"context"
-	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"net"
@@ -10,15 +9,13 @@ import (
 	"net/netip"
 	"net/url"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/metacubex/mihomo/common/atomic"
 	"github.com/metacubex/mihomo/common/queue"
 	"github.com/metacubex/mihomo/common/utils"
-	"github.com/metacubex/mihomo/component/ca"
+	"github.com/metacubex/mihomo/component/dialer"
 	C "github.com/metacubex/mihomo/constant"
-	"github.com/metacubex/mihomo/log"
 	"github.com/puzpuzpuz/xsync/v3"
 )
 
@@ -40,11 +37,6 @@ type Proxy struct {
 	extra   *xsync.MapOf[string, *internalProxyState]
 }
 
-// Adapter implements C.Proxy
-func (p *Proxy) Adapter() C.ProxyAdapter {
-	return p.ProxyAdapter
-}
-
 // AliveForTestUrl implements C.Proxy
 func (p *Proxy) AliveForTestUrl(url string) bool {
 	if state, ok := p.extra.Load(url); ok {
@@ -62,8 +54,8 @@ func (p *Proxy) Dial(metadata *C.Metadata) (C.Conn, error) {
 }
 
 // DialContext implements C.ProxyAdapter
-func (p *Proxy) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
+func (p *Proxy) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
-	conn, err := p.ProxyAdapter.DialContext(ctx, metadata)
+	conn, err := p.ProxyAdapter.DialContext(ctx, metadata, opts...)
 	return conn, err
 }
 
@@ -75,8 +67,8 @@ func (p *Proxy) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (p *Proxy) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (p *Proxy) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	pc, err := p.ProxyAdapter.ListenPacketContext(ctx, metadata)
+	pc, err := p.ProxyAdapter.ListenPacketContext(ctx, metadata, opts...)
 	return pc, err
 }
 
@@ -162,17 +154,8 @@ func (p *Proxy) MarshalJSON() ([]byte, error) {
 	mapping["alive"] = p.alive.Load()
 	mapping["name"] = p.Name()
 	mapping["udp"] = p.SupportUDP()
-	mapping["uot"] = p.SupportUOT()
+	mapping["xudp"] = p.SupportXUDP()
-
+	mapping["tfo"] = p.SupportTFO()
-	proxyInfo := p.ProxyInfo()
-	mapping["xudp"] = proxyInfo.XUDP
-	mapping["tfo"] = proxyInfo.TFO
-	mapping["mptcp"] = proxyInfo.MPTCP
-	mapping["smux"] = proxyInfo.SMUX
-	mapping["interface"] = proxyInfo.Interface
-	mapping["dialer-proxy"] = proxyInfo.DialerProxy
-	mapping["routing-mark"] = proxyInfo.RoutingMark
-
 	return json.Marshal(mapping)
 }
 
@@ -247,7 +230,6 @@ func (p *Proxy) URLTest(ctx context.Context, url string, expectedStatus utils.In
 		IdleConnTimeout:       90 * time.Second,
 		TLSHandshakeTimeout:   10 * time.Second,
 		ExpectContinueTimeout: 1 * time.Second,
-		TLSClientConfig:       ca.GetGlobalTLSConfig(&tls.Config{}),
 	}
 
 	client := http.Client{
@@ -270,18 +252,10 @@ func (p *Proxy) URLTest(ctx context.Context, url string, expectedStatus utils.In
 
 	if unifiedDelay {
 		second := time.Now()
-		var ignoredErr error
+		resp, err = client.Do(req)
-		var secondResp *http.Response
+		if err == nil {
-		secondResp, ignoredErr = client.Do(req)
-		if ignoredErr == nil {
-			resp = secondResp
 			_ = resp.Body.Close()
 			start = second
-		} else {
-			if strings.HasPrefix(url, "http://") {
-				log.Errorln("%s failed to get the second response from %s: %v", p.Name(), url, ignoredErr)
-				log.Warnln("It is recommended to use HTTPS for provider.health-check.url and group.url to ensure better reliability. Due to some proxy providers hijacking test addresses and not being compatible with repeated HEAD requests, using HTTP may result in failed tests.")
-			}
 		}
 	}
 
@@ -289,7 +263,6 @@ func (p *Proxy) URLTest(ctx context.Context, url string, expectedStatus utils.In
 	t = uint16(time.Since(start) / time.Millisecond)
 	return
 }
-
 func NewProxy(adapter C.ProxyAdapter) *Proxy {
 	return &Proxy{
 		ProxyAdapter: adapter,

adapter/inbound/addition.go

@@ -69,5 +69,3 @@ func WithDSCP(dscp uint8) Addition {
 		metadata.DSCP = dscp
 	}
 }
-
-func Placeholder(metadata *C.Metadata) {}

adapter/inbound/auth.go

@@ -34,5 +34,12 @@ func SkipAuthRemoteAddress(addr string) bool {
 }
 
 func skipAuth(addr netip.Addr) bool {
-	return prefixesContains(skipAuthPrefixes, addr)
+	if addr.IsValid() {
+		for _, prefix := range skipAuthPrefixes {
+			if prefix.Contains(addr.Unmap()) {
+				return true
+			}
+		}
+	}
+	return false
 }

adapter/inbound/https.go

@@ -11,8 +11,6 @@ import (
 func NewHTTPS(request *http.Request, conn net.Conn, additions ...Addition) (net.Conn, *C.Metadata) {
 	metadata := parseHTTPAddr(request)
 	metadata.Type = C.HTTPS
-	metadata.RawSrcAddr = conn.RemoteAddr()
-	metadata.RawDstAddr = conn.LocalAddr()
 	ApplyAdditions(metadata, WithSrcAddr(conn.RemoteAddr()), WithInAddr(conn.LocalAddr()))
 	ApplyAdditions(metadata, additions...)
 	return conn, metadata

adapter/inbound/ipfilter.go

@@ -31,17 +31,27 @@ func IsRemoteAddrDisAllowed(addr net.Addr) bool {
 	if err := m.SetRemoteAddr(addr); err != nil {
 		return false
 	}
-	ipAddr := m.AddrPort().Addr()
+	return isAllowed(m.AddrPort().Addr().Unmap()) && !isDisAllowed(m.AddrPort().Addr().Unmap())
-	if ipAddr.IsValid() {
+}
-		return isAllowed(ipAddr) && !isDisAllowed(ipAddr)
+
+func isAllowed(addr netip.Addr) bool {
+	if addr.IsValid() {
+		for _, prefix := range lanAllowedIPs {
+			if prefix.Contains(addr) {
+				return true
+			}
+		}
 	}
 	return false
 }
 
-func isAllowed(addr netip.Addr) bool {
-	return prefixesContains(lanAllowedIPs, addr)
-}
-
 func isDisAllowed(addr netip.Addr) bool {
-	return prefixesContains(lanDisAllowedIPs, addr)
+	if addr.IsValid() {
+		for _, prefix := range lanDisAllowedIPs {
+			if prefix.Contains(addr) {
+				return true
+			}
+		}
+	}
+	return false
 }

adapter/inbound/listen.go

@@ -2,12 +2,7 @@ package inbound
 
 import (
 	"context"
-	"fmt"
 	"net"
-	"net/netip"
-	"sync"
-
-	"github.com/metacubex/mihomo/component/keepalive"
 
 	"github.com/metacubex/tfo-go"
 )
@@ -16,91 +11,20 @@ var (
 	lc = tfo.ListenConfig{
 		DisableTFO: true,
 	}
-	mutex sync.RWMutex
 )
 
 func SetTfo(open bool) {
-	mutex.Lock()
-	defer mutex.Unlock()
 	lc.DisableTFO = !open
 }
 
-func Tfo() bool {
-	mutex.RLock()
-	defer mutex.RUnlock()
-	return !lc.DisableTFO
-}
-
 func SetMPTCP(open bool) {
-	mutex.Lock()
-	defer mutex.Unlock()
 	setMultiPathTCP(&lc.ListenConfig, open)
 }
 
-func MPTCP() bool {
-	mutex.RLock()
-	defer mutex.RUnlock()
-	return getMultiPathTCP(&lc.ListenConfig)
-}
-
-func preResolve(network, address string) (string, error) {
-	switch network { // like net.Resolver.internetAddrList but filter domain to avoid call net.Resolver.lookupIPAddr
-	case "tcp", "tcp4", "tcp6", "udp", "udp4", "udp6", "ip", "ip4", "ip6":
-		if host, port, err := net.SplitHostPort(address); err == nil {
-			switch host {
-			case "localhost":
-				switch network {
-				case "tcp6", "udp6", "ip6":
-					address = net.JoinHostPort("::1", port)
-				default:
-					address = net.JoinHostPort("127.0.0.1", port)
-				}
-			case "": // internetAddrList can handle this special case
-				break
-			default:
-				if _, err := netip.ParseAddr(host); err != nil { // not ip
-					return "", fmt.Errorf("invalid network address: %s", address)
-				}
-			}
-		}
-	}
-	return address, nil
-}
-
 func ListenContext(ctx context.Context, network, address string) (net.Listener, error) {
-	address, err := preResolve(network, address)
-	if err != nil {
-		return nil, err
-	}
-
-	mutex.RLock()
-	defer mutex.RUnlock()
 	return lc.Listen(ctx, network, address)
 }
 
 func Listen(network, address string) (net.Listener, error) {
 	return ListenContext(context.Background(), network, address)
 }
-
-func ListenPacketContext(ctx context.Context, network, address string) (net.PacketConn, error) {
-	address, err := preResolve(network, address)
-	if err != nil {
-		return nil, err
-	}
-
-	mutex.RLock()
-	defer mutex.RUnlock()
-	return lc.ListenPacket(ctx, network, address)
-}
-
-func ListenPacket(network, address string) (net.PacketConn, error) {
-	return ListenPacketContext(context.Background(), network, address)
-}
-
-func init() {
-	keepalive.SetDisableKeepAliveCallback.Register(func(b bool) {
-		mutex.Lock()
-		defer mutex.Unlock()
-		keepalive.SetNetListenConfig(&lc.ListenConfig)
-	})
-}

adapter/inbound/listen_notwindows.go

@@ -1,14 +0,0 @@
-//go:build !windows
-
-package inbound
-
-import (
-	"net"
-	"os"
-)
-
-const SupportNamedPipe = false
-
-func ListenNamedPipe(path string) (net.Listener, error) {
-	return nil, os.ErrInvalid
-}

adapter/inbound/listen_windows.go

@@ -1,32 +0,0 @@
-package inbound
-
-import (
-	"net"
-	"os"
-
-	"github.com/metacubex/wireguard-go/ipc/namedpipe"
-	"golang.org/x/sys/windows"
-)
-
-const SupportNamedPipe = true
-
-// windowsSDDL is the Security Descriptor set on the namedpipe.
-// It provides read/write access to all users and the local system.
-const windowsSDDL = "D:PAI(A;OICI;GWGR;;;BU)(A;OICI;GWGR;;;SY)"
-
-func ListenNamedPipe(path string) (net.Listener, error) {
-	sddl := os.Getenv("LISTEN_NAMEDPIPE_SDDL")
-	if sddl == "" {
-		sddl = windowsSDDL
-	}
-	securityDescriptor, err := windows.SecurityDescriptorFromString(sddl)
-	if err != nil {
-		return nil, err
-	}
-	namedpipeLC := namedpipe.ListenConfig{
-		SecurityDescriptor: securityDescriptor,
-		InputBufferSize:    256 * 1024,
-		OutputBufferSize:   256 * 1024,
-	}
-	return namedpipeLC.Listen(path)
-}

adapter/inbound/mptcp_go120.go

@@ -8,7 +8,3 @@ const multipathTCPAvailable = false
 
 func setMultiPathTCP(listenConfig *net.ListenConfig, open bool) {
 }
-
-func getMultiPathTCP(listenConfig *net.ListenConfig) bool {
-	return false
-}

adapter/inbound/mptcp_go121.go

@@ -9,7 +9,3 @@ const multipathTCPAvailable = true
 func setMultiPathTCP(listenConfig *net.ListenConfig, open bool) {
 	listenConfig.SetMultipathTCP(open)
 }
-
-func getMultiPathTCP(listenConfig *net.ListenConfig) bool {
-	return listenConfig.MultipathTCP()
-}

adapter/inbound/util.go

@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/metacubex/mihomo/common/nnip"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/transport/socks5"
 )
@@ -20,13 +21,13 @@ func parseSocksAddr(target socks5.Addr) *C.Metadata {
 		metadata.Host = strings.TrimRight(string(target[2:2+target[1]]), ".")
 		metadata.DstPort = uint16((int(target[2+target[1]]) << 8) | int(target[2+target[1]+1]))
 	case socks5.AtypIPv4:
-		metadata.DstIP, _ = netip.AddrFromSlice(target[1 : 1+net.IPv4len])
+		metadata.DstIP = nnip.IpToAddr(net.IP(target[1 : 1+net.IPv4len]))
 		metadata.DstPort = uint16((int(target[1+net.IPv4len]) << 8) | int(target[1+net.IPv4len+1]))
 	case socks5.AtypIPv6:
-		metadata.DstIP, _ = netip.AddrFromSlice(target[1 : 1+net.IPv6len])
+		ip6, _ := netip.AddrFromSlice(target[1 : 1+net.IPv6len])
+		metadata.DstIP = ip6.Unmap()
 		metadata.DstPort = uint16((int(target[1+net.IPv6len]) << 8) | int(target[1+net.IPv6len+1]))
 	}
-	metadata.DstIP = metadata.DstIP.Unmap()
 
 	return metadata
 }
@@ -60,19 +61,3 @@ func parseHTTPAddr(request *http.Request) *C.Metadata {
 
 	return metadata
 }
-
-func prefixesContains(prefixes []netip.Prefix, addr netip.Addr) bool {
-	if len(prefixes) == 0 {
-		return false
-	}
-	if !addr.IsValid() {
-		return false
-	}
-	addr = addr.Unmap().WithZone("") // netip.Prefix.Contains returns false if ip has an IPv6 zone
-	for _, prefix := range prefixes {
-		if prefix.Contains(addr) {
-			return true
-		}
-	}
-	return false
-}

adapter/outbound/anytls.go

@@ -1,134 +0,0 @@
-package outbound
-
-import (
-	"context"
-	"errors"
-	"net"
-	"strconv"
-	"time"
-
-	CN "github.com/metacubex/mihomo/common/net"
-	"github.com/metacubex/mihomo/component/dialer"
-	"github.com/metacubex/mihomo/component/proxydialer"
-	"github.com/metacubex/mihomo/component/resolver"
-	C "github.com/metacubex/mihomo/constant"
-	"github.com/metacubex/mihomo/transport/anytls"
-	"github.com/metacubex/mihomo/transport/vmess"
-
-	M "github.com/metacubex/sing/common/metadata"
-	"github.com/metacubex/sing/common/uot"
-)
-
-type AnyTLS struct {
-	*Base
-	client *anytls.Client
-	dialer proxydialer.SingDialer
-	option *AnyTLSOption
-}
-
-type AnyTLSOption struct {
-	BasicOption
-	Name                     string   `proxy:"name"`
-	Server                   string   `proxy:"server"`
-	Port                     int      `proxy:"port"`
-	Password                 string   `proxy:"password"`
-	ALPN                     []string `proxy:"alpn,omitempty"`
-	SNI                      string   `proxy:"sni,omitempty"`
-	ClientFingerprint        string   `proxy:"client-fingerprint,omitempty"`
-	SkipCertVerify           bool     `proxy:"skip-cert-verify,omitempty"`
-	Fingerprint              string   `proxy:"fingerprint,omitempty"`
-	UDP                      bool     `proxy:"udp,omitempty"`
-	IdleSessionCheckInterval int      `proxy:"idle-session-check-interval,omitempty"`
-	IdleSessionTimeout       int      `proxy:"idle-session-timeout,omitempty"`
-	MinIdleSession           int      `proxy:"min-idle-session,omitempty"`
-}
-
-func (t *AnyTLS) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := t.client.CreateProxy(ctx, M.ParseSocksaddrHostPort(metadata.String(), metadata.DstPort))
-	if err != nil {
-		return nil, err
-	}
-	return NewConn(c, t), nil
-}
-
-func (t *AnyTLS) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	// create tcp
-	c, err := t.client.CreateProxy(ctx, uot.RequestDestination(2))
-	if err != nil {
-		return nil, err
-	}
-
-	// create uot on tcp
-	if !metadata.Resolved() {
-		ip, err := resolver.ResolveIP(ctx, metadata.Host)
-		if err != nil {
-			return nil, errors.New("can't resolve ip")
-		}
-		metadata.DstIP = ip
-	}
-	destination := M.SocksaddrFromNet(metadata.UDPAddr())
-	return newPacketConn(CN.NewThreadSafePacketConn(uot.NewLazyConn(c, uot.Request{Destination: destination})), t), nil
-}
-
-// SupportUOT implements C.ProxyAdapter
-func (t *AnyTLS) SupportUOT() bool {
-	return true
-}
-
-// ProxyInfo implements C.ProxyAdapter
-func (t *AnyTLS) ProxyInfo() C.ProxyInfo {
-	info := t.Base.ProxyInfo()
-	info.DialerProxy = t.option.DialerProxy
-	return info
-}
-
-// Close implements C.ProxyAdapter
-func (t *AnyTLS) Close() error {
-	return t.client.Close()
-}
-
-func NewAnyTLS(option AnyTLSOption) (*AnyTLS, error) {
-	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
-	outbound := &AnyTLS{
-		Base: &Base{
-			name:   option.Name,
-			addr:   addr,
-			tp:     C.AnyTLS,
-			udp:    option.UDP,
-			tfo:    option.TFO,
-			mpTcp:  option.MPTCP,
-			iface:  option.Interface,
-			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
-		},
-		option: &option,
-	}
-
-	singDialer := proxydialer.NewByNameSingDialer(option.DialerProxy, dialer.NewDialer(outbound.DialOptions()...))
-	outbound.dialer = singDialer
-
-	tOption := anytls.ClientConfig{
-		Password:                 option.Password,
-		Server:                   M.ParseSocksaddrHostPort(option.Server, uint16(option.Port)),
-		Dialer:                   singDialer,
-		IdleSessionCheckInterval: time.Duration(option.IdleSessionCheckInterval) * time.Second,
-		IdleSessionTimeout:       time.Duration(option.IdleSessionTimeout) * time.Second,
-		MinIdleSession:           option.MinIdleSession,
-	}
-	tlsConfig := &vmess.TLSConfig{
-		Host:              option.SNI,
-		SkipCertVerify:    option.SkipCertVerify,
-		NextProtos:        option.ALPN,
-		FingerPrint:       option.Fingerprint,
-		ClientFingerprint: option.ClientFingerprint,
-	}
-	if tlsConfig.Host == "" {
-		tlsConfig.Host = option.Server
-	}
-	tOption.TLSConfig = tlsConfig
-
-	client := anytls.NewClient(context.TODO(), tOption)
-	outbound.client = client
-
-	return outbound, nil
-}

adapter/outbound/base.go

@@ -4,23 +4,15 @@ import (
 	"context"
 	"encoding/json"
 	"net"
-	"runtime"
 	"strings"
-	"sync"
 	"syscall"
 
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/common/utils"
 	"github.com/metacubex/mihomo/component/dialer"
 	C "github.com/metacubex/mihomo/constant"
-	"github.com/metacubex/mihomo/log"
 )
 
-type ProxyAdapter interface {
-	C.ProxyAdapter
-	DialOptions() []dialer.Option
-}
-
 type Base struct {
 	name   string
 	addr   string
@@ -59,7 +51,7 @@ func (b *Base) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Me
 	return c, C.ErrNotSupport
 }
 
-func (b *Base) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
+func (b *Base) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
 	return nil, C.ErrNotSupport
 }
 
@@ -69,7 +61,7 @@ func (b *Base) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metad
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (b *Base) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (b *Base) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
 	return nil, C.ErrNotSupport
 }
 
@@ -93,15 +85,14 @@ func (b *Base) SupportUDP() bool {
 	return b.udp
 }
 
-// ProxyInfo implements C.ProxyAdapter
+// SupportXUDP implements C.ProxyAdapter
-func (b *Base) ProxyInfo() (info C.ProxyInfo) {
+func (b *Base) SupportXUDP() bool {
-	info.XUDP = b.xudp
+	return b.xudp
-	info.TFO = b.tfo
+}
-	info.MPTCP = b.mpTcp
+
-	info.SMUX = false
+// SupportTFO implements C.ProxyAdapter
-	info.Interface = b.iface
+func (b *Base) SupportTFO() bool {
-	info.RoutingMark = b.rmark
+	return b.tfo
-	return
 }
 
 // IsL3Protocol implements C.ProxyAdapter
@@ -128,7 +119,7 @@ func (b *Base) Unwrap(metadata *C.Metadata, touch bool) C.Proxy {
 }
 
 // DialOptions return []dialer.Option from struct
-func (b *Base) DialOptions() (opts []dialer.Option) {
+func (b *Base) DialOptions(opts ...dialer.Option) []dialer.Option {
 	if b.iface != "" {
 		opts = append(opts, dialer.WithInterface(b.iface))
 	}
@@ -160,16 +151,12 @@ func (b *Base) DialOptions() (opts []dialer.Option) {
 	return opts
 }
 
-func (b *Base) Close() error {
-	return nil
-}
-
 type BasicOption struct {
-	TFO         bool   `proxy:"tfo,omitempty"`
+	TFO         bool   `proxy:"tfo,omitempty" group:"tfo,omitempty"`
-	MPTCP       bool   `proxy:"mptcp,omitempty"`
+	MPTCP       bool   `proxy:"mptcp,omitempty" group:"mptcp,omitempty"`
-	Interface   string `proxy:"interface-name,omitempty"`
+	Interface   string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
-	RoutingMark int    `proxy:"routing-mark,omitempty"`
+	RoutingMark int    `proxy:"routing-mark,omitempty" group:"routing-mark,omitempty"`
-	IPVersion   string `proxy:"ip-version,omitempty"`
+	IPVersion   string `proxy:"ip-version,omitempty" group:"ip-version,omitempty"`
 	DialerProxy string `proxy:"dialer-proxy,omitempty"` // don't apply this option into groups, but can set a group name in a proxy
 }
 
@@ -233,10 +220,6 @@ func (c *conn) ReaderReplaceable() bool {
 	return true
 }
 
-func (c *conn) AddRef(ref any) {
-	c.ExtendedConn = N.NewRefConn(c.ExtendedConn, ref) // add ref for autoCloseProxyAdapter
-}
-
 func NewConn(c net.Conn, a C.ProxyAdapter) C.Conn {
 	if _, ok := c.(syscall.Conn); !ok { // exclusion system conn like *net.TCPConn
 		c = N.NewDeadlineConn(c) // most conn from outbound can't handle readDeadline correctly
@@ -283,10 +266,6 @@ func (c *packetConn) ReaderReplaceable() bool {
 	return true
 }
 
-func (c *packetConn) AddRef(ref any) {
-	c.EnhancePacketConn = N.NewRefPacketConn(c.EnhancePacketConn, ref) // add ref for autoCloseProxyAdapter
-}
-
 func newPacketConn(pc net.PacketConn, a C.ProxyAdapter) C.PacketConn {
 	epc := N.NewEnhancePacketConn(pc)
 	if _, ok := pc.(syscall.Conn); !ok { // exclusion system conn like *net.UDPConn
@@ -306,75 +285,3 @@ func parseRemoteDestination(addr string) string {
 		}
 	}
 }
-
-type AddRef interface {
-	AddRef(ref any)
-}
-
-type autoCloseProxyAdapter struct {
-	ProxyAdapter
-	closeOnce sync.Once
-	closeErr  error
-}
-
-func (p *autoCloseProxyAdapter) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := p.ProxyAdapter.DialContext(ctx, metadata)
-	if err != nil {
-		return nil, err
-	}
-	if c, ok := c.(AddRef); ok {
-		c.AddRef(p)
-	}
-	return c, nil
-}
-
-func (p *autoCloseProxyAdapter) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := p.ProxyAdapter.DialContextWithDialer(ctx, dialer, metadata)
-	if err != nil {
-		return nil, err
-	}
-	if c, ok := c.(AddRef); ok {
-		c.AddRef(p)
-	}
-	return c, nil
-}
-
-func (p *autoCloseProxyAdapter) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	pc, err := p.ProxyAdapter.ListenPacketContext(ctx, metadata)
-	if err != nil {
-		return nil, err
-	}
-	if pc, ok := pc.(AddRef); ok {
-		pc.AddRef(p)
-	}
-	return pc, nil
-}
-
-func (p *autoCloseProxyAdapter) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	pc, err := p.ProxyAdapter.ListenPacketWithDialer(ctx, dialer, metadata)
-	if err != nil {
-		return nil, err
-	}
-	if pc, ok := pc.(AddRef); ok {
-		pc.AddRef(p)
-	}
-	return pc, nil
-}
-
-func (p *autoCloseProxyAdapter) Close() error {
-	p.closeOnce.Do(func() {
-		log.Debugln("Closing outdated proxy [%s]", p.Name())
-		runtime.SetFinalizer(p, nil)
-		p.closeErr = p.ProxyAdapter.Close()
-	})
-	return p.closeErr
-}
-
-func NewAutoCloseProxyAdapter(adapter ProxyAdapter) ProxyAdapter {
-	proxy := &autoCloseProxyAdapter{
-		ProxyAdapter: adapter,
-	}
-	// auto close ProxyAdapter
-	runtime.SetFinalizer(proxy, (*autoCloseProxyAdapter).Close)
-	return proxy
-}

adapter/outbound/direct.go

@@ -3,6 +3,9 @@ package outbound
 import (
 	"context"
 	"errors"
+	"net/netip"
+
+	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/loopback"
 	"github.com/metacubex/mihomo/component/resolver"
@@ -20,43 +23,39 @@ type DirectOption struct {
 }
 
 // DialContext implements C.ProxyAdapter
-func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
+func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
 	if err := d.loopBack.CheckConn(metadata); err != nil {
 		return nil, err
 	}
-	opts := d.DialOptions()
+	opts = append(opts, dialer.WithResolver(resolver.DefaultResolver))
-	opts = append(opts, dialer.WithResolver(resolver.DirectHostResolver))
+	c, err := dialer.DialContext(ctx, "tcp", metadata.RemoteAddress(), d.Base.DialOptions(opts...)...)
-	c, err := dialer.DialContext(ctx, "tcp", metadata.RemoteAddress(), opts...)
 	if err != nil {
 		return nil, err
 	}
+	N.TCPKeepAlive(c)
 	return d.loopBack.NewConn(NewConn(c, d)), nil
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (d *Direct) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (d *Direct) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
 	if err := d.loopBack.CheckPacketConn(metadata); err != nil {
 		return nil, err
 	}
 	// net.UDPConn.WriteTo only working with *net.UDPAddr, so we need a net.UDPAddr
 	if !metadata.Resolved() {
-		ip, err := resolver.ResolveIPWithResolver(ctx, metadata.Host, resolver.DirectHostResolver)
+		ip, err := resolver.ResolveIPWithResolver(ctx, metadata.Host, resolver.DefaultResolver)
 		if err != nil {
 			return nil, errors.New("can't resolve ip")
 		}
 		metadata.DstIP = ip
 	}
-	pc, err := dialer.NewDialer(d.DialOptions()...).ListenPacket(ctx, "udp", "", metadata.AddrPort())
+	pc, err := dialer.NewDialer(d.Base.DialOptions(opts...)...).ListenPacket(ctx, "udp", "", netip.AddrPortFrom(metadata.DstIP, metadata.DstPort))
 	if err != nil {
 		return nil, err
 	}
 	return d.loopBack.NewPacketConn(newPacketConn(pc, d)), nil
 }
 
-func (d *Direct) IsL3Protocol(metadata *C.Metadata) bool {
-	return true // tell DNSDialer don't send domain to DialContext, avoid lookback to DefaultResolver
-}
-
 func NewDirectWithOption(option DirectOption) *Direct {
 	return &Direct{
 		Base: &Base{

adapter/outbound/dns.go

@@ -7,6 +7,7 @@ import (
 
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/common/pool"
+	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/resolver"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/log"
@@ -22,14 +23,14 @@ type DnsOption struct {
 }
 
 // DialContext implements C.ProxyAdapter
-func (d *Dns) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
+func (d *Dns) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
 	left, right := N.Pipe()
 	go resolver.RelayDnsConn(context.Background(), right, 0)
 	return NewConn(left, d), nil
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (d *Dns) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (d *Dns) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
 	log.Debugln("[DNS] hijack udp:%s from %s", metadata.RemoteAddress(), metadata.SourceAddrPort())
 
 	ctx, cancel := context.WithCancel(context.Background())

adapter/outbound/http.go

@@ -7,6 +7,8 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
+
+	"io"
 	"net"
 	"net/http"
 	"strconv"
@@ -51,15 +53,15 @@ func (h *Http) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Me
 		}
 	}
 
-	if err := h.shakeHandContext(ctx, c, metadata); err != nil {
+	if err := h.shakeHand(metadata, c); err != nil {
 		return nil, err
 	}
 	return c, nil
 }
 
 // DialContext implements C.ProxyAdapter
-func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
+func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
-	return h.DialContextWithDialer(ctx, dialer.NewDialer(h.DialOptions()...), metadata)
+	return h.DialContextWithDialer(ctx, dialer.NewDialer(h.Base.DialOptions(opts...)...), metadata)
 }
 
 // DialContextWithDialer implements C.ProxyAdapter
@@ -74,6 +76,7 @@ func (h *Http) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metad
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", h.addr, err)
 	}
+	N.TCPKeepAlive(c)
 
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
@@ -92,19 +95,7 @@ func (h *Http) SupportWithDialer() C.NetWork {
 	return C.TCP
 }
 
-// ProxyInfo implements C.ProxyAdapter
+func (h *Http) shakeHand(metadata *C.Metadata, rw io.ReadWriter) error {
-func (h *Http) ProxyInfo() C.ProxyInfo {
-	info := h.Base.ProxyInfo()
-	info.DialerProxy = h.option.DialerProxy
-	return info
-}
-
-func (h *Http) shakeHandContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (err error) {
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
-
 	addr := metadata.RemoteAddress()
 	HeaderString := "CONNECT " + addr + " HTTP/1.1\r\n"
 	tempHeaders := map[string]string{
@@ -128,13 +119,13 @@ func (h *Http) shakeHandContext(ctx context.Context, c net.Conn, metadata *C.Met
 
 	HeaderString += "\r\n"
 
-	_, err = c.Write([]byte(HeaderString))
+	_, err := rw.Write([]byte(HeaderString))
 
 	if err != nil {
 		return err
 	}
 
-	resp, err := http.ReadResponse(bufio.NewReader(c), nil)
+	resp, err := http.ReadResponse(bufio.NewReader(rw), nil)
 
 	if err != nil {
 		return err

adapter/outbound/hysteria.go

@@ -10,10 +10,13 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/metacubex/quic-go"
+	"github.com/metacubex/quic-go/congestion"
+	M "github.com/sagernet/sing/common/metadata"
+
 	"github.com/metacubex/mihomo/component/ca"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/proxydialer"
-	tlsC "github.com/metacubex/mihomo/component/tls"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/log"
 	hyCongestion "github.com/metacubex/mihomo/transport/hysteria/congestion"
@@ -22,10 +25,6 @@ import (
 	"github.com/metacubex/mihomo/transport/hysteria/pmtud_fix"
 	"github.com/metacubex/mihomo/transport/hysteria/transport"
 	"github.com/metacubex/mihomo/transport/hysteria/utils"
-
-	"github.com/metacubex/quic-go"
-	"github.com/metacubex/quic-go/congestion"
-	M "github.com/metacubex/sing/common/metadata"
 )
 
 const (
@@ -46,8 +45,8 @@ type Hysteria struct {
 	client *core.Client
 }
 
-func (h *Hysteria) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
+func (h *Hysteria) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
-	tcpConn, err := h.client.DialTCP(metadata.String(), metadata.DstPort, h.genHdc(ctx))
+	tcpConn, err := h.client.DialTCP(metadata.String(), metadata.DstPort, h.genHdc(ctx, opts...))
 	if err != nil {
 		return nil, err
 	}
@@ -55,42 +54,35 @@ func (h *Hysteria) DialContext(ctx context.Context, metadata *C.Metadata) (C.Con
 	return NewConn(tcpConn, h), nil
 }
 
-func (h *Hysteria) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (h *Hysteria) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	udpConn, err := h.client.DialUDP(h.genHdc(ctx))
+	udpConn, err := h.client.DialUDP(h.genHdc(ctx, opts...))
 	if err != nil {
 		return nil, err
 	}
 	return newPacketConn(&hyPacketConn{udpConn}, h), nil
 }
 
-func (h *Hysteria) genHdc(ctx context.Context) utils.PacketDialer {
+func (h *Hysteria) genHdc(ctx context.Context, opts ...dialer.Option) utils.PacketDialer {
 	return &hyDialerWithContext{
 		ctx: context.Background(),
-		hyDialer: func(network string, rAddr net.Addr) (net.PacketConn, error) {
+		hyDialer: func(network string) (net.PacketConn, error) {
 			var err error
-			var cDialer C.Dialer = dialer.NewDialer(h.DialOptions()...)
+			var cDialer C.Dialer = dialer.NewDialer(h.Base.DialOptions(opts...)...)
 			if len(h.option.DialerProxy) > 0 {
 				cDialer, err = proxydialer.NewByName(h.option.DialerProxy, cDialer)
 				if err != nil {
 					return nil, err
 				}
 			}
-			rAddrPort, _ := netip.ParseAddrPort(rAddr.String())
+			rAddrPort, _ := netip.ParseAddrPort(h.Addr())
 			return cDialer.ListenPacket(ctx, network, "", rAddrPort)
 		},
 		remoteAddr: func(addr string) (net.Addr, error) {
-			return resolveUDPAddr(ctx, "udp", addr, h.prefer)
+			return resolveUDPAddrWithPrefer(ctx, "udp", addr, h.prefer)
 		},
 	}
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (h *Hysteria) ProxyInfo() C.ProxyInfo {
-	info := h.Base.ProxyInfo()
-	info.DialerProxy = h.option.DialerProxy
-	return info
-}
-
 type HysteriaOption struct {
 	BasicOption
 	Name                string   `proxy:"name"`
@@ -135,7 +127,11 @@ func (c *HysteriaOption) Speed() (uint64, uint64, error) {
 }
 
 func NewHysteria(option HysteriaOption) (*Hysteria, error) {
-	clientTransport := &transport.ClientTransport{}
+	clientTransport := &transport.ClientTransport{
+		Dialer: &net.Dialer{
+			Timeout: 8 * time.Second,
+		},
+	}
 	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
 	ports := option.Ports
 
@@ -215,14 +211,14 @@ func NewHysteria(option HysteriaOption) (*Hysteria, error) {
 		down = uint64(option.DownSpeed * mbpsToBps)
 	}
 	client, err := core.NewClient(
-		addr, ports, option.Protocol, auth, tlsC.UConfig(tlsConfig), quicConfig, clientTransport, up, down, func(refBPS uint64) congestion.CongestionControl {
+		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)
 	}
-	outbound := &Hysteria{
+	return &Hysteria{
 		Base: &Base{
 			name:   option.Name,
 			addr:   addr,
@@ -235,17 +231,7 @@ func NewHysteria(option HysteriaOption) (*Hysteria, error) {
 		},
 		option: &option,
 		client: client,
-	}
+	}, nil
-
-	return outbound, nil
-}
-
-// Close implements C.ProxyAdapter
-func (h *Hysteria) Close() error {
-	if h.client != nil {
-		return h.client.Close()
-	}
-	return nil
 }
 
 type hyPacketConn struct {
@@ -282,7 +268,7 @@ func (c *hyPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
 }
 
 type hyDialerWithContext struct {
-	hyDialer   func(network string, rAddr net.Addr) (net.PacketConn, error)
+	hyDialer   func(network string) (net.PacketConn, error)
 	ctx        context.Context
 	remoteAddr func(host string) (net.Addr, error)
 }
@@ -292,7 +278,7 @@ func (h *hyDialerWithContext) ListenPacket(rAddr net.Addr) (net.PacketConn, erro
 	if addrPort, err := netip.ParseAddrPort(rAddr.String()); err == nil {
 		network = dialer.ParseNetwork(network, addrPort.Addr())
 	}
-	return h.hyDialer(network, rAddr)
+	return h.hyDialer(network)
 }
 
 func (h *hyDialerWithContext) Context() context.Context {

adapter/outbound/hysteria2.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"net"
+	"runtime"
 	"strconv"
 	"time"
 
@@ -14,15 +15,14 @@ import (
 	"github.com/metacubex/mihomo/component/ca"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/proxydialer"
-	tlsC "github.com/metacubex/mihomo/component/tls"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/log"
 	tuicCommon "github.com/metacubex/mihomo/transport/tuic/common"
 
-	"github.com/metacubex/quic-go"
-	"github.com/metacubex/randv2"
 	"github.com/metacubex/sing-quic/hysteria2"
-	M "github.com/metacubex/sing/common/metadata"
+
+	M "github.com/sagernet/sing/common/metadata"
+	"github.com/zhangyunhao116/fastrand"
 )
 
 func init() {
@@ -60,23 +60,21 @@ type Hysteria2Option struct {
 	CustomCAString string   `proxy:"ca-str,omitempty"`
 	CWND           int      `proxy:"cwnd,omitempty"`
 	UdpMTU         int      `proxy:"udp-mtu,omitempty"`
-
-	// quic-go special config
-	InitialStreamReceiveWindow     uint64 `proxy:"initial-stream-receive-window,omitempty"`
-	MaxStreamReceiveWindow         uint64 `proxy:"max-stream-receive-window,omitempty"`
-	InitialConnectionReceiveWindow uint64 `proxy:"initial-connection-receive-window,omitempty"`
-	MaxConnectionReceiveWindow     uint64 `proxy:"max-connection-receive-window,omitempty"`
 }
 
-func (h *Hysteria2) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
+func (h *Hysteria2) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
+	options := h.Base.DialOptions(opts...)
+	h.dialer.SetDialer(dialer.NewDialer(options...))
 	c, err := h.client.DialConn(ctx, M.ParseSocksaddrHostPort(metadata.String(), metadata.DstPort))
 	if err != nil {
 		return nil, err
 	}
-	return NewConn(c, h), nil
+	return NewConn(CN.NewRefConn(c, h), h), nil
 }
 
-func (h *Hysteria2) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
+func (h *Hysteria2) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
+	options := h.Base.DialOptions(opts...)
+	h.dialer.SetDialer(dialer.NewDialer(options...))
 	pc, err := h.client.ListenPacket(ctx)
 	if err != nil {
 		return nil, err
@@ -84,42 +82,17 @@ func (h *Hysteria2) ListenPacketContext(ctx context.Context, metadata *C.Metadat
 	if pc == nil {
 		return nil, errors.New("packetConn is nil")
 	}
-	return newPacketConn(CN.NewThreadSafePacketConn(pc), h), nil
+	return newPacketConn(CN.NewRefPacketConn(CN.NewThreadSafePacketConn(pc), h), h), nil
 }
 
-// Close implements C.ProxyAdapter
+func closeHysteria2(h *Hysteria2) {
-func (h *Hysteria2) Close() error {
 	if h.client != nil {
-		return h.client.CloseWithError(errors.New("proxy removed"))
+		_ = h.client.CloseWithError(errors.New("proxy removed"))
 	}
-	return nil
-}
-
-// ProxyInfo implements C.ProxyAdapter
-func (h *Hysteria2) ProxyInfo() C.ProxyInfo {
-	info := h.Base.ProxyInfo()
-	info.DialerProxy = h.option.DialerProxy
-	return info
 }
 
 func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {
 	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
-	outbound := &Hysteria2{
-		Base: &Base{
-			name:   option.Name,
-			addr:   addr,
-			tp:     C.Hysteria2,
-			udp:    true,
-			iface:  option.Interface,
-			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
-		},
-		option: &option,
-	}
-
-	singDialer := proxydialer.NewByNameSingDialer(option.DialerProxy, dialer.NewDialer(outbound.DialOptions()...))
-	outbound.dialer = singDialer
-
 	var salamanderPassword string
 	if len(option.Obfs) > 0 {
 		if option.ObfsPassword == "" {
@@ -160,12 +133,7 @@ func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {
 		option.UdpMTU = 1200 - 3
 	}
 
-	quicConfig := &quic.Config{
+	singDialer := proxydialer.NewByNameSingDialer(option.DialerProxy, dialer.NewDialer())
-		InitialStreamReceiveWindow:     option.InitialStreamReceiveWindow,
-		MaxStreamReceiveWindow:         option.MaxStreamReceiveWindow,
-		InitialConnectionReceiveWindow: option.InitialConnectionReceiveWindow,
-		MaxConnectionReceiveWindow:     option.MaxConnectionReceiveWindow,
-	}
 
 	clientOptions := hysteria2.ClientOptions{
 		Context:            context.TODO(),
@@ -175,13 +143,12 @@ func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {
 		ReceiveBPS:         StringToBps(option.Down),
 		SalamanderPassword: salamanderPassword,
 		Password:           option.Password,
-		TLSConfig:          tlsC.UConfig(tlsConfig),
+		TLSConfig:          tlsConfig,
-		QUICConfig:         quicConfig,
 		UDPDisabled:        false,
 		CWND:               option.CWND,
 		UdpMTU:             option.UdpMTU,
 		ServerAddress: func(ctx context.Context) (*net.UDPAddr, error) {
-			return resolveUDPAddr(ctx, "udp", addr, C.NewDNSPrefer(option.IPVersion))
+			return resolveUDPAddrWithPrefer(ctx, "udp", addr, C.NewDNSPrefer(option.IPVersion))
 		},
 	}
 
@@ -198,7 +165,7 @@ func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {
 		})
 		if len(serverAddress) > 0 {
 			clientOptions.ServerAddress = func(ctx context.Context) (*net.UDPAddr, error) {
-				return resolveUDPAddr(ctx, "udp", serverAddress[randv2.IntN(len(serverAddress))], C.NewDNSPrefer(option.IPVersion))
+				return resolveUDPAddrWithPrefer(ctx, "udp", serverAddress[fastrand.Intn(len(serverAddress))], C.NewDNSPrefer(option.IPVersion))
 			}
 
 			if option.HopInterval == 0 {
@@ -217,7 +184,22 @@ func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {
 	if err != nil {
 		return nil, err
 	}
-	outbound.client = client
+
+	outbound := &Hysteria2{
+		Base: &Base{
+			name:   option.Name,
+			addr:   addr,
+			tp:     C.Hysteria2,
+			udp:    true,
+			iface:  option.Interface,
+			rmark:  option.RoutingMark,
+			prefer: C.NewDNSPrefer(option.IPVersion),
+		},
+		option: &option,
+		client: client,
+		dialer: singDialer,
+	}
+	runtime.SetFinalizer(outbound, closeHysteria2)
 
 	return outbound, nil
 }

adapter/outbound/mieru.go

@@ -1,301 +0,0 @@
-package outbound
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"strconv"
-	"sync"
-
-	CN "github.com/metacubex/mihomo/common/net"
-	"github.com/metacubex/mihomo/component/dialer"
-	"github.com/metacubex/mihomo/component/proxydialer"
-	C "github.com/metacubex/mihomo/constant"
-
-	mieruclient "github.com/enfein/mieru/v3/apis/client"
-	mierucommon "github.com/enfein/mieru/v3/apis/common"
-	mierumodel "github.com/enfein/mieru/v3/apis/model"
-	mierupb "github.com/enfein/mieru/v3/pkg/appctl/appctlpb"
-	"google.golang.org/protobuf/proto"
-)
-
-type Mieru struct {
-	*Base
-	option *MieruOption
-	client mieruclient.Client
-	mu     sync.Mutex
-}
-
-type MieruOption struct {
-	BasicOption
-	Name         string `proxy:"name"`
-	Server       string `proxy:"server"`
-	Port         int    `proxy:"port,omitempty"`
-	PortRange    string `proxy:"port-range,omitempty"`
-	Transport    string `proxy:"transport"`
-	UDP          bool   `proxy:"udp,omitempty"`
-	UserName     string `proxy:"username"`
-	Password     string `proxy:"password"`
-	Multiplexing string `proxy:"multiplexing,omitempty"`
-}
-
-// DialContext implements C.ProxyAdapter
-func (m *Mieru) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
-	if err := m.ensureClientIsRunning(); err != nil {
-		return nil, err
-	}
-	addr := metadataToMieruNetAddrSpec(metadata)
-	c, err := m.client.DialContext(ctx, addr)
-	if err != nil {
-		return nil, fmt.Errorf("dial to %s failed: %w", addr, err)
-	}
-	return NewConn(c, m), nil
-}
-
-// ListenPacketContext implements C.ProxyAdapter
-func (m *Mieru) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if err := m.ensureClientIsRunning(); err != nil {
-		return nil, err
-	}
-	c, err := m.client.DialContext(ctx, metadata.UDPAddr())
-	if err != nil {
-		return nil, fmt.Errorf("dial to %s failed: %w", metadata.UDPAddr(), err)
-	}
-	return newPacketConn(CN.NewThreadSafePacketConn(mierucommon.NewUDPAssociateWrapper(mierucommon.NewPacketOverStreamTunnel(c))), m), nil
-}
-
-// SupportUOT implements C.ProxyAdapter
-func (m *Mieru) SupportUOT() bool {
-	return true
-}
-
-// ProxyInfo implements C.ProxyAdapter
-func (m *Mieru) ProxyInfo() C.ProxyInfo {
-	info := m.Base.ProxyInfo()
-	info.DialerProxy = m.option.DialerProxy
-	return info
-}
-
-func (m *Mieru) ensureClientIsRunning() error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.client.IsRunning() {
-		return nil
-	}
-
-	// Create a dialer and add it to the client config, before starting the client.
-	var dialer C.Dialer = dialer.NewDialer(m.DialOptions()...)
-	var err error
-	if len(m.option.DialerProxy) > 0 {
-		dialer, err = proxydialer.NewByName(m.option.DialerProxy, dialer)
-		if err != nil {
-			return err
-		}
-	}
-	config, err := m.client.Load()
-	if err != nil {
-		return err
-	}
-	config.Dialer = dialer
-	if err := m.client.Store(config); err != nil {
-		return err
-	}
-
-	if err := m.client.Start(); err != nil {
-		return fmt.Errorf("failed to start mieru client: %w", err)
-	}
-	return nil
-}
-
-func NewMieru(option MieruOption) (*Mieru, error) {
-	config, err := buildMieruClientConfig(option)
-	if err != nil {
-		return nil, fmt.Errorf("failed to build mieru client config: %w", err)
-	}
-	c := mieruclient.NewClient()
-	if err := c.Store(config); err != nil {
-		return nil, fmt.Errorf("failed to store mieru client config: %w", err)
-	}
-	// Client is started lazily on the first use.
-
-	var addr string
-	if option.Port != 0 {
-		addr = net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
-	} else {
-		beginPort, _, _ := beginAndEndPortFromPortRange(option.PortRange)
-		addr = net.JoinHostPort(option.Server, strconv.Itoa(beginPort))
-	}
-	outbound := &Mieru{
-		Base: &Base{
-			name:   option.Name,
-			addr:   addr,
-			iface:  option.Interface,
-			tp:     C.Mieru,
-			udp:    option.UDP,
-			xudp:   false,
-			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
-		},
-		option: &option,
-		client: c,
-	}
-	return outbound, nil
-}
-
-// Close implements C.ProxyAdapter
-func (m *Mieru) Close() error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	if m.client != nil && m.client.IsRunning() {
-		return m.client.Stop()
-	}
-	return nil
-}
-
-func metadataToMieruNetAddrSpec(metadata *C.Metadata) mierumodel.NetAddrSpec {
-	if metadata.Host != "" {
-		return mierumodel.NetAddrSpec{
-			AddrSpec: mierumodel.AddrSpec{
-				FQDN: metadata.Host,
-				Port: int(metadata.DstPort),
-			},
-			Net: "tcp",
-		}
-	} else {
-		return mierumodel.NetAddrSpec{
-			AddrSpec: mierumodel.AddrSpec{
-				IP:   metadata.DstIP.AsSlice(),
-				Port: int(metadata.DstPort),
-			},
-			Net: "tcp",
-		}
-	}
-}
-
-func buildMieruClientConfig(option MieruOption) (*mieruclient.ClientConfig, error) {
-	if err := validateMieruOption(option); err != nil {
-		return nil, fmt.Errorf("failed to validate mieru option: %w", err)
-	}
-
-	transportProtocol := mierupb.TransportProtocol_TCP.Enum()
-	var server *mierupb.ServerEndpoint
-	if net.ParseIP(option.Server) != nil {
-		// server is an IP address
-		if option.PortRange != "" {
-			server = &mierupb.ServerEndpoint{
-				IpAddress: proto.String(option.Server),
-				PortBindings: []*mierupb.PortBinding{
-					{
-						PortRange: proto.String(option.PortRange),
-						Protocol:  transportProtocol,
-					},
-				},
-			}
-		} else {
-			server = &mierupb.ServerEndpoint{
-				IpAddress: proto.String(option.Server),
-				PortBindings: []*mierupb.PortBinding{
-					{
-						Port:     proto.Int32(int32(option.Port)),
-						Protocol: transportProtocol,
-					},
-				},
-			}
-		}
-	} else {
-		// server is a domain name
-		if option.PortRange != "" {
-			server = &mierupb.ServerEndpoint{
-				DomainName: proto.String(option.Server),
-				PortBindings: []*mierupb.PortBinding{
-					{
-						PortRange: proto.String(option.PortRange),
-						Protocol:  transportProtocol,
-					},
-				},
-			}
-		} else {
-			server = &mierupb.ServerEndpoint{
-				DomainName: proto.String(option.Server),
-				PortBindings: []*mierupb.PortBinding{
-					{
-						Port:     proto.Int32(int32(option.Port)),
-						Protocol: transportProtocol,
-					},
-				},
-			}
-		}
-	}
-	config := &mieruclient.ClientConfig{
-		Profile: &mierupb.ClientProfile{
-			ProfileName: proto.String(option.Name),
-			User: &mierupb.User{
-				Name:     proto.String(option.UserName),
-				Password: proto.String(option.Password),
-			},
-			Servers: []*mierupb.ServerEndpoint{server},
-		},
-	}
-	if multiplexing, ok := mierupb.MultiplexingLevel_value[option.Multiplexing]; ok {
-		config.Profile.Multiplexing = &mierupb.MultiplexingConfig{
-			Level: mierupb.MultiplexingLevel(multiplexing).Enum(),
-		}
-	}
-	return config, nil
-}
-
-func validateMieruOption(option MieruOption) error {
-	if option.Name == "" {
-		return fmt.Errorf("name is empty")
-	}
-	if option.Server == "" {
-		return fmt.Errorf("server is empty")
-	}
-	if option.Port == 0 && option.PortRange == "" {
-		return fmt.Errorf("either port or port-range must be set")
-	}
-	if option.Port != 0 && option.PortRange != "" {
-		return fmt.Errorf("port and port-range cannot be set at the same time")
-	}
-	if option.Port != 0 && (option.Port < 1 || option.Port > 65535) {
-		return fmt.Errorf("port must be between 1 and 65535")
-	}
-	if option.PortRange != "" {
-		begin, end, err := beginAndEndPortFromPortRange(option.PortRange)
-		if err != nil {
-			return fmt.Errorf("invalid port-range format")
-		}
-		if begin < 1 || begin > 65535 {
-			return fmt.Errorf("begin port must be between 1 and 65535")
-		}
-		if end < 1 || end > 65535 {
-			return fmt.Errorf("end port must be between 1 and 65535")
-		}
-		if begin > end {
-			return fmt.Errorf("begin port must be less than or equal to end port")
-		}
-	}
-
-	if option.Transport != "TCP" {
-		return fmt.Errorf("transport must be TCP")
-	}
-	if option.UserName == "" {
-		return fmt.Errorf("username is empty")
-	}
-	if option.Password == "" {
-		return fmt.Errorf("password is empty")
-	}
-	if option.Multiplexing != "" {
-		if _, ok := mierupb.MultiplexingLevel_value[option.Multiplexing]; !ok {
-			return fmt.Errorf("invalid multiplexing level: %s", option.Multiplexing)
-		}
-	}
-	return nil
-}
-
-func beginAndEndPortFromPortRange(portRange string) (int, int, error) {
-	var begin, end int
-	_, err := fmt.Sscanf(portRange, "%d-%d", &begin, &end)
-	return begin, end, err
-}

adapter/outbound/mieru_test.go

@@ -1,92 +0,0 @@
-package outbound
-
-import "testing"
-
-func TestNewMieru(t *testing.T) {
-	testCases := []struct {
-		option       MieruOption
-		wantBaseAddr string
-	}{
-		{
-			option: MieruOption{
-				Name:      "test",
-				Server:    "1.2.3.4",
-				Port:      10000,
-				Transport: "TCP",
-				UserName:  "test",
-				Password:  "test",
-			},
-			wantBaseAddr: "1.2.3.4:10000",
-		},
-		{
-			option: MieruOption{
-				Name:      "test",
-				Server:    "2001:db8::1",
-				PortRange: "10001-10002",
-				Transport: "TCP",
-				UserName:  "test",
-				Password:  "test",
-			},
-			wantBaseAddr: "[2001:db8::1]:10001",
-		},
-		{
-			option: MieruOption{
-				Name:      "test",
-				Server:    "example.com",
-				Port:      10003,
-				Transport: "TCP",
-				UserName:  "test",
-				Password:  "test",
-			},
-			wantBaseAddr: "example.com:10003",
-		},
-	}
-
-	for _, testCase := range testCases {
-		mieru, err := NewMieru(testCase.option)
-		if err != nil {
-			t.Error(err)
-		}
-		if mieru.addr != testCase.wantBaseAddr {
-			t.Errorf("got addr %q, want %q", mieru.addr, testCase.wantBaseAddr)
-		}
-	}
-}
-
-func TestBeginAndEndPortFromPortRange(t *testing.T) {
-	testCases := []struct {
-		input  string
-		begin  int
-		end    int
-		hasErr bool
-	}{
-		{"1-10", 1, 10, false},
-		{"1000-2000", 1000, 2000, false},
-		{"65535-65535", 65535, 65535, false},
-		{"1", 0, 0, true},
-		{"1-", 0, 0, true},
-		{"-10", 0, 0, true},
-		{"a-b", 0, 0, true},
-		{"1-b", 0, 0, true},
-		{"a-10", 0, 0, true},
-	}
-
-	for _, testCase := range testCases {
-		begin, end, err := beginAndEndPortFromPortRange(testCase.input)
-		if testCase.hasErr {
-			if err == nil {
-				t.Errorf("beginAndEndPortFromPortRange(%s) should return an error", testCase.input)
-			}
-		} else {
-			if err != nil {
-				t.Errorf("beginAndEndPortFromPortRange(%s) should not return an error, but got %v", testCase.input, err)
-			}
-			if begin != testCase.begin {
-				t.Errorf("beginAndEndPortFromPortRange(%s) begin port mismatch, got %d, want %d", testCase.input, begin, testCase.begin)
-			}
-			if end != testCase.end {
-				t.Errorf("beginAndEndPortFromPortRange(%s) end port mismatch, got %d, want %d", testCase.input, end, testCase.end)
-			}
-		}
-	}
-}

adapter/outbound/reality.go

@@ -20,19 +20,16 @@ func (o RealityOptions) Parse() (*tlsC.RealityConfig, error) {
 		config := new(tlsC.RealityConfig)
 
 		const x25519ScalarSize = 32
-		publicKey, err := base64.RawURLEncoding.DecodeString(o.PublicKey)
+		var publicKey [x25519ScalarSize]byte
-		if err != nil || len(publicKey) != x25519ScalarSize {
+		n, err := base64.RawURLEncoding.Decode(publicKey[:], []byte(o.PublicKey))
+		if err != nil || n != x25519ScalarSize {
 			return nil, errors.New("invalid REALITY public key")
 		}
-		config.PublicKey, err = ecdh.X25519().NewPublicKey(publicKey)
+		config.PublicKey, err = ecdh.X25519().NewPublicKey(publicKey[:])
 		if err != nil {
 			return nil, fmt.Errorf("fail to create REALITY public key: %w", err)
 		}
 
-		n := hex.DecodedLen(len(o.ShortID))
-		if n > tlsC.RealityMaxShortIDLen {
-			return nil, errors.New("invalid REALITY short id")
-		}
 		n, err = hex.Decode(config.ShortID[:], []byte(o.ShortID))
 		if err != nil || n > tlsC.RealityMaxShortIDLen {
 			return nil, errors.New("invalid REALITY short ID")

adapter/outbound/reject.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/metacubex/mihomo/common/buf"
+	"github.com/metacubex/mihomo/component/dialer"
 	C "github.com/metacubex/mihomo/constant"
 )
 
@@ -20,7 +21,7 @@ type RejectOption struct {
 }
 
 // DialContext implements C.ProxyAdapter
-func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
+func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
 	if r.drop {
 		return NewConn(dropConn{}, r), nil
 	}
@@ -28,7 +29,7 @@ func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn,
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (r *Reject) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (r *Reject) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
 	return newPacketConn(&nopPacketConn{}, r), nil
 }
 
@@ -36,7 +37,7 @@ func NewRejectWithOption(option RejectOption) *Reject {
 	return &Reject{
 		Base: &Base{
 			name: option.Name,
-			tp:   C.Reject,
+			tp:   C.Direct,
 			udp:  true,
 		},
 	}

adapter/outbound/shadowsocks.go

@@ -13,16 +13,16 @@ import (
 	"github.com/metacubex/mihomo/component/proxydialer"
 	"github.com/metacubex/mihomo/component/resolver"
 	C "github.com/metacubex/mihomo/constant"
-	gost "github.com/metacubex/mihomo/transport/gost-plugin"
 	"github.com/metacubex/mihomo/transport/restls"
 	obfs "github.com/metacubex/mihomo/transport/simple-obfs"
 	shadowtls "github.com/metacubex/mihomo/transport/sing-shadowtls"
 	v2rayObfs "github.com/metacubex/mihomo/transport/v2ray-plugin"
 
+	restlsC "github.com/3andne/restls-client-go"
 	shadowsocks "github.com/metacubex/sing-shadowsocks2"
-	"github.com/metacubex/sing/common/bufio"
+	"github.com/sagernet/sing/common/bufio"
-	M "github.com/metacubex/sing/common/metadata"
+	M "github.com/sagernet/sing/common/metadata"
-	"github.com/metacubex/sing/common/uot"
+	"github.com/sagernet/sing/common/uot"
 )
 
 type ShadowSocks struct {
@@ -34,9 +34,8 @@ type ShadowSocks struct {
 	obfsMode        string
 	obfsOption      *simpleObfsOption
 	v2rayOption     *v2rayObfs.Option
-	gostOption      *gost.Option
 	shadowTLSOption *shadowtls.ShadowTLSOption
-	restlsConfig    *restls.Config
+	restlsConfig    *restlsC.Config
 }
 
 type ShadowSocksOption struct {
@@ -72,24 +71,12 @@ type v2rayObfsOption struct {
 	V2rayHttpUpgradeFastOpen bool              `obfs:"v2ray-http-upgrade-fast-open,omitempty"`
 }
 
-type gostObfsOption struct {
-	Mode           string            `obfs:"mode"`
-	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,omitempty"`
+	Password       string `obfs:"password"`
-	Host           string   `obfs:"host"`
+	Host           string `obfs:"host"`
-	Fingerprint    string   `obfs:"fingerprint,omitempty"`
+	Fingerprint    string `obfs:"fingerprint,omitempty"`
-	SkipCertVerify bool     `obfs:"skip-cert-verify,omitempty"`
+	SkipCertVerify bool   `obfs:"skip-cert-verify,omitempty"`
-	Version        int      `obfs:"version,omitempty"`
+	Version        int    `obfs:"version,omitempty"`
-	ALPN           []string `obfs:"alpn,omitempty"`
 }
 
 type restlsOption struct {
@@ -100,7 +87,7 @@ type restlsOption struct {
 }
 
 // StreamConnContext implements C.ProxyAdapter
-func (ss *ShadowSocks) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ net.Conn, err error) {
+func (ss *ShadowSocks) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	useEarly := false
 	switch ss.obfsMode {
 	case "tls":
@@ -109,23 +96,20 @@ func (ss *ShadowSocks) StreamConnContext(ctx context.Context, c net.Conn, metada
 		_, port, _ := net.SplitHostPort(ss.addr)
 		c = obfs.NewHTTPObfs(c, ss.obfsOption.Host, port)
 	case "websocket":
-		if ss.v2rayOption != nil {
+		var err error
-			c, err = v2rayObfs.NewV2rayObfs(ctx, c, ss.v2rayOption)
+		c, err = v2rayObfs.NewV2rayObfs(ctx, c, ss.v2rayOption)
-		} else if ss.gostOption != nil {
-			c, err = gost.NewGostWebsocket(ctx, c, ss.gostOption)
-		} else {
-			return nil, fmt.Errorf("plugin options is required")
-		}
 		if err != nil {
 			return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
 		}
 	case shadowtls.Mode:
+		var err error
 		c, err = shadowtls.NewShadowTLS(ctx, c, ss.shadowTLSOption)
 		if err != nil {
 			return nil, err
 		}
 		useEarly = true
 	case restls.Mode:
+		var err error
 		c, err = restls.NewRestls(ctx, c, ss.restlsConfig)
 		if err != nil {
 			return nil, fmt.Errorf("%s (restls) connect error: %w", ss.addr, err)
@@ -133,12 +117,6 @@ func (ss *ShadowSocks) StreamConnContext(ctx context.Context, c net.Conn, metada
 		useEarly = true
 	}
 	useEarly = useEarly || N.NeedHandshake(c)
-	if !useEarly {
-		if ctx.Done() != nil {
-			done := N.SetupContextForConn(ctx, c)
-			defer done(&err)
-		}
-	}
 	if metadata.NetWork == C.UDP && ss.option.UDPOverTCP {
 		uotDestination := uot.RequestDestination(uint8(ss.option.UDPOverTCPVersion))
 		if useEarly {
@@ -155,8 +133,8 @@ func (ss *ShadowSocks) StreamConnContext(ctx context.Context, c net.Conn, metada
 }
 
 // DialContext implements C.ProxyAdapter
-func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
+func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
-	return ss.DialContextWithDialer(ctx, dialer.NewDialer(ss.DialOptions()...), metadata)
+	return ss.DialContextWithDialer(ctx, dialer.NewDialer(ss.Base.DialOptions(opts...)...), metadata)
 }
 
 // DialContextWithDialer implements C.ProxyAdapter
@@ -171,6 +149,7 @@ func (ss *ShadowSocks) DialContextWithDialer(ctx context.Context, dialer C.Diale
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
 	}
+	N.TCPKeepAlive(c)
 
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
@@ -181,12 +160,18 @@ func (ss *ShadowSocks) DialContextWithDialer(ctx context.Context, dialer C.Diale
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (ss *ShadowSocks) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (ss *ShadowSocks) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	return ss.ListenPacketWithDialer(ctx, dialer.NewDialer(ss.DialOptions()...), metadata)
+	return ss.ListenPacketWithDialer(ctx, dialer.NewDialer(ss.Base.DialOptions(opts...)...), metadata)
 }
 
 // ListenPacketWithDialer implements C.ProxyAdapter
 func (ss *ShadowSocks) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
+	if len(ss.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(ss.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
+	}
 	if ss.option.UDPOverTCP {
 		tcpConn, err := ss.DialContextWithDialer(ctx, dialer, metadata)
 		if err != nil {
@@ -194,13 +179,7 @@ func (ss *ShadowSocks) ListenPacketWithDialer(ctx context.Context, dialer C.Dial
 		}
 		return ss.ListenPacketOnStreamConn(ctx, tcpConn, metadata)
 	}
-	if len(ss.option.DialerProxy) > 0 {
+	addr, err := resolveUDPAddrWithPrefer(ctx, "udp", ss.addr, ss.prefer)
-		dialer, err = proxydialer.NewByName(ss.option.DialerProxy, dialer)
-		if err != nil {
-			return nil, err
-		}
-	}
-	addr, err := resolveUDPAddr(ctx, "udp", ss.addr, ss.prefer)
 	if err != nil {
 		return nil, err
 	}
@@ -218,13 +197,6 @@ func (ss *ShadowSocks) SupportWithDialer() C.NetWork {
 	return C.ALLNet
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (ss *ShadowSocks) ProxyInfo() C.ProxyInfo {
-	info := ss.Base.ProxyInfo()
-	info.DialerProxy = ss.option.DialerProxy
-	return info
-}
-
 // ListenPacketOnStreamConn implements C.ProxyAdapter
 func (ss *ShadowSocks) ListenPacketOnStreamConn(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ C.PacketConn, err error) {
 	if ss.option.UDPOverTCP {
@@ -258,14 +230,13 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 		Password: option.Password,
 	})
 	if err != nil {
-		return nil, fmt.Errorf("ss %s cipher: %s initialize error: %w", addr, option.Cipher, err)
+		return nil, fmt.Errorf("ss %s initialize error: %w", addr, err)
 	}
 
 	var v2rayOption *v2rayObfs.Option
-	var gostOption *gost.Option
 	var obfsOption *simpleObfsOption
 	var shadowTLSOpt *shadowtls.ShadowTLSOption
-	var restlsConfig *restls.Config
+	var restlsConfig *restlsC.Config
 	obfsMode := ""
 
 	decoder := structure.NewDecoder(structure.Option{TagName: "obfs", WeaklyTypedInput: true})
@@ -302,29 +273,6 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 		if opts.TLS {
 			v2rayOption.TLS = true
 			v2rayOption.SkipCertVerify = opts.SkipCertVerify
-			v2rayOption.Fingerprint = opts.Fingerprint
-		}
-	} else if option.Plugin == "gost-plugin" {
-		opts := gostObfsOption{Host: "bing.com", Mux: true}
-		if err := decoder.Decode(option.PluginOpts, &opts); err != nil {
-			return nil, fmt.Errorf("ss %s initialize gost-plugin error: %w", addr, err)
-		}
-
-		if opts.Mode != "websocket" {
-			return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode)
-		}
-		obfsMode = opts.Mode
-		gostOption = &gost.Option{
-			Host:    opts.Host,
-			Path:    opts.Path,
-			Headers: opts.Headers,
-			Mux:     opts.Mux,
-		}
-
-		if opts.TLS {
-			gostOption.TLS = true
-			gostOption.SkipCertVerify = opts.SkipCertVerify
-			gostOption.Fingerprint = opts.Fingerprint
 		}
 	} else if option.Plugin == shadowtls.Mode {
 		obfsMode = shadowtls.Mode
@@ -343,12 +291,6 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 			SkipCertVerify:    opt.SkipCertVerify,
 			Version:           opt.Version,
 		}
-
-		if opt.ALPN != nil { // structure's Decode will ensure value not nil when input has value even it was set an empty array
-			shadowTLSOpt.ALPN = opt.ALPN
-		} else {
-			shadowTLSOpt.ALPN = shadowtls.DefaultALPN
-		}
 	} else if option.Plugin == restls.Mode {
 		obfsMode = restls.Mode
 		restlsOpt := &restlsOption{}
@@ -356,7 +298,7 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 			return nil, fmt.Errorf("ss %s initialize restls-plugin error: %w", addr, err)
 		}
 
-		restlsConfig, err = restls.NewRestlsConfig(restlsOpt.Host, restlsOpt.Password, restlsOpt.VersionHint, restlsOpt.RestlsScript, option.ClientFingerprint)
+		restlsConfig, err = restlsC.NewRestlsConfig(restlsOpt.Host, restlsOpt.Password, restlsOpt.VersionHint, restlsOpt.RestlsScript, option.ClientFingerprint)
 		if err != nil {
 			return nil, fmt.Errorf("ss %s initialize restls-plugin error: %w", addr, err)
 		}
@@ -387,7 +329,6 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 		option:          &option,
 		obfsMode:        obfsMode,
 		v2rayOption:     v2rayOption,
-		gostOption:      gostOption,
 		obfsOption:      obfsOption,
 		shadowTLSOption: shadowTLSOpt,
 		restlsConfig:    restlsConfig,

adapter/outbound/shadowsocksr.go

@@ -42,15 +42,12 @@ type ShadowSocksROption struct {
 }
 
 // StreamConnContext implements C.ProxyAdapter
-func (ssr *ShadowSocksR) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ net.Conn, err error) {
+func (ssr *ShadowSocksR) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
 	c = ssr.obfs.StreamConn(c)
 	c = ssr.cipher.StreamConn(c)
 	var (
-		iv []byte
+		iv  []byte
+		err error
 	)
 	switch conn := c.(type) {
 	case *shadowstream.Conn:
@@ -67,8 +64,8 @@ func (ssr *ShadowSocksR) StreamConnContext(ctx context.Context, c net.Conn, meta
 }
 
 // DialContext implements C.ProxyAdapter
-func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
+func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
-	return ssr.DialContextWithDialer(ctx, dialer.NewDialer(ssr.DialOptions()...), metadata)
+	return ssr.DialContextWithDialer(ctx, dialer.NewDialer(ssr.Base.DialOptions(opts...)...), metadata)
 }
 
 // DialContextWithDialer implements C.ProxyAdapter
@@ -83,6 +80,7 @@ func (ssr *ShadowSocksR) DialContextWithDialer(ctx context.Context, dialer C.Dia
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", ssr.addr, err)
 	}
+	N.TCPKeepAlive(c)
 
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
@@ -93,8 +91,8 @@ func (ssr *ShadowSocksR) DialContextWithDialer(ctx context.Context, dialer C.Dia
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (ssr *ShadowSocksR) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (ssr *ShadowSocksR) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	return ssr.ListenPacketWithDialer(ctx, dialer.NewDialer(ssr.DialOptions()...), metadata)
+	return ssr.ListenPacketWithDialer(ctx, dialer.NewDialer(ssr.Base.DialOptions(opts...)...), metadata)
 }
 
 // ListenPacketWithDialer implements C.ProxyAdapter
@@ -105,7 +103,7 @@ func (ssr *ShadowSocksR) ListenPacketWithDialer(ctx context.Context, dialer C.Di
 			return nil, err
 		}
 	}
-	addr, err := resolveUDPAddr(ctx, "udp", ssr.addr, ssr.prefer)
+	addr, err := resolveUDPAddrWithPrefer(ctx, "udp", ssr.addr, ssr.prefer)
 	if err != nil {
 		return nil, err
 	}
@@ -125,13 +123,6 @@ func (ssr *ShadowSocksR) SupportWithDialer() C.NetWork {
 	return C.ALLNet
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (ssr *ShadowSocksR) ProxyInfo() C.ProxyInfo {
-	info := ssr.Base.ProxyInfo()
-	info.DialerProxy = ssr.option.DialerProxy
-	return info
-}
-
 func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) {
 	// SSR protocol compatibility
 	// https://github.com/metacubex/mihomo/pull/2056
@@ -144,7 +135,7 @@ func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) {
 	password := option.Password
 	coreCiph, err := core.PickCipher(cipher, nil, password)
 	if err != nil {
-		return nil, fmt.Errorf("ssr %s cipher: %s initialize error: %w", addr, cipher, err)
+		return nil, fmt.Errorf("ssr %s initialize error: %w", addr, err)
 	}
 	var (
 		ivSize int

adapter/outbound/singmux.go

@@ -3,6 +3,7 @@ package outbound
 import (
 	"context"
 	"errors"
+	"runtime"
 
 	CN "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/component/dialer"
@@ -11,13 +12,14 @@ import (
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/log"
 
-	mux "github.com/metacubex/sing-mux"
+	mux "github.com/sagernet/sing-mux"
-	E "github.com/metacubex/sing/common/exceptions"
+	E "github.com/sagernet/sing/common/exceptions"
-	M "github.com/metacubex/sing/common/metadata"
+	M "github.com/sagernet/sing/common/metadata"
 )
 
 type SingMux struct {
-	ProxyAdapter
+	C.ProxyAdapter
+	base    ProxyBase
 	client  *mux.Client
 	dialer  proxydialer.SingDialer
 	onlyTcp bool
@@ -41,18 +43,26 @@ type BrutalOption struct {
 	Down    string `proxy:"down,omitempty"`
 }
 
-func (s *SingMux) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
+type ProxyBase interface {
+	DialOptions(opts ...dialer.Option) []dialer.Option
+}
+
+func (s *SingMux) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
+	options := s.base.DialOptions(opts...)
+	s.dialer.SetDialer(dialer.NewDialer(options...))
 	c, err := s.client.DialContext(ctx, "tcp", M.ParseSocksaddrHostPort(metadata.String(), metadata.DstPort))
 	if err != nil {
 		return nil, err
 	}
-	return NewConn(c, s), err
+	return NewConn(CN.NewRefConn(c, s), s.ProxyAdapter), err
 }
 
-func (s *SingMux) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
+func (s *SingMux) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
 	if s.onlyTcp {
-		return s.ProxyAdapter.ListenPacketContext(ctx, metadata)
+		return s.ProxyAdapter.ListenPacketContext(ctx, metadata, opts...)
 	}
+	options := s.base.DialOptions(opts...)
+	s.dialer.SetDialer(dialer.NewDialer(options...))
 
 	// sing-mux use stream-oriented udp with a special address, so we need a net.UDPAddr
 	if !metadata.Resolved() {
@@ -70,7 +80,7 @@ func (s *SingMux) ListenPacketContext(ctx context.Context, metadata *C.Metadata)
 	if pc == nil {
 		return nil, E.New("packetConn is nil")
 	}
-	return newPacketConn(CN.NewThreadSafePacketConn(pc), s), nil
+	return newPacketConn(CN.NewRefPacketConn(CN.NewThreadSafePacketConn(pc), s), s.ProxyAdapter), nil
 }
 
 func (s *SingMux) SupportUDP() bool {
@@ -87,25 +97,15 @@ func (s *SingMux) SupportUOT() bool {
 	return true
 }
 
-func (s *SingMux) ProxyInfo() C.ProxyInfo {
+func closeSingMux(s *SingMux) {
-	info := s.ProxyAdapter.ProxyInfo()
+	_ = s.client.Close()
-	info.SMUX = true
-	return info
 }
 
-// Close implements C.ProxyAdapter
+func NewSingMux(option SingMuxOption, proxy C.ProxyAdapter, base ProxyBase) (C.ProxyAdapter, error) {
-func (s *SingMux) Close() error {
-	if s.client != nil {
-		_ = s.client.Close()
-	}
-	return s.ProxyAdapter.Close()
-}
-
-func NewSingMux(option SingMuxOption, proxy ProxyAdapter) (ProxyAdapter, error) {
 	// TODO
 	// "TCP Brutal is only supported on Linux-based systems"
 
-	singDialer := proxydialer.NewSingDialer(proxy, dialer.NewDialer(proxy.DialOptions()...), option.Statistic)
+	singDialer := proxydialer.NewSingDialer(proxy, dialer.NewDialer(), option.Statistic)
 	client, err := mux.NewClient(mux.Options{
 		Dialer:         singDialer,
 		Logger:         log.SingLogger,
@@ -125,9 +125,11 @@ func NewSingMux(option SingMuxOption, proxy ProxyAdapter) (ProxyAdapter, error)
 	}
 	outbound := &SingMux{
 		ProxyAdapter: proxy,
+		base:         base,
 		client:       client,
 		dialer:       singDialer,
 		onlyTcp:      option.OnlyTcp,
 	}
+	runtime.SetFinalizer(outbound, closeSingMux)
 	return outbound, nil
 }

adapter/outbound/snell.go

@@ -42,7 +42,7 @@ type streamOption struct {
 	obfsOption *simpleObfsOption
 }
 
-func snellStreamConn(c net.Conn, option streamOption) *snell.Snell {
+func streamConn(c net.Conn, option streamOption) *snell.Snell {
 	switch option.obfsOption.Mode {
 	case "tls":
 		c = obfs.NewTLSObfs(c, option.obfsOption.Host)
@@ -55,41 +55,31 @@ func snellStreamConn(c net.Conn, option streamOption) *snell.Snell {
 
 // StreamConnContext implements C.ProxyAdapter
 func (s *Snell) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
-	c = snellStreamConn(c, streamOption{s.psk, s.version, s.addr, s.obfsOption})
+	c = streamConn(c, streamOption{s.psk, s.version, s.addr, s.obfsOption})
-	err := s.writeHeaderContext(ctx, c, metadata)
+	if metadata.NetWork == C.UDP {
+		err := snell.WriteUDPHeader(c, s.version)
+		return c, err
+	}
+	err := snell.WriteHeader(c, metadata.String(), uint(metadata.DstPort), s.version)
 	return c, err
 }
 
-func (s *Snell) writeHeaderContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (err error) {
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
-
-	if metadata.NetWork == C.UDP {
-		err = snell.WriteUDPHeader(c, s.version)
-		return
-	}
-	err = snell.WriteHeader(c, metadata.String(), uint(metadata.DstPort), s.version)
-	return
-}
-
 // DialContext implements C.ProxyAdapter
-func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
+func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
-	if s.version == snell.Version2 {
+	if s.version == snell.Version2 && len(opts) == 0 {
 		c, err := s.pool.Get()
 		if err != nil {
 			return nil, err
 		}
 
-		if err = s.writeHeaderContext(ctx, c, metadata); err != nil {
+		if err = snell.WriteHeader(c, metadata.String(), uint(metadata.DstPort), s.version); err != nil {
-			_ = c.Close()
+			c.Close()
 			return nil, err
 		}
 		return NewConn(c, s), err
 	}
 
-	return s.DialContextWithDialer(ctx, dialer.NewDialer(s.DialOptions()...), metadata)
+	return s.DialContextWithDialer(ctx, dialer.NewDialer(s.Base.DialOptions(opts...)...), metadata)
 }
 
 // DialContextWithDialer implements C.ProxyAdapter
@@ -104,6 +94,7 @@ func (s *Snell) DialContextWithDialer(ctx context.Context, dialer C.Dialer, meta
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", s.addr, err)
 	}
+	N.TCPKeepAlive(c)
 
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
@@ -114,8 +105,8 @@ 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) (C.PacketConn, error) {
+func (s *Snell) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	return s.ListenPacketWithDialer(ctx, dialer.NewDialer(s.DialOptions()...), metadata)
+	return s.ListenPacketWithDialer(ctx, dialer.NewDialer(s.Base.DialOptions(opts...)...), metadata)
 }
 
 // ListenPacketWithDialer implements C.ProxyAdapter
@@ -131,8 +122,13 @@ func (s *Snell) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, met
 	if err != nil {
 		return nil, err
 	}
+	N.TCPKeepAlive(c)
+	c = streamConn(c, streamOption{s.psk, s.version, s.addr, s.obfsOption})
 
-	c, err = s.StreamConnContext(ctx, c, metadata)
+	err = snell.WriteUDPHeader(c, s.version)
+	if err != nil {
+		return nil, err
+	}
 
 	pc := snell.PacketConn(c)
 	return newPacketConn(pc, s), nil
@@ -148,13 +144,6 @@ func (s *Snell) SupportUOT() bool {
 	return true
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (s *Snell) ProxyInfo() C.ProxyInfo {
-	info := s.Base.ProxyInfo()
-	info.DialerProxy = s.option.DialerProxy
-	return info
-}
-
 func NewSnell(option SnellOption) (*Snell, error) {
 	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
 	psk := []byte(option.Psk)
@@ -207,7 +196,7 @@ func NewSnell(option SnellOption) (*Snell, error) {
 	if option.Version == snell.Version2 {
 		s.pool = snell.NewPool(func(ctx context.Context) (*snell.Snell, error) {
 			var err error
-			var cDialer C.Dialer = dialer.NewDialer(s.DialOptions()...)
+			var cDialer C.Dialer = dialer.NewDialer(s.Base.DialOptions()...)
 			if len(s.option.DialerProxy) > 0 {
 				cDialer, err = proxydialer.NewByName(s.option.DialerProxy, cDialer)
 				if err != nil {
@@ -219,7 +208,8 @@ func NewSnell(option SnellOption) (*Snell, error) {
 				return nil, err
 			}
 
-			return snellStreamConn(c, streamOption{psk, option.Version, addr, obfsOption}), nil
+			N.TCPKeepAlive(c)
+			return streamConn(c, streamOption{psk, option.Version, addr, obfsOption}), nil
 		})
 	}
 	return s, nil

adapter/outbound/socks5.go

@@ -59,15 +59,15 @@ func (ss *Socks5) StreamConnContext(ctx context.Context, c net.Conn, metadata *C
 			Password: ss.pass,
 		}
 	}
-	if _, err := ss.clientHandshakeContext(ctx, c, serializesSocksAddr(metadata), socks5.CmdConnect, user); err != nil {
+	if _, err := socks5.ClientHandshake(c, serializesSocksAddr(metadata), socks5.CmdConnect, user); err != nil {
 		return nil, err
 	}
 	return c, nil
 }
 
 // DialContext implements C.ProxyAdapter
-func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
+func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
-	return ss.DialContextWithDialer(ctx, dialer.NewDialer(ss.DialOptions()...), metadata)
+	return ss.DialContextWithDialer(ctx, dialer.NewDialer(ss.Base.DialOptions(opts...)...), metadata)
 }
 
 // DialContextWithDialer implements C.ProxyAdapter
@@ -82,6 +82,7 @@ func (ss *Socks5) DialContextWithDialer(ctx context.Context, dialer C.Dialer, me
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
 	}
+	N.TCPKeepAlive(c)
 
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
@@ -101,8 +102,8 @@ func (ss *Socks5) SupportWithDialer() C.NetWork {
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
+func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
-	var cDialer C.Dialer = dialer.NewDialer(ss.DialOptions()...)
+	var cDialer C.Dialer = dialer.NewDialer(ss.Base.DialOptions(opts...)...)
 	if len(ss.option.DialerProxy) > 0 {
 		cDialer, err = proxydialer.NewByName(ss.option.DialerProxy, cDialer)
 		if err != nil {
@@ -127,6 +128,7 @@ func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata)
 		safeConnClose(c, err)
 	}(c)
 
+	N.TCPKeepAlive(c)
 	var user *socks5.User
 	if ss.user != "" {
 		user = &socks5.User{
@@ -136,7 +138,7 @@ func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata)
 	}
 
 	udpAssocateAddr := socks5.AddrFromStdAddrPort(netip.AddrPortFrom(netip.IPv4Unspecified(), 0))
-	bindAddr, err := ss.clientHandshakeContext(ctx, c, udpAssocateAddr, socks5.CmdUDPAssociate, user)
+	bindAddr, err := socks5.ClientHandshake(c, udpAssocateAddr, socks5.CmdUDPAssociate, user)
 	if err != nil {
 		err = fmt.Errorf("client hanshake error: %w", err)
 		return
@@ -148,7 +150,7 @@ func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata)
 		err = errors.New("invalid UDP bind address")
 		return
 	} else if bindUDPAddr.IP.IsUnspecified() {
-		serverAddr, err := resolveUDPAddr(ctx, "udp", ss.Addr(), C.IPv4Prefer)
+		serverAddr, err := resolveUDPAddr(ctx, "udp", ss.Addr())
 		if err != nil {
 			return nil, err
 		}
@@ -172,21 +174,6 @@ func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata)
 	return newPacketConn(&socksPacketConn{PacketConn: pc, rAddr: bindUDPAddr, tcpConn: c}, ss), nil
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (ss *Socks5) ProxyInfo() C.ProxyInfo {
-	info := ss.Base.ProxyInfo()
-	info.DialerProxy = ss.option.DialerProxy
-	return info
-}
-
-func (ss *Socks5) clientHandshakeContext(ctx context.Context, c net.Conn, addr socks5.Addr, command socks5.Command, user *socks5.User) (_ socks5.Addr, err error) {
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
-	return socks5.ClientHandshake(c, addr, command, user)
-}
-
 func NewSocks5(option Socks5Option) (*Socks5, error) {
 	var tlsConfig *tls.Config
 	if option.TLS {

adapter/outbound/ssh.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -16,7 +17,7 @@ import (
 	"github.com/metacubex/mihomo/component/proxydialer"
 	C "github.com/metacubex/mihomo/constant"
 
-	"github.com/metacubex/randv2"
+	"github.com/zhangyunhao116/fastrand"
 	"golang.org/x/crypto/ssh"
 )
 
@@ -24,10 +25,7 @@ type Ssh struct {
 	*Base
 
 	option *SshOption
-
+	client *sshClient // using a standalone struct to avoid its inner loop invalidate the Finalizer
-	config *ssh.ClientConfig
-	client *ssh.Client
-	cMutex sync.Mutex
 }
 
 type SshOption struct {
@@ -43,15 +41,15 @@ type SshOption struct {
 	HostKeyAlgorithms    []string `proxy:"host-key-algorithms,omitempty"`
 }
 
-func (s *Ssh) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
+func (s *Ssh) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
-	var cDialer C.Dialer = dialer.NewDialer(s.DialOptions()...)
+	var cDialer C.Dialer = dialer.NewDialer(s.Base.DialOptions(opts...)...)
 	if len(s.option.DialerProxy) > 0 {
 		cDialer, err = proxydialer.NewByName(s.option.DialerProxy, cDialer)
 		if err != nil {
 			return nil, err
 		}
 	}
-	client, err := s.connect(ctx, cDialer, s.addr)
+	client, err := s.client.connect(ctx, cDialer, s.addr)
 	if err != nil {
 		return nil, err
 	}
@@ -60,10 +58,16 @@ func (s *Ssh) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn,
 		return nil, err
 	}
 
-	return NewConn(c, s), nil
+	return NewConn(N.NewRefConn(c, s), s), nil
 }
 
-func (s *Ssh) connect(ctx context.Context, cDialer C.Dialer, addr string) (client *ssh.Client, err error) {
+type sshClient struct {
+	config *ssh.ClientConfig
+	client *ssh.Client
+	cMutex sync.Mutex
+}
+
+func (s *sshClient) connect(ctx context.Context, cDialer C.Dialer, addr string) (client *ssh.Client, err error) {
 	s.cMutex.Lock()
 	defer s.cMutex.Unlock()
 	if s.client != nil {
@@ -73,6 +77,7 @@ func (s *Ssh) connect(ctx context.Context, cDialer C.Dialer, addr string) (clien
 	if err != nil {
 		return nil, err
 	}
+	N.TCPKeepAlive(c)
 
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
@@ -104,15 +109,7 @@ func (s *Ssh) connect(ctx context.Context, cDialer C.Dialer, addr string) (clien
 	return client, nil
 }
 
-// ProxyInfo implements C.ProxyAdapter
+func (s *sshClient) Close() error {
-func (s *Ssh) ProxyInfo() C.ProxyInfo {
-	info := s.Base.ProxyInfo()
-	info.DialerProxy = s.option.DialerProxy
-	return info
-}
-
-// Close implements C.ProxyAdapter
-func (s *Ssh) Close() error {
 	s.cMutex.Lock()
 	defer s.cMutex.Unlock()
 	if s.client != nil {
@@ -121,6 +118,10 @@ func (s *Ssh) Close() error {
 	return nil
 }
 
+func closeSsh(s *Ssh) {
+	_ = s.client.Close()
+}
+
 func NewSsh(option SshOption) (*Ssh, error) {
 	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
 
@@ -136,11 +137,7 @@ func NewSsh(option SshOption) (*Ssh, error) {
 		if strings.Contains(option.PrivateKey, "PRIVATE KEY") {
 			b = []byte(option.PrivateKey)
 		} else {
-			path := C.Path.Resolve(option.PrivateKey)
+			b, err = os.ReadFile(C.Path.Resolve(option.PrivateKey))
-			if !C.Path.IsSafePath(path) {
-				return nil, fmt.Errorf("path is not subpath of home directory: %s", path)
-			}
-			b, err = os.ReadFile(path)
 			if err != nil {
 				return nil, err
 			}
@@ -183,10 +180,10 @@ func NewSsh(option SshOption) (*Ssh, error) {
 	}
 
 	version := "SSH-2.0-OpenSSH_"
-	if randv2.IntN(2) == 0 {
+	if fastrand.Intn(2) == 0 {
-		version += "7." + strconv.Itoa(randv2.IntN(10))
+		version += "7." + strconv.Itoa(fastrand.Intn(10))
 	} else {
-		version += "8." + strconv.Itoa(randv2.IntN(9))
+		version += "8." + strconv.Itoa(fastrand.Intn(9))
 	}
 	config.ClientVersion = version
 
@@ -201,8 +198,11 @@ func NewSsh(option SshOption) (*Ssh, error) {
 			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		option: &option,
-		config: &config,
+		client: &sshClient{
+			config: &config,
+		},
 	}
+	runtime.SetFinalizer(outbound, closeSsh)
 
 	return outbound, nil
 }

adapter/outbound/trojan.go

@@ -3,7 +3,6 @@ package outbound
 import (
 	"context"
 	"crypto/tls"
-	"errors"
 	"fmt"
 	"net"
 	"net/http"
@@ -16,15 +15,13 @@ import (
 	tlsC "github.com/metacubex/mihomo/component/tls"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/transport/gun"
-	"github.com/metacubex/mihomo/transport/shadowsocks/core"
 	"github.com/metacubex/mihomo/transport/trojan"
-	"github.com/metacubex/mihomo/transport/vmess"
 )
 
 type Trojan struct {
 	*Base
-	option      *TrojanOption
+	instance *trojan.Trojan
-	hexPassword [trojan.KeyLength]byte
+	option   *TrojanOption
 
 	// for gun mux
 	gunTLSConfig *tls.Config
@@ -32,8 +29,6 @@ type Trojan struct {
 	transport    *gun.TransportWrap
 
 	realityConfig *tlsC.RealityConfig
-
-	ssCipher core.Cipher
 }
 
 type TrojanOption struct {
@@ -51,32 +46,18 @@ type TrojanOption struct {
 	RealityOpts       RealityOptions `proxy:"reality-opts,omitempty"`
 	GrpcOpts          GrpcOptions    `proxy:"grpc-opts,omitempty"`
 	WSOpts            WSOptions      `proxy:"ws-opts,omitempty"`
-	SSOpts            TrojanSSOption `proxy:"ss-opts,omitempty"`
 	ClientFingerprint string         `proxy:"client-fingerprint,omitempty"`
 }
 
-// TrojanSSOption from https://github.com/p4gefau1t/trojan-go/blob/v0.10.6/tunnel/shadowsocks/config.go#L5
+func (t *Trojan) plainStream(ctx context.Context, c net.Conn) (net.Conn, error) {
-type TrojanSSOption struct {
+	if t.option.Network == "ws" {
-	Enabled  bool   `proxy:"enabled,omitempty"`
-	Method   string `proxy:"method,omitempty"`
-	Password string `proxy:"password,omitempty"`
-}
-
-// StreamConnContext implements C.ProxyAdapter
-func (t *Trojan) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ net.Conn, err error) {
-	switch t.option.Network {
-	case "ws":
 		host, port, _ := net.SplitHostPort(t.addr)
-
+		wsOpts := &trojan.WebsocketOption{
-		wsOpts := &vmess.WebsocketConfig{
 			Host:                     host,
 			Port:                     port,
 			Path:                     t.option.WSOpts.Path,
-			MaxEarlyData:             t.option.WSOpts.MaxEarlyData,
-			EarlyDataHeaderName:      t.option.WSOpts.EarlyDataHeaderName,
 			V2rayHttpUpgrade:         t.option.WSOpts.V2rayHttpUpgrade,
 			V2rayHttpUpgradeFastOpen: t.option.WSOpts.V2rayHttpUpgradeFastOpen,
-			ClientFingerprint:        t.option.ClientFingerprint,
 			Headers:                  http.Header{},
 		}
 
@@ -90,101 +71,55 @@ func (t *Trojan) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.
 			}
 		}
 
-		alpn := trojan.DefaultWebsocketALPN
+		return t.instance.StreamWebsocketConn(ctx, c, wsOpts)
-		if len(t.option.ALPN) != 0 {
-			alpn = t.option.ALPN
-		}
-
-		wsOpts.TLS = true
-		tlsConfig := &tls.Config{
-			NextProtos:         alpn,
-			MinVersion:         tls.VersionTLS12,
-			InsecureSkipVerify: t.option.SkipCertVerify,
-			ServerName:         t.option.SNI,
-		}
-
-		wsOpts.TLSConfig, err = ca.GetSpecifiedFingerprintTLSConfig(tlsConfig, t.option.Fingerprint)
-		if err != nil {
-			return nil, err
-		}
-
-		c, err = vmess.StreamWebsocketConn(ctx, c, wsOpts)
-	case "grpc":
-		c, err = gun.StreamGunWithConn(c, t.gunTLSConfig, t.gunConfig, t.realityConfig)
-	default:
-		// default tcp network
-		// handle TLS
-		alpn := trojan.DefaultALPN
-		if len(t.option.ALPN) != 0 {
-			alpn = t.option.ALPN
-		}
-		c, err = vmess.StreamTLSConn(ctx, c, &vmess.TLSConfig{
-			Host:              t.option.SNI,
-			SkipCertVerify:    t.option.SkipCertVerify,
-			FingerPrint:       t.option.Fingerprint,
-			ClientFingerprint: t.option.ClientFingerprint,
-			NextProtos:        alpn,
-			Reality:           t.realityConfig,
-		})
 	}
+
+	return t.instance.StreamConn(ctx, c)
+}
+
+// StreamConnContext implements C.ProxyAdapter
+func (t *Trojan) StreamConnContext(ctx context.Context, 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, t.realityConfig)
+	} else {
+		c, err = t.plainStream(ctx, c)
+	}
+
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
 	}
 
-	return t.streamConnContext(ctx, c, metadata)
-}
-
-func (t *Trojan) streamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ net.Conn, err error) {
-	if t.ssCipher != nil {
-		c = t.ssCipher.StreamConn(c)
-	}
-
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
-	command := trojan.CommandTCP
 	if metadata.NetWork == C.UDP {
-		command = trojan.CommandUDP
+		err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata))
+		return c, err
 	}
-	err = trojan.WriteHeader(c, t.hexPassword, command, serializesSocksAddr(metadata))
+	err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
 	return c, err
 }
 
-func (t *Trojan) writeHeaderContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (err error) {
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
-	command := trojan.CommandTCP
-	if metadata.NetWork == C.UDP {
-		command = trojan.CommandUDP
-	}
-	err = trojan.WriteHeader(c, t.hexPassword, command, serializesSocksAddr(metadata))
-	return err
-}
-
 // DialContext implements C.ProxyAdapter
-func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
+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 {
+	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
 		}
-		defer func(c net.Conn) {
-			safeConnClose(c, err)
-		}(c)
 
-		c, err = t.streamConnContext(ctx, c, metadata)
+		if err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata)); err != nil {
-		if err != nil {
+			c.Close()
 			return nil, err
 		}
 
 		return NewConn(c, t), nil
 	}
-	return t.DialContextWithDialer(ctx, dialer.NewDialer(t.DialOptions()...), metadata)
+	return t.DialContextWithDialer(ctx, dialer.NewDialer(t.Base.DialOptions(opts...)...), metadata)
 }
 
 // DialContextWithDialer implements C.ProxyAdapter
@@ -199,6 +134,7 @@ func (t *Trojan) DialContextWithDialer(ctx context.Context, dialer C.Dialer, met
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
 	}
+	N.TCPKeepAlive(c)
 
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
@@ -213,11 +149,11 @@ func (t *Trojan) DialContextWithDialer(ctx context.Context, dialer C.Dialer, met
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (t *Trojan) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
+func (t *Trojan) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
 	var c net.Conn
 
 	// grpc transport
-	if t.transport != nil {
+	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)
@@ -225,16 +161,15 @@ func (t *Trojan) ListenPacketContext(ctx context.Context, metadata *C.Metadata)
 		defer func(c net.Conn) {
 			safeConnClose(c, err)
 		}(c)
-
+		err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata))
-		c, err = t.streamConnContext(ctx, c, metadata)
 		if err != nil {
 			return nil, err
 		}
 
-		pc := trojan.NewPacketConn(c)
+		pc := t.instance.PacketConn(c)
 		return newPacketConn(pc, t), err
 	}
-	return t.ListenPacketWithDialer(ctx, dialer.NewDialer(t.DialOptions()...), metadata)
+	return t.ListenPacketWithDialer(ctx, dialer.NewDialer(t.Base.DialOptions(opts...)...), metadata)
 }
 
 // ListenPacketWithDialer implements C.ProxyAdapter
@@ -252,12 +187,18 @@ func (t *Trojan) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, me
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
 	}(c)
-	c, err = t.StreamConnContext(ctx, c, metadata)
+	N.TCPKeepAlive(c)
+	c, err = t.plainStream(ctx, c)
+	if err != nil {
+		return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
+	}
+
+	err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata))
 	if err != nil {
 		return nil, err
 	}
 
-	pc := trojan.NewPacketConn(c)
+	pc := t.instance.PacketConn(c)
 	return newPacketConn(pc, t), err
 }
 
@@ -268,7 +209,7 @@ func (t *Trojan) SupportWithDialer() C.NetWork {
 
 // ListenPacketOnStreamConn implements C.ProxyAdapter
 func (t *Trojan) ListenPacketOnStreamConn(c net.Conn, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	pc := trojan.NewPacketConn(c)
+	pc := t.instance.PacketConn(c)
 	return newPacketConn(pc, t), err
 }
 
@@ -277,26 +218,20 @@ func (t *Trojan) SupportUOT() bool {
 	return true
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (t *Trojan) ProxyInfo() C.ProxyInfo {
-	info := t.Base.ProxyInfo()
-	info.DialerProxy = t.option.DialerProxy
-	return info
-}
-
-// Close implements C.ProxyAdapter
-func (t *Trojan) Close() error {
-	if t.transport != nil {
-		return t.transport.Close()
-	}
-	return nil
-}
-
 func NewTrojan(option TrojanOption) (*Trojan, error) {
 	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
 
-	if option.SNI == "" {
+	tOption := &trojan.Option{
-		option.SNI = option.Server
+		Password:          option.Password,
+		ALPN:              option.ALPN,
+		ServerName:        option.Server,
+		SkipCertVerify:    option.SkipCertVerify,
+		Fingerprint:       option.Fingerprint,
+		ClientFingerprint: option.ClientFingerprint,
+	}
+
+	if option.SNI != "" {
+		tOption.ServerName = option.SNI
 	}
 
 	t := &Trojan{
@@ -311,8 +246,8 @@ func NewTrojan(option TrojanOption) (*Trojan, error) {
 			rmark:  option.RoutingMark,
 			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
-		option:      &option,
+		instance: trojan.New(tOption),
-		hexPassword: trojan.Key(option.Password),
+		option:   &option,
 	}
 
 	var err error
@@ -320,43 +255,31 @@ func NewTrojan(option TrojanOption) (*Trojan, error) {
 	if err != nil {
 		return nil, err
 	}
-
+	tOption.Reality = t.realityConfig
-	if option.SSOpts.Enabled {
-		if option.SSOpts.Password == "" {
-			return nil, errors.New("empty password")
-		}
-		if option.SSOpts.Method == "" {
-			option.SSOpts.Method = "AES-128-GCM"
-		}
-		ciph, err := core.PickCipher(option.SSOpts.Method, nil, option.SSOpts.Password)
-		if err != nil {
-			return nil, err
-		}
-		t.ssCipher = ciph
-	}
 
 	if option.Network == "grpc" {
-		dialFn := func(ctx context.Context, network, addr string) (net.Conn, error) {
+		dialFn := func(network, addr string) (net.Conn, error) {
 			var err error
-			var cDialer C.Dialer = dialer.NewDialer(t.DialOptions()...)
+			var cDialer C.Dialer = dialer.NewDialer(t.Base.DialOptions()...)
 			if len(t.option.DialerProxy) > 0 {
 				cDialer, err = proxydialer.NewByName(t.option.DialerProxy, cDialer)
 				if err != nil {
 					return nil, err
 				}
 			}
-			c, err := cDialer.DialContext(ctx, "tcp", t.addr)
+			c, err := cDialer.DialContext(context.Background(), "tcp", t.addr)
 			if err != nil {
 				return nil, fmt.Errorf("%s connect error: %s", t.addr, err.Error())
 			}
+			N.TCPKeepAlive(c)
 			return c, nil
 		}
 
 		tlsConfig := &tls.Config{
 			NextProtos:         option.ALPN,
 			MinVersion:         tls.VersionTLS12,
-			InsecureSkipVerify: option.SkipCertVerify,
+			InsecureSkipVerify: tOption.SkipCertVerify,
-			ServerName:         option.SNI,
+			ServerName:         tOption.ServerName,
 		}
 
 		var err error
@@ -365,13 +288,12 @@ func NewTrojan(option TrojanOption) (*Trojan, error) {
 			return nil, err
 		}
 
-		t.transport = gun.NewHTTP2Client(dialFn, tlsConfig, option.ClientFingerprint, t.realityConfig)
+		t.transport = gun.NewHTTP2Client(dialFn, tlsConfig, tOption.ClientFingerprint, t.realityConfig)
 
 		t.gunTLSConfig = tlsConfig
 		t.gunConfig = &gun.Config{
-			ServiceName:       option.GrpcOpts.GrpcServiceName,
+			ServiceName: option.GrpcOpts.GrpcServiceName,
-			Host:              option.SNI,
+			Host:        tOption.ServerName,
-			ClientFingerprint: option.ClientFingerprint,
 		}
 	}
 

adapter/outbound/tuic.go

@@ -14,14 +14,13 @@ import (
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/proxydialer"
 	"github.com/metacubex/mihomo/component/resolver"
-	tlsC "github.com/metacubex/mihomo/component/tls"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/transport/tuic"
 
 	"github.com/gofrs/uuid/v5"
 	"github.com/metacubex/quic-go"
-	M "github.com/metacubex/sing/common/metadata"
+	M "github.com/sagernet/sing/common/metadata"
-	"github.com/metacubex/sing/common/uot"
+	"github.com/sagernet/sing/common/uot"
 )
 
 type Tuic struct {
@@ -66,8 +65,8 @@ type TuicOption struct {
 }
 
 // DialContext implements C.ProxyAdapter
-func (t *Tuic) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
+func (t *Tuic) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
-	return t.DialContextWithDialer(ctx, dialer.NewDialer(t.DialOptions()...), metadata)
+	return t.DialContextWithDialer(ctx, dialer.NewDialer(t.Base.DialOptions(opts...)...), metadata)
 }
 
 // DialContextWithDialer implements C.ProxyAdapter
@@ -80,8 +79,8 @@ func (t *Tuic) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metad
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (t *Tuic) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
+func (t *Tuic) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
-	return t.ListenPacketWithDialer(ctx, dialer.NewDialer(t.DialOptions()...), metadata)
+	return t.ListenPacketWithDialer(ctx, dialer.NewDialer(t.Base.DialOptions(opts...)...), metadata)
 }
 
 // ListenPacketWithDialer implements C.ProxyAdapter
@@ -131,7 +130,7 @@ func (t *Tuic) dialWithDialer(ctx context.Context, dialer C.Dialer) (transport *
 			return nil, nil, err
 		}
 	}
-	udpAddr, err := resolveUDPAddr(ctx, "udp", t.addr, t.prefer)
+	udpAddr, err := resolveUDPAddrWithPrefer(ctx, "udp", t.addr, t.prefer)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -147,13 +146,6 @@ func (t *Tuic) dialWithDialer(ctx context.Context, dialer C.Dialer) (transport *
 	return
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (t *Tuic) ProxyInfo() C.ProxyInfo {
-	info := t.Base.ProxyInfo()
-	info.DialerProxy = t.option.DialerProxy
-	return info
-}
-
 func NewTuic(option TuicOption) (*Tuic, error) {
 	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
 	serverName := option.Server
@@ -285,7 +277,7 @@ func NewTuic(option TuicOption) (*Tuic, error) {
 	if len(option.Token) > 0 {
 		tkn := tuic.GenTKN(option.Token)
 		clientOption := &tuic.ClientOptionV4{
-			TlsConfig:             tlsC.UConfig(tlsConfig),
+			TlsConfig:             tlsConfig,
 			QuicConfig:            quicConfig,
 			Token:                 tkn,
 			UdpRelayMode:          udpRelayMode,
@@ -305,7 +297,7 @@ func NewTuic(option TuicOption) (*Tuic, error) {
 			maxUdpRelayPacketSize = tuic.MaxFragSizeV5
 		}
 		clientOption := &tuic.ClientOptionV5{
-			TlsConfig:             tlsC.UConfig(tlsConfig),
+			TlsConfig:             tlsConfig,
 			QuicConfig:            quicConfig,
 			Uuid:                  uuid.FromStringOrNil(option.UUID),
 			Password:              option.Password,

adapter/outbound/util.go

@@ -3,59 +3,118 @@ package outbound
 import (
 	"bytes"
 	"context"
+	"crypto/tls"
 	"fmt"
 	"net"
 	"net/netip"
 	"regexp"
 	"strconv"
+	"sync"
 
 	"github.com/metacubex/mihomo/component/resolver"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/transport/socks5"
 )
 
+var (
+	globalClientSessionCache tls.ClientSessionCache
+	once                     sync.Once
+)
+
+func getClientSessionCache() tls.ClientSessionCache {
+	once.Do(func() {
+		globalClientSessionCache = tls.NewLRUClientSessionCache(128)
+	})
+	return globalClientSessionCache
+}
+
 func serializesSocksAddr(metadata *C.Metadata) []byte {
 	var buf [][]byte
 	addrType := metadata.AddrType()
+	aType := uint8(addrType)
 	p := uint(metadata.DstPort)
 	port := []byte{uint8(p >> 8), uint8(p & 0xff)}
 	switch addrType {
-	case C.AtypDomainName:
+	case socks5.AtypDomainName:
 		lenM := uint8(len(metadata.Host))
 		host := []byte(metadata.Host)
-		buf = [][]byte{{socks5.AtypDomainName, lenM}, host, port}
+		buf = [][]byte{{aType, lenM}, host, port}
-	case C.AtypIPv4:
+	case socks5.AtypIPv4:
 		host := metadata.DstIP.AsSlice()
-		buf = [][]byte{{socks5.AtypIPv4}, host, port}
+		buf = [][]byte{{aType}, host, port}
-	case C.AtypIPv6:
+	case socks5.AtypIPv6:
 		host := metadata.DstIP.AsSlice()
-		buf = [][]byte{{socks5.AtypIPv6}, host, port}
+		buf = [][]byte{{aType}, host, port}
 	}
 	return bytes.Join(buf, nil)
 }
 
-func resolveUDPAddr(ctx context.Context, network, address string, prefer C.DNSPrefer) (*net.UDPAddr, error) {
+func resolveUDPAddr(ctx context.Context, network, address string) (*net.UDPAddr, error) {
+	host, port, err := net.SplitHostPort(address)
+	if err != nil {
+		return nil, err
+	}
+
+	ip, err := resolver.ResolveProxyServerHost(ctx, 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.ResolveIPv4WithResolver(ctx, host, resolver.ProxyServerHostResolver)
+		ip, err = resolver.ResolveIPv4ProxyServerHost(ctx, host)
 	case C.IPv6Only:
-		ip, err = resolver.ResolveIPv6WithResolver(ctx, host, resolver.ProxyServerHostResolver)
+		ip, err = resolver.ResolveIPv6ProxyServerHost(ctx, host)
 	case C.IPv6Prefer:
-		ip, err = resolver.ResolveIPPrefer6WithResolver(ctx, host, resolver.ProxyServerHostResolver)
+		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:
-		ip, err = resolver.ResolveIPWithResolver(ctx, host, resolver.ProxyServerHostResolver)
+		// 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
 	}
-
-	ip, port = resolver.LookupIP4P(ip, port)
 	return net.ResolveUDPAddr(network, net.JoinHostPort(ip.String(), port))
 }
 

adapter/outbound/vless.go

@@ -21,13 +21,15 @@ import (
 	"github.com/metacubex/mihomo/component/resolver"
 	tlsC "github.com/metacubex/mihomo/component/tls"
 	C "github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/transport/gun"
+	"github.com/metacubex/mihomo/transport/socks5"
 	"github.com/metacubex/mihomo/transport/vless"
 	"github.com/metacubex/mihomo/transport/vmess"
 
 	vmessSing "github.com/metacubex/sing-vmess"
 	"github.com/metacubex/sing-vmess/packetaddr"
-	M "github.com/metacubex/sing/common/metadata"
+	M "github.com/sagernet/sing/common/metadata"
 )
 
 const (
@@ -75,7 +77,13 @@ type VlessOption struct {
 	ClientFingerprint string            `proxy:"client-fingerprint,omitempty"`
 }
 
-func (v *Vless) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ net.Conn, err error) {
+func (v *Vless) StreamConnContext(ctx context.Context, 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":
 		host, port, _ := net.SplitHostPort(v.addr)
@@ -149,7 +157,7 @@ func (v *Vless) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			Path:  v.option.HTTP2Opts.Path,
 		}
 
-		c, err = vmess.StreamH2Conn(ctx, c, h2Opts)
+		c, err = vmess.StreamH2Conn(c, h2Opts)
 	case "grpc":
 		c, err = gun.StreamGunWithConn(c, v.gunTLSConfig, v.gunConfig, v.realityConfig)
 	default:
@@ -162,14 +170,10 @@ func (v *Vless) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 		return nil, err
 	}
 
-	return v.streamConnContext(ctx, c, metadata)
+	return v.streamConn(c, metadata)
 }
 
-func (v *Vless) streamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (conn net.Conn, err error) {
+func (v *Vless) streamConn(c net.Conn, metadata *C.Metadata) (conn net.Conn, err error) {
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
 	if metadata.NetWork == C.UDP {
 		if v.option.PacketAddr {
 			metadata = &C.Metadata{
@@ -225,11 +229,10 @@ func (v *Vless) streamTLSConn(ctx context.Context, conn net.Conn, isH2 bool) (ne
 }
 
 // DialContext implements C.ProxyAdapter
-func (v *Vless) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
+func (v *Vless) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
-	var c net.Conn
 	// gun transport
-	if v.transport != nil {
+	if v.transport != nil && len(opts) == 0 {
-		c, err = gun.StreamGunWithTransport(v.transport, v.gunConfig)
+		c, err := gun.StreamGunWithTransport(v.transport, v.gunConfig)
 		if err != nil {
 			return nil, err
 		}
@@ -237,14 +240,14 @@ func (v *Vless) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn
 			safeConnClose(c, err)
 		}(c)
 
-		c, err = v.streamConnContext(ctx, c, metadata)
+		c, err = v.client.StreamConn(c, parseVlessAddr(metadata, v.option.XUDP))
 		if err != nil {
 			return nil, err
 		}
 
 		return NewConn(c, v), nil
 	}
-	return v.DialContextWithDialer(ctx, dialer.NewDialer(v.DialOptions()...), metadata)
+	return v.DialContextWithDialer(ctx, dialer.NewDialer(v.Base.DialOptions(opts...)...), metadata)
 }
 
 // DialContextWithDialer implements C.ProxyAdapter
@@ -259,6 +262,7 @@ func (v *Vless) DialContextWithDialer(ctx context.Context, dialer C.Dialer, meta
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 	}
+	N.TCPKeepAlive(c)
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
 	}(c)
@@ -271,7 +275,7 @@ func (v *Vless) DialContextWithDialer(ctx context.Context, dialer C.Dialer, meta
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (v *Vless) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
+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
 	if !metadata.Resolved() {
 		ip, err := resolver.ResolveIP(ctx, metadata.Host)
@@ -282,7 +286,7 @@ func (v *Vless) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (
 	}
 	var c net.Conn
 	// gun transport
-	if v.transport != nil {
+	if v.transport != nil && len(opts) == 0 {
 		c, err = gun.StreamGunWithTransport(v.transport, v.gunConfig)
 		if err != nil {
 			return nil, err
@@ -291,14 +295,14 @@ func (v *Vless) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (
 			safeConnClose(c, err)
 		}(c)
 
-		c, err = v.streamConnContext(ctx, c, metadata)
+		c, err = v.streamConn(c, metadata)
 		if err != nil {
 			return nil, fmt.Errorf("new vless client error: %v", err)
 		}
 
 		return v.ListenPacketOnStreamConn(ctx, c, metadata)
 	}
-	return v.ListenPacketWithDialer(ctx, dialer.NewDialer(v.DialOptions()...), metadata)
+	return v.ListenPacketWithDialer(ctx, dialer.NewDialer(v.Base.DialOptions(opts...)...), metadata)
 }
 
 // ListenPacketWithDialer implements C.ProxyAdapter
@@ -323,6 +327,7 @@ func (v *Vless) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, met
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 	}
+	N.TCPKeepAlive(c)
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
 	}(c)
@@ -376,34 +381,19 @@ func (v *Vless) SupportUOT() bool {
 	return true
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (v *Vless) ProxyInfo() C.ProxyInfo {
-	info := v.Base.ProxyInfo()
-	info.DialerProxy = v.option.DialerProxy
-	return info
-}
-
-// Close implements C.ProxyAdapter
-func (v *Vless) Close() error {
-	if v.transport != nil {
-		return v.transport.Close()
-	}
-	return nil
-}
-
 func parseVlessAddr(metadata *C.Metadata, xudp bool) *vless.DstAddr {
 	var addrType byte
 	var addr []byte
 	switch metadata.AddrType() {
-	case C.AtypIPv4:
+	case socks5.AtypIPv4:
 		addrType = vless.AtypIPv4
 		addr = make([]byte, net.IPv4len)
 		copy(addr[:], metadata.DstIP.AsSlice())
-	case C.AtypIPv6:
+	case socks5.AtypIPv6:
 		addrType = vless.AtypIPv6
 		addr = make([]byte, net.IPv6len)
 		copy(addr[:], metadata.DstIP.AsSlice())
-	case C.AtypDomainName:
+	case socks5.AtypDomainName:
 		addrType = vless.AtypDomainName
 		addr = make([]byte, len(metadata.Host)+1)
 		addr[0] = byte(len(metadata.Host))
@@ -515,12 +505,17 @@ func NewVless(option VlessOption) (*Vless, error) {
 	var addons *vless.Addons
 	if option.Network != "ws" && len(option.Flow) >= 16 {
 		option.Flow = option.Flow[:16]
-		if option.Flow != vless.XRV {
+		switch option.Flow {
+		case vless.XRV:
+			log.Warnln("To use %s, ensure your server is upgrade to Xray-core v1.8.0+", vless.XRV)
+			addons = &vless.Addons{
+				Flow: option.Flow,
+			}
+		case vless.XRO, vless.XRD, vless.XRS:
+			log.Fatalln("Legacy XTLS protocol %s is deprecated and no longer supported", option.Flow)
+		default:
 			return nil, fmt.Errorf("unsupported xtls flow type: %s", option.Flow)
 		}
-		addons = &vless.Addons{
-			Flow: option.Flow,
-		}
 	}
 
 	switch option.PacketEncoding {
@@ -569,19 +564,20 @@ func NewVless(option VlessOption) (*Vless, error) {
 			option.HTTP2Opts.Host = append(option.HTTP2Opts.Host, "www.example.com")
 		}
 	case "grpc":
-		dialFn := func(ctx context.Context, network, addr string) (net.Conn, error) {
+		dialFn := func(network, addr string) (net.Conn, error) {
 			var err error
-			var cDialer C.Dialer = dialer.NewDialer(v.DialOptions()...)
+			var cDialer C.Dialer = dialer.NewDialer(v.Base.DialOptions()...)
 			if len(v.option.DialerProxy) > 0 {
 				cDialer, err = proxydialer.NewByName(v.option.DialerProxy, cDialer)
 				if err != nil {
 					return nil, err
 				}
 			}
-			c, err := cDialer.DialContext(ctx, "tcp", v.addr)
+			c, err := cDialer.DialContext(context.Background(), "tcp", v.addr)
 			if err != nil {
 				return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 			}
+			N.TCPKeepAlive(c)
 			return c, nil
 		}
 
@@ -595,13 +591,10 @@ func NewVless(option VlessOption) (*Vless, error) {
 		}
 		var tlsConfig *tls.Config
 		if option.TLS {
-			tlsConfig, err = ca.GetSpecifiedFingerprintTLSConfig(&tls.Config{
+			tlsConfig = ca.GetGlobalTLSConfig(&tls.Config{
 				InsecureSkipVerify: v.option.SkipCertVerify,
 				ServerName:         v.option.ServerName,
-			}, v.option.Fingerprint)
+			})
-			if err != nil {
-				return nil, err
-			}
 			if option.ServerName == "" {
 				host, _, _ := net.SplitHostPort(v.addr)
 				tlsConfig.ServerName = host

adapter/outbound/vmess.go

@@ -25,7 +25,7 @@ import (
 
 	vmess "github.com/metacubex/sing-vmess"
 	"github.com/metacubex/sing-vmess/packetaddr"
-	M "github.com/metacubex/sing/common/metadata"
+	M "github.com/sagernet/sing/common/metadata"
 )
 
 var ErrUDPRemoteAddrMismatch = errors.New("udp packet dropped due to mismatched remote address")
@@ -96,7 +96,13 @@ type WSOptions struct {
 }
 
 // StreamConnContext implements C.ProxyAdapter
-func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ net.Conn, err error) {
+func (v *Vmess) StreamConnContext(ctx context.Context, 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":
 		host, port, _ := net.SplitHostPort(v.addr)
@@ -173,7 +179,6 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 		tlsOpts := mihomoVMess.TLSConfig{
 			Host:              host,
 			SkipCertVerify:    v.option.SkipCertVerify,
-			FingerPrint:       v.option.Fingerprint,
 			NextProtos:        []string{"h2"},
 			ClientFingerprint: v.option.ClientFingerprint,
 			Reality:           v.realityConfig,
@@ -193,7 +198,7 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			Path:  v.option.HTTP2Opts.Path,
 		}
 
-		c, err = mihomoVMess.StreamH2Conn(ctx, c, h2Opts)
+		c, err = mihomoVMess.StreamH2Conn(c, h2Opts)
 	case "grpc":
 		c, err = gun.StreamGunWithConn(c, v.gunTLSConfig, v.gunConfig, v.realityConfig)
 	default:
@@ -203,7 +208,6 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			tlsOpts := &mihomoVMess.TLSConfig{
 				Host:              host,
 				SkipCertVerify:    v.option.SkipCertVerify,
-				FingerPrint:       v.option.Fingerprint,
 				ClientFingerprint: v.option.ClientFingerprint,
 				Reality:           v.realityConfig,
 				NextProtos:        v.option.ALPN,
@@ -220,24 +224,17 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 	if err != nil {
 		return nil, err
 	}
-	return v.streamConnContext(ctx, c, metadata)
+	return v.streamConn(c, metadata)
 }
 
-func (v *Vmess) streamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (conn net.Conn, err error) {
+func (v *Vmess) streamConn(c net.Conn, metadata *C.Metadata) (conn net.Conn, err error) {
-	useEarly := N.NeedHandshake(c)
-	if !useEarly {
-		if ctx.Done() != nil {
-			done := N.SetupContextForConn(ctx, c)
-			defer done(&err)
-		}
-	}
 	if metadata.NetWork == C.UDP {
 		if v.option.XUDP {
 			var globalID [8]byte
 			if metadata.SourceValid() {
 				globalID = utils.GlobalID(metadata.SourceAddress())
 			}
-			if useEarly {
+			if N.NeedHandshake(c) {
 				conn = v.client.DialEarlyXUDPPacketConn(c,
 					globalID,
 					M.SocksaddrFromNet(metadata.UDPAddr()))
@@ -247,7 +244,7 @@ func (v *Vmess) streamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 					M.SocksaddrFromNet(metadata.UDPAddr()))
 			}
 		} else if v.option.PacketAddr {
-			if useEarly {
+			if N.NeedHandshake(c) {
 				conn = v.client.DialEarlyPacketConn(c,
 					M.ParseSocksaddrHostPort(packetaddr.SeqPacketMagicAddress, 443))
 			} else {
@@ -256,7 +253,7 @@ func (v *Vmess) streamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			}
 			conn = packetaddr.NewBindConn(conn)
 		} else {
-			if useEarly {
+			if N.NeedHandshake(c) {
 				conn = v.client.DialEarlyPacketConn(c,
 					M.SocksaddrFromNet(metadata.UDPAddr()))
 			} else {
@@ -265,7 +262,7 @@ func (v *Vmess) streamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			}
 		}
 	} else {
-		if useEarly {
+		if N.NeedHandshake(c) {
 			conn = v.client.DialEarlyConn(c,
 				M.ParseSocksaddrHostPort(metadata.String(), metadata.DstPort))
 		} else {
@@ -280,11 +277,10 @@ func (v *Vmess) streamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 }
 
 // DialContext implements C.ProxyAdapter
-func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
+func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
-	var c net.Conn
 	// gun transport
-	if v.transport != nil {
+	if v.transport != nil && len(opts) == 0 {
-		c, err = gun.StreamGunWithTransport(v.transport, v.gunConfig)
+		c, err := gun.StreamGunWithTransport(v.transport, v.gunConfig)
 		if err != nil {
 			return nil, err
 		}
@@ -292,14 +288,14 @@ func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn
 			safeConnClose(c, err)
 		}(c)
 
-		c, err = v.streamConnContext(ctx, c, metadata)
+		c, err = v.client.DialConn(c, M.ParseSocksaddrHostPort(metadata.String(), metadata.DstPort))
 		if err != nil {
 			return nil, err
 		}
 
 		return NewConn(c, v), nil
 	}
-	return v.DialContextWithDialer(ctx, dialer.NewDialer(v.DialOptions()...), metadata)
+	return v.DialContextWithDialer(ctx, dialer.NewDialer(v.Base.DialOptions(opts...)...), metadata)
 }
 
 // DialContextWithDialer implements C.ProxyAdapter
@@ -314,6 +310,7 @@ func (v *Vmess) DialContextWithDialer(ctx context.Context, dialer C.Dialer, meta
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 	}
+	N.TCPKeepAlive(c)
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
 	}(c)
@@ -323,7 +320,7 @@ 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) (_ C.PacketConn, err error) {
+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
 	if !metadata.Resolved() {
 		ip, err := resolver.ResolveIP(ctx, metadata.Host)
@@ -334,7 +331,7 @@ func (v *Vmess) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (
 	}
 	var c net.Conn
 	// gun transport
-	if v.transport != nil {
+	if v.transport != nil && len(opts) == 0 {
 		c, err = gun.StreamGunWithTransport(v.transport, v.gunConfig)
 		if err != nil {
 			return nil, err
@@ -343,13 +340,13 @@ func (v *Vmess) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (
 			safeConnClose(c, err)
 		}(c)
 
-		c, err = v.streamConnContext(ctx, c, metadata)
+		c, err = v.streamConn(c, metadata)
 		if err != nil {
 			return nil, fmt.Errorf("new vmess client error: %v", err)
 		}
 		return v.ListenPacketOnStreamConn(ctx, c, metadata)
 	}
-	return v.ListenPacketWithDialer(ctx, dialer.NewDialer(v.DialOptions()...), metadata)
+	return v.ListenPacketWithDialer(ctx, dialer.NewDialer(v.Base.DialOptions(opts...)...), metadata)
 }
 
 // ListenPacketWithDialer implements C.ProxyAdapter
@@ -374,6 +371,7 @@ func (v *Vmess) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, met
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 	}
+	N.TCPKeepAlive(c)
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
 	}(c)
@@ -390,21 +388,6 @@ func (v *Vmess) SupportWithDialer() C.NetWork {
 	return C.ALLNet
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (v *Vmess) ProxyInfo() C.ProxyInfo {
-	info := v.Base.ProxyInfo()
-	info.DialerProxy = v.option.DialerProxy
-	return info
-}
-
-// Close implements C.ProxyAdapter
-func (v *Vmess) Close() error {
-	if v.transport != nil {
-		return v.transport.Close()
-	}
-	return nil
-}
-
 // ListenPacketOnStreamConn implements C.ProxyAdapter
 func (v *Vmess) ListenPacketOnStreamConn(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ C.PacketConn, err error) {
 	// vmess use stream-oriented udp with a special address, so we need a net.UDPAddr
@@ -469,30 +452,26 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 		option: &option,
 	}
 
-	v.realityConfig, err = v.option.RealityOpts.Parse()
-	if err != nil {
-		return nil, err
-	}
-
 	switch option.Network {
 	case "h2":
 		if len(option.HTTP2Opts.Host) == 0 {
 			option.HTTP2Opts.Host = append(option.HTTP2Opts.Host, "www.example.com")
 		}
 	case "grpc":
-		dialFn := func(ctx context.Context, network, addr string) (net.Conn, error) {
+		dialFn := func(network, addr string) (net.Conn, error) {
 			var err error
-			var cDialer C.Dialer = dialer.NewDialer(v.DialOptions()...)
+			var cDialer C.Dialer = dialer.NewDialer(v.Base.DialOptions()...)
 			if len(v.option.DialerProxy) > 0 {
 				cDialer, err = proxydialer.NewByName(v.option.DialerProxy, cDialer)
 				if err != nil {
 					return nil, err
 				}
 			}
-			c, err := cDialer.DialContext(ctx, "tcp", v.addr)
+			c, err := cDialer.DialContext(context.Background(), "tcp", v.addr)
 			if err != nil {
 				return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 			}
+			N.TCPKeepAlive(c)
 			return c, nil
 		}
 
@@ -506,13 +485,10 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 		}
 		var tlsConfig *tls.Config
 		if option.TLS {
-			tlsConfig, err = ca.GetSpecifiedFingerprintTLSConfig(&tls.Config{
+			tlsConfig = ca.GetGlobalTLSConfig(&tls.Config{
 				InsecureSkipVerify: v.option.SkipCertVerify,
 				ServerName:         v.option.ServerName,
-			}, v.option.Fingerprint)
+			})
-			if err != nil {
-				return nil, err
-			}
 			if option.ServerName == "" {
 				host, _, _ := net.SplitHostPort(v.addr)
 				tlsConfig.ServerName = host
@@ -525,6 +501,11 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 		v.transport = gun.NewHTTP2Client(dialFn, tlsConfig, v.option.ClientFingerprint, v.realityConfig)
 	}
 
+	v.realityConfig, err = v.option.RealityOpts.Parse()
+	if err != nil {
+		return nil, err
+	}
+
 	return v, nil
 }
 

adapter/outbound/wireguard.go

@@ -8,12 +8,13 @@ import (
 	"fmt"
 	"net"
 	"net/netip"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync"
-	"time"
 
 	"github.com/metacubex/mihomo/common/atomic"
+	CN "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/proxydialer"
 	"github.com/metacubex/mihomo/component/resolver"
@@ -22,27 +23,23 @@ import (
 	"github.com/metacubex/mihomo/dns"
 	"github.com/metacubex/mihomo/log"
 
-	amnezia "github.com/metacubex/amneziawg-go/device"
 	wireguard "github.com/metacubex/sing-wireguard"
-	"github.com/metacubex/wireguard-go/device"
 
-	"github.com/metacubex/sing/common/debug"
+	"github.com/sagernet/sing/common"
-	E "github.com/metacubex/sing/common/exceptions"
+	"github.com/sagernet/sing/common/debug"
-	M "github.com/metacubex/sing/common/metadata"
+	E "github.com/sagernet/sing/common/exceptions"
+	M "github.com/sagernet/sing/common/metadata"
+	"github.com/sagernet/wireguard-go/device"
 )
 
-type wireguardGoDevice interface {
-	Close()
-	IpcSet(uapiConf string) error
-}
-
 type WireGuard struct {
 	*Base
 	bind      *wireguard.ClientBind
-	device    wireguardGoDevice
+	device    *device.Device
 	tunDevice wireguard.Device
 	dialer    proxydialer.SingDialer
-	resolver  resolver.Resolver
+	resolver  *dns.Resolver
+	refP      *refProxyAdapter
 
 	initOk        atomic.Bool
 	initMutex     sync.Mutex
@@ -51,9 +48,7 @@ type WireGuard struct {
 	connectAddr   M.Socksaddr
 	localPrefixes []netip.Prefix
 
-	serverAddrMap   map[M.Socksaddr]netip.AddrPort
+	closeCh chan struct{} // for test
-	serverAddrTime  atomic.TypedValue[time.Time]
-	serverAddrMutex sync.Mutex
 }
 
 type WireGuardOption struct {
@@ -68,14 +63,10 @@ type WireGuardOption struct {
 	UDP                 bool   `proxy:"udp,omitempty"`
 	PersistentKeepalive int    `proxy:"persistent-keepalive,omitempty"`
 
-	AmneziaWGOption *AmneziaWGOption `proxy:"amnezia-wg-option,omitempty"`
-
 	Peers []WireGuardPeerOption `proxy:"peers,omitempty"`
 
 	RemoteDnsResolve bool     `proxy:"remote-dns-resolve,omitempty"`
 	Dns              []string `proxy:"dns,omitempty"`
-
-	RefreshServerIPInterval int `proxy:"refresh-server-ip-interval,omitempty"`
 }
 
 type WireGuardPeerOption struct {
@@ -87,18 +78,6 @@ type WireGuardPeerOption struct {
 	AllowedIPs   []string `proxy:"allowed-ips,omitempty"`
 }
 
-type AmneziaWGOption struct {
-	JC   int    `proxy:"jc"`
-	JMin int    `proxy:"jmin"`
-	JMax int    `proxy:"jmax"`
-	S1   int    `proxy:"s1"`
-	S2   int    `proxy:"s2"`
-	H1   uint32 `proxy:"h1"`
-	H2   uint32 `proxy:"h2"`
-	H3   uint32 `proxy:"h3"`
-	H4   uint32 `proxy:"h4"`
-}
-
 type wgSingErrorHandler struct {
 	name string
 }
@@ -166,9 +145,9 @@ func NewWireGuard(option WireGuardOption) (*WireGuard, error) {
 			rmark:  option.RoutingMark,
 			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
+		dialer: proxydialer.NewSlowDownSingDialer(proxydialer.NewByNameSingDialer(option.DialerProxy, dialer.NewDialer()), slowdown.New()),
 	}
-	singDialer := proxydialer.NewSlowDownSingDialer(proxydialer.NewByNameSingDialer(option.DialerProxy, dialer.NewDialer(outbound.DialOptions()...)), slowdown.New())
+	runtime.SetFinalizer(outbound, closeWireGuard)
-	outbound.dialer = singDialer
 
 	var reserved [3]uint8
 	if len(option.Reserved) > 0 {
@@ -258,20 +237,14 @@ func NewWireGuard(option WireGuardOption) (*WireGuard, error) {
 	if err != nil {
 		return nil, E.Cause(err, "create WireGuard device")
 	}
-	logger := &device.Logger{
+	outbound.device = device.NewDevice(context.Background(), outbound.tunDevice, outbound.bind, &device.Logger{
 		Verbosef: func(format string, args ...interface{}) {
 			log.SingLogger.Debug(fmt.Sprintf("[WG](%s) %s", option.Name, fmt.Sprintf(format, args...)))
 		},
 		Errorf: func(format string, args ...interface{}) {
 			log.SingLogger.Error(fmt.Sprintf("[WG](%s) %s", option.Name, fmt.Sprintf(format, args...)))
 		},
-	}
+	}, option.Workers)
-	if option.AmneziaWGOption != nil {
-		outbound.bind.SetParseReserved(false) // AmneziaWG don't need parse reserved
-		outbound.device = amnezia.NewDevice(outbound.tunDevice, outbound.bind, logger, option.Workers)
-	} else {
-		outbound.device = device.NewDevice(outbound.tunDevice, outbound.bind, logger, option.Workers)
-	}
 
 	var has6 bool
 	for _, address := range outbound.localPrefixes {
@@ -281,13 +254,15 @@ func NewWireGuard(option WireGuardOption) (*WireGuard, error) {
 		}
 	}
 
+	refP := &refProxyAdapter{}
+	outbound.refP = refP
 	if option.RemoteDnsResolve && len(option.Dns) > 0 {
 		nss, err := dns.ParseNameServer(option.Dns)
 		if err != nil {
 			return nil, err
 		}
 		for i := range nss {
-			nss[i].ProxyAdapter = outbound
+			nss[i].ProxyAdapter = refP
 		}
 		outbound.resolver = dns.NewResolver(dns.Config{
 			Main: nss,
@@ -302,7 +277,7 @@ func (w *WireGuard) resolve(ctx context.Context, address M.Socksaddr) (netip.Add
 	if address.Addr.IsValid() {
 		return address.AddrPort(), nil
 	}
-	udpAddr, err := resolveUDPAddr(ctx, "udp", address.String(), w.prefer)
+	udpAddr, err := resolveUDPAddrWithPrefer(ctx, "udp", address.String(), w.prefer)
 	if err != nil {
 		return netip.AddrPort{}, err
 	}
@@ -312,15 +287,6 @@ func (w *WireGuard) resolve(ctx context.Context, address M.Socksaddr) (netip.Add
 }
 
 func (w *WireGuard) init(ctx context.Context) error {
-	err := w.init0(ctx)
-	if err != nil {
-		return err
-	}
-	w.updateServerAddr(ctx)
-	return nil
-}
-
-func (w *WireGuard) init0(ctx context.Context) error {
 	if w.initOk.Load() {
 		return nil
 	}
@@ -335,23 +301,70 @@ func (w *WireGuard) init0(ctx context.Context) error {
 	}
 
 	w.bind.ResetReservedForEndpoint()
-	w.serverAddrMap = make(map[M.Socksaddr]netip.AddrPort)
+	ipcConf := "private_key=" + w.option.PrivateKey
-	ipcConf, err := w.genIpcConf(ctx, false)
+	if len(w.option.Peers) > 0 {
-	if err != nil {
+		for i, peer := range w.option.Peers {
-		// !!! do not set initErr here !!!
+			destination, err := w.resolve(ctx, peer.Addr())
-		// let us can retry domain resolve in next time
+			if err != nil {
-		return err
+				// !!! do not set initErr here !!!
+				// let us can retry domain resolve in next time
+				return E.Cause(err, "resolve endpoint domain for peer ", i)
+			}
+			ipcConf += "\npublic_key=" + peer.PublicKey
+			ipcConf += "\nendpoint=" + destination.String()
+			if peer.PreSharedKey != "" {
+				ipcConf += "\npreshared_key=" + peer.PreSharedKey
+			}
+			for _, allowedIP := range peer.AllowedIPs {
+				ipcConf += "\nallowed_ip=" + allowedIP
+			}
+			if len(peer.Reserved) > 0 {
+				var reserved [3]uint8
+				copy(reserved[:], w.option.Reserved)
+				w.bind.SetReservedForEndpoint(destination, reserved)
+			}
+		}
+	} else {
+		ipcConf += "\npublic_key=" + w.option.PublicKey
+		destination, err := w.resolve(ctx, w.connectAddr)
+		if err != nil {
+			// !!! do not set initErr here !!!
+			// let us can retry domain resolve in next time
+			return E.Cause(err, "resolve endpoint domain")
+		}
+		w.bind.SetConnectAddr(destination)
+		ipcConf += "\nendpoint=" + destination.String()
+		if w.option.PreSharedKey != "" {
+			ipcConf += "\npreshared_key=" + w.option.PreSharedKey
+		}
+		var has4, has6 bool
+		for _, address := range w.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 w.option.PersistentKeepalive != 0 {
+		ipcConf += fmt.Sprintf("\npersistent_keepalive_interval=%d", w.option.PersistentKeepalive)
 	}
 
 	if debug.Enabled {
 		log.SingLogger.Trace(fmt.Sprintf("[WG](%s) created wireguard ipc conf: \n %s", w.option.Name, ipcConf))
 	}
-	err = w.device.IpcSet(ipcConf)
+	err := w.device.IpcSet(ipcConf)
 	if err != nil {
 		w.initErr = E.Cause(err, "setup wireguard")
 		return w.initErr
 	}
-	w.serverAddrTime.Store(time.Now())
 
 	err = w.tunDevice.Start()
 	if err != nil {
@@ -363,133 +376,19 @@ func (w *WireGuard) init0(ctx context.Context) error {
 	return nil
 }
 
-func (w *WireGuard) updateServerAddr(ctx context.Context) {
+func closeWireGuard(w *WireGuard) {
-	if w.option.RefreshServerIPInterval != 0 && time.Since(w.serverAddrTime.Load()) > time.Second*time.Duration(w.option.RefreshServerIPInterval) {
-		if w.serverAddrMutex.TryLock() {
-			defer w.serverAddrMutex.Unlock()
-			ipcConf, err := w.genIpcConf(ctx, true)
-			if err != nil {
-				log.Warnln("[WG](%s)UpdateServerAddr failed to generate wireguard ipc conf: %s", w.option.Name, err)
-				return
-			}
-			err = w.device.IpcSet(ipcConf)
-			if err != nil {
-				log.Warnln("[WG](%s)UpdateServerAddr failed to update wireguard ipc conf: %s", w.option.Name, err)
-				return
-			}
-			w.serverAddrTime.Store(time.Now())
-		}
-	}
-}
-
-func (w *WireGuard) genIpcConf(ctx context.Context, updateOnly bool) (string, error) {
-	ipcConf := ""
-	if !updateOnly {
-		ipcConf += "private_key=" + w.option.PrivateKey + "\n"
-		if w.option.AmneziaWGOption != nil {
-			ipcConf += "jc=" + strconv.Itoa(w.option.AmneziaWGOption.JC) + "\n"
-			ipcConf += "jmin=" + strconv.Itoa(w.option.AmneziaWGOption.JMin) + "\n"
-			ipcConf += "jmax=" + strconv.Itoa(w.option.AmneziaWGOption.JMax) + "\n"
-			ipcConf += "s1=" + strconv.Itoa(w.option.AmneziaWGOption.S1) + "\n"
-			ipcConf += "s2=" + strconv.Itoa(w.option.AmneziaWGOption.S2) + "\n"
-			ipcConf += "h1=" + strconv.FormatUint(uint64(w.option.AmneziaWGOption.H1), 10) + "\n"
-			ipcConf += "h2=" + strconv.FormatUint(uint64(w.option.AmneziaWGOption.H2), 10) + "\n"
-			ipcConf += "h3=" + strconv.FormatUint(uint64(w.option.AmneziaWGOption.H3), 10) + "\n"
-			ipcConf += "h4=" + strconv.FormatUint(uint64(w.option.AmneziaWGOption.H4), 10) + "\n"
-		}
-	}
-	if len(w.option.Peers) > 0 {
-		for i, peer := range w.option.Peers {
-			peerAddr := peer.Addr()
-			destination, err := w.resolve(ctx, peerAddr)
-			if err != nil {
-				return "", E.Cause(err, "resolve endpoint domain for peer ", i)
-			}
-			if w.serverAddrMap[peerAddr] != destination {
-				w.serverAddrMap[peerAddr] = destination
-			} else if updateOnly {
-				continue
-			}
-
-			if len(w.option.Peers) == 1 { // must call SetConnectAddr if isConnect == true
-				w.bind.SetConnectAddr(destination)
-			}
-			ipcConf += "public_key=" + peer.PublicKey + "\n"
-			if updateOnly {
-				ipcConf += "update_only=true\n"
-			}
-			ipcConf += "endpoint=" + destination.String() + "\n"
-			if len(peer.Reserved) > 0 {
-				var reserved [3]uint8
-				copy(reserved[:], w.option.Reserved)
-				w.bind.SetReservedForEndpoint(destination, reserved)
-			}
-			if updateOnly {
-				continue
-			}
-			if peer.PreSharedKey != "" {
-				ipcConf += "preshared_key=" + peer.PreSharedKey + "\n"
-			}
-			for _, allowedIP := range peer.AllowedIPs {
-				ipcConf += "allowed_ip=" + allowedIP + "\n"
-			}
-			if w.option.PersistentKeepalive != 0 {
-				ipcConf += fmt.Sprintf("persistent_keepalive_interval=%d\n", w.option.PersistentKeepalive)
-			}
-		}
-	} else {
-		destination, err := w.resolve(ctx, w.connectAddr)
-		if err != nil {
-			return "", E.Cause(err, "resolve endpoint domain")
-		}
-		if w.serverAddrMap[w.connectAddr] != destination {
-			w.serverAddrMap[w.connectAddr] = destination
-		} else if updateOnly {
-			return "", nil
-		}
-		w.bind.SetConnectAddr(destination) // must call SetConnectAddr if isConnect == true
-		ipcConf += "public_key=" + w.option.PublicKey + "\n"
-		if updateOnly {
-			ipcConf += "update_only=true\n"
-		}
-		ipcConf += "endpoint=" + destination.String() + "\n"
-		if updateOnly {
-			return ipcConf, nil
-		}
-		if w.option.PreSharedKey != "" {
-			ipcConf += "preshared_key=" + w.option.PreSharedKey + "\n"
-		}
-		var has4, has6 bool
-		for _, address := range w.localPrefixes {
-			if address.Addr().Is4() {
-				has4 = true
-			} else {
-				has6 = true
-			}
-		}
-		if has4 {
-			ipcConf += "allowed_ip=0.0.0.0/0\n"
-		}
-		if has6 {
-			ipcConf += "allowed_ip=::/0\n"
-		}
-
-		if w.option.PersistentKeepalive != 0 {
-			ipcConf += fmt.Sprintf("persistent_keepalive_interval=%d\n", w.option.PersistentKeepalive)
-		}
-	}
-	return ipcConf, nil
-}
-
-// Close implements C.ProxyAdapter
-func (w *WireGuard) Close() error {
 	if w.device != nil {
 		w.device.Close()
 	}
-	return nil
+	_ = common.Close(w.tunDevice)
+	if w.closeCh != nil {
+		close(w.closeCh)
+	}
 }
 
-func (w *WireGuard) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
+func (w *WireGuard) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
+	options := w.Base.DialOptions(opts...)
+	w.dialer.SetDialer(dialer.NewDialer(options...))
 	var conn net.Conn
 	if err = w.init(ctx); err != nil {
 		return nil, err
@@ -497,9 +396,10 @@ func (w *WireGuard) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.
 	if !metadata.Resolved() || w.resolver != nil {
 		r := resolver.DefaultResolver
 		if w.resolver != nil {
+			w.refP.SetProxyAdapter(w)
+			defer w.refP.ClearProxyAdapter()
 			r = w.resolver
 		}
-		options := w.DialOptions()
 		options = append(options, dialer.WithResolver(r))
 		options = append(options, dialer.WithNetDialer(wgNetDialer{tunDevice: w.tunDevice}))
 		conn, err = dialer.NewDialer(options...).DialContext(ctx, "tcp", metadata.RemoteAddress())
@@ -512,10 +412,12 @@ func (w *WireGuard) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.
 	if conn == nil {
 		return nil, E.New("conn is nil")
 	}
-	return NewConn(conn, w), nil
+	return NewConn(CN.NewRefConn(conn, w), w), nil
 }
 
-func (w *WireGuard) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
+func (w *WireGuard) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
+	options := w.Base.DialOptions(opts...)
+	w.dialer.SetDialer(dialer.NewDialer(options...))
 	var pc net.PacketConn
 	if err = w.init(ctx); err != nil {
 		return nil, err
@@ -523,6 +425,8 @@ func (w *WireGuard) ListenPacketContext(ctx context.Context, metadata *C.Metadat
 	if (!metadata.Resolved() || w.resolver != nil) && metadata.Host != "" {
 		r := resolver.DefaultResolver
 		if w.resolver != nil {
+			w.refP.SetProxyAdapter(w)
+			defer w.refP.ClearProxyAdapter()
 			r = w.resolver
 		}
 		ip, err := resolver.ResolveIPWithResolver(ctx, metadata.Host, r)
@@ -538,10 +442,146 @@ func (w *WireGuard) ListenPacketContext(ctx context.Context, metadata *C.Metadat
 	if pc == nil {
 		return nil, E.New("packetConn is nil")
 	}
-	return newPacketConn(pc, w), nil
+	return newPacketConn(CN.NewRefPacketConn(pc, w), w), nil
 }
 
 // IsL3Protocol implements C.ProxyAdapter
 func (w *WireGuard) IsL3Protocol(metadata *C.Metadata) bool {
 	return true
 }
+
+type refProxyAdapter struct {
+	proxyAdapter C.ProxyAdapter
+	count        int
+	mutex        sync.Mutex
+}
+
+func (r *refProxyAdapter) SetProxyAdapter(proxyAdapter C.ProxyAdapter) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+	r.proxyAdapter = proxyAdapter
+	r.count++
+}
+
+func (r *refProxyAdapter) ClearProxyAdapter() {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+	r.count--
+	if r.count == 0 {
+		r.proxyAdapter = nil
+	}
+}
+
+func (r *refProxyAdapter) Name() string {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.Name()
+	}
+	return ""
+}
+
+func (r *refProxyAdapter) Type() C.AdapterType {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.Type()
+	}
+	return C.AdapterType(0)
+}
+
+func (r *refProxyAdapter) Addr() string {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.Addr()
+	}
+	return ""
+}
+
+func (r *refProxyAdapter) SupportUDP() bool {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.SupportUDP()
+	}
+	return false
+}
+
+func (r *refProxyAdapter) SupportXUDP() bool {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.SupportXUDP()
+	}
+	return false
+}
+
+func (r *refProxyAdapter) SupportTFO() bool {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.SupportTFO()
+	}
+	return false
+}
+
+func (r *refProxyAdapter) MarshalJSON() ([]byte, error) {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.MarshalJSON()
+	}
+	return nil, C.ErrNotSupport
+}
+
+func (r *refProxyAdapter) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.StreamConnContext(ctx, c, metadata)
+	}
+	return nil, C.ErrNotSupport
+}
+
+func (r *refProxyAdapter) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.DialContext(ctx, metadata, opts...)
+	}
+	return nil, C.ErrNotSupport
+}
+
+func (r *refProxyAdapter) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.ListenPacketContext(ctx, metadata, opts...)
+	}
+	return nil, C.ErrNotSupport
+}
+
+func (r *refProxyAdapter) SupportUOT() bool {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.SupportUOT()
+	}
+	return false
+}
+
+func (r *refProxyAdapter) SupportWithDialer() C.NetWork {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.SupportWithDialer()
+	}
+	return C.InvalidNet
+}
+
+func (r *refProxyAdapter) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (C.Conn, error) {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.DialContextWithDialer(ctx, dialer, metadata)
+	}
+	return nil, C.ErrNotSupport
+}
+
+func (r *refProxyAdapter) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (C.PacketConn, error) {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.ListenPacketWithDialer(ctx, dialer, metadata)
+	}
+	return nil, C.ErrNotSupport
+}
+
+func (r *refProxyAdapter) IsL3Protocol(metadata *C.Metadata) bool {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.IsL3Protocol(metadata)
+	}
+	return false
+}
+
+func (r *refProxyAdapter) Unwrap(metadata *C.Metadata, touch bool) C.Proxy {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.Unwrap(metadata, touch)
+	}
+	return nil
+}
+
+var _ C.ProxyAdapter = (*refProxyAdapter)(nil)

adapter/outbound/wireguard_test.go

@@ -0,0 +1,44 @@
+//go:build with_gvisor
+
+package outbound
+
+import (
+	"context"
+	"runtime"
+	"testing"
+	"time"
+)
+
+func TestWireGuardGC(t *testing.T) {
+	option := WireGuardOption{}
+	option.Server = "162.159.192.1"
+	option.Port = 2408
+	option.PrivateKey = "iOx7749AdqH3IqluG7+0YbGKd0m1mcEXAfGRzpy9rG8="
+	option.PublicKey = "bmXOC+F1FxEMF9dyiK2H5/1SUtzH0JuVo51h2wPfgyo="
+	option.Ip = "172.16.0.2"
+	option.Ipv6 = "2606:4700:110:8d29:be92:3a6a:f4:c437"
+	option.Reserved = []uint8{51, 69, 125}
+	wg, err := NewWireGuard(option)
+	if err != nil {
+		t.Error(err)
+	}
+	closeCh := make(chan struct{})
+	wg.closeCh = closeCh
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+	defer cancel()
+	err = wg.init(ctx)
+	if err != nil {
+		t.Error(err)
+	}
+	// must do a small sleep before test GC
+	// because it maybe deadlocks if w.device.Close call too fast after w.device.Start
+	time.Sleep(10 * time.Millisecond)
+	wg = nil
+	runtime.GC()
+	select {
+	case <-closeCh:
+		return
+	case <-ctx.Done():
+		t.Error("timeout not GC")
+	}
+}

adapter/outboundgroup/fallback.go

@@ -6,9 +6,11 @@ import (
 	"errors"
 	"time"
 
+	"github.com/metacubex/mihomo/adapter/outbound"
 	"github.com/metacubex/mihomo/common/callback"
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/common/utils"
+	"github.com/metacubex/mihomo/component/dialer"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/constant/provider"
 )
@@ -29,13 +31,13 @@ func (f *Fallback) Now() string {
 }
 
 // DialContext implements C.ProxyAdapter
-func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
+func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
 	proxy := f.findAliveProxy(true)
-	c, err := proxy.DialContext(ctx, metadata)
+	c, err := proxy.DialContext(ctx, metadata, f.Base.DialOptions(opts...)...)
 	if err == nil {
 		c.AppendToChains(f)
 	} else {
-		f.onDialFailed(proxy.Type(), err, f.healthCheck)
+		f.onDialFailed(proxy.Type(), err)
 	}
 
 	if N.NeedHandshake(c) {
@@ -43,7 +45,7 @@ func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata) (C.Con
 			if err == nil {
 				f.onDialSuccess()
 			} else {
-				f.onDialFailed(proxy.Type(), err, f.healthCheck)
+				f.onDialFailed(proxy.Type(), err)
 			}
 		})
 	}
@@ -52,9 +54,9 @@ func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata) (C.Con
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (f *Fallback) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (f *Fallback) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
 	proxy := f.findAliveProxy(true)
-	pc, err := proxy.ListenPacketContext(ctx, metadata)
+	pc, err := proxy.ListenPacketContext(ctx, metadata, f.Base.DialOptions(opts...)...)
 	if err == nil {
 		pc.AppendToChains(f)
 	}
@@ -153,14 +155,18 @@ func (f *Fallback) ForceSet(name string) {
 func NewFallback(option *GroupCommonOption, providers []provider.ProxyProvider) *Fallback {
 	return &Fallback{
 		GroupBase: NewGroupBase(GroupBaseOption{
-			Name:           option.Name,
+			outbound.BaseOption{
-			Type:           C.Fallback,
+				Name:        option.Name,
-			Filter:         option.Filter,
+				Type:        C.Fallback,
-			ExcludeFilter:  option.ExcludeFilter,
+				Interface:   option.Interface,
-			ExcludeType:    option.ExcludeType,
+				RoutingMark: option.RoutingMark,
-			TestTimeout:    option.TestTimeout,
+			},
-			MaxFailedTimes: option.MaxFailedTimes,
+			option.Filter,
-			Providers:      providers,
+			option.ExcludeFilter,
+			option.ExcludeType,
+			option.TestTimeout,
+			option.MaxFailedTimes,
+			providers,
 		}),
 		disableUDP:     option.DisableUDP,
 		testUrl:        option.URL,

adapter/outboundgroup/groupbase.go

@@ -2,7 +2,6 @@ package outboundgroup
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"strings"
 	"sync"
@@ -18,70 +17,61 @@ import (
 	"github.com/metacubex/mihomo/tunnel"
 
 	"github.com/dlclark/regexp2"
-	"golang.org/x/exp/slices"
 )
 
 type GroupBase struct {
 	*outbound.Base
-	filterRegs        []*regexp2.Regexp
+	filterRegs       []*regexp2.Regexp
-	excludeFilterRegs []*regexp2.Regexp
+	excludeFilterReg *regexp2.Regexp
-	excludeTypeArray  []string
+	excludeTypeArray []string
-	providers         []provider.ProxyProvider
+	providers        []provider.ProxyProvider
-	failedTestMux     sync.Mutex
+	failedTestMux    sync.Mutex
-	failedTimes       int
+	failedTimes      int
-	failedTime        time.Time
+	failedTime       time.Time
-	failedTesting     atomic.Bool
+	failedTesting    atomic.Bool
-	TestTimeout       int
+	proxies          [][]C.Proxy
-	maxFailedTimes    int
+	versions         []atomic.Uint32
-
+	TestTimeout      int
-	// for GetProxies
+	maxFailedTimes   int
-	getProxiesMutex  sync.Mutex
-	providerVersions []uint32
-	providerProxies  []C.Proxy
 }
 
 type GroupBaseOption struct {
-	Name           string
+	outbound.BaseOption
-	Type           C.AdapterType
+	filter         string
-	Filter         string
+	excludeFilter  string
-	ExcludeFilter  string
+	excludeType    string
-	ExcludeType    string
 	TestTimeout    int
-	MaxFailedTimes int
+	maxFailedTimes int
-	Providers      []provider.ProxyProvider
+	providers      []provider.ProxyProvider
 }
 
 func NewGroupBase(opt GroupBaseOption) *GroupBase {
-	var excludeTypeArray []string
+	var excludeFilterReg *regexp2.Regexp
-	if opt.ExcludeType != "" {
+	if opt.excludeFilter != "" {
-		excludeTypeArray = strings.Split(opt.ExcludeType, "|")
+		excludeFilterReg = regexp2.MustCompile(opt.excludeFilter, 0)
 	}
-
+	var excludeTypeArray []string
-	var excludeFilterRegs []*regexp2.Regexp
+	if opt.excludeType != "" {
-	if opt.ExcludeFilter != "" {
+		excludeTypeArray = strings.Split(opt.excludeType, "|")
-		for _, excludeFilter := range strings.Split(opt.ExcludeFilter, "`") {
-			excludeFilterReg := regexp2.MustCompile(excludeFilter, regexp2.None)
-			excludeFilterRegs = append(excludeFilterRegs, excludeFilterReg)
-		}
 	}
 
 	var filterRegs []*regexp2.Regexp
-	if opt.Filter != "" {
+	if opt.filter != "" {
-		for _, filter := range strings.Split(opt.Filter, "`") {
+		for _, filter := range strings.Split(opt.filter, "`") {
-			filterReg := regexp2.MustCompile(filter, regexp2.None)
+			filterReg := regexp2.MustCompile(filter, 0)
 			filterRegs = append(filterRegs, filterReg)
 		}
 	}
 
 	gb := &GroupBase{
-		Base:              outbound.NewBase(outbound.BaseOption{Name: opt.Name, Type: opt.Type}),
+		Base:             outbound.NewBase(opt.BaseOption),
-		filterRegs:        filterRegs,
+		filterRegs:       filterRegs,
-		excludeFilterRegs: excludeFilterRegs,
+		excludeFilterReg: excludeFilterReg,
-		excludeTypeArray:  excludeTypeArray,
+		excludeTypeArray: excludeTypeArray,
-		providers:         opt.Providers,
+		providers:        opt.providers,
-		failedTesting:     atomic.NewBool(false),
+		failedTesting:    atomic.NewBool(false),
-		TestTimeout:       opt.TestTimeout,
+		TestTimeout:      opt.TestTimeout,
-		maxFailedTimes:    opt.MaxFailedTimes,
+		maxFailedTimes:   opt.maxFailedTimes,
 	}
 
 	if gb.TestTimeout == 0 {
@@ -91,6 +81,9 @@ func NewGroupBase(opt GroupBaseOption) *GroupBase {
 		gb.maxFailedTimes = 5
 	}
 
+	gb.proxies = make([][]C.Proxy, len(opt.providers))
+	gb.versions = make([]atomic.Uint32, len(opt.providers))
+
 	return gb
 }
 
@@ -101,62 +94,63 @@ func (gb *GroupBase) Touch() {
 }
 
 func (gb *GroupBase) GetProxies(touch bool) []C.Proxy {
-	providerVersions := make([]uint32, len(gb.providers))
-	for i, pd := range gb.providers {
-		if touch { // touch first
-			pd.Touch()
-		}
-		providerVersions[i] = pd.Version()
-	}
-
-	// thread safe
-	gb.getProxiesMutex.Lock()
-	defer gb.getProxiesMutex.Unlock()
-
-	// return the cached proxies if version not changed
-	if slices.Equal(providerVersions, gb.providerVersions) {
-		return gb.providerProxies
-	}
-
 	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 _, pd := range gb.providers {
+		for i, pd := range gb.providers {
-			if pd.VehicleType() == types.Compatible { // compatible provider unneeded filter
+			if touch {
-				proxies = append(proxies, pd.Proxies()...)
+				pd.Touch()
+			}
+
+			if pd.VehicleType() == types.Compatible {
+				gb.versions[i].Store(pd.Version())
+				gb.proxies[i] = pd.Proxies()
 				continue
 			}
 
-			var newProxies []C.Proxy
+			version := gb.versions[i].Load()
-			proxiesSet := map[string]struct{}{}
+			if version != pd.Version() && gb.versions[i].CompareAndSwap(version, pd.Version()) {
-			for _, filterReg := range gb.filterRegs {
+				var (
-				for _, p := range pd.Proxies() {
+					proxies    []C.Proxy
-					name := p.Name()
+					newProxies []C.Proxy
-					if mat, _ := filterReg.MatchString(name); mat {
+				)
-						if _, ok := proxiesSet[name]; !ok {
+
-							proxiesSet[name] = struct{}{}
+				proxies = pd.Proxies()
-							newProxies = append(newProxies, p)
+				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
 			}
-			proxies = append(proxies, newProxies...)
+		}
+
+		for _, p := range gb.proxies {
+			proxies = append(proxies, p...)
 		}
 	}
 
-	// Multiple filers means that proxies are sorted in the order in which the filers appear.
-	// Although the filter has been performed once in the previous process,
-	// when there are multiple providers, the array needs to be reordered as a whole.
 	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.MatchString(name); mat {
+				if mat, _ := filterReg.FindStringMatch(name); mat != nil {
 					if _, ok := proxiesSet[name]; !ok {
 						proxiesSet[name] = struct{}{}
 						newProxies = append(newProxies, p)
@@ -173,31 +167,32 @@ func (gb *GroupBase) GetProxies(touch bool) []C.Proxy {
 		}
 		proxies = newProxies
 	}
-
+	if gb.excludeTypeArray != nil {
-	if len(gb.excludeFilterRegs) > 0 {
 		var newProxies []C.Proxy
-	LOOP1:
 		for _, p := range proxies {
-			name := p.Name()
+			mType := p.Type().String()
-			for _, excludeFilterReg := range gb.excludeFilterRegs {
+			flag := false
-				if mat, _ := excludeFilterReg.MatchString(name); mat {
+			for i := range gb.excludeTypeArray {
-					continue LOOP1
+				if strings.EqualFold(mType, gb.excludeTypeArray[i]) {
+					flag = true
+					break
 				}
+
+			}
+			if flag {
+				continue
 			}
 			newProxies = append(newProxies, p)
 		}
 		proxies = newProxies
 	}
 
-	if gb.excludeTypeArray != nil {
+	if gb.excludeFilterReg != nil {
 		var newProxies []C.Proxy
-	LOOP2:
 		for _, p := range proxies {
-			mType := p.Type().String()
+			name := p.Name()
-			for _, excludeType := range gb.excludeTypeArray {
+			if mat, _ := gb.excludeFilterReg.FindStringMatch(name); mat != nil {
-				if strings.EqualFold(mType, excludeType) {
+				continue
-					continue LOOP2
-				}
 			}
 			newProxies = append(newProxies, p)
 		}
@@ -205,13 +200,9 @@ func (gb *GroupBase) GetProxies(touch bool) []C.Proxy {
 	}
 
 	if len(proxies) == 0 {
-		return []C.Proxy{tunnel.Proxies()["COMPATIBLE"]}
+		return append(proxies, tunnel.Proxies()["COMPATIBLE"])
 	}
 
-	// only cache when proxies not empty
-	gb.providerVersions = providerVersions
-	gb.providerProxies = proxies
-
 	return proxies
 }
 
@@ -243,21 +234,17 @@ func (gb *GroupBase) URLTest(ctx context.Context, url string, expectedStatus uti
 	}
 }
 
-func (gb *GroupBase) onDialFailed(adapterType C.AdapterType, err error, fn func()) {
+func (gb *GroupBase) onDialFailed(adapterType C.AdapterType, err error) {
 	if adapterType == C.Direct || adapterType == C.Compatible || adapterType == C.Reject || adapterType == C.Pass || adapterType == C.RejectDrop {
 		return
 	}
 
-	if errors.Is(err, C.ErrNotSupport) {
+	if strings.Contains(err.Error(), "connection refused") {
+		go gb.healthCheck()
 		return
 	}
 
 	go func() {
-		if strings.Contains(err.Error(), "connection refused") {
-			fn()
-			return
-		}
-
 		gb.failedTestMux.Lock()
 		defer gb.failedTestMux.Unlock()
 
@@ -274,7 +261,7 @@ func (gb *GroupBase) onDialFailed(adapterType C.AdapterType, err error, fn func(
 			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())
-				fn()
+				gb.healthCheck()
 			}
 		}
 	}()

adapter/outboundgroup/loadbalance.go

@@ -9,10 +9,12 @@ import (
 	"sync"
 	"time"
 
+	"github.com/metacubex/mihomo/adapter/outbound"
 	"github.com/metacubex/mihomo/common/callback"
 	"github.com/metacubex/mihomo/common/lru"
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/common/utils"
+	"github.com/metacubex/mihomo/component/dialer"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/constant/provider"
 
@@ -86,14 +88,14 @@ func jumpHash(key uint64, buckets int32) int32 {
 }
 
 // DialContext implements C.ProxyAdapter
-func (lb *LoadBalance) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Conn, err error) {
+func (lb *LoadBalance) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (c C.Conn, err error) {
 	proxy := lb.Unwrap(metadata, true)
-	c, err = proxy.DialContext(ctx, metadata)
+	c, err = proxy.DialContext(ctx, metadata, lb.Base.DialOptions(opts...)...)
 
 	if err == nil {
 		c.AppendToChains(lb)
 	} else {
-		lb.onDialFailed(proxy.Type(), err, lb.healthCheck)
+		lb.onDialFailed(proxy.Type(), err)
 	}
 
 	if N.NeedHandshake(c) {
@@ -101,7 +103,7 @@ func (lb *LoadBalance) DialContext(ctx context.Context, metadata *C.Metadata) (c
 			if err == nil {
 				lb.onDialSuccess()
 			} else {
-				lb.onDialFailed(proxy.Type(), err, lb.healthCheck)
+				lb.onDialFailed(proxy.Type(), err)
 			}
 		})
 	}
@@ -110,7 +112,7 @@ func (lb *LoadBalance) DialContext(ctx context.Context, metadata *C.Metadata) (c
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (lb *LoadBalance) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (pc C.PacketConn, err error) {
+func (lb *LoadBalance) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (pc C.PacketConn, err error) {
 	defer func() {
 		if err == nil {
 			pc.AppendToChains(lb)
@@ -118,7 +120,7 @@ func (lb *LoadBalance) ListenPacketContext(ctx context.Context, metadata *C.Meta
 	}()
 
 	proxy := lb.Unwrap(metadata, true)
-	return proxy.ListenPacketContext(ctx, metadata)
+	return proxy.ListenPacketContext(ctx, metadata, lb.Base.DialOptions(opts...)...)
 }
 
 // SupportUDP implements C.ProxyAdapter
@@ -202,7 +204,8 @@ func strategyStickySessions(url string) strategyFn {
 		for i := 1; i < maxRetry; i++ {
 			proxy := proxies[nowIdx]
 			if proxy.AliveForTestUrl(url) {
-				if !has || nowIdx != idx {
+				if nowIdx != idx {
+					lruCache.Delete(key)
 					lruCache.Set(key, nowIdx)
 				}
 
@@ -212,6 +215,7 @@ func strategyStickySessions(url string) strategyFn {
 			}
 		}
 
+		lruCache.Delete(key)
 		lruCache.Set(key, 0)
 		return proxies[0]
 	}
@@ -253,14 +257,18 @@ func NewLoadBalance(option *GroupCommonOption, providers []provider.ProxyProvide
 	}
 	return &LoadBalance{
 		GroupBase: NewGroupBase(GroupBaseOption{
-			Name:           option.Name,
+			outbound.BaseOption{
-			Type:           C.LoadBalance,
+				Name:        option.Name,
-			Filter:         option.Filter,
+				Type:        C.LoadBalance,
-			ExcludeFilter:  option.ExcludeFilter,
+				Interface:   option.Interface,
-			ExcludeType:    option.ExcludeType,
+				RoutingMark: option.RoutingMark,
-			TestTimeout:    option.TestTimeout,
+			},
-			MaxFailedTimes: option.MaxFailedTimes,
+			option.Filter,
-			Providers:      providers,
+			option.ExcludeFilter,
+			option.ExcludeType,
+			option.TestTimeout,
+			option.MaxFailedTimes,
+			providers,
 		}),
 		strategyFn:     strategyFn,
 		disableUDP:     option.DisableUDP,

adapter/outboundgroup/parser.go

@@ -5,14 +5,12 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/dlclark/regexp2"
+	"github.com/metacubex/mihomo/adapter/outbound"
-
 	"github.com/metacubex/mihomo/adapter/provider"
 	"github.com/metacubex/mihomo/common/structure"
 	"github.com/metacubex/mihomo/common/utils"
 	C "github.com/metacubex/mihomo/constant"
 	types "github.com/metacubex/mihomo/constant/provider"
-	"github.com/metacubex/mihomo/log"
 )
 
 var (
@@ -23,6 +21,7 @@ var (
 )
 
 type GroupCommonOption struct {
+	outbound.BasicOption
 	Name                string   `group:"name"`
 	Type                string   `group:"type"`
 	Proxies             []string `group:"proxies,omitempty"`
@@ -42,10 +41,6 @@ type GroupCommonOption struct {
 	IncludeAllProviders bool     `group:"include-all-providers,omitempty"`
 	Hidden              bool     `group:"hidden,omitempty"`
 	Icon                string   `group:"icon,omitempty"`
-
-	// removed configs, only for error logging
-	Interface   string `group:"interface-name,omitempty"`
-	RoutingMark int    `group:"routing-mark,omitempty"`
 }
 
 func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, providersMap map[string]types.ProxyProvider, AllProxies []string, AllProviders []string) (C.ProxyAdapter, error) {
@@ -62,13 +57,6 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
 		return nil, errFormat
 	}
 
-	if groupOption.RoutingMark != 0 {
-		log.Errorln("The group [%s] with routing-mark configuration was removed, please set it directly on the proxy instead", groupOption.Name)
-	}
-	if groupOption.Interface != "" {
-		log.Errorln("The group [%s] with interface-name configuration was removed, please set it directly on the proxy instead", groupOption.Name)
-	}
-
 	groupName := groupOption.Name
 
 	providers := []types.ProxyProvider{}
@@ -79,28 +67,10 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
 	}
 
 	if groupOption.IncludeAllProviders {
-		groupOption.Use = AllProviders
+		groupOption.Use = append(groupOption.Use, AllProviders...)
 	}
 	if groupOption.IncludeAllProxies {
-		if groupOption.Filter != "" {
+		groupOption.Proxies = append(groupOption.Proxies, AllProxies...)
-			var filterRegs []*regexp2.Regexp
-			for _, filter := range strings.Split(groupOption.Filter, "`") {
-				filterReg := regexp2.MustCompile(filter, regexp2.None)
-				filterRegs = append(filterRegs, filterReg)
-			}
-			for _, p := range AllProxies {
-				for _, filterReg := range filterRegs {
-					if mat, _ := filterReg.MatchString(p); mat {
-						groupOption.Proxies = append(groupOption.Proxies, p)
-					}
-				}
-			}
-		} else {
-			groupOption.Proxies = append(groupOption.Proxies, AllProxies...)
-		}
-		if len(groupOption.Proxies) == 0 && len(groupOption.Use) == 0 {
-			groupOption.Proxies = []string{"COMPATIBLE"}
-		}
 	}
 
 	if len(groupOption.Proxies) == 0 && len(groupOption.Use) == 0 {

adapter/outboundgroup/relay.go

@@ -9,7 +9,6 @@ import (
 	"github.com/metacubex/mihomo/component/proxydialer"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/constant/provider"
-	"github.com/metacubex/mihomo/log"
 )
 
 type Relay struct {
@@ -19,17 +18,17 @@ type Relay struct {
 }
 
 // DialContext implements C.ProxyAdapter
-func (r *Relay) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
+func (r *Relay) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
 	proxies, chainProxies := r.proxies(metadata, true)
 
 	switch len(proxies) {
 	case 0:
-		return outbound.NewDirect().DialContext(ctx, metadata)
+		return outbound.NewDirect().DialContext(ctx, metadata, r.Base.DialOptions(opts...)...)
 	case 1:
-		return proxies[0].DialContext(ctx, metadata)
+		return proxies[0].DialContext(ctx, metadata, r.Base.DialOptions(opts...)...)
 	}
 	var d C.Dialer
-	d = dialer.NewDialer()
+	d = dialer.NewDialer(r.Base.DialOptions(opts...)...)
 	for _, proxy := range proxies[:len(proxies)-1] {
 		d = proxydialer.New(proxy, d, false)
 	}
@@ -49,18 +48,18 @@ func (r *Relay) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn,
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (r *Relay) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
+func (r *Relay) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
 	proxies, chainProxies := r.proxies(metadata, true)
 
 	switch len(proxies) {
 	case 0:
-		return outbound.NewDirect().ListenPacketContext(ctx, metadata)
+		return outbound.NewDirect().ListenPacketContext(ctx, metadata, r.Base.DialOptions(opts...)...)
 	case 1:
-		return proxies[0].ListenPacketContext(ctx, metadata)
+		return proxies[0].ListenPacketContext(ctx, metadata, r.Base.DialOptions(opts...)...)
 	}
 
 	var d C.Dialer
-	d = dialer.NewDialer()
+	d = dialer.NewDialer(r.Base.DialOptions(opts...)...)
 	for _, proxy := range proxies[:len(proxies)-1] {
 		d = proxydialer.New(proxy, d, false)
 	}
@@ -150,12 +149,20 @@ func (r *Relay) Addr() string {
 }
 
 func NewRelay(option *GroupCommonOption, providers []provider.ProxyProvider) *Relay {
-	log.Warnln("The group [%s] with relay type is deprecated, please using dialer-proxy instead", option.Name)
 	return &Relay{
 		GroupBase: NewGroupBase(GroupBaseOption{
-			Name:      option.Name,
+			outbound.BaseOption{
-			Type:      C.Relay,
+				Name:        option.Name,
-			Providers: providers,
+				Type:        C.Relay,
+				Interface:   option.Interface,
+				RoutingMark: option.RoutingMark,
+			},
+			"",
+			"",
+			"",
+			5000,
+			5,
+			providers,
 		}),
 		Hidden: option.Hidden,
 		Icon:   option.Icon,

adapter/outboundgroup/selector.go

@@ -5,6 +5,8 @@ import (
 	"encoding/json"
 	"errors"
 
+	"github.com/metacubex/mihomo/adapter/outbound"
+	"github.com/metacubex/mihomo/component/dialer"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/constant/provider"
 )
@@ -13,14 +15,13 @@ type Selector struct {
 	*GroupBase
 	disableUDP bool
 	selected   string
-	testUrl    string
 	Hidden     bool
 	Icon       string
 }
 
 // DialContext implements C.ProxyAdapter
-func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
+func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
-	c, err := s.selectedProxy(true).DialContext(ctx, metadata)
+	c, err := s.selectedProxy(true).DialContext(ctx, metadata, s.Base.DialOptions(opts...)...)
 	if err == nil {
 		c.AppendToChains(s)
 	}
@@ -28,8 +29,8 @@ func (s *Selector) DialContext(ctx context.Context, metadata *C.Metadata) (C.Con
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (s *Selector) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (s *Selector) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	pc, err := s.selectedProxy(true).ListenPacketContext(ctx, metadata)
+	pc, err := s.selectedProxy(true).ListenPacketContext(ctx, metadata, s.Base.DialOptions(opts...)...)
 	if err == nil {
 		pc.AppendToChains(s)
 	}
@@ -56,20 +57,13 @@ func (s *Selector) MarshalJSON() ([]byte, error) {
 	for _, proxy := range s.GetProxies(false) {
 		all = append(all, proxy.Name())
 	}
-	// When testurl is the default value
-	// do not append a value to ensure that the web dashboard follows the settings of the dashboard
-	var url string
-	if s.testUrl != C.DefaultTestURL {
-		url = s.testUrl
-	}
 
 	return json.Marshal(map[string]any{
-		"type":    s.Type().String(),
+		"type":   s.Type().String(),
-		"now":     s.Now(),
+		"now":    s.Now(),
-		"all":     all,
+		"all":    all,
-		"testUrl": url,
+		"hidden": s.Hidden,
-		"hidden":  s.Hidden,
+		"icon":   s.Icon,
-		"icon":    s.Icon,
 	})
 }
 
@@ -111,18 +105,21 @@ func (s *Selector) selectedProxy(touch bool) C.Proxy {
 func NewSelector(option *GroupCommonOption, providers []provider.ProxyProvider) *Selector {
 	return &Selector{
 		GroupBase: NewGroupBase(GroupBaseOption{
-			Name:           option.Name,
+			outbound.BaseOption{
-			Type:           C.Selector,
+				Name:        option.Name,
-			Filter:         option.Filter,
+				Type:        C.Selector,
-			ExcludeFilter:  option.ExcludeFilter,
+				Interface:   option.Interface,
-			ExcludeType:    option.ExcludeType,
+				RoutingMark: option.RoutingMark,
-			TestTimeout:    option.TestTimeout,
+			},
-			MaxFailedTimes: option.MaxFailedTimes,
+			option.Filter,
-			Providers:      providers,
+			option.ExcludeFilter,
+			option.ExcludeType,
+			option.TestTimeout,
+			option.MaxFailedTimes,
+			providers,
 		}),
 		selected:   "COMPATIBLE",
 		disableUDP: option.DisableUDP,
-		testUrl:    option.URL,
 		Hidden:     option.Hidden,
 		Icon:       option.Icon,
 	}

adapter/outboundgroup/urltest.go

@@ -4,12 +4,16 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
+	"sync"
 	"time"
 
+	"github.com/metacubex/mihomo/adapter/outbound"
 	"github.com/metacubex/mihomo/common/callback"
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/common/singledo"
 	"github.com/metacubex/mihomo/common/utils"
+	"github.com/metacubex/mihomo/component/dialer"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/constant/provider"
 )
@@ -50,23 +54,23 @@ func (u *URLTest) Set(name string) error {
 	if p == nil {
 		return errors.New("proxy not exist")
 	}
-	u.ForceSet(name)
+	u.selected = name
+	u.fast(false)
 	return nil
 }
 
 func (u *URLTest) ForceSet(name string) {
 	u.selected = name
-	u.fastSingle.Reset()
 }
 
 // DialContext implements C.ProxyAdapter
-func (u *URLTest) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Conn, err error) {
+func (u *URLTest) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (c C.Conn, err error) {
 	proxy := u.fast(true)
-	c, err = proxy.DialContext(ctx, metadata)
+	c, err = proxy.DialContext(ctx, metadata, u.Base.DialOptions(opts...)...)
 	if err == nil {
 		c.AppendToChains(u)
 	} else {
-		u.onDialFailed(proxy.Type(), err, u.healthCheck)
+		u.onDialFailed(proxy.Type(), err)
 	}
 
 	if N.NeedHandshake(c) {
@@ -74,7 +78,7 @@ func (u *URLTest) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Co
 			if err == nil {
 				u.onDialSuccess()
 			} else {
-				u.onDialFailed(proxy.Type(), err, u.healthCheck)
+				u.onDialFailed(proxy.Type(), err)
 			}
 		})
 	}
@@ -83,13 +87,10 @@ func (u *URLTest) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Co
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (u *URLTest) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (u *URLTest) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	proxy := u.fast(true)
+	pc, err := u.fast(true).ListenPacketContext(ctx, metadata, u.Base.DialOptions(opts...)...)
-	pc, err := proxy.ListenPacketContext(ctx, metadata)
 	if err == nil {
 		pc.AppendToChains(u)
-	} else {
-		u.onDialFailed(proxy.Type(), err, u.healthCheck)
 	}
 
 	return pc, err
@@ -100,27 +101,22 @@ func (u *URLTest) Unwrap(metadata *C.Metadata, touch bool) C.Proxy {
 	return u.fast(touch)
 }
 
-func (u *URLTest) healthCheck() {
-	u.fastSingle.Reset()
-	u.GroupBase.healthCheck()
-	u.fastSingle.Reset()
-}
-
 func (u *URLTest) fast(touch bool) C.Proxy {
-	elm, _, shared := u.fastSingle.Do(func() (C.Proxy, error) {
+
-		proxies := u.GetProxies(touch)
+	proxies := u.GetProxies(touch)
-		if u.selected != "" {
+	if u.selected != "" {
-			for _, proxy := range proxies {
+		for _, proxy := range proxies {
-				if !proxy.AliveForTestUrl(u.testUrl) {
+			if !proxy.AliveForTestUrl(u.testUrl) {
-					continue
+				continue
-				}
+			}
-				if proxy.Name() == u.selected {
+			if proxy.Name() == u.selected {
-					u.fastNode = proxy
+				u.fastNode = proxy
-					return proxy, nil
+				return proxy
-				}
 			}
 		}
+	}
 
+	elm, _, shared := u.fastSingle.Do(func() (C.Proxy, error) {
 		fast := proxies[0]
 		minDelay := fast.LastDelayForTestUrl(u.testUrl)
 		fastNotExist := true
@@ -186,7 +182,31 @@ func (u *URLTest) MarshalJSON() ([]byte, error) {
 }
 
 func (u *URLTest) URLTest(ctx context.Context, url string, expectedStatus utils.IntRanges[uint16]) (map[string]uint16, error) {
-	return u.GroupBase.URLTest(ctx, u.testUrl, expectedStatus)
+	var wg sync.WaitGroup
+	var lock sync.Mutex
+	mp := map[string]uint16{}
+	proxies := u.GetProxies(false)
+	for _, proxy := range proxies {
+		proxy := proxy
+		wg.Add(1)
+		go func() {
+			delay, err := proxy.URLTest(ctx, u.testUrl, expectedStatus)
+			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 parseURLTestOption(config map[string]any) []urlTestOption {
@@ -205,14 +225,19 @@ func parseURLTestOption(config map[string]any) []urlTestOption {
 func NewURLTest(option *GroupCommonOption, providers []provider.ProxyProvider, options ...urlTestOption) *URLTest {
 	urlTest := &URLTest{
 		GroupBase: NewGroupBase(GroupBaseOption{
-			Name:           option.Name,
+			outbound.BaseOption{
-			Type:           C.URLTest,
+				Name:        option.Name,
-			Filter:         option.Filter,
+				Type:        C.URLTest,
-			ExcludeFilter:  option.ExcludeFilter,
+				Interface:   option.Interface,
-			ExcludeType:    option.ExcludeType,
+				RoutingMark: option.RoutingMark,
-			TestTimeout:    option.TestTimeout,
+			},
-			MaxFailedTimes: option.MaxFailedTimes,
+
-			Providers:      providers,
+			option.Filter,
+			option.ExcludeFilter,
+			option.ExcludeType,
+			option.TestTimeout,
+			option.MaxFailedTimes,
+			providers,
 		}),
 		fastSingle:     singledo.NewSingle[C.Proxy](time.Second * 10),
 		disableUDP:     option.DisableUDP,

adapter/outboundgroup/util.go

@@ -4,7 +4,3 @@ type SelectAble interface {
 	Set(string) error
 	ForceSet(name string)
 }
-
-var _ SelectAble = (*Fallback)(nil)
-var _ SelectAble = (*URLTest)(nil)
-var _ SelectAble = (*Selector)(nil)

adapter/parser.go

@@ -3,6 +3,8 @@ package adapter
 import (
 	"fmt"
 
+	tlsC "github.com/metacubex/mihomo/component/tls"
+
 	"github.com/metacubex/mihomo/adapter/outbound"
 	"github.com/metacubex/mihomo/common/structure"
 	C "github.com/metacubex/mihomo/constant"
@@ -16,12 +18,12 @@ func ParseProxy(mapping map[string]any) (C.Proxy, error) {
 	}
 
 	var (
-		proxy outbound.ProxyAdapter
+		proxy C.ProxyAdapter
 		err   error
 	)
 	switch proxyType {
 	case "ss":
-		ssOption := &outbound.ShadowSocksOption{}
+		ssOption := &outbound.ShadowSocksOption{ClientFingerprint: tlsC.GetGlobalFingerprint()}
 		err = decoder.Decode(mapping, ssOption)
 		if err != nil {
 			break
@@ -54,6 +56,7 @@ func ParseProxy(mapping map[string]any) (C.Proxy, error) {
 				Method: "GET",
 				Path:   []string{"/"},
 			},
+			ClientFingerprint: tlsC.GetGlobalFingerprint(),
 		}
 
 		err = decoder.Decode(mapping, vmessOption)
@@ -62,7 +65,7 @@ func ParseProxy(mapping map[string]any) (C.Proxy, error) {
 		}
 		proxy, err = outbound.NewVmess(*vmessOption)
 	case "vless":
-		vlessOption := &outbound.VlessOption{}
+		vlessOption := &outbound.VlessOption{ClientFingerprint: tlsC.GetGlobalFingerprint()}
 		err = decoder.Decode(mapping, vlessOption)
 		if err != nil {
 			break
@@ -76,7 +79,7 @@ func ParseProxy(mapping map[string]any) (C.Proxy, error) {
 		}
 		proxy, err = outbound.NewSnell(*snellOption)
 	case "trojan":
-		trojanOption := &outbound.TrojanOption{}
+		trojanOption := &outbound.TrojanOption{ClientFingerprint: tlsC.GetGlobalFingerprint()}
 		err = decoder.Decode(mapping, trojanOption)
 		if err != nil {
 			break
@@ -138,20 +141,6 @@ func ParseProxy(mapping map[string]any) (C.Proxy, error) {
 			break
 		}
 		proxy, err = outbound.NewSsh(*sshOption)
-	case "mieru":
-		mieruOption := &outbound.MieruOption{}
-		err = decoder.Decode(mapping, mieruOption)
-		if err != nil {
-			break
-		}
-		proxy, err = outbound.NewMieru(*mieruOption)
-	case "anytls":
-		anytlsOption := &outbound.AnyTLSOption{}
-		err = decoder.Decode(mapping, anytlsOption)
-		if err != nil {
-			break
-		}
-		proxy, err = outbound.NewAnyTLS(*anytlsOption)
 	default:
 		return nil, fmt.Errorf("unsupport proxy type: %s", proxyType)
 	}
@@ -167,13 +156,12 @@ func ParseProxy(mapping map[string]any) (C.Proxy, error) {
 			return nil, err
 		}
 		if muxOption.Enabled {
-			proxy, err = outbound.NewSingMux(*muxOption, proxy)
+			proxy, err = outbound.NewSingMux(*muxOption, proxy, proxy.(outbound.ProxyBase))
 			if err != nil {
 				return nil, err
 			}
 		}
 	}
 
-	proxy = outbound.NewAutoCloseProxyAdapter(proxy)
 	return NewProxy(proxy), nil
 }

adapter/provider/healthcheck.go

@@ -7,13 +7,13 @@ import (
 	"time"
 
 	"github.com/metacubex/mihomo/common/atomic"
+	"github.com/metacubex/mihomo/common/batch"
 	"github.com/metacubex/mihomo/common/singledo"
 	"github.com/metacubex/mihomo/common/utils"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/log"
 
 	"github.com/dlclark/regexp2"
-	"golang.org/x/sync/errgroup"
 )
 
 type HealthCheckOption struct {
@@ -27,8 +27,6 @@ type extraOption struct {
 }
 
 type HealthCheck struct {
-	ctx            context.Context
-	ctxCancel      context.CancelFunc
 	url            string
 	extra          map[string]*extraOption
 	mu             sync.Mutex
@@ -38,6 +36,7 @@ type HealthCheck struct {
 	lazy           bool
 	expectedStatus utils.IntRanges[uint16]
 	lastTouch      atomic.TypedValue[time.Time]
+	done           chan struct{}
 	singleDo       *singledo.Single[struct{}]
 	timeout        time.Duration
 }
@@ -60,7 +59,7 @@ func (hc *HealthCheck) process() {
 			} else {
 				log.Debugln("Skip once health check because we are lazy")
 			}
-		case <-hc.ctx.Done():
+		case <-hc.done:
 			ticker.Stop()
 			hc.stop()
 			return
@@ -147,8 +146,7 @@ func (hc *HealthCheck) check() {
 	_, _, _ = hc.singleDo.Do(func() (struct{}, error) {
 		id := utils.NewUUIDV4().String()
 		log.Debugln("Start New Health Checking {%s}", id)
-		b := new(errgroup.Group)
+		b, _ := batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](10))
-		b.SetLimit(10)
 
 		// execute default health check
 		option := &extraOption{filters: nil, expectedStatus: hc.expectedStatus}
@@ -160,13 +158,13 @@ func (hc *HealthCheck) check() {
 				hc.execute(b, url, id, option)
 			}
 		}
-		_ = b.Wait()
+		b.Wait()
 		log.Debugln("Finish A Health Checking {%s}", id)
 		return struct{}{}, nil
 	})
 }
 
-func (hc *HealthCheck) execute(b *errgroup.Group, url, uid string, option *extraOption) {
+func (hc *HealthCheck) execute(b *batch.Batch[bool], url, uid string, option *extraOption) {
 	url = strings.TrimSpace(url)
 	if len(url) == 0 {
 		log.Debugln("Health Check has been skipped due to testUrl is empty, {%s}", uid)
@@ -183,32 +181,32 @@ func (hc *HealthCheck) execute(b *errgroup.Group, url, uid string, option *extra
 				filters = append(filters, filter)
 			}
 
-			filterReg = regexp2.MustCompile(strings.Join(filters, "|"), regexp2.None)
+			filterReg = regexp2.MustCompile(strings.Join(filters, "|"), 0)
 		}
 	}
 
 	for _, proxy := range hc.proxies {
 		// skip proxies that do not require health check
 		if filterReg != nil {
-			if match, _ := filterReg.MatchString(proxy.Name()); !match {
+			if match, _ := filterReg.FindStringMatch(proxy.Name()); match == nil {
 				continue
 			}
 		}
 
 		p := proxy
-		b.Go(func() error {
+		b.Go(p.Name(), func() (bool, error) {
-			ctx, cancel := context.WithTimeout(hc.ctx, hc.timeout)
+			ctx, cancel := context.WithTimeout(context.Background(), hc.timeout)
 			defer cancel()
 			log.Debugln("Health Checking, proxy: %s, url: %s, id: {%s}", p.Name(), url, uid)
 			_, _ = p.URLTest(ctx, url, expectedStatus)
 			log.Debugln("Health Checked, proxy: %s, url: %s, alive: %t, delay: %d ms uid: {%s}", p.Name(), url, p.AliveForTestUrl(url), p.LastDelayForTestUrl(url), uid)
-			return nil
+			return false, nil
 		})
 	}
 }
 
 func (hc *HealthCheck) close() {
-	hc.ctxCancel()
+	hc.done <- struct{}{}
 }
 
 func NewHealthCheck(proxies []C.Proxy, url string, timeout uint, interval uint, lazy bool, expectedStatus utils.IntRanges[uint16]) *HealthCheck {
@@ -219,11 +217,8 @@ func NewHealthCheck(proxies []C.Proxy, url string, timeout uint, interval uint,
 	if timeout == 0 {
 		timeout = 5000
 	}
-	ctx, cancel := context.WithCancel(context.Background())
 
 	return &HealthCheck{
-		ctx:            ctx,
-		ctxCancel:      cancel,
 		proxies:        proxies,
 		url:            url,
 		timeout:        time.Duration(timeout) * time.Millisecond,
@@ -231,6 +226,7 @@ func NewHealthCheck(proxies []C.Proxy, url string, timeout uint, interval uint,
 		interval:       time.Duration(interval) * time.Second,
 		lazy:           lazy,
 		expectedStatus: expectedStatus,
+		done:           make(chan struct{}, 1),
 		singleDo:       singledo.NewSingle[struct{}](time.Second),
 	}
 }

adapter/provider/parser.go

@@ -1,7 +1,6 @@
 package provider
 
 import (
-	"encoding"
 	"errors"
 	"fmt"
 	"time"
@@ -10,9 +9,8 @@ import (
 	"github.com/metacubex/mihomo/common/utils"
 	"github.com/metacubex/mihomo/component/resource"
 	C "github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/constant/features"
 	types "github.com/metacubex/mihomo/constant/provider"
-
-	"github.com/dlclark/regexp2"
 )
 
 var (
@@ -29,20 +27,8 @@ type healthCheckSchema struct {
 	ExpectedStatus string `provider:"expected-status,omitempty"`
 }
 
-type OverrideProxyNameSchema struct {
-	// matching expression for regex replacement
-	Pattern *regexp2.Regexp `provider:"pattern"`
-	// the new content after regex matching
-	Target string `provider:"target"`
-}
-
-var _ encoding.TextUnmarshaler = (*regexp2.Regexp)(nil) // ensure *regexp2.Regexp can decode direct by structure package
-
 type OverrideSchema struct {
-	TFO              *bool   `provider:"tfo,omitempty"`
-	MPTcp            *bool   `provider:"mptcp,omitempty"`
 	UDP              *bool   `provider:"udp,omitempty"`
-	UDPOverTCP       *bool   `provider:"udp-over-tcp,omitempty"`
 	Up               *string `provider:"up,omitempty"`
 	Down             *string `provider:"down,omitempty"`
 	DialerProxy      *string `provider:"dialer-proxy,omitempty"`
@@ -52,22 +38,18 @@ type OverrideSchema struct {
 	IPVersion        *string `provider:"ip-version,omitempty"`
 	AdditionalPrefix *string `provider:"additional-prefix,omitempty"`
 	AdditionalSuffix *string `provider:"additional-suffix,omitempty"`
-
-	ProxyName []OverrideProxyNameSchema `provider:"proxy-name,omitempty"`
 }
 
 type proxyProviderSchema struct {
-	Type          string           `provider:"type"`
+	Type          string `provider:"type"`
-	Path          string           `provider:"path,omitempty"`
+	Path          string `provider:"path,omitempty"`
-	URL           string           `provider:"url,omitempty"`
+	URL           string `provider:"url,omitempty"`
-	Proxy         string           `provider:"proxy,omitempty"`
+	Proxy         string `provider:"proxy,omitempty"`
-	Interval      int              `provider:"interval,omitempty"`
+	Interval      int    `provider:"interval,omitempty"`
-	Filter        string           `provider:"filter,omitempty"`
+	Filter        string `provider:"filter,omitempty"`
-	ExcludeFilter string           `provider:"exclude-filter,omitempty"`
+	ExcludeFilter string `provider:"exclude-filter,omitempty"`
-	ExcludeType   string           `provider:"exclude-type,omitempty"`
+	ExcludeType   string `provider:"exclude-type,omitempty"`
-	DialerProxy   string           `provider:"dialer-proxy,omitempty"`
+	DialerProxy   string `provider:"dialer-proxy,omitempty"`
-	SizeLimit     int64            `provider:"size-limit,omitempty"`
-	Payload       []map[string]any `provider:"payload,omitempty"`
 
 	HealthCheck healthCheckSchema   `provider:"health-check,omitempty"`
 	Override    OverrideSchema      `provider:"override,omitempty"`
@@ -100,11 +82,6 @@ func ParseProxyProvider(name string, mapping map[string]any) (types.ProxyProvide
 	}
 	hc := NewHealthCheck([]C.Proxy{}, schema.HealthCheck.URL, uint(schema.HealthCheck.TestTimeout), hcInterval, schema.HealthCheck.Lazy, expectedStatus)
 
-	parser, err := NewProxiesParser(schema.Filter, schema.ExcludeFilter, schema.ExcludeType, schema.DialerProxy, schema.Override)
-	if err != nil {
-		return nil, err
-	}
-
 	var vehicle types.Vehicle
 	switch schema.Type {
 	case "file":
@@ -114,18 +91,21 @@ func ParseProxyProvider(name string, mapping map[string]any) (types.ProxyProvide
 		path := C.Path.GetPathByHash("proxies", schema.URL)
 		if schema.Path != "" {
 			path = C.Path.Resolve(schema.Path)
-			if !C.Path.IsSafePath(path) {
+			if !features.CMFA && !C.Path.IsSafePath(path) {
 				return nil, fmt.Errorf("%w: %s", errSubPath, path)
 			}
 		}
-		vehicle = resource.NewHTTPVehicle(schema.URL, path, schema.Proxy, schema.Header, resource.DefaultHttpTimeout, schema.SizeLimit)
+		vehicle = resource.NewHTTPVehicle(schema.URL, path, schema.Proxy, schema.Header)
-	case "inline":
-		return NewInlineProvider(name, schema.Payload, parser, hc)
 	default:
 		return nil, fmt.Errorf("%w: %s", errVehicleType, schema.Type)
 	}
 
 	interval := time.Duration(uint(schema.Interval)) * time.Second
+	filter := schema.Filter
+	excludeFilter := schema.ExcludeFilter
+	excludeType := schema.ExcludeType
+	dialerProxy := schema.DialerProxy
+	override := schema.Override
 
-	return NewProxySetProvider(name, interval, schema.Payload, parser, vehicle, hc)
+	return NewProxySetProvider(name, interval, filter, excludeFilter, excludeType, dialerProxy, override, vehicle, hc)
 }

adapter/provider/patch_android.go

@@ -0,0 +1,36 @@
+//go:build android && cmfa
+
+package provider
+
+import (
+	"time"
+)
+
+var (
+	suspended bool
+)
+
+type UpdatableProvider interface {
+	UpdatedAt() time.Time
+}
+
+func (pp *proxySetProvider) UpdatedAt() time.Time {
+	return pp.Fetcher.UpdatedAt
+}
+
+func (pp *proxySetProvider) Close() error {
+	pp.healthCheck.close()
+	pp.Fetcher.Destroy()
+
+	return nil
+}
+
+func (cp *compatibleProvider) Close() error {
+	cp.healthCheck.close()
+
+	return nil
+}
+
+func Suspend(s bool) {
+	suspended = s
+}

adapter/provider/provider.go

@@ -1,11 +1,11 @@
 package provider
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
-	"reflect"
 	"runtime"
 	"strings"
 	"time"
@@ -13,10 +13,11 @@ import (
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/common/convert"
 	"github.com/metacubex/mihomo/common/utils"
-	"github.com/metacubex/mihomo/component/profile/cachefile"
+	mihomoHttp "github.com/metacubex/mihomo/component/http"
 	"github.com/metacubex/mihomo/component/resource"
 	C "github.com/metacubex/mihomo/constant"
 	types "github.com/metacubex/mihomo/constant/provider"
+	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/tunnel/statistic"
 
 	"github.com/dlclark/regexp2"
@@ -31,119 +32,125 @@ type ProxySchema struct {
 	Proxies []map[string]any `yaml:"proxies"`
 }
 
-type providerForApi struct {
-	Name             string            `json:"name"`
-	Type             string            `json:"type"`
-	VehicleType      string            `json:"vehicleType"`
-	Proxies          []C.Proxy         `json:"proxies"`
-	TestUrl          string            `json:"testUrl"`
-	ExpectedStatus   string            `json:"expectedStatus"`
-	UpdatedAt        time.Time         `json:"updatedAt,omitempty"`
-	SubscriptionInfo *SubscriptionInfo `json:"subscriptionInfo,omitempty"`
-}
-
-type baseProvider struct {
-	name        string
-	proxies     []C.Proxy
-	healthCheck *HealthCheck
-	version     uint32
-}
-
-func (bp *baseProvider) Name() string {
-	return bp.name
-}
-
-func (bp *baseProvider) Version() uint32 {
-	return bp.version
-}
-
-func (bp *baseProvider) HealthCheck() {
-	bp.healthCheck.check()
-}
-
-func (bp *baseProvider) Type() types.ProviderType {
-	return types.Proxy
-}
-
-func (bp *baseProvider) Proxies() []C.Proxy {
-	return bp.proxies
-}
-
-func (bp *baseProvider) Count() int {
-	return len(bp.proxies)
-}
-
-func (bp *baseProvider) Touch() {
-	bp.healthCheck.touch()
-}
-
-func (bp *baseProvider) HealthCheckURL() string {
-	return bp.healthCheck.url
-}
-
-func (bp *baseProvider) RegisterHealthCheckTask(url string, expectedStatus utils.IntRanges[uint16], filter string, interval uint) {
-	bp.healthCheck.registerHealthCheckTask(url, expectedStatus, filter, interval)
-}
-
-func (bp *baseProvider) setProxies(proxies []C.Proxy) {
-	bp.proxies = proxies
-	bp.version += 1
-	bp.healthCheck.setProxy(proxies)
-	if bp.healthCheck.auto() {
-		go bp.healthCheck.check()
-	}
-}
-
-func (bp *baseProvider) Close() error {
-	bp.healthCheck.close()
-	return nil
-}
-
 // ProxySetProvider for auto gc
 type ProxySetProvider struct {
 	*proxySetProvider
 }
 
 type proxySetProvider struct {
-	baseProvider
 	*resource.Fetcher[[]C.Proxy]
+	proxies          []C.Proxy
+	healthCheck      *HealthCheck
+	version          uint32
 	subscriptionInfo *SubscriptionInfo
 }
 
 func (pp *proxySetProvider) MarshalJSON() ([]byte, error) {
-	return json.Marshal(providerForApi{
+	return json.Marshal(map[string]any{
-		Name:             pp.Name(),
+		"name":             pp.Name(),
-		Type:             pp.Type().String(),
+		"type":             pp.Type().String(),
-		VehicleType:      pp.VehicleType().String(),
+		"vehicleType":      pp.VehicleType().String(),
-		Proxies:          pp.Proxies(),
+		"proxies":          pp.Proxies(),
-		TestUrl:          pp.healthCheck.url,
+		"testUrl":          pp.healthCheck.url,
-		ExpectedStatus:   pp.healthCheck.expectedStatus.String(),
+		"expectedStatus":   pp.healthCheck.expectedStatus.String(),
-		UpdatedAt:        pp.UpdatedAt(),
+		"updatedAt":        pp.UpdatedAt,
-		SubscriptionInfo: pp.subscriptionInfo,
+		"subscriptionInfo": pp.subscriptionInfo,
 	})
 }
 
+func (pp *proxySetProvider) Version() uint32 {
+	return pp.version
+}
+
 func (pp *proxySetProvider) Name() string {
 	return pp.Fetcher.Name()
 }
 
+func (pp *proxySetProvider) HealthCheck() {
+	pp.healthCheck.check()
+}
+
 func (pp *proxySetProvider) Update() error {
-	_, _, err := pp.Fetcher.Update()
+	elm, same, err := pp.Fetcher.Update()
+	if err == nil && !same {
+		pp.OnUpdate(elm)
+	}
 	return err
 }
 
 func (pp *proxySetProvider) Initial() error {
-	_, err := pp.Fetcher.Initial()
+	elm, err := pp.Fetcher.Initial()
 	if err != nil {
 		return err
 	}
-	if subscriptionInfo := cachefile.Cache().GetSubscriptionInfo(pp.Name()); subscriptionInfo != "" {
+	pp.OnUpdate(elm)
-		pp.subscriptionInfo = NewSubscriptionInfo(subscriptionInfo)
+	pp.getSubscriptionInfo()
-	}
 	pp.closeAllConnections()
 	return nil
 }
 
+func (pp *proxySetProvider) Type() types.ProviderType {
+	return types.Proxy
+}
+
+func (pp *proxySetProvider) Proxies() []C.Proxy {
+	return pp.proxies
+}
+
+func (pp *proxySetProvider) Touch() {
+	pp.healthCheck.touch()
+}
+
+func (pp *proxySetProvider) HealthCheckURL() string {
+	return pp.healthCheck.url
+}
+
+func (pp *proxySetProvider) RegisterHealthCheckTask(url string, expectedStatus utils.IntRanges[uint16], filter string, interval uint) {
+	pp.healthCheck.registerHealthCheckTask(url, expectedStatus, filter, interval)
+}
+
+func (pp *proxySetProvider) setProxies(proxies []C.Proxy) {
+	pp.proxies = proxies
+	pp.healthCheck.setProxy(proxies)
+	if pp.healthCheck.auto() {
+		go pp.healthCheck.check()
+	}
+}
+
+func (pp *proxySetProvider) getSubscriptionInfo() {
+	if pp.VehicleType() != types.HTTP {
+		return
+	}
+	go func() {
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*90)
+		defer cancel()
+		resp, err := mihomoHttp.HttpRequestWithProxy(ctx, pp.Vehicle().(*resource.HTTPVehicle).Url(),
+			http.MethodGet, http.Header{"User-Agent": {C.UA}}, nil, pp.Vehicle().Proxy())
+		if err != nil {
+			return
+		}
+		defer resp.Body.Close()
+
+		userInfoStr := strings.TrimSpace(resp.Header.Get("subscription-userinfo"))
+		if userInfoStr == "" {
+			resp2, err := mihomoHttp.HttpRequestWithProxy(ctx, pp.Vehicle().(*resource.HTTPVehicle).Url(),
+				http.MethodGet, http.Header{"User-Agent": {"Quantumultx"}}, nil, pp.Vehicle().Proxy())
+			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 (pp *proxySetProvider) closeAllConnections() {
 	statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
 		for _, chain := range c.Chains() {
@@ -156,147 +163,81 @@ func (pp *proxySetProvider) closeAllConnections() {
 	})
 }
 
-func (pp *proxySetProvider) Close() error {
+func stopProxyProvider(pd *ProxySetProvider) {
-	_ = pp.baseProvider.Close()
+	pd.healthCheck.close()
-	return pp.Fetcher.Close()
+	_ = pd.Fetcher.Destroy()
 }
 
-func NewProxySetProvider(name string, interval time.Duration, payload []map[string]any, parser resource.Parser[[]C.Proxy], vehicle types.Vehicle, hc *HealthCheck) (*ProxySetProvider, error) {
+func NewProxySetProvider(name string, interval time.Duration, filter string, excludeFilter string, excludeType string, dialerProxy string, override OverrideSchema, vehicle types.Vehicle, hc *HealthCheck) (*ProxySetProvider, error) {
+	excludeFilterReg, err := regexp2.Compile(excludeFilter, 0)
+	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()
 	}
 
 	pd := &proxySetProvider{
-		baseProvider: baseProvider{
+		proxies:     []C.Proxy{},
-			name:        name,
+		healthCheck: hc,
-			proxies:     []C.Proxy{},
-			healthCheck: hc,
-		},
 	}
 
-	if len(payload) > 0 { // using as fallback proxies
+	fetcher := resource.NewFetcher[[]C.Proxy](name, interval, vehicle, proxiesParseAndFilter(filter, excludeFilter, excludeTypeArray, filterRegs, excludeFilterReg, dialerProxy, override), proxiesOnUpdate(pd))
-		ps := ProxySchema{Proxies: payload}
-		buf, err := yaml.Marshal(ps)
-		if err != nil {
-			return nil, err
-		}
-		proxies, err := parser(buf)
-		if err != nil {
-			return nil, err
-		}
-		pd.proxies = proxies
-	}
-
-	fetcher := resource.NewFetcher[[]C.Proxy](name, interval, vehicle, parser, pd.setProxies)
 	pd.Fetcher = fetcher
-	if httpVehicle, ok := vehicle.(*resource.HTTPVehicle); ok {
-		httpVehicle.SetInRead(func(resp *http.Response) {
-			if subscriptionInfo := resp.Header.Get("subscription-userinfo"); subscriptionInfo != "" {
-				cachefile.Cache().SetSubscriptionInfo(name, subscriptionInfo)
-				pd.subscriptionInfo = NewSubscriptionInfo(subscriptionInfo)
-			}
-		})
-	}
-
 	wrapper := &ProxySetProvider{pd}
-	runtime.SetFinalizer(wrapper, (*ProxySetProvider).Close)
+	runtime.SetFinalizer(wrapper, stopProxyProvider)
 	return wrapper, nil
 }
 
-func (pp *ProxySetProvider) Close() error {
-	runtime.SetFinalizer(pp, nil)
-	return pp.proxySetProvider.Close()
-}
-
-// InlineProvider for auto gc
-type InlineProvider struct {
-	*inlineProvider
-}
-
-type inlineProvider struct {
-	baseProvider
-	updateAt time.Time
-}
-
-func (ip *inlineProvider) MarshalJSON() ([]byte, error) {
-	return json.Marshal(providerForApi{
-		Name:           ip.Name(),
-		Type:           ip.Type().String(),
-		VehicleType:    ip.VehicleType().String(),
-		Proxies:        ip.Proxies(),
-		TestUrl:        ip.healthCheck.url,
-		ExpectedStatus: ip.healthCheck.expectedStatus.String(),
-		UpdatedAt:      ip.updateAt,
-	})
-}
-
-func (ip *inlineProvider) VehicleType() types.VehicleType {
-	return types.Inline
-}
-
-func (ip *inlineProvider) Initial() error {
-	return nil
-}
-
-func (ip *inlineProvider) Update() error {
-	// make api update happy
-	ip.updateAt = time.Now()
-	return nil
-}
-
-func NewInlineProvider(name string, payload []map[string]any, parser resource.Parser[[]C.Proxy], hc *HealthCheck) (*InlineProvider, error) {
-	if hc.auto() {
-		go hc.process()
-	}
-
-	ps := ProxySchema{Proxies: payload}
-	buf, err := yaml.Marshal(ps)
-	if err != nil {
-		return nil, err
-	}
-	proxies, err := parser(buf)
-	if err != nil {
-		return nil, err
-	}
-
-	ip := &inlineProvider{
-		baseProvider: baseProvider{
-			name:        name,
-			proxies:     proxies,
-			healthCheck: hc,
-		},
-		updateAt: time.Now(),
-	}
-	wrapper := &InlineProvider{ip}
-	runtime.SetFinalizer(wrapper, (*InlineProvider).Close)
-	return wrapper, nil
-}
-
-func (ip *InlineProvider) Close() error {
-	runtime.SetFinalizer(ip, nil)
-	return ip.baseProvider.Close()
-}
-
 // CompatibleProvider for auto gc
 type CompatibleProvider struct {
 	*compatibleProvider
 }
 
 type compatibleProvider struct {
-	baseProvider
+	name        string
+	healthCheck *HealthCheck
+	proxies     []C.Proxy
+	version     uint32
 }
 
 func (cp *compatibleProvider) MarshalJSON() ([]byte, error) {
-	return json.Marshal(providerForApi{
+	return json.Marshal(map[string]any{
-		Name:           cp.Name(),
+		"name":           cp.Name(),
-		Type:           cp.Type().String(),
+		"type":           cp.Type().String(),
-		VehicleType:    cp.VehicleType().String(),
+		"vehicleType":    cp.VehicleType().String(),
-		Proxies:        cp.Proxies(),
+		"proxies":        cp.Proxies(),
-		TestUrl:        cp.healthCheck.url,
+		"testUrl":        cp.healthCheck.url,
-		ExpectedStatus: cp.healthCheck.expectedStatus.String(),
+		"expectedStatus": cp.healthCheck.expectedStatus.String(),
 	})
 }
 
+func (cp *compatibleProvider) Version() uint32 {
+	return cp.version
+}
+
+func (cp *compatibleProvider) Name() string {
+	return cp.name
+}
+
+func (cp *compatibleProvider) HealthCheck() {
+	cp.healthCheck.check()
+}
+
 func (cp *compatibleProvider) Update() error {
 	return nil
 }
@@ -312,6 +253,30 @@ func (cp *compatibleProvider) VehicleType() types.VehicleType {
 	return types.Compatible
 }
 
+func (cp *compatibleProvider) Type() types.ProviderType {
+	return types.Proxy
+}
+
+func (cp *compatibleProvider) Proxies() []C.Proxy {
+	return cp.proxies
+}
+
+func (cp *compatibleProvider) Touch() {
+	cp.healthCheck.touch()
+}
+
+func (cp *compatibleProvider) HealthCheckURL() string {
+	return cp.healthCheck.url
+}
+
+func (cp *compatibleProvider) RegisterHealthCheckTask(url string, expectedStatus utils.IntRanges[uint16], filter string, interval uint) {
+	cp.healthCheck.registerHealthCheckTask(url, expectedStatus, filter, interval)
+}
+
+func stopCompatibleProvider(pd *CompatibleProvider) {
+	pd.healthCheck.close()
+}
+
 func NewCompatibleProvider(name string, proxies []C.Proxy, hc *HealthCheck) (*CompatibleProvider, error) {
 	if len(proxies) == 0 {
 		return nil, errors.New("provider need one proxy at least")
@@ -322,42 +287,25 @@ func NewCompatibleProvider(name string, proxies []C.Proxy, hc *HealthCheck) (*Co
 	}
 
 	pd := &compatibleProvider{
-		baseProvider: baseProvider{
+		name:        name,
-			name:        name,
+		proxies:     proxies,
-			proxies:     proxies,
+		healthCheck: hc,
-			healthCheck: hc,
-		},
 	}
 
 	wrapper := &CompatibleProvider{pd}
-	runtime.SetFinalizer(wrapper, (*CompatibleProvider).Close)
+	runtime.SetFinalizer(wrapper, stopCompatibleProvider)
 	return wrapper, nil
 }
 
-func (cp *CompatibleProvider) Close() error {
+func proxiesOnUpdate(pd *proxySetProvider) func([]C.Proxy) {
-	runtime.SetFinalizer(cp, nil)
+	return func(elm []C.Proxy) {
-	return cp.compatibleProvider.Close()
+		pd.setProxies(elm)
+		pd.version += 1
+		pd.getSubscriptionInfo()
+	}
 }
 
-func NewProxiesParser(filter string, excludeFilter string, excludeType string, dialerProxy string, override OverrideSchema) (resource.Parser[[]C.Proxy], error) {
+func proxiesParseAndFilter(filter string, excludeFilter string, excludeTypeArray []string, filterRegs []*regexp2.Regexp, excludeFilterReg *regexp2.Regexp, dialerProxy string, override OverrideSchema) resource.Parser[[]C.Proxy] {
-	excludeFilterReg, err := regexp2.Compile(excludeFilter, regexp2.None)
-	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, regexp2.None)
-		if err != nil {
-			return nil, fmt.Errorf("invalid filter regex: %w", err)
-		}
-		filterRegs = append(filterRegs, filterReg)
-	}
-
 	return func(buf []byte) ([]C.Proxy, error) {
 		schema := &ProxySchema{}
 
@@ -408,12 +356,12 @@ func NewProxiesParser(filter string, excludeFilter string, excludeType string, d
 					continue
 				}
 				if len(excludeFilter) > 0 {
-					if mat, _ := excludeFilterReg.MatchString(name); mat {
+					if mat, _ := excludeFilterReg.FindStringMatch(name); mat != nil {
 						continue
 					}
 				}
 				if len(filter) > 0 {
-					if mat, _ := filterReg.MatchString(name); !mat {
+					if mat, _ := filterReg.FindStringMatch(name); mat == nil {
 						continue
 					}
 				}
@@ -425,33 +373,37 @@ func NewProxiesParser(filter string, excludeFilter string, excludeType string, d
 					mapping["dialer-proxy"] = dialerProxy
 				}
 
-				val := reflect.ValueOf(override)
+				if override.UDP != nil {
-				for i := 0; i < val.NumField(); i++ {
+					mapping["udp"] = *override.UDP
-					field := val.Field(i)
+				}
-					if field.IsNil() {
+				if override.Up != nil {
-						continue
+					mapping["up"] = *override.Up
-					}
+				}
-					fieldName := strings.Split(val.Type().Field(i).Tag.Get("provider"), ",")[0]
+				if override.Down != nil {
-					switch fieldName {
+					mapping["down"] = *override.Down
-					case "additional-prefix":
+				}
-						name := mapping["name"].(string)
+				if override.DialerProxy != nil {
-						mapping["name"] = *field.Interface().(*string) + name
+					mapping["dialer-proxy"] = *override.DialerProxy
-					case "additional-suffix":
+				}
-						name := mapping["name"].(string)
+				if override.SkipCertVerify != nil {
-						mapping["name"] = name + *field.Interface().(*string)
+					mapping["skip-cert-verify"] = *override.SkipCertVerify
-					case "proxy-name":
+				}
-						// Iterate through all naming replacement rules and perform the replacements.
+				if override.Interface != nil {
-						for _, expr := range override.ProxyName {
+					mapping["interface-name"] = *override.Interface
-							name := mapping["name"].(string)
+				}
-							newName, err := expr.Pattern.Replace(name, expr.Target, 0, -1)
+				if override.RoutingMark != nil {
-							if err != nil {
+					mapping["routing-mark"] = *override.RoutingMark
-								return nil, fmt.Errorf("proxy name replace error: %w", err)
+				}
-							}
+				if override.IPVersion != nil {
-							mapping["name"] = newName
+					mapping["ip-version"] = *override.IPVersion
-						}
+				}
-					default:
+				if override.AdditionalPrefix != nil {
-						mapping[fieldName] = field.Elem().Interface()
+					name := mapping["name"].(string)
-					}
+					mapping["name"] = *override.AdditionalPrefix + name
+				}
+				if override.AdditionalSuffix != nil {
+					name := mapping["name"].(string)
+					mapping["name"] = name + *override.AdditionalSuffix
 				}
 
 				proxy, err := adapter.ParseProxy(mapping)
@@ -472,5 +424,5 @@ func NewProxiesParser(filter string, excludeFilter string, excludeType string, d
 		}
 
 		return proxies, nil
-	}, nil
+	}
 }

adapter/provider/subscription_info.go

@@ -1,11 +1,8 @@
 package provider
 
 import (
-	"fmt"
 	"strconv"
 	"strings"
-
-	"github.com/metacubex/mihomo/log"
 )
 
 type SubscriptionInfo struct {
@@ -15,44 +12,28 @@ type SubscriptionInfo struct {
 	Expire   int64
 }
 
-func NewSubscriptionInfo(userinfo string) (si *SubscriptionInfo) {
+func NewSubscriptionInfo(userinfo string) (si *SubscriptionInfo, err error) {
-	userinfo = strings.ReplaceAll(strings.ToLower(userinfo), " ", "")
+	userinfo = strings.ToLower(userinfo)
+	userinfo = strings.ReplaceAll(userinfo, " ", "")
 	si = new(SubscriptionInfo)
-
 	for _, field := range strings.Split(userinfo, ";") {
-		name, value, ok := strings.Cut(field, "=")
+		switch name, value, _ := strings.Cut(field, "="); name {
-		if !ok {
-			continue
-		}
-
-		intValue, err := parseValue(value)
-		if err != nil {
-			log.Warnln("[Provider] get subscription-userinfo: %e", err)
-			continue
-		}
-
-		switch name {
 		case "upload":
-			si.Upload = intValue
+			si.Upload, err = strconv.ParseInt(value, 10, 64)
 		case "download":
-			si.Download = intValue
+			si.Download, err = strconv.ParseInt(value, 10, 64)
 		case "total":
-			si.Total = intValue
+			si.Total, err = strconv.ParseInt(value, 10, 64)
 		case "expire":
-			si.Expire = intValue
+			if value == "" {
+				si.Expire = 0
+			} else {
+				si.Expire, err = strconv.ParseInt(value, 10, 64)
+			}
+		}
+		if err != nil {
+			return
 		}
 	}
-	return si
+	return
-}
-
-func parseValue(value string) (int64, error) {
-	if intValue, err := strconv.ParseInt(value, 10, 64); err == nil {
-		return intValue, nil
-	}
-
-	if floatValue, err := strconv.ParseFloat(value, 64); err == nil {
-		return int64(floatValue), nil
-	}
-
-	return 0, fmt.Errorf("failed to parse value '%s'", value)
 }

common/arc/arc.go

@@ -33,8 +33,15 @@ type ARC[K comparable, V any] struct {
 
 // New returns a new Adaptive Replacement Cache (ARC).
 func New[K comparable, V any](options ...Option[K, V]) *ARC[K, V] {
-	arc := &ARC[K, V]{}
+	arc := &ARC[K, V]{
-	arc.Clear()
+		p:     0,
+		t1:    list.New[*entry[K, V]](),
+		b1:    list.New[*entry[K, V]](),
+		t2:    list.New[*entry[K, V]](),
+		b2:    list.New[*entry[K, V]](),
+		len:   0,
+		cache: make(map[K]*entry[K, V]),
+	}
 
 	for _, option := range options {
 		option(arc)
@@ -42,19 +49,6 @@ func New[K comparable, V any](options ...Option[K, V]) *ARC[K, V] {
 	return arc
 }
 
-func (a *ARC[K, V]) Clear() {
-	a.mutex.Lock()
-	defer a.mutex.Unlock()
-
-	a.p = 0
-	a.t1 = list.New[*entry[K, V]]()
-	a.b1 = list.New[*entry[K, V]]()
-	a.t2 = list.New[*entry[K, V]]()
-	a.b2 = list.New[*entry[K, V]]()
-	a.len = 0
-	a.cache = make(map[K]*entry[K, V])
-}
-
 // Set inserts a new key-value pair into the cache.
 // This optimizes future access to this entry (side effect).
 func (a *ARC[K, V]) Set(key K, value V) {

common/buf/sing.go

@@ -1,8 +1,8 @@
 package buf
 
 import (
-	"github.com/metacubex/sing/common"
+	"github.com/sagernet/sing/common"
-	"github.com/metacubex/sing/common/buf"
+	"github.com/sagernet/sing/common/buf"
 )
 
 const BufferSize = buf.BufferSize

common/contextutils/afterfunc_compact.go

@@ -1,31 +0,0 @@
-package contextutils
-
-import (
-	"context"
-	"sync"
-)
-
-func afterFunc(ctx context.Context, f func()) (stop func() bool) {
-	stopc := make(chan struct{})
-	once := sync.Once{} // either starts running f or stops f from running
-	if ctx.Done() != nil {
-		go func() {
-			select {
-			case <-ctx.Done():
-				once.Do(func() {
-					go f()
-				})
-			case <-stopc:
-			}
-		}()
-	}
-
-	return func() bool {
-		stopped := false
-		once.Do(func() {
-			stopped = true
-			close(stopc)
-		})
-		return stopped
-	}
-}

common/contextutils/afterfunc_go120.go

@@ -1,11 +0,0 @@
-//go:build !go1.21
-
-package contextutils
-
-import (
-	"context"
-)
-
-func AfterFunc(ctx context.Context, f func()) (stop func() bool) {
-	return afterFunc(ctx, f)
-}

common/contextutils/afterfunc_go121.go

@@ -1,9 +0,0 @@
-//go:build go1.21
-
-package contextutils
-
-import "context"
-
-func AfterFunc(ctx context.Context, f func()) (stop func() bool) {
-	return context.AfterFunc(ctx, f)
-}

common/contextutils/afterfunc_test.go

@@ -1,100 +0,0 @@
-package contextutils
-
-import (
-	"context"
-	"testing"
-	"time"
-)
-
-const (
-	shortDuration    = 1 * time.Millisecond // a reasonable duration to block in a test
-	veryLongDuration = 1000 * time.Hour     // an arbitrary upper bound on the test's running time
-)
-
-func TestAfterFuncCalledAfterCancel(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	donec := make(chan struct{})
-	stop := afterFunc(ctx, func() {
-		close(donec)
-	})
-	select {
-	case <-donec:
-		t.Fatalf("AfterFunc called before context is done")
-	case <-time.After(shortDuration):
-	}
-	cancel()
-	select {
-	case <-donec:
-	case <-time.After(veryLongDuration):
-		t.Fatalf("AfterFunc not called after context is canceled")
-	}
-	if stop() {
-		t.Fatalf("stop() = true, want false")
-	}
-}
-
-func TestAfterFuncCalledAfterTimeout(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), shortDuration)
-	defer cancel()
-	donec := make(chan struct{})
-	afterFunc(ctx, func() {
-		close(donec)
-	})
-	select {
-	case <-donec:
-	case <-time.After(veryLongDuration):
-		t.Fatalf("AfterFunc not called after context is canceled")
-	}
-}
-
-func TestAfterFuncCalledImmediately(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	cancel()
-	donec := make(chan struct{})
-	afterFunc(ctx, func() {
-		close(donec)
-	})
-	select {
-	case <-donec:
-	case <-time.After(veryLongDuration):
-		t.Fatalf("AfterFunc not called for already-canceled context")
-	}
-}
-
-func TestAfterFuncNotCalledAfterStop(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	donec := make(chan struct{})
-	stop := afterFunc(ctx, func() {
-		close(donec)
-	})
-	if !stop() {
-		t.Fatalf("stop() = false, want true")
-	}
-	cancel()
-	select {
-	case <-donec:
-		t.Fatalf("AfterFunc called for already-canceled context")
-	case <-time.After(shortDuration):
-	}
-	if stop() {
-		t.Fatalf("stop() = true, want false")
-	}
-}
-
-// This test verifies that canceling a context does not block waiting for AfterFuncs to finish.
-func TestAfterFuncCalledAsynchronously(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	donec := make(chan struct{})
-	stop := afterFunc(ctx, func() {
-		// The channel send blocks until donec is read from.
-		donec <- struct{}{}
-	})
-	defer stop()
-	cancel()
-	// After cancel returns, read from donec and unblock the AfterFunc.
-	select {
-	case <-donec:
-	case <-time.After(veryLongDuration):
-		t.Fatalf("AfterFunc not called after context is canceled")
-	}
-}

common/convert/converter.go

@@ -275,24 +275,22 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			vmess["skip-cert-verify"] = false
 
 			vmess["cipher"] = "auto"
-			if cipher, ok := values["scy"].(string); ok && cipher != "" {
+			if cipher, ok := values["scy"]; ok && cipher != "" {
 				vmess["cipher"] = cipher
 			}
 
-			if sni, ok := values["sni"].(string); ok && sni != "" {
+			if sni, ok := values["sni"]; ok && sni != "" {
 				vmess["servername"] = sni
 			}
 
-			network, ok := values["net"].(string)
+			network, _ := values["net"].(string)
-			if ok {
+			network = strings.ToLower(network)
-				network = strings.ToLower(network)
+			if values["type"] == "http" {
-				if values["type"] == "http" {
+				network = "http"
-					network = "http"
+			} else if network == "http" {
-				} else if network == "http" {
+				network = "h2"
-					network = "h2"
-				}
-				vmess["network"] = network
 			}
+			vmess["network"] = network
 
 			tls, ok := values["tls"].(string)
 			if ok {
@@ -309,12 +307,12 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			case "http":
 				headers := make(map[string]any)
 				httpOpts := make(map[string]any)
-				if host, ok := values["host"].(string); ok && host != "" {
+				if host, ok := values["host"]; ok && host != "" {
-					headers["Host"] = []string{host}
+					headers["Host"] = []string{host.(string)}
 				}
 				httpOpts["path"] = []string{"/"}
-				if path, ok := values["path"].(string); ok && path != "" {
+				if path, ok := values["path"]; ok && path != "" {
-					httpOpts["path"] = []string{path}
+					httpOpts["path"] = []string{path.(string)}
 				}
 				httpOpts["headers"] = headers
 
@@ -323,8 +321,8 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			case "h2":
 				headers := make(map[string]any)
 				h2Opts := make(map[string]any)
-				if host, ok := values["host"].(string); ok && host != "" {
+				if host, ok := values["host"]; ok && host != "" {
-					headers["Host"] = []string{host}
+					headers["Host"] = []string{host.(string)}
 				}
 
 				h2Opts["path"] = values["path"]
@@ -335,12 +333,12 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			case "ws", "httpupgrade":
 				headers := make(map[string]any)
 				wsOpts := make(map[string]any)
-				wsOpts["path"] = "/"
+				wsOpts["path"] = []string{"/"}
-				if host, ok := values["host"].(string); ok && host != "" {
+				if host, ok := values["host"]; ok && host != "" {
-					headers["Host"] = host
+					headers["Host"] = host.(string)
 				}
-				if path, ok := values["path"].(string); ok && path != "" {
+				if path, ok := values["path"]; ok && path != "" {
-					path := path
+					path := path.(string)
 					pathURL, err := url.Parse(path)
 					if err == nil {
 						query := pathURL.Query()

common/convert/util.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/metacubex/mihomo/common/utils"
 
-	"github.com/metacubex/randv2"
 	"github.com/metacubex/sing-shadowsocks/shadowimpl"
+	"github.com/zhangyunhao116/fastrand"
 )
 
 var hostsSuffix = []string{
@@ -302,11 +302,11 @@ func RandHost() string {
 	prefix += string(buf[6:8]) + "-"
 	prefix += string(buf[len(buf)-8:])
 
-	return prefix + hostsSuffix[randv2.IntN(hostsLen)]
+	return prefix + hostsSuffix[fastrand.Intn(hostsLen)]
 }
 
 func RandUserAgent() string {
-	return userAgents[randv2.IntN(uaLen)]
+	return userAgents[fastrand.Intn(uaLen)]
 }
 
 func SetUserAgent(header http.Header) {

common/lru/lrucache.go

@@ -68,8 +68,10 @@ type LruCache[K comparable, V any] struct {
 
 // New creates an LruCache
 func New[K comparable, V any](options ...Option[K, V]) *LruCache[K, V] {
-	lc := &LruCache[K, V]{}
+	lc := &LruCache[K, V]{
-	lc.Clear()
+		lru:   list.New[*entry[K, V]](),
+		cache: make(map[K]*list.Element[*entry[K, V]]),
+	}
 
 	for _, option := range options {
 		option(lc)
@@ -78,14 +80,6 @@ func New[K comparable, V any](options ...Option[K, V]) *LruCache[K, V] {
 	return lc
 }
 
-func (c *LruCache[K, V]) Clear() {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	c.lru = list.New[*entry[K, V]]()
-	c.cache = make(map[K]*list.Element[*entry[K, V]])
-}
-
 // Get returns any representation of a cached response and a bool
 // set to true if the key was found.
 func (c *LruCache[K, V]) Get(key K) (V, bool) {
@@ -229,10 +223,6 @@ func (c *LruCache[K, V]) Delete(key K) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
-	c.delete(key)
-}
-
-func (c *LruCache[K, V]) delete(key K) {
 	if le, ok := c.cache[key]; ok {
 		c.deleteElement(le)
 	}
@@ -256,32 +246,13 @@ func (c *LruCache[K, V]) deleteElement(le *list.Element[*entry[K, V]]) {
 	}
 }
 
-// Compute either sets the computed new value for the key or deletes
+func (c *LruCache[K, V]) Clear() error {
-// the value for the key. When the delete result of the valueFn function
-// is set to true, the value will be deleted, if it exists. When delete
-// is set to false, the value is updated to the newValue.
-// The ok result indicates whether value was computed and stored, thus, is
-// present in the map. The actual result contains the new value in cases where
-// the value was computed and stored.
-func (c *LruCache[K, V]) Compute(
-	key K,
-	valueFn func(oldValue V, loaded bool) (newValue V, delete bool),
-) (actual V, ok bool) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
-	if el := c.get(key); el != nil {
+	c.cache = make(map[K]*list.Element[*entry[K, V]])
-		actual, ok = el.value, true
+
-	}
+	return nil
-	if newValue, del := valueFn(actual, ok); del {
-		if ok { // data not in cache, so needn't delete
-			c.delete(key)
-		}
-		return lo.Empty[V](), false
-	} else {
-		c.set(key, newValue)
-		return newValue, true
-	}
 }
 
 type entry[K comparable, V any] struct {

common/net/context.go

@@ -3,37 +3,29 @@ package net
 import (
 	"context"
 	"net"
-
-	"github.com/metacubex/mihomo/common/contextutils"
 )
 
-// SetupContextForConn is a helper function that starts connection I/O interrupter.
+// SetupContextForConn is a helper function that starts connection I/O interrupter goroutine.
-// if ctx be canceled before done called, it will close the connection.
-// should use like this:
-//
-//	func streamConn(ctx context.Context, conn net.Conn) (_ net.Conn, err error) {
-//		if ctx.Done() != nil {
-//			done := N.SetupContextForConn(ctx, conn)
-//			defer done(&err)
-//		}
-//		conn, err := xxx
-//		return conn, err
-//	}
 func SetupContextForConn(ctx context.Context, conn net.Conn) (done func(*error)) {
-	stopc := make(chan struct{})
+	var (
-	stop := contextutils.AfterFunc(ctx, func() {
+		quit      = make(chan struct{})
-		// Close the connection, discarding the error
+		interrupt = make(chan error, 1)
-		_ = conn.Close()
+	)
-		close(stopc)
+	go func() {
-	})
+		select {
+		case <-quit:
+			interrupt <- nil
+		case <-ctx.Done():
+			// Close the connection, discarding the error
+			_ = conn.Close()
+			interrupt <- ctx.Err()
+		}
+	}()
 	return func(inputErr *error) {
-		if !stop() {
+		close(quit)
-			// The AfterFunc was started, wait for it to complete.
+		if ctxErr := <-interrupt; ctxErr != nil && inputErr != nil {
-			<-stopc
+			// Return context error to user.
-			if ctxErr := ctx.Err(); ctxErr != nil && inputErr != nil {
+			inputErr = &ctxErr
-				// Return context error to user.
-				*inputErr = ctxErr
-			}
 		}
 	}
 }

common/net/context_test.go

@@ -1,103 +0,0 @@
-package net_test
-
-import (
-	"context"
-	"errors"
-	"net"
-	"testing"
-	"time"
-
-	N "github.com/metacubex/mihomo/common/net"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func testRead(ctx context.Context, conn net.Conn) (err error) {
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, conn)
-		defer done(&err)
-	}
-	_, err = conn.Read(make([]byte, 1))
-	return err
-}
-
-func TestSetupContextForConnWithCancel(t *testing.T) {
-	t.Parallel()
-	c1, c2 := N.Pipe()
-	defer c1.Close()
-	defer c2.Close()
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	errc := make(chan error)
-	go func() {
-		errc <- testRead(ctx, c1)
-	}()
-
-	select {
-	case <-errc:
-		t.Fatal("conn closed before cancel")
-	case <-time.After(100 * time.Millisecond):
-		cancel()
-	}
-
-	select {
-	case err := <-errc:
-		assert.ErrorIs(t, err, context.Canceled)
-	case <-time.After(100 * time.Millisecond):
-		t.Fatal("conn not be canceled")
-	}
-}
-
-func TestSetupContextForConnWithTimeout1(t *testing.T) {
-	t.Parallel()
-	c1, c2 := N.Pipe()
-	defer c1.Close()
-	defer c2.Close()
-	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
-	defer cancel()
-
-	errc := make(chan error)
-	go func() {
-		errc <- testRead(ctx, c1)
-	}()
-
-	select {
-	case err := <-errc:
-		if !errors.Is(ctx.Err(), context.DeadlineExceeded) {
-			t.Fatal("conn closed before timeout")
-		}
-		assert.ErrorIs(t, err, context.DeadlineExceeded)
-	case <-time.After(200 * time.Millisecond):
-		t.Fatal("conn not be canceled")
-	}
-}
-
-func TestSetupContextForConnWithTimeout2(t *testing.T) {
-	t.Parallel()
-	c1, c2 := N.Pipe()
-	defer c1.Close()
-	defer c2.Close()
-	ctx, cancel := context.WithTimeout(context.Background(), 200*time.Millisecond)
-	defer cancel()
-
-	errc := make(chan error)
-	go func() {
-		errc <- testRead(ctx, c1)
-	}()
-
-	select {
-	case <-errc:
-		t.Fatal("conn closed before cancel")
-	case <-time.After(100 * time.Millisecond):
-		c2.Write(make([]byte, 1))
-	}
-
-	select {
-	case err := <-errc:
-		assert.Nil(t, ctx.Err())
-		assert.Nil(t, err)
-	case <-time.After(200 * time.Millisecond):
-		t.Fatal("conn not be canceled")
-	}
-}

common/net/deadline/conn.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/metacubex/mihomo/common/atomic"
 
-	"github.com/metacubex/sing/common/buf"
+	"github.com/sagernet/sing/common/buf"
-	"github.com/metacubex/sing/common/bufio"
+	"github.com/sagernet/sing/common/bufio"
-	"github.com/metacubex/sing/common/network"
+	"github.com/sagernet/sing/common/network"
 )
 
 type connReadResult struct {

common/net/deadline/packet_sing.go

@@ -6,10 +6,10 @@ import (
 
 	"github.com/metacubex/mihomo/common/net/packet"
 
-	"github.com/metacubex/sing/common/buf"
+	"github.com/sagernet/sing/common/buf"
-	"github.com/metacubex/sing/common/bufio"
+	"github.com/sagernet/sing/common/bufio"
-	M "github.com/metacubex/sing/common/metadata"
+	M "github.com/sagernet/sing/common/metadata"
-	N "github.com/metacubex/sing/common/network"
+	N "github.com/sagernet/sing/common/network"
 )
 
 type SingPacketConn struct {

common/net/deadline/pipe_sing.go

@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/metacubex/sing/common/buf"
+	"github.com/sagernet/sing/common/buf"
-	N "github.com/metacubex/sing/common/network"
+	N "github.com/sagernet/sing/common/network"
 )
 
 type pipeAddr struct{}

common/net/listener.go

@@ -1,90 +0,0 @@
-package net
-
-import (
-	"context"
-	"net"
-	"sync"
-)
-
-type handleContextListener struct {
-	net.Listener
-	ctx      context.Context
-	cancel   context.CancelFunc
-	conns    chan net.Conn
-	err      error
-	once     sync.Once
-	handle   func(context.Context, net.Conn) (net.Conn, error)
-	panicLog func(any)
-}
-
-func (l *handleContextListener) init() {
-	go func() {
-		for {
-			c, err := l.Listener.Accept()
-			if err != nil {
-				l.err = err
-				close(l.conns)
-				return
-			}
-			go func() {
-				defer func() {
-					if r := recover(); r != nil {
-						if l.panicLog != nil {
-							l.panicLog(r)
-						}
-					}
-				}()
-				if c, err := l.handle(l.ctx, c); err == nil {
-					l.conns <- c
-				} else {
-					// handle failed, close the underlying connection.
-					_ = c.Close()
-				}
-			}()
-		}
-	}()
-}
-
-func (l *handleContextListener) Accept() (net.Conn, error) {
-	l.once.Do(l.init)
-	if c, ok := <-l.conns; ok {
-		return c, nil
-	}
-	return nil, l.err
-}
-
-func (l *handleContextListener) Close() error {
-	l.cancel()
-	l.once.Do(func() { // l.init has not been called yet, so close related resources directly.
-		l.err = net.ErrClosed
-		close(l.conns)
-	})
-	defer func() {
-		// at here, listener has been closed, so we should close all connections in the channel
-		for c := range l.conns {
-			go func(c net.Conn) {
-				defer func() {
-					if r := recover(); r != nil {
-						if l.panicLog != nil {
-							l.panicLog(r)
-						}
-					}
-				}()
-				_ = c.Close()
-			}(c)
-		}
-	}()
-	return l.Listener.Close()
-}
-
-func NewHandleContextListener(ctx context.Context, l net.Listener, handle func(context.Context, net.Conn) (net.Conn, error), panicLog func(any)) net.Listener {
-	ctx, cancel := context.WithCancel(ctx)
-	return &handleContextListener{
-		Listener: l,
-		ctx:      ctx,
-		cancel:   cancel,
-		conns:    make(chan net.Conn),
-		handle:   handle,
-		panicLog: panicLog,
-	}
-}

common/net/packet/packet_posix.go

@@ -45,11 +45,7 @@ func (c *enhanceUDPConn) WaitReadFrom() (data []byte, put func(), addr net.Addr,
 				addr = &net.UDPAddr{IP: ip[:], Port: from.Port}
 			case *syscall.SockaddrInet6:
 				ip := from.Addr // copy from.Addr; ip escapes, so this line allocates 16 bytes
-				zone := ""
+				addr = &net.UDPAddr{IP: ip[:], Port: from.Port, Zone: strconv.FormatInt(int64(from.ZoneId), 10)}
-				if from.ZoneId != 0 {
-					zone = strconv.FormatInt(int64(from.ZoneId), 10)
-				}
-				addr = &net.UDPAddr{IP: ip[:], Port: from.Port, Zone: zone}
 			}
 		}
 		// udp should not convert readN == 0 to io.EOF

common/net/packet/packet_sing.go

@@ -3,10 +3,10 @@ package packet
 import (
 	"net"
 
-	"github.com/metacubex/sing/common/buf"
+	"github.com/sagernet/sing/common/buf"
-	"github.com/metacubex/sing/common/bufio"
+	"github.com/sagernet/sing/common/bufio"
-	M "github.com/metacubex/sing/common/metadata"
+	M "github.com/sagernet/sing/common/metadata"
-	N "github.com/metacubex/sing/common/network"
+	N "github.com/sagernet/sing/common/network"
 )
 
 type SingPacketConn = N.NetPacketConn

common/net/packet/packet_windows.go

@@ -54,11 +54,7 @@ func (c *enhanceUDPConn) WaitReadFrom() (data []byte, put func(), addr net.Addr,
 				addr = &net.UDPAddr{IP: ip[:], Port: from.Port}
 			case *windows.SockaddrInet6:
 				ip := from.Addr // copy from.Addr; ip escapes, so this line allocates 16 bytes
-				zone := ""
+				addr = &net.UDPAddr{IP: ip[:], Port: from.Port, Zone: strconv.FormatInt(int64(from.ZoneId), 10)}
-				if from.ZoneId != 0 {
-					zone = strconv.FormatInt(int64(from.ZoneId), 10)
-				}
-				addr = &net.UDPAddr{IP: ip[:], Port: from.Port, Zone: zone}
 			}
 		}
 		// udp should not convert readN == 0 to io.EOF

common/net/packet/ref_sing.go

@@ -3,9 +3,9 @@ package packet
 import (
 	"runtime"
 
-	"github.com/metacubex/sing/common/buf"
+	"github.com/sagernet/sing/common/buf"
-	M "github.com/metacubex/sing/common/metadata"
+	M "github.com/sagernet/sing/common/metadata"
-	N "github.com/metacubex/sing/common/network"
+	N "github.com/sagernet/sing/common/network"
 )
 
 type refSingPacketConn struct {

common/net/packet/thread_sing.go

@@ -1,9 +1,9 @@
 package packet
 
 import (
-	"github.com/metacubex/sing/common/buf"
+	"github.com/sagernet/sing/common/buf"
-	M "github.com/metacubex/sing/common/metadata"
+	M "github.com/sagernet/sing/common/metadata"
-	N "github.com/metacubex/sing/common/network"
+	N "github.com/sagernet/sing/common/network"
 )
 
 type threadSafeSingPacketConn struct {

common/net/refconn.go

@@ -77,6 +77,6 @@ func (c *refConn) WriterReplaceable() bool { // Relay() will handle reference
 
 var _ ExtendedConn = (*refConn)(nil)
 
-func NewRefConn(conn net.Conn, ref any) ExtendedConn {
+func NewRefConn(conn net.Conn, ref any) net.Conn {
 	return &refConn{conn: NewExtendedConn(conn), ref: ref}
 }

common/net/sing.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/metacubex/mihomo/common/net/deadline"
 
-	"github.com/metacubex/sing/common"
+	"github.com/sagernet/sing/common"
-	"github.com/metacubex/sing/common/bufio"
+	"github.com/sagernet/sing/common/bufio"
-	"github.com/metacubex/sing/common/network"
+	"github.com/sagernet/sing/common/network"
 )
 
 var NewExtendedConn = bufio.NewExtendedConn

common/net/tcpip.go

@@ -4,8 +4,11 @@ import (
 	"fmt"
 	"net"
 	"strings"
+	"time"
 )
 
+var KeepAliveInterval = 15 * time.Second
+
 func SplitNetworkType(s string) (string, string, error) {
 	var (
 		shecme   string
@@ -44,3 +47,10 @@ func SplitHostPort(s string) (host, port string, hasPort bool, err error) {
 	host, port, err = net.SplitHostPort(temp)
 	return
 }
+
+func TCPKeepAlive(c net.Conn) {
+	if tcp, ok := c.(*net.TCPConn); ok {
+		_ = tcp.SetKeepAlive(true)
+		_ = tcp.SetKeepAlivePeriod(KeepAliveInterval)
+	}
+}

common/net/tls.go

@@ -0,0 +1,58 @@
+package net
+
+import (
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/tls"
+	"crypto/x509"
+	"encoding/pem"
+	"fmt"
+	"math/big"
+)
+
+type Path interface {
+	Resolve(path string) string
+}
+
+func ParseCert(certificate, privateKey string, path Path) (tls.Certificate, error) {
+	if certificate == "" && privateKey == "" {
+		return newRandomTLSKeyPair()
+	}
+	cert, painTextErr := tls.X509KeyPair([]byte(certificate), []byte(privateKey))
+	if painTextErr == nil {
+		return cert, nil
+	}
+
+	certificate = path.Resolve(certificate)
+	privateKey = path.Resolve(privateKey)
+	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/nnip/netip.go

@@ -0,0 +1,53 @@
+package nnip
+
+import (
+	"encoding/binary"
+	"net"
+	"net/netip"
+)
+
+// IpToAddr converts the net.IP to netip.Addr.
+// If slice's length is not 4 or 16, IpToAddr returns netip.Addr{}
+func IpToAddr(slice net.IP) netip.Addr {
+	ip := slice
+	if len(ip) != 4 {
+		if ip = slice.To4(); ip == nil {
+			ip = slice
+		}
+	}
+
+	if addr, ok := netip.AddrFromSlice(ip); ok {
+		return addr
+	}
+	return netip.Addr{}
+}
+
+// UnMasked returns p's last IP address.
+// If p is invalid, UnMasked returns netip.Addr{}
+func UnMasked(p netip.Prefix) netip.Addr {
+	if !p.IsValid() {
+		return netip.Addr{}
+	}
+
+	buf := p.Addr().As16()
+
+	hi := binary.BigEndian.Uint64(buf[:8])
+	lo := binary.BigEndian.Uint64(buf[8:])
+
+	bits := p.Bits()
+	if bits <= 32 {
+		bits += 96
+	}
+
+	hi = hi | ^uint64(0)>>bits
+	lo = lo | ^(^uint64(0) << (128 - bits))
+
+	binary.BigEndian.PutUint64(buf[:8], hi)
+	binary.BigEndian.PutUint64(buf[8:], lo)
+
+	addr := netip.AddrFrom16(buf)
+	if p.Addr().Is4() {
+		return addr.Unmap()
+	}
+	return addr
+}

common/observable/observable.go

@@ -10,7 +10,6 @@ type Observable[T any] struct {
 	listener map[Subscription[T]]*Subscriber[T]
 	mux      sync.Mutex
 	done     bool
-	stopCh   chan struct{}
 }
 
 func (o *Observable[T]) process() {
@@ -32,7 +31,6 @@ func (o *Observable[T]) close() {
 	for _, sub := range o.listener {
 		sub.Close()
 	}
-	close(o.stopCh)
 }
 
 func (o *Observable[T]) Subscribe() (Subscription[T], error) {
@@ -61,7 +59,6 @@ func NewObservable[T any](iter Iterable[T]) *Observable[T] {
 	observable := &Observable[T]{
 		iterable: iter,
 		listener: map[Subscription[T]]*Subscriber[T]{},
-		stopCh:   make(chan struct{}),
 	}
 	go observable.process()
 	return observable

common/observable/observable_test.go

@@ -70,11 +70,9 @@ func TestObservable_SubscribeClosedSource(t *testing.T) {
 	src := NewObservable[int](iter)
 	data, _ := src.Subscribe()
 	<-data
-	select {
+
-	case <-src.stopCh:
+	_, closed := src.Subscribe()
-	case <-time.After(time.Second):
+	assert.NotNil(t, closed)
-		assert.Fail(t, "timeout not stop")
-	}
 }
 
 func TestObservable_UnSubscribeWithNotExistSubscription(t *testing.T) {

common/once/oncefunc.go

@@ -1,102 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package once
-
-import "sync"
-
-// OnceFunc returns a function that invokes f only once. The returned function
-// may be called concurrently.
-//
-// If f panics, the returned function will panic with the same value on every call.
-func OnceFunc(f func()) func() {
-	var (
-		once  sync.Once
-		valid bool
-		p     any
-	)
-	// Construct the inner closure just once to reduce costs on the fast path.
-	g := func() {
-		defer func() {
-			p = recover()
-			if !valid {
-				// Re-panic immediately so on the first call the user gets a
-				// complete stack trace into f.
-				panic(p)
-			}
-		}()
-		f()
-		f = nil      // Do not keep f alive after invoking it.
-		valid = true // Set only if f does not panic.
-	}
-	return func() {
-		once.Do(g)
-		if !valid {
-			panic(p)
-		}
-	}
-}
-
-// OnceValue returns a function that invokes f only once and returns the value
-// returned by f. The returned function may be called concurrently.
-//
-// If f panics, the returned function will panic with the same value on every call.
-func OnceValue[T any](f func() T) func() T {
-	var (
-		once   sync.Once
-		valid  bool
-		p      any
-		result T
-	)
-	g := func() {
-		defer func() {
-			p = recover()
-			if !valid {
-				panic(p)
-			}
-		}()
-		result = f()
-		f = nil
-		valid = true
-	}
-	return func() T {
-		once.Do(g)
-		if !valid {
-			panic(p)
-		}
-		return result
-	}
-}
-
-// OnceValues returns a function that invokes f only once and returns the values
-// returned by f. The returned function may be called concurrently.
-//
-// If f panics, the returned function will panic with the same value on every call.
-func OnceValues[T1, T2 any](f func() (T1, T2)) func() (T1, T2) {
-	var (
-		once  sync.Once
-		valid bool
-		p     any
-		r1    T1
-		r2    T2
-	)
-	g := func() {
-		defer func() {
-			p = recover()
-			if !valid {
-				panic(p)
-			}
-		}()
-		r1, r2 = f()
-		f = nil
-		valid = true
-	}
-	return func() (T1, T2) {
-		once.Do(g)
-		if !valid {
-			panic(p)
-		}
-		return r1, r2
-	}
-}

common/picker/picker_test.go

@@ -22,10 +22,9 @@ func sleepAndSend[T any](ctx context.Context, delay int, input T) func() (T, err
 }
 
 func TestPicker_Basic(t *testing.T) {
-	t.Parallel()
 	picker, ctx := WithContext[int](context.Background())
-	picker.Go(sleepAndSend(ctx, 200, 2))
+	picker.Go(sleepAndSend(ctx, 30, 2))
-	picker.Go(sleepAndSend(ctx, 100, 1))
+	picker.Go(sleepAndSend(ctx, 20, 1))
 
 	number := picker.Wait()
 	assert.NotNil(t, number)
@@ -33,9 +32,8 @@ func TestPicker_Basic(t *testing.T) {
 }
 
 func TestPicker_Timeout(t *testing.T) {
-	t.Parallel()
 	picker, ctx := WithTimeout[int](context.Background(), time.Millisecond*5)
-	picker.Go(sleepAndSend(ctx, 100, 1))
+	picker.Go(sleepAndSend(ctx, 20, 1))
 
 	number := picker.Wait()
 	assert.Equal(t, number, lo.Empty[int]())

common/pool/alloc_test.go

@@ -3,8 +3,8 @@ package pool
 import (
 	"testing"
 
-	"github.com/metacubex/randv2"
 	"github.com/stretchr/testify/assert"
+	"github.com/zhangyunhao116/fastrand"
 )
 
 func TestAllocGet(t *testing.T) {
@@ -43,6 +43,6 @@ func TestAllocPutThenGet(t *testing.T) {
 
 func BenchmarkMSB(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		msb(randv2.Int())
+		msb(fastrand.Int())
 	}
 }

common/pool/sing.go

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

common/queue/queue.go

@@ -59,8 +59,8 @@ func (q *Queue[T]) Copy() []T {
 
 // Len returns the number of items in this queue.
 func (q *Queue[T]) Len() int64 {
-	q.lock.RLock()
+	q.lock.Lock()
-	defer q.lock.RUnlock()
+	defer q.lock.Unlock()
 
 	return int64(len(q.items))
 }

common/singledo/singledo.go

@@ -13,26 +13,25 @@ type call[T any] struct {
 
 type Single[T any] struct {
 	mux    sync.Mutex
+	last   time.Time
 	wait   time.Duration
 	call   *call[T]
 	result *Result[T]
 }
 
 type Result[T any] struct {
-	Val  T
+	Val T
-	Err  error
+	Err error
-	Time time.Time
 }
 
 // Do single.Do likes sync.singleFlight
 func (s *Single[T]) Do(fn func() (T, error)) (v T, err error, shared bool) {
 	s.mux.Lock()
-	result := s.result
+	now := time.Now()
-	if result != nil && time.Since(result.Time) < s.wait {
+	if now.Before(s.last.Add(s.wait)) {
 		s.mux.Unlock()
-		return result.Val, result.Err, true
+		return s.result.Val, s.result.Err, true
 	}
-	s.result = nil // The result has expired, clear it
 
 	if callM := s.call; callM != nil {
 		s.mux.Unlock()
@@ -48,19 +47,15 @@ func (s *Single[T]) Do(fn func() (T, error)) (v T, err error, shared bool) {
 	callM.wg.Done()
 
 	s.mux.Lock()
-	if s.call == callM { // maybe reset when fn is running
+	s.call = nil
-		s.call = nil
+	s.result = &Result[T]{callM.val, callM.err}
-		s.result = &Result[T]{callM.val, callM.err, time.Now()}
+	s.last = now
-	}
 	s.mux.Unlock()
 	return callM.val, callM.err, false
 }
 
 func (s *Single[T]) Reset() {
-	s.mux.Lock()
+	s.last = time.Time{}
-	s.call = nil
-	s.result = nil
-	s.mux.Unlock()
 }
 
 func NewSingle[T any](wait time.Duration) *Single[T] {

common/singledo/singledo_test.go

@@ -11,13 +11,12 @@ import (
 )
 
 func TestBasic(t *testing.T) {
-	t.Parallel()
+	single := NewSingle[int](time.Millisecond * 30)
-	single := NewSingle[int](time.Millisecond * 200)
 	foo := 0
 	shardCount := atomic.NewInt32(0)
 	call := func() (int, error) {
 		foo++
-		time.Sleep(time.Millisecond * 20)
+		time.Sleep(time.Millisecond * 5)
 		return 0, nil
 	}
 
@@ -40,8 +39,7 @@ func TestBasic(t *testing.T) {
 }
 
 func TestTimer(t *testing.T) {
-	t.Parallel()
+	single := NewSingle[int](time.Millisecond * 30)
-	single := NewSingle[int](time.Millisecond * 200)
 	foo := 0
 	callM := func() (int, error) {
 		foo++
@@ -49,7 +47,7 @@ func TestTimer(t *testing.T) {
 	}
 
 	_, _, _ = single.Do(callM)
-	time.Sleep(100 * time.Millisecond)
+	time.Sleep(10 * time.Millisecond)
 	_, _, shard := single.Do(callM)
 
 	assert.Equal(t, 1, foo)
@@ -57,8 +55,7 @@ func TestTimer(t *testing.T) {
 }
 
 func TestReset(t *testing.T) {
-	t.Parallel()
+	single := NewSingle[int](time.Millisecond * 30)
-	single := NewSingle[int](time.Millisecond * 200)
 	foo := 0
 	callM := func() (int, error) {
 		foo++

common/singleflight/singleflight.go

@@ -1,224 +0,0 @@
-// copy and modify from "golang.org/x/sync/singleflight"
-
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package singleflight provides a duplicate function call suppression
-// mechanism.
-package singleflight
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"runtime"
-	"runtime/debug"
-	"sync"
-)
-
-// errGoexit indicates the runtime.Goexit was called in
-// the user given function.
-var errGoexit = errors.New("runtime.Goexit was called")
-
-// A panicError is an arbitrary value recovered from a panic
-// with the stack trace during the execution of given function.
-type panicError struct {
-	value interface{}
-	stack []byte
-}
-
-// Error implements error interface.
-func (p *panicError) Error() string {
-	return fmt.Sprintf("%v\n\n%s", p.value, p.stack)
-}
-
-func (p *panicError) Unwrap() error {
-	err, ok := p.value.(error)
-	if !ok {
-		return nil
-	}
-
-	return err
-}
-
-func newPanicError(v interface{}) error {
-	stack := debug.Stack()
-
-	// The first line of the stack trace is of the form "goroutine N [status]:"
-	// but by the time the panic reaches Do the goroutine may no longer exist
-	// and its status will have changed. Trim out the misleading line.
-	if line := bytes.IndexByte(stack[:], '\n'); line >= 0 {
-		stack = stack[line+1:]
-	}
-	return &panicError{value: v, stack: stack}
-}
-
-// call is an in-flight or completed singleflight.Do call
-type call[T any] struct {
-	wg sync.WaitGroup
-
-	// These fields are written once before the WaitGroup is done
-	// and are only read after the WaitGroup is done.
-	val T
-	err error
-
-	// These fields are read and written with the singleflight
-	// mutex held before the WaitGroup is done, and are read but
-	// not written after the WaitGroup is done.
-	dups  int
-	chans []chan<- Result[T]
-}
-
-// Group represents a class of work and forms a namespace in
-// which units of work can be executed with duplicate suppression.
-type Group[T any] struct {
-	mu sync.Mutex          // protects m
-	m  map[string]*call[T] // lazily initialized
-
-	StoreResult bool
-}
-
-// Result holds the results of Do, so they can be passed
-// on a channel.
-type Result[T any] struct {
-	Val    T
-	Err    error
-	Shared bool
-}
-
-// Do executes and returns the results of the given function, making
-// sure that only one execution is in-flight for a given key at a
-// time. If a duplicate comes in, the duplicate caller waits for the
-// original to complete and receives the same results.
-// The return value shared indicates whether v was given to multiple callers.
-func (g *Group[T]) Do(key string, fn func() (T, error)) (v T, err error, shared bool) {
-	g.mu.Lock()
-	if g.m == nil {
-		g.m = make(map[string]*call[T])
-	}
-	if c, ok := g.m[key]; ok {
-		c.dups++
-		g.mu.Unlock()
-		c.wg.Wait()
-
-		if e, ok := c.err.(*panicError); ok {
-			panic(e)
-		} else if c.err == errGoexit {
-			runtime.Goexit()
-		}
-		return c.val, c.err, true
-	}
-	c := new(call[T])
-	c.wg.Add(1)
-	g.m[key] = c
-	g.mu.Unlock()
-
-	g.doCall(c, key, fn)
-	return c.val, c.err, c.dups > 0
-}
-
-// DoChan is like Do but returns a channel that will receive the
-// results when they are ready.
-//
-// The returned channel will not be closed.
-func (g *Group[T]) DoChan(key string, fn func() (T, error)) <-chan Result[T] {
-	ch := make(chan Result[T], 1)
-	g.mu.Lock()
-	if g.m == nil {
-		g.m = make(map[string]*call[T])
-	}
-	if c, ok := g.m[key]; ok {
-		c.dups++
-		c.chans = append(c.chans, ch)
-		g.mu.Unlock()
-		return ch
-	}
-	c := &call[T]{chans: []chan<- Result[T]{ch}}
-	c.wg.Add(1)
-	g.m[key] = c
-	g.mu.Unlock()
-
-	go g.doCall(c, key, fn)
-
-	return ch
-}
-
-// doCall handles the single call for a key.
-func (g *Group[T]) doCall(c *call[T], key string, fn func() (T, error)) {
-	normalReturn := false
-	recovered := false
-
-	// use double-defer to distinguish panic from runtime.Goexit,
-	// more details see https://golang.org/cl/134395
-	defer func() {
-		// the given function invoked runtime.Goexit
-		if !normalReturn && !recovered {
-			c.err = errGoexit
-		}
-
-		g.mu.Lock()
-		defer g.mu.Unlock()
-		c.wg.Done()
-		if g.m[key] == c && !g.StoreResult {
-			delete(g.m, key)
-		}
-
-		if e, ok := c.err.(*panicError); ok {
-			// In order to prevent the waiting channels from being blocked forever,
-			// needs to ensure that this panic cannot be recovered.
-			if len(c.chans) > 0 {
-				go panic(e)
-				select {} // Keep this goroutine around so that it will appear in the crash dump.
-			} else {
-				panic(e)
-			}
-		} else if c.err == errGoexit {
-			// Already in the process of goexit, no need to call again
-		} else {
-			// Normal return
-			for _, ch := range c.chans {
-				ch <- Result[T]{c.val, c.err, c.dups > 0}
-			}
-		}
-	}()
-
-	func() {
-		defer func() {
-			if !normalReturn {
-				// Ideally, we would wait to take a stack trace until we've determined
-				// whether this is a panic or a runtime.Goexit.
-				//
-				// Unfortunately, the only way we can distinguish the two is to see
-				// whether the recover stopped the goroutine from terminating, and by
-				// the time we know that, the part of the stack trace relevant to the
-				// panic has been discarded.
-				if r := recover(); r != nil {
-					c.err = newPanicError(r)
-				}
-			}
-		}()
-
-		c.val, c.err = fn()
-		normalReturn = true
-	}()
-
-	if !normalReturn {
-		recovered = true
-	}
-}
-
-// Forget tells the singleflight to forget about a key.  Future calls
-// to Do for this key will call the function rather than waiting for
-// an earlier call to complete.
-func (g *Group[T]) Forget(key string) {
-	g.mu.Lock()
-	delete(g.m, key)
-	g.mu.Unlock()
-}
-
-func (g *Group[T]) Reset() {
-	g.mu.Lock()
-	g.m = nil
-	g.mu.Unlock()
-}

common/sockopt/reuse_common.go

@@ -1,30 +0,0 @@
-package sockopt
-
-import (
-	"net"
-	"syscall"
-)
-
-func RawConnReuseaddr(rc syscall.RawConn) (err error) {
-	var innerErr error
-	err = rc.Control(func(fd uintptr) {
-		innerErr = reuseControl(fd)
-	})
-
-	if innerErr != nil {
-		err = innerErr
-	}
-	return
-}
-
-func UDPReuseaddr(c net.PacketConn) error {
-	if c, ok := c.(syscall.Conn); ok {
-		rc, err := c.SyscallConn()
-		if err != nil {
-			return err
-		}
-
-		return RawConnReuseaddr(rc)
-	}
-	return nil
-}

common/sockopt/reuse_unix.go

@@ -1,22 +0,0 @@
-//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-
-package sockopt
-
-import (
-	"golang.org/x/sys/unix"
-)
-
-func reuseControl(fd uintptr) error {
-	e1 := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEADDR, 1)
-	e2 := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEPORT, 1)
-
-	if e1 != nil {
-		return e1
-	}
-
-	if e2 != nil {
-		return e2
-	}
-
-	return nil
-}

common/sockopt/reuse_windows.go

@@ -1,9 +0,0 @@
-package sockopt
-
-import (
-	"golang.org/x/sys/windows"
-)
-
-func reuseControl(fd uintptr) error {
-	return windows.SetsockoptInt(windows.Handle(fd), windows.SOL_SOCKET, windows.SO_REUSEADDR, 1)
-}

common/sockopt/reuseaddr_linux.go

@@ -0,0 +1,19 @@
+package sockopt
+
+import (
+	"net"
+	"syscall"
+)
+
+func UDPReuseaddr(c *net.UDPConn) (err error) {
+	rc, err := c.SyscallConn()
+	if err != nil {
+		return
+	}
+
+	rc.Control(func(fd uintptr) {
+		err = syscall.SetsockoptInt(int(fd), syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1)
+	})
+
+	return
+}

common/sockopt/reuseaddr_other.go

@@ -0,0 +1,11 @@
+//go:build !linux
+
+package sockopt
+
+import (
+	"net"
+)
+
+func UDPReuseaddr(c *net.UDPConn) (err error) {
+	return
+}

common/structure/structure.go

@@ -3,7 +3,6 @@ package structure
 // references: https://github.com/mitchellh/mapstructure
 
 import (
-	"encoding"
 	"encoding/base64"
 	"fmt"
 	"reflect"
@@ -86,62 +85,36 @@ func (d *Decoder) Decode(src map[string]any, dst any) error {
 	return nil
 }
 
-// isNil returns true if the input is nil or a typed nil pointer.
-func isNil(input any) bool {
-	if input == nil {
-		return true
-	}
-	val := reflect.ValueOf(input)
-	return val.Kind() == reflect.Pointer && val.IsNil()
-}
-
 func (d *Decoder) decode(name string, data any, val reflect.Value) error {
-	if isNil(data) {
+	kind := val.Kind()
-		// If the data is nil, then we don't set anything
+	switch {
-		// Maybe we should set to zero value?
+	case isInt(kind):
-		return nil
+		return d.decodeInt(name, data, val)
+	case isUint(kind):
+		return d.decodeUint(name, data, val)
+	case isFloat(kind):
+		return d.decodeFloat(name, data, val)
 	}
-	if !reflect.ValueOf(data).IsValid() {
+	switch kind {
-		// If the input value is invalid, then we just set the value
+	case reflect.Pointer:
-		// to be the zero value.
+		if val.IsNil() {
-		val.Set(reflect.Zero(val.Type()))
-		return nil
-	}
-	for {
-		kind := val.Kind()
-		if kind == reflect.Pointer && val.IsNil() {
 			val.Set(reflect.New(val.Type().Elem()))
 		}
-		if ok, err := d.decodeTextUnmarshaller(name, data, val); ok {
+		return d.decode(name, data, val.Elem())
-			return err
+	case reflect.String:
-		}
+		return d.decodeString(name, data, val)
-		switch {
+	case reflect.Bool:
-		case isInt(kind):
+		return d.decodeBool(name, data, val)
-			return d.decodeInt(name, data, val)
+	case reflect.Slice:
-		case isUint(kind):
+		return d.decodeSlice(name, data, val)
-			return d.decodeUint(name, data, val)
+	case reflect.Map:
-		case isFloat(kind):
+		return d.decodeMap(name, data, val)
-			return d.decodeFloat(name, data, val)
+	case reflect.Interface:
-		}
+		return d.setInterface(name, data, val)
-		switch kind {
+	case reflect.Struct:
-		case reflect.Pointer:
+		return d.decodeStruct(name, data, val)
-			val = val.Elem()
+	default:
-			continue
+		return fmt.Errorf("type %s not support", val.Kind().String())
-		case reflect.String:
-			return d.decodeString(name, data, val)
-		case reflect.Bool:
-			return d.decodeBool(name, data, val)
-		case reflect.Slice:
-			return d.decodeSlice(name, data, val)
-		case reflect.Map:
-			return d.decodeMap(name, data, val)
-		case reflect.Interface:
-			return d.setInterface(name, data, val)
-		case reflect.Struct:
-			return d.decodeStruct(name, data, val)
-		default:
-			return fmt.Errorf("type %s not support", val.Kind().String())
-		}
 	}
 }
 
@@ -580,25 +553,3 @@ func (d *Decoder) setInterface(name string, data any, val reflect.Value) (err er
 	val.Set(dataVal)
 	return nil
 }
-
-func (d *Decoder) decodeTextUnmarshaller(name string, data any, val reflect.Value) (bool, error) {
-	if !val.CanAddr() {
-		return false, nil
-	}
-	valAddr := val.Addr()
-	if !valAddr.CanInterface() {
-		return false, nil
-	}
-	unmarshaller, ok := valAddr.Interface().(encoding.TextUnmarshaler)
-	if !ok {
-		return false, nil
-	}
-	var str string
-	if err := d.decodeString(name, data, reflect.Indirect(reflect.ValueOf(&str))); err != nil {
-		return false, err
-	}
-	if err := unmarshaller.UnmarshalText([]byte(str)); err != nil {
-		return true, fmt.Errorf("cannot parse '%s' as %s: %s", name, val.Type(), err)
-	}
-	return true, nil
-}