fix: wildcard matching problem (#536)

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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,82 @@
+name: Bug report
+description: Create a report to help us improve
+title: "[Bug] "
+body:
+  - type: checkboxes
+    id: ensure
+    attributes:
+      label: Verify steps
+      description: "
+在提交之前，请确认
+Please verify that you've followed these steps
+"
+      options:
+        - label: "
+确保你使用的是**本仓库**最新的的 clash 或 clash Alpha 版本
+Ensure you are using the latest version of Clash or Clash Premium from **this repository**.
+"
+          required: true
+        - label: "
+如果你可以自己 debug 并解决的话，提交 PR 吧
+Is this something you can **debug and fix**? Send a pull request! Bug fixes and documentation fixes are welcome.
+"
+          required: false
+        - label: "
+我已经在 [Issue Tracker](……/) 中找过我要提出的问题
+I have searched on the [issue tracker](……/) for a related issue.
+"
+          required: true
+        - label: "
+我已经使用 Alpha 分支版本测试过，问题依旧存在
+I have tested using the dev branch, and the issue still exists.
+"
+          required: true
+        - label: "
+我已经仔细看过 [Documentation](https://wiki.metacubex.one/) 并无法自行解决问题
+I have read the [documentation](https://wiki.metacubex.one/) and was unable to solve the issue.
+"
+          required: true
+        - label: "
+这是 Clash 核心的问题，并非我所使用的 Clash 衍生版本（如 OpenClash、KoolClash 等）的特定问题
+This is an issue of the Clash core *per se*, not to the derivatives of Clash, like OpenClash or KoolClash.
+"
+          required: true
+  - type: input
+    attributes:
+      label: Clash version
+      description: "use `clash -v`"
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: What OS are you seeing the problem on?
+      multiple: true
+      options:
+        - macOS
+        - Windows
+        - Linux
+        - OpenBSD/FreeBSD
+  - type: textarea
+    attributes:
+      render: yaml
+      label: "Clash config"
+      description: "
+在下方附上 Clash core 配置文件，请确保配置文件中没有敏感信息（比如：服务器地址，密码，端口等）
+Paste the Clash core configuration file below, please make sure that there is no sensitive information in the configuration file (e.g., server address/url, password, port)
+"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      render: shell
+      label: Clash log
+      description: "
+在下方附上 Clash Core 的日志，log level 使用 DEBUG
+Paste the Clash core log below with the log level set to `DEBUG`.
+"
+  - type: textarea
+    attributes:
+      label: Description
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature_request.yml

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

.github/genReleaseNote.sh

@@ -0,0 +1 @@
+git log --pretty=format:"* %s by @%an" v1.14.x..v1.14.y | sort -f | uniq > release.md

.github/workflows/build.yml

@@ -126,9 +126,9 @@ jobs:
         shell: bash
 
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v3
         with:
-          go-version: "1.21"
+          go-version: "1.20"
           check-latest: true
 
       - name: Test
@@ -223,7 +223,7 @@ jobs:
         working-directory: bin
 
       - name: Delete current release assets
-        uses: 8Mi-Tech/delete-release-assets-action@main
+        uses: andreaswilli/delete-release-assets-action@v2.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           tag: Prerelease-${{ github.ref_name }}
@@ -246,14 +246,18 @@ jobs:
           Release created at  ${{ env.BUILDTIME }}
           Synchronize ${{ github.ref_name }} branch code updates, keeping only the latest version
           <br>
-          [我应该下载哪个文件? / Which file should I download?](https://github.com/MetaCubeX/Clash.Meta/wiki/FAQ)
-          [查看文档 / Docs](https://metacubex.github.io/Meta-Docs/)
+          ### release version
+          `default(not specified in file name)`: compiled with GOAMD64=v3
+          `cgo`: support lwip tun stack, compiled with GOAMD64=v1
+          `compatible`: compiled with GOAMD64=v1
+          Check details between different architectural levels [here](https://github.com/golang/go/wiki/MinimumRequirements#amd64).
           EOF
 
       - name: Upload Prerelease
         uses: softprops/action-gh-release@v1
         if: ${{  success() }}
         with:
+          tag: ${{ github.ref_name }}
           tag_name: Prerelease-${{ github.ref_name }}
           files: |
             bin/*
@@ -280,12 +284,12 @@ jobs:
         uses: softprops/action-gh-release@v1
         if: ${{  success() }}
         with:
+          tag: ${{ github.ref_name }}
           tag_name: ${{ github.ref_name }}
           files: bin/*
           generate_release_notes: true
 
   Docker:
-    if: ${{ github.event_name != 'pull_request'  }}
     permissions: write-all
     needs: [Build]
     runs-on: ubuntu-latest
@@ -305,10 +309,10 @@ jobs:
         working-directory: bin
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v1
 
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1
         with:
           version: latest
 
@@ -316,7 +320,7 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v3
         with:
           images: ${{ env.REGISTRY }}/${{ secrets.DOCKERHUB_ACCOUNT }}/${{secrets.DOCKERHUB_REPO}}
       - name: Show files
@@ -325,7 +329,7 @@ jobs:
           ls bin/
       - name: Log into registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v1
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ secrets.DOCKER_HUB_USER }}
@@ -335,7 +339,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
         with:
           context: .
           file: ./Dockerfile

.github/workflows/delete.yml

@@ -0,0 +1,15 @@
+name: Delete old workflow runs
+on:
+  schedule:
+    - cron: "0 0 * * SUN"
+
+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

Dockerfile

@@ -4,9 +4,9 @@ RUN echo "I'm building for $TARGETPLATFORM"
 
 RUN apk add --no-cache gzip && \
     mkdir /clash-config && \
-    wget -O /clash-config/geoip.metadb https://fastly.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.metadb && \
-    wget -O /clash-config/geosite.dat https://fastly.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.dat && \
-    wget -O /clash-config/geoip.dat https://fastly.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.dat
+    wget -O /clash-config/Country.mmdb https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb && \
+    wget -O /clash-config/geosite.dat https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat && \
+    wget -O /clash-config/geoip.dat https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
 
 COPY docker/file-name.sh /clash/file-name.sh
 WORKDIR /clash

Makefile

@@ -31,8 +31,6 @@ PLATFORM_LIST = \
 	linux-mips-hardfloat \
 	linux-mipsle-softfloat \
 	linux-mipsle-hardfloat \
-	linux-riscv64 \
-	linux-loong64 \
 	android-arm64 \
 	freebsd-386 \
 	freebsd-amd64 \
@@ -106,9 +104,6 @@ linux-mips64le:
 linux-riscv64:
 	GOARCH=riscv64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
-linux-loong64:
-	GOARCH=loong64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
 android-arm64:
 	GOARCH=arm64 GOOS=android $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 

adapter/adapter.go

@@ -3,41 +3,25 @@ package adapter
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net"
 	"net/http"
 	"net/netip"
 	"net/url"
-	"strconv"
-	"sync"
 	"time"
 
 	"github.com/Dreamacro/clash/common/atomic"
 	"github.com/Dreamacro/clash/common/queue"
-	"github.com/Dreamacro/clash/common/utils"
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
-	"github.com/Dreamacro/clash/log"
 )
 
 var UnifiedDelay = atomic.NewBool(false)
 
-const (
-	defaultHistoriesNum = 10
-)
-
-type extraProxyState struct {
-	history *queue.Queue[C.DelayHistory]
-	alive   *atomic.Bool
-}
-
 type Proxy struct {
 	C.ProxyAdapter
 	history *queue.Queue[C.DelayHistory]
 	alive   *atomic.Bool
-	url     string
-	extra   sync.Map
 }
 
 // Alive implements C.Proxy
@@ -45,15 +29,6 @@ func (p *Proxy) Alive() bool {
 	return p.alive.Load()
 }
 
-// AliveForTestUrl implements C.Proxy
-func (p *Proxy) AliveForTestUrl(url string) bool {
-	if state, ok := p.extra.Load(url); ok {
-		return state.(*extraProxyState).alive.Load()
-	}
-
-	return p.alive.Load()
-}
-
 // Dial implements C.Proxy
 func (p *Proxy) Dial(metadata *C.Metadata) (C.Conn, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), C.DefaultTCPTimeout)
@@ -87,51 +62,9 @@ func (p *Proxy) DelayHistory() []C.DelayHistory {
 	for _, item := range queueM {
 		histories = append(histories, item)
 	}
-
 	return histories
 }
 
-// DelayHistoryForTestUrl implements C.Proxy
-func (p *Proxy) DelayHistoryForTestUrl(url string) []C.DelayHistory {
-	var queueM []C.DelayHistory
-
-	if state, ok := p.extra.Load(url); ok {
-		queueM = state.(*extraProxyState).history.Copy()
-	}
-
-	if queueM == nil {
-		queueM = p.history.Copy()
-	}
-
-	histories := []C.DelayHistory{}
-	for _, item := range queueM {
-		histories = append(histories, item)
-	}
-	return histories
-}
-
-func (p *Proxy) ExtraDelayHistory() map[string][]C.DelayHistory {
-	extraHistory := map[string][]C.DelayHistory{}
-
-	p.extra.Range(func(k, v interface{}) bool {
-
-		testUrl := k.(string)
-		state := v.(*extraProxyState)
-
-		histories := []C.DelayHistory{}
-		queueM := state.history.Copy()
-
-		for _, item := range queueM {
-			histories = append(histories, item)
-		}
-
-		extraHistory[testUrl] = histories
-
-		return true
-	})
-	return extraHistory
-}
-
 // LastDelay return last history record. if proxy is not alive, return the max value of uint16.
 // implements C.Proxy
 func (p *Proxy) LastDelay() (delay uint16) {
@@ -147,28 +80,6 @@ func (p *Proxy) LastDelay() (delay uint16) {
 	return history.Delay
 }
 
-// LastDelayForTestUrl implements C.Proxy
-func (p *Proxy) LastDelayForTestUrl(url string) (delay uint16) {
-	var max uint16 = 0xffff
-
-	alive := p.alive.Load()
-	history := p.history.Last()
-
-	if state, ok := p.extra.Load(url); ok {
-		alive = state.(*extraProxyState).alive.Load()
-		history = state.(*extraProxyState).history.Last()
-	}
-
-	if !alive {
-		return max
-	}
-
-	if history.Delay == 0 {
-		return max
-	}
-	return history.Delay
-}
-
 // MarshalJSON implements C.ProxyAdapter
 func (p *Proxy) MarshalJSON() ([]byte, error) {
 	inner, err := p.ProxyAdapter.MarshalJSON()
@@ -179,8 +90,6 @@ func (p *Proxy) MarshalJSON() ([]byte, error) {
 	mapping := map[string]any{}
 	_ = json.Unmarshal(inner, &mapping)
 	mapping["history"] = p.DelayHistory()
-	mapping["extra"] = p.ExtraDelayHistory()
-	mapping["alive"] = p.Alive()
 	mapping["name"] = p.Name()
 	mapping["udp"] = p.SupportUDP()
 	mapping["xudp"] = p.SupportXUDP()
@@ -190,50 +99,17 @@ func (p *Proxy) MarshalJSON() ([]byte, error) {
 
 // URLTest get the delay for the specified URL
 // implements C.Proxy
-func (p *Proxy) URLTest(ctx context.Context, url string, expectedStatus utils.IntRanges[uint16], store C.DelayHistoryStoreType) (t uint16, err error) {
+func (p *Proxy) URLTest(ctx context.Context, url string) (t uint16, err error) {
 	defer func() {
-		alive := err == nil
-		store = p.determineFinalStoreType(store, url)
-
-		switch store {
-		case C.OriginalHistory:
-			p.alive.Store(alive)
+		p.alive.Store(err == nil)
 		record := C.DelayHistory{Time: time.Now()}
-			if alive {
+		if err == nil {
 			record.Delay = t
 		}
 		p.history.Put(record)
-			if p.history.Len() > defaultHistoriesNum {
+		if p.history.Len() > 10 {
 			p.history.Pop()
 		}
-
-			// test URL configured by the proxy provider
-			if len(p.url) == 0 {
-				p.url = url
-			}
-		case C.ExtraHistory:
-			record := C.DelayHistory{Time: time.Now()}
-			if alive {
-				record.Delay = t
-			}
-
-			state, ok := p.extra.Load(url)
-			if !ok {
-				state = &extraProxyState{
-					history: queue.New[C.DelayHistory](defaultHistoriesNum),
-					alive:   atomic.NewBool(true),
-				}
-				p.extra.Store(url, state)
-			}
-
-			state.(*extraProxyState).alive.Store(alive)
-			state.(*extraProxyState).history.Put(record)
-			if state.(*extraProxyState).history.Len() > defaultHistoriesNum {
-				state.(*extraProxyState).history.Pop()
-			}
-		default:
-			log.Debugln("health check result will be discarded, url: %s alive: %t, delay: %d", url, alive, t)
-		}
 	}()
 
 	unifiedDelay := UnifiedDelay.Load()
@@ -296,22 +172,12 @@ func (p *Proxy) URLTest(ctx context.Context, url string, expectedStatus utils.In
 		}
 	}
 
-	if expectedStatus != nil && !expectedStatus.Check(uint16(resp.StatusCode)) {
-		// maybe another value should be returned for differentiation
-		err = errors.New("response status is inconsistent with the expected status")
-	}
-
 	t = uint16(time.Since(start) / time.Millisecond)
 	return
 }
 
 func NewProxy(adapter C.ProxyAdapter) *Proxy {
-	return &Proxy{
-		ProxyAdapter: adapter,
-		history:      queue.New[C.DelayHistory](defaultHistoriesNum),
-		alive:        atomic.NewBool(true),
-		url:          "",
-		extra:        sync.Map{}}
+	return &Proxy{adapter, queue.New[C.DelayHistory](10), atomic.NewBool(true)}
 }
 
 func urlToMetadata(rawURL string) (addr C.Metadata, err error) {
@@ -332,46 +198,11 @@ func urlToMetadata(rawURL string) (addr C.Metadata, err error) {
 			return
 		}
 	}
-	uintPort, err := strconv.ParseUint(port, 10, 16)
-	if err != nil {
-		return
-	}
 
 	addr = C.Metadata{
 		Host:    u.Hostname(),
 		DstIP:   netip.Addr{},
-		DstPort: uint16(uintPort),
+		DstPort: port,
 	}
 	return
 }
-
-func (p *Proxy) determineFinalStoreType(store C.DelayHistoryStoreType, url string) C.DelayHistoryStoreType {
-	if store != C.DropHistory {
-		return store
-	}
-
-	if len(p.url) == 0 || url == p.url {
-		return C.OriginalHistory
-	}
-
-	length := 0
-	p.extra.Range(func(_, _ interface{}) bool {
-		length++
-		return length < 2*C.DefaultMaxHealthCheckUrlNum
-	})
-
-	if length == 0 {
-		return C.ExtraHistory
-	}
-
-	_, ok := p.extra.Load(url)
-	if ok {
-		return C.ExtraHistory
-	}
-
-	if length < 2*C.DefaultMaxHealthCheckUrlNum {
-		return C.ExtraHistory
-	}
-
-	return store
-}

adapter/inbound/addition.go

@@ -16,12 +16,6 @@ func WithInName(name string) Addition {
 	}
 }
 
-func WithInUser(user string) Addition {
-	return func(metadata *C.Metadata) {
-		metadata.InUser = user
-	}
-}
-
 func WithSpecialRules(specialRules string) Addition {
 	return func(metadata *C.Metadata) {
 		metadata.SpecialRules = specialRules

adapter/inbound/listen.go

@@ -17,10 +17,6 @@ func SetTfo(open bool) {
 	lc.DisableTFO = !open
 }
 
-func SetMPTCP(open bool) {
-	setMultiPathTCP(&lc.ListenConfig, open)
-}
-
 func ListenContext(ctx context.Context, network, address string) (net.Listener, error) {
 	return lc.Listen(ctx, network, address)
 }

adapter/inbound/mptcp_go120.go

@@ -1,10 +0,0 @@
-//go:build !go1.21
-
-package inbound
-
-import "net"
-
-const multipathTCPAvailable = false
-
-func setMultiPathTCP(listenConfig *net.ListenConfig, open bool) {
-}

adapter/inbound/mptcp_go121.go

@@ -1,11 +0,0 @@
-//go:build go1.21
-
-package inbound
-
-import "net"
-
-const multipathTCPAvailable = true
-
-func setMultiPathTCP(listenConfig *net.ListenConfig, open bool) {
-	listenConfig.SetMultipathTCP(open)
-}

adapter/inbound/socket.go

@@ -3,7 +3,6 @@ package inbound
 import (
 	"net"
 	"net/netip"
-	"strconv"
 
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/context"
@@ -31,22 +30,23 @@ func NewSocket(target socks5.Addr, conn net.Conn, source C.Type, additions ...Ad
 	return context.NewConnContext(conn, metadata)
 }
 
-func NewInner(conn net.Conn, address string) *context.ConnContext {
+func NewInner(conn net.Conn, dst string, host string) *context.ConnContext {
 	metadata := &C.Metadata{}
 	metadata.NetWork = C.TCP
 	metadata.Type = C.INNER
 	metadata.DNSMode = C.DNSNormal
+	metadata.Host = host
 	metadata.Process = C.ClashName
-	if h, port, err := net.SplitHostPort(address); err == nil {
-		if port, err := strconv.ParseUint(port, 10, 16); err == nil {
-			metadata.DstPort = uint16(port)
-		}
+	if h, port, err := net.SplitHostPort(dst); err == nil {
+		metadata.DstPort = port
+		if host == "" {
 			if ip, err := netip.ParseAddr(h); err == nil {
 				metadata.DstIP = ip
 			} else {
 				metadata.Host = h
 			}
 		}
+	}
 
 	return context.NewConnContext(conn, metadata)
 }

adapter/inbound/util.go

@@ -20,14 +20,14 @@ func parseSocksAddr(target socks5.Addr) *C.Metadata {
 	case socks5.AtypDomainName:
 		// trim for FQDN
 		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]))
+		metadata.DstPort = strconv.Itoa((int(target[2+target[1]]) << 8) | int(target[2+target[1]+1]))
 	case socks5.AtypIPv4:
 		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]))
+		metadata.DstPort = strconv.Itoa((int(target[1+net.IPv4len]) << 8) | int(target[1+net.IPv4len+1]))
 	case socks5.AtypIPv6:
 		ip6, _ := netip.AddrFromSlice(target[1 : 1+net.IPv6len])
 		metadata.DstIP = ip6.Unmap()
-		metadata.DstPort = uint16((int(target[1+net.IPv6len]) << 8) | int(target[1+net.IPv6len+1]))
+		metadata.DstPort = strconv.Itoa((int(target[1+net.IPv6len]) << 8) | int(target[1+net.IPv6len+1]))
 	}
 
 	return metadata
@@ -43,16 +43,11 @@ func parseHTTPAddr(request *http.Request) *C.Metadata {
 	// trim FQDN (#737)
 	host = strings.TrimRight(host, ".")
 
-	var uint16Port uint16
-	if port, err := strconv.ParseUint(port, 10, 16); err == nil {
-		uint16Port = uint16(port)
-	}
-
 	metadata := &C.Metadata{
 		NetWork: C.TCP,
 		Host:    host,
 		DstIP:   netip.Addr{},
-		DstPort: uint16Port,
+		DstPort: port,
 	}
 
 	ip, err := netip.ParseAddr(host)
@@ -63,10 +58,10 @@ func parseHTTPAddr(request *http.Request) *C.Metadata {
 	return metadata
 }
 
-func parseAddr(addr net.Addr) (netip.Addr, uint16, error) {
+func parseAddr(addr net.Addr) (netip.Addr, string, error) {
 	// Filter when net.Addr interface is nil
 	if addr == nil {
-		return netip.Addr{}, 0, errors.New("nil addr")
+		return netip.Addr{}, "", errors.New("nil addr")
 	}
 	if rawAddr, ok := addr.(interface{ RawAddr() net.Addr }); ok {
 		ip, port, err := parseAddr(rawAddr.RawAddr())
@@ -77,14 +72,9 @@ func parseAddr(addr net.Addr) (netip.Addr, uint16, error) {
 	addrStr := addr.String()
 	host, port, err := net.SplitHostPort(addrStr)
 	if err != nil {
-		return netip.Addr{}, 0, err
-	}
-
-	var uint16Port uint16
-	if port, err := strconv.ParseUint(port, 10, 16); err == nil {
-		uint16Port = uint16(port)
+		return netip.Addr{}, "", err
 	}
 
 	ip, err := netip.ParseAddr(host)
-	return ip, uint16Port, err
+	return ip, port, err
 }

adapter/outbound/base.go

@@ -21,7 +21,6 @@ type Base struct {
 	udp    bool
 	xudp   bool
 	tfo    bool
-	mpTcp  bool
 	rmark  int
 	id     string
 	prefer C.DNSPrefer
@@ -46,8 +45,8 @@ func (b *Base) Type() C.AdapterType {
 	return b.tp
 }
 
-// StreamConnContext implements C.ProxyAdapter
-func (b *Base) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+// StreamConn implements C.ProxyAdapter
+func (b *Base) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	return c, C.ErrNotSupport
 }
 
@@ -144,16 +143,11 @@ func (b *Base) DialOptions(opts ...dialer.Option) []dialer.Option {
 		opts = append(opts, dialer.WithTFO(true))
 	}
 
-	if b.mpTcp {
-		opts = append(opts, dialer.WithMPTCP(true))
-	}
-
 	return opts
 }
 
 type BasicOption struct {
 	TFO         bool   `proxy:"tfo,omitempty" group:"tfo,omitempty"`
-	MPTCP       bool   `proxy:"mptcp,omitempty" group:"mptcp,omitempty"`
 	Interface   string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
 	RoutingMark int    `proxy:"routing-mark,omitempty" group:"routing-mark,omitempty"`
 	IPVersion   string `proxy:"ip-version,omitempty" group:"ip-version,omitempty"`
@@ -167,7 +161,6 @@ type BaseOption struct {
 	UDP         bool
 	XUDP        bool
 	TFO         bool
-	MPTCP       bool
 	Interface   string
 	RoutingMark int
 	Prefer      C.DNSPrefer
@@ -181,7 +174,6 @@ func NewBase(opt BaseOption) *Base {
 		udp:    opt.UDP,
 		xudp:   opt.XUDP,
 		tfo:    opt.TFO,
-		mpTcp:  opt.MPTCP,
 		iface:  opt.Interface,
 		rmark:  opt.RoutingMark,
 		prefer: opt.Prefer,
@@ -228,7 +220,7 @@ func NewConn(c net.Conn, a C.ProxyAdapter) C.Conn {
 }
 
 type packetConn struct {
-	N.EnhancePacketConn
+	net.PacketConn
 	chain                   C.Chain
 	adapterName             string
 	connID                  string
@@ -250,28 +242,15 @@ func (c *packetConn) AppendToChains(a C.ProxyAdapter) {
 }
 
 func (c *packetConn) LocalAddr() net.Addr {
-	lAddr := c.EnhancePacketConn.LocalAddr()
+	lAddr := c.PacketConn.LocalAddr()
 	return N.NewCustomAddr(c.adapterName, c.connID, lAddr) // make quic-go's connMultiplexer happy
 }
 
-func (c *packetConn) Upstream() any {
-	return c.EnhancePacketConn
-}
-
-func (c *packetConn) WriterReplaceable() bool {
-	return true
-}
-
-func (c *packetConn) ReaderReplaceable() bool {
-	return true
-}
-
 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
-		epc = N.NewDeadlineEnhancePacketConn(epc) // most conn from outbound can't handle readDeadline correctly
+		pc = N.NewDeadlinePacketConn(pc) // most conn from outbound can't handle readDeadline correctly
 	}
-	return &packetConn{epc, []string{a.Name()}, a.Name(), utils.NewUUIDV4().String(), parseRemoteDestination(a.Addr())}
+	return &packetConn{pc, []string{a.Name()}, a.Name(), utils.NewUUIDV4().String(), parseRemoteDestination(a.Addr())}
 }
 
 func parseRemoteDestination(addr string) string {

adapter/outbound/direct.go

@@ -3,6 +3,8 @@ package outbound
 import (
 	"context"
 	"errors"
+	"net"
+
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/resolver"
 	C "github.com/Dreamacro/clash/constant"
@@ -12,11 +14,6 @@ type Direct struct {
 	*Base
 }
 
-type DirectOption struct {
-	BasicOption
-	Name string `proxy:"name"`
-}
-
 // DialContext implements C.ProxyAdapter
 func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
 	opts = append(opts, dialer.WithResolver(resolver.DefaultResolver))
@@ -42,22 +39,11 @@ func (d *Direct) ListenPacketContext(ctx context.Context, metadata *C.Metadata,
 	if err != nil {
 		return nil, err
 	}
-	return newPacketConn(pc, d), nil
+	return newPacketConn(&directPacketConn{pc}, d), nil
 }
 
-func NewDirectWithOption(option DirectOption) *Direct {
-	return &Direct{
-		Base: &Base{
-			name:   option.Name,
-			tp:     C.Direct,
-			udp:    true,
-			tfo:    option.TFO,
-			mpTcp:  option.MPTCP,
-			iface:  option.Interface,
-			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
-		},
-	}
+type directPacketConn struct {
+	net.PacketConn
 }
 
 func NewDirect() *Direct {

adapter/outbound/http.go

@@ -10,6 +10,7 @@ import (
 	"io"
 	"net"
 	"net/http"
+	"net/url"
 	"strconv"
 
 	"github.com/Dreamacro/clash/component/dialer"
@@ -40,10 +41,12 @@ type HttpOption struct {
 	Headers        map[string]string `proxy:"headers,omitempty"`
 }
 
-// StreamConnContext implements C.ProxyAdapter
-func (h *Http) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+// StreamConn implements C.ProxyAdapter
+func (h *Http) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	if h.tlsConfig != nil {
 		cc := tls.Client(c, h.tlsConfig)
+		ctx, cancel := context.WithTimeout(context.Background(), C.DefaultTLSTimeout)
+		defer cancel()
 		err := cc.HandshakeContext(ctx)
 		c = cc
 		if err != nil {
@@ -80,7 +83,7 @@ func (h *Http) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metad
 		safeConnClose(c, err)
 	}(c)
 
-	c, err = h.StreamConnContext(ctx, c, metadata)
+	c, err = h.StreamConn(c, metadata)
 	if err != nil {
 		return nil, err
 	}
@@ -95,36 +98,34 @@ func (h *Http) SupportWithDialer() C.NetWork {
 
 func (h *Http) shakeHand(metadata *C.Metadata, rw io.ReadWriter) error {
 	addr := metadata.RemoteAddress()
-	HeaderString := "CONNECT " + addr + " HTTP/1.1\r\n"
-	tempHeaders := map[string]string{
-		"Host":             addr,
-		"User-Agent":       "Go-http-client/1.1",
-		"Proxy-Connection": "Keep-Alive",
+	req := &http.Request{
+		Method: http.MethodConnect,
+		URL: &url.URL{
+			Host: addr,
+		},
+		Host: addr,
+		Header: http.Header{
+			"Proxy-Connection": []string{"Keep-Alive"},
+		},
 	}
 
+	//增加headers
+	if len(h.option.Headers) != 0 {
 		for key, value := range h.option.Headers {
-		tempHeaders[key] = value
+			req.Header.Add(key, value)
+		}
 	}
 
 	if h.user != "" && h.pass != "" {
 		auth := h.user + ":" + h.pass
-		tempHeaders["Proxy-Authorization"] = "Basic " + base64.StdEncoding.EncodeToString([]byte(auth))
+		req.Header.Add("Proxy-Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(auth)))
 	}
 
-	for key, value := range tempHeaders {
-		HeaderString += key + ": " + value + "\r\n"
-	}
-
-	HeaderString += "\r\n"
-
-	_, err := rw.Write([]byte(HeaderString))
-
-	if err != nil {
+	if err := req.Write(rw); err != nil {
 		return err
 	}
 
-	resp, err := http.ReadResponse(bufio.NewReader(rw), nil)
-
+	resp, err := http.ReadResponse(bufio.NewReader(rw), req)
 	if err != nil {
 		return err
 	}
@@ -177,7 +178,6 @@ func NewHttp(option HttpOption) (*Http, error) {
 			addr:   net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
 			tp:     C.Http,
 			tfo:    option.TFO,
-			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
 			prefer: C.NewDNSPrefer(option.IPVersion),

adapter/outbound/hysteria.go

@@ -318,16 +318,6 @@ func (c *hyPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
 	return
 }
 
-func (c *hyPacketConn) WaitReadFrom() (data []byte, put func(), addr net.Addr, err error) {
-	b, addrStr, err := c.UDPConn.ReadFrom()
-	if err != nil {
-		return
-	}
-	data = b
-	addr = M.ParseSocksaddr(addrStr).UDPAddr()
-	return
-}
-
 func (c *hyPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
 	err = c.UDPConn.WriteTo(p, M.SocksaddrFromNet(addr).String())
 	if err != nil {

adapter/outbound/reject.go

@@ -78,9 +78,6 @@ type nopPacketConn struct{}
 
 func (npc nopPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) { return len(b), nil }
 func (npc nopPacketConn) ReadFrom(b []byte) (int, net.Addr, error)           { return 0, nil, io.EOF }
-func (npc nopPacketConn) WaitReadFrom() ([]byte, func(), net.Addr, error) {
-	return nil, nil, nil, io.EOF
-}
 func (npc nopPacketConn) Close() error                                       { return nil }
 func (npc nopPacketConn) LocalAddr() net.Addr                                { return udpAddrIPv4Unspecified }
 func (npc nopPacketConn) SetDeadline(time.Time) error                        { return nil }

adapter/outbound/shadowsocks.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net"
 	"strconv"
+	"time"
 
 	N "github.com/Dreamacro/clash/common/net"
 	"github.com/Dreamacro/clash/common/structure"
@@ -16,10 +17,13 @@ import (
 	"github.com/Dreamacro/clash/transport/restls"
 	obfs "github.com/Dreamacro/clash/transport/simple-obfs"
 	shadowtls "github.com/Dreamacro/clash/transport/sing-shadowtls"
+	"github.com/Dreamacro/clash/transport/socks5"
 	v2rayObfs "github.com/Dreamacro/clash/transport/v2ray-plugin"
 
 	restlsC "github.com/3andne/restls-client-go"
-	shadowsocks "github.com/metacubex/sing-shadowsocks2"
+	shadowsocks "github.com/metacubex/sing-shadowsocks"
+	"github.com/metacubex/sing-shadowsocks/shadowimpl"
+	"github.com/sagernet/sing/common/bufio"
 	M "github.com/sagernet/sing/common/metadata"
 	"github.com/sagernet/sing/common/uot"
 )
@@ -83,7 +87,14 @@ type restlsOption struct {
 	RestlsScript string `obfs:"restls-script,omitempty"`
 }
 
-// StreamConnContext implements C.ProxyAdapter
+// StreamConn implements C.ProxyAdapter
+func (ss *ShadowSocks) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+	// fix tls handshake not timeout
+	ctx, cancel := context.WithTimeout(context.Background(), C.DefaultTLSTimeout)
+	defer cancel()
+	return ss.StreamConnContext(ctx, c, metadata)
+}
+
 func (ss *ShadowSocks) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	useEarly := false
 	switch ss.obfsMode {
@@ -94,7 +105,7 @@ func (ss *ShadowSocks) StreamConnContext(ctx context.Context, c net.Conn, metada
 		c = obfs.NewHTTPObfs(c, ss.obfsOption.Host, port)
 	case "websocket":
 		var err error
-		c, err = v2rayObfs.NewV2rayObfs(ctx, c, ss.v2rayOption)
+		c, err = v2rayObfs.NewV2rayObfs(c, ss.v2rayOption)
 		if err != nil {
 			return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
 		}
@@ -185,7 +196,7 @@ func (ss *ShadowSocks) ListenPacketWithDialer(ctx context.Context, dialer C.Dial
 	if err != nil {
 		return nil, err
 	}
-	pc = ss.method.DialPacketConn(N.NewBindPacketConn(pc, addr))
+	pc = ss.method.DialPacketConn(bufio.NewBindPacketConn(pc, addr))
 	return newPacketConn(pc, ss), nil
 }
 
@@ -223,9 +234,7 @@ func (ss *ShadowSocks) SupportUOT() bool {
 
 func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
-	method, err := shadowsocks.CreateMethod(context.Background(), option.Cipher, shadowsocks.MethodOptions{
-		Password: option.Password,
-	})
+	method, err := shadowimpl.FetchMethod(option.Cipher, option.Password, time.Now)
 	if err != nil {
 		return nil, fmt.Errorf("ss %s initialize error: %w", addr, err)
 	}
@@ -294,6 +303,7 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 		}
 
 		restlsConfig, err = restlsC.NewRestlsConfig(restlsOpt.Host, restlsOpt.Password, restlsOpt.VersionHint, restlsOpt.RestlsScript, option.ClientFingerprint)
+		restlsConfig.SessionTicketsDisabled = true
 		if err != nil {
 			return nil, fmt.Errorf("ss %s initialize restls-plugin error: %w", addr, err)
 		}
@@ -302,7 +312,7 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 	switch option.UDPOverTCPVersion {
 	case uot.Version, uot.LegacyVersion:
 	case 0:
-		option.UDPOverTCPVersion = uot.LegacyVersion
+		option.UDPOverTCPVersion = uot.Version
 	default:
 		return nil, fmt.Errorf("ss %s unknown udp over tcp protocol version: %d", addr, option.UDPOverTCPVersion)
 	}
@@ -314,7 +324,6 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 			tp:     C.Shadowsocks,
 			udp:    option.UDP,
 			tfo:    option.TFO,
-			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
 			prefer: C.NewDNSPrefer(option.IPVersion),
@@ -329,3 +338,36 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 		restlsConfig:    restlsConfig,
 	}, nil
 }
+
+type ssPacketConn struct {
+	net.PacketConn
+	rAddr net.Addr
+}
+
+func (spc *ssPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
+	packet, err := socks5.EncodeUDPPacket(socks5.ParseAddrToSocksAddr(addr), b)
+	if err != nil {
+		return
+	}
+	return spc.PacketConn.WriteTo(packet[3:], spc.rAddr)
+}
+
+func (spc *ssPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
+	n, _, e := spc.PacketConn.ReadFrom(b)
+	if e != nil {
+		return 0, nil, e
+	}
+
+	addr := socks5.SplitAddr(b[:n])
+	if addr == nil {
+		return 0, nil, errors.New("parse addr error")
+	}
+
+	udpAddr := addr.UDPAddr()
+	if udpAddr == nil {
+		return 0, nil, errors.New("parse addr error")
+	}
+
+	copy(b, b[len(addr):])
+	return n - len(addr), udpAddr, e
+}

adapter/outbound/shadowsocksr.go

@@ -2,19 +2,16 @@ package outbound
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"net"
 	"strconv"
 
-	N "github.com/Dreamacro/clash/common/net"
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/proxydialer"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/transport/shadowsocks/core"
 	"github.com/Dreamacro/clash/transport/shadowsocks/shadowaead"
 	"github.com/Dreamacro/clash/transport/shadowsocks/shadowstream"
-	"github.com/Dreamacro/clash/transport/socks5"
 	"github.com/Dreamacro/clash/transport/ssr/obfs"
 	"github.com/Dreamacro/clash/transport/ssr/protocol"
 )
@@ -41,8 +38,8 @@ type ShadowSocksROption struct {
 	UDP           bool   `proxy:"udp,omitempty"`
 }
 
-// StreamConnContext implements C.ProxyAdapter
-func (ssr *ShadowSocksR) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+// StreamConn implements C.ProxyAdapter
+func (ssr *ShadowSocksR) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	c = ssr.obfs.StreamConn(c)
 	c = ssr.cipher.StreamConn(c)
 	var (
@@ -86,7 +83,7 @@ func (ssr *ShadowSocksR) DialContextWithDialer(ctx context.Context, dialer C.Dia
 		safeConnClose(c, err)
 	}(c)
 
-	c, err = ssr.StreamConnContext(ctx, c, metadata)
+	c, err = ssr.StreamConn(c, metadata)
 	return NewConn(c, ssr), err
 }
 
@@ -113,9 +110,9 @@ func (ssr *ShadowSocksR) ListenPacketWithDialer(ctx context.Context, dialer C.Di
 		return nil, err
 	}
 
-	epc := ssr.cipher.PacketConn(N.NewEnhancePacketConn(pc))
-	epc = ssr.protocol.PacketConn(epc)
-	return newPacketConn(&ssrPacketConn{EnhancePacketConn: epc, rAddr: addr}, ssr), nil
+	pc = ssr.cipher.PacketConn(pc)
+	pc = ssr.protocol.PacketConn(pc)
+	return newPacketConn(&ssPacketConn{PacketConn: pc, rAddr: addr}, ssr), nil
 }
 
 // SupportWithDialer implements C.ProxyAdapter
@@ -181,7 +178,6 @@ func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) {
 			tp:     C.ShadowsocksR,
 			udp:    option.UDP,
 			tfo:    option.TFO,
-			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
 			prefer: C.NewDNSPrefer(option.IPVersion),
@@ -192,62 +188,3 @@ func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) {
 		protocol: protocol,
 	}, nil
 }
-
-type ssrPacketConn struct {
-	N.EnhancePacketConn
-	rAddr net.Addr
-}
-
-func (spc *ssrPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
-	packet, err := socks5.EncodeUDPPacket(socks5.ParseAddrToSocksAddr(addr), b)
-	if err != nil {
-		return
-	}
-	return spc.EnhancePacketConn.WriteTo(packet[3:], spc.rAddr)
-}
-
-func (spc *ssrPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
-	n, _, e := spc.EnhancePacketConn.ReadFrom(b)
-	if e != nil {
-		return 0, nil, e
-	}
-
-	addr := socks5.SplitAddr(b[:n])
-	if addr == nil {
-		return 0, nil, errors.New("parse addr error")
-	}
-
-	udpAddr := addr.UDPAddr()
-	if udpAddr == nil {
-		return 0, nil, errors.New("parse addr error")
-	}
-
-	copy(b, b[len(addr):])
-	return n - len(addr), udpAddr, e
-}
-
-func (spc *ssrPacketConn) WaitReadFrom() (data []byte, put func(), addr net.Addr, err error) {
-	data, put, _, err = spc.EnhancePacketConn.WaitReadFrom()
-	if err != nil {
-		return nil, nil, nil, err
-	}
-
-	_addr := socks5.SplitAddr(data)
-	if _addr == nil {
-		if put != nil {
-			put()
-		}
-		return nil, nil, nil, errors.New("parse addr error")
-	}
-
-	addr = _addr.UDPAddr()
-	if addr == nil {
-		if put != nil {
-			put()
-		}
-		return nil, nil, nil, errors.New("parse addr error")
-	}
-
-	data = data[len(_addr):]
-	return
-}

adapter/outbound/singmux.go

@@ -92,12 +92,12 @@ func (s *SingMux) ListenPacketContext(ctx context.Context, metadata *C.Metadata,
 	if pc == nil {
 		return nil, E.New("packetConn is nil")
 	}
-	return newPacketConn(CN.NewRefPacketConn(CN.NewThreadSafePacketConn(pc), s), s.ProxyAdapter), nil
+	return newPacketConn(CN.NewRefPacketConn(pc, s), s.ProxyAdapter), nil
 }
 
 func (s *SingMux) SupportUDP() bool {
 	if s.onlyTcp {
-		return s.ProxyAdapter.SupportUDP()
+		return s.ProxyAdapter.SupportUOT()
 	}
 	return true
 }

adapter/outbound/snell.go

@@ -52,14 +52,15 @@ func streamConn(c net.Conn, option streamOption) *snell.Snell {
 	return snell.StreamConn(c, option.psk, option.version)
 }
 
-// StreamConnContext implements C.ProxyAdapter
-func (s *Snell) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+// StreamConn implements C.ProxyAdapter
+func (s *Snell) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	c = streamConn(c, streamOption{s.psk, s.version, s.addr, s.obfsOption})
 	if metadata.NetWork == C.UDP {
 		err := snell.WriteUDPHeader(c, s.version)
 		return c, err
 	}
-	err := snell.WriteHeader(c, metadata.String(), uint(metadata.DstPort), s.version)
+	port, _ := strconv.ParseUint(metadata.DstPort, 10, 16)
+	err := snell.WriteHeader(c, metadata.String(), uint(port), s.version)
 	return c, err
 }
 
@@ -71,7 +72,8 @@ func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata, opts ...d
 			return nil, err
 		}
 
-		if err = snell.WriteHeader(c, metadata.String(), uint(metadata.DstPort), s.version); err != nil {
+		port, _ := strconv.ParseUint(metadata.DstPort, 10, 16)
+		if err = snell.WriteHeader(c, metadata.String(), uint(port), s.version); err != nil {
 			c.Close()
 			return nil, err
 		}
@@ -99,7 +101,7 @@ func (s *Snell) DialContextWithDialer(ctx context.Context, dialer C.Dialer, meta
 		safeConnClose(c, err)
 	}(c)
 
-	c, err = s.StreamConnContext(ctx, c, metadata)
+	c, err = s.StreamConn(c, metadata)
 	return NewConn(c, s), err
 }
 
@@ -181,7 +183,6 @@ func NewSnell(option SnellOption) (*Snell, error) {
 			tp:     C.Snell,
 			udp:    option.UDP,
 			tfo:    option.TFO,
-			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
 			prefer: C.NewDNSPrefer(option.IPVersion),

adapter/outbound/socks5.go

@@ -39,10 +39,12 @@ type Socks5Option struct {
 	Fingerprint    string `proxy:"fingerprint,omitempty"`
 }
 
-// StreamConnContext implements C.ProxyAdapter
-func (ss *Socks5) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+// StreamConn implements C.ProxyAdapter
+func (ss *Socks5) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	if ss.tls {
 		cc := tls.Client(c, ss.tlsConfig)
+		ctx, cancel := context.WithTimeout(context.Background(), C.DefaultTLSTimeout)
+		defer cancel()
 		err := cc.HandshakeContext(ctx)
 		c = cc
 		if err != nil {
@@ -86,7 +88,7 @@ func (ss *Socks5) DialContextWithDialer(ctx context.Context, dialer C.Dialer, me
 		safeConnClose(c, err)
 	}(c)
 
-	c, err = ss.StreamConnContext(ctx, c, metadata)
+	c, err = ss.StreamConn(c, metadata)
 	if err != nil {
 		return nil, err
 	}
@@ -196,7 +198,6 @@ func NewSocks5(option Socks5Option) (*Socks5, error) {
 			tp:     C.Socks5,
 			udp:    option.UDP,
 			tfo:    option.TFO,
-			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
 			prefer: C.NewDNSPrefer(option.IPVersion),

adapter/outbound/trojan.go

@@ -14,6 +14,7 @@ import (
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/transport/gun"
 	"github.com/Dreamacro/clash/transport/trojan"
+	"github.com/Dreamacro/clash/transport/vless"
 )
 
 type Trojan struct {
@@ -44,10 +45,12 @@ type TrojanOption struct {
 	RealityOpts       RealityOptions `proxy:"reality-opts,omitempty"`
 	GrpcOpts          GrpcOptions    `proxy:"grpc-opts,omitempty"`
 	WSOpts            WSOptions      `proxy:"ws-opts,omitempty"`
+	Flow              string         `proxy:"flow,omitempty"`
+	FlowShow          bool           `proxy:"flow-show,omitempty"`
 	ClientFingerprint string         `proxy:"client-fingerprint,omitempty"`
 }
 
-func (t *Trojan) plainStream(ctx context.Context, c net.Conn) (net.Conn, error) {
+func (t *Trojan) plainStream(c net.Conn) (net.Conn, error) {
 	if t.option.Network == "ws" {
 		host, port, _ := net.SplitHostPort(t.addr)
 		wsOpts := &trojan.WebsocketOption{
@@ -68,14 +71,14 @@ func (t *Trojan) plainStream(ctx context.Context, c net.Conn) (net.Conn, error)
 			wsOpts.Headers = header
 		}
 
-		return t.instance.StreamWebsocketConn(ctx, c, wsOpts)
+		return t.instance.StreamWebsocketConn(c, wsOpts)
 	}
 
-	return t.instance.StreamConn(ctx, c)
+	return t.instance.StreamConn(c)
 }
 
-// StreamConnContext implements C.ProxyAdapter
-func (t *Trojan) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+// StreamConn implements C.ProxyAdapter
+func (t *Trojan) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	var err error
 
 	if tlsC.HaveGlobalFingerprint() && len(t.option.ClientFingerprint) == 0 {
@@ -85,13 +88,18 @@ func (t *Trojan) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.
 	if t.transport != nil {
 		c, err = gun.StreamGunWithConn(c, t.gunTLSConfig, t.gunConfig, t.realityConfig)
 	} else {
-		c, err = t.plainStream(ctx, c)
+		c, err = t.plainStream(c)
 	}
 
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
 	}
 
+	c, err = t.instance.PresetXTLSConn(c)
+	if err != nil {
+		return nil, err
+	}
+
 	if metadata.NetWork == C.UDP {
 		err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata))
 		return c, err
@@ -109,6 +117,12 @@ func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata, opts ...
 			return nil, err
 		}
 
+		c, err = t.instance.PresetXTLSConn(c)
+		if err != nil {
+			c.Close()
+			return nil, err
+		}
+
 		if err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata)); err != nil {
 			c.Close()
 			return nil, err
@@ -137,7 +151,7 @@ func (t *Trojan) DialContextWithDialer(ctx context.Context, dialer C.Dialer, met
 		safeConnClose(c, err)
 	}(c)
 
-	c, err = t.StreamConnContext(ctx, c, metadata)
+	c, err = t.StreamConn(c, metadata)
 	if err != nil {
 		return nil, err
 	}
@@ -185,7 +199,7 @@ func (t *Trojan) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, me
 		safeConnClose(c, err)
 	}(c)
 	tcpKeepAlive(c)
-	c, err = t.plainStream(ctx, c)
+	c, err = t.plainStream(c)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
 	}
@@ -223,10 +237,24 @@ func NewTrojan(option TrojanOption) (*Trojan, error) {
 		ALPN:              option.ALPN,
 		ServerName:        option.Server,
 		SkipCertVerify:    option.SkipCertVerify,
+		FlowShow:          option.FlowShow,
 		Fingerprint:       option.Fingerprint,
 		ClientFingerprint: option.ClientFingerprint,
 	}
 
+	switch option.Network {
+	case "", "tcp":
+		if len(option.Flow) >= 16 {
+			option.Flow = option.Flow[:16]
+			switch option.Flow {
+			case vless.XRO, vless.XRD, vless.XRS:
+				tOption.Flow = option.Flow
+			default:
+				return nil, fmt.Errorf("unsupported xtls flow type: %s", option.Flow)
+			}
+		}
+	}
+
 	if option.SNI != "" {
 		tOption.ServerName = option.SNI
 	}
@@ -238,7 +266,6 @@ func NewTrojan(option TrojanOption) (*Trojan, error) {
 			tp:     C.Trojan,
 			udp:    option.UDP,
 			tfo:    option.TFO,
-			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
 			prefer: C.NewDNSPrefer(option.IPVersion),

adapter/outbound/tuic.go

@@ -6,7 +6,6 @@ import (
 	"crypto/tls"
 	"encoding/hex"
 	"encoding/pem"
-	"errors"
 	"fmt"
 	"math"
 	"net"
@@ -14,17 +13,13 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/metacubex/quic-go"
+
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/proxydialer"
-	"github.com/Dreamacro/clash/component/resolver"
 	tlsC "github.com/Dreamacro/clash/component/tls"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/transport/tuic"
-
-	"github.com/gofrs/uuid/v5"
-	"github.com/metacubex/quic-go"
-	M "github.com/sagernet/sing/common/metadata"
-	"github.com/sagernet/sing/common/uot"
 )
 
 type Tuic struct {
@@ -38,9 +33,7 @@ type TuicOption struct {
 	Name                  string   `proxy:"name"`
 	Server                string   `proxy:"server"`
 	Port                  int      `proxy:"port"`
-	Token                 string   `proxy:"token,omitempty"`
-	UUID                  string   `proxy:"uuid,omitempty"`
-	Password              string   `proxy:"password,omitempty"`
+	Token                 string   `proxy:"token"`
 	Ip                    string   `proxy:"ip,omitempty"`
 	HeartbeatInterval     int      `proxy:"heartbeat-interval,omitempty"`
 	ALPN                  []string `proxy:"alpn,omitempty"`
@@ -53,7 +46,6 @@ type TuicOption struct {
 
 	FastOpen             bool   `proxy:"fast-open,omitempty"`
 	MaxOpenStreams       int    `proxy:"max-open-streams,omitempty"`
-	CWND                 int    `proxy:"cwnd,omitempty"`
 	SkipCertVerify       bool   `proxy:"skip-cert-verify,omitempty"`
 	Fingerprint          string `proxy:"fingerprint,omitempty"`
 	CustomCA             string `proxy:"ca,omitempty"`
@@ -63,9 +55,6 @@ type TuicOption struct {
 	DisableMTUDiscovery  bool   `proxy:"disable-mtu-discovery,omitempty"`
 	MaxDatagramFrameSize int    `proxy:"max-datagram-frame-size,omitempty"`
 	SNI                  string `proxy:"sni,omitempty"`
-
-	UDPOverStream        bool `proxy:"udp-over-stream,omitempty"`
-	UDPOverStreamVersion int  `proxy:"udp-over-stream-version,omitempty"`
 }
 
 // DialContext implements C.ProxyAdapter
@@ -89,32 +78,6 @@ func (t *Tuic) ListenPacketContext(ctx context.Context, metadata *C.Metadata, op
 
 // ListenPacketWithDialer implements C.ProxyAdapter
 func (t *Tuic) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if t.option.UDPOverStream {
-		uotDestination := uot.RequestDestination(uint8(t.option.UDPOverStreamVersion))
-		uotMetadata := *metadata
-		uotMetadata.Host = uotDestination.Fqdn
-		uotMetadata.DstPort = uotDestination.Port
-		c, err := t.DialContextWithDialer(ctx, dialer, &uotMetadata)
-		if err != nil {
-			return nil, err
-		}
-
-		// tuic uos use stream-oriented udp with a special address, so we need a net.UDPAddr
-		if !metadata.Resolved() {
-			ip, err := resolver.ResolveIP(ctx, metadata.Host)
-			if err != nil {
-				return nil, errors.New("can't resolve ip")
-			}
-			metadata.DstIP = ip
-		}
-
-		destination := M.SocksaddrFromNet(metadata.UDPAddr())
-		if t.option.UDPOverStreamVersion == uot.LegacyVersion {
-			return newPacketConn(uot.NewConn(c, uot.Request{Destination: destination}), t), nil
-		} else {
-			return newPacketConn(uot.NewLazyConn(c, uot.Request{Destination: destination}), t), nil
-		}
-	}
 	pc, err := t.client.ListenPacketWithDialer(ctx, metadata, dialer, t.dialWithDialer)
 	if err != nil {
 		return nil, err
@@ -127,7 +90,11 @@ func (t *Tuic) SupportWithDialer() C.NetWork {
 	return C.ALLNet
 }
 
-func (t *Tuic) dialWithDialer(ctx context.Context, dialer C.Dialer) (transport *quic.Transport, addr net.Addr, err error) {
+func (t *Tuic) dial(ctx context.Context, opts ...dialer.Option) (pc net.PacketConn, addr net.Addr, err error) {
+	return t.dialWithDialer(ctx, dialer.NewDialer(opts...))
+}
+
+func (t *Tuic) dialWithDialer(ctx context.Context, dialer C.Dialer) (pc net.PacketConn, addr net.Addr, err error) {
 	if len(t.option.DialerProxy) > 0 {
 		dialer, err = proxydialer.NewByName(t.option.DialerProxy, dialer)
 		if err != nil {
@@ -139,14 +106,10 @@ func (t *Tuic) dialWithDialer(ctx context.Context, dialer C.Dialer) (transport *
 		return nil, nil, err
 	}
 	addr = udpAddr
-	var pc net.PacketConn
 	pc, err = dialer.ListenPacket(ctx, "udp", "", udpAddr.AddrPort())
 	if err != nil {
 		return nil, nil, err
 	}
-	transport = &quic.Transport{Conn: pc}
-	transport.SetCreatedConn(true) // auto close conn
-	transport.SetSingleUse(true)   // auto close transport
 	return
 }
 
@@ -195,7 +158,7 @@ func NewTuic(option TuicOption) (*Tuic, error) {
 		tlsConfig = tlsC.GetGlobalTLSConfig(tlsConfig)
 	}
 
-	if option.ALPN != nil { // structure's Decode will ensure value not nil when input has value even it was set an empty array
+	if len(option.ALPN) > 0 {
 		tlsConfig.NextProtos = option.ALPN
 	} else {
 		tlsConfig.NextProtos = []string{"h3"}
@@ -209,9 +172,8 @@ func NewTuic(option TuicOption) (*Tuic, error) {
 		option.HeartbeatInterval = 10000
 	}
 
-	udpRelayMode := tuic.QUIC
 	if option.UdpRelayMode != "quic" {
-		udpRelayMode = tuic.NATIVE
+		option.UdpRelayMode = "native"
 	}
 
 	if option.MaxUdpRelayPacketSize == 0 {
@@ -222,23 +184,14 @@ func NewTuic(option TuicOption) (*Tuic, error) {
 		option.MaxOpenStreams = 100
 	}
 
-	if option.CWND == 0 {
-		option.CWND = 32
-	}
-
-	packetOverHead := tuic.PacketOverHeadV4
-	if len(option.Token) == 0 {
-		packetOverHead = tuic.PacketOverHeadV5
-	}
-
 	if option.MaxDatagramFrameSize == 0 {
-		option.MaxDatagramFrameSize = option.MaxUdpRelayPacketSize + packetOverHead
+		option.MaxDatagramFrameSize = option.MaxUdpRelayPacketSize + tuic.PacketOverHead
 	}
 
 	if option.MaxDatagramFrameSize > 1400 {
 		option.MaxDatagramFrameSize = 1400
 	}
-	option.MaxUdpRelayPacketSize = option.MaxDatagramFrameSize - packetOverHead
+	option.MaxUdpRelayPacketSize = option.MaxDatagramFrameSize - tuic.PacketOverHead
 
 	// ensure server's incoming stream can handle correctly, increase to 1.1x
 	quicMaxOpenStreams := int64(option.MaxOpenStreams)
@@ -267,18 +220,12 @@ func NewTuic(option TuicOption) (*Tuic, error) {
 	if len(option.Ip) > 0 {
 		addr = net.JoinHostPort(option.Ip, strconv.Itoa(option.Port))
 	}
+	host := option.Server
 	if option.DisableSni {
+		host = ""
 		tlsConfig.ServerName = ""
-		tlsConfig.InsecureSkipVerify = true // tls: either ServerName or InsecureSkipVerify must be specified in the tls.Config
-	}
-
-	switch option.UDPOverStreamVersion {
-	case uot.Version, uot.LegacyVersion:
-	case 0:
-		option.UDPOverStreamVersion = uot.LegacyVersion
-	default:
-		return nil, fmt.Errorf("tuic %s unknown udp over stream protocol version: %d", addr, option.UDPOverStreamVersion)
 	}
+	tkn := tuic.GenTKN(option.Token)
 
 	t := &Tuic{
 		Base: &Base{
@@ -304,40 +251,21 @@ func NewTuic(option TuicOption) (*Tuic, error) {
 	if clientMaxOpenStreams < 1 {
 		clientMaxOpenStreams = 1
 	}
-
-	if len(option.Token) > 0 {
-		tkn := tuic.GenTKN(option.Token)
-		clientOption := &tuic.ClientOptionV4{
+	clientOption := &tuic.ClientOption{
 		TlsConfig:             tlsConfig,
 		QuicConfig:            quicConfig,
+		Host:                  host,
 		Token:                 tkn,
-			UdpRelayMode:          udpRelayMode,
+		UdpRelayMode:          option.UdpRelayMode,
 		CongestionController:  option.CongestionController,
 		ReduceRtt:             option.ReduceRtt,
 		RequestTimeout:        time.Duration(option.RequestTimeout) * time.Millisecond,
 		MaxUdpRelayPacketSize: option.MaxUdpRelayPacketSize,
 		FastOpen:              option.FastOpen,
 		MaxOpenStreams:        clientMaxOpenStreams,
-			CWND:                  option.CWND,
 	}
 
-		t.client = tuic.NewPoolClientV4(clientOption)
-	} else {
-		clientOption := &tuic.ClientOptionV5{
-			TlsConfig:             tlsConfig,
-			QuicConfig:            quicConfig,
-			Uuid:                  uuid.FromStringOrNil(option.UUID),
-			Password:              option.Password,
-			UdpRelayMode:          udpRelayMode,
-			CongestionController:  option.CongestionController,
-			ReduceRtt:             option.ReduceRtt,
-			MaxUdpRelayPacketSize: option.MaxUdpRelayPacketSize,
-			MaxOpenStreams:        clientMaxOpenStreams,
-			CWND:                  option.CWND,
-		}
-
-		t.client = tuic.NewPoolClientV5(clientOption)
-	}
+	t.client = tuic.NewPoolClient(clientOption)
 
 	return t, nil
 }

adapter/outbound/util.go

@@ -4,8 +4,10 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
+	xtls "github.com/xtls/go"
 	"net"
 	"net/netip"
+	"strconv"
 	"sync"
 	"time"
 
@@ -16,6 +18,7 @@ import (
 
 var (
 	globalClientSessionCache  tls.ClientSessionCache
+	globalClientXSessionCache xtls.ClientSessionCache
 	once                      sync.Once
 )
 
@@ -33,11 +36,18 @@ func getClientSessionCache() tls.ClientSessionCache {
 	return globalClientSessionCache
 }
 
+func getClientXSessionCache() xtls.ClientSessionCache {
+	once.Do(func() {
+		globalClientXSessionCache = xtls.NewLRUClientSessionCache(128)
+	})
+	return globalClientXSessionCache
+}
+
 func serializesSocksAddr(metadata *C.Metadata) []byte {
 	var buf [][]byte
 	addrType := metadata.AddrType()
 	aType := uint8(addrType)
-	p := uint(metadata.DstPort)
+	p, _ := strconv.ParseUint(metadata.DstPort, 10, 16)
 	port := []byte{uint8(p >> 8), uint8(p & 0xff)}
 	switch addrType {
 	case socks5.AtypDomainName:

adapter/outbound/vless.go

@@ -13,8 +13,6 @@ import (
 	"sync"
 
 	"github.com/Dreamacro/clash/common/convert"
-	N "github.com/Dreamacro/clash/common/net"
-	"github.com/Dreamacro/clash/common/utils"
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/proxydialer"
 	"github.com/Dreamacro/clash/component/resolver"
@@ -26,8 +24,8 @@ import (
 	"github.com/Dreamacro/clash/transport/vless"
 	"github.com/Dreamacro/clash/transport/vmess"
 
-	vmessSing "github.com/metacubex/sing-vmess"
-	"github.com/metacubex/sing-vmess/packetaddr"
+	vmessSing "github.com/sagernet/sing-vmess"
+	"github.com/sagernet/sing-vmess/packetaddr"
 	M "github.com/sagernet/sing/common/metadata"
 )
 
@@ -56,8 +54,8 @@ type VlessOption struct {
 	Port              int               `proxy:"port"`
 	UUID              string            `proxy:"uuid"`
 	Flow              string            `proxy:"flow,omitempty"`
+	FlowShow          bool              `proxy:"flow-show,omitempty"`
 	TLS               bool              `proxy:"tls,omitempty"`
-	ALPN              []string          `proxy:"alpn,omitempty"`
 	UDP               bool              `proxy:"udp,omitempty"`
 	PacketAddr        bool              `proxy:"packet-addr,omitempty"`
 	XUDP              bool              `proxy:"xudp,omitempty"`
@@ -76,7 +74,7 @@ type VlessOption struct {
 	ClientFingerprint string            `proxy:"client-fingerprint,omitempty"`
 }
 
-func (v *Vless) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+func (v *Vless) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	var err error
 
 	if tlsC.HaveGlobalFingerprint() && len(v.option.ClientFingerprint) == 0 {
@@ -130,10 +128,10 @@ func (v *Vless) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 				convert.SetUserAgent(wsOpts.Headers)
 			}
 		}
-		c, err = vmess.StreamWebsocketConn(ctx, c, wsOpts)
+		c, err = vmess.StreamWebsocketConn(c, wsOpts)
 	case "http":
 		// readability first, so just copy default TLS logic
-		c, err = v.streamTLSConn(ctx, c, false)
+		c, err = v.streamTLSOrXTLSConn(c, false)
 		if err != nil {
 			return nil, err
 		}
@@ -148,7 +146,7 @@ func (v *Vless) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 
 		c = vmess.StreamHTTPConn(c, httpOpts)
 	case "h2":
-		c, err = v.streamTLSConn(ctx, c, true)
+		c, err = v.streamTLSOrXTLSConn(c, true)
 		if err != nil {
 			return nil, err
 		}
@@ -163,8 +161,8 @@ func (v *Vless) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 		c, err = gun.StreamGunWithConn(c, v.gunTLSConfig, v.gunConfig, v.realityConfig)
 	default:
 		// default tcp network
-		// handle TLS
-		c, err = v.streamTLSConn(ctx, c, false)
+		// handle TLS And XTLS
+		c, err = v.streamTLSOrXTLSConn(c, false)
 	}
 
 	if err != nil {
@@ -180,7 +178,7 @@ func (v *Vless) streamConn(c net.Conn, metadata *C.Metadata) (conn net.Conn, err
 			metadata = &C.Metadata{
 				NetWork: C.UDP,
 				Host:    packetaddr.SeqPacketMagicAddress,
-				DstPort: 443,
+				DstPort: "443",
 			}
 		} else {
 			metadata = &C.Metadata{ // a clear metadata only contains ip
@@ -202,17 +200,29 @@ func (v *Vless) streamConn(c net.Conn, metadata *C.Metadata) (conn net.Conn, err
 	return
 }
 
-func (v *Vless) streamTLSConn(ctx context.Context, conn net.Conn, isH2 bool) (net.Conn, error) {
-	if v.option.TLS {
+func (v *Vless) streamTLSOrXTLSConn(conn net.Conn, isH2 bool) (net.Conn, error) {
 	host, _, _ := net.SplitHostPort(v.addr)
 
+	if v.isLegacyXTLSEnabled() && !isH2 {
+		xtlsOpts := vless.XTLSConfig{
+			Host:           host,
+			SkipCertVerify: v.option.SkipCertVerify,
+			Fingerprint:    v.option.Fingerprint,
+		}
+
+		if v.option.ServerName != "" {
+			xtlsOpts.Host = v.option.ServerName
+		}
+
+		return vless.StreamXTLSConn(conn, &xtlsOpts)
+
+	} else if v.option.TLS {
 		tlsOpts := vmess.TLSConfig{
 			Host:              host,
 			SkipCertVerify:    v.option.SkipCertVerify,
 			FingerPrint:       v.option.Fingerprint,
 			ClientFingerprint: v.option.ClientFingerprint,
 			Reality:           v.realityConfig,
-			NextProtos:        v.option.ALPN,
 		}
 
 		if isH2 {
@@ -223,12 +233,16 @@ func (v *Vless) streamTLSConn(ctx context.Context, conn net.Conn, isH2 bool) (ne
 			tlsOpts.Host = v.option.ServerName
 		}
 
-		return vmess.StreamTLSConn(ctx, conn, &tlsOpts)
+		return vmess.StreamTLSConn(conn, &tlsOpts)
 	}
 
 	return conn, nil
 }
 
+func (v *Vless) isLegacyXTLSEnabled() bool {
+	return v.client.Addons != nil && v.client.Addons.Flow != vless.XRV
+}
+
 // DialContext implements C.ProxyAdapter
 func (v *Vless) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
 	// gun transport
@@ -268,7 +282,7 @@ func (v *Vless) DialContextWithDialer(ctx context.Context, dialer C.Dialer, meta
 		safeConnClose(c, err)
 	}(c)
 
-	c, err = v.StreamConnContext(ctx, c, metadata)
+	c, err = v.StreamConn(c, metadata)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 	}
@@ -333,7 +347,7 @@ func (v *Vless) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, met
 		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)
 	}
@@ -358,21 +372,15 @@ func (v *Vless) ListenPacketOnStreamConn(ctx context.Context, c net.Conn, metada
 	}
 
 	if v.option.XUDP {
-		var globalID [8]byte
-		if metadata.SourceValid() {
-			globalID = utils.GlobalID(metadata.SourceAddress())
-		}
-		return newPacketConn(N.NewThreadSafePacketConn(
-			vmessSing.NewXUDPConn(c,
-				globalID,
-				M.SocksaddrFromNet(metadata.UDPAddr())),
-		), v), nil
+		return newPacketConn(&threadSafePacketConn{
+			PacketConn: vmessSing.NewXUDPConn(c, M.SocksaddrFromNet(metadata.UDPAddr())),
+		}, v), nil
 	} else if v.option.PacketAddr {
-		return newPacketConn(N.NewThreadSafePacketConn(
-			packetaddr.NewConn(&vlessPacketConn{
+		return newPacketConn(&threadSafePacketConn{
+			PacketConn: packetaddr.NewConn(&vlessPacketConn{
 				Conn: c, rAddr: metadata.UDPAddr(),
 			}, M.SocksaddrFromNet(metadata.UDPAddr())),
-		), v), nil
+		}, v), nil
 	}
 	return newPacketConn(&vlessPacketConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil
 }
@@ -401,11 +409,12 @@ func parseVlessAddr(metadata *C.Metadata, xudp bool) *vless.DstAddr {
 		copy(addr[1:], metadata.Host)
 	}
 
+	port, _ := strconv.ParseUint(metadata.DstPort, 10, 16)
 	return &vless.DstAddr{
 		UDP:      metadata.NetWork == C.UDP,
 		AddrType: addrType,
 		Addr:     addr,
-		Port:     metadata.DstPort,
+		Port:     uint16(port),
 		Mux:      metadata.NetWork == C.UDP && xudp,
 	}
 }
@@ -509,11 +518,11 @@ func NewVless(option VlessOption) (*Vless, error) {
 		switch option.Flow {
 		case vless.XRV:
 			log.Warnln("To use %s, ensure your server is upgrade to Xray-core v1.8.0+", vless.XRV)
+			fallthrough
+		case vless.XRO, vless.XRD, vless.XRS:
 			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)
 		}
@@ -532,7 +541,7 @@ func NewVless(option VlessOption) (*Vless, error) {
 		option.PacketAddr = false
 	}
 
-	client, err := vless.NewClient(option.UUID, addons)
+	client, err := vless.NewClient(option.UUID, addons, option.FlowShow)
 	if err != nil {
 		return nil, err
 	}
@@ -545,7 +554,6 @@ func NewVless(option VlessOption) (*Vless, error) {
 			udp:    option.UDP,
 			xudp:   option.XUDP,
 			tfo:    option.TFO,
-			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
 			prefer: C.NewDNSPrefer(option.IPVersion),
@@ -587,19 +595,15 @@ func NewVless(option VlessOption) (*Vless, error) {
 			Host:              v.option.ServerName,
 			ClientFingerprint: v.option.ClientFingerprint,
 		}
-		if option.ServerName == "" {
-			gunConfig.Host = v.addr
-		}
-		var tlsConfig *tls.Config
-		if option.TLS {
-			tlsConfig = tlsC.GetGlobalTLSConfig(&tls.Config{
+		tlsConfig := tlsC.GetGlobalTLSConfig(&tls.Config{
 			InsecureSkipVerify: v.option.SkipCertVerify,
 			ServerName:         v.option.ServerName,
 		})
-			if option.ServerName == "" {
+
+		if v.option.ServerName == "" {
 			host, _, _ := net.SplitHostPort(v.addr)
 			tlsConfig.ServerName = host
-			}
+			gunConfig.Host = host
 		}
 
 		v.gunTLSConfig = tlsConfig

adapter/outbound/vmess.go

@@ -12,18 +12,16 @@ import (
 	"sync"
 
 	N "github.com/Dreamacro/clash/common/net"
-	"github.com/Dreamacro/clash/common/utils"
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/proxydialer"
 	"github.com/Dreamacro/clash/component/resolver"
 	tlsC "github.com/Dreamacro/clash/component/tls"
 	C "github.com/Dreamacro/clash/constant"
-	"github.com/Dreamacro/clash/ntp"
 	"github.com/Dreamacro/clash/transport/gun"
 	clashVMess "github.com/Dreamacro/clash/transport/vmess"
 
-	vmess "github.com/metacubex/sing-vmess"
-	"github.com/metacubex/sing-vmess/packetaddr"
+	vmess "github.com/sagernet/sing-vmess"
+	"github.com/sagernet/sing-vmess/packetaddr"
 	M "github.com/sagernet/sing/common/metadata"
 )
 
@@ -53,7 +51,6 @@ type VmessOption struct {
 	UDP                 bool           `proxy:"udp,omitempty"`
 	Network             string         `proxy:"network,omitempty"`
 	TLS                 bool           `proxy:"tls,omitempty"`
-	ALPN                []string       `proxy:"alpn,omitempty"`
 	SkipCertVerify      bool           `proxy:"skip-cert-verify,omitempty"`
 	Fingerprint         string         `proxy:"fingerprint,omitempty"`
 	ServerName          string         `proxy:"servername,omitempty"`
@@ -92,8 +89,8 @@ type WSOptions struct {
 	EarlyDataHeaderName string            `proxy:"early-data-header-name,omitempty"`
 }
 
-// StreamConnContext implements C.ProxyAdapter
-func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+// StreamConn implements C.ProxyAdapter
+func (v *Vmess) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	var err error
 
 	if tlsC.HaveGlobalFingerprint() && (len(v.option.ClientFingerprint) == 0) {
@@ -141,7 +138,7 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 				wsOpts.TLSConfig.ServerName = host
 			}
 		}
-		c, err = clashVMess.StreamWebsocketConn(ctx, c, wsOpts)
+		c, err = clashVMess.StreamWebsocketConn(c, wsOpts)
 	case "http":
 		// readability first, so just copy default TLS logic
 		if v.option.TLS {
@@ -151,13 +148,12 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 				SkipCertVerify:    v.option.SkipCertVerify,
 				ClientFingerprint: v.option.ClientFingerprint,
 				Reality:           v.realityConfig,
-				NextProtos:        v.option.ALPN,
 			}
 
 			if v.option.ServerName != "" {
 				tlsOpts.Host = v.option.ServerName
 			}
-			c, err = clashVMess.StreamTLSConn(ctx, c, tlsOpts)
+			c, err = clashVMess.StreamTLSConn(c, tlsOpts)
 			if err != nil {
 				return nil, err
 			}
@@ -186,7 +182,7 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			tlsOpts.Host = v.option.ServerName
 		}
 
-		c, err = clashVMess.StreamTLSConn(ctx, c, &tlsOpts)
+		c, err = clashVMess.StreamTLSConn(c, &tlsOpts)
 		if err != nil {
 			return nil, err
 		}
@@ -208,14 +204,13 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 				SkipCertVerify:    v.option.SkipCertVerify,
 				ClientFingerprint: v.option.ClientFingerprint,
 				Reality:           v.realityConfig,
-				NextProtos:        v.option.ALPN,
 			}
 
 			if v.option.ServerName != "" {
 				tlsOpts.Host = v.option.ServerName
 			}
 
-			c, err = clashVMess.StreamTLSConn(ctx, c, tlsOpts)
+			c, err = clashVMess.StreamTLSConn(c, tlsOpts)
 		}
 	}
 
@@ -228,44 +223,30 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 func (v *Vmess) streamConn(c net.Conn, metadata *C.Metadata) (conn net.Conn, err error) {
 	if metadata.NetWork == C.UDP {
 		if v.option.XUDP {
-			var globalID [8]byte
-			if metadata.SourceValid() {
-				globalID = utils.GlobalID(metadata.SourceAddress())
-			}
 			if N.NeedHandshake(c) {
-				conn = v.client.DialEarlyXUDPPacketConn(c,
-					globalID,
-					M.SocksaddrFromNet(metadata.UDPAddr()))
+				conn = v.client.DialEarlyXUDPPacketConn(c, M.SocksaddrFromNet(metadata.UDPAddr()))
 			} else {
-				conn, err = v.client.DialXUDPPacketConn(c,
-					globalID,
-					M.SocksaddrFromNet(metadata.UDPAddr()))
+				conn, err = v.client.DialXUDPPacketConn(c, M.SocksaddrFromNet(metadata.UDPAddr()))
 			}
 		} else if v.option.PacketAddr {
 			if N.NeedHandshake(c) {
-				conn = v.client.DialEarlyPacketConn(c,
-					M.ParseSocksaddrHostPort(packetaddr.SeqPacketMagicAddress, 443))
+				conn = v.client.DialEarlyPacketConn(c, M.ParseSocksaddrHostPort(packetaddr.SeqPacketMagicAddress, 443))
 			} else {
-				conn, err = v.client.DialPacketConn(c,
-					M.ParseSocksaddrHostPort(packetaddr.SeqPacketMagicAddress, 443))
+				conn, err = v.client.DialPacketConn(c, M.ParseSocksaddrHostPort(packetaddr.SeqPacketMagicAddress, 443))
 			}
 			conn = packetaddr.NewBindConn(conn)
 		} else {
 			if N.NeedHandshake(c) {
-				conn = v.client.DialEarlyPacketConn(c,
-					M.SocksaddrFromNet(metadata.UDPAddr()))
+				conn = v.client.DialEarlyPacketConn(c, M.SocksaddrFromNet(metadata.UDPAddr()))
 			} else {
-				conn, err = v.client.DialPacketConn(c,
-					M.SocksaddrFromNet(metadata.UDPAddr()))
+				conn, err = v.client.DialPacketConn(c, M.SocksaddrFromNet(metadata.UDPAddr()))
 			}
 		}
 	} else {
 		if N.NeedHandshake(c) {
-			conn = v.client.DialEarlyConn(c,
-				M.ParseSocksaddr(metadata.RemoteAddress()))
+			conn = v.client.DialEarlyConn(c, M.ParseSocksaddr(metadata.RemoteAddress()))
 		} else {
-			conn, err = v.client.DialConn(c,
-				M.ParseSocksaddr(metadata.RemoteAddress()))
+			conn, err = v.client.DialConn(c, M.ParseSocksaddr(metadata.RemoteAddress()))
 		}
 	}
 	if err != nil {
@@ -313,7 +294,7 @@ func (v *Vmess) DialContextWithDialer(ctx context.Context, dialer C.Dialer, meta
 		safeConnClose(c, err)
 	}(c)
 
-	c, err = v.StreamConnContext(ctx, c, metadata)
+	c, err = v.StreamConn(c, metadata)
 	return NewConn(c, v), err
 }
 
@@ -374,7 +355,7 @@ func (v *Vmess) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, met
 		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)
 	}
@@ -398,7 +379,7 @@ func (v *Vmess) ListenPacketOnStreamConn(ctx context.Context, c net.Conn, metada
 	}
 
 	if pc, ok := c.(net.PacketConn); ok {
-		return newPacketConn(N.NewThreadSafePacketConn(pc), v), nil
+		return newPacketConn(&threadSafePacketConn{PacketConn: pc}, v), nil
 	}
 	return newPacketConn(&vmessPacketConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil
 }
@@ -417,7 +398,6 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 	if option.AuthenticatedLength {
 		options = append(options, vmess.ClientWithAuthenticatedLength())
 	}
-	options = append(options, vmess.ClientWithTimeFunc(ntp.Now))
 	client, err := vmess.NewClient(option.UUID, security, option.AlterID, options...)
 	if err != nil {
 		return nil, err
@@ -433,6 +413,13 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 		option.PacketAddr = false
 	}
 
+	switch option.Network {
+	case "h2", "grpc":
+		if !option.TLS {
+			option.TLS = true
+		}
+	}
+
 	v := &Vmess{
 		Base: &Base{
 			name:   option.Name,
@@ -441,7 +428,6 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 			udp:    option.UDP,
 			xudp:   option.XUDP,
 			tfo:    option.TFO,
-			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
 			prefer: C.NewDNSPrefer(option.IPVersion),
@@ -478,19 +464,15 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 			Host:              v.option.ServerName,
 			ClientFingerprint: v.option.ClientFingerprint,
 		}
-		if option.ServerName == "" {
-			gunConfig.Host = v.addr
-		}
-		var tlsConfig *tls.Config
-		if option.TLS {
-			tlsConfig = tlsC.GetGlobalTLSConfig(&tls.Config{
+		tlsConfig := &tls.Config{
 			InsecureSkipVerify: v.option.SkipCertVerify,
 			ServerName:         v.option.ServerName,
-			})
-			if option.ServerName == "" {
+		}
+
+		if v.option.ServerName == "" {
 			host, _, _ := net.SplitHostPort(v.addr)
 			tlsConfig.ServerName = host
-			}
+			gunConfig.Host = host
 		}
 
 		v.gunTLSConfig = tlsConfig
@@ -507,6 +489,17 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 	return v, nil
 }
 
+type threadSafePacketConn struct {
+	net.PacketConn
+	access sync.Mutex
+}
+
+func (c *threadSafePacketConn) WriteTo(b []byte, addr net.Addr) (int, error) {
+	c.access.Lock()
+	defer c.access.Unlock()
+	return c.PacketConn.WriteTo(b, addr)
+}
+
 type vmessPacketConn struct {
 	net.Conn
 	rAddr  net.Addr

adapter/outbound/wireguard.go

@@ -67,7 +67,7 @@ type WireGuardPeerOption struct {
 	PublicKey    string   `proxy:"public-key,omitempty"`
 	PreSharedKey string   `proxy:"pre-shared-key,omitempty"`
 	Reserved     []uint8  `proxy:"reserved,omitempty"`
-	AllowedIPs   []string `proxy:"allowed-ips,omitempty"`
+	AllowedIPs   []string `proxy:"allowed_ips,omitempty"`
 }
 
 type wgSingDialer struct {
@@ -302,7 +302,7 @@ func NewWireGuard(option WireGuardOption) (*WireGuard, error) {
 	if err != nil {
 		return nil, E.Cause(err, "create WireGuard device")
 	}
-	outbound.device = device.NewDevice(context.Background(), outbound.tunDevice, outbound.bind, &device.Logger{
+	outbound.device = device.NewDevice(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...)))
 		},
@@ -374,7 +374,8 @@ func (w *WireGuard) DialContext(ctx context.Context, metadata *C.Metadata, opts
 		options = append(options, dialer.WithNetDialer(wgNetDialer{tunDevice: w.tunDevice}))
 		conn, err = dialer.NewDialer(options...).DialContext(ctx, "tcp", metadata.RemoteAddress())
 	} else {
-		conn, err = w.tunDevice.DialContext(ctx, "tcp", M.SocksaddrFrom(metadata.DstIP, metadata.DstPort).Unwrap())
+		port, _ := strconv.Atoi(metadata.DstPort)
+		conn, err = w.tunDevice.DialContext(ctx, "tcp", M.SocksaddrFrom(metadata.DstIP, uint16(port)).Unwrap())
 	}
 	if err != nil {
 		return nil, err
@@ -411,7 +412,8 @@ func (w *WireGuard) ListenPacketContext(ctx context.Context, metadata *C.Metadat
 		}
 		metadata.DstIP = ip
 	}
-	pc, err = w.tunDevice.ListenPacket(ctx, M.SocksaddrFrom(metadata.DstIP, metadata.DstPort).Unwrap())
+	port, _ := strconv.Atoi(metadata.DstPort)
+	pc, err = w.tunDevice.ListenPacket(ctx, M.SocksaddrFrom(metadata.DstIP, uint16(port)).Unwrap())
 	if err != nil {
 		return nil, err
 	}
@@ -497,9 +499,9 @@ func (r *refProxyAdapter) MarshalJSON() ([]byte, error) {
 	return nil, C.ErrNotSupport
 }
 
-func (r *refProxyAdapter) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+func (r *refProxyAdapter) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	if r.proxyAdapter != nil {
-		return r.proxyAdapter.StreamConnContext(ctx, c, metadata)
+		return r.proxyAdapter.StreamConn(c, metadata)
 	}
 	return nil, C.ErrNotSupport
 }

adapter/outboundgroup/fallback.go

@@ -9,7 +9,6 @@ import (
 	"github.com/Dreamacro/clash/adapter/outbound"
 	"github.com/Dreamacro/clash/common/callback"
 	N "github.com/Dreamacro/clash/common/net"
-	"github.com/Dreamacro/clash/common/utils"
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/constant/provider"
@@ -20,7 +19,6 @@ type Fallback struct {
 	disableUDP bool
 	testUrl    string
 	selected   string
-	expectedStatus string
 }
 
 func (f *Fallback) Now() string {
@@ -87,8 +85,6 @@ func (f *Fallback) MarshalJSON() ([]byte, error) {
 		"type": f.Type().String(),
 		"now":  f.Now(),
 		"all":  all,
-		"testUrl":  f.testUrl,
-		"expected": f.expectedStatus,
 	})
 }
 
@@ -102,14 +98,12 @@ func (f *Fallback) findAliveProxy(touch bool) C.Proxy {
 	proxies := f.GetProxies(touch)
 	for _, proxy := range proxies {
 		if len(f.selected) == 0 {
-			// if proxy.Alive() {
-			if proxy.AliveForTestUrl(f.testUrl) {
+			if proxy.Alive() {
 				return proxy
 			}
 		} else {
 			if proxy.Name() == f.selected {
-				// if proxy.Alive() {
-				if proxy.AliveForTestUrl(f.testUrl) {
+				if proxy.Alive() {
 					return proxy
 				} else {
 					f.selected = ""
@@ -135,12 +129,10 @@ func (f *Fallback) Set(name string) error {
 	}
 
 	f.selected = name
-	// if !p.Alive() {
-	if !p.AliveForTestUrl(f.testUrl) {
+	if !p.Alive() {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(5000))
 		defer cancel()
-		expectedStatus, _ := utils.NewIntRanges[uint16](f.expectedStatus)
-		_, _ = p.URLTest(ctx, f.testUrl, expectedStatus, C.ExtraHistory)
+		_, _ = p.URLTest(ctx, f.testUrl)
 	}
 
 	return nil
@@ -166,6 +158,5 @@ func NewFallback(option *GroupCommonOption, providers []provider.ProxyProvider)
 		}),
 		disableUDP: option.DisableUDP,
 		testUrl:    option.URL,
-		expectedStatus: option.ExpectedStatus,
 	}
 }

adapter/outboundgroup/groupbase.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/Dreamacro/clash/adapter/outbound"
 	"github.com/Dreamacro/clash/common/atomic"
-	"github.com/Dreamacro/clash/common/utils"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/constant/provider"
 	types "github.com/Dreamacro/clash/constant/provider"
@@ -131,6 +130,10 @@ func (gb *GroupBase) GetProxies(touch bool) []C.Proxy {
 		}
 	}
 
+	if len(proxies) == 0 {
+		return append(proxies, tunnel.Proxies()["COMPATIBLE"])
+	}
+
 	if len(gb.providers) > 1 && len(gb.filterRegs) > 1 {
 		var newProxies []C.Proxy
 		proxiesSet := map[string]struct{}{}
@@ -186,14 +189,10 @@ func (gb *GroupBase) GetProxies(touch bool) []C.Proxy {
 		proxies = newProxies
 	}
 
-	if len(proxies) == 0 {
-		return append(proxies, tunnel.Proxies()["COMPATIBLE"])
-	}
-
 	return proxies
 }
 
-func (gb *GroupBase) URLTest(ctx context.Context, url string, expectedStatus utils.IntRanges[uint16]) (map[string]uint16, error) {
+func (gb *GroupBase) URLTest(ctx context.Context, url string) (map[string]uint16, error) {
 	var wg sync.WaitGroup
 	var lock sync.Mutex
 	mp := map[string]uint16{}
@@ -202,7 +201,7 @@ func (gb *GroupBase) URLTest(ctx context.Context, url string, expectedStatus uti
 		proxy := proxy
 		wg.Add(1)
 		go func() {
-			delay, err := proxy.URLTest(ctx, url, expectedStatus, C.DropHistory)
+			delay, err := proxy.URLTest(ctx, url)
 			if err == nil {
 				lock.Lock()
 				mp[proxy.Name()] = delay

adapter/outboundgroup/loadbalance.go

@@ -12,8 +12,8 @@ import (
 	"github.com/Dreamacro/clash/adapter/outbound"
 	"github.com/Dreamacro/clash/common/cache"
 	"github.com/Dreamacro/clash/common/callback"
+	"github.com/Dreamacro/clash/common/murmur3"
 	N "github.com/Dreamacro/clash/common/net"
-	"github.com/Dreamacro/clash/common/utils"
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/constant/provider"
@@ -27,8 +27,6 @@ type LoadBalance struct {
 	*GroupBase
 	disableUDP bool
 	strategyFn strategyFn
-	testUrl        string
-	expectedStatus string
 }
 
 var errStrategy = errors.New("unsupported strategy")
@@ -131,7 +129,7 @@ func (lb *LoadBalance) IsL3Protocol(metadata *C.Metadata) bool {
 	return lb.Unwrap(metadata, false).IsL3Protocol(metadata)
 }
 
-func strategyRoundRobin(url string) strategyFn {
+func strategyRoundRobin() strategyFn {
 	idx := 0
 	idxMutex := sync.Mutex{}
 	return func(proxies []C.Proxy, metadata *C.Metadata, touch bool) C.Proxy {
@@ -150,8 +148,7 @@ func strategyRoundRobin(url string) strategyFn {
 		for ; i < length; i++ {
 			id := (idx + i) % length
 			proxy := proxies[id]
-			// if proxy.Alive() {
-			if proxy.AliveForTestUrl(url) {
+			if proxy.Alive() {
 				i++
 				return proxy
 			}
@@ -161,24 +158,22 @@ func strategyRoundRobin(url string) strategyFn {
 	}
 }
 
-func strategyConsistentHashing(url string) strategyFn {
+func strategyConsistentHashing() strategyFn {
 	maxRetry := 5
 	return func(proxies []C.Proxy, metadata *C.Metadata, touch bool) C.Proxy {
-		key := utils.MapHash(getKey(metadata))
+		key := uint64(murmur3.Sum32([]byte(getKey(metadata))))
 		buckets := int32(len(proxies))
 		for i := 0; i < maxRetry; i, key = i+1, key+1 {
 			idx := jumpHash(key, buckets)
 			proxy := proxies[idx]
-			// if proxy.Alive() {
-			if proxy.AliveForTestUrl(url) {
+			if proxy.Alive() {
 				return proxy
 			}
 		}
 
 		// when availability is poor, traverse the entire list to get the available nodes
 		for _, proxy := range proxies {
-			// if proxy.Alive() {
-			if proxy.AliveForTestUrl(url) {
+			if proxy.Alive() {
 				return proxy
 			}
 		}
@@ -187,14 +182,14 @@ func strategyConsistentHashing(url string) strategyFn {
 	}
 }
 
-func strategyStickySessions(url string) strategyFn {
+func strategyStickySessions() strategyFn {
 	ttl := time.Minute * 10
 	maxRetry := 5
 	lruCache := cache.New[uint64, int](
 		cache.WithAge[uint64, int](int64(ttl.Seconds())),
 		cache.WithSize[uint64, int](1000))
 	return func(proxies []C.Proxy, metadata *C.Metadata, touch bool) C.Proxy {
-		key := utils.MapHash(getKeyWithSrcAndDst(metadata))
+		key := uint64(murmur3.Sum32([]byte(getKeyWithSrcAndDst(metadata))))
 		length := len(proxies)
 		idx, has := lruCache.Get(key)
 		if !has {
@@ -204,8 +199,7 @@ func strategyStickySessions(url string) strategyFn {
 		nowIdx := idx
 		for i := 1; i < maxRetry; i++ {
 			proxy := proxies[nowIdx]
-			// if proxy.Alive() {
-			if proxy.AliveForTestUrl(url) {
+			if proxy.Alive() {
 				if nowIdx != idx {
 					lruCache.Delete(key)
 					lruCache.Set(key, nowIdx)
@@ -238,8 +232,6 @@ func (lb *LoadBalance) MarshalJSON() ([]byte, error) {
 	return json.Marshal(map[string]any{
 		"type": lb.Type().String(),
 		"all":  all,
-		"testUrl":        lb.testUrl,
-		"expectedStatus": lb.expectedStatus,
 	})
 }
 
@@ -247,11 +239,11 @@ func NewLoadBalance(option *GroupCommonOption, providers []provider.ProxyProvide
 	var strategyFn strategyFn
 	switch strategy {
 	case "consistent-hashing":
-		strategyFn = strategyConsistentHashing(option.URL)
+		strategyFn = strategyConsistentHashing()
 	case "round-robin":
-		strategyFn = strategyRoundRobin(option.URL)
+		strategyFn = strategyRoundRobin()
 	case "sticky-sessions":
-		strategyFn = strategyStickySessions(option.URL)
+		strategyFn = strategyStickySessions()
 	default:
 		return nil, fmt.Errorf("%w: %s", errStrategy, strategy)
 	}
@@ -270,7 +262,5 @@ func NewLoadBalance(option *GroupCommonOption, providers []provider.ProxyProvide
 		}),
 		strategyFn: strategyFn,
 		disableUDP: option.DisableUDP,
-		testUrl:        option.URL,
-		expectedStatus: option.ExpectedStatus,
 	}, nil
 }

adapter/outboundgroup/parser.go

@@ -3,20 +3,19 @@ package outboundgroup
 import (
 	"errors"
 	"fmt"
-	"strings"
 
 	"github.com/Dreamacro/clash/adapter/outbound"
 	"github.com/Dreamacro/clash/adapter/provider"
 	"github.com/Dreamacro/clash/common/structure"
-	"github.com/Dreamacro/clash/common/utils"
 	C "github.com/Dreamacro/clash/constant"
 	types "github.com/Dreamacro/clash/constant/provider"
 )
 
 var (
 	errFormat            = errors.New("format error")
-	errType              = errors.New("unsupported type")
+	errType              = errors.New("unsupport type")
 	errMissProxy         = errors.New("`use` or `proxies` missing")
+	errMissHealthCheck   = errors.New("`url` or `interval` missing")
 	errDuplicateProvider = errors.New("duplicate provider name")
 )
 
@@ -33,7 +32,6 @@ type GroupCommonOption struct {
 	Filter        string   `group:"filter,omitempty"`
 	ExcludeFilter string   `group:"exclude-filter,omitempty"`
 	ExcludeType   string   `group:"exclude-type,omitempty"`
-	ExpectedStatus string   `group:"expected-status,omitempty"`
 }
 
 func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, providersMap map[string]types.ProxyProvider) (C.ProxyAdapter, error) {
@@ -55,36 +53,30 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
 	providers := []types.ProxyProvider{}
 
 	if len(groupOption.Proxies) == 0 && len(groupOption.Use) == 0 {
-		return nil, fmt.Errorf("%s: %w", groupName, errMissProxy)
+		return nil, errMissProxy
 	}
 
-	expectedStatus, err := utils.NewIntRanges[uint16](groupOption.ExpectedStatus)
-	if err != nil {
-		return nil, fmt.Errorf("%s: %w", groupName, err)
-	}
-
-	status := strings.TrimSpace(groupOption.ExpectedStatus)
-	if status == "" {
-		status = "*"
-	}
-	groupOption.ExpectedStatus = status
-	testUrl := groupOption.URL
-
 	if len(groupOption.Proxies) != 0 {
 		ps, err := getProxies(proxyMap, groupOption.Proxies)
 		if err != nil {
-			return nil, fmt.Errorf("%s: %w", groupName, err)
+			return nil, err
 		}
 
 		if _, ok := providersMap[groupName]; ok {
-			return nil, fmt.Errorf("%s: %w", groupName, errDuplicateProvider)
+			return nil, errDuplicateProvider
 		}
 
-		var url string
-		var interval uint
-
 		// select don't need health check
-		if groupOption.Type != "select" && groupOption.Type != "relay" {
+		if groupOption.Type == "select" || groupOption.Type == "relay" {
+			hc := provider.NewHealthCheck(ps, "", 0, true)
+			pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
+			if err != nil {
+				return nil, err
+			}
+
+			providers = append(providers, pd)
+			providersMap[groupName] = pd
+		} else {
 			if groupOption.URL == "" {
 				groupOption.URL = "https://cp.cloudflare.com/generate_204"
 			}
@@ -93,29 +85,22 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
 				groupOption.Interval = 300
 			}
 
-			url = groupOption.URL
-			interval = uint(groupOption.Interval)
-		}
-
-		hc := provider.NewHealthCheck(ps, url, interval, true, expectedStatus)
+			hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.Interval), groupOption.Lazy)
 			pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
 			if err != nil {
-			return nil, fmt.Errorf("%s: %w", groupName, err)
+				return nil, err
 			}
 
 			providers = append(providers, pd)
 			providersMap[groupName] = pd
 		}
+	}
 
 	if len(groupOption.Use) != 0 {
 		list, err := getProviders(providersMap, groupOption.Use)
 		if err != nil {
-			return nil, fmt.Errorf("%s: %w", groupName, err)
+			return nil, err
 		}
-
-		// different proxy groups use different test URL
-		addTestUrlToProviders(list, testUrl, expectedStatus, groupOption.Filter, uint(groupOption.Interval))
-
 		providers = append(providers, list...)
 	} else {
 		groupOption.Filter = ""
@@ -169,13 +154,3 @@ func getProviders(mapping map[string]types.ProxyProvider, list []string) ([]type
 	}
 	return ps, nil
 }
-
-func addTestUrlToProviders(providers []types.ProxyProvider, url string, expectedStatus utils.IntRanges[uint16], filter string, interval uint) {
-	if len(providers) == 0 || len(url) == 0 {
-		return
-	}
-
-	for _, pd := range providers {
-		pd.RegisterHealthCheckTask(url, expectedStatus, filter, interval)
-	}
-}

adapter/outboundgroup/urltest.go

@@ -27,7 +27,6 @@ type URLTest struct {
 	*GroupBase
 	selected   string
 	testUrl    string
-	expectedStatus string
 	tolerance  uint16
 	disableUDP bool
 	fastNode   C.Proxy
@@ -97,49 +96,44 @@ func (u *URLTest) Unwrap(metadata *C.Metadata, touch bool) C.Proxy {
 }
 
 func (u *URLTest) fast(touch bool) C.Proxy {
-
-	proxies := u.GetProxies(touch)
-	if u.selected != "" {
-		for _, proxy := range proxies {
-			if !proxy.Alive() {
-				continue
-			}
-			if proxy.Name() == u.selected {
-				u.fastNode = proxy
-				return proxy
-			}
-		}
-	}
-
 	elm, _, shared := u.fastSingle.Do(func() (C.Proxy, error) {
+		var s C.Proxy
+		proxies := u.GetProxies(touch)
 		fast := proxies[0]
-		// min := fast.LastDelay()
-		min := fast.LastDelayForTestUrl(u.testUrl)
+		if fast.Name() == u.selected {
+			s = fast
+		}
+		min := fast.LastDelay()
 		fastNotExist := true
 
 		for _, proxy := range proxies[1:] {
+
 			if u.fastNode != nil && proxy.Name() == u.fastNode.Name() {
 				fastNotExist = false
 			}
 
-			// if !proxy.Alive() {
-			if !proxy.AliveForTestUrl(u.testUrl) {
+			if proxy.Name() == u.selected {
+				s = proxy
+			}
+			if !proxy.Alive() {
 				continue
 			}
 
-			// delay := proxy.LastDelay()
-			delay := proxy.LastDelayForTestUrl(u.testUrl)
+			delay := proxy.LastDelay()
 			if delay < min {
 				fast = proxy
 				min = delay
 			}
-
 		}
 		// tolerance
-		// if u.fastNode == nil || fastNotExist || !u.fastNode.Alive() || u.fastNode.LastDelay() > fast.LastDelay()+u.tolerance {
-		if u.fastNode == nil || fastNotExist || !u.fastNode.AliveForTestUrl(u.testUrl) || u.fastNode.LastDelayForTestUrl(u.testUrl) > fast.LastDelayForTestUrl(u.testUrl)+u.tolerance {
+		if u.fastNode == nil || fastNotExist || !u.fastNode.Alive() || u.fastNode.LastDelay() > fast.LastDelay()+u.tolerance {
 			u.fastNode = fast
 		}
+		if s != nil {
+			if s.Alive() && s.LastDelay() < fast.LastDelay()+u.tolerance {
+				u.fastNode = s
+			}
+		}
 		return u.fastNode, nil
 	})
 	if shared && touch { // a shared fastSingle.Do() may cause providers untouched, so we touch them again
@@ -172,8 +166,6 @@ func (u *URLTest) MarshalJSON() ([]byte, error) {
 		"type": u.Type().String(),
 		"now":  u.Now(),
 		"all":  all,
-		"testUrl":  u.testUrl,
-		"expected": u.expectedStatus,
 	})
 }
 
@@ -208,7 +200,6 @@ func NewURLTest(option *GroupCommonOption, providers []provider.ProxyProvider, o
 		fastSingle: singledo.NewSingle[C.Proxy](time.Second * 10),
 		disableUDP: option.DisableUDP,
 		testUrl:    option.URL,
-		expectedStatus: option.ExpectedStatus,
 	}
 
 	for _, option := range options {

adapter/parser.go

@@ -106,13 +106,6 @@ func ParseProxy(mapping map[string]any) (C.Proxy, error) {
 			break
 		}
 		proxy, err = outbound.NewTuic(*tuicOption)
-	case "direct":
-		directOption := &outbound.DirectOption{}
-		err = decoder.Decode(mapping, directOption)
-		if err != nil {
-			break
-		}
-		proxy = outbound.NewDirectWithOption(*directOption)
 	default:
 		return nil, fmt.Errorf("unsupport proxy type: %s", proxyType)
 	}

adapter/provider/healthcheck.go

@@ -2,8 +2,6 @@ package provider
 
 import (
 	"context"
-	"strings"
-	"sync"
 	"time"
 
 	"github.com/Dreamacro/clash/common/atomic"
@@ -12,8 +10,6 @@ import (
 	"github.com/Dreamacro/clash/common/utils"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
-
-	"github.com/dlclark/regexp2"
 )
 
 const (
@@ -25,33 +21,18 @@ type HealthCheckOption struct {
 	Interval uint
 }
 
-type extraOption struct {
-	expectedStatus utils.IntRanges[uint16]
-	filters        map[string]struct{}
-}
-
 type HealthCheck struct {
 	url       string
-	extra          map[string]*extraOption
-	mu             sync.Mutex
-	started        *atomic.Bool
 	proxies   []C.Proxy
 	interval  uint
 	lazy      bool
-	expectedStatus utils.IntRanges[uint16]
 	lastTouch *atomic.Int64
 	done      chan struct{}
 	singleDo  *singledo.Single[struct{}]
 }
 
 func (hc *HealthCheck) process() {
-	if hc.started.Load() {
-		log.Warnln("Skip start health check timer due to it's started")
-		return
-	}
-
 	ticker := time.NewTicker(time.Duration(hc.interval) * time.Second)
-	hc.start()
 	for {
 		select {
 		case <-ticker.C:
@@ -63,7 +44,6 @@ func (hc *HealthCheck) process() {
 			}
 		case <-hc.done:
 			ticker.Stop()
-			hc.stop()
 			return
 		}
 	}
@@ -73,63 +53,6 @@ func (hc *HealthCheck) setProxy(proxies []C.Proxy) {
 	hc.proxies = proxies
 }
 
-func (hc *HealthCheck) registerHealthCheckTask(url string, expectedStatus utils.IntRanges[uint16], filter string, interval uint) {
-	url = strings.TrimSpace(url)
-	if len(url) == 0 || url == hc.url {
-		log.Debugln("ignore invalid health check url: %s", url)
-		return
-	}
-
-	hc.mu.Lock()
-	defer hc.mu.Unlock()
-
-	// if the provider has not set up health checks, then modify it to be the same as the group's interval
-	if hc.interval == 0 {
-		hc.interval = interval
-	}
-
-	if hc.extra == nil {
-		hc.extra = make(map[string]*extraOption)
-	}
-
-	// prioritize the use of previously registered configurations, especially those from provider
-	if _, ok := hc.extra[url]; ok {
-		// provider default health check does not set filter
-		if url != hc.url && len(filter) != 0 {
-			splitAndAddFiltersToExtra(filter, hc.extra[url])
-		}
-
-		log.Debugln("health check url: %s exists", url)
-		return
-	}
-
-	// due to the time-consuming nature of health checks, a maximum of defaultMaxTestURLNum URLs can be set for testing
-	if len(hc.extra) > C.DefaultMaxHealthCheckUrlNum {
-		log.Debugln("skip add url: %s to health check because it has reached the maximum limit: %d", url, C.DefaultMaxHealthCheckUrlNum)
-		return
-	}
-
-	option := &extraOption{filters: map[string]struct{}{}, expectedStatus: expectedStatus}
-	splitAndAddFiltersToExtra(filter, option)
-	hc.extra[url] = option
-
-	if hc.auto() && !hc.started.Load() {
-		go hc.process()
-	}
-}
-
-func splitAndAddFiltersToExtra(filter string, option *extraOption) {
-	filter = strings.TrimSpace(filter)
-	if len(filter) != 0 {
-		for _, regex := range strings.Split(filter, "`") {
-			regex = strings.TrimSpace(regex)
-			if len(regex) != 0 {
-				option.filters[regex] = struct{}{}
-			}
-		}
-	}
-}
-
 func (hc *HealthCheck) auto() bool {
 	return hc.interval != 0
 }
@@ -138,100 +61,39 @@ func (hc *HealthCheck) touch() {
 	hc.lastTouch.Store(time.Now().Unix())
 }
 
-func (hc *HealthCheck) start() {
-	hc.started.Store(true)
-}
-
-func (hc *HealthCheck) stop() {
-	hc.started.Store(false)
-}
-
 func (hc *HealthCheck) check() {
 	_, _, _ = hc.singleDo.Do(func() (struct{}, error) {
 		id := utils.NewUUIDV4().String()
 		log.Debugln("Start New Health Checking {%s}", id)
 		b, _ := batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](10))
-
-		// execute default health check
-		option := &extraOption{filters: nil, expectedStatus: hc.expectedStatus}
-		hc.execute(b, hc.url, id, option)
-
-		// execute extra health check
-		if len(hc.extra) != 0 {
-			for url, option := range hc.extra {
-				hc.execute(b, url, id, option)
-			}
+		for _, proxy := range hc.proxies {
+			p := proxy
+			b.Go(p.Name(), func() (bool, error) {
+				ctx, cancel := context.WithTimeout(context.Background(), defaultURLTestTimeout)
+				defer cancel()
+				log.Debugln("Health Checking %s {%s}", p.Name(), id)
+				_, _ = p.URLTest(ctx, hc.url)
+				log.Debugln("Health Checked %s : %t %d ms {%s}", p.Name(), p.Alive(), p.LastDelay(), id)
+				return false, nil
+			})
 		}
+
 		b.Wait()
 		log.Debugln("Finish A Health Checking {%s}", id)
 		return struct{}{}, nil
 	})
 }
 
-func (hc *HealthCheck) 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)
-		return
-	}
-
-	var filterReg *regexp2.Regexp
-	var store = C.OriginalHistory
-	var expectedStatus utils.IntRanges[uint16]
-	if option != nil {
-		if url != hc.url {
-			store = C.ExtraHistory
-		}
-
-		expectedStatus = option.expectedStatus
-		if len(option.filters) != 0 {
-			filters := make([]string, 0, len(option.filters))
-			for filter := range option.filters {
-				filters = append(filters, filter)
-			}
-
-			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.FindStringMatch(proxy.Name()); match == nil {
-				continue
-			}
-		}
-
-		p := proxy
-		b.Go(p.Name(), func() (bool, error) {
-			ctx, cancel := context.WithTimeout(context.Background(), defaultURLTestTimeout)
-			defer cancel()
-			log.Debugln("Health Checking, proxy: %s, url: %s, id: {%s}", p.Name(), url, uid)
-			_, _ = p.URLTest(ctx, url, expectedStatus, store)
-			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 false, nil
-		})
-	}
-}
-
 func (hc *HealthCheck) close() {
 	hc.done <- struct{}{}
 }
 
-func NewHealthCheck(proxies []C.Proxy, url string, interval uint, lazy bool, expectedStatus utils.IntRanges[uint16]) *HealthCheck {
-	if len(url) == 0 {
-		interval = 0
-		expectedStatus = nil
-	}
-
+func NewHealthCheck(proxies []C.Proxy, url string, interval uint, lazy bool) *HealthCheck {
 	return &HealthCheck{
 		proxies:   proxies,
 		url:       url,
-		extra:          map[string]*extraOption{},
-		started:        atomic.NewBool(false),
 		interval:  interval,
 		lazy:      lazy,
-		expectedStatus: expectedStatus,
 		lastTouch: atomic.NewInt64(0),
 		done:      make(chan struct{}, 1),
 		singleDo:  singledo.NewSingle[struct{}](time.Second),

adapter/provider/parser.go

@@ -6,28 +6,23 @@ import (
 	"time"
 
 	"github.com/Dreamacro/clash/common/structure"
-	"github.com/Dreamacro/clash/common/utils"
 	"github.com/Dreamacro/clash/component/resource"
 	C "github.com/Dreamacro/clash/constant"
 	types "github.com/Dreamacro/clash/constant/provider"
 )
 
-var (
-	errVehicleType = errors.New("unsupport vehicle type")
-	errSubPath     = errors.New("path is not subpath of home directory")
-)
+var errVehicleType = errors.New("unsupport vehicle type")
 
 type healthCheckSchema struct {
 	Enable   bool   `provider:"enable"`
 	URL      string `provider:"url"`
 	Interval int    `provider:"interval"`
 	Lazy     bool   `provider:"lazy,omitempty"`
-	ExpectedStatus string `provider:"expected-status,omitempty"`
 }
 
 type proxyProviderSchema struct {
 	Type          string            `provider:"type"`
-	Path          string            `provider:"path,omitempty"`
+	Path          string            `provider:"path"`
 	URL           string            `provider:"url,omitempty"`
 	Interval      int               `provider:"interval,omitempty"`
 	Filter        string            `provider:"filter,omitempty"`
@@ -49,33 +44,20 @@ func ParseProxyProvider(name string, mapping map[string]any) (types.ProxyProvide
 		return nil, err
 	}
 
-	expectedStatus, err := utils.NewIntRanges[uint16](schema.HealthCheck.ExpectedStatus)
-	if err != nil {
-		return nil, err
-	}
-
 	var hcInterval uint
 	if schema.HealthCheck.Enable {
 		hcInterval = uint(schema.HealthCheck.Interval)
 	}
-	hc := NewHealthCheck([]C.Proxy{}, schema.HealthCheck.URL, hcInterval, schema.HealthCheck.Lazy, expectedStatus)
+	hc := NewHealthCheck([]C.Proxy{}, schema.HealthCheck.URL, hcInterval, schema.HealthCheck.Lazy)
+
+	path := C.Path.Resolve(schema.Path)
 
 	var vehicle types.Vehicle
 	switch schema.Type {
 	case "file":
-		path := C.Path.Resolve(schema.Path)
 		vehicle = resource.NewFileVehicle(path)
 	case "http":
-		if schema.Path != "" {
-			path := C.Path.Resolve(schema.Path)
-			if !C.Path.IsSafePath(path) {
-				return nil, fmt.Errorf("%w: %s", errSubPath, path)
-			}
 		vehicle = resource.NewHTTPVehicle(schema.URL, path)
-		} else {
-			path := C.Path.GetPathByHash("proxies", schema.URL)
-			vehicle = resource.NewHTTPVehicle(schema.URL, path)
-		}
 	default:
 		return nil, fmt.Errorf("%w: %s", errVehicleType, schema.Type)
 	}

adapter/provider/provider.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/Dreamacro/clash/adapter"
 	"github.com/Dreamacro/clash/common/convert"
-	"github.com/Dreamacro/clash/common/utils"
 	clashHttp "github.com/Dreamacro/clash/component/http"
 	"github.com/Dreamacro/clash/component/resource"
 	C "github.com/Dreamacro/clash/constant"
@@ -51,7 +50,6 @@ func (pp *proxySetProvider) MarshalJSON() ([]byte, error) {
 		"type":             pp.Type().String(),
 		"vehicleType":      pp.VehicleType().String(),
 		"proxies":          pp.Proxies(),
-		"testUrl":          pp.healthCheck.url,
 		"updatedAt":        pp.UpdatedAt,
 		"subscriptionInfo": pp.subscriptionInfo,
 	})
@@ -100,10 +98,6 @@ func (pp *proxySetProvider) Touch() {
 	pp.healthCheck.touch()
 }
 
-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)
@@ -147,15 +141,15 @@ func (pp *proxySetProvider) getSubscriptionInfo() {
 }
 
 func (pp *proxySetProvider) closeAllConnections() {
-	statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
+	snapshot := statistic.DefaultManager.Snapshot()
+	for _, c := range snapshot.Connections {
 		for _, chain := range c.Chains() {
 			if chain == pp.Name() {
 				_ = c.Close()
 				break
 			}
 		}
-		return true
-	})
+	}
 }
 
 func stopProxyProvider(pd *ProxySetProvider) {
@@ -216,7 +210,6 @@ func (cp *compatibleProvider) MarshalJSON() ([]byte, error) {
 		"type":        cp.Type().String(),
 		"vehicleType": cp.VehicleType().String(),
 		"proxies":     cp.Proxies(),
-		"testUrl":     cp.healthCheck.url,
 	})
 }
 
@@ -256,10 +249,6 @@ func (cp *compatibleProvider) Touch() {
 	cp.healthCheck.touch()
 }
 
-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()
 }
@@ -299,7 +288,7 @@ func proxiesParseAndFilter(filter string, excludeFilter string, excludeTypeArray
 		if err := yaml.Unmarshal(buf, schema); err != nil {
 			proxies, err1 := convert.ConvertsV2Ray(buf)
 			if err1 != nil {
-				return nil, fmt.Errorf("%w, %w", err, err1)
+				return nil, fmt.Errorf("%s, %w", err.Error(), err1)
 			}
 			schema.Proxies = proxies
 		}

common/buf/sing.go

@@ -11,9 +11,18 @@ type Buffer = buf.Buffer
 
 var New = buf.New
 var NewSize = buf.NewSize
+var StackNew = buf.StackNew
+var StackNewSize = buf.StackNewSize
 var With = buf.With
 var As = buf.As
 
+var KeepAlive = common.KeepAlive
+
+//go:norace
+func Dup[T any](obj T) T {
+	return common.Dup(obj)
+}
+
 var (
 	Must  = common.Must
 	Error = common.Error

common/cache/lrucache.go

@@ -7,8 +7,6 @@ import (
 	"time"
 
 	"github.com/Dreamacro/clash/common/generics/list"
-
-	"github.com/samber/lo"
 )
 
 // Option is part of Functional Options Pattern
@@ -84,27 +82,9 @@ func New[K comparable, V any](options ...Option[K, V]) *LruCache[K, V] {
 // Get returns the 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) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
 	el := c.get(key)
 	if el == nil {
-		return lo.Empty[V](), false
-	}
-	value := el.value
-
-	return value, true
-}
-
-func (c *LruCache[K, V]) GetOrStore(key K, constructor func() V) (V, bool) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	el := c.get(key)
-	if el == nil {
-		value := constructor()
-		c.set(key, value)
-		return value, false
+		return getZero[V](), false
 	}
 	value := el.value
 
@@ -116,12 +96,9 @@ func (c *LruCache[K, V]) GetOrStore(key K, constructor func() V) (V, bool) {
 // and a bool set to true if the key was found.
 // This method will NOT check the maxAge of element and will NOT update the expires.
 func (c *LruCache[K, V]) GetWithExpire(key K) (V, time.Time, bool) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
 	el := c.get(key)
 	if el == nil {
-		return lo.Empty[V](), time.Time{}, false
+		return getZero[V](), time.Time{}, false
 	}
 
 	return el.value, time.Unix(el.expires, 0), true
@@ -138,18 +115,11 @@ func (c *LruCache[K, V]) Exist(key K) bool {
 
 // Set stores the any representation of a response for a given key.
 func (c *LruCache[K, V]) Set(key K, value V) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	c.set(key, value)
-}
-
-func (c *LruCache[K, V]) set(key K, value V) {
 	expires := int64(0)
 	if c.maxAge > 0 {
 		expires = time.Now().Unix() + c.maxAge
 	}
-	c.setWithExpire(key, value, time.Unix(expires, 0))
+	c.SetWithExpire(key, value, time.Unix(expires, 0))
 }
 
 // SetWithExpire stores the any representation of a response for a given key and given expires.
@@ -158,10 +128,6 @@ func (c *LruCache[K, V]) SetWithExpire(key K, value V, expires time.Time) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
-	c.setWithExpire(key, value, expires)
-}
-
-func (c *LruCache[K, V]) setWithExpire(key K, value V, expires time.Time) {
 	if le, ok := c.cache[key]; ok {
 		c.lru.MoveToBack(le)
 		e := le.Value
@@ -199,6 +165,9 @@ func (c *LruCache[K, V]) CloneTo(n *LruCache[K, V]) {
 }
 
 func (c *LruCache[K, V]) get(key K) *entry[K, V] {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+
 	le, ok := c.cache[key]
 	if !ok {
 		return nil
@@ -222,11 +191,12 @@ func (c *LruCache[K, V]) get(key K) *entry[K, V] {
 // Delete removes the value associated with a key.
 func (c *LruCache[K, V]) Delete(key K) {
 	c.mu.Lock()
-	defer c.mu.Unlock()
 
 	if le, ok := c.cache[key]; ok {
 		c.deleteElement(le)
 	}
+
+	c.mu.Unlock()
 }
 
 func (c *LruCache[K, V]) maybeDeleteOldest() {
@@ -249,10 +219,10 @@ func (c *LruCache[K, V]) deleteElement(le *list.Element[*entry[K, V]]) {
 
 func (c *LruCache[K, V]) Clear() error {
 	c.mu.Lock()
-	defer c.mu.Unlock()
 
 	c.cache = make(map[K]*list.Element[*entry[K, V]])
 
+	c.mu.Unlock()
 	return nil
 }
 
@@ -261,3 +231,8 @@ type entry[K comparable, V any] struct {
 	value   V
 	expires int64
 }
+
+func getZero[T any]() T {
+	var result T
+	return result
+}

common/convert/converter.go

@@ -50,9 +50,7 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			hysteria["port"] = urlHysteria.Port()
 			hysteria["sni"] = query.Get("peer")
 			hysteria["obfs"] = query.Get("obfs")
-			if alpn := query.Get("alpn"); alpn != "" {
-				hysteria["alpn"] = strings.Split(alpn, ",")
-			}
+			hysteria["alpn"] = []string{query.Get("alpn")}
 			hysteria["auth_str"] = query.Get("auth")
 			hysteria["protocol"] = query.Get("protocol")
 			up := query.Get("up")
@@ -69,47 +67,6 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 
 			proxies = append(proxies, hysteria)
 
-		case "tuic":
-			// A temporary unofficial TUIC share link standard
-			// Modified from https://github.com/daeuniverse/dae/discussions/182
-			// Changes:
-			//   1. Support TUICv4, just replace uuid:password with token
-			//   2. Remove `allow_insecure` field
-			urlTUIC, err := url.Parse(line)
-			if err != nil {
-				continue
-			}
-			query := urlTUIC.Query()
-
-			tuic := make(map[string]any, 20)
-			tuic["name"] = uniqueName(names, urlTUIC.Fragment)
-			tuic["type"] = scheme
-			tuic["server"] = urlTUIC.Hostname()
-			tuic["port"] = urlTUIC.Port()
-			tuic["udp"] = true
-			password, v5 := urlTUIC.User.Password()
-			if v5 {
-				tuic["uuid"] = urlTUIC.User.Username()
-				tuic["password"] = password
-			} else {
-				tuic["token"] = urlTUIC.User.Username()
-			}
-			if cc := query.Get("congestion_control"); cc != "" {
-				tuic["congestion-controller"] = cc
-			}
-			if alpn := query.Get("alpn"); alpn != "" {
-				tuic["alpn"] = strings.Split(alpn, ",")
-			}
-			if sni := query.Get("sni"); sni != "" {
-				tuic["sni"] = sni
-			}
-			if query.Get("disable_sni") == "1" {
-				tuic["disable-sni"] = true
-			}
-			if udpRelayMode := query.Get("udp_relay_mode"); udpRelayMode != "" {
-				tuic["udp-relay-mode"] = udpRelayMode
-			}
-
 		case "trojan":
 			urlTrojan, err := url.Parse(line)
 			if err != nil {
@@ -129,12 +86,10 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			trojan["udp"] = true
 			trojan["skip-cert-verify"], _ = strconv.ParseBool(query.Get("allowInsecure"))
 
-			if sni := query.Get("sni"); sni != "" {
+			sni := query.Get("sni")
+			if sni != "" {
 				trojan["sni"] = sni
 			}
-			if alpn := query.Get("alpn"); alpn != "" {
-				trojan["alpn"] = strings.Split(alpn, ",")
-			}
 
 			network := strings.ToLower(query.Get("type"))
 			if network != "" {
@@ -262,9 +217,6 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 				if strings.HasSuffix(tls, "tls") {
 					vmess["tls"] = true
 				}
-				if alpn, ok := values["alpn"].(string); ok {
-					vmess["alpn"] = strings.Split(alpn, ",")
-				}
 			}
 
 			switch network {
@@ -380,7 +332,6 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 				}
 			}
 			proxies = append(proxies, ss)
-
 		case "ssr":
 			dcBuf, err := encRaw.DecodeString(body)
 			if err != nil {

common/convert/v.go

@@ -24,6 +24,8 @@ func handleVShareLink(names map[string]int, url *url.URL, scheme string, proxy m
 	proxy["port"] = url.Port()
 	proxy["uuid"] = url.User.Username()
 	proxy["udp"] = true
+	proxy["skip-cert-verify"] = false
+	proxy["tls"] = false
 	tls := strings.ToLower(query.Get("security"))
 	if strings.HasSuffix(tls, "tls") || tls == "reality" {
 		proxy["tls"] = true
@@ -32,9 +34,6 @@ func handleVShareLink(names map[string]int, url *url.URL, scheme string, proxy m
 		} else {
 			proxy["client-fingerprint"] = fingerprint
 		}
-		if alpn := query.Get("alpn"); alpn != "" {
-			proxy["alpn"] = strings.Split(alpn, ",")
-		}
 	}
 	if sni := query.Get("sni"); sni != "" {
 		proxy["servername"] = sni

common/net/bind.go

@@ -3,43 +3,34 @@ package net
 import "net"
 
 type bindPacketConn struct {
-	EnhancePacketConn
+	net.PacketConn
 	rAddr net.Addr
 }
 
-func (c *bindPacketConn) Read(b []byte) (n int, err error) {
-	n, _, err = c.EnhancePacketConn.ReadFrom(b)
+func (wpc *bindPacketConn) Read(b []byte) (n int, err error) {
+	n, _, err = wpc.PacketConn.ReadFrom(b)
 	return n, err
 }
 
-func (c *bindPacketConn) WaitRead() (data []byte, put func(), err error) {
-	data, put, _, err = c.EnhancePacketConn.WaitReadFrom()
-	return
+func (wpc *bindPacketConn) Write(b []byte) (n int, err error) {
+	return wpc.PacketConn.WriteTo(b, wpc.rAddr)
 }
 
-func (c *bindPacketConn) Write(b []byte) (n int, err error) {
-	return c.EnhancePacketConn.WriteTo(b, c.rAddr)
+func (wpc *bindPacketConn) RemoteAddr() net.Addr {
+	return wpc.rAddr
 }
 
-func (c *bindPacketConn) RemoteAddr() net.Addr {
-	return c.rAddr
-}
-
-func (c *bindPacketConn) LocalAddr() net.Addr {
-	if c.EnhancePacketConn.LocalAddr() == nil {
+func (wpc *bindPacketConn) LocalAddr() net.Addr {
+	if wpc.PacketConn.LocalAddr() == nil {
 		return &net.UDPAddr{IP: net.IPv4zero, Port: 0}
 	} else {
-		return c.EnhancePacketConn.LocalAddr()
+		return wpc.PacketConn.LocalAddr()
 	}
 }
 
-func (c *bindPacketConn) Upstream() any {
-	return c.EnhancePacketConn
-}
-
 func NewBindPacketConn(pc net.PacketConn, rAddr net.Addr) net.Conn {
 	return &bindPacketConn{
-		EnhancePacketConn: NewEnhancePacketConn(pc),
+		PacketConn: pc,
 		rAddr:      rAddr,
 	}
 }

common/net/bufconn.go

@@ -62,7 +62,7 @@ func (c *BufferedConn) Buffered() int {
 }
 
 func (c *BufferedConn) ReadBuffer(buffer *buf.Buffer) (err error) {
-	if c.r != nil && c.r.Buffered() > 0 {
+	if c.r.Buffered() > 0 {
 		_, err = buffer.ReadOnceFrom(c.r)
 		return
 	}
@@ -70,11 +70,10 @@ func (c *BufferedConn) ReadBuffer(buffer *buf.Buffer) (err error) {
 }
 
 func (c *BufferedConn) ReadCached() *buf.Buffer { // call in sing/common/bufio.Copy
-	if c.r != nil && c.r.Buffered() > 0 {
+	if c.r.Buffered() > 0 {
 		length := c.r.Buffered()
 		b, _ := c.r.Peek(length)
 		_, _ = c.r.Discard(length)
-		c.r = nil // drop bufio.Reader to let gc can clean up its internal buf
 		return buf.As(b)
 	}
 	return nil
@@ -85,7 +84,7 @@ func (c *BufferedConn) Upstream() any {
 }
 
 func (c *BufferedConn) ReaderReplaceable() bool {
-	if c.r != nil && c.r.Buffered() > 0 {
+	if c.r.Buffered() > 0 {
 		return false
 	}
 	return true

common/net/deadline/packet.go

@@ -1,154 +0,0 @@
-package deadline
-
-import (
-	"net"
-	"os"
-	"runtime"
-	"time"
-
-	"github.com/Dreamacro/clash/common/atomic"
-	"github.com/Dreamacro/clash/common/net/packet"
-)
-
-type readResult struct {
-	data []byte
-	addr net.Addr
-	err  error
-}
-
-type NetPacketConn struct {
-	net.PacketConn
-	deadline     atomic.TypedValue[time.Time]
-	pipeDeadline pipeDeadline
-	disablePipe  atomic.Bool
-	inRead       atomic.Bool
-	resultCh     chan any
-}
-
-func NewNetPacketConn(pc net.PacketConn) net.PacketConn {
-	npc := &NetPacketConn{
-		PacketConn:   pc,
-		pipeDeadline: makePipeDeadline(),
-		resultCh:     make(chan any, 1),
-	}
-	npc.resultCh <- nil
-	if enhancePC, isEnhance := pc.(packet.EnhancePacketConn); isEnhance {
-		epc := &EnhancePacketConn{
-			NetPacketConn: npc,
-			enhancePacketConn: enhancePacketConn{
-				netPacketConn:     npc,
-				enhancePacketConn: enhancePC,
-			},
-		}
-		if singPC, isSingPC := pc.(packet.SingPacketConn); isSingPC {
-			return &EnhanceSingPacketConn{
-				EnhancePacketConn: epc,
-				singPacketConn: singPacketConn{
-					netPacketConn:  npc,
-					singPacketConn: singPC,
-				},
-			}
-		}
-		return epc
-	}
-	if singPC, isSingPC := pc.(packet.SingPacketConn); isSingPC {
-		return &SingPacketConn{
-			NetPacketConn: npc,
-			singPacketConn: singPacketConn{
-				netPacketConn:  npc,
-				singPacketConn: singPC,
-			},
-		}
-	}
-	return npc
-}
-
-func (c *NetPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
-FOR:
-	for {
-		select {
-		case result := <-c.resultCh:
-			if result != nil {
-				if result, ok := result.(*readResult); ok {
-					n = copy(p, result.data)
-					addr = result.addr
-					err = result.err
-					c.resultCh <- nil // finish cache read
-					return
-				}
-				c.resultCh <- result // another type of read
-				runtime.Gosched()    // allowing other goroutines to run
-				continue FOR
-			} else {
-				c.resultCh <- nil
-				break FOR
-			}
-		case <-c.pipeDeadline.wait():
-			return 0, nil, os.ErrDeadlineExceeded
-		}
-	}
-
-	if c.disablePipe.Load() {
-		return c.PacketConn.ReadFrom(p)
-	} else if c.deadline.Load().IsZero() {
-		c.inRead.Store(true)
-		defer c.inRead.Store(false)
-		n, addr, err = c.PacketConn.ReadFrom(p)
-		return
-	}
-
-	<-c.resultCh
-	go c.pipeReadFrom(len(p))
-
-	return c.ReadFrom(p)
-}
-
-func (c *NetPacketConn) pipeReadFrom(size int) {
-	buffer := make([]byte, size)
-	n, addr, err := c.PacketConn.ReadFrom(buffer)
-	buffer = buffer[:n]
-	result := &readResult{}
-	result.data = buffer
-	result.addr = addr
-	result.err = err
-	c.resultCh <- result
-}
-
-func (c *NetPacketConn) SetReadDeadline(t time.Time) error {
-	if c.disablePipe.Load() {
-		return c.PacketConn.SetReadDeadline(t)
-	} else if c.inRead.Load() {
-		c.disablePipe.Store(true)
-		return c.PacketConn.SetReadDeadline(t)
-	}
-	c.deadline.Store(t)
-	c.pipeDeadline.set(t)
-	return nil
-}
-
-func (c *NetPacketConn) ReaderReplaceable() bool {
-	select {
-	case result := <-c.resultCh:
-		c.resultCh <- result
-		if result != nil {
-			return false // cache reading
-		} else {
-			break
-		}
-	default:
-		return false // pipe reading
-	}
-	return c.disablePipe.Load() || c.deadline.Load().IsZero()
-}
-
-func (c *NetPacketConn) WriterReplaceable() bool {
-	return true
-}
-
-func (c *NetPacketConn) Upstream() any {
-	return c.PacketConn
-}
-
-func (c *NetPacketConn) NeedAdditionalReadDeadline() bool {
-	return false
-}

common/net/deadline/packet_enhance.go

@@ -1,83 +0,0 @@
-package deadline
-
-import (
-	"net"
-	"os"
-	"runtime"
-
-	"github.com/Dreamacro/clash/common/net/packet"
-)
-
-type EnhancePacketConn struct {
-	*NetPacketConn
-	enhancePacketConn
-}
-
-var _ packet.EnhancePacketConn = (*EnhancePacketConn)(nil)
-
-func NewEnhancePacketConn(pc packet.EnhancePacketConn) packet.EnhancePacketConn {
-	return NewNetPacketConn(pc).(packet.EnhancePacketConn)
-}
-
-type enhanceReadResult struct {
-	data []byte
-	put  func()
-	addr net.Addr
-	err  error
-}
-
-type enhancePacketConn struct {
-	netPacketConn     *NetPacketConn
-	enhancePacketConn packet.EnhancePacketConn
-}
-
-func (c *enhancePacketConn) WaitReadFrom() (data []byte, put func(), addr net.Addr, err error) {
-FOR:
-	for {
-		select {
-		case result := <-c.netPacketConn.resultCh:
-			if result != nil {
-				if result, ok := result.(*enhanceReadResult); ok {
-					data = result.data
-					put = result.put
-					addr = result.addr
-					err = result.err
-					c.netPacketConn.resultCh <- nil // finish cache read
-					return
-				}
-				c.netPacketConn.resultCh <- result // another type of read
-				runtime.Gosched()                  // allowing other goroutines to run
-				continue FOR
-			} else {
-				c.netPacketConn.resultCh <- nil
-				break FOR
-			}
-		case <-c.netPacketConn.pipeDeadline.wait():
-			return nil, nil, nil, os.ErrDeadlineExceeded
-		}
-	}
-
-	if c.netPacketConn.disablePipe.Load() {
-		return c.enhancePacketConn.WaitReadFrom()
-	} else if c.netPacketConn.deadline.Load().IsZero() {
-		c.netPacketConn.inRead.Store(true)
-		defer c.netPacketConn.inRead.Store(false)
-		data, put, addr, err = c.enhancePacketConn.WaitReadFrom()
-		return
-	}
-
-	<-c.netPacketConn.resultCh
-	go c.pipeWaitReadFrom()
-
-	return c.WaitReadFrom()
-}
-
-func (c *enhancePacketConn) pipeWaitReadFrom() {
-	data, put, addr, err := c.enhancePacketConn.WaitReadFrom()
-	result := &enhanceReadResult{}
-	result.data = data
-	result.put = put
-	result.addr = addr
-	result.err = err
-	c.netPacketConn.resultCh <- result
-}

common/net/deadline/packet_sing.go

@@ -1,177 +0,0 @@
-package deadline
-
-import (
-	"os"
-	"runtime"
-
-	"github.com/Dreamacro/clash/common/net/packet"
-	"github.com/sagernet/sing/common/buf"
-	"github.com/sagernet/sing/common/bufio"
-	M "github.com/sagernet/sing/common/metadata"
-	N "github.com/sagernet/sing/common/network"
-)
-
-type SingPacketConn struct {
-	*NetPacketConn
-	singPacketConn
-}
-
-var _ packet.SingPacketConn = (*SingPacketConn)(nil)
-
-func NewSingPacketConn(pc packet.SingPacketConn) packet.SingPacketConn {
-	return NewNetPacketConn(pc).(packet.SingPacketConn)
-}
-
-type EnhanceSingPacketConn struct {
-	*EnhancePacketConn
-	singPacketConn
-}
-
-func NewEnhanceSingPacketConn(pc packet.EnhanceSingPacketConn) packet.EnhanceSingPacketConn {
-	return NewNetPacketConn(pc).(packet.EnhanceSingPacketConn)
-}
-
-var _ packet.EnhanceSingPacketConn = (*EnhanceSingPacketConn)(nil)
-
-type singReadResult struct {
-	buffer      *buf.Buffer
-	destination M.Socksaddr
-	err         error
-}
-
-type singPacketConn struct {
-	netPacketConn  *NetPacketConn
-	singPacketConn packet.SingPacketConn
-}
-
-func (c *singPacketConn) ReadPacket(buffer *buf.Buffer) (destination M.Socksaddr, err error) {
-FOR:
-	for {
-		select {
-		case result := <-c.netPacketConn.resultCh:
-			if result != nil {
-				if result, ok := result.(*singReadResult); ok {
-					destination = result.destination
-					err = result.err
-					n, _ := buffer.Write(result.buffer.Bytes())
-					result.buffer.Advance(n)
-					if result.buffer.IsEmpty() {
-						result.buffer.Release()
-					}
-					c.netPacketConn.resultCh <- nil // finish cache read
-					return
-				}
-				c.netPacketConn.resultCh <- result // another type of read
-				runtime.Gosched()                  // allowing other goroutines to run
-				continue FOR
-			} else {
-				c.netPacketConn.resultCh <- nil
-				break FOR
-			}
-		case <-c.netPacketConn.pipeDeadline.wait():
-			return M.Socksaddr{}, os.ErrDeadlineExceeded
-		}
-	}
-
-	if c.netPacketConn.disablePipe.Load() {
-		return c.singPacketConn.ReadPacket(buffer)
-	} else if c.netPacketConn.deadline.Load().IsZero() {
-		c.netPacketConn.inRead.Store(true)
-		defer c.netPacketConn.inRead.Store(false)
-		destination, err = c.singPacketConn.ReadPacket(buffer)
-		return
-	}
-
-	<-c.netPacketConn.resultCh
-	go c.pipeReadPacket(buffer.FreeLen())
-
-	return c.ReadPacket(buffer)
-}
-
-func (c *singPacketConn) pipeReadPacket(pLen int) {
-	buffer := buf.NewSize(pLen)
-	destination, err := c.singPacketConn.ReadPacket(buffer)
-	result := &singReadResult{}
-	result.destination = destination
-	result.err = err
-	c.netPacketConn.resultCh <- result
-}
-
-func (c *singPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {
-	return c.singPacketConn.WritePacket(buffer, destination)
-}
-
-func (c *singPacketConn) CreateReadWaiter() (N.PacketReadWaiter, bool) {
-	prw, isReadWaiter := bufio.CreatePacketReadWaiter(c.singPacketConn)
-	if isReadWaiter {
-		return &singPacketReadWaiter{
-			netPacketConn:    c.netPacketConn,
-			packetReadWaiter: prw,
-		}, true
-	}
-	return nil, false
-}
-
-var _ N.PacketReadWaiter = (*singPacketReadWaiter)(nil)
-
-type singPacketReadWaiter struct {
-	netPacketConn    *NetPacketConn
-	packetReadWaiter N.PacketReadWaiter
-}
-
-type singWaitReadResult singReadResult
-
-func (c *singPacketReadWaiter) InitializeReadWaiter(newBuffer func() *buf.Buffer) {
-	c.packetReadWaiter.InitializeReadWaiter(newBuffer)
-}
-
-func (c *singPacketReadWaiter) WaitReadPacket() (destination M.Socksaddr, err error) {
-FOR:
-	for {
-		select {
-		case result := <-c.netPacketConn.resultCh:
-			if result != nil {
-				if result, ok := result.(*singWaitReadResult); ok {
-					destination = result.destination
-					err = result.err
-					c.netPacketConn.resultCh <- nil // finish cache read
-					return
-				}
-				c.netPacketConn.resultCh <- result // another type of read
-				runtime.Gosched()                  // allowing other goroutines to run
-				continue FOR
-			} else {
-				c.netPacketConn.resultCh <- nil
-				break FOR
-			}
-		case <-c.netPacketConn.pipeDeadline.wait():
-			return M.Socksaddr{}, os.ErrDeadlineExceeded
-		}
-	}
-
-	if c.netPacketConn.disablePipe.Load() {
-		return c.packetReadWaiter.WaitReadPacket()
-	} else if c.netPacketConn.deadline.Load().IsZero() {
-		c.netPacketConn.inRead.Store(true)
-		defer c.netPacketConn.inRead.Store(false)
-		destination, err = c.packetReadWaiter.WaitReadPacket()
-		return
-	}
-
-	<-c.netPacketConn.resultCh
-	go c.pipeWaitReadPacket()
-
-	return c.WaitReadPacket()
-}
-
-func (c *singPacketReadWaiter) pipeWaitReadPacket() {
-	destination, err := c.packetReadWaiter.WaitReadPacket()
-	result := &singWaitReadResult{}
-	result.destination = destination
-	result.err = err
-	c.netPacketConn.resultCh <- result
-}
-
-func (c *singPacketReadWaiter) Upstream() any {
-	return c.packetReadWaiter
-}

common/net/deadline/pipe.go

@@ -1,84 +0,0 @@
-// Copyright 2010 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 deadline
-
-import (
-	"sync"
-	"time"
-)
-
-// pipeDeadline is an abstraction for handling timeouts.
-type pipeDeadline struct {
-	mu     sync.Mutex // Guards timer and cancel
-	timer  *time.Timer
-	cancel chan struct{} // Must be non-nil
-}
-
-func makePipeDeadline() pipeDeadline {
-	return pipeDeadline{cancel: make(chan struct{})}
-}
-
-// set sets the point in time when the deadline will time out.
-// A timeout event is signaled by closing the channel returned by waiter.
-// Once a timeout has occurred, the deadline can be refreshed by specifying a
-// t value in the future.
-//
-// A zero value for t prevents timeout.
-func (d *pipeDeadline) set(t time.Time) {
-	d.mu.Lock()
-	defer d.mu.Unlock()
-
-	if d.timer != nil && !d.timer.Stop() {
-		<-d.cancel // Wait for the timer callback to finish and close cancel
-	}
-	d.timer = nil
-
-	// Time is zero, then there is no deadline.
-	closed := isClosedChan(d.cancel)
-	if t.IsZero() {
-		if closed {
-			d.cancel = make(chan struct{})
-		}
-		return
-	}
-
-	// Time in the future, setup a timer to cancel in the future.
-	if dur := time.Until(t); dur > 0 {
-		if closed {
-			d.cancel = make(chan struct{})
-		}
-		d.timer = time.AfterFunc(dur, func() {
-			close(d.cancel)
-		})
-		return
-	}
-
-	// Time in the past, so close immediately.
-	if !closed {
-		close(d.cancel)
-	}
-}
-
-// wait returns a channel that is closed when the deadline is exceeded.
-func (d *pipeDeadline) wait() chan struct{} {
-	d.mu.Lock()
-	defer d.mu.Unlock()
-	return d.cancel
-}
-
-func isClosedChan(c <-chan struct{}) bool {
-	select {
-	case <-c:
-		return true
-	default:
-		return false
-	}
-}
-
-func makeFilledChan() chan struct{} {
-	ch := make(chan struct{}, 1)
-	ch <- struct{}{}
-	return ch
-}

common/net/packet.go

@@ -1,18 +0,0 @@
-package net
-
-import (
-	"github.com/Dreamacro/clash/common/net/deadline"
-	"github.com/Dreamacro/clash/common/net/packet"
-)
-
-type EnhancePacketConn = packet.EnhancePacketConn
-type WaitReadFrom = packet.WaitReadFrom
-
-var NewEnhancePacketConn = packet.NewEnhancePacketConn
-var NewThreadSafePacketConn = packet.NewThreadSafePacketConn
-var NewRefPacketConn = packet.NewRefPacketConn
-
-var NewDeadlineNetPacketConn = deadline.NewNetPacketConn
-var NewDeadlineEnhancePacketConn = deadline.NewEnhancePacketConn
-var NewDeadlineSingPacketConn = deadline.NewSingPacketConn
-var NewDeadlineEnhanceSingPacketConn = deadline.NewEnhanceSingPacketConn

common/net/packet/packet.go

@@ -1,77 +0,0 @@
-package packet
-
-import (
-	"net"
-
-	"github.com/Dreamacro/clash/common/pool"
-)
-
-type WaitReadFrom interface {
-	WaitReadFrom() (data []byte, put func(), addr net.Addr, err error)
-}
-
-type EnhancePacketConn interface {
-	net.PacketConn
-	WaitReadFrom
-}
-
-func NewEnhancePacketConn(pc net.PacketConn) EnhancePacketConn {
-	if udpConn, isUDPConn := pc.(*net.UDPConn); isUDPConn {
-		return &enhanceUDPConn{UDPConn: udpConn}
-	}
-	if enhancePC, isEnhancePC := pc.(EnhancePacketConn); isEnhancePC {
-		return enhancePC
-	}
-	if singPC, isSingPC := pc.(SingPacketConn); isSingPC {
-		return newEnhanceSingPacketConn(singPC)
-	}
-	return &enhancePacketConn{PacketConn: pc}
-}
-
-type enhancePacketConn struct {
-	net.PacketConn
-}
-
-func (c *enhancePacketConn) WaitReadFrom() (data []byte, put func(), addr net.Addr, err error) {
-	return waitReadFrom(c.PacketConn)
-}
-
-func (c *enhancePacketConn) Upstream() any {
-	return c.PacketConn
-}
-
-func (c *enhancePacketConn) WriterReplaceable() bool {
-	return true
-}
-
-func (c *enhancePacketConn) ReaderReplaceable() bool {
-	return true
-}
-
-func (c *enhanceUDPConn) Upstream() any {
-	return c.UDPConn
-}
-
-func (c *enhanceUDPConn) WriterReplaceable() bool {
-	return true
-}
-
-func (c *enhanceUDPConn) ReaderReplaceable() bool {
-	return true
-}
-
-func waitReadFrom(pc net.PacketConn) (data []byte, put func(), addr net.Addr, err error) {
-	readBuf := pool.Get(pool.UDPBufferSize)
-	put = func() {
-		_ = pool.Put(readBuf)
-	}
-	var readN int
-	readN, addr, err = pc.ReadFrom(readBuf)
-	if readN > 0 {
-		data = readBuf[:readN]
-	} else {
-		put()
-		put = nil
-	}
-	return
-}

common/net/packet/packet_posix.go

@@ -1,65 +0,0 @@
-//go:build !windows
-
-package packet
-
-import (
-	"net"
-	"strconv"
-	"syscall"
-
-	"github.com/Dreamacro/clash/common/pool"
-)
-
-type enhanceUDPConn struct {
-	*net.UDPConn
-	rawConn syscall.RawConn
-}
-
-func (c *enhanceUDPConn) WaitReadFrom() (data []byte, put func(), addr net.Addr, err error) {
-	if c.rawConn == nil {
-		c.rawConn, _ = c.UDPConn.SyscallConn()
-	}
-	var readErr error
-	err = c.rawConn.Read(func(fd uintptr) (done bool) {
-		readBuf := pool.Get(pool.UDPBufferSize)
-		put = func() {
-			_ = pool.Put(readBuf)
-		}
-		var readFrom syscall.Sockaddr
-		var readN int
-		readN, _, _, readFrom, readErr = syscall.Recvmsg(int(fd), readBuf, nil, 0)
-		if readN > 0 {
-			data = readBuf[:readN]
-		} else {
-			put()
-			put = nil
-			data = nil
-		}
-		if readErr == syscall.EAGAIN {
-			return false
-		}
-		if readFrom != nil {
-			switch from := readFrom.(type) {
-			case *syscall.SockaddrInet4:
-				ip := from.Addr // copy from.Addr; ip escapes, so this line allocates 4 bytes
-				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
-				addr = &net.UDPAddr{IP: ip[:], Port: from.Port, Zone: strconv.FormatInt(int64(from.ZoneId), 10)}
-			}
-		}
-		// udp should not convert readN == 0 to io.EOF
-		//if readN == 0 {
-		//	readErr = io.EOF
-		//}
-		return true
-	})
-	if err != nil {
-		return
-	}
-	if readErr != nil {
-		err = readErr
-		return
-	}
-	return
-}

common/net/packet/packet_sing.go

@@ -1,79 +0,0 @@
-package packet
-
-import (
-	"net"
-
-	"github.com/sagernet/sing/common/buf"
-	"github.com/sagernet/sing/common/bufio"
-	M "github.com/sagernet/sing/common/metadata"
-	N "github.com/sagernet/sing/common/network"
-)
-
-type SingPacketConn = N.NetPacketConn
-
-type EnhanceSingPacketConn interface {
-	SingPacketConn
-	EnhancePacketConn
-}
-
-type enhanceSingPacketConn struct {
-	SingPacketConn
-	packetReadWaiter N.PacketReadWaiter
-}
-
-func (c *enhanceSingPacketConn) WaitReadFrom() (data []byte, put func(), addr net.Addr, err error) {
-	var buff *buf.Buffer
-	var dest M.Socksaddr
-	newBuffer := func() *buf.Buffer {
-		buff = buf.NewPacket() // do not use stack buffer
-		return buff
-	}
-	if c.packetReadWaiter != nil {
-		c.packetReadWaiter.InitializeReadWaiter(newBuffer)
-		defer c.packetReadWaiter.InitializeReadWaiter(nil)
-		dest, err = c.packetReadWaiter.WaitReadPacket()
-	} else {
-		dest, err = c.SingPacketConn.ReadPacket(newBuffer())
-	}
-	if dest.IsFqdn() {
-		addr = dest
-	} else {
-		addr = dest.UDPAddr()
-	}
-	if err != nil {
-		if buff != nil {
-			buff.Release()
-		}
-		return
-	}
-	if buff == nil {
-		return
-	}
-	if buff.IsEmpty() {
-		buff.Release()
-		return
-	}
-	data = buff.Bytes()
-	put = buff.Release
-	return
-}
-
-func (c *enhanceSingPacketConn) Upstream() any {
-	return c.SingPacketConn
-}
-
-func (c *enhanceSingPacketConn) WriterReplaceable() bool {
-	return true
-}
-
-func (c *enhanceSingPacketConn) ReaderReplaceable() bool {
-	return true
-}
-
-func newEnhanceSingPacketConn(conn SingPacketConn) *enhanceSingPacketConn {
-	epc := &enhanceSingPacketConn{SingPacketConn: conn}
-	if readWaiter, isReadWaiter := bufio.CreatePacketReadWaiter(conn); isReadWaiter {
-		epc.packetReadWaiter = readWaiter
-	}
-	return epc
-}

common/net/packet/packet_windows.go

@@ -1,15 +0,0 @@
-//go:build windows
-
-package packet
-
-import (
-	"net"
-)
-
-type enhanceUDPConn struct {
-	*net.UDPConn
-}
-
-func (c *enhanceUDPConn) WaitReadFrom() (data []byte, put func(), addr net.Addr, err error) {
-	return waitReadFrom(c.UDPConn)
-}

common/net/packet/ref.go

@@ -1,75 +0,0 @@
-package packet
-
-import (
-	"net"
-	"runtime"
-	"time"
-)
-
-type refPacketConn struct {
-	pc  EnhancePacketConn
-	ref any
-}
-
-func (c *refPacketConn) WaitReadFrom() (data []byte, put func(), addr net.Addr, err error) {
-	defer runtime.KeepAlive(c.ref)
-	return c.pc.WaitReadFrom()
-}
-
-func (c *refPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
-	defer runtime.KeepAlive(c.ref)
-	return c.pc.ReadFrom(p)
-}
-
-func (c *refPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
-	defer runtime.KeepAlive(c.ref)
-	return c.pc.WriteTo(p, addr)
-}
-
-func (c *refPacketConn) Close() error {
-	defer runtime.KeepAlive(c.ref)
-	return c.pc.Close()
-}
-
-func (c *refPacketConn) LocalAddr() net.Addr {
-	defer runtime.KeepAlive(c.ref)
-	return c.pc.LocalAddr()
-}
-
-func (c *refPacketConn) SetDeadline(t time.Time) error {
-	defer runtime.KeepAlive(c.ref)
-	return c.pc.SetDeadline(t)
-}
-
-func (c *refPacketConn) SetReadDeadline(t time.Time) error {
-	defer runtime.KeepAlive(c.ref)
-	return c.pc.SetReadDeadline(t)
-}
-
-func (c *refPacketConn) SetWriteDeadline(t time.Time) error {
-	defer runtime.KeepAlive(c.ref)
-	return c.pc.SetWriteDeadline(t)
-}
-
-func (c *refPacketConn) Upstream() any {
-	return c.pc
-}
-
-func (c *refPacketConn) ReaderReplaceable() bool { // Relay() will handle reference
-	return true
-}
-
-func (c *refPacketConn) WriterReplaceable() bool { // Relay() will handle reference
-	return true
-}
-
-func NewRefPacketConn(pc net.PacketConn, ref any) EnhancePacketConn {
-	rPC := &refPacketConn{pc: NewEnhancePacketConn(pc), ref: ref}
-	if singPC, isSingPC := pc.(SingPacketConn); isSingPC {
-		return &refSingPacketConn{
-			refPacketConn:  rPC,
-			singPacketConn: singPC,
-		}
-	}
-	return rPC
-}

common/net/packet/ref_sing.go

@@ -1,26 +0,0 @@
-package packet
-
-import (
-	"runtime"
-
-	"github.com/sagernet/sing/common/buf"
-	M "github.com/sagernet/sing/common/metadata"
-	N "github.com/sagernet/sing/common/network"
-)
-
-type refSingPacketConn struct {
-	*refPacketConn
-	singPacketConn SingPacketConn
-}
-
-var _ N.NetPacketConn = (*refSingPacketConn)(nil)
-
-func (c *refSingPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {
-	defer runtime.KeepAlive(c.ref)
-	return c.singPacketConn.WritePacket(buffer, destination)
-}
-
-func (c *refSingPacketConn) ReadPacket(buffer *buf.Buffer) (destination M.Socksaddr, err error) {
-	defer runtime.KeepAlive(c.ref)
-	return c.singPacketConn.ReadPacket(buffer)
-}

common/net/packet/thread.go

@@ -1,36 +0,0 @@
-package packet
-
-import (
-	"net"
-	"sync"
-)
-
-type threadSafePacketConn struct {
-	EnhancePacketConn
-	access sync.Mutex
-}
-
-func (c *threadSafePacketConn) WriteTo(b []byte, addr net.Addr) (int, error) {
-	c.access.Lock()
-	defer c.access.Unlock()
-	return c.EnhancePacketConn.WriteTo(b, addr)
-}
-
-func (c *threadSafePacketConn) Upstream() any {
-	return c.EnhancePacketConn
-}
-
-func (c *threadSafePacketConn) ReaderReplaceable() bool {
-	return true
-}
-
-func NewThreadSafePacketConn(pc net.PacketConn) EnhancePacketConn {
-	tsPC := &threadSafePacketConn{EnhancePacketConn: NewEnhancePacketConn(pc)}
-	if singPC, isSingPC := pc.(SingPacketConn); isSingPC {
-		return &threadSafeSingPacketConn{
-			threadSafePacketConn: tsPC,
-			singPacketConn:       singPC,
-		}
-	}
-	return tsPC
-}

common/net/packet/thread_sing.go

@@ -1,24 +0,0 @@
-package packet
-
-import (
-	"github.com/sagernet/sing/common/buf"
-	M "github.com/sagernet/sing/common/metadata"
-	N "github.com/sagernet/sing/common/network"
-)
-
-type threadSafeSingPacketConn struct {
-	*threadSafePacketConn
-	singPacketConn SingPacketConn
-}
-
-var _ N.NetPacketConn = (*threadSafeSingPacketConn)(nil)
-
-func (c *threadSafeSingPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {
-	c.access.Lock()
-	defer c.access.Unlock()
-	return c.singPacketConn.WritePacket(buffer, destination)
-}
-
-func (c *threadSafeSingPacketConn) ReadPacket(buffer *buf.Buffer) (destination M.Socksaddr, err error) {
-	return c.singPacketConn.ReadPacket(buffer)
-}

common/net/refconn.go

@@ -80,3 +80,47 @@ var _ ExtendedConn = (*refConn)(nil)
 func NewRefConn(conn net.Conn, ref any) net.Conn {
 	return &refConn{conn: NewExtendedConn(conn), ref: ref}
 }
+
+type refPacketConn struct {
+	pc  net.PacketConn
+	ref any
+}
+
+func (pc *refPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
+	defer runtime.KeepAlive(pc.ref)
+	return pc.pc.ReadFrom(p)
+}
+
+func (pc *refPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
+	defer runtime.KeepAlive(pc.ref)
+	return pc.pc.WriteTo(p, addr)
+}
+
+func (pc *refPacketConn) Close() error {
+	defer runtime.KeepAlive(pc.ref)
+	return pc.pc.Close()
+}
+
+func (pc *refPacketConn) LocalAddr() net.Addr {
+	defer runtime.KeepAlive(pc.ref)
+	return pc.pc.LocalAddr()
+}
+
+func (pc *refPacketConn) SetDeadline(t time.Time) error {
+	defer runtime.KeepAlive(pc.ref)
+	return pc.pc.SetDeadline(t)
+}
+
+func (pc *refPacketConn) SetReadDeadline(t time.Time) error {
+	defer runtime.KeepAlive(pc.ref)
+	return pc.pc.SetReadDeadline(t)
+}
+
+func (pc *refPacketConn) SetWriteDeadline(t time.Time) error {
+	defer runtime.KeepAlive(pc.ref)
+	return pc.pc.SetWriteDeadline(t)
+}
+
+func NewRefPacketConn(pc net.PacketConn, ref any) net.PacketConn {
+	return &refPacketConn{pc: pc, ref: ref}
+}

common/net/sing.go

@@ -23,6 +23,10 @@ func NewDeadlineConn(conn net.Conn) ExtendedConn {
 	return deadline.NewFallbackConn(conn)
 }
 
+func NewDeadlinePacketConn(pc net.PacketConn) net.PacketConn {
+	return deadline.NewFallbackPacketConn(bufio.NewPacketConn(pc))
+}
+
 func NeedHandshake(conn any) bool {
 	if earlyConn, isEarlyConn := common.Cast[network.EarlyConn](conn); isEarlyConn && earlyConn.NeedHandshake() {
 		return true

common/net/tls.go

@@ -11,7 +11,7 @@ import (
 )
 
 func ParseCert(certificate, privateKey string) (tls.Certificate, error) {
-	if certificate == "" && privateKey == "" {
+	if certificate == "" || privateKey == "" {
 		return newRandomTLSKeyPair()
 	}
 	cert, painTextErr := tls.X509KeyPair([]byte(certificate), []byte(privateKey))

common/picker/picker.go

@@ -47,7 +47,6 @@ func (p *Picker[T]) Wait() T {
 	p.wg.Wait()
 	if p.cancel != nil {
 		p.cancel()
-		p.cancel = nil
 	}
 	return p.result
 }
@@ -70,7 +69,6 @@ func (p *Picker[T]) Go(f func() (T, error)) {
 				p.result = ret
 				if p.cancel != nil {
 					p.cancel()
-					p.cancel = nil
 				}
 			})
 		} else {
@@ -80,13 +78,3 @@ func (p *Picker[T]) Go(f func() (T, error)) {
 		}
 	}()
 }
-
-// Close cancels the picker context and releases resources associated with it.
-// If Wait has been called, then there is no need to call Close.
-func (p *Picker[T]) Close() error {
-	if p.cancel != nil {
-		p.cancel()
-		p.cancel = nil
-	}
-	return nil
-}

common/picker/picker_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/samber/lo"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -16,7 +15,7 @@ func sleepAndSend[T any](ctx context.Context, delay int, input T) func() (T, err
 		case <-timer.C:
 			return input, nil
 		case <-ctx.Done():
-			return lo.Empty[T](), ctx.Err()
+			return getZero[T](), ctx.Err()
 		}
 	}
 }
@@ -36,6 +35,11 @@ func TestPicker_Timeout(t *testing.T) {
 	picker.Go(sleepAndSend(ctx, 20, 1))
 
 	number := picker.Wait()
-	assert.Equal(t, number, lo.Empty[int]())
+	assert.Equal(t, number, getZero[int]())
 	assert.NotNil(t, picker.Error())
 }
+
+func getZero[T any]() T {
+	var result T
+	return result
+}

common/pool/alloc.go

@@ -32,14 +32,10 @@ func NewAllocator() *Allocator {
 
 // Get a []byte from pool with most appropriate cap
 func (alloc *Allocator) Get(size int) []byte {
-	switch {
-	case size < 0:
-		panic("alloc.Get: len out of range")
-	case size == 0:
+	if size <= 0 || size > 65536 {
 		return nil
-	case size > 65536:
-		return make([]byte, size)
-	default:
+	}
+
 	bits := msb(size)
 	if size == 1<<bits {
 		return alloc.buffers[bits].Get().([]byte)[:size]
@@ -47,17 +43,12 @@ func (alloc *Allocator) Get(size int) []byte {
 
 	return alloc.buffers[bits+1].Get().([]byte)[:size]
 }
-}
 
 // Put returns a []byte to pool for future use,
 // which the cap must be exactly 2^n
 func (alloc *Allocator) Put(buf []byte) error {
-	if cap(buf) == 0 || cap(buf) > 65536 {
-		return nil
-	}
-	
 	bits := msb(cap(buf))
-	if cap(buf) != 1<<bits {
+	if cap(buf) == 0 || cap(buf) > 65536 || cap(buf) != 1<<bits {
 		return errors.New("allocator Put() incorrect buffer size")
 	}
 

common/pool/alloc_test.go

@@ -19,17 +19,17 @@ func TestAllocGet(t *testing.T) {
 	assert.Equal(t, 1024, cap(alloc.Get(1023)))
 	assert.Equal(t, 1024, len(alloc.Get(1024)))
 	assert.Equal(t, 65536, len(alloc.Get(65536)))
-	assert.Equal(t, 65537, len(alloc.Get(65537)))
+	assert.Nil(t, alloc.Get(65537))
 }
 
 func TestAllocPut(t *testing.T) {
 	alloc := NewAllocator()
-	assert.Nil(t, alloc.Put(nil), "put nil misbehavior")
+	assert.NotNil(t, alloc.Put(nil), "put nil misbehavior")
 	assert.NotNil(t, alloc.Put(make([]byte, 3)), "put elem:3 []bytes misbehavior")
 	assert.Nil(t, alloc.Put(make([]byte, 4)), "put elem:4 []bytes misbehavior")
 	assert.Nil(t, alloc.Put(make([]byte, 1023, 1024)), "put elem:1024 []bytes misbehavior")
 	assert.Nil(t, alloc.Put(make([]byte, 65536)), "put elem:65536 []bytes misbehavior")
-	assert.Nil(t, alloc.Put(make([]byte, 65537)), "put elem:65537 []bytes misbehavior")
+	assert.NotNil(t, alloc.Put(make([]byte, 65537)), "put elem:65537 []bytes misbehavior")
 }
 
 func TestAllocPutThenGet(t *testing.T) {

common/queue/queue.go

@@ -2,8 +2,6 @@ package queue
 
 import (
 	"sync"
-
-	"github.com/samber/lo"
 )
 
 // Queue is a simple concurrent safe queue
@@ -26,7 +24,7 @@ func (q *Queue[T]) Put(items ...T) {
 // Pop returns the head of items.
 func (q *Queue[T]) Pop() T {
 	if len(q.items) == 0 {
-		return lo.Empty[T]()
+		return GetZero[T]()
 	}
 
 	q.lock.Lock()
@@ -39,7 +37,7 @@ func (q *Queue[T]) Pop() T {
 // Last returns the last of item.
 func (q *Queue[T]) Last() T {
 	if len(q.items) == 0 {
-		return lo.Empty[T]()
+		return GetZero[T]()
 	}
 
 	q.lock.RLock()
@@ -71,3 +69,8 @@ func New[T any](hint int64) *Queue[T] {
 		items: make([]T, 0, hint),
 	}
 }
+
+func GetZero[T any]() T {
+	var result T
+	return result
+}

common/structure/structure.go

@@ -96,11 +96,6 @@ func (d *Decoder) decode(name string, data any, val reflect.Value) error {
 		return d.decodeFloat(name, data, val)
 	}
 	switch kind {
-	case reflect.Pointer:
-		if val.IsNil() {
-			val.Set(reflect.New(val.Type().Elem()))
-		}
-		return d.decode(name, data, val.Elem())
 	case reflect.String:
 		return d.decodeString(name, data, val)
 	case reflect.Bool:
@@ -287,9 +282,6 @@ func (d *Decoder) decodeSlice(name string, data any, val reflect.Value) error {
 	}
 
 	valSlice := val
-	// make a new slice with cap(val)==cap(dataVal)
-	// the caller can determine whether the original configuration contains this item by judging whether the value is nil.
-	valSlice = reflect.MakeSlice(valType, 0, dataVal.Len())
 	for i := 0; i < dataVal.Len(); i++ {
 		currentData := dataVal.Index(i).Interface()
 		for valSlice.Len() <= i {

common/utils/global_id.go

@@ -1,17 +0,0 @@
-package utils
-
-import (
-	"hash/maphash"
-	"unsafe"
-)
-
-var globalSeed = maphash.MakeSeed()
-
-func GlobalID(material string) (id [8]byte) {
-	*(*uint64)(unsafe.Pointer(&id[0])) = maphash.String(globalSeed, material)
-	return
-}
-
-func MapHash(material string) uint64 {
-	return maphash.String(globalSeed, material)
-}

common/utils/range.go

@@ -9,36 +9,36 @@ type Range[T constraints.Ordered] struct {
 	end   T
 }
 
-func NewRange[T constraints.Ordered](start, end T) Range[T] {
+func NewRange[T constraints.Ordered](start, end T) *Range[T] {
 	if start > end {
-		return Range[T]{
+		return &Range[T]{
 			start: end,
 			end:   start,
 		}
 	}
 
-	return Range[T]{
+	return &Range[T]{
 		start: start,
 		end:   end,
 	}
 }
 
-func (r Range[T]) Contains(t T) bool {
+func (r *Range[T]) Contains(t T) bool {
 	return t >= r.start && t <= r.end
 }
 
-func (r Range[T]) LeftContains(t T) bool {
+func (r *Range[T]) LeftContains(t T) bool {
 	return t >= r.start && t < r.end
 }
 
-func (r Range[T]) RightContains(t T) bool {
+func (r *Range[T]) RightContains(t T) bool {
 	return t > r.start && t <= r.end
 }
 
-func (r Range[T]) Start() T {
+func (r *Range[T]) Start() T {
 	return r.start
 }
 
-func (r Range[T]) End() T {
+func (r *Range[T]) End() T {
 	return r.end
 }

common/utils/ranges.go

@@ -1,77 +0,0 @@
-package utils
-
-import (
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-
-	"golang.org/x/exp/constraints"
-)
-
-type IntRanges[T constraints.Integer] []Range[T]
-
-var errIntRanges = errors.New("intRanges error")
-
-func NewIntRanges[T constraints.Integer](expected string) (IntRanges[T], error) {
-	// example: 200 or 200/302 or 200-400 or 200/204/401-429/501-503
-	expected = strings.TrimSpace(expected)
-	if len(expected) == 0 || expected == "*" {
-		return nil, nil
-	}
-
-	list := strings.Split(expected, "/")
-	if len(list) > 28 {
-		return nil, fmt.Errorf("%w, too many ranges to use, maximum support 28 ranges", errIntRanges)
-	}
-
-	return NewIntRangesFromList[T](list)
-}
-
-func NewIntRangesFromList[T constraints.Integer](list []string) (IntRanges[T], error) {
-	var ranges IntRanges[T]
-	for _, s := range list {
-		if s == "" {
-			continue
-		}
-
-		status := strings.Split(s, "-")
-		statusLen := len(status)
-		if statusLen > 2 {
-			return nil, errIntRanges
-		}
-
-		start, err := strconv.ParseInt(strings.Trim(status[0], "[ ]"), 10, 64)
-		if err != nil {
-			return nil, errIntRanges
-		}
-
-		switch statusLen {
-		case 1:
-			ranges = append(ranges, NewRange(T(start), T(start)))
-		case 2:
-			end, err := strconv.ParseUint(strings.Trim(status[1], "[ ]"), 10, 64)
-			if err != nil {
-				return nil, errIntRanges
-			}
-
-			ranges = append(ranges, NewRange(T(start), T(end)))
-		}
-	}
-
-	return ranges, nil
-}
-
-func (ranges IntRanges[T]) Check(status T) bool {
-	if len(ranges) == 0 {
-		return true
-	}
-
-	for _, segment := range ranges {
-		if segment.Contains(status) {
-			return true
-		}
-	}
-
-	return false
-}

common/utils/string_unsafe.go

@@ -1,21 +0,0 @@
-package utils
-
-import "unsafe"
-
-// ImmutableBytesFromString is equivalent to []byte(s), except that it uses the
-// same memory backing s instead of making a heap-allocated copy. This is only
-// valid if the returned slice is never mutated.
-func ImmutableBytesFromString(s string) []byte {
-	b := unsafe.StringData(s)
-	return unsafe.Slice(b, len(s))
-}
-
-// StringFromImmutableBytes is equivalent to string(bs), except that it uses
-// the same memory backing bs instead of making a heap-allocated copy. This is
-// only valid if bs is never mutated after StringFromImmutableBytes returns.
-func StringFromImmutableBytes(bs []byte) string {
-	if len(bs) == 0 {
-		return ""
-	}
-	return unsafe.String(&bs[0], len(bs))
-}

component/dialer/bind.go

@@ -1,51 +0,0 @@
-package dialer
-
-import (
-	"net"
-	"net/netip"
-	"strings"
-
-	"github.com/Dreamacro/clash/component/iface"
-)
-
-func LookupLocalAddrFromIfaceName(ifaceName string, network string, destination netip.Addr, port int) (net.Addr, error) {
-	ifaceObj, err := iface.ResolveInterface(ifaceName)
-	if err != nil {
-		return nil, err
-	}
-
-	var addr *netip.Prefix
-	switch network {
-	case "udp4", "tcp4":
-		addr, err = ifaceObj.PickIPv4Addr(destination)
-	case "tcp6", "udp6":
-		addr, err = ifaceObj.PickIPv6Addr(destination)
-	default:
-		if destination.IsValid() {
-			if destination.Is4() || destination.Is4In6() {
-				addr, err = ifaceObj.PickIPv4Addr(destination)
-			} else {
-				addr, err = ifaceObj.PickIPv6Addr(destination)
-			}
-		} else {
-			addr, err = ifaceObj.PickIPv4Addr(destination)
-		}
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	if strings.HasPrefix(network, "tcp") {
-		return &net.TCPAddr{
-			IP:   addr.Addr().AsSlice(),
-			Port: port,
-		}, nil
-	} else if strings.HasPrefix(network, "udp") {
-		return &net.UDPAddr{
-			IP:   addr.Addr().AsSlice(),
-			Port: port,
-		}, nil
-	}
-
-	return nil, iface.ErrAddrNotFound
-}

component/dialer/bind_others.go

@@ -7,8 +7,52 @@ import (
 	"net/netip"
 	"strconv"
 	"strings"
+
+	"github.com/Dreamacro/clash/component/iface"
 )
 
+func lookupLocalAddr(ifaceName string, network string, destination netip.Addr, port int) (net.Addr, error) {
+	ifaceObj, err := iface.ResolveInterface(ifaceName)
+	if err != nil {
+		return nil, err
+	}
+
+	var addr *netip.Prefix
+	switch network {
+	case "udp4", "tcp4":
+		addr, err = ifaceObj.PickIPv4Addr(destination)
+	case "tcp6", "udp6":
+		addr, err = ifaceObj.PickIPv6Addr(destination)
+	default:
+		if destination.IsValid() {
+			if destination.Is4() {
+				addr, err = ifaceObj.PickIPv4Addr(destination)
+			} else {
+				addr, err = ifaceObj.PickIPv6Addr(destination)
+			}
+		} else {
+			addr, err = ifaceObj.PickIPv4Addr(destination)
+		}
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	if strings.HasPrefix(network, "tcp") {
+		return &net.TCPAddr{
+			IP:   addr.Addr().AsSlice(),
+			Port: port,
+		}, nil
+	} else if strings.HasPrefix(network, "udp") {
+		return &net.UDPAddr{
+			IP:   addr.Addr().AsSlice(),
+			Port: port,
+		}, nil
+	}
+
+	return nil, iface.ErrAddrNotFound
+}
+
 func bindIfaceToDialer(ifaceName string, dialer *net.Dialer, network string, destination netip.Addr) error {
 	if !destination.IsGlobalUnicast() {
 		return nil
@@ -22,7 +66,7 @@ func bindIfaceToDialer(ifaceName string, dialer *net.Dialer, network string, des
 		}
 	}
 
-	addr, err := LookupLocalAddrFromIfaceName(ifaceName, network, destination, int(local))
+	addr, err := lookupLocalAddr(ifaceName, network, destination, int(local))
 	if err != nil {
 		return err
 	}
@@ -40,7 +84,7 @@ func bindIfaceToListenConfig(ifaceName string, _ *net.ListenConfig, network, add
 
 	local, _ := strconv.ParseUint(port, 10, 16)
 
-	addr, err := LookupLocalAddrFromIfaceName(ifaceName, network, netip.Addr{}, int(local))
+	addr, err := lookupLocalAddr(ifaceName, network, netip.Addr{}, int(local))
 	if err != nil {
 		return "", err
 	}

component/dialer/control.go

@@ -20,20 +20,3 @@ func addControlToListenConfig(lc *net.ListenConfig, fn controlFn) {
 		return fn(context.Background(), network, address, c)
 	}
 }
-
-func addControlToDialer(d *net.Dialer, fn controlFn) {
-	ld := *d
-	d.ControlContext = func(ctx context.Context, network, address string, c syscall.RawConn) (err error) {
-		switch {
-		case ld.ControlContext != nil:
-			if err = ld.ControlContext(ctx, network, address, c); err != nil {
-				return
-			}
-		case ld.Control != nil:
-			if err = ld.Control(network, address, c); err != nil {
-				return
-			}
-		}
-		return fn(ctx, network, address, c)
-	}
-}

component/dialer/control_go119.go

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

component/dialer/control_go120.go

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

component/dialer/dialer.go

@@ -2,7 +2,6 @@ package dialer
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"net"
 	"net/netip"
@@ -132,9 +131,6 @@ func dialContext(ctx context.Context, network string, destination netip.Addr, po
 	if opt.routingMark != 0 {
 		bindMarkToDialer(opt.routingMark, dialer, network, destination)
 	}
-	if opt.mpTcp {
-		setMultiPathTCP(dialer)
-	}
 	if opt.tfo {
 		return dialTFO(ctx, *dialer, network, address)
 	}
@@ -162,22 +158,14 @@ func concurrentDualStackDialContext(ctx context.Context, network string, ips []n
 
 func dualStackDialContext(ctx context.Context, dialFn dialFunc, network string, ips []netip.Addr, port string, opt *option) (net.Conn, error) {
 	ipv4s, ipv6s := resolver.SortationAddr(ips)
-	if len(ipv4s) == 0 && len(ipv6s) == 0 {
-		return nil, ErrorNoIpAddress
-	}
-
 	preferIPVersion := opt.prefer
+
 	fallbackTicker := time.NewTicker(fallbackTimeout)
 	defer fallbackTicker.Stop()
-
 	results := make(chan dialResult)
 	returned := make(chan struct{})
 	defer close(returned)
-
-	var wg sync.WaitGroup
-
 	racer := func(ips []netip.Addr, isPrimary bool) {
-		defer wg.Done()
 		result := dialResult{isPrimary: isPrimary}
 		defer func() {
 			select {
@@ -190,36 +178,18 @@ func dualStackDialContext(ctx context.Context, dialFn dialFunc, network string,
 		}()
 		result.Conn, result.error = dialFn(ctx, network, ips, port, opt)
 	}
-
-	if len(ipv4s) != 0 {
-		wg.Add(1)
 	go racer(ipv4s, preferIPVersion != 6)
-	}
-
-	if len(ipv6s) != 0 {
-		wg.Add(1)
 	go racer(ipv6s, preferIPVersion != 4)
-	}
-
-	go func() {
-		wg.Wait()
-		close(results)
-	}()
-
 	var fallback dialResult
 	var errs []error
-
-loop:
-	for {
+	for i := 0; i < 2; {
 		select {
 		case <-fallbackTicker.C:
 			if fallback.error == nil && fallback.Conn != nil {
 				return fallback.Conn, nil
 			}
-		case res, ok := <-results:
-			if !ok {
-				break loop
-			}
+		case res := <-results:
+			i++
 			if res.error == nil {
 				if res.isPrimary {
 					return res.Conn, nil
@@ -234,11 +204,10 @@ loop:
 			}
 		}
 	}
-
 	if fallback.error == nil && fallback.Conn != nil {
 		return fallback.Conn, nil
 	}
-	return nil, errors.Join(errs...)
+	return nil, errorsJoin(errs...)
 }
 
 func parallelDialContext(ctx context.Context, network string, ips []netip.Addr, port string, opt *option) (net.Conn, error) {
@@ -275,7 +244,7 @@ func parallelDialContext(ctx context.Context, network string, ips []netip.Addr,
 	}
 
 	if len(errs) > 0 {
-		return nil, errors.Join(errs...)
+		return nil, errorsJoin(errs...)
 	}
 	return nil, os.ErrDeadlineExceeded
 }
@@ -292,7 +261,7 @@ func serialDialContext(ctx context.Context, network string, ips []netip.Addr, po
 			errs = append(errs, err)
 		}
 	}
-	return nil, errors.Join(errs...)
+	return nil, errorsJoin(errs...)
 }
 
 type dialResult struct {

component/dialer/error.go

@@ -2,9 +2,17 @@ package dialer
 
 import (
 	"errors"
+
+	E "github.com/sagernet/sing/common/exceptions"
 )
 
 var (
 	ErrorNoIpAddress           = errors.New("no ip address")
 	ErrorInvalidedNetworkStack = errors.New("invalided network stack")
 )
+
+func errorsJoin(errs ...error) error {
+	// compatibility with golang<1.20
+	// maybe use errors.Join(errs...) is better after we drop the old version's support
+	return E.Errors(errs...)
+}

component/dialer/mptcp_go120.go

@@ -1,12 +0,0 @@
-//go:build !go1.21
-
-package dialer
-
-import (
-	"net"
-)
-
-const multipathTCPAvailable = false
-
-func setMultiPathTCP(dialer *net.Dialer) {
-}

component/dialer/mptcp_go121.go

@@ -1,11 +0,0 @@
-//go:build go1.21
-
-package dialer
-
-import "net"
-
-const multipathTCPAvailable = true
-
-func setMultiPathTCP(dialer *net.Dialer) {
-	dialer.SetMultipathTCP(true)
-}

component/dialer/options.go

@@ -25,7 +25,6 @@ type option struct {
 	network       int
 	prefer        int
 	tfo           bool
-	mpTcp         bool
 	resolver      resolver.Resolver
 	netDialer     NetDialer
 }
@@ -84,12 +83,6 @@ func WithTFO(tfo bool) Option {
 	}
 }
 
-func WithMPTCP(mpTcp bool) Option {
-	return func(opt *option) {
-		opt.mpTcp = mpTcp
-	}
-}
-
 func WithNetDialer(netDialer NetDialer) Option {
 	return func(opt *option) {
 		opt.netDialer = netDialer

component/dialer/tfo.go

@@ -18,11 +18,10 @@ type tfoConn struct {
 }
 
 func (c *tfoConn) Dial(earlyData []byte) (err error) {
-	conn, err := c.dialFn(c.ctx, earlyData)
+	c.Conn, err = c.dialFn(c.ctx, earlyData)
 	if err != nil {
 		return
 	}
-	c.Conn = conn
 	c.dialed <- true
 	return err
 }

component/geodata/strmatcher/mph_matcher.go

@@ -234,26 +234,26 @@ tail:
 	case s == 0:
 	case s < 4:
 		h ^= uint64(*(*byte)(p))
-		h ^= uint64(*(*byte)(unsafe.Add(p, s>>1))) << 8
-		h ^= uint64(*(*byte)(unsafe.Add(p, s-1))) << 16
+		h ^= uint64(*(*byte)(add(p, s>>1))) << 8
+		h ^= uint64(*(*byte)(add(p, s-1))) << 16
 		h = rotl31(h*m1) * m2
 	case s <= 8:
 		h ^= uint64(readUnaligned32(p))
-		h ^= uint64(readUnaligned32(unsafe.Add(p, s-4))) << 32
+		h ^= uint64(readUnaligned32(add(p, s-4))) << 32
 		h = rotl31(h*m1) * m2
 	case s <= 16:
 		h ^= readUnaligned64(p)
 		h = rotl31(h*m1) * m2
-		h ^= readUnaligned64(unsafe.Add(p, s-8))
+		h ^= readUnaligned64(add(p, s-8))
 		h = rotl31(h*m1) * m2
 	case s <= 32:
 		h ^= readUnaligned64(p)
 		h = rotl31(h*m1) * m2
-		h ^= readUnaligned64(unsafe.Add(p, 8))
+		h ^= readUnaligned64(add(p, 8))
 		h = rotl31(h*m1) * m2
-		h ^= readUnaligned64(unsafe.Add(p, s-16))
+		h ^= readUnaligned64(add(p, s-16))
 		h = rotl31(h*m1) * m2
-		h ^= readUnaligned64(unsafe.Add(p, s-8))
+		h ^= readUnaligned64(add(p, s-8))
 		h = rotl31(h*m1) * m2
 	default:
 		v1 := h
@@ -263,16 +263,16 @@ tail:
 		for s >= 32 {
 			v1 ^= readUnaligned64(p)
 			v1 = rotl31(v1*m1) * m2
-			p = unsafe.Add(p, 8)
+			p = add(p, 8)
 			v2 ^= readUnaligned64(p)
 			v2 = rotl31(v2*m2) * m3
-			p = unsafe.Add(p, 8)
+			p = add(p, 8)
 			v3 ^= readUnaligned64(p)
 			v3 = rotl31(v3*m3) * m4
-			p = unsafe.Add(p, 8)
+			p = add(p, 8)
 			v4 ^= readUnaligned64(p)
 			v4 = rotl31(v4*m4) * m1
-			p = unsafe.Add(p, 8)
+			p = add(p, 8)
 			s -= 32
 		}
 		h = v1 ^ v2 ^ v3 ^ v4
@@ -285,6 +285,10 @@ tail:
 	return uintptr(h)
 }
 
+func add(p unsafe.Pointer, x uintptr) unsafe.Pointer {
+	return unsafe.Pointer(uintptr(p) + x)
+}
+
 func readUnaligned32(p unsafe.Pointer) uint32 {
 	q := (*[4]byte)(p)
 	return uint32(q[0]) | uint32(q[1])<<8 | uint32(q[2])<<16 | uint32(q[3])<<24

component/http/http.go

@@ -53,12 +53,8 @@ func HttpRequest(ctx context.Context, url, method string, header map[string][]st
 		TLSHandshakeTimeout:   10 * time.Second,
 		ExpectContinueTimeout: 1 * time.Second,
 		DialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
-			if conn, err := inner.HandleTcp(address); err == nil {
+			conn := inner.HandleTcp(address, "")
 			return conn, nil
-			} else {
-				d := net.Dialer{}
-				return d.DialContext(ctx, network, address)
-			}
 		},
 		TLSClientConfig: tls.GetDefaultTLSConfig(),
 	}

component/iface/iface.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"net"
 	"net/netip"
-	"strings"
 	"time"
 
 	"github.com/Dreamacro/clash/common/singledo"
@@ -38,21 +37,12 @@ func ResolveInterface(name string) (*Interface, error) {
 			if err != nil {
 				continue
 			}
-			// if not available device like Meta, dummy0, docker0, etc.
-			if (iface.Flags&net.FlagMulticast == 0) || (iface.Flags&net.FlagPointToPoint != 0) || (iface.Flags&net.FlagRunning == 0) {
-				continue
-			}
 
 			ipNets := make([]*netip.Prefix, 0, len(addrs))
 			for _, addr := range addrs {
 				ipNet := addr.(*net.IPNet)
 				ip, _ := netip.AddrFromSlice(ipNet.IP)
 
-				//unavailable IPv6 Address
-				if ip.Is6() && strings.HasPrefix(ip.String(), "fe80") {
-					continue
-				}
-
 				ones, bits := ipNet.Mask.Size()
 				if bits == 32 {
 					ip = ip.Unmap()

component/mmdb/mmdb.go

@@ -12,68 +12,42 @@ import (
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
 
-	"github.com/oschwald/maxminddb-golang"
-)
-
-type databaseType = uint8
-
-const (
-	typeMaxmind databaseType = iota
-	typeSing
-	typeMetaV0
+	"github.com/oschwald/geoip2-golang"
 )
 
 var (
-	reader Reader
+	mmdb *geoip2.Reader
 	once sync.Once
 )
 
 func LoadFromBytes(buffer []byte) {
 	once.Do(func() {
-		mmdb, err := maxminddb.FromBytes(buffer)
+		var err error
+		mmdb, err = geoip2.FromBytes(buffer)
 		if err != nil {
 			log.Fatalln("Can't load mmdb: %s", err.Error())
 		}
-		reader = Reader{Reader: mmdb}
-		switch mmdb.Metadata.DatabaseType {
-		case "sing-geoip":
-			reader.databaseType = typeSing
-		case "Meta-geoip0":
-			reader.databaseType = typeMetaV0
-		default:
-			reader.databaseType = typeMaxmind
-		}
 	})
 }
 
 func Verify() bool {
-	instance, err := maxminddb.Open(C.Path.MMDB())
+	instance, err := geoip2.Open(C.Path.MMDB())
 	if err == nil {
 		instance.Close()
 	}
 	return err == nil
 }
 
-func Instance() Reader {
+func Instance() *geoip2.Reader {
 	once.Do(func() {
-		mmdbPath := C.Path.MMDB()
-		log.Debugln("Load MMDB file: %s", mmdbPath)
-		mmdb, err := maxminddb.Open(mmdbPath)
+		var err error
+		mmdb, err = geoip2.Open(C.Path.MMDB())
 		if err != nil {
-			log.Fatalln("Can't load MMDB: %s", err.Error())
-		}
-		reader = Reader{Reader: mmdb}
-		switch mmdb.Metadata.DatabaseType {
-		case "sing-geoip":
-			reader.databaseType = typeSing
-		case "Meta-geoip0":
-			reader.databaseType = typeMetaV0
-		default:
-			reader.databaseType = typeMaxmind
+			log.Fatalln("Can't load mmdb: %s", err.Error())
 		}
 	})
 
-	return reader
+	return mmdb
 }
 
 func DownloadMMDB(path string) (err error) {

component/mmdb/reader.go

@@ -1,56 +0,0 @@
-package mmdb
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/oschwald/maxminddb-golang"
-	"github.com/sagernet/sing/common"
-)
-
-type geoip2Country struct {
-	Country struct {
-		IsoCode string `maxminddb:"iso_code"`
-	} `maxminddb:"country"`
-}
-
-type Reader struct {
-	*maxminddb.Reader
-	databaseType
-}
-
-func (r Reader) LookupCode(ipAddress net.IP) []string {
-	switch r.databaseType {
-	case typeMaxmind:
-		var country geoip2Country
-		_ = r.Lookup(ipAddress, &country)
-		if country.Country.IsoCode == "" {
-			return []string{}
-		}
-		return []string{country.Country.IsoCode}
-
-	case typeSing:
-		var code string
-		_ = r.Lookup(ipAddress, &code)
-		if code == "" {
-			return []string{}
-		}
-		return []string{code}
-
-	case typeMetaV0:
-		var record any
-		_ = r.Lookup(ipAddress, &record)
-		switch record := record.(type) {
-		case string:
-			return []string{record}
-		case []any: // lookup returned type of slice is []any
-			return common.Map(record, func(it any) string {
-				return it.(string)
-			})
-		}
-		return []string{}
-
-	default:
-		panic(fmt.Sprint("unknown geoip database type:", r.databaseType))
-	}
-}

component/nat/proxy.go

@@ -1,26 +0,0 @@
-package nat
-
-import (
-	"net"
-
-	"github.com/Dreamacro/clash/common/atomic"
-	C "github.com/Dreamacro/clash/constant"
-)
-
-type writeBackProxy struct {
-	wb atomic.TypedValue[C.WriteBack]
-}
-
-func (w *writeBackProxy) WriteBack(b []byte, addr net.Addr) (n int, err error) {
-	return w.wb.Load().WriteBack(b, addr)
-}
-
-func (w *writeBackProxy) UpdateWriteBack(wb C.WriteBack) {
-	w.wb.Store(wb)
-}
-
-func NewWriteBackProxy(wb C.WriteBack) C.WriteBackProxy {
-	w := &writeBackProxy{}
-	w.UpdateWriteBack(wb)
-	return w
-}

component/nat/table.go

@@ -13,24 +13,22 @@ type Table struct {
 
 type Entry struct {
 	PacketConn      C.PacketConn
-	WriteBackProxy  C.WriteBackProxy
 	LocalUDPConnMap sync.Map
 }
 
-func (t *Table) Set(key string, e C.PacketConn, w C.WriteBackProxy) {
+func (t *Table) Set(key string, e C.PacketConn) {
 	t.mapping.Store(key, &Entry{
 		PacketConn:      e,
-		WriteBackProxy:  w,
 		LocalUDPConnMap: sync.Map{},
 	})
 }
 
-func (t *Table) Get(key string) (C.PacketConn, C.WriteBackProxy) {
+func (t *Table) Get(key string) C.PacketConn {
 	entry, exist := t.getEntry(key)
 	if !exist {
-		return nil, nil
+		return nil
 	}
-	return entry.PacketConn, entry.WriteBackProxy
+	return entry.PacketConn
 }
 
 func (t *Table) GetOrCreateLock(key string) (*sync.Cond, bool) {

component/process/process_windows.go

@@ -67,7 +67,7 @@ func findProcessName(network string, ip netip.Addr, srcPort int) (uint32, string
 		err := initWin32API()
 		if err != nil {
 			log.Errorln("Initialize PROCESS-NAME failed: %s", err.Error())
-			log.Warnln("All PROCESS-NAMES rules will be skipped")
+			log.Warnln("All PROCESS-NAMES rules will be skiped")
 			return
 		}
 	})

component/proxydialer/proxydialer.go

@@ -71,7 +71,7 @@ func (p proxyDialer) DialContext(ctx context.Context, network, address string) (
 
 func (p proxyDialer) ListenPacket(ctx context.Context, network, address string, rAddrPort netip.AddrPort) (net.PacketConn, error) {
 	currentMeta := &C.Metadata{Type: C.INNER}
-	if err := currentMeta.SetRemoteAddress(rAddrPort.String()); err != nil {
+	if err := currentMeta.SetRemoteAddress(address); err != nil {
 		return nil, err
 	}
 	return p.listenPacket(ctx, currentMeta)

component/resource/fetcher.go

@@ -9,8 +9,6 @@ import (
 
 	types "github.com/Dreamacro/clash/constant/provider"
 	"github.com/Dreamacro/clash/log"
-
-	"github.com/samber/lo"
 )
 
 var (
@@ -67,7 +65,7 @@ func (f *Fetcher[V]) Initial() (V, error) {
 	}
 
 	if err != nil {
-		return lo.Empty[V](), err
+		return getZero[V](), err
 	}
 
 	var contents V
@@ -87,18 +85,18 @@ func (f *Fetcher[V]) Initial() (V, error) {
 
 	if err != nil {
 		if !isLocal {
-			return lo.Empty[V](), err
+			return getZero[V](), err
 		}
 
 		// parse local file error, fallback to remote
 		buf, err = f.vehicle.Read()
 		if err != nil {
-			return lo.Empty[V](), err
+			return getZero[V](), err
 		}
 
 		contents, err = f.parser(buf)
 		if err != nil {
-			return lo.Empty[V](), err
+			return getZero[V](), err
 		}
 
 		isLocal = false
@@ -106,7 +104,7 @@ func (f *Fetcher[V]) Initial() (V, error) {
 
 	if f.vehicle.Type() != types.File && !isLocal {
 		if err := safeWrite(f.vehicle.Path(), buf); err != nil {
-			return lo.Empty[V](), err
+			return getZero[V](), err
 		}
 	}
 
@@ -123,7 +121,7 @@ func (f *Fetcher[V]) Initial() (V, error) {
 func (f *Fetcher[V]) Update() (V, bool, error) {
 	buf, err := f.vehicle.Read()
 	if err != nil {
-		return lo.Empty[V](), false, err
+		return getZero[V](), false, err
 	}
 
 	now := time.Now()
@@ -131,17 +129,17 @@ func (f *Fetcher[V]) Update() (V, bool, error) {
 	if bytes.Equal(f.hash[:], hash[:]) {
 		f.UpdatedAt = &now
 		_ = os.Chtimes(f.vehicle.Path(), now, now)
-		return lo.Empty[V](), true, nil
+		return getZero[V](), true, nil
 	}
 
 	contents, err := f.parser(buf)
 	if err != nil {
-		return lo.Empty[V](), false, err
+		return getZero[V](), false, err
 	}
 
 	if f.vehicle.Type() != types.File {
 		if err := safeWrite(f.vehicle.Path(), buf); err != nil {
-			return lo.Empty[V](), false, err
+			return getZero[V](), false, err
 		}
 	}
 
@@ -212,3 +210,8 @@ func NewFetcher[V any](name string, interval time.Duration, vehicle types.Vehicl
 		interval: interval,
 	}
 }
+
+func getZero[V any]() V {
+	var result V
+	return result
+}

component/resource/vehicle.go

@@ -2,14 +2,12 @@ package resource
 
 import (
 	"context"
-	"errors"
+	clashHttp "github.com/Dreamacro/clash/component/http"
+	types "github.com/Dreamacro/clash/constant/provider"
 	"io"
 	"net/http"
 	"os"
 	"time"
-
-	clashHttp "github.com/Dreamacro/clash/component/http"
-	types "github.com/Dreamacro/clash/constant/provider"
 )
 
 type FileVehicle struct {
@@ -56,10 +54,8 @@ func (h *HTTPVehicle) Read() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	defer resp.Body.Close()
-	if resp.StatusCode < 200 || resp.StatusCode > 299 {
-		return nil, errors.New(resp.Status)
-	}
 	buf, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err

component/sniffer/base_sniffer.go

@@ -10,11 +10,11 @@ import (
 
 type SnifferConfig struct {
 	OverrideDest bool
-	Ports        utils.IntRanges[uint16]
+	Ports        []utils.Range[uint16]
 }
 
 type BaseSniffer struct {
-	ports              utils.IntRanges[uint16]
+	ports              []utils.Range[uint16]
 	supportNetworkType constant.NetWork
 }
 
@@ -35,10 +35,15 @@ func (bs *BaseSniffer) SupportNetwork() constant.NetWork {
 
 // SupportPort implements sniffer.Sniffer
 func (bs *BaseSniffer) SupportPort(port uint16) bool {
-	return bs.ports.Check(port)
+	for _, portRange := range bs.ports {
+		if portRange.Contains(port) {
+			return true
+		}
+	}
+	return false
 }
 
-func NewBaseSniffer(ports utils.IntRanges[uint16], networkType constant.NetWork) *BaseSniffer {
+func NewBaseSniffer(ports []utils.Range[uint16], networkType constant.NetWork) *BaseSniffer {
 	return &BaseSniffer{
 		ports:              ports,
 		supportNetworkType: networkType,

component/sniffer/dispatcher.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net"
 	"net/netip"
+	"strconv"
 	"sync"
 	"time"
 
@@ -37,11 +38,17 @@ type SnifferDispatcher struct {
 
 func (sd *SnifferDispatcher) TCPSniff(conn *N.BufferedConn, metadata *C.Metadata) {
 	if (metadata.Host == "" && sd.parsePureIp) || sd.forceDomain.Has(metadata.Host) || (metadata.DNSMode == C.DNSMapping && sd.forceDnsMapping) {
+		port, err := strconv.ParseUint(metadata.DstPort, 10, 16)
+		if err != nil {
+			log.Debugln("[Sniffer] Dst port is error")
+			return
+		}
+
 		inWhitelist := false
 		overrideDest := false
 		for sniffer, config := range sd.sniffers {
 			if sniffer.SupportNetwork() == C.TCP || sniffer.SupportNetwork() == C.ALLNet {
-				inWhitelist = sniffer.SupportPort(metadata.DstPort)
+				inWhitelist = sniffer.SupportPort(uint16(port))
 				if inWhitelist {
 					overrideDest = config.OverrideDest
 					break
@@ -54,7 +61,7 @@ func (sd *SnifferDispatcher) TCPSniff(conn *N.BufferedConn, metadata *C.Metadata
 		}
 
 		sd.rwMux.RLock()
-		dst := fmt.Sprintf("%s:%d", metadata.DstIP, metadata.DstPort)
+		dst := fmt.Sprintf("%s:%s", metadata.DstIP, metadata.DstPort)
 		if count, ok := sd.skipList.Get(dst); ok && count > 5 {
 			log.Debugln("[Sniffer] Skip sniffing[%s] due to multiple failures", dst)
 			defer sd.rwMux.RUnlock()
@@ -64,7 +71,7 @@ func (sd *SnifferDispatcher) TCPSniff(conn *N.BufferedConn, metadata *C.Metadata
 
 		if host, err := sd.sniffDomain(conn, metadata); err != nil {
 			sd.cacheSniffFailed(metadata)
-			log.Debugln("[Sniffer] All sniffing sniff failed with from [%s:%d] to [%s:%d]", metadata.SrcIP, metadata.SrcPort, metadata.String(), metadata.DstPort)
+			log.Debugln("[Sniffer] All sniffing sniff failed with from [%s:%s] to [%s:%s]", metadata.SrcIP, metadata.SrcPort, metadata.String(), metadata.DstPort)
 			return
 		} else {
 			if sd.skipSNI.Has(host) {
@@ -142,7 +149,7 @@ func (sd *SnifferDispatcher) sniffDomain(conn *N.BufferedConn, metadata *C.Metad
 
 func (sd *SnifferDispatcher) cacheSniffFailed(metadata *C.Metadata) {
 	sd.rwMux.Lock()
-	dst := fmt.Sprintf("%s:%d", metadata.DstIP, metadata.DstPort)
+	dst := fmt.Sprintf("%s:%s", metadata.DstIP, metadata.DstPort)
 	count, _ := sd.skipList.Get(dst)
 	if count <= 5 {
 		count++

component/sniffer/http_sniffer.go

@@ -34,9 +34,11 @@ type HTTPSniffer struct {
 var _ sniffer.Sniffer = (*HTTPSniffer)(nil)
 
 func NewHTTPSniffer(snifferConfig SnifferConfig) (*HTTPSniffer, error) {
-	ports := snifferConfig.Ports
-	if len(ports) == 0 {
-		ports = utils.IntRanges[uint16]{utils.NewRange[uint16](80, 80)}
+	ports := make([]utils.Range[uint16], 0)
+	if len(snifferConfig.Ports) == 0 {
+		ports = append(ports, *utils.NewRange[uint16](80, 80))
+	} else {
+		ports = append(ports, snifferConfig.Ports...)
 	}
 	return &HTTPSniffer{
 		BaseSniffer: NewBaseSniffer(ports, C.TCP),

component/sniffer/tls_sniffer.go

@@ -22,9 +22,11 @@ type TLSSniffer struct {
 }
 
 func NewTLSSniffer(snifferConfig SnifferConfig) (*TLSSniffer, error) {
-	ports := snifferConfig.Ports
-	if len(ports) == 0 {
-		ports = utils.IntRanges[uint16]{utils.NewRange[uint16](443, 443)}
+	ports := make([]utils.Range[uint16], 0)
+	if len(snifferConfig.Ports) == 0 {
+		ports = append(ports, *utils.NewRange[uint16](443, 443))
+	} else {
+		ports = append(ports, snifferConfig.Ports...)
 	}
 	return &TLSSniffer{
 		BaseSniffer: NewBaseSniffer(ports, C.TCP),

component/tls/config.go

@@ -10,12 +10,14 @@ import (
 	"fmt"
 	"strings"
 	"sync"
+
+	xtls "github.com/xtls/go"
 )
 
 var trustCerts []*x509.Certificate
 var certPool *x509.CertPool
 var mutex sync.RWMutex
-var errNotMatch = errors.New("certificate fingerprints do not match")
+var errNotMacth error = errors.New("certificate fingerprints do not match")
 
 func AddCertificate(certificate string) error {
 	mutex.Lock()
@@ -31,22 +33,10 @@ func AddCertificate(certificate string) error {
 	}
 }
 
-func initializeCertPool() {
-	var err error
-	certPool, err = x509.SystemCertPool()
-	if err != nil {
-		certPool = x509.NewCertPool()
-	}
-	for _, cert := range trustCerts {
-		certPool.AddCert(cert)
-	}
-}
-
 func ResetCertificate() {
 	mutex.Lock()
 	defer mutex.Unlock()
 	trustCerts = nil
-	initializeCertPool()
 }
 
 func getCertPool() *x509.CertPool {
@@ -59,7 +49,12 @@ func getCertPool() *x509.CertPool {
 		if certPool != nil {
 			return certPool
 		}
-		initializeCertPool()
+		certPool, err := x509.SystemCertPool()
+		if err == nil {
+			for _, cert := range trustCerts {
+				certPool.AddCert(cert)
+			}
+		}
 	}
 	return certPool
 }
@@ -77,7 +72,7 @@ func verifyFingerprint(fingerprint *[32]byte) func(rawCerts [][]byte, verifiedCh
 				}
 			}
 		}
-		return errNotMatch
+		return errNotMacth
 	}
 }
 
@@ -120,3 +115,27 @@ func GetGlobalTLSConfig(tlsConfig *tls.Config) *tls.Config {
 	tlsConfig.RootCAs = certPool
 	return tlsConfig
 }
+
+// GetSpecifiedFingerprintXTLSConfig specified fingerprint
+func GetSpecifiedFingerprintXTLSConfig(tlsConfig *xtls.Config, fingerprint string) (*xtls.Config, error) {
+	if fingerprintBytes, err := convertFingerprint(fingerprint); err != nil {
+		return nil, err
+	} else {
+		tlsConfig = GetGlobalXTLSConfig(tlsConfig)
+		tlsConfig.VerifyPeerCertificate = verifyFingerprint(fingerprintBytes)
+		tlsConfig.InsecureSkipVerify = true
+		return tlsConfig, nil
+	}
+}
+
+func GetGlobalXTLSConfig(tlsConfig *xtls.Config) *xtls.Config {
+	certPool := getCertPool()
+	if tlsConfig == nil {
+		return &xtls.Config{
+			RootCAs: certPool,
+		}
+	}
+
+	tlsConfig.RootCAs = certPool
+	return tlsConfig
+}

component/tls/reality.go

@@ -22,11 +22,9 @@ import (
 
 	"github.com/Dreamacro/clash/common/utils"
 	"github.com/Dreamacro/clash/log"
-	"github.com/Dreamacro/clash/ntp"
 
 	utls "github.com/sagernet/utls"
 	"github.com/zhangyunhao116/fastrand"
-	"golang.org/x/crypto/chacha20poly1305"
 	"golang.org/x/crypto/curve25519"
 	"golang.org/x/crypto/hkdf"
 	"golang.org/x/net/http2"
@@ -39,9 +37,6 @@ type RealityConfig struct {
 	ShortID   [RealityMaxShortIDLen]byte
 }
 
-//go:linkname aesgcmPreferred crypto/tls.aesgcmPreferred
-func aesgcmPreferred(ciphers []uint16) bool
-
 func GetRealityConn(ctx context.Context, conn net.Conn, ClientFingerprint string, tlsConfig *tls.Config, realityConfig *RealityConfig) (net.Conn, error) {
 	if fingerprint, exists := GetFingerprint(ClientFingerprint); exists {
 		verifier := &realityVerifier{
@@ -66,17 +61,17 @@ func GetRealityConn(ctx context.Context, conn net.Conn, ClientFingerprint string
 		}
 
 		hello := uConn.HandshakeState.Hello
-		rawSessionID := hello.Raw[39 : 39+32] // the location of session ID
-		for i := range rawSessionID {         // https://github.com/golang/go/issues/5373
-			rawSessionID[i] = 0
+		for i := range hello.SessionId { // https://github.com/golang/go/issues/5373
+			hello.SessionId[i] = 0
 		}
+		copy(hello.Raw[39:], hello.SessionId)
 
-		binary.BigEndian.PutUint64(hello.SessionId, uint64(ntp.Now().Unix()))
+		binary.BigEndian.PutUint64(hello.SessionId, uint64(time.Now().Unix()))
 
-		copy(hello.SessionId[8:], realityConfig.ShortID[:])
 		hello.SessionId[0] = 1
 		hello.SessionId[1] = 8
-		hello.SessionId[2] = 2
+		hello.SessionId[2] = 0
+		copy(hello.SessionId[8:], realityConfig.ShortID[:])
 
 		//log.Debugln("REALITY hello.sessionId[:16]: %v", hello.SessionId[:16])
 
@@ -89,14 +84,9 @@ func GetRealityConn(ctx context.Context, conn net.Conn, ClientFingerprint string
 		if err != nil {
 			return nil, err
 		}
-		var aeadCipher cipher.AEAD
-		if aesgcmPreferred(hello.CipherSuites) {
 		aesBlock, _ := aes.NewCipher(authKey)
-			aeadCipher, _ = cipher.NewGCM(aesBlock)
-		} else {
-			aeadCipher, _ = chacha20poly1305.New(authKey)
-		}
-		aeadCipher.Seal(hello.SessionId[:0], hello.Random[20:], hello.SessionId[:16], hello.Raw)
+		aesGcmCipher, _ := cipher.NewGCM(aesBlock)
+		aesGcmCipher.Seal(hello.SessionId[:0], hello.Random[20:], hello.SessionId[:16], hello.Raw)
 		copy(hello.Raw[39:], hello.SessionId)
 		//log.Debugln("REALITY hello.sessionId: %v", hello.SessionId)
 		//log.Debugln("REALITY uConn.AuthKey: %v", authKey)
@@ -106,7 +96,7 @@ func GetRealityConn(ctx context.Context, conn net.Conn, ClientFingerprint string
 			return nil, err
 		}
 
-		log.Debugln("REALITY Authentication: %v, AEAD: %T", verifier.verified, aeadCipher)
+		log.Debugln("REALITY Authentication: %v", verifier.verified)
 
 		if !verifier.verified {
 			go realityClientFallback(uConn, uConfig.ServerName, clientID)
@@ -147,11 +137,11 @@ type realityVerifier struct {
 	verified   bool
 }
 
-var pOffset = utils.MustOK(reflect.TypeOf((*utls.Conn)(nil)).Elem().FieldByName("peerCertificates")).Offset
+var pOffset = utils.MustOK(reflect.TypeOf((*utls.UConn)(nil)).Elem().FieldByName("peerCertificates")).Offset
 
 func (c *realityVerifier) VerifyPeerCertificate(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error {
 	//p, _ := reflect.TypeOf(c.Conn).Elem().FieldByName("peerCertificates")
-	certs := *(*[]*x509.Certificate)(unsafe.Add(unsafe.Pointer(c.Conn), pOffset))
+	certs := *(*[]*x509.Certificate)(unsafe.Pointer(uintptr(unsafe.Pointer(c.Conn)) + pOffset))
 	if pub, ok := certs[0].PublicKey.(ed25519.PublicKey); ok {
 		h := hmac.New(sha512.New, c.authKey)
 		h.Write(pub)

component/trie/domain_set.go

@@ -23,8 +23,6 @@ type DomainSet struct {
 	ranks, selects      []int32
 }
 
-type qElt struct{ s, e, col int }
-
 // NewDomainSet creates a new *DomainSet struct, from a DomainTrie.
 func (t *DomainTrie[T]) NewDomainSet() *DomainSet {
 	reserveDomains := make([]string, 0)
@@ -41,6 +39,7 @@ func (t *DomainTrie[T]) NewDomainSet() *DomainSet {
 	ss := &DomainSet{}
 	lIdx := 0
 
+	type qElt struct{ s, e, col int }
 	queue := []qElt{{0, len(keys), 0}}
 	for i := 0; i < len(queue); i++ {
 		elt := queue[i]