Merge branch 'Alpha' into Meta

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

.github/genReleaseNote.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-while getopts "v:" opt; do
-  case $opt in
-    v)
-      version_range=$OPTARG
-      ;;
-    \?)
-      echo "Invalid option: -$OPTARG" >&2
-      exit 1
-      ;;
-  esac
-done
-
-if [ -z "$version_range" ]; then
-  echo "Please provide the version range using -v option. Example: ./genReleashNote.sh -v v1.14.1...v1.14.2"
-  exit 1
-fi
-
-echo "## What's Changed" > release.md
-git log --pretty=format:"* %h %s by @%an" --grep="^feat" -i $version_range | sort -f | uniq >> release.md
-echo "" >> release.md
-
-echo "## BUG & Fix" >> release.md
-git log --pretty=format:"* %h %s by @%an" --grep="^fix" -i $version_range | sort -f | uniq >> release.md
-echo "" >> release.md
-
-echo "## Maintenance" >> release.md
-git log --pretty=format:"* %h %s by @%an" --grep="^chore\|^docs\|^refactor" -i $version_range | sort -f | uniq >> release.md
-echo "" >> release.md
-
-echo "**Full Changelog**: https://github.com/MetaCubeX/mihomo/compare/$version_range" >> release.md

.github/patch/go1.21.patch

@@ -1,182 +0,0 @@
-Subject: [PATCH] Revert "[release-branch.go1.21] crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
----
-Index: src/crypto/rand/rand.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/crypto/rand/rand.go b/src/crypto/rand/rand.go
---- a/src/crypto/rand/rand.go	(revision 8bba868de983dd7bf55fcd121495ba8d6e2734e7)
-+++ b/src/crypto/rand/rand.go	(revision 7e6c963d81e14ee394402671d4044b2940c8d2c1)
-@@ -15,7 +15,7 @@
- // available, /dev/urandom otherwise.
- // On OpenBSD and macOS, Reader uses getentropy(2).
- // On other Unix-like systems, Reader reads from /dev/urandom.
--// On Windows systems, Reader uses the ProcessPrng API.
-+// On Windows systems, Reader uses the RtlGenRandom API.
- // On JS/Wasm, Reader uses the Web Crypto API.
- // On WASIP1/Wasm, Reader uses random_get from wasi_snapshot_preview1.
- var Reader io.Reader
-Index: src/crypto/rand/rand_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/crypto/rand/rand_windows.go b/src/crypto/rand/rand_windows.go
---- a/src/crypto/rand/rand_windows.go	(revision 8bba868de983dd7bf55fcd121495ba8d6e2734e7)
-+++ b/src/crypto/rand/rand_windows.go	(revision 7e6c963d81e14ee394402671d4044b2940c8d2c1)
-@@ -15,8 +15,11 @@
- 
- type rngReader struct{}
- 
--func (r *rngReader) Read(b []byte) (int, error) {
--	if err := windows.ProcessPrng(b); err != nil {
-+func (r *rngReader) Read(b []byte) (n int, err error) {
-+	// RtlGenRandom only returns 1<<32-1 bytes at a time. We only read at
-+	// most 1<<31-1 bytes at a time so that  this works the same on 32-bit
-+	// and 64-bit systems.
-+	if err := batched(windows.RtlGenRandom, 1<<31-1)(b); err != nil {
- 		return 0, err
- 	}
- 	return len(b), nil
-Index: src/internal/syscall/windows/syscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/internal/syscall/windows/syscall_windows.go b/src/internal/syscall/windows/syscall_windows.go
---- a/src/internal/syscall/windows/syscall_windows.go	(revision 8bba868de983dd7bf55fcd121495ba8d6e2734e7)
-+++ b/src/internal/syscall/windows/syscall_windows.go	(revision 7e6c963d81e14ee394402671d4044b2940c8d2c1)
-@@ -384,7 +384,7 @@
- //sys	DestroyEnvironmentBlock(block *uint16) (err error) = userenv.DestroyEnvironmentBlock
- //sys	CreateEvent(eventAttrs *SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle syscall.Handle, err error) = kernel32.CreateEventW
- 
--//sys	ProcessPrng(buf []byte) (err error) = bcryptprimitives.ProcessPrng
-+//sys	RtlGenRandom(buf []byte) (err error) = advapi32.SystemFunction036
- 
- //sys	RtlLookupFunctionEntry(pc uintptr, baseAddress *uintptr, table *byte) (ret uintptr) = kernel32.RtlLookupFunctionEntry
- //sys	RtlVirtualUnwind(handlerType uint32, baseAddress uintptr, pc uintptr, entry uintptr, ctxt uintptr, data *uintptr, frame *uintptr, ctxptrs *byte) (ret uintptr) = kernel32.RtlVirtualUnwind
-Index: src/internal/syscall/windows/zsyscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/internal/syscall/windows/zsyscall_windows.go b/src/internal/syscall/windows/zsyscall_windows.go
---- a/src/internal/syscall/windows/zsyscall_windows.go	(revision 8bba868de983dd7bf55fcd121495ba8d6e2734e7)
-+++ b/src/internal/syscall/windows/zsyscall_windows.go	(revision 7e6c963d81e14ee394402671d4044b2940c8d2c1)
-@@ -37,14 +37,13 @@
- }
- 
- var (
--	modadvapi32         = syscall.NewLazyDLL(sysdll.Add("advapi32.dll"))
--	modbcryptprimitives = syscall.NewLazyDLL(sysdll.Add("bcryptprimitives.dll"))
--	modiphlpapi         = syscall.NewLazyDLL(sysdll.Add("iphlpapi.dll"))
--	modkernel32         = syscall.NewLazyDLL(sysdll.Add("kernel32.dll"))
--	modnetapi32         = syscall.NewLazyDLL(sysdll.Add("netapi32.dll"))
--	modpsapi            = syscall.NewLazyDLL(sysdll.Add("psapi.dll"))
--	moduserenv          = syscall.NewLazyDLL(sysdll.Add("userenv.dll"))
--	modws2_32           = syscall.NewLazyDLL(sysdll.Add("ws2_32.dll"))
-+	modadvapi32 = syscall.NewLazyDLL(sysdll.Add("advapi32.dll"))
-+	modiphlpapi = syscall.NewLazyDLL(sysdll.Add("iphlpapi.dll"))
-+	modkernel32 = syscall.NewLazyDLL(sysdll.Add("kernel32.dll"))
-+	modnetapi32 = syscall.NewLazyDLL(sysdll.Add("netapi32.dll"))
-+	modpsapi    = syscall.NewLazyDLL(sysdll.Add("psapi.dll"))
-+	moduserenv  = syscall.NewLazyDLL(sysdll.Add("userenv.dll"))
-+	modws2_32   = syscall.NewLazyDLL(sysdll.Add("ws2_32.dll"))
- 
- 	procAdjustTokenPrivileges        = modadvapi32.NewProc("AdjustTokenPrivileges")
- 	procDuplicateTokenEx             = modadvapi32.NewProc("DuplicateTokenEx")
-@@ -53,7 +52,7 @@
- 	procOpenThreadToken              = modadvapi32.NewProc("OpenThreadToken")
- 	procRevertToSelf                 = modadvapi32.NewProc("RevertToSelf")
- 	procSetTokenInformation          = modadvapi32.NewProc("SetTokenInformation")
--	procProcessPrng                  = modbcryptprimitives.NewProc("ProcessPrng")
-+	procSystemFunction036            = modadvapi32.NewProc("SystemFunction036")
- 	procGetAdaptersAddresses         = modiphlpapi.NewProc("GetAdaptersAddresses")
- 	procCreateEventW                 = modkernel32.NewProc("CreateEventW")
- 	procGetACP                       = modkernel32.NewProc("GetACP")
-@@ -149,12 +148,12 @@
- 	return
- }
- 
--func ProcessPrng(buf []byte) (err error) {
-+func RtlGenRandom(buf []byte) (err error) {
- 	var _p0 *byte
- 	if len(buf) > 0 {
- 		_p0 = &buf[0]
- 	}
--	r1, _, e1 := syscall.Syscall(procProcessPrng.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0)
-+	r1, _, e1 := syscall.Syscall(procSystemFunction036.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0)
- 	if r1 == 0 {
- 		err = errnoErr(e1)
- 	}
-Index: src/runtime/os_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/runtime/os_windows.go b/src/runtime/os_windows.go
---- a/src/runtime/os_windows.go	(revision 8bba868de983dd7bf55fcd121495ba8d6e2734e7)
-+++ b/src/runtime/os_windows.go	(revision 7e6c963d81e14ee394402671d4044b2940c8d2c1)
-@@ -127,8 +127,15 @@
- 	_AddVectoredContinueHandler,
- 	_ stdFunction
- 
--	// Use ProcessPrng to generate cryptographically random data.
--	_ProcessPrng stdFunction
-+	// Use RtlGenRandom to generate cryptographically random data.
-+	// This approach has been recommended by Microsoft (see issue
-+	// 15589 for details).
-+	// The RtlGenRandom is not listed in advapi32.dll, instead
-+	// RtlGenRandom function can be found by searching for SystemFunction036.
-+	// Also some versions of Mingw cannot link to SystemFunction036
-+	// when building executable as Cgo. So load SystemFunction036
-+	// manually during runtime startup.
-+	_RtlGenRandom stdFunction
- 
- 	// Load ntdll.dll manually during startup, otherwise Mingw
- 	// links wrong printf function to cgo executable (see issue
-@@ -145,12 +152,12 @@
- )
- 
- var (
--	bcryptprimitivesdll = [...]uint16{'b', 'c', 'r', 'y', 'p', 't', 'p', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', 's', '.', 'd', 'l', 'l', 0}
--	kernel32dll         = [...]uint16{'k', 'e', 'r', 'n', 'e', 'l', '3', '2', '.', 'd', 'l', 'l', 0}
--	ntdlldll            = [...]uint16{'n', 't', 'd', 'l', 'l', '.', 'd', 'l', 'l', 0}
--	powrprofdll         = [...]uint16{'p', 'o', 'w', 'r', 'p', 'r', 'o', 'f', '.', 'd', 'l', 'l', 0}
--	winmmdll            = [...]uint16{'w', 'i', 'n', 'm', 'm', '.', 'd', 'l', 'l', 0}
--	ws2_32dll           = [...]uint16{'w', 's', '2', '_', '3', '2', '.', 'd', 'l', 'l', 0}
-+	advapi32dll = [...]uint16{'a', 'd', 'v', 'a', 'p', 'i', '3', '2', '.', 'd', 'l', 'l', 0}
-+	kernel32dll = [...]uint16{'k', 'e', 'r', 'n', 'e', 'l', '3', '2', '.', 'd', 'l', 'l', 0}
-+	ntdlldll    = [...]uint16{'n', 't', 'd', 'l', 'l', '.', 'd', 'l', 'l', 0}
-+	powrprofdll = [...]uint16{'p', 'o', 'w', 'r', 'p', 'r', 'o', 'f', '.', 'd', 'l', 'l', 0}
-+	winmmdll    = [...]uint16{'w', 'i', 'n', 'm', 'm', '.', 'd', 'l', 'l', 0}
-+	ws2_32dll   = [...]uint16{'w', 's', '2', '_', '3', '2', '.', 'd', 'l', 'l', 0}
- )
- 
- // Function to be called by windows CreateThread
-@@ -249,11 +256,11 @@
- 	}
- 	_AddVectoredContinueHandler = windowsFindfunc(k32, []byte("AddVectoredContinueHandler\000"))
- 
--	bcryptPrimitives := windowsLoadSystemLib(bcryptprimitivesdll[:])
--	if bcryptPrimitives == 0 {
--		throw("bcryptprimitives.dll not found")
-+	a32 := windowsLoadSystemLib(advapi32dll[:])
-+	if a32 == 0 {
-+		throw("advapi32.dll not found")
- 	}
--	_ProcessPrng = windowsFindfunc(bcryptPrimitives, []byte("ProcessPrng\000"))
-+	_RtlGenRandom = windowsFindfunc(a32, []byte("SystemFunction036\000"))
- 
- 	n32 := windowsLoadSystemLib(ntdlldll[:])
- 	if n32 == 0 {
-@@ -610,7 +617,7 @@
- //go:nosplit
- func getRandomData(r []byte) {
- 	n := 0
--	if stdcall2(_ProcessPrng, uintptr(unsafe.Pointer(&r[0])), uintptr(len(r)))&0xff != 0 {
-+	if stdcall2(_RtlGenRandom, uintptr(unsafe.Pointer(&r[0])), uintptr(len(r)))&0xff != 0 {
- 		n = len(r)
- 	}
- 	extendRandom(r, n)

.github/patch/go1.22.patch

@@ -1,645 +0,0 @@
-Subject: [PATCH] Revert "runtime: always use LoadLibraryEx to load system libraries"
-Revert "syscall: remove Windows 7 console handle workaround"
-Revert "net: remove sysSocket fallback for Windows 7"
-Revert "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
----
-Index: src/crypto/rand/rand.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/crypto/rand/rand.go b/src/crypto/rand/rand.go
---- a/src/crypto/rand/rand.go	(revision cb4eee693c382bea4222f20837e26501d40ed892)
-+++ b/src/crypto/rand/rand.go	(revision 9779155f18b6556a034f7bb79fb7fb2aad1e26a9)
-@@ -15,7 +15,7 @@
- // available, /dev/urandom otherwise.
- // On OpenBSD and macOS, Reader uses getentropy(2).
- // On other Unix-like systems, Reader reads from /dev/urandom.
--// On Windows systems, Reader uses the ProcessPrng API.
-+// On Windows systems, Reader uses the RtlGenRandom API.
- // On JS/Wasm, Reader uses the Web Crypto API.
- // On WASIP1/Wasm, Reader uses random_get from wasi_snapshot_preview1.
- var Reader io.Reader
-Index: src/crypto/rand/rand_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/crypto/rand/rand_windows.go b/src/crypto/rand/rand_windows.go
---- a/src/crypto/rand/rand_windows.go	(revision cb4eee693c382bea4222f20837e26501d40ed892)
-+++ b/src/crypto/rand/rand_windows.go	(revision 9779155f18b6556a034f7bb79fb7fb2aad1e26a9)
-@@ -15,8 +15,11 @@
- 
- type rngReader struct{}
- 
--func (r *rngReader) Read(b []byte) (int, error) {
--	if err := windows.ProcessPrng(b); err != nil {
-+func (r *rngReader) Read(b []byte) (n int, err error) {
-+	// RtlGenRandom only returns 1<<32-1 bytes at a time. We only read at
-+	// most 1<<31-1 bytes at a time so that  this works the same on 32-bit
-+	// and 64-bit systems.
-+	if err := batched(windows.RtlGenRandom, 1<<31-1)(b); err != nil {
- 		return 0, err
- 	}
- 	return len(b), nil
-Index: src/internal/syscall/windows/syscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/internal/syscall/windows/syscall_windows.go b/src/internal/syscall/windows/syscall_windows.go
---- a/src/internal/syscall/windows/syscall_windows.go	(revision cb4eee693c382bea4222f20837e26501d40ed892)
-+++ b/src/internal/syscall/windows/syscall_windows.go	(revision 9779155f18b6556a034f7bb79fb7fb2aad1e26a9)
-@@ -384,7 +384,7 @@
- //sys	DestroyEnvironmentBlock(block *uint16) (err error) = userenv.DestroyEnvironmentBlock
- //sys	CreateEvent(eventAttrs *SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle syscall.Handle, err error) = kernel32.CreateEventW
- 
--//sys	ProcessPrng(buf []byte) (err error) = bcryptprimitives.ProcessPrng
-+//sys	RtlGenRandom(buf []byte) (err error) = advapi32.SystemFunction036
- 
- type FILE_ID_BOTH_DIR_INFO struct {
- 	NextEntryOffset uint32
-Index: src/internal/syscall/windows/zsyscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/internal/syscall/windows/zsyscall_windows.go b/src/internal/syscall/windows/zsyscall_windows.go
---- a/src/internal/syscall/windows/zsyscall_windows.go	(revision cb4eee693c382bea4222f20837e26501d40ed892)
-+++ b/src/internal/syscall/windows/zsyscall_windows.go	(revision 9779155f18b6556a034f7bb79fb7fb2aad1e26a9)
-@@ -37,14 +37,13 @@
- }
- 
- var (
--	modadvapi32         = syscall.NewLazyDLL(sysdll.Add("advapi32.dll"))
--	modbcryptprimitives = syscall.NewLazyDLL(sysdll.Add("bcryptprimitives.dll"))
--	modiphlpapi         = syscall.NewLazyDLL(sysdll.Add("iphlpapi.dll"))
--	modkernel32         = syscall.NewLazyDLL(sysdll.Add("kernel32.dll"))
--	modnetapi32         = syscall.NewLazyDLL(sysdll.Add("netapi32.dll"))
--	modpsapi            = syscall.NewLazyDLL(sysdll.Add("psapi.dll"))
--	moduserenv          = syscall.NewLazyDLL(sysdll.Add("userenv.dll"))
--	modws2_32           = syscall.NewLazyDLL(sysdll.Add("ws2_32.dll"))
-+	modadvapi32 = syscall.NewLazyDLL(sysdll.Add("advapi32.dll"))
-+	modiphlpapi = syscall.NewLazyDLL(sysdll.Add("iphlpapi.dll"))
-+	modkernel32 = syscall.NewLazyDLL(sysdll.Add("kernel32.dll"))
-+	modnetapi32 = syscall.NewLazyDLL(sysdll.Add("netapi32.dll"))
-+	modpsapi    = syscall.NewLazyDLL(sysdll.Add("psapi.dll"))
-+	moduserenv  = syscall.NewLazyDLL(sysdll.Add("userenv.dll"))
-+	modws2_32   = syscall.NewLazyDLL(sysdll.Add("ws2_32.dll"))
- 
- 	procAdjustTokenPrivileges             = modadvapi32.NewProc("AdjustTokenPrivileges")
- 	procDuplicateTokenEx                  = modadvapi32.NewProc("DuplicateTokenEx")
-@@ -56,7 +55,7 @@
- 	procQueryServiceStatus                = modadvapi32.NewProc("QueryServiceStatus")
- 	procRevertToSelf                      = modadvapi32.NewProc("RevertToSelf")
- 	procSetTokenInformation               = modadvapi32.NewProc("SetTokenInformation")
--	procProcessPrng                       = modbcryptprimitives.NewProc("ProcessPrng")
-+	procSystemFunction036                 = modadvapi32.NewProc("SystemFunction036")
- 	procGetAdaptersAddresses              = modiphlpapi.NewProc("GetAdaptersAddresses")
- 	procCreateEventW                      = modkernel32.NewProc("CreateEventW")
- 	procGetACP                            = modkernel32.NewProc("GetACP")
-@@ -180,12 +179,12 @@
- 	return
- }
- 
--func ProcessPrng(buf []byte) (err error) {
-+func RtlGenRandom(buf []byte) (err error) {
- 	var _p0 *byte
- 	if len(buf) > 0 {
- 		_p0 = &buf[0]
- 	}
--	r1, _, e1 := syscall.Syscall(procProcessPrng.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0)
-+	r1, _, e1 := syscall.Syscall(procSystemFunction036.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0)
- 	if r1 == 0 {
- 		err = errnoErr(e1)
- 	}
-Index: src/runtime/os_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/runtime/os_windows.go b/src/runtime/os_windows.go
---- a/src/runtime/os_windows.go	(revision cb4eee693c382bea4222f20837e26501d40ed892)
-+++ b/src/runtime/os_windows.go	(revision 83ff9782e024cb328b690cbf0da4e7848a327f4f)
-@@ -40,8 +40,8 @@
- //go:cgo_import_dynamic runtime._GetSystemInfo GetSystemInfo%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._GetThreadContext GetThreadContext%2 "kernel32.dll"
- //go:cgo_import_dynamic runtime._SetThreadContext SetThreadContext%2 "kernel32.dll"
--//go:cgo_import_dynamic runtime._LoadLibraryExW LoadLibraryExW%3 "kernel32.dll"
- //go:cgo_import_dynamic runtime._LoadLibraryW LoadLibraryW%1 "kernel32.dll"
-+//go:cgo_import_dynamic runtime._LoadLibraryA LoadLibraryA%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._PostQueuedCompletionStatus PostQueuedCompletionStatus%4 "kernel32.dll"
- //go:cgo_import_dynamic runtime._QueryPerformanceCounter QueryPerformanceCounter%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._RaiseFailFastException RaiseFailFastException%3 "kernel32.dll"
-@@ -74,7 +74,6 @@
- 	// Following syscalls are available on every Windows PC.
- 	// All these variables are set by the Windows executable
- 	// loader before the Go program starts.
--	_AddVectoredContinueHandler,
- 	_AddVectoredExceptionHandler,
- 	_CloseHandle,
- 	_CreateEventA,
-@@ -98,8 +97,8 @@
- 	_GetSystemInfo,
- 	_GetThreadContext,
- 	_SetThreadContext,
--	_LoadLibraryExW,
- 	_LoadLibraryW,
-+	_LoadLibraryA,
- 	_PostQueuedCompletionStatus,
- 	_QueryPerformanceCounter,
- 	_RaiseFailFastException,
-@@ -127,8 +126,23 @@
- 	_WriteFile,
- 	_ stdFunction
- 
--	// Use ProcessPrng to generate cryptographically random data.
--	_ProcessPrng stdFunction
-+	// Following syscalls are only available on some Windows PCs.
-+	// We will load syscalls, if available, before using them.
-+	_AddDllDirectory,
-+	_AddVectoredContinueHandler,
-+	_LoadLibraryExA,
-+	_LoadLibraryExW,
-+	_ stdFunction
-+
-+	// Use RtlGenRandom to generate cryptographically random data.
-+	// This approach has been recommended by Microsoft (see issue
-+	// 15589 for details).
-+	// The RtlGenRandom is not listed in advapi32.dll, instead
-+	// RtlGenRandom function can be found by searching for SystemFunction036.
-+	// Also some versions of Mingw cannot link to SystemFunction036
-+	// when building executable as Cgo. So load SystemFunction036
-+	// manually during runtime startup.
-+	_RtlGenRandom stdFunction
- 
- 	// Load ntdll.dll manually during startup, otherwise Mingw
- 	// links wrong printf function to cgo executable (see issue
-@@ -143,14 +157,6 @@
- 	_ stdFunction
- )
- 
--var (
--	bcryptprimitivesdll = [...]uint16{'b', 'c', 'r', 'y', 'p', 't', 'p', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', 's', '.', 'd', 'l', 'l', 0}
--	ntdlldll            = [...]uint16{'n', 't', 'd', 'l', 'l', '.', 'd', 'l', 'l', 0}
--	powrprofdll         = [...]uint16{'p', 'o', 'w', 'r', 'p', 'r', 'o', 'f', '.', 'd', 'l', 'l', 0}
--	winmmdll            = [...]uint16{'w', 'i', 'n', 'm', 'm', '.', 'd', 'l', 'l', 0}
--	ws2_32dll           = [...]uint16{'w', 's', '2', '_', '3', '2', '.', 'd', 'l', 'l', 0}
--)
--
- // Function to be called by windows CreateThread
- // to start new os thread.
- func tstart_stdcall(newm *m)
-@@ -239,25 +245,51 @@
- 	return unsafe.String(&sysDirectory[0], sysDirectoryLen)
- }
- 
--func windowsLoadSystemLib(name []uint16) uintptr {
--	return stdcall3(_LoadLibraryExW, uintptr(unsafe.Pointer(&name[0])), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+//go:linkname syscall_getSystemDirectory syscall.getSystemDirectory
-+func syscall_getSystemDirectory() string {
-+	return unsafe.String(&sysDirectory[0], sysDirectoryLen)
-+}
-+
-+func windowsLoadSystemLib(name []byte) uintptr {
-+	if useLoadLibraryEx {
-+		return stdcall3(_LoadLibraryExA, uintptr(unsafe.Pointer(&name[0])), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+	} else {
-+		absName := append(sysDirectory[:sysDirectoryLen], name...)
-+		return stdcall1(_LoadLibraryA, uintptr(unsafe.Pointer(&absName[0])))
-+	}
- }
- 
- func loadOptionalSyscalls() {
--	bcryptPrimitives := windowsLoadSystemLib(bcryptprimitivesdll[:])
--	if bcryptPrimitives == 0 {
--		throw("bcryptprimitives.dll not found")
-+	var kernel32dll = []byte("kernel32.dll\000")
-+	k32 := stdcall1(_LoadLibraryA, uintptr(unsafe.Pointer(&kernel32dll[0])))
-+	if k32 == 0 {
-+		throw("kernel32.dll not found")
- 	}
--	_ProcessPrng = windowsFindfunc(bcryptPrimitives, []byte("ProcessPrng\000"))
-+	_AddDllDirectory = windowsFindfunc(k32, []byte("AddDllDirectory\000"))
-+	_AddVectoredContinueHandler = windowsFindfunc(k32, []byte("AddVectoredContinueHandler\000"))
-+	_LoadLibraryExA = windowsFindfunc(k32, []byte("LoadLibraryExA\000"))
-+	_LoadLibraryExW = windowsFindfunc(k32, []byte("LoadLibraryExW\000"))
-+	useLoadLibraryEx = (_LoadLibraryExW != nil && _LoadLibraryExA != nil && _AddDllDirectory != nil)
-+
-+	initSysDirectory()
- 
--	n32 := windowsLoadSystemLib(ntdlldll[:])
-+	var advapi32dll = []byte("advapi32.dll\000")
-+	a32 := windowsLoadSystemLib(advapi32dll)
-+	if a32 == 0 {
-+		throw("advapi32.dll not found")
-+	}
-+	_RtlGenRandom = windowsFindfunc(a32, []byte("SystemFunction036\000"))
-+
-+	var ntdll = []byte("ntdll.dll\000")
-+	n32 := windowsLoadSystemLib(ntdll)
- 	if n32 == 0 {
- 		throw("ntdll.dll not found")
- 	}
- 	_RtlGetCurrentPeb = windowsFindfunc(n32, []byte("RtlGetCurrentPeb\000"))
- 	_RtlGetNtVersionNumbers = windowsFindfunc(n32, []byte("RtlGetNtVersionNumbers\000"))
- 
--	m32 := windowsLoadSystemLib(winmmdll[:])
-+	var winmmdll = []byte("winmm.dll\000")
-+	m32 := windowsLoadSystemLib(winmmdll)
- 	if m32 == 0 {
- 		throw("winmm.dll not found")
- 	}
-@@ -267,7 +299,8 @@
- 		throw("timeBegin/EndPeriod not found")
- 	}
- 
--	ws232 := windowsLoadSystemLib(ws2_32dll[:])
-+	var ws232dll = []byte("ws2_32.dll\000")
-+	ws232 := windowsLoadSystemLib(ws232dll)
- 	if ws232 == 0 {
- 		throw("ws2_32.dll not found")
- 	}
-@@ -286,7 +319,7 @@
- 		context  uintptr
- 	}
- 
--	powrprof := windowsLoadSystemLib(powrprofdll[:])
-+	powrprof := windowsLoadSystemLib([]byte("powrprof.dll\000"))
- 	if powrprof == 0 {
- 		return // Running on Windows 7, where we don't need it anyway.
- 	}
-@@ -360,6 +393,22 @@
- // in sys_windows_386.s and sys_windows_amd64.s:
- func getlasterror() uint32
- 
-+// When loading DLLs, we prefer to use LoadLibraryEx with
-+// LOAD_LIBRARY_SEARCH_* flags, if available. LoadLibraryEx is not
-+// available on old Windows, though, and the LOAD_LIBRARY_SEARCH_*
-+// flags are not available on some versions of Windows without a
-+// security patch.
-+//
-+// https://msdn.microsoft.com/en-us/library/ms684179(v=vs.85).aspx says:
-+// "Windows 7, Windows Server 2008 R2, Windows Vista, and Windows
-+// Server 2008: The LOAD_LIBRARY_SEARCH_* flags are available on
-+// systems that have KB2533623 installed. To determine whether the
-+// flags are available, use GetProcAddress to get the address of the
-+// AddDllDirectory, RemoveDllDirectory, or SetDefaultDllDirectories
-+// function. If GetProcAddress succeeds, the LOAD_LIBRARY_SEARCH_*
-+// flags can be used with LoadLibraryEx."
-+var useLoadLibraryEx bool
-+
- var timeBeginPeriodRetValue uint32
- 
- // osRelaxMinNS indicates that sysmon shouldn't osRelax if the next
-@@ -507,7 +556,6 @@
- 	initHighResTimer()
- 	timeBeginPeriodRetValue = osRelax(false)
- 
--	initSysDirectory()
- 	initLongPathSupport()
- 
- 	ncpu = getproccount()
-@@ -524,7 +572,7 @@
- //go:nosplit
- func readRandom(r []byte) int {
- 	n := 0
--	if stdcall2(_ProcessPrng, uintptr(unsafe.Pointer(&r[0])), uintptr(len(r)))&0xff != 0 {
-+	if stdcall2(_RtlGenRandom, uintptr(unsafe.Pointer(&r[0])), uintptr(len(r)))&0xff != 0 {
- 		n = len(r)
- 	}
- 	return n
-Index: src/net/hook_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/hook_windows.go b/src/net/hook_windows.go
---- a/src/net/hook_windows.go	(revision 9779155f18b6556a034f7bb79fb7fb2aad1e26a9)
-+++ b/src/net/hook_windows.go	(revision ef0606261340e608017860b423ffae5c1ce78239)
-@@ -13,6 +13,7 @@
- 	hostsFilePath = windows.GetSystemDirectory() + "/Drivers/etc/hosts"
- 
- 	// Placeholders for socket system calls.
-+	socketFunc    func(int, int, int) (syscall.Handle, error)                                                 = syscall.Socket
- 	wsaSocketFunc func(int32, int32, int32, *syscall.WSAProtocolInfo, uint32, uint32) (syscall.Handle, error) = windows.WSASocket
- 	connectFunc   func(syscall.Handle, syscall.Sockaddr) error                                                = syscall.Connect
- 	listenFunc    func(syscall.Handle, int) error                                                             = syscall.Listen
-Index: src/net/internal/socktest/main_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/main_test.go b/src/net/internal/socktest/main_test.go
---- a/src/net/internal/socktest/main_test.go	(revision 9779155f18b6556a034f7bb79fb7fb2aad1e26a9)
-+++ b/src/net/internal/socktest/main_test.go	(revision ef0606261340e608017860b423ffae5c1ce78239)
-@@ -2,7 +2,7 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
- 
--//go:build !js && !plan9 && !wasip1 && !windows
-+//go:build !js && !plan9 && !wasip1
- 
- package socktest_test
- 
-Index: src/net/internal/socktest/main_windows_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/main_windows_test.go b/src/net/internal/socktest/main_windows_test.go
-new file mode 100644
---- /dev/null	(revision ef0606261340e608017860b423ffae5c1ce78239)
-+++ b/src/net/internal/socktest/main_windows_test.go	(revision ef0606261340e608017860b423ffae5c1ce78239)
-@@ -0,0 +1,22 @@
-+// Copyright 2015 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 socktest_test
-+
-+import "syscall"
-+
-+var (
-+	socketFunc func(int, int, int) (syscall.Handle, error)
-+	closeFunc  func(syscall.Handle) error
-+)
-+
-+func installTestHooks() {
-+	socketFunc = sw.Socket
-+	closeFunc = sw.Closesocket
-+}
-+
-+func uninstallTestHooks() {
-+	socketFunc = syscall.Socket
-+	closeFunc = syscall.Closesocket
-+}
-Index: src/net/internal/socktest/sys_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/sys_windows.go b/src/net/internal/socktest/sys_windows.go
---- a/src/net/internal/socktest/sys_windows.go	(revision 9779155f18b6556a034f7bb79fb7fb2aad1e26a9)
-+++ b/src/net/internal/socktest/sys_windows.go	(revision ef0606261340e608017860b423ffae5c1ce78239)
-@@ -9,6 +9,38 @@
- 	"syscall"
- )
- 
-+// Socket wraps [syscall.Socket].
-+func (sw *Switch) Socket(family, sotype, proto int) (s syscall.Handle, err error) {
-+	sw.once.Do(sw.init)
-+
-+	so := &Status{Cookie: cookie(family, sotype, proto)}
-+	sw.fmu.RLock()
-+	f, _ := sw.fltab[FilterSocket]
-+	sw.fmu.RUnlock()
-+
-+	af, err := f.apply(so)
-+	if err != nil {
-+		return syscall.InvalidHandle, err
-+	}
-+	s, so.Err = syscall.Socket(family, sotype, proto)
-+	if err = af.apply(so); err != nil {
-+		if so.Err == nil {
-+			syscall.Closesocket(s)
-+		}
-+		return syscall.InvalidHandle, err
-+	}
-+
-+	sw.smu.Lock()
-+	defer sw.smu.Unlock()
-+	if so.Err != nil {
-+		sw.stats.getLocked(so.Cookie).OpenFailed++
-+		return syscall.InvalidHandle, so.Err
-+	}
-+	nso := sw.addLocked(s, family, sotype, proto)
-+	sw.stats.getLocked(nso.Cookie).Opened++
-+	return s, nil
-+}
-+
- // WSASocket wraps [syscall.WSASocket].
- func (sw *Switch) WSASocket(family, sotype, proto int32, protinfo *syscall.WSAProtocolInfo, group uint32, flags uint32) (s syscall.Handle, err error) {
- 	sw.once.Do(sw.init)
-Index: src/net/main_windows_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/main_windows_test.go b/src/net/main_windows_test.go
---- a/src/net/main_windows_test.go	(revision 9779155f18b6556a034f7bb79fb7fb2aad1e26a9)
-+++ b/src/net/main_windows_test.go	(revision ef0606261340e608017860b423ffae5c1ce78239)
-@@ -8,6 +8,7 @@
- 
- var (
- 	// Placeholders for saving original socket system calls.
-+	origSocket      = socketFunc
- 	origWSASocket   = wsaSocketFunc
- 	origClosesocket = poll.CloseFunc
- 	origConnect     = connectFunc
-@@ -17,6 +18,7 @@
- )
- 
- func installTestHooks() {
-+	socketFunc = sw.Socket
- 	wsaSocketFunc = sw.WSASocket
- 	poll.CloseFunc = sw.Closesocket
- 	connectFunc = sw.Connect
-@@ -26,6 +28,7 @@
- }
- 
- func uninstallTestHooks() {
-+	socketFunc = origSocket
- 	wsaSocketFunc = origWSASocket
- 	poll.CloseFunc = origClosesocket
- 	connectFunc = origConnect
-Index: src/net/sock_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/sock_windows.go b/src/net/sock_windows.go
---- a/src/net/sock_windows.go	(revision 9779155f18b6556a034f7bb79fb7fb2aad1e26a9)
-+++ b/src/net/sock_windows.go	(revision ef0606261340e608017860b423ffae5c1ce78239)
-@@ -20,6 +20,21 @@
- func sysSocket(family, sotype, proto int) (syscall.Handle, error) {
- 	s, err := wsaSocketFunc(int32(family), int32(sotype), int32(proto),
- 		nil, 0, windows.WSA_FLAG_OVERLAPPED|windows.WSA_FLAG_NO_HANDLE_INHERIT)
-+	if err == nil {
-+		return s, nil
-+	}
-+	// WSA_FLAG_NO_HANDLE_INHERIT flag is not supported on some
-+	// old versions of Windows, see
-+	// https://msdn.microsoft.com/en-us/library/windows/desktop/ms742212(v=vs.85).aspx
-+	// for details. Just use syscall.Socket, if windows.WSASocket failed.
-+
-+	// See ../syscall/exec_unix.go for description of ForkLock.
-+	syscall.ForkLock.RLock()
-+	s, err = socketFunc(family, sotype, proto)
-+	if err == nil {
-+		syscall.CloseOnExec(s)
-+	}
-+	syscall.ForkLock.RUnlock()
- 	if err != nil {
- 		return syscall.InvalidHandle, os.NewSyscallError("socket", err)
- 	}
-Index: src/syscall/exec_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/syscall/exec_windows.go b/src/syscall/exec_windows.go
---- a/src/syscall/exec_windows.go	(revision 9779155f18b6556a034f7bb79fb7fb2aad1e26a9)
-+++ b/src/syscall/exec_windows.go	(revision 7f83badcb925a7e743188041cb6e561fc9b5b642)
-@@ -14,7 +14,6 @@
- 	"unsafe"
- )
- 
--// ForkLock is not used on Windows.
- var ForkLock sync.RWMutex
- 
- // EscapeArg rewrites command line argument s as prescribed
-@@ -317,6 +316,17 @@
- 		}
- 	}
- 
-+	var maj, min, build uint32
-+	rtlGetNtVersionNumbers(&maj, &min, &build)
-+	isWin7 := maj < 6 || (maj == 6 && min <= 1)
-+	// NT kernel handles are divisible by 4, with the bottom 3 bits left as
-+	// a tag. The fully set tag correlates with the types of handles we're
-+	// concerned about here.  Except, the kernel will interpret some
-+	// special handle values, like -1, -2, and so forth, so kernelbase.dll
-+	// checks to see that those bottom three bits are checked, but that top
-+	// bit is not checked.
-+	isLegacyWin7ConsoleHandle := func(handle Handle) bool { return isWin7 && handle&0x10000003 == 3 }
-+
- 	p, _ := GetCurrentProcess()
- 	parentProcess := p
- 	if sys.ParentProcess != 0 {
-@@ -325,7 +335,15 @@
- 	fd := make([]Handle, len(attr.Files))
- 	for i := range attr.Files {
- 		if attr.Files[i] > 0 {
--			err := DuplicateHandle(p, Handle(attr.Files[i]), parentProcess, &fd[i], 0, true, DUPLICATE_SAME_ACCESS)
-+			destinationProcessHandle := parentProcess
-+
-+			// On Windows 7, console handles aren't real handles, and can only be duplicated
-+			// into the current process, not a parent one, which amounts to the same thing.
-+			if parentProcess != p && isLegacyWin7ConsoleHandle(Handle(attr.Files[i])) {
-+				destinationProcessHandle = p
-+			}
-+
-+			err := DuplicateHandle(p, Handle(attr.Files[i]), destinationProcessHandle, &fd[i], 0, true, DUPLICATE_SAME_ACCESS)
- 			if err != nil {
- 				return 0, 0, err
- 			}
-@@ -356,6 +374,14 @@
- 
- 	fd = append(fd, sys.AdditionalInheritedHandles...)
- 
-+	// On Windows 7, console handles aren't real handles, so don't pass them
-+	// through to PROC_THREAD_ATTRIBUTE_HANDLE_LIST.
-+	for i := range fd {
-+		if isLegacyWin7ConsoleHandle(fd[i]) {
-+			fd[i] = 0
-+		}
-+	}
-+
- 	// The presence of a NULL handle in the list is enough to cause PROC_THREAD_ATTRIBUTE_HANDLE_LIST
- 	// to treat the entire list as empty, so remove NULL handles.
- 	j := 0
-Index: src/runtime/syscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/runtime/syscall_windows.go b/src/runtime/syscall_windows.go
---- a/src/runtime/syscall_windows.go	(revision 7f83badcb925a7e743188041cb6e561fc9b5b642)
-+++ b/src/runtime/syscall_windows.go	(revision 83ff9782e024cb328b690cbf0da4e7848a327f4f)
-@@ -413,23 +413,36 @@
- 
- const _LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800
- 
-+// When available, this function will use LoadLibraryEx with the filename
-+// parameter and the important SEARCH_SYSTEM32 argument. But on systems that
-+// do not have that option, absoluteFilepath should contain a fallback
-+// to the full path inside of system32 for use with vanilla LoadLibrary.
-+//
- //go:linkname syscall_loadsystemlibrary syscall.loadsystemlibrary
- //go:nosplit
- //go:cgo_unsafe_args
--func syscall_loadsystemlibrary(filename *uint16) (handle, err uintptr) {
-+func syscall_loadsystemlibrary(filename *uint16, absoluteFilepath *uint16) (handle, err uintptr) {
- 	lockOSThread()
- 	c := &getg().m.syscall
--	c.fn = getLoadLibraryEx()
--	c.n = 3
--	args := struct {
--		lpFileName *uint16
--		hFile      uintptr // always 0
--		flags      uint32
--	}{filename, 0, _LOAD_LIBRARY_SEARCH_SYSTEM32}
--	c.args = uintptr(noescape(unsafe.Pointer(&args)))
-+
-+	if useLoadLibraryEx {
-+		c.fn = getLoadLibraryEx()
-+		c.n = 3
-+		args := struct {
-+			lpFileName *uint16
-+			hFile      uintptr // always 0
-+			flags      uint32
-+		}{filename, 0, _LOAD_LIBRARY_SEARCH_SYSTEM32}
-+		c.args = uintptr(noescape(unsafe.Pointer(&args)))
-+	} else {
-+		c.fn = getLoadLibrary()
-+		c.n = 1
-+		c.args = uintptr(noescape(unsafe.Pointer(&absoluteFilepath)))
-+	}
- 
- 	cgocall(asmstdcallAddr, unsafe.Pointer(c))
- 	KeepAlive(filename)
-+	KeepAlive(absoluteFilepath)
- 	handle = c.r1
- 	if handle == 0 {
- 		err = c.err
-Index: src/syscall/dll_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/syscall/dll_windows.go b/src/syscall/dll_windows.go
---- a/src/syscall/dll_windows.go	(revision 7f83badcb925a7e743188041cb6e561fc9b5b642)
-+++ b/src/syscall/dll_windows.go	(revision 83ff9782e024cb328b690cbf0da4e7848a327f4f)
-@@ -44,7 +44,7 @@
- 
- func SyscallN(trap uintptr, args ...uintptr) (r1, r2 uintptr, err Errno)
- func loadlibrary(filename *uint16) (handle uintptr, err Errno)
--func loadsystemlibrary(filename *uint16) (handle uintptr, err Errno)
-+func loadsystemlibrary(filename *uint16, absoluteFilepath *uint16) (handle uintptr, err Errno)
- func getprocaddress(handle uintptr, procname *uint8) (proc uintptr, err Errno)
- 
- // A DLL implements access to a single DLL.
-@@ -53,6 +53,9 @@
- 	Handle Handle
- }
- 
-+//go:linkname getSystemDirectory
-+func getSystemDirectory() string // Implemented in runtime package.
-+
- // LoadDLL loads the named DLL file into memory.
- //
- // If name is not an absolute path and is not a known system DLL used by
-@@ -69,7 +72,11 @@
- 	var h uintptr
- 	var e Errno
- 	if sysdll.IsSystemDLL[name] {
--		h, e = loadsystemlibrary(namep)
-+		absoluteFilepathp, err := UTF16PtrFromString(getSystemDirectory() + name)
-+		if err != nil {
-+			return nil, err
-+		}
-+		h, e = loadsystemlibrary(namep, absoluteFilepathp)
- 	} else {
- 		h, e = loadlibrary(namep)
- 	}

.github/patch/go1.23.patch

@@ -1,643 +0,0 @@
-Subject: [PATCH] Revert "runtime: always use LoadLibraryEx to load system libraries"
-Revert "syscall: remove Windows 7 console handle workaround"
-Revert "net: remove sysSocket fallback for Windows 7"
-Revert "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
----
-Index: src/crypto/rand/rand.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/crypto/rand/rand.go b/src/crypto/rand/rand.go
---- a/src/crypto/rand/rand.go	(revision 6885bad7dd86880be6929c02085e5c7a67ff2887)
-+++ b/src/crypto/rand/rand.go	(revision 9ac42137ef6730e8b7daca016ece831297a1d75b)
-@@ -16,7 +16,7 @@
- //   - On macOS and iOS, Reader uses arc4random_buf(3).
- //   - On OpenBSD and NetBSD, Reader uses getentropy(2).
- //   - On other Unix-like systems, Reader reads from /dev/urandom.
--//   - On Windows, Reader uses the ProcessPrng API.
-+//   - On Windows systems, Reader uses the RtlGenRandom API.
- //   - On js/wasm, Reader uses the Web Crypto API.
- //   - On wasip1/wasm, Reader uses random_get from wasi_snapshot_preview1.
- var Reader io.Reader
-Index: src/crypto/rand/rand_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/crypto/rand/rand_windows.go b/src/crypto/rand/rand_windows.go
---- a/src/crypto/rand/rand_windows.go	(revision 6885bad7dd86880be6929c02085e5c7a67ff2887)
-+++ b/src/crypto/rand/rand_windows.go	(revision 9ac42137ef6730e8b7daca016ece831297a1d75b)
-@@ -15,8 +15,11 @@
- 
- type rngReader struct{}
- 
--func (r *rngReader) Read(b []byte) (int, error) {
--	if err := windows.ProcessPrng(b); err != nil {
-+func (r *rngReader) Read(b []byte) (n int, err error) {
-+	// RtlGenRandom only returns 1<<32-1 bytes at a time. We only read at
-+	// most 1<<31-1 bytes at a time so that  this works the same on 32-bit
-+	// and 64-bit systems.
-+	if err := batched(windows.RtlGenRandom, 1<<31-1)(b); err != nil {
- 		return 0, err
- 	}
- 	return len(b), nil
-Index: src/internal/syscall/windows/syscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/internal/syscall/windows/syscall_windows.go b/src/internal/syscall/windows/syscall_windows.go
---- a/src/internal/syscall/windows/syscall_windows.go	(revision 6885bad7dd86880be6929c02085e5c7a67ff2887)
-+++ b/src/internal/syscall/windows/syscall_windows.go	(revision 9ac42137ef6730e8b7daca016ece831297a1d75b)
-@@ -414,7 +414,7 @@
- //sys	DestroyEnvironmentBlock(block *uint16) (err error) = userenv.DestroyEnvironmentBlock
- //sys	CreateEvent(eventAttrs *SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle syscall.Handle, err error) = kernel32.CreateEventW
- 
--//sys	ProcessPrng(buf []byte) (err error) = bcryptprimitives.ProcessPrng
-+//sys	RtlGenRandom(buf []byte) (err error) = advapi32.SystemFunction036
- 
- type FILE_ID_BOTH_DIR_INFO struct {
- 	NextEntryOffset uint32
-Index: src/internal/syscall/windows/zsyscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/internal/syscall/windows/zsyscall_windows.go b/src/internal/syscall/windows/zsyscall_windows.go
---- a/src/internal/syscall/windows/zsyscall_windows.go	(revision 6885bad7dd86880be6929c02085e5c7a67ff2887)
-+++ b/src/internal/syscall/windows/zsyscall_windows.go	(revision 9ac42137ef6730e8b7daca016ece831297a1d75b)
-@@ -38,7 +38,6 @@
- 
- var (
- 	modadvapi32         = syscall.NewLazyDLL(sysdll.Add("advapi32.dll"))
--	modbcryptprimitives = syscall.NewLazyDLL(sysdll.Add("bcryptprimitives.dll"))
- 	modiphlpapi         = syscall.NewLazyDLL(sysdll.Add("iphlpapi.dll"))
- 	modkernel32         = syscall.NewLazyDLL(sysdll.Add("kernel32.dll"))
- 	modnetapi32         = syscall.NewLazyDLL(sysdll.Add("netapi32.dll"))
-@@ -57,7 +56,7 @@
- 	procQueryServiceStatus                = modadvapi32.NewProc("QueryServiceStatus")
- 	procRevertToSelf                      = modadvapi32.NewProc("RevertToSelf")
- 	procSetTokenInformation               = modadvapi32.NewProc("SetTokenInformation")
--	procProcessPrng                       = modbcryptprimitives.NewProc("ProcessPrng")
-+	procSystemFunction036                 = modadvapi32.NewProc("SystemFunction036")
- 	procGetAdaptersAddresses              = modiphlpapi.NewProc("GetAdaptersAddresses")
- 	procCreateEventW                      = modkernel32.NewProc("CreateEventW")
- 	procGetACP                            = modkernel32.NewProc("GetACP")
-@@ -183,12 +182,12 @@
- 	return
- }
- 
--func ProcessPrng(buf []byte) (err error) {
-+func RtlGenRandom(buf []byte) (err error) {
- 	var _p0 *byte
- 	if len(buf) > 0 {
- 		_p0 = &buf[0]
- 	}
--	r1, _, e1 := syscall.Syscall(procProcessPrng.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0)
-+	r1, _, e1 := syscall.Syscall(procSystemFunction036.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0)
- 	if r1 == 0 {
- 		err = errnoErr(e1)
- 	}
-Index: src/runtime/os_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/runtime/os_windows.go b/src/runtime/os_windows.go
---- a/src/runtime/os_windows.go	(revision 6885bad7dd86880be6929c02085e5c7a67ff2887)
-+++ b/src/runtime/os_windows.go	(revision 69e2eed6dd0f6d815ebf15797761c13f31213dd6)
-@@ -39,8 +39,8 @@
- //go:cgo_import_dynamic runtime._GetSystemInfo GetSystemInfo%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._GetThreadContext GetThreadContext%2 "kernel32.dll"
- //go:cgo_import_dynamic runtime._SetThreadContext SetThreadContext%2 "kernel32.dll"
--//go:cgo_import_dynamic runtime._LoadLibraryExW LoadLibraryExW%3 "kernel32.dll"
- //go:cgo_import_dynamic runtime._LoadLibraryW LoadLibraryW%1 "kernel32.dll"
-+//go:cgo_import_dynamic runtime._LoadLibraryA LoadLibraryA%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._PostQueuedCompletionStatus PostQueuedCompletionStatus%4 "kernel32.dll"
- //go:cgo_import_dynamic runtime._QueryPerformanceCounter QueryPerformanceCounter%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._QueryPerformanceFrequency QueryPerformanceFrequency%1 "kernel32.dll"
-@@ -74,7 +74,6 @@
- 	// Following syscalls are available on every Windows PC.
- 	// All these variables are set by the Windows executable
- 	// loader before the Go program starts.
--	_AddVectoredContinueHandler,
- 	_AddVectoredExceptionHandler,
- 	_CloseHandle,
- 	_CreateEventA,
-@@ -97,8 +96,8 @@
- 	_GetSystemInfo,
- 	_GetThreadContext,
- 	_SetThreadContext,
--	_LoadLibraryExW,
- 	_LoadLibraryW,
-+	_LoadLibraryA,
- 	_PostQueuedCompletionStatus,
- 	_QueryPerformanceCounter,
- 	_QueryPerformanceFrequency,
-@@ -127,8 +126,23 @@
- 	_WriteFile,
- 	_ stdFunction
- 
--	// Use ProcessPrng to generate cryptographically random data.
--	_ProcessPrng stdFunction
-+	// Following syscalls are only available on some Windows PCs.
-+	// We will load syscalls, if available, before using them.
-+	_AddDllDirectory,
-+	_AddVectoredContinueHandler,
-+	_LoadLibraryExA,
-+	_LoadLibraryExW,
-+	_ stdFunction
-+
-+	// Use RtlGenRandom to generate cryptographically random data.
-+	// This approach has been recommended by Microsoft (see issue
-+	// 15589 for details).
-+	// The RtlGenRandom is not listed in advapi32.dll, instead
-+	// RtlGenRandom function can be found by searching for SystemFunction036.
-+	// Also some versions of Mingw cannot link to SystemFunction036
-+	// when building executable as Cgo. So load SystemFunction036
-+	// manually during runtime startup.
-+	_RtlGenRandom stdFunction
- 
- 	// Load ntdll.dll manually during startup, otherwise Mingw
- 	// links wrong printf function to cgo executable (see issue
-@@ -145,13 +159,6 @@
- 	_ stdFunction
- )
- 
--var (
--	bcryptprimitivesdll = [...]uint16{'b', 'c', 'r', 'y', 'p', 't', 'p', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', 's', '.', 'd', 'l', 'l', 0}
--	ntdlldll            = [...]uint16{'n', 't', 'd', 'l', 'l', '.', 'd', 'l', 'l', 0}
--	powrprofdll         = [...]uint16{'p', 'o', 'w', 'r', 'p', 'r', 'o', 'f', '.', 'd', 'l', 'l', 0}
--	winmmdll            = [...]uint16{'w', 'i', 'n', 'm', 'm', '.', 'd', 'l', 'l', 0}
--)
--
- // Function to be called by windows CreateThread
- // to start new os thread.
- func tstart_stdcall(newm *m)
-@@ -244,8 +251,18 @@
- 	return unsafe.String(&sysDirectory[0], sysDirectoryLen)
- }
- 
--func windowsLoadSystemLib(name []uint16) uintptr {
--	return stdcall3(_LoadLibraryExW, uintptr(unsafe.Pointer(&name[0])), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+//go:linkname syscall_getSystemDirectory syscall.getSystemDirectory
-+func syscall_getSystemDirectory() string {
-+	return unsafe.String(&sysDirectory[0], sysDirectoryLen)
-+}
-+
-+func windowsLoadSystemLib(name []byte) uintptr {
-+	if useLoadLibraryEx {
-+		return stdcall3(_LoadLibraryExA, uintptr(unsafe.Pointer(&name[0])), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+	} else {
-+		absName := append(sysDirectory[:sysDirectoryLen], name...)
-+		return stdcall1(_LoadLibraryA, uintptr(unsafe.Pointer(&absName[0])))
-+	}
- }
- 
- //go:linkname windows_QueryPerformanceCounter internal/syscall/windows.QueryPerformanceCounter
-@@ -263,13 +280,28 @@
- }
- 
- func loadOptionalSyscalls() {
--	bcryptPrimitives := windowsLoadSystemLib(bcryptprimitivesdll[:])
--	if bcryptPrimitives == 0 {
--		throw("bcryptprimitives.dll not found")
-+	var kernel32dll = []byte("kernel32.dll\000")
-+	k32 := stdcall1(_LoadLibraryA, uintptr(unsafe.Pointer(&kernel32dll[0])))
-+	if k32 == 0 {
-+		throw("kernel32.dll not found")
- 	}
--	_ProcessPrng = windowsFindfunc(bcryptPrimitives, []byte("ProcessPrng\000"))
-+	_AddDllDirectory = windowsFindfunc(k32, []byte("AddDllDirectory\000"))
-+	_AddVectoredContinueHandler = windowsFindfunc(k32, []byte("AddVectoredContinueHandler\000"))
-+	_LoadLibraryExA = windowsFindfunc(k32, []byte("LoadLibraryExA\000"))
-+	_LoadLibraryExW = windowsFindfunc(k32, []byte("LoadLibraryExW\000"))
-+	useLoadLibraryEx = (_LoadLibraryExW != nil && _LoadLibraryExA != nil && _AddDllDirectory != nil)
-+
-+	initSysDirectory()
- 
--	n32 := windowsLoadSystemLib(ntdlldll[:])
-+	var advapi32dll = []byte("advapi32.dll\000")
-+	a32 := windowsLoadSystemLib(advapi32dll)
-+	if a32 == 0 {
-+		throw("advapi32.dll not found")
-+	}
-+	_RtlGenRandom = windowsFindfunc(a32, []byte("SystemFunction036\000"))
-+
-+	var ntdll = []byte("ntdll.dll\000")
-+	n32 := windowsLoadSystemLib(ntdll)
- 	if n32 == 0 {
- 		throw("ntdll.dll not found")
- 	}
-@@ -298,7 +330,7 @@
- 		context  uintptr
- 	}
- 
--	powrprof := windowsLoadSystemLib(powrprofdll[:])
-+	powrprof := windowsLoadSystemLib([]byte("powrprof.dll\000"))
- 	if powrprof == 0 {
- 		return // Running on Windows 7, where we don't need it anyway.
- 	}
-@@ -357,6 +389,22 @@
- // in sys_windows_386.s and sys_windows_amd64.s:
- func getlasterror() uint32
- 
-+// When loading DLLs, we prefer to use LoadLibraryEx with
-+// LOAD_LIBRARY_SEARCH_* flags, if available. LoadLibraryEx is not
-+// available on old Windows, though, and the LOAD_LIBRARY_SEARCH_*
-+// flags are not available on some versions of Windows without a
-+// security patch.
-+//
-+// https://msdn.microsoft.com/en-us/library/ms684179(v=vs.85).aspx says:
-+// "Windows 7, Windows Server 2008 R2, Windows Vista, and Windows
-+// Server 2008: The LOAD_LIBRARY_SEARCH_* flags are available on
-+// systems that have KB2533623 installed. To determine whether the
-+// flags are available, use GetProcAddress to get the address of the
-+// AddDllDirectory, RemoveDllDirectory, or SetDefaultDllDirectories
-+// function. If GetProcAddress succeeds, the LOAD_LIBRARY_SEARCH_*
-+// flags can be used with LoadLibraryEx."
-+var useLoadLibraryEx bool
-+
- var timeBeginPeriodRetValue uint32
- 
- // osRelaxMinNS indicates that sysmon shouldn't osRelax if the next
-@@ -430,7 +478,8 @@
- 		// Only load winmm.dll if we need it.
- 		// This avoids a dependency on winmm.dll for Go programs
- 		// that run on new Windows versions.
--		m32 := windowsLoadSystemLib(winmmdll[:])
-+		var winmmdll = []byte("winmm.dll\000")
-+		m32 := windowsLoadSystemLib(winmmdll)
- 		if m32 == 0 {
- 			print("runtime: LoadLibraryExW failed; errno=", getlasterror(), "\n")
- 			throw("winmm.dll not found")
-@@ -471,6 +520,28 @@
- 	canUseLongPaths = true
- }
- 
-+var osVersionInfo struct {
-+	majorVersion uint32
-+	minorVersion uint32
-+	buildNumber  uint32
-+}
-+
-+func initOsVersionInfo() {
-+	info := _OSVERSIONINFOW{}
-+	info.osVersionInfoSize = uint32(unsafe.Sizeof(info))
-+	stdcall1(_RtlGetVersion, uintptr(unsafe.Pointer(&info)))
-+	osVersionInfo.majorVersion = info.majorVersion
-+	osVersionInfo.minorVersion = info.minorVersion
-+	osVersionInfo.buildNumber = info.buildNumber
-+}
-+
-+//go:linkname rtlGetNtVersionNumbers syscall.rtlGetNtVersionNumbers
-+func rtlGetNtVersionNumbers(majorVersion *uint32, minorVersion *uint32, buildNumber *uint32) {
-+	*majorVersion = osVersionInfo.majorVersion
-+	*minorVersion = osVersionInfo.minorVersion
-+	*buildNumber = osVersionInfo.buildNumber
-+}
-+
- func osinit() {
- 	asmstdcallAddr = unsafe.Pointer(abi.FuncPCABI0(asmstdcall))
- 
-@@ -483,8 +554,8 @@
- 	initHighResTimer()
- 	timeBeginPeriodRetValue = osRelax(false)
- 
--	initSysDirectory()
- 	initLongPathSupport()
-+	initOsVersionInfo()
- 
- 	ncpu = getproccount()
- 
-@@ -500,7 +571,7 @@
- //go:nosplit
- func readRandom(r []byte) int {
- 	n := 0
--	if stdcall2(_ProcessPrng, uintptr(unsafe.Pointer(&r[0])), uintptr(len(r)))&0xff != 0 {
-+	if stdcall2(_RtlGenRandom, uintptr(unsafe.Pointer(&r[0])), uintptr(len(r)))&0xff != 0 {
- 		n = len(r)
- 	}
- 	return n
-Index: src/net/hook_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/hook_windows.go b/src/net/hook_windows.go
---- a/src/net/hook_windows.go	(revision 9ac42137ef6730e8b7daca016ece831297a1d75b)
-+++ b/src/net/hook_windows.go	(revision 21290de8a4c91408de7c2b5b68757b1e90af49dd)
-@@ -13,6 +13,7 @@
- 	hostsFilePath = windows.GetSystemDirectory() + "/Drivers/etc/hosts"
- 
- 	// Placeholders for socket system calls.
-+	socketFunc    func(int, int, int) (syscall.Handle, error)                                                 = syscall.Socket
- 	wsaSocketFunc func(int32, int32, int32, *syscall.WSAProtocolInfo, uint32, uint32) (syscall.Handle, error) = windows.WSASocket
- 	connectFunc   func(syscall.Handle, syscall.Sockaddr) error                                                = syscall.Connect
- 	listenFunc    func(syscall.Handle, int) error                                                             = syscall.Listen
-Index: src/net/internal/socktest/main_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/main_test.go b/src/net/internal/socktest/main_test.go
---- a/src/net/internal/socktest/main_test.go	(revision 9ac42137ef6730e8b7daca016ece831297a1d75b)
-+++ b/src/net/internal/socktest/main_test.go	(revision 21290de8a4c91408de7c2b5b68757b1e90af49dd)
-@@ -2,7 +2,7 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
- 
--//go:build !js && !plan9 && !wasip1 && !windows
-+//go:build !js && !plan9 && !wasip1
- 
- package socktest_test
- 
-Index: src/net/internal/socktest/main_windows_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/main_windows_test.go b/src/net/internal/socktest/main_windows_test.go
-new file mode 100644
---- /dev/null	(revision 21290de8a4c91408de7c2b5b68757b1e90af49dd)
-+++ b/src/net/internal/socktest/main_windows_test.go	(revision 21290de8a4c91408de7c2b5b68757b1e90af49dd)
-@@ -0,0 +1,22 @@
-+// Copyright 2015 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 socktest_test
-+
-+import "syscall"
-+
-+var (
-+	socketFunc func(int, int, int) (syscall.Handle, error)
-+	closeFunc  func(syscall.Handle) error
-+)
-+
-+func installTestHooks() {
-+	socketFunc = sw.Socket
-+	closeFunc = sw.Closesocket
-+}
-+
-+func uninstallTestHooks() {
-+	socketFunc = syscall.Socket
-+	closeFunc = syscall.Closesocket
-+}
-Index: src/net/internal/socktest/sys_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/sys_windows.go b/src/net/internal/socktest/sys_windows.go
---- a/src/net/internal/socktest/sys_windows.go	(revision 9ac42137ef6730e8b7daca016ece831297a1d75b)
-+++ b/src/net/internal/socktest/sys_windows.go	(revision 21290de8a4c91408de7c2b5b68757b1e90af49dd)
-@@ -9,6 +9,38 @@
- 	"syscall"
- )
- 
-+// Socket wraps [syscall.Socket].
-+func (sw *Switch) Socket(family, sotype, proto int) (s syscall.Handle, err error) {
-+	sw.once.Do(sw.init)
-+
-+	so := &Status{Cookie: cookie(family, sotype, proto)}
-+	sw.fmu.RLock()
-+	f, _ := sw.fltab[FilterSocket]
-+	sw.fmu.RUnlock()
-+
-+	af, err := f.apply(so)
-+	if err != nil {
-+		return syscall.InvalidHandle, err
-+	}
-+	s, so.Err = syscall.Socket(family, sotype, proto)
-+	if err = af.apply(so); err != nil {
-+		if so.Err == nil {
-+			syscall.Closesocket(s)
-+		}
-+		return syscall.InvalidHandle, err
-+	}
-+
-+	sw.smu.Lock()
-+	defer sw.smu.Unlock()
-+	if so.Err != nil {
-+		sw.stats.getLocked(so.Cookie).OpenFailed++
-+		return syscall.InvalidHandle, so.Err
-+	}
-+	nso := sw.addLocked(s, family, sotype, proto)
-+	sw.stats.getLocked(nso.Cookie).Opened++
-+	return s, nil
-+}
-+
- // WSASocket wraps [syscall.WSASocket].
- func (sw *Switch) WSASocket(family, sotype, proto int32, protinfo *syscall.WSAProtocolInfo, group uint32, flags uint32) (s syscall.Handle, err error) {
- 	sw.once.Do(sw.init)
-Index: src/net/main_windows_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/main_windows_test.go b/src/net/main_windows_test.go
---- a/src/net/main_windows_test.go	(revision 9ac42137ef6730e8b7daca016ece831297a1d75b)
-+++ b/src/net/main_windows_test.go	(revision 21290de8a4c91408de7c2b5b68757b1e90af49dd)
-@@ -8,6 +8,7 @@
- 
- var (
- 	// Placeholders for saving original socket system calls.
-+	origSocket      = socketFunc
- 	origWSASocket   = wsaSocketFunc
- 	origClosesocket = poll.CloseFunc
- 	origConnect     = connectFunc
-@@ -17,6 +18,7 @@
- )
- 
- func installTestHooks() {
-+	socketFunc = sw.Socket
- 	wsaSocketFunc = sw.WSASocket
- 	poll.CloseFunc = sw.Closesocket
- 	connectFunc = sw.Connect
-@@ -26,6 +28,7 @@
- }
- 
- func uninstallTestHooks() {
-+	socketFunc = origSocket
- 	wsaSocketFunc = origWSASocket
- 	poll.CloseFunc = origClosesocket
- 	connectFunc = origConnect
-Index: src/net/sock_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/sock_windows.go b/src/net/sock_windows.go
---- a/src/net/sock_windows.go	(revision 9ac42137ef6730e8b7daca016ece831297a1d75b)
-+++ b/src/net/sock_windows.go	(revision 21290de8a4c91408de7c2b5b68757b1e90af49dd)
-@@ -20,6 +20,21 @@
- func sysSocket(family, sotype, proto int) (syscall.Handle, error) {
- 	s, err := wsaSocketFunc(int32(family), int32(sotype), int32(proto),
- 		nil, 0, windows.WSA_FLAG_OVERLAPPED|windows.WSA_FLAG_NO_HANDLE_INHERIT)
-+	if err == nil {
-+		return s, nil
-+	}
-+	// WSA_FLAG_NO_HANDLE_INHERIT flag is not supported on some
-+	// old versions of Windows, see
-+	// https://msdn.microsoft.com/en-us/library/windows/desktop/ms742212(v=vs.85).aspx
-+	// for details. Just use syscall.Socket, if windows.WSASocket failed.
-+
-+	// See ../syscall/exec_unix.go for description of ForkLock.
-+	syscall.ForkLock.RLock()
-+	s, err = socketFunc(family, sotype, proto)
-+	if err == nil {
-+		syscall.CloseOnExec(s)
-+	}
-+	syscall.ForkLock.RUnlock()
- 	if err != nil {
- 		return syscall.InvalidHandle, os.NewSyscallError("socket", err)
- 	}
-Index: src/syscall/exec_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/syscall/exec_windows.go b/src/syscall/exec_windows.go
---- a/src/syscall/exec_windows.go	(revision 9ac42137ef6730e8b7daca016ece831297a1d75b)
-+++ b/src/syscall/exec_windows.go	(revision 6a31d3fa8e47ddabc10bd97bff10d9a85f4cfb76)
-@@ -14,7 +14,6 @@
- 	"unsafe"
- )
- 
--// ForkLock is not used on Windows.
- var ForkLock sync.RWMutex
- 
- // EscapeArg rewrites command line argument s as prescribed
-@@ -254,6 +253,9 @@
- var zeroProcAttr ProcAttr
- var zeroSysProcAttr SysProcAttr
- 
-+//go:linkname rtlGetNtVersionNumbers
-+func rtlGetNtVersionNumbers(majorVersion *uint32, minorVersion *uint32, buildNumber *uint32)
-+
- func StartProcess(argv0 string, argv []string, attr *ProcAttr) (pid int, handle uintptr, err error) {
- 	if len(argv0) == 0 {
- 		return 0, 0, EWINDOWS
-@@ -317,6 +319,17 @@
- 		}
- 	}
- 
-+	var maj, min, build uint32
-+	rtlGetNtVersionNumbers(&maj, &min, &build)
-+	isWin7 := maj < 6 || (maj == 6 && min <= 1)
-+	// NT kernel handles are divisible by 4, with the bottom 3 bits left as
-+	// a tag. The fully set tag correlates with the types of handles we're
-+	// concerned about here.  Except, the kernel will interpret some
-+	// special handle values, like -1, -2, and so forth, so kernelbase.dll
-+	// checks to see that those bottom three bits are checked, but that top
-+	// bit is not checked.
-+	isLegacyWin7ConsoleHandle := func(handle Handle) bool { return isWin7 && handle&0x10000003 == 3 }
-+
- 	p, _ := GetCurrentProcess()
- 	parentProcess := p
- 	if sys.ParentProcess != 0 {
-@@ -325,7 +338,15 @@
- 	fd := make([]Handle, len(attr.Files))
- 	for i := range attr.Files {
- 		if attr.Files[i] > 0 {
--			err := DuplicateHandle(p, Handle(attr.Files[i]), parentProcess, &fd[i], 0, true, DUPLICATE_SAME_ACCESS)
-+			destinationProcessHandle := parentProcess
-+
-+			// On Windows 7, console handles aren't real handles, and can only be duplicated
-+			// into the current process, not a parent one, which amounts to the same thing.
-+			if parentProcess != p && isLegacyWin7ConsoleHandle(Handle(attr.Files[i])) {
-+				destinationProcessHandle = p
-+			}
-+
-+			err := DuplicateHandle(p, Handle(attr.Files[i]), destinationProcessHandle, &fd[i], 0, true, DUPLICATE_SAME_ACCESS)
- 			if err != nil {
- 				return 0, 0, err
- 			}
-@@ -356,6 +377,14 @@
- 
- 	fd = append(fd, sys.AdditionalInheritedHandles...)
- 
-+	// On Windows 7, console handles aren't real handles, so don't pass them
-+	// through to PROC_THREAD_ATTRIBUTE_HANDLE_LIST.
-+	for i := range fd {
-+		if isLegacyWin7ConsoleHandle(fd[i]) {
-+			fd[i] = 0
-+		}
-+	}
-+
- 	// The presence of a NULL handle in the list is enough to cause PROC_THREAD_ATTRIBUTE_HANDLE_LIST
- 	// to treat the entire list as empty, so remove NULL handles.
- 	j := 0
-Index: src/runtime/syscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/runtime/syscall_windows.go b/src/runtime/syscall_windows.go
---- a/src/runtime/syscall_windows.go	(revision 6a31d3fa8e47ddabc10bd97bff10d9a85f4cfb76)
-+++ b/src/runtime/syscall_windows.go	(revision 69e2eed6dd0f6d815ebf15797761c13f31213dd6)
-@@ -413,10 +413,20 @@
- 
- const _LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800
- 
-+// When available, this function will use LoadLibraryEx with the filename
-+// parameter and the important SEARCH_SYSTEM32 argument. But on systems that
-+// do not have that option, absoluteFilepath should contain a fallback
-+// to the full path inside of system32 for use with vanilla LoadLibrary.
-+//
- //go:linkname syscall_loadsystemlibrary syscall.loadsystemlibrary
--func syscall_loadsystemlibrary(filename *uint16) (handle, err uintptr) {
--	handle, _, err = syscall_SyscallN(uintptr(unsafe.Pointer(_LoadLibraryExW)), uintptr(unsafe.Pointer(filename)), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+func syscall_loadsystemlibrary(filename *uint16, absoluteFilepath *uint16) (handle, err uintptr) {
-+	if useLoadLibraryEx {
-+		handle, _, err = syscall_SyscallN(uintptr(unsafe.Pointer(_LoadLibraryExW)), uintptr(unsafe.Pointer(filename)), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+	} else {
-+		handle, _, err = syscall_SyscallN(uintptr(unsafe.Pointer(_LoadLibraryW)), uintptr(unsafe.Pointer(absoluteFilepath)))
-+	}
- 	KeepAlive(filename)
-+	KeepAlive(absoluteFilepath)
- 	if handle != 0 {
- 		err = 0
- 	}
-Index: src/syscall/dll_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/syscall/dll_windows.go b/src/syscall/dll_windows.go
---- a/src/syscall/dll_windows.go	(revision 6a31d3fa8e47ddabc10bd97bff10d9a85f4cfb76)
-+++ b/src/syscall/dll_windows.go	(revision 69e2eed6dd0f6d815ebf15797761c13f31213dd6)
-@@ -44,7 +44,7 @@
- 
- func SyscallN(trap uintptr, args ...uintptr) (r1, r2 uintptr, err Errno)
- func loadlibrary(filename *uint16) (handle uintptr, err Errno)
--func loadsystemlibrary(filename *uint16) (handle uintptr, err Errno)
-+func loadsystemlibrary(filename *uint16, absoluteFilepath *uint16) (handle uintptr, err Errno)
- func getprocaddress(handle uintptr, procname *uint8) (proc uintptr, err Errno)
- 
- // A DLL implements access to a single DLL.
-@@ -53,6 +53,9 @@
- 	Handle Handle
- }
- 
-+//go:linkname getSystemDirectory
-+func getSystemDirectory() string // Implemented in runtime package.
-+
- // LoadDLL loads the named DLL file into memory.
- //
- // If name is not an absolute path and is not a known system DLL used by
-@@ -69,7 +72,11 @@
- 	var h uintptr
- 	var e Errno
- 	if sysdll.IsSystemDLL[name] {
--		h, e = loadsystemlibrary(namep)
-+		absoluteFilepathp, err := UTF16PtrFromString(getSystemDirectory() + name)
-+		if err != nil {
-+			return nil, err
-+		}
-+		h, e = loadsystemlibrary(namep, absoluteFilepathp)
- 	} else {
- 		h, e = loadlibrary(namep)
- 	}

.github/patch/go1.24.patch

@@ -1,657 +0,0 @@
-Subject: [PATCH] Revert "runtime: always use LoadLibraryEx to load system libraries"
-Revert "syscall: remove Windows 7 console handle workaround"
-Revert "net: remove sysSocket fallback for Windows 7"
-Revert "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
----
-Index: src/crypto/internal/sysrand/rand_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/crypto/internal/sysrand/rand_windows.go b/src/crypto/internal/sysrand/rand_windows.go
---- a/src/crypto/internal/sysrand/rand_windows.go	(revision 3901409b5d0fb7c85a3e6730a59943cc93b2835c)
-+++ b/src/crypto/internal/sysrand/rand_windows.go	(revision 2a406dc9f1ea7323d6ca9fccb2fe9ddebb6b1cc8)
-@@ -7,5 +7,26 @@
- import "internal/syscall/windows"
- 
- func read(b []byte) error {
--	return windows.ProcessPrng(b)
-+	// RtlGenRandom only returns 1<<32-1 bytes at a time. We only read at
-+	// most 1<<31-1 bytes at a time so that  this works the same on 32-bit
-+	// and 64-bit systems.
-+	return batched(windows.RtlGenRandom, 1<<31-1)(b)
-+}
-+
-+// batched returns a function that calls f to populate a []byte by chunking it
-+// into subslices of, at most, readMax bytes.
-+func batched(f func([]byte) error, readMax int) func([]byte) error {
-+	return func(out []byte) error {
-+		for len(out) > 0 {
-+			read := len(out)
-+			if read > readMax {
-+				read = readMax
-+			}
-+			if err := f(out[:read]); err != nil {
-+				return err
-+			}
-+			out = out[read:]
-+		}
-+		return nil
-+	}
- }
-Index: src/crypto/rand/rand.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/crypto/rand/rand.go b/src/crypto/rand/rand.go
---- a/src/crypto/rand/rand.go	(revision 3901409b5d0fb7c85a3e6730a59943cc93b2835c)
-+++ b/src/crypto/rand/rand.go	(revision 2a406dc9f1ea7323d6ca9fccb2fe9ddebb6b1cc8)
-@@ -22,7 +22,7 @@
- //   - On legacy Linux (< 3.17), Reader opens /dev/urandom on first use.
- //   - On macOS, iOS, and OpenBSD Reader, uses arc4random_buf(3).
- //   - On NetBSD, Reader uses the kern.arandom sysctl.
--//   - On Windows, Reader uses the ProcessPrng API.
-+//   - On Windows systems, Reader uses the RtlGenRandom API.
- //   - On js/wasm, Reader uses the Web Crypto API.
- //   - On wasip1/wasm, Reader uses random_get.
- //
-Index: src/internal/syscall/windows/syscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/internal/syscall/windows/syscall_windows.go b/src/internal/syscall/windows/syscall_windows.go
---- a/src/internal/syscall/windows/syscall_windows.go	(revision 3901409b5d0fb7c85a3e6730a59943cc93b2835c)
-+++ b/src/internal/syscall/windows/syscall_windows.go	(revision 2a406dc9f1ea7323d6ca9fccb2fe9ddebb6b1cc8)
-@@ -416,7 +416,7 @@
- //sys	DestroyEnvironmentBlock(block *uint16) (err error) = userenv.DestroyEnvironmentBlock
- //sys	CreateEvent(eventAttrs *SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle syscall.Handle, err error) = kernel32.CreateEventW
- 
--//sys	ProcessPrng(buf []byte) (err error) = bcryptprimitives.ProcessPrng
-+//sys	RtlGenRandom(buf []byte) (err error) = advapi32.SystemFunction036
- 
- type FILE_ID_BOTH_DIR_INFO struct {
- 	NextEntryOffset uint32
-Index: src/internal/syscall/windows/zsyscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/internal/syscall/windows/zsyscall_windows.go b/src/internal/syscall/windows/zsyscall_windows.go
---- a/src/internal/syscall/windows/zsyscall_windows.go	(revision 3901409b5d0fb7c85a3e6730a59943cc93b2835c)
-+++ b/src/internal/syscall/windows/zsyscall_windows.go	(revision 2a406dc9f1ea7323d6ca9fccb2fe9ddebb6b1cc8)
-@@ -38,7 +38,6 @@
- 
- var (
- 	modadvapi32         = syscall.NewLazyDLL(sysdll.Add("advapi32.dll"))
--	modbcryptprimitives = syscall.NewLazyDLL(sysdll.Add("bcryptprimitives.dll"))
- 	modiphlpapi         = syscall.NewLazyDLL(sysdll.Add("iphlpapi.dll"))
- 	modkernel32         = syscall.NewLazyDLL(sysdll.Add("kernel32.dll"))
- 	modnetapi32         = syscall.NewLazyDLL(sysdll.Add("netapi32.dll"))
-@@ -63,7 +62,7 @@
- 	procQueryServiceStatus                = modadvapi32.NewProc("QueryServiceStatus")
- 	procRevertToSelf                      = modadvapi32.NewProc("RevertToSelf")
- 	procSetTokenInformation               = modadvapi32.NewProc("SetTokenInformation")
--	procProcessPrng                       = modbcryptprimitives.NewProc("ProcessPrng")
-+	procSystemFunction036                 = modadvapi32.NewProc("SystemFunction036")
- 	procGetAdaptersAddresses              = modiphlpapi.NewProc("GetAdaptersAddresses")
- 	procCreateEventW                      = modkernel32.NewProc("CreateEventW")
- 	procGetACP                            = modkernel32.NewProc("GetACP")
-@@ -236,12 +235,12 @@
- 	return
- }
- 
--func ProcessPrng(buf []byte) (err error) {
-+func RtlGenRandom(buf []byte) (err error) {
- 	var _p0 *byte
- 	if len(buf) > 0 {
- 		_p0 = &buf[0]
- 	}
--	r1, _, e1 := syscall.Syscall(procProcessPrng.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0)
-+	r1, _, e1 := syscall.Syscall(procSystemFunction036.Addr(), 2, uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), 0)
- 	if r1 == 0 {
- 		err = errnoErr(e1)
- 	}
-Index: src/runtime/os_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/runtime/os_windows.go b/src/runtime/os_windows.go
---- a/src/runtime/os_windows.go	(revision 3901409b5d0fb7c85a3e6730a59943cc93b2835c)
-+++ b/src/runtime/os_windows.go	(revision ac3e93c061779dfefc0dd13a5b6e6f764a25621e)
-@@ -40,8 +40,8 @@
- //go:cgo_import_dynamic runtime._GetSystemInfo GetSystemInfo%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._GetThreadContext GetThreadContext%2 "kernel32.dll"
- //go:cgo_import_dynamic runtime._SetThreadContext SetThreadContext%2 "kernel32.dll"
--//go:cgo_import_dynamic runtime._LoadLibraryExW LoadLibraryExW%3 "kernel32.dll"
- //go:cgo_import_dynamic runtime._LoadLibraryW LoadLibraryW%1 "kernel32.dll"
-+//go:cgo_import_dynamic runtime._LoadLibraryA LoadLibraryA%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._PostQueuedCompletionStatus PostQueuedCompletionStatus%4 "kernel32.dll"
- //go:cgo_import_dynamic runtime._QueryPerformanceCounter QueryPerformanceCounter%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._QueryPerformanceFrequency QueryPerformanceFrequency%1 "kernel32.dll"
-@@ -75,7 +75,6 @@
- 	// Following syscalls are available on every Windows PC.
- 	// All these variables are set by the Windows executable
- 	// loader before the Go program starts.
--	_AddVectoredContinueHandler,
- 	_AddVectoredExceptionHandler,
- 	_CloseHandle,
- 	_CreateEventA,
-@@ -98,8 +97,8 @@
- 	_GetSystemInfo,
- 	_GetThreadContext,
- 	_SetThreadContext,
--	_LoadLibraryExW,
- 	_LoadLibraryW,
-+	_LoadLibraryA,
- 	_PostQueuedCompletionStatus,
- 	_QueryPerformanceCounter,
- 	_QueryPerformanceFrequency,
-@@ -128,8 +127,23 @@
- 	_WriteFile,
- 	_ stdFunction
- 
--	// Use ProcessPrng to generate cryptographically random data.
--	_ProcessPrng stdFunction
-+	// Following syscalls are only available on some Windows PCs.
-+	// We will load syscalls, if available, before using them.
-+	_AddDllDirectory,
-+	_AddVectoredContinueHandler,
-+	_LoadLibraryExA,
-+	_LoadLibraryExW,
-+	_ stdFunction
-+
-+	// Use RtlGenRandom to generate cryptographically random data.
-+	// This approach has been recommended by Microsoft (see issue
-+	// 15589 for details).
-+	// The RtlGenRandom is not listed in advapi32.dll, instead
-+	// RtlGenRandom function can be found by searching for SystemFunction036.
-+	// Also some versions of Mingw cannot link to SystemFunction036
-+	// when building executable as Cgo. So load SystemFunction036
-+	// manually during runtime startup.
-+	_RtlGenRandom stdFunction
- 
- 	// Load ntdll.dll manually during startup, otherwise Mingw
- 	// links wrong printf function to cgo executable (see issue
-@@ -146,13 +160,6 @@
- 	_ stdFunction
- )
- 
--var (
--	bcryptprimitivesdll = [...]uint16{'b', 'c', 'r', 'y', 'p', 't', 'p', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', 's', '.', 'd', 'l', 'l', 0}
--	ntdlldll            = [...]uint16{'n', 't', 'd', 'l', 'l', '.', 'd', 'l', 'l', 0}
--	powrprofdll         = [...]uint16{'p', 'o', 'w', 'r', 'p', 'r', 'o', 'f', '.', 'd', 'l', 'l', 0}
--	winmmdll            = [...]uint16{'w', 'i', 'n', 'm', 'm', '.', 'd', 'l', 'l', 0}
--)
--
- // Function to be called by windows CreateThread
- // to start new os thread.
- func tstart_stdcall(newm *m)
-@@ -245,8 +252,18 @@
- 	return unsafe.String(&sysDirectory[0], sysDirectoryLen)
- }
- 
--func windowsLoadSystemLib(name []uint16) uintptr {
--	return stdcall3(_LoadLibraryExW, uintptr(unsafe.Pointer(&name[0])), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+//go:linkname syscall_getSystemDirectory syscall.getSystemDirectory
-+func syscall_getSystemDirectory() string {
-+	return unsafe.String(&sysDirectory[0], sysDirectoryLen)
-+}
-+
-+func windowsLoadSystemLib(name []byte) uintptr {
-+	if useLoadLibraryEx {
-+		return stdcall3(_LoadLibraryExA, uintptr(unsafe.Pointer(&name[0])), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+	} else {
-+		absName := append(sysDirectory[:sysDirectoryLen], name...)
-+		return stdcall1(_LoadLibraryA, uintptr(unsafe.Pointer(&absName[0])))
-+	}
- }
- 
- //go:linkname windows_QueryPerformanceCounter internal/syscall/windows.QueryPerformanceCounter
-@@ -264,13 +281,28 @@
- }
- 
- func loadOptionalSyscalls() {
--	bcryptPrimitives := windowsLoadSystemLib(bcryptprimitivesdll[:])
--	if bcryptPrimitives == 0 {
--		throw("bcryptprimitives.dll not found")
-+	var kernel32dll = []byte("kernel32.dll\000")
-+	k32 := stdcall1(_LoadLibraryA, uintptr(unsafe.Pointer(&kernel32dll[0])))
-+	if k32 == 0 {
-+		throw("kernel32.dll not found")
- 	}
--	_ProcessPrng = windowsFindfunc(bcryptPrimitives, []byte("ProcessPrng\000"))
-+	_AddDllDirectory = windowsFindfunc(k32, []byte("AddDllDirectory\000"))
-+	_AddVectoredContinueHandler = windowsFindfunc(k32, []byte("AddVectoredContinueHandler\000"))
-+	_LoadLibraryExA = windowsFindfunc(k32, []byte("LoadLibraryExA\000"))
-+	_LoadLibraryExW = windowsFindfunc(k32, []byte("LoadLibraryExW\000"))
-+	useLoadLibraryEx = (_LoadLibraryExW != nil && _LoadLibraryExA != nil && _AddDllDirectory != nil)
-+
-+	initSysDirectory()
- 
--	n32 := windowsLoadSystemLib(ntdlldll[:])
-+	var advapi32dll = []byte("advapi32.dll\000")
-+	a32 := windowsLoadSystemLib(advapi32dll)
-+	if a32 == 0 {
-+		throw("advapi32.dll not found")
-+	}
-+	_RtlGenRandom = windowsFindfunc(a32, []byte("SystemFunction036\000"))
-+
-+	var ntdll = []byte("ntdll.dll\000")
-+	n32 := windowsLoadSystemLib(ntdll)
- 	if n32 == 0 {
- 		throw("ntdll.dll not found")
- 	}
-@@ -299,7 +331,7 @@
- 		context  uintptr
- 	}
- 
--	powrprof := windowsLoadSystemLib(powrprofdll[:])
-+	powrprof := windowsLoadSystemLib([]byte("powrprof.dll\000"))
- 	if powrprof == 0 {
- 		return // Running on Windows 7, where we don't need it anyway.
- 	}
-@@ -358,6 +390,22 @@
- // in sys_windows_386.s and sys_windows_amd64.s:
- func getlasterror() uint32
- 
-+// When loading DLLs, we prefer to use LoadLibraryEx with
-+// LOAD_LIBRARY_SEARCH_* flags, if available. LoadLibraryEx is not
-+// available on old Windows, though, and the LOAD_LIBRARY_SEARCH_*
-+// flags are not available on some versions of Windows without a
-+// security patch.
-+//
-+// https://msdn.microsoft.com/en-us/library/ms684179(v=vs.85).aspx says:
-+// "Windows 7, Windows Server 2008 R2, Windows Vista, and Windows
-+// Server 2008: The LOAD_LIBRARY_SEARCH_* flags are available on
-+// systems that have KB2533623 installed. To determine whether the
-+// flags are available, use GetProcAddress to get the address of the
-+// AddDllDirectory, RemoveDllDirectory, or SetDefaultDllDirectories
-+// function. If GetProcAddress succeeds, the LOAD_LIBRARY_SEARCH_*
-+// flags can be used with LoadLibraryEx."
-+var useLoadLibraryEx bool
-+
- var timeBeginPeriodRetValue uint32
- 
- // osRelaxMinNS indicates that sysmon shouldn't osRelax if the next
-@@ -431,7 +479,8 @@
- 		// Only load winmm.dll if we need it.
- 		// This avoids a dependency on winmm.dll for Go programs
- 		// that run on new Windows versions.
--		m32 := windowsLoadSystemLib(winmmdll[:])
-+		var winmmdll = []byte("winmm.dll\000")
-+		m32 := windowsLoadSystemLib(winmmdll)
- 		if m32 == 0 {
- 			print("runtime: LoadLibraryExW failed; errno=", getlasterror(), "\n")
- 			throw("winmm.dll not found")
-@@ -472,6 +521,28 @@
- 	canUseLongPaths = true
- }
- 
-+var osVersionInfo struct {
-+	majorVersion uint32
-+	minorVersion uint32
-+	buildNumber  uint32
-+}
-+
-+func initOsVersionInfo() {
-+	info := _OSVERSIONINFOW{}
-+	info.osVersionInfoSize = uint32(unsafe.Sizeof(info))
-+	stdcall1(_RtlGetVersion, uintptr(unsafe.Pointer(&info)))
-+	osVersionInfo.majorVersion = info.majorVersion
-+	osVersionInfo.minorVersion = info.minorVersion
-+	osVersionInfo.buildNumber = info.buildNumber
-+}
-+
-+//go:linkname rtlGetNtVersionNumbers syscall.rtlGetNtVersionNumbers
-+func rtlGetNtVersionNumbers(majorVersion *uint32, minorVersion *uint32, buildNumber *uint32) {
-+	*majorVersion = osVersionInfo.majorVersion
-+	*minorVersion = osVersionInfo.minorVersion
-+	*buildNumber = osVersionInfo.buildNumber
-+}
-+
- func osinit() {
- 	asmstdcallAddr = unsafe.Pointer(abi.FuncPCABI0(asmstdcall))
- 
-@@ -484,8 +555,8 @@
- 	initHighResTimer()
- 	timeBeginPeriodRetValue = osRelax(false)
- 
--	initSysDirectory()
- 	initLongPathSupport()
-+	initOsVersionInfo()
- 
- 	ncpu = getproccount()
- 
-@@ -501,7 +572,7 @@
- //go:nosplit
- func readRandom(r []byte) int {
- 	n := 0
--	if stdcall2(_ProcessPrng, uintptr(unsafe.Pointer(&r[0])), uintptr(len(r)))&0xff != 0 {
-+	if stdcall2(_RtlGenRandom, uintptr(unsafe.Pointer(&r[0])), uintptr(len(r)))&0xff != 0 {
- 		n = len(r)
- 	}
- 	return n
-Index: src/net/hook_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/hook_windows.go b/src/net/hook_windows.go
---- a/src/net/hook_windows.go	(revision 2a406dc9f1ea7323d6ca9fccb2fe9ddebb6b1cc8)
-+++ b/src/net/hook_windows.go	(revision 7b1fd7d39c6be0185fbe1d929578ab372ac5c632)
-@@ -13,6 +13,7 @@
- 	hostsFilePath = windows.GetSystemDirectory() + "/Drivers/etc/hosts"
- 
- 	// Placeholders for socket system calls.
-+	socketFunc    func(int, int, int) (syscall.Handle, error)                                                 = syscall.Socket
- 	wsaSocketFunc func(int32, int32, int32, *syscall.WSAProtocolInfo, uint32, uint32) (syscall.Handle, error) = windows.WSASocket
- 	connectFunc   func(syscall.Handle, syscall.Sockaddr) error                                                = syscall.Connect
- 	listenFunc    func(syscall.Handle, int) error                                                             = syscall.Listen
-Index: src/net/internal/socktest/main_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/main_test.go b/src/net/internal/socktest/main_test.go
---- a/src/net/internal/socktest/main_test.go	(revision 2a406dc9f1ea7323d6ca9fccb2fe9ddebb6b1cc8)
-+++ b/src/net/internal/socktest/main_test.go	(revision 7b1fd7d39c6be0185fbe1d929578ab372ac5c632)
-@@ -2,7 +2,7 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
- 
--//go:build !js && !plan9 && !wasip1 && !windows
-+//go:build !js && !plan9 && !wasip1
- 
- package socktest_test
- 
-Index: src/net/internal/socktest/main_windows_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/main_windows_test.go b/src/net/internal/socktest/main_windows_test.go
-new file mode 100644
---- /dev/null	(revision 7b1fd7d39c6be0185fbe1d929578ab372ac5c632)
-+++ b/src/net/internal/socktest/main_windows_test.go	(revision 7b1fd7d39c6be0185fbe1d929578ab372ac5c632)
-@@ -0,0 +1,22 @@
-+// Copyright 2015 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 socktest_test
-+
-+import "syscall"
-+
-+var (
-+	socketFunc func(int, int, int) (syscall.Handle, error)
-+	closeFunc  func(syscall.Handle) error
-+)
-+
-+func installTestHooks() {
-+	socketFunc = sw.Socket
-+	closeFunc = sw.Closesocket
-+}
-+
-+func uninstallTestHooks() {
-+	socketFunc = syscall.Socket
-+	closeFunc = syscall.Closesocket
-+}
-Index: src/net/internal/socktest/sys_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/sys_windows.go b/src/net/internal/socktest/sys_windows.go
---- a/src/net/internal/socktest/sys_windows.go	(revision 2a406dc9f1ea7323d6ca9fccb2fe9ddebb6b1cc8)
-+++ b/src/net/internal/socktest/sys_windows.go	(revision 7b1fd7d39c6be0185fbe1d929578ab372ac5c632)
-@@ -9,6 +9,38 @@
- 	"syscall"
- )
- 
-+// Socket wraps [syscall.Socket].
-+func (sw *Switch) Socket(family, sotype, proto int) (s syscall.Handle, err error) {
-+	sw.once.Do(sw.init)
-+
-+	so := &Status{Cookie: cookie(family, sotype, proto)}
-+	sw.fmu.RLock()
-+	f, _ := sw.fltab[FilterSocket]
-+	sw.fmu.RUnlock()
-+
-+	af, err := f.apply(so)
-+	if err != nil {
-+		return syscall.InvalidHandle, err
-+	}
-+	s, so.Err = syscall.Socket(family, sotype, proto)
-+	if err = af.apply(so); err != nil {
-+		if so.Err == nil {
-+			syscall.Closesocket(s)
-+		}
-+		return syscall.InvalidHandle, err
-+	}
-+
-+	sw.smu.Lock()
-+	defer sw.smu.Unlock()
-+	if so.Err != nil {
-+		sw.stats.getLocked(so.Cookie).OpenFailed++
-+		return syscall.InvalidHandle, so.Err
-+	}
-+	nso := sw.addLocked(s, family, sotype, proto)
-+	sw.stats.getLocked(nso.Cookie).Opened++
-+	return s, nil
-+}
-+
- // WSASocket wraps [syscall.WSASocket].
- func (sw *Switch) WSASocket(family, sotype, proto int32, protinfo *syscall.WSAProtocolInfo, group uint32, flags uint32) (s syscall.Handle, err error) {
- 	sw.once.Do(sw.init)
-Index: src/net/main_windows_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/main_windows_test.go b/src/net/main_windows_test.go
---- a/src/net/main_windows_test.go	(revision 2a406dc9f1ea7323d6ca9fccb2fe9ddebb6b1cc8)
-+++ b/src/net/main_windows_test.go	(revision 7b1fd7d39c6be0185fbe1d929578ab372ac5c632)
-@@ -8,6 +8,7 @@
- 
- var (
- 	// Placeholders for saving original socket system calls.
-+	origSocket      = socketFunc
- 	origWSASocket   = wsaSocketFunc
- 	origClosesocket = poll.CloseFunc
- 	origConnect     = connectFunc
-@@ -17,6 +18,7 @@
- )
- 
- func installTestHooks() {
-+	socketFunc = sw.Socket
- 	wsaSocketFunc = sw.WSASocket
- 	poll.CloseFunc = sw.Closesocket
- 	connectFunc = sw.Connect
-@@ -26,6 +28,7 @@
- }
- 
- func uninstallTestHooks() {
-+	socketFunc = origSocket
- 	wsaSocketFunc = origWSASocket
- 	poll.CloseFunc = origClosesocket
- 	connectFunc = origConnect
-Index: src/net/sock_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/sock_windows.go b/src/net/sock_windows.go
---- a/src/net/sock_windows.go	(revision 2a406dc9f1ea7323d6ca9fccb2fe9ddebb6b1cc8)
-+++ b/src/net/sock_windows.go	(revision 7b1fd7d39c6be0185fbe1d929578ab372ac5c632)
-@@ -20,6 +20,21 @@
- func sysSocket(family, sotype, proto int) (syscall.Handle, error) {
- 	s, err := wsaSocketFunc(int32(family), int32(sotype), int32(proto),
- 		nil, 0, windows.WSA_FLAG_OVERLAPPED|windows.WSA_FLAG_NO_HANDLE_INHERIT)
-+	if err == nil {
-+		return s, nil
-+	}
-+	// WSA_FLAG_NO_HANDLE_INHERIT flag is not supported on some
-+	// old versions of Windows, see
-+	// https://msdn.microsoft.com/en-us/library/windows/desktop/ms742212(v=vs.85).aspx
-+	// for details. Just use syscall.Socket, if windows.WSASocket failed.
-+
-+	// See ../syscall/exec_unix.go for description of ForkLock.
-+	syscall.ForkLock.RLock()
-+	s, err = socketFunc(family, sotype, proto)
-+	if err == nil {
-+		syscall.CloseOnExec(s)
-+	}
-+	syscall.ForkLock.RUnlock()
- 	if err != nil {
- 		return syscall.InvalidHandle, os.NewSyscallError("socket", err)
- 	}
-Index: src/syscall/exec_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/syscall/exec_windows.go b/src/syscall/exec_windows.go
---- a/src/syscall/exec_windows.go	(revision 2a406dc9f1ea7323d6ca9fccb2fe9ddebb6b1cc8)
-+++ b/src/syscall/exec_windows.go	(revision 979d6d8bab3823ff572ace26767fd2ce3cf351ae)
-@@ -14,7 +14,6 @@
- 	"unsafe"
- )
- 
--// ForkLock is not used on Windows.
- var ForkLock sync.RWMutex
- 
- // EscapeArg rewrites command line argument s as prescribed
-@@ -254,6 +253,9 @@
- var zeroProcAttr ProcAttr
- var zeroSysProcAttr SysProcAttr
- 
-+//go:linkname rtlGetNtVersionNumbers
-+func rtlGetNtVersionNumbers(majorVersion *uint32, minorVersion *uint32, buildNumber *uint32)
-+
- func StartProcess(argv0 string, argv []string, attr *ProcAttr) (pid int, handle uintptr, err error) {
- 	if len(argv0) == 0 {
- 		return 0, 0, EWINDOWS
-@@ -317,6 +319,17 @@
- 		}
- 	}
- 
-+	var maj, min, build uint32
-+	rtlGetNtVersionNumbers(&maj, &min, &build)
-+	isWin7 := maj < 6 || (maj == 6 && min <= 1)
-+	// NT kernel handles are divisible by 4, with the bottom 3 bits left as
-+	// a tag. The fully set tag correlates with the types of handles we're
-+	// concerned about here.  Except, the kernel will interpret some
-+	// special handle values, like -1, -2, and so forth, so kernelbase.dll
-+	// checks to see that those bottom three bits are checked, but that top
-+	// bit is not checked.
-+	isLegacyWin7ConsoleHandle := func(handle Handle) bool { return isWin7 && handle&0x10000003 == 3 }
-+
- 	p, _ := GetCurrentProcess()
- 	parentProcess := p
- 	if sys.ParentProcess != 0 {
-@@ -325,7 +338,15 @@
- 	fd := make([]Handle, len(attr.Files))
- 	for i := range attr.Files {
- 		if attr.Files[i] > 0 {
--			err := DuplicateHandle(p, Handle(attr.Files[i]), parentProcess, &fd[i], 0, true, DUPLICATE_SAME_ACCESS)
-+			destinationProcessHandle := parentProcess
-+
-+			// On Windows 7, console handles aren't real handles, and can only be duplicated
-+			// into the current process, not a parent one, which amounts to the same thing.
-+			if parentProcess != p && isLegacyWin7ConsoleHandle(Handle(attr.Files[i])) {
-+				destinationProcessHandle = p
-+			}
-+
-+			err := DuplicateHandle(p, Handle(attr.Files[i]), destinationProcessHandle, &fd[i], 0, true, DUPLICATE_SAME_ACCESS)
- 			if err != nil {
- 				return 0, 0, err
- 			}
-@@ -356,6 +377,14 @@
- 
- 	fd = append(fd, sys.AdditionalInheritedHandles...)
- 
-+	// On Windows 7, console handles aren't real handles, so don't pass them
-+	// through to PROC_THREAD_ATTRIBUTE_HANDLE_LIST.
-+	for i := range fd {
-+		if isLegacyWin7ConsoleHandle(fd[i]) {
-+			fd[i] = 0
-+		}
-+	}
-+
- 	// The presence of a NULL handle in the list is enough to cause PROC_THREAD_ATTRIBUTE_HANDLE_LIST
- 	// to treat the entire list as empty, so remove NULL handles.
- 	j := 0
-Index: src/runtime/syscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/runtime/syscall_windows.go b/src/runtime/syscall_windows.go
---- a/src/runtime/syscall_windows.go	(revision 979d6d8bab3823ff572ace26767fd2ce3cf351ae)
-+++ b/src/runtime/syscall_windows.go	(revision ac3e93c061779dfefc0dd13a5b6e6f764a25621e)
-@@ -413,10 +413,20 @@
- 
- const _LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800
- 
-+// When available, this function will use LoadLibraryEx with the filename
-+// parameter and the important SEARCH_SYSTEM32 argument. But on systems that
-+// do not have that option, absoluteFilepath should contain a fallback
-+// to the full path inside of system32 for use with vanilla LoadLibrary.
-+//
- //go:linkname syscall_loadsystemlibrary syscall.loadsystemlibrary
--func syscall_loadsystemlibrary(filename *uint16) (handle, err uintptr) {
--	handle, _, err = syscall_SyscallN(uintptr(unsafe.Pointer(_LoadLibraryExW)), uintptr(unsafe.Pointer(filename)), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+func syscall_loadsystemlibrary(filename *uint16, absoluteFilepath *uint16) (handle, err uintptr) {
-+	if useLoadLibraryEx {
-+		handle, _, err = syscall_SyscallN(uintptr(unsafe.Pointer(_LoadLibraryExW)), uintptr(unsafe.Pointer(filename)), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+	} else {
-+		handle, _, err = syscall_SyscallN(uintptr(unsafe.Pointer(_LoadLibraryW)), uintptr(unsafe.Pointer(absoluteFilepath)))
-+	}
- 	KeepAlive(filename)
-+	KeepAlive(absoluteFilepath)
- 	if handle != 0 {
- 		err = 0
- 	}
-Index: src/syscall/dll_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/syscall/dll_windows.go b/src/syscall/dll_windows.go
---- a/src/syscall/dll_windows.go	(revision 979d6d8bab3823ff572ace26767fd2ce3cf351ae)
-+++ b/src/syscall/dll_windows.go	(revision ac3e93c061779dfefc0dd13a5b6e6f764a25621e)
-@@ -45,7 +45,7 @@
- //go:noescape
- func SyscallN(trap uintptr, args ...uintptr) (r1, r2 uintptr, err Errno)
- func loadlibrary(filename *uint16) (handle uintptr, err Errno)
--func loadsystemlibrary(filename *uint16) (handle uintptr, err Errno)
-+func loadsystemlibrary(filename *uint16, absoluteFilepath *uint16) (handle uintptr, err Errno)
- func getprocaddress(handle uintptr, procname *uint8) (proc uintptr, err Errno)
- 
- // A DLL implements access to a single DLL.
-@@ -54,6 +54,9 @@
- 	Handle Handle
- }
- 
-+//go:linkname getSystemDirectory
-+func getSystemDirectory() string // Implemented in runtime package.
-+
- // LoadDLL loads the named DLL file into memory.
- //
- // If name is not an absolute path and is not a known system DLL used by
-@@ -70,7 +73,11 @@
- 	var h uintptr
- 	var e Errno
- 	if sysdll.IsSystemDLL[name] {
--		h, e = loadsystemlibrary(namep)
-+		absoluteFilepathp, err := UTF16PtrFromString(getSystemDirectory() + name)
-+		if err != nil {
-+			return nil, err
-+		}
-+		h, e = loadsystemlibrary(namep, absoluteFilepathp)
- 	} else {
- 		h, e = loadlibrary(namep)
- 	}

.github/patch/go1.25.patch

@@ -1,884 +0,0 @@
-Subject: [PATCH] Revert "os: remove 5ms sleep on Windows in (*Process).Wait"
-Fix os.RemoveAll not working on Windows7
-Revert "runtime: always use LoadLibraryEx to load system libraries"
-Revert "syscall: remove Windows 7 console handle workaround"
-Revert "net: remove sysSocket fallback for Windows 7"
-Revert "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
----
-Index: src/crypto/internal/sysrand/rand_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/crypto/internal/sysrand/rand_windows.go b/src/crypto/internal/sysrand/rand_windows.go
---- a/src/crypto/internal/sysrand/rand_windows.go	(revision 439ff996f0ee506fc2eb84b7f11ffc360a6299f2)
-+++ b/src/crypto/internal/sysrand/rand_windows.go	(revision 466f6c7a29bc098b0d4c987b803c779222894a11)
-@@ -7,5 +7,26 @@
- import "internal/syscall/windows"
- 
- func read(b []byte) error {
--	return windows.ProcessPrng(b)
-+	// RtlGenRandom only returns 1<<32-1 bytes at a time. We only read at
-+	// most 1<<31-1 bytes at a time so that  this works the same on 32-bit
-+	// and 64-bit systems.
-+	return batched(windows.RtlGenRandom, 1<<31-1)(b)
-+}
-+
-+// batched returns a function that calls f to populate a []byte by chunking it
-+// into subslices of, at most, readMax bytes.
-+func batched(f func([]byte) error, readMax int) func([]byte) error {
-+	return func(out []byte) error {
-+		for len(out) > 0 {
-+			read := len(out)
-+			if read > readMax {
-+				read = readMax
-+			}
-+			if err := f(out[:read]); err != nil {
-+				return err
-+			}
-+			out = out[read:]
-+		}
-+		return nil
-+	}
- }
-Index: src/crypto/rand/rand.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/crypto/rand/rand.go b/src/crypto/rand/rand.go
---- a/src/crypto/rand/rand.go	(revision 439ff996f0ee506fc2eb84b7f11ffc360a6299f2)
-+++ b/src/crypto/rand/rand.go	(revision 466f6c7a29bc098b0d4c987b803c779222894a11)
-@@ -22,7 +22,7 @@
- //   - On legacy Linux (< 3.17), Reader opens /dev/urandom on first use.
- //   - On macOS, iOS, and OpenBSD Reader, uses arc4random_buf(3).
- //   - On NetBSD, Reader uses the kern.arandom sysctl.
--//   - On Windows, Reader uses the ProcessPrng API.
-+//   - On Windows systems, Reader uses the RtlGenRandom API.
- //   - On js/wasm, Reader uses the Web Crypto API.
- //   - On wasip1/wasm, Reader uses random_get.
- //
-Index: src/internal/syscall/windows/syscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/internal/syscall/windows/syscall_windows.go b/src/internal/syscall/windows/syscall_windows.go
---- a/src/internal/syscall/windows/syscall_windows.go	(revision 439ff996f0ee506fc2eb84b7f11ffc360a6299f2)
-+++ b/src/internal/syscall/windows/syscall_windows.go	(revision 466f6c7a29bc098b0d4c987b803c779222894a11)
-@@ -419,7 +419,7 @@
- //sys	DestroyEnvironmentBlock(block *uint16) (err error) = userenv.DestroyEnvironmentBlock
- //sys	CreateEvent(eventAttrs *SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle syscall.Handle, err error) = kernel32.CreateEventW
- 
--//sys	ProcessPrng(buf []byte) (err error) = bcryptprimitives.ProcessPrng
-+//sys	RtlGenRandom(buf []byte) (err error) = advapi32.SystemFunction036
- 
- type FILE_ID_BOTH_DIR_INFO struct {
- 	NextEntryOffset uint32
-Index: src/internal/syscall/windows/zsyscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/internal/syscall/windows/zsyscall_windows.go b/src/internal/syscall/windows/zsyscall_windows.go
---- a/src/internal/syscall/windows/zsyscall_windows.go	(revision 439ff996f0ee506fc2eb84b7f11ffc360a6299f2)
-+++ b/src/internal/syscall/windows/zsyscall_windows.go	(revision 466f6c7a29bc098b0d4c987b803c779222894a11)
-@@ -38,7 +38,6 @@
- 
- var (
- 	modadvapi32         = syscall.NewLazyDLL(sysdll.Add("advapi32.dll"))
--	modbcryptprimitives = syscall.NewLazyDLL(sysdll.Add("bcryptprimitives.dll"))
- 	modiphlpapi         = syscall.NewLazyDLL(sysdll.Add("iphlpapi.dll"))
- 	modkernel32         = syscall.NewLazyDLL(sysdll.Add("kernel32.dll"))
- 	modnetapi32         = syscall.NewLazyDLL(sysdll.Add("netapi32.dll"))
-@@ -65,7 +64,7 @@
- 	procSetEntriesInAclW                  = modadvapi32.NewProc("SetEntriesInAclW")
- 	procSetNamedSecurityInfoW             = modadvapi32.NewProc("SetNamedSecurityInfoW")
- 	procSetTokenInformation               = modadvapi32.NewProc("SetTokenInformation")
--	procProcessPrng                       = modbcryptprimitives.NewProc("ProcessPrng")
-+	procSystemFunction036                 = modadvapi32.NewProc("SystemFunction036")
- 	procGetAdaptersAddresses              = modiphlpapi.NewProc("GetAdaptersAddresses")
- 	procCreateEventW                      = modkernel32.NewProc("CreateEventW")
- 	procCreateIoCompletionPort            = modkernel32.NewProc("CreateIoCompletionPort")
-@@ -270,12 +269,12 @@
- 	return
- }
- 
--func ProcessPrng(buf []byte) (err error) {
-+func RtlGenRandom(buf []byte) (err error) {
- 	var _p0 *byte
- 	if len(buf) > 0 {
- 		_p0 = &buf[0]
- 	}
--	r1, _, e1 := syscall.SyscallN(procProcessPrng.Addr(), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
-+	r1, _, e1 := syscall.SyscallN(procSystemFunction036.Addr(), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
- 	if r1 == 0 {
- 		err = errnoErr(e1)
- 	}
-Index: src/runtime/os_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/runtime/os_windows.go b/src/runtime/os_windows.go
---- a/src/runtime/os_windows.go	(revision 439ff996f0ee506fc2eb84b7f11ffc360a6299f2)
-+++ b/src/runtime/os_windows.go	(revision f6bddda4e8ff58a957462a1a09562924d5f3d05c)
-@@ -39,8 +39,8 @@
- //go:cgo_import_dynamic runtime._GetSystemInfo GetSystemInfo%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._GetThreadContext GetThreadContext%2 "kernel32.dll"
- //go:cgo_import_dynamic runtime._SetThreadContext SetThreadContext%2 "kernel32.dll"
--//go:cgo_import_dynamic runtime._LoadLibraryExW LoadLibraryExW%3 "kernel32.dll"
- //go:cgo_import_dynamic runtime._LoadLibraryW LoadLibraryW%1 "kernel32.dll"
-+//go:cgo_import_dynamic runtime._LoadLibraryA LoadLibraryA%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._PostQueuedCompletionStatus PostQueuedCompletionStatus%4 "kernel32.dll"
- //go:cgo_import_dynamic runtime._QueryPerformanceCounter QueryPerformanceCounter%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._QueryPerformanceFrequency QueryPerformanceFrequency%1 "kernel32.dll"
-@@ -74,7 +74,6 @@
- 	// Following syscalls are available on every Windows PC.
- 	// All these variables are set by the Windows executable
- 	// loader before the Go program starts.
--	_AddVectoredContinueHandler,
- 	_AddVectoredExceptionHandler,
- 	_CloseHandle,
- 	_CreateEventA,
-@@ -97,8 +96,8 @@
- 	_GetSystemInfo,
- 	_GetThreadContext,
- 	_SetThreadContext,
--	_LoadLibraryExW,
- 	_LoadLibraryW,
-+	_LoadLibraryA,
- 	_PostQueuedCompletionStatus,
- 	_QueryPerformanceCounter,
- 	_QueryPerformanceFrequency,
-@@ -127,8 +126,23 @@
- 	_WriteFile,
- 	_ stdFunction
- 
--	// Use ProcessPrng to generate cryptographically random data.
--	_ProcessPrng stdFunction
-+	// Following syscalls are only available on some Windows PCs.
-+	// We will load syscalls, if available, before using them.
-+	_AddDllDirectory,
-+	_AddVectoredContinueHandler,
-+	_LoadLibraryExA,
-+	_LoadLibraryExW,
-+	_ stdFunction
-+
-+	// Use RtlGenRandom to generate cryptographically random data.
-+	// This approach has been recommended by Microsoft (see issue
-+	// 15589 for details).
-+	// The RtlGenRandom is not listed in advapi32.dll, instead
-+	// RtlGenRandom function can be found by searching for SystemFunction036.
-+	// Also some versions of Mingw cannot link to SystemFunction036
-+	// when building executable as Cgo. So load SystemFunction036
-+	// manually during runtime startup.
-+	_RtlGenRandom stdFunction
- 
- 	// Load ntdll.dll manually during startup, otherwise Mingw
- 	// links wrong printf function to cgo executable (see issue
-@@ -145,13 +159,6 @@
- 	_ stdFunction
- )
- 
--var (
--	bcryptprimitivesdll = [...]uint16{'b', 'c', 'r', 'y', 'p', 't', 'p', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', 's', '.', 'd', 'l', 'l', 0}
--	ntdlldll            = [...]uint16{'n', 't', 'd', 'l', 'l', '.', 'd', 'l', 'l', 0}
--	powrprofdll         = [...]uint16{'p', 'o', 'w', 'r', 'p', 'r', 'o', 'f', '.', 'd', 'l', 'l', 0}
--	winmmdll            = [...]uint16{'w', 'i', 'n', 'm', 'm', '.', 'd', 'l', 'l', 0}
--)
--
- // Function to be called by windows CreateThread
- // to start new os thread.
- func tstart_stdcall(newm *m)
-@@ -244,8 +251,18 @@
- 	return unsafe.String(&sysDirectory[0], sysDirectoryLen)
- }
- 
--func windowsLoadSystemLib(name []uint16) uintptr {
--	return stdcall3(_LoadLibraryExW, uintptr(unsafe.Pointer(&name[0])), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+//go:linkname syscall_getSystemDirectory syscall.getSystemDirectory
-+func syscall_getSystemDirectory() string {
-+	return unsafe.String(&sysDirectory[0], sysDirectoryLen)
-+}
-+
-+func windowsLoadSystemLib(name []byte) uintptr {
-+	if useLoadLibraryEx {
-+		return stdcall3(_LoadLibraryExA, uintptr(unsafe.Pointer(&name[0])), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+	} else {
-+		absName := append(sysDirectory[:sysDirectoryLen], name...)
-+		return stdcall1(_LoadLibraryA, uintptr(unsafe.Pointer(&absName[0])))
-+	}
- }
- 
- //go:linkname windows_QueryPerformanceCounter internal/syscall/windows.QueryPerformanceCounter
-@@ -263,13 +280,28 @@
- }
- 
- func loadOptionalSyscalls() {
--	bcryptPrimitives := windowsLoadSystemLib(bcryptprimitivesdll[:])
--	if bcryptPrimitives == 0 {
--		throw("bcryptprimitives.dll not found")
-+	var kernel32dll = []byte("kernel32.dll\000")
-+	k32 := stdcall1(_LoadLibraryA, uintptr(unsafe.Pointer(&kernel32dll[0])))
-+	if k32 == 0 {
-+		throw("kernel32.dll not found")
- 	}
--	_ProcessPrng = windowsFindfunc(bcryptPrimitives, []byte("ProcessPrng\000"))
-+	_AddDllDirectory = windowsFindfunc(k32, []byte("AddDllDirectory\000"))
-+	_AddVectoredContinueHandler = windowsFindfunc(k32, []byte("AddVectoredContinueHandler\000"))
-+	_LoadLibraryExA = windowsFindfunc(k32, []byte("LoadLibraryExA\000"))
-+	_LoadLibraryExW = windowsFindfunc(k32, []byte("LoadLibraryExW\000"))
-+	useLoadLibraryEx = (_LoadLibraryExW != nil && _LoadLibraryExA != nil && _AddDllDirectory != nil)
-+
-+	initSysDirectory()
- 
--	n32 := windowsLoadSystemLib(ntdlldll[:])
-+	var advapi32dll = []byte("advapi32.dll\000")
-+	a32 := windowsLoadSystemLib(advapi32dll)
-+	if a32 == 0 {
-+		throw("advapi32.dll not found")
-+	}
-+	_RtlGenRandom = windowsFindfunc(a32, []byte("SystemFunction036\000"))
-+
-+	var ntdll = []byte("ntdll.dll\000")
-+	n32 := windowsLoadSystemLib(ntdll)
- 	if n32 == 0 {
- 		throw("ntdll.dll not found")
- 	}
-@@ -298,7 +330,7 @@
- 		context  uintptr
- 	}
- 
--	powrprof := windowsLoadSystemLib(powrprofdll[:])
-+	powrprof := windowsLoadSystemLib([]byte("powrprof.dll\000"))
- 	if powrprof == 0 {
- 		return // Running on Windows 7, where we don't need it anyway.
- 	}
-@@ -357,6 +389,22 @@
- // in sys_windows_386.s and sys_windows_amd64.s:
- func getlasterror() uint32
- 
-+// When loading DLLs, we prefer to use LoadLibraryEx with
-+// LOAD_LIBRARY_SEARCH_* flags, if available. LoadLibraryEx is not
-+// available on old Windows, though, and the LOAD_LIBRARY_SEARCH_*
-+// flags are not available on some versions of Windows without a
-+// security patch.
-+//
-+// https://msdn.microsoft.com/en-us/library/ms684179(v=vs.85).aspx says:
-+// "Windows 7, Windows Server 2008 R2, Windows Vista, and Windows
-+// Server 2008: The LOAD_LIBRARY_SEARCH_* flags are available on
-+// systems that have KB2533623 installed. To determine whether the
-+// flags are available, use GetProcAddress to get the address of the
-+// AddDllDirectory, RemoveDllDirectory, or SetDefaultDllDirectories
-+// function. If GetProcAddress succeeds, the LOAD_LIBRARY_SEARCH_*
-+// flags can be used with LoadLibraryEx."
-+var useLoadLibraryEx bool
-+
- var timeBeginPeriodRetValue uint32
- 
- // osRelaxMinNS indicates that sysmon shouldn't osRelax if the next
-@@ -430,7 +478,8 @@
- 		// Only load winmm.dll if we need it.
- 		// This avoids a dependency on winmm.dll for Go programs
- 		// that run on new Windows versions.
--		m32 := windowsLoadSystemLib(winmmdll[:])
-+		var winmmdll = []byte("winmm.dll\000")
-+		m32 := windowsLoadSystemLib(winmmdll)
- 		if m32 == 0 {
- 			print("runtime: LoadLibraryExW failed; errno=", getlasterror(), "\n")
- 			throw("winmm.dll not found")
-@@ -471,6 +520,28 @@
- 	canUseLongPaths = true
- }
- 
-+var osVersionInfo struct {
-+	majorVersion uint32
-+	minorVersion uint32
-+	buildNumber  uint32
-+}
-+
-+func initOsVersionInfo() {
-+	info := _OSVERSIONINFOW{}
-+	info.osVersionInfoSize = uint32(unsafe.Sizeof(info))
-+	stdcall1(_RtlGetVersion, uintptr(unsafe.Pointer(&info)))
-+	osVersionInfo.majorVersion = info.majorVersion
-+	osVersionInfo.minorVersion = info.minorVersion
-+	osVersionInfo.buildNumber = info.buildNumber
-+}
-+
-+//go:linkname rtlGetNtVersionNumbers syscall.rtlGetNtVersionNumbers
-+func rtlGetNtVersionNumbers(majorVersion *uint32, minorVersion *uint32, buildNumber *uint32) {
-+	*majorVersion = osVersionInfo.majorVersion
-+	*minorVersion = osVersionInfo.minorVersion
-+	*buildNumber = osVersionInfo.buildNumber
-+}
-+
- func osinit() {
- 	asmstdcallAddr = unsafe.Pointer(abi.FuncPCABI0(asmstdcall))
- 
-@@ -483,8 +554,8 @@
- 	initHighResTimer()
- 	timeBeginPeriodRetValue = osRelax(false)
- 
--	initSysDirectory()
- 	initLongPathSupport()
-+	initOsVersionInfo()
- 
- 	numCPUStartup = getCPUCount()
- 
-@@ -500,7 +571,7 @@
- //go:nosplit
- func readRandom(r []byte) int {
- 	n := 0
--	if stdcall2(_ProcessPrng, uintptr(unsafe.Pointer(&r[0])), uintptr(len(r)))&0xff != 0 {
-+	if stdcall2(_RtlGenRandom, uintptr(unsafe.Pointer(&r[0])), uintptr(len(r)))&0xff != 0 {
- 		n = len(r)
- 	}
- 	return n
-Index: src/net/hook_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/hook_windows.go b/src/net/hook_windows.go
---- a/src/net/hook_windows.go	(revision 466f6c7a29bc098b0d4c987b803c779222894a11)
-+++ b/src/net/hook_windows.go	(revision 1bdabae205052afe1dadb2ad6f1ba612cdbc532a)
-@@ -13,6 +13,7 @@
- 	hostsFilePath = windows.GetSystemDirectory() + "/Drivers/etc/hosts"
- 
- 	// Placeholders for socket system calls.
-+	socketFunc    func(int, int, int) (syscall.Handle, error)                                                 = syscall.Socket
- 	wsaSocketFunc func(int32, int32, int32, *syscall.WSAProtocolInfo, uint32, uint32) (syscall.Handle, error) = windows.WSASocket
- 	connectFunc   func(syscall.Handle, syscall.Sockaddr) error                                                = syscall.Connect
- 	listenFunc    func(syscall.Handle, int) error                                                             = syscall.Listen
-Index: src/net/internal/socktest/main_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/main_test.go b/src/net/internal/socktest/main_test.go
---- a/src/net/internal/socktest/main_test.go	(revision 466f6c7a29bc098b0d4c987b803c779222894a11)
-+++ b/src/net/internal/socktest/main_test.go	(revision 1bdabae205052afe1dadb2ad6f1ba612cdbc532a)
-@@ -2,7 +2,7 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
- 
--//go:build !js && !plan9 && !wasip1 && !windows
-+//go:build !js && !plan9 && !wasip1
- 
- package socktest_test
- 
-Index: src/net/internal/socktest/main_windows_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/main_windows_test.go b/src/net/internal/socktest/main_windows_test.go
-new file mode 100644
---- /dev/null	(revision 1bdabae205052afe1dadb2ad6f1ba612cdbc532a)
-+++ b/src/net/internal/socktest/main_windows_test.go	(revision 1bdabae205052afe1dadb2ad6f1ba612cdbc532a)
-@@ -0,0 +1,22 @@
-+// Copyright 2015 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 socktest_test
-+
-+import "syscall"
-+
-+var (
-+	socketFunc func(int, int, int) (syscall.Handle, error)
-+	closeFunc  func(syscall.Handle) error
-+)
-+
-+func installTestHooks() {
-+	socketFunc = sw.Socket
-+	closeFunc = sw.Closesocket
-+}
-+
-+func uninstallTestHooks() {
-+	socketFunc = syscall.Socket
-+	closeFunc = syscall.Closesocket
-+}
-Index: src/net/internal/socktest/sys_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/sys_windows.go b/src/net/internal/socktest/sys_windows.go
---- a/src/net/internal/socktest/sys_windows.go	(revision 466f6c7a29bc098b0d4c987b803c779222894a11)
-+++ b/src/net/internal/socktest/sys_windows.go	(revision 1bdabae205052afe1dadb2ad6f1ba612cdbc532a)
-@@ -9,6 +9,38 @@
- 	"syscall"
- )
- 
-+// Socket wraps [syscall.Socket].
-+func (sw *Switch) Socket(family, sotype, proto int) (s syscall.Handle, err error) {
-+	sw.once.Do(sw.init)
-+
-+	so := &Status{Cookie: cookie(family, sotype, proto)}
-+	sw.fmu.RLock()
-+	f, _ := sw.fltab[FilterSocket]
-+	sw.fmu.RUnlock()
-+
-+	af, err := f.apply(so)
-+	if err != nil {
-+		return syscall.InvalidHandle, err
-+	}
-+	s, so.Err = syscall.Socket(family, sotype, proto)
-+	if err = af.apply(so); err != nil {
-+		if so.Err == nil {
-+			syscall.Closesocket(s)
-+		}
-+		return syscall.InvalidHandle, err
-+	}
-+
-+	sw.smu.Lock()
-+	defer sw.smu.Unlock()
-+	if so.Err != nil {
-+		sw.stats.getLocked(so.Cookie).OpenFailed++
-+		return syscall.InvalidHandle, so.Err
-+	}
-+	nso := sw.addLocked(s, family, sotype, proto)
-+	sw.stats.getLocked(nso.Cookie).Opened++
-+	return s, nil
-+}
-+
- // WSASocket wraps [syscall.WSASocket].
- func (sw *Switch) WSASocket(family, sotype, proto int32, protinfo *syscall.WSAProtocolInfo, group uint32, flags uint32) (s syscall.Handle, err error) {
- 	sw.once.Do(sw.init)
-Index: src/net/main_windows_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/main_windows_test.go b/src/net/main_windows_test.go
---- a/src/net/main_windows_test.go	(revision 466f6c7a29bc098b0d4c987b803c779222894a11)
-+++ b/src/net/main_windows_test.go	(revision 1bdabae205052afe1dadb2ad6f1ba612cdbc532a)
-@@ -12,6 +12,7 @@
- 
- var (
- 	// Placeholders for saving original socket system calls.
-+	origSocket      = socketFunc
- 	origWSASocket   = wsaSocketFunc
- 	origClosesocket = poll.CloseFunc
- 	origConnect     = connectFunc
-@@ -21,6 +22,7 @@
- )
- 
- func installTestHooks() {
-+	socketFunc = sw.Socket
- 	wsaSocketFunc = sw.WSASocket
- 	poll.CloseFunc = sw.Closesocket
- 	connectFunc = sw.Connect
-@@ -30,6 +32,7 @@
- }
- 
- func uninstallTestHooks() {
-+	socketFunc = origSocket
- 	wsaSocketFunc = origWSASocket
- 	poll.CloseFunc = origClosesocket
- 	connectFunc = origConnect
-Index: src/net/sock_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/sock_windows.go b/src/net/sock_windows.go
---- a/src/net/sock_windows.go	(revision 466f6c7a29bc098b0d4c987b803c779222894a11)
-+++ b/src/net/sock_windows.go	(revision 1bdabae205052afe1dadb2ad6f1ba612cdbc532a)
-@@ -20,6 +20,21 @@
- func sysSocket(family, sotype, proto int) (syscall.Handle, error) {
- 	s, err := wsaSocketFunc(int32(family), int32(sotype), int32(proto),
- 		nil, 0, windows.WSA_FLAG_OVERLAPPED|windows.WSA_FLAG_NO_HANDLE_INHERIT)
-+	if err == nil {
-+		return s, nil
-+	}
-+	// WSA_FLAG_NO_HANDLE_INHERIT flag is not supported on some
-+	// old versions of Windows, see
-+	// https://msdn.microsoft.com/en-us/library/windows/desktop/ms742212(v=vs.85).aspx
-+	// for details. Just use syscall.Socket, if windows.WSASocket failed.
-+
-+	// See ../syscall/exec_unix.go for description of ForkLock.
-+	syscall.ForkLock.RLock()
-+	s, err = socketFunc(family, sotype, proto)
-+	if err == nil {
-+		syscall.CloseOnExec(s)
-+	}
-+	syscall.ForkLock.RUnlock()
- 	if err != nil {
- 		return syscall.InvalidHandle, os.NewSyscallError("socket", err)
- 	}
-Index: src/syscall/exec_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/syscall/exec_windows.go b/src/syscall/exec_windows.go
---- a/src/syscall/exec_windows.go	(revision 466f6c7a29bc098b0d4c987b803c779222894a11)
-+++ b/src/syscall/exec_windows.go	(revision a90777dcf692dd2168577853ba743b4338721b06)
-@@ -14,7 +14,6 @@
- 	"unsafe"
- )
- 
--// ForkLock is not used on Windows.
- var ForkLock sync.RWMutex
- 
- // EscapeArg rewrites command line argument s as prescribed
-@@ -254,6 +253,9 @@
- var zeroProcAttr ProcAttr
- var zeroSysProcAttr SysProcAttr
- 
-+//go:linkname rtlGetNtVersionNumbers
-+func rtlGetNtVersionNumbers(majorVersion *uint32, minorVersion *uint32, buildNumber *uint32)
-+
- func StartProcess(argv0 string, argv []string, attr *ProcAttr) (pid int, handle uintptr, err error) {
- 	if len(argv0) == 0 {
- 		return 0, 0, EWINDOWS
-@@ -317,6 +319,17 @@
- 		}
- 	}
- 
-+	var maj, min, build uint32
-+	rtlGetNtVersionNumbers(&maj, &min, &build)
-+	isWin7 := maj < 6 || (maj == 6 && min <= 1)
-+	// NT kernel handles are divisible by 4, with the bottom 3 bits left as
-+	// a tag. The fully set tag correlates with the types of handles we're
-+	// concerned about here.  Except, the kernel will interpret some
-+	// special handle values, like -1, -2, and so forth, so kernelbase.dll
-+	// checks to see that those bottom three bits are checked, but that top
-+	// bit is not checked.
-+	isLegacyWin7ConsoleHandle := func(handle Handle) bool { return isWin7 && handle&0x10000003 == 3 }
-+
- 	p, _ := GetCurrentProcess()
- 	parentProcess := p
- 	if sys.ParentProcess != 0 {
-@@ -325,7 +338,15 @@
- 	fd := make([]Handle, len(attr.Files))
- 	for i := range attr.Files {
- 		if attr.Files[i] > 0 {
--			err := DuplicateHandle(p, Handle(attr.Files[i]), parentProcess, &fd[i], 0, true, DUPLICATE_SAME_ACCESS)
-+			destinationProcessHandle := parentProcess
-+
-+			// On Windows 7, console handles aren't real handles, and can only be duplicated
-+			// into the current process, not a parent one, which amounts to the same thing.
-+			if parentProcess != p && isLegacyWin7ConsoleHandle(Handle(attr.Files[i])) {
-+				destinationProcessHandle = p
-+			}
-+
-+			err := DuplicateHandle(p, Handle(attr.Files[i]), destinationProcessHandle, &fd[i], 0, true, DUPLICATE_SAME_ACCESS)
- 			if err != nil {
- 				return 0, 0, err
- 			}
-@@ -356,6 +377,14 @@
- 
- 	fd = append(fd, sys.AdditionalInheritedHandles...)
- 
-+	// On Windows 7, console handles aren't real handles, so don't pass them
-+	// through to PROC_THREAD_ATTRIBUTE_HANDLE_LIST.
-+	for i := range fd {
-+		if isLegacyWin7ConsoleHandle(fd[i]) {
-+			fd[i] = 0
-+		}
-+	}
-+
- 	// The presence of a NULL handle in the list is enough to cause PROC_THREAD_ATTRIBUTE_HANDLE_LIST
- 	// to treat the entire list as empty, so remove NULL handles.
- 	j := 0
-Index: src/runtime/syscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/runtime/syscall_windows.go b/src/runtime/syscall_windows.go
---- a/src/runtime/syscall_windows.go	(revision a90777dcf692dd2168577853ba743b4338721b06)
-+++ b/src/runtime/syscall_windows.go	(revision f6bddda4e8ff58a957462a1a09562924d5f3d05c)
-@@ -413,10 +413,20 @@
- 
- const _LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800
- 
-+// When available, this function will use LoadLibraryEx with the filename
-+// parameter and the important SEARCH_SYSTEM32 argument. But on systems that
-+// do not have that option, absoluteFilepath should contain a fallback
-+// to the full path inside of system32 for use with vanilla LoadLibrary.
-+//
- //go:linkname syscall_loadsystemlibrary syscall.loadsystemlibrary
--func syscall_loadsystemlibrary(filename *uint16) (handle, err uintptr) {
--	handle, _, err = syscall_SyscallN(uintptr(unsafe.Pointer(_LoadLibraryExW)), uintptr(unsafe.Pointer(filename)), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+func syscall_loadsystemlibrary(filename *uint16, absoluteFilepath *uint16) (handle, err uintptr) {
-+	if useLoadLibraryEx {
-+		handle, _, err = syscall_SyscallN(uintptr(unsafe.Pointer(_LoadLibraryExW)), uintptr(unsafe.Pointer(filename)), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+	} else {
-+		handle, _, err = syscall_SyscallN(uintptr(unsafe.Pointer(_LoadLibraryW)), uintptr(unsafe.Pointer(absoluteFilepath)))
-+	}
- 	KeepAlive(filename)
-+	KeepAlive(absoluteFilepath)
- 	if handle != 0 {
- 		err = 0
- 	}
-Index: src/syscall/dll_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/syscall/dll_windows.go b/src/syscall/dll_windows.go
---- a/src/syscall/dll_windows.go	(revision a90777dcf692dd2168577853ba743b4338721b06)
-+++ b/src/syscall/dll_windows.go	(revision f6bddda4e8ff58a957462a1a09562924d5f3d05c)
-@@ -45,7 +45,7 @@
- //go:noescape
- func SyscallN(trap uintptr, args ...uintptr) (r1, r2 uintptr, err Errno)
- func loadlibrary(filename *uint16) (handle uintptr, err Errno)
--func loadsystemlibrary(filename *uint16) (handle uintptr, err Errno)
-+func loadsystemlibrary(filename *uint16, absoluteFilepath *uint16) (handle uintptr, err Errno)
- func getprocaddress(handle uintptr, procname *uint8) (proc uintptr, err Errno)
- 
- // A DLL implements access to a single DLL.
-@@ -54,6 +54,9 @@
- 	Handle Handle
- }
- 
-+//go:linkname getSystemDirectory
-+func getSystemDirectory() string // Implemented in runtime package.
-+
- // LoadDLL loads the named DLL file into memory.
- //
- // If name is not an absolute path and is not a known system DLL used by
-@@ -70,7 +73,11 @@
- 	var h uintptr
- 	var e Errno
- 	if sysdll.IsSystemDLL[name] {
--		h, e = loadsystemlibrary(namep)
-+		absoluteFilepathp, err := UTF16PtrFromString(getSystemDirectory() + name)
-+		if err != nil {
-+			return nil, err
-+		}
-+		h, e = loadsystemlibrary(namep, absoluteFilepathp)
- 	} else {
- 		h, e = loadlibrary(namep)
- 	}
-Index: src/os/removeall_at.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/os/removeall_at.go b/src/os/removeall_at.go
---- a/src/os/removeall_at.go	(revision f6bddda4e8ff58a957462a1a09562924d5f3d05c)
-+++ b/src/os/removeall_at.go	(revision bed309eff415bcb3c77dd4bc3277b682b89a388d)
-@@ -2,7 +2,7 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
- 
--//go:build unix || wasip1 || windows
-+//go:build unix || wasip1
- 
- package os
- 
-@@ -175,3 +175,25 @@
- 	}
- 	return newDirFile(fd, name)
- }
-+
-+func rootRemoveAll(r *Root, name string) error {
-+	// Consistency with os.RemoveAll: Strip trailing /s from the name,
-+	// so RemoveAll("not_a_directory/") succeeds.
-+	for len(name) > 0 && IsPathSeparator(name[len(name)-1]) {
-+		name = name[:len(name)-1]
-+	}
-+	if endsWithDot(name) {
-+		// Consistency with os.RemoveAll: Return EINVAL when trying to remove .
-+		return &PathError{Op: "RemoveAll", Path: name, Err: syscall.EINVAL}
-+	}
-+	_, err := doInRoot(r, name, nil, func(parent sysfdType, name string) (struct{}, error) {
-+		return struct{}{}, removeAllFrom(parent, name)
-+	})
-+	if IsNotExist(err) {
-+		return nil
-+	}
-+	if err != nil {
-+		return &PathError{Op: "RemoveAll", Path: name, Err: underlyingError(err)}
-+	}
-+	return err
-+}
-Index: src/os/removeall_noat.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/os/removeall_noat.go b/src/os/removeall_noat.go
---- a/src/os/removeall_noat.go	(revision f6bddda4e8ff58a957462a1a09562924d5f3d05c)
-+++ b/src/os/removeall_noat.go	(revision bed309eff415bcb3c77dd4bc3277b682b89a388d)
-@@ -2,7 +2,7 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
- 
--//go:build (js && wasm) || plan9
-+//go:build (js && wasm) || plan9 || windows
- 
- package os
- 
-@@ -140,3 +140,22 @@
- 	}
- 	return err
- }
-+
-+func rootRemoveAll(r *Root, name string) error {
-+	if endsWithDot(name) {
-+		// Consistency with os.RemoveAll: Return EINVAL when trying to remove .
-+		return &PathError{Op: "RemoveAll", Path: name, Err: syscall.EINVAL}
-+	}
-+	if err := checkPathEscapesLstat(r, name); err != nil {
-+		if err == syscall.ENOTDIR {
-+			// Some intermediate path component is not a directory.
-+			// RemoveAll treats this as success (since the target doesn't exist).
-+			return nil
-+		}
-+		return &PathError{Op: "RemoveAll", Path: name, Err: err}
-+	}
-+	if err := RemoveAll(joinPath(r.root.name, name)); err != nil {
-+		return &PathError{Op: "RemoveAll", Path: name, Err: underlyingError(err)}
-+	}
-+	return nil
-+}
-Index: src/os/root_noopenat.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/os/root_noopenat.go b/src/os/root_noopenat.go
---- a/src/os/root_noopenat.go	(revision f6bddda4e8ff58a957462a1a09562924d5f3d05c)
-+++ b/src/os/root_noopenat.go	(revision bed309eff415bcb3c77dd4bc3277b682b89a388d)
-@@ -11,7 +11,6 @@
- 	"internal/filepathlite"
- 	"internal/stringslite"
- 	"sync/atomic"
--	"syscall"
- 	"time"
- )
- 
-@@ -185,25 +184,6 @@
- 	}
- 	return nil
- }
--
--func rootRemoveAll(r *Root, name string) error {
--	if endsWithDot(name) {
--		// Consistency with os.RemoveAll: Return EINVAL when trying to remove .
--		return &PathError{Op: "RemoveAll", Path: name, Err: syscall.EINVAL}
--	}
--	if err := checkPathEscapesLstat(r, name); err != nil {
--		if err == syscall.ENOTDIR {
--			// Some intermediate path component is not a directory.
--			// RemoveAll treats this as success (since the target doesn't exist).
--			return nil
--		}
--		return &PathError{Op: "RemoveAll", Path: name, Err: err}
--	}
--	if err := RemoveAll(joinPath(r.root.name, name)); err != nil {
--		return &PathError{Op: "RemoveAll", Path: name, Err: underlyingError(err)}
--	}
--	return nil
--}
- 
- func rootReadlink(r *Root, name string) (string, error) {
- 	if err := checkPathEscapesLstat(r, name); err != nil {
-Index: src/os/root_openat.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/os/root_openat.go b/src/os/root_openat.go
---- a/src/os/root_openat.go	(revision f6bddda4e8ff58a957462a1a09562924d5f3d05c)
-+++ b/src/os/root_openat.go	(revision bed309eff415bcb3c77dd4bc3277b682b89a388d)
-@@ -196,28 +196,6 @@
- 	return nil
- }
- 
--func rootRemoveAll(r *Root, name string) error {
--	// Consistency with os.RemoveAll: Strip trailing /s from the name,
--	// so RemoveAll("not_a_directory/") succeeds.
--	for len(name) > 0 && IsPathSeparator(name[len(name)-1]) {
--		name = name[:len(name)-1]
--	}
--	if endsWithDot(name) {
--		// Consistency with os.RemoveAll: Return EINVAL when trying to remove .
--		return &PathError{Op: "RemoveAll", Path: name, Err: syscall.EINVAL}
--	}
--	_, err := doInRoot(r, name, nil, func(parent sysfdType, name string) (struct{}, error) {
--		return struct{}{}, removeAllFrom(parent, name)
--	})
--	if IsNotExist(err) {
--		return nil
--	}
--	if err != nil {
--		return &PathError{Op: "RemoveAll", Path: name, Err: underlyingError(err)}
--	}
--	return err
--}
--
- func rootRename(r *Root, oldname, newname string) error {
- 	_, err := doInRoot(r, oldname, nil, func(oldparent sysfdType, oldname string) (struct{}, error) {
- 		_, err := doInRoot(r, newname, nil, func(newparent sysfdType, newname string) (struct{}, error) {
-Index: src/os/root_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/os/root_windows.go b/src/os/root_windows.go
---- a/src/os/root_windows.go	(revision f6bddda4e8ff58a957462a1a09562924d5f3d05c)
-+++ b/src/os/root_windows.go	(revision bed309eff415bcb3c77dd4bc3277b682b89a388d)
-@@ -402,3 +402,14 @@
- 	}
- 	return fi.Mode(), nil
- }
-+
-+func checkPathEscapes(r *Root, name string) error {
-+	if !filepathlite.IsLocal(name) {
-+		return errPathEscapes
-+	}
-+	return nil
-+}
-+
-+func checkPathEscapesLstat(r *Root, name string) error {
-+	return checkPathEscapes(r, name)
-+}
-Index: src/os/exec_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/os/exec_windows.go b/src/os/exec_windows.go
---- a/src/os/exec_windows.go	(revision bed309eff415bcb3c77dd4bc3277b682b89a388d)
-+++ b/src/os/exec_windows.go	(revision 34b899c2fb39b092db4fa67c4417e41dc046be4b)
-@@ -10,6 +10,7 @@
- 	"runtime"
- 	"syscall"
- 	"time"
-+	_ "unsafe"
- )
- 
- // Note that Process.handle is never nil because Windows always requires
-@@ -49,9 +50,23 @@
- 	// than statusDone.
- 	p.doRelease(statusReleased)
- 
-+	var maj, min, build uint32
-+	rtlGetNtVersionNumbers(&maj, &min, &build)
-+	if maj < 10 {
-+		// NOTE(brainman): It seems that sometimes process is not dead
-+		// when WaitForSingleObject returns. But we do not know any
-+		// other way to wait for it. Sleeping for a while seems to do
-+		// the trick sometimes.
-+		// See https://golang.org/issue/25965 for details.
-+		time.Sleep(5 * time.Millisecond)
-+	}
-+
- 	return &ProcessState{p.Pid, syscall.WaitStatus{ExitCode: ec}, &u}, nil
- }
- 
-+//go:linkname rtlGetNtVersionNumbers syscall.rtlGetNtVersionNumbers
-+func rtlGetNtVersionNumbers(majorVersion *uint32, minorVersion *uint32, buildNumber *uint32)
-+
- func (p *Process) signal(sig Signal) error {
- 	handle, status := p.handleTransientAcquire()
- 	switch status {

.github/patch/go1.26.patch

@@ -1,883 +0,0 @@
-Subject: [PATCH] Revert "os: remove 5ms sleep on Windows in (*Process).Wait"
-Fix os.RemoveAll not working on Windows7
-Revert "runtime: always use LoadLibraryEx to load system libraries"
-Revert "syscall: remove Windows 7 console handle workaround"
-Revert "net: remove sysSocket fallback for Windows 7"
-Revert "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
----
-Index: src/crypto/internal/sysrand/rand_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/crypto/internal/sysrand/rand_windows.go b/src/crypto/internal/sysrand/rand_windows.go
---- a/src/crypto/internal/sysrand/rand_windows.go	(revision e87b10ea2a2c6c65b80c4374af42b9c02ac9fb20)
-+++ b/src/crypto/internal/sysrand/rand_windows.go	(revision 4b29590aa510e05686ea53de16e1e571d22203d8)
-@@ -7,5 +7,26 @@
- import "internal/syscall/windows"
- 
- func read(b []byte) error {
--	return windows.ProcessPrng(b)
-+	// RtlGenRandom only returns 1<<32-1 bytes at a time. We only read at
-+	// most 1<<31-1 bytes at a time so that  this works the same on 32-bit
-+	// and 64-bit systems.
-+	return batched(windows.RtlGenRandom, 1<<31-1)(b)
-+}
-+
-+// batched returns a function that calls f to populate a []byte by chunking it
-+// into subslices of, at most, readMax bytes.
-+func batched(f func([]byte) error, readMax int) func([]byte) error {
-+	return func(out []byte) error {
-+		for len(out) > 0 {
-+			read := len(out)
-+			if read > readMax {
-+				read = readMax
-+			}
-+			if err := f(out[:read]); err != nil {
-+				return err
-+			}
-+			out = out[read:]
-+		}
-+		return nil
-+	}
- }
-Index: src/crypto/rand/rand.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/crypto/rand/rand.go b/src/crypto/rand/rand.go
---- a/src/crypto/rand/rand.go	(revision e87b10ea2a2c6c65b80c4374af42b9c02ac9fb20)
-+++ b/src/crypto/rand/rand.go	(revision 4b29590aa510e05686ea53de16e1e571d22203d8)
-@@ -25,7 +25,7 @@
- //   - On legacy Linux (< 3.17), Reader opens /dev/urandom on first use.
- //   - On macOS, iOS, and OpenBSD Reader, uses arc4random_buf(3).
- //   - On NetBSD, Reader uses the kern.arandom sysctl.
--//   - On Windows, Reader uses the ProcessPrng API.
-+//   - On Windows systems, Reader uses the RtlGenRandom API.
- //   - On js/wasm, Reader uses the Web Crypto API.
- //   - On wasip1/wasm, Reader uses random_get.
- //
-Index: src/internal/syscall/windows/syscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/internal/syscall/windows/syscall_windows.go b/src/internal/syscall/windows/syscall_windows.go
---- a/src/internal/syscall/windows/syscall_windows.go	(revision e87b10ea2a2c6c65b80c4374af42b9c02ac9fb20)
-+++ b/src/internal/syscall/windows/syscall_windows.go	(revision 4b29590aa510e05686ea53de16e1e571d22203d8)
-@@ -421,7 +421,7 @@
- //sys	DestroyEnvironmentBlock(block *uint16) (err error) = userenv.DestroyEnvironmentBlock
- //sys	CreateEvent(eventAttrs *SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle syscall.Handle, err error) = kernel32.CreateEventW
- 
--//sys	ProcessPrng(buf []byte) (err error) = bcryptprimitives.ProcessPrng
-+//sys	RtlGenRandom(buf []byte) (err error) = advapi32.SystemFunction036
- 
- type FILE_ID_BOTH_DIR_INFO struct {
- 	NextEntryOffset uint32
-Index: src/internal/syscall/windows/zsyscall_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/internal/syscall/windows/zsyscall_windows.go b/src/internal/syscall/windows/zsyscall_windows.go
---- a/src/internal/syscall/windows/zsyscall_windows.go	(revision e87b10ea2a2c6c65b80c4374af42b9c02ac9fb20)
-+++ b/src/internal/syscall/windows/zsyscall_windows.go	(revision 4b29590aa510e05686ea53de16e1e571d22203d8)
-@@ -38,7 +38,6 @@
- 
- var (
- 	modadvapi32         = syscall.NewLazyDLL(sysdll.Add("advapi32.dll"))
--	modbcryptprimitives = syscall.NewLazyDLL(sysdll.Add("bcryptprimitives.dll"))
- 	modiphlpapi         = syscall.NewLazyDLL(sysdll.Add("iphlpapi.dll"))
- 	modkernel32         = syscall.NewLazyDLL(sysdll.Add("kernel32.dll"))
- 	modnetapi32         = syscall.NewLazyDLL(sysdll.Add("netapi32.dll"))
-@@ -65,7 +64,7 @@
- 	procSetEntriesInAclW                  = modadvapi32.NewProc("SetEntriesInAclW")
- 	procSetNamedSecurityInfoW             = modadvapi32.NewProc("SetNamedSecurityInfoW")
- 	procSetTokenInformation               = modadvapi32.NewProc("SetTokenInformation")
--	procProcessPrng                       = modbcryptprimitives.NewProc("ProcessPrng")
-+	procSystemFunction036                 = modadvapi32.NewProc("SystemFunction036")
- 	procGetAdaptersAddresses              = modiphlpapi.NewProc("GetAdaptersAddresses")
- 	procCreateEventW                      = modkernel32.NewProc("CreateEventW")
- 	procCreateIoCompletionPort            = modkernel32.NewProc("CreateIoCompletionPort")
-@@ -271,12 +270,12 @@
- 	return
- }
- 
--func ProcessPrng(buf []byte) (err error) {
-+func RtlGenRandom(buf []byte) (err error) {
- 	var _p0 *byte
- 	if len(buf) > 0 {
- 		_p0 = &buf[0]
- 	}
--	r1, _, e1 := syscall.SyscallN(procProcessPrng.Addr(), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
-+	r1, _, e1 := syscall.SyscallN(procSystemFunction036.Addr(), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)))
- 	if r1 == 0 {
- 		err = errnoErr(e1)
- 	}
-Index: src/runtime/os_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/runtime/os_windows.go b/src/runtime/os_windows.go
---- a/src/runtime/os_windows.go	(revision e87b10ea2a2c6c65b80c4374af42b9c02ac9fb20)
-+++ b/src/runtime/os_windows.go	(revision ce2e1a3d2c3c0d7277b4102841db1697147d2923)
-@@ -40,7 +40,8 @@
- //go:cgo_import_dynamic runtime._GetSystemInfo GetSystemInfo%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._GetThreadContext GetThreadContext%2 "kernel32.dll"
- //go:cgo_import_dynamic runtime._SetThreadContext SetThreadContext%2 "kernel32.dll"
--//go:cgo_import_dynamic runtime._LoadLibraryExW LoadLibraryExW%3 "kernel32.dll"
-+//go:cgo_import_dynamic runtime._LoadLibraryW LoadLibraryW%1 "kernel32.dll"
-+//go:cgo_import_dynamic runtime._LoadLibraryA LoadLibraryA%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._PostQueuedCompletionStatus PostQueuedCompletionStatus%4 "kernel32.dll"
- //go:cgo_import_dynamic runtime._QueryPerformanceCounter QueryPerformanceCounter%1 "kernel32.dll"
- //go:cgo_import_dynamic runtime._QueryPerformanceFrequency QueryPerformanceFrequency%1 "kernel32.dll"
-@@ -74,7 +75,6 @@
- 	// Following syscalls are available on every Windows PC.
- 	// All these variables are set by the Windows executable
- 	// loader before the Go program starts.
--	_AddVectoredContinueHandler,
- 	_AddVectoredExceptionHandler,
- 	_CloseHandle,
- 	_CreateEventA,
-@@ -97,7 +97,8 @@
- 	_GetSystemInfo,
- 	_GetThreadContext,
- 	_SetThreadContext,
--	_LoadLibraryExW,
-+	_LoadLibraryW,
-+	_LoadLibraryA,
- 	_PostQueuedCompletionStatus,
- 	_QueryPerformanceCounter,
- 	_QueryPerformanceFrequency,
-@@ -126,8 +127,23 @@
- 	_WriteFile,
- 	_ stdFunction
- 
--	// Use ProcessPrng to generate cryptographically random data.
--	_ProcessPrng stdFunction
-+	// Following syscalls are only available on some Windows PCs.
-+	// We will load syscalls, if available, before using them.
-+	_AddDllDirectory,
-+	_AddVectoredContinueHandler,
-+	_LoadLibraryExA,
-+	_LoadLibraryExW,
-+	_ stdFunction
-+
-+	// Use RtlGenRandom to generate cryptographically random data.
-+	// This approach has been recommended by Microsoft (see issue
-+	// 15589 for details).
-+	// The RtlGenRandom is not listed in advapi32.dll, instead
-+	// RtlGenRandom function can be found by searching for SystemFunction036.
-+	// Also some versions of Mingw cannot link to SystemFunction036
-+	// when building executable as Cgo. So load SystemFunction036
-+	// manually during runtime startup.
-+	_RtlGenRandom stdFunction
- 
- 	// Load ntdll.dll manually during startup, otherwise Mingw
- 	// links wrong printf function to cgo executable (see issue
-@@ -144,13 +160,6 @@
- 	_ stdFunction
- )
- 
--var (
--	bcryptprimitivesdll = [...]uint16{'b', 'c', 'r', 'y', 'p', 't', 'p', 'r', 'i', 'm', 'i', 't', 'i', 'v', 'e', 's', '.', 'd', 'l', 'l', 0}
--	ntdlldll            = [...]uint16{'n', 't', 'd', 'l', 'l', '.', 'd', 'l', 'l', 0}
--	powrprofdll         = [...]uint16{'p', 'o', 'w', 'r', 'p', 'r', 'o', 'f', '.', 'd', 'l', 'l', 0}
--	winmmdll            = [...]uint16{'w', 'i', 'n', 'm', 'm', '.', 'd', 'l', 'l', 0}
--)
--
- // Function to be called by windows CreateThread
- // to start new os thread.
- func tstart_stdcall(newm *m)
-@@ -242,9 +251,40 @@
- 	return unsafe.String(&sysDirectory[0], sysDirectoryLen)
- }
- 
--func windowsLoadSystemLib(name []uint16) uintptr {
--	const _LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800
--	return stdcall(_LoadLibraryExW, uintptr(unsafe.Pointer(&name[0])), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+//go:linkname syscall_getSystemDirectory syscall.getSystemDirectory
-+func syscall_getSystemDirectory() string {
-+	return unsafe.String(&sysDirectory[0], sysDirectoryLen)
-+}
-+
-+func windowsLoadSystemLib(name []byte) uintptr {
-+	if useLoadLibraryEx {
-+		return stdcall(_LoadLibraryExA, uintptr(unsafe.Pointer(&name[0])), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+	} else {
-+		absName := append(sysDirectory[:sysDirectoryLen], name...)
-+		return stdcall(_LoadLibraryA, uintptr(unsafe.Pointer(&absName[0])))
-+	}
-+}
-+
-+const _LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800
-+
-+// When available, this function will use LoadLibraryEx with the filename
-+// parameter and the important SEARCH_SYSTEM32 argument. But on systems that
-+// do not have that option, absoluteFilepath should contain a fallback
-+// to the full path inside of system32 for use with vanilla LoadLibrary.
-+//
-+//go:linkname syscall_loadsystemlibrary syscall.loadsystemlibrary
-+func syscall_loadsystemlibrary(filename *uint16, absoluteFilepath *uint16) (handle, err uintptr) {
-+	if useLoadLibraryEx {
-+		handle, _, err = syscall_syscalln(uintptr(unsafe.Pointer(_LoadLibraryExW)), 3, uintptr(unsafe.Pointer(filename)), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
-+	} else {
-+		handle, _, err = syscall_syscalln(uintptr(unsafe.Pointer(_LoadLibraryW)), 1, uintptr(unsafe.Pointer(absoluteFilepath)))
-+	}
-+	KeepAlive(filename)
-+	KeepAlive(absoluteFilepath)
-+	if handle != 0 {
-+		err = 0
-+	}
-+	return
- }
- 
- //go:linkname windows_QueryPerformanceCounter internal/syscall/windows.QueryPerformanceCounter
-@@ -262,13 +302,28 @@
- }
- 
- func loadOptionalSyscalls() {
--	bcryptPrimitives := windowsLoadSystemLib(bcryptprimitivesdll[:])
--	if bcryptPrimitives == 0 {
--		throw("bcryptprimitives.dll not found")
-+	var kernel32dll = []byte("kernel32.dll\000")
-+	k32 := stdcall(_LoadLibraryA, uintptr(unsafe.Pointer(&kernel32dll[0])))
-+	if k32 == 0 {
-+		throw("kernel32.dll not found")
- 	}
--	_ProcessPrng = windowsFindfunc(bcryptPrimitives, []byte("ProcessPrng\000"))
-+	_AddDllDirectory = windowsFindfunc(k32, []byte("AddDllDirectory\000"))
-+	_AddVectoredContinueHandler = windowsFindfunc(k32, []byte("AddVectoredContinueHandler\000"))
-+	_LoadLibraryExA = windowsFindfunc(k32, []byte("LoadLibraryExA\000"))
-+	_LoadLibraryExW = windowsFindfunc(k32, []byte("LoadLibraryExW\000"))
-+	useLoadLibraryEx = (_LoadLibraryExW != nil && _LoadLibraryExA != nil && _AddDllDirectory != nil)
-+
-+	initSysDirectory()
- 
--	n32 := windowsLoadSystemLib(ntdlldll[:])
-+	var advapi32dll = []byte("advapi32.dll\000")
-+	a32 := windowsLoadSystemLib(advapi32dll)
-+	if a32 == 0 {
-+		throw("advapi32.dll not found")
-+	}
-+	_RtlGenRandom = windowsFindfunc(a32, []byte("SystemFunction036\000"))
-+
-+	var ntdll = []byte("ntdll.dll\000")
-+	n32 := windowsLoadSystemLib(ntdll)
- 	if n32 == 0 {
- 		throw("ntdll.dll not found")
- 	}
-@@ -297,7 +352,7 @@
- 		context  uintptr
- 	}
- 
--	powrprof := windowsLoadSystemLib(powrprofdll[:])
-+	powrprof := windowsLoadSystemLib([]byte("powrprof.dll\000"))
- 	if powrprof == 0 {
- 		return // Running on Windows 7, where we don't need it anyway.
- 	}
-@@ -351,6 +406,22 @@
- // in sys_windows_386.s and sys_windows_amd64.s:
- func getlasterror() uint32
- 
-+// When loading DLLs, we prefer to use LoadLibraryEx with
-+// LOAD_LIBRARY_SEARCH_* flags, if available. LoadLibraryEx is not
-+// available on old Windows, though, and the LOAD_LIBRARY_SEARCH_*
-+// flags are not available on some versions of Windows without a
-+// security patch.
-+//
-+// https://msdn.microsoft.com/en-us/library/ms684179(v=vs.85).aspx says:
-+// "Windows 7, Windows Server 2008 R2, Windows Vista, and Windows
-+// Server 2008: The LOAD_LIBRARY_SEARCH_* flags are available on
-+// systems that have KB2533623 installed. To determine whether the
-+// flags are available, use GetProcAddress to get the address of the
-+// AddDllDirectory, RemoveDllDirectory, or SetDefaultDllDirectories
-+// function. If GetProcAddress succeeds, the LOAD_LIBRARY_SEARCH_*
-+// flags can be used with LoadLibraryEx."
-+var useLoadLibraryEx bool
-+
- var timeBeginPeriodRetValue uint32
- 
- // osRelaxMinNS indicates that sysmon shouldn't osRelax if the next
-@@ -417,7 +488,8 @@
- 		// Only load winmm.dll if we need it.
- 		// This avoids a dependency on winmm.dll for Go programs
- 		// that run on new Windows versions.
--		m32 := windowsLoadSystemLib(winmmdll[:])
-+		var winmmdll = []byte("winmm.dll\000")
-+		m32 := windowsLoadSystemLib(winmmdll)
- 		if m32 == 0 {
- 			print("runtime: LoadLibraryExW failed; errno=", getlasterror(), "\n")
- 			throw("winmm.dll not found")
-@@ -458,6 +530,28 @@
- 	canUseLongPaths = true
- }
- 
-+var osVersionInfo struct {
-+	majorVersion uint32
-+	minorVersion uint32
-+	buildNumber  uint32
-+}
-+
-+func initOsVersionInfo() {
-+	info := windows.OSVERSIONINFOW{}
-+	info.OSVersionInfoSize = uint32(unsafe.Sizeof(info))
-+	stdcall(_RtlGetVersion, uintptr(unsafe.Pointer(&info)))
-+	osVersionInfo.majorVersion = info.MajorVersion
-+	osVersionInfo.minorVersion = info.MinorVersion
-+	osVersionInfo.buildNumber = info.BuildNumber
-+}
-+
-+//go:linkname rtlGetNtVersionNumbers syscall.rtlGetNtVersionNumbers
-+func rtlGetNtVersionNumbers(majorVersion *uint32, minorVersion *uint32, buildNumber *uint32) {
-+	*majorVersion = osVersionInfo.majorVersion
-+	*minorVersion = osVersionInfo.minorVersion
-+	*buildNumber = osVersionInfo.buildNumber
-+}
-+
- func osinit() {
- 	asmstdcallAddr = unsafe.Pointer(windows.AsmStdCallAddr())
- 
-@@ -470,8 +564,8 @@
- 	initHighResTimer()
- 	timeBeginPeriodRetValue = osRelax(false)
- 
--	initSysDirectory()
- 	initLongPathSupport()
-+	initOsVersionInfo()
- 
- 	numCPUStartup = getCPUCount()
- 
-@@ -487,7 +581,7 @@
- //go:nosplit
- func readRandom(r []byte) int {
- 	n := 0
--	if stdcall(_ProcessPrng, uintptr(unsafe.Pointer(&r[0])), uintptr(len(r)))&0xff != 0 {
-+	if stdcall(_RtlGenRandom, uintptr(unsafe.Pointer(&r[0])), uintptr(len(r)))&0xff != 0 {
- 		n = len(r)
- 	}
- 	return n
-Index: src/net/hook_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/hook_windows.go b/src/net/hook_windows.go
---- a/src/net/hook_windows.go	(revision 4b29590aa510e05686ea53de16e1e571d22203d8)
-+++ b/src/net/hook_windows.go	(revision 2263b05b2fa6ce228fde1899587baf109f1e2e0a)
-@@ -13,6 +13,7 @@
- 	hostsFilePath = windows.GetSystemDirectory() + "/Drivers/etc/hosts"
- 
- 	// Placeholders for socket system calls.
-+	socketFunc    func(int, int, int) (syscall.Handle, error)                                                 = syscall.Socket
- 	wsaSocketFunc func(int32, int32, int32, *syscall.WSAProtocolInfo, uint32, uint32) (syscall.Handle, error) = windows.WSASocket
- 	connectFunc   func(syscall.Handle, syscall.Sockaddr) error                                                = syscall.Connect
- 	listenFunc    func(syscall.Handle, int) error                                                             = syscall.Listen
-Index: src/net/internal/socktest/main_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/main_test.go b/src/net/internal/socktest/main_test.go
---- a/src/net/internal/socktest/main_test.go	(revision 4b29590aa510e05686ea53de16e1e571d22203d8)
-+++ b/src/net/internal/socktest/main_test.go	(revision 2263b05b2fa6ce228fde1899587baf109f1e2e0a)
-@@ -2,7 +2,7 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
- 
--//go:build !js && !plan9 && !wasip1 && !windows
-+//go:build !js && !plan9 && !wasip1
- 
- package socktest_test
- 
-Index: src/net/internal/socktest/main_windows_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/main_windows_test.go b/src/net/internal/socktest/main_windows_test.go
-new file mode 100644
---- /dev/null	(revision 2263b05b2fa6ce228fde1899587baf109f1e2e0a)
-+++ b/src/net/internal/socktest/main_windows_test.go	(revision 2263b05b2fa6ce228fde1899587baf109f1e2e0a)
-@@ -0,0 +1,22 @@
-+// Copyright 2015 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 socktest_test
-+
-+import "syscall"
-+
-+var (
-+	socketFunc func(int, int, int) (syscall.Handle, error)
-+	closeFunc  func(syscall.Handle) error
-+)
-+
-+func installTestHooks() {
-+	socketFunc = sw.Socket
-+	closeFunc = sw.Closesocket
-+}
-+
-+func uninstallTestHooks() {
-+	socketFunc = syscall.Socket
-+	closeFunc = syscall.Closesocket
-+}
-Index: src/net/internal/socktest/sys_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/internal/socktest/sys_windows.go b/src/net/internal/socktest/sys_windows.go
---- a/src/net/internal/socktest/sys_windows.go	(revision 4b29590aa510e05686ea53de16e1e571d22203d8)
-+++ b/src/net/internal/socktest/sys_windows.go	(revision 2263b05b2fa6ce228fde1899587baf109f1e2e0a)
-@@ -9,6 +9,38 @@
- 	"syscall"
- )
- 
-+// Socket wraps [syscall.Socket].
-+func (sw *Switch) Socket(family, sotype, proto int) (s syscall.Handle, err error) {
-+	sw.once.Do(sw.init)
-+
-+	so := &Status{Cookie: cookie(family, sotype, proto)}
-+	sw.fmu.RLock()
-+	f, _ := sw.fltab[FilterSocket]
-+	sw.fmu.RUnlock()
-+
-+	af, err := f.apply(so)
-+	if err != nil {
-+		return syscall.InvalidHandle, err
-+	}
-+	s, so.Err = syscall.Socket(family, sotype, proto)
-+	if err = af.apply(so); err != nil {
-+		if so.Err == nil {
-+			syscall.Closesocket(s)
-+		}
-+		return syscall.InvalidHandle, err
-+	}
-+
-+	sw.smu.Lock()
-+	defer sw.smu.Unlock()
-+	if so.Err != nil {
-+		sw.stats.getLocked(so.Cookie).OpenFailed++
-+		return syscall.InvalidHandle, so.Err
-+	}
-+	nso := sw.addLocked(s, family, sotype, proto)
-+	sw.stats.getLocked(nso.Cookie).Opened++
-+	return s, nil
-+}
-+
- // WSASocket wraps [syscall.WSASocket].
- func (sw *Switch) WSASocket(family, sotype, proto int32, protinfo *syscall.WSAProtocolInfo, group uint32, flags uint32) (s syscall.Handle, err error) {
- 	sw.once.Do(sw.init)
-Index: src/net/main_windows_test.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/main_windows_test.go b/src/net/main_windows_test.go
---- a/src/net/main_windows_test.go	(revision 4b29590aa510e05686ea53de16e1e571d22203d8)
-+++ b/src/net/main_windows_test.go	(revision 2263b05b2fa6ce228fde1899587baf109f1e2e0a)
-@@ -12,6 +12,7 @@
- 
- var (
- 	// Placeholders for saving original socket system calls.
-+	origSocket      = socketFunc
- 	origWSASocket   = wsaSocketFunc
- 	origClosesocket = poll.CloseFunc
- 	origConnect     = connectFunc
-@@ -21,6 +22,7 @@
- )
- 
- func installTestHooks() {
-+	socketFunc = sw.Socket
- 	wsaSocketFunc = sw.WSASocket
- 	poll.CloseFunc = sw.Closesocket
- 	connectFunc = sw.Connect
-@@ -30,6 +32,7 @@
- }
- 
- func uninstallTestHooks() {
-+	socketFunc = origSocket
- 	wsaSocketFunc = origWSASocket
- 	poll.CloseFunc = origClosesocket
- 	connectFunc = origConnect
-Index: src/net/sock_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/net/sock_windows.go b/src/net/sock_windows.go
---- a/src/net/sock_windows.go	(revision 4b29590aa510e05686ea53de16e1e571d22203d8)
-+++ b/src/net/sock_windows.go	(revision 2263b05b2fa6ce228fde1899587baf109f1e2e0a)
-@@ -20,6 +20,21 @@
- func sysSocket(family, sotype, proto int) (syscall.Handle, error) {
- 	s, err := wsaSocketFunc(int32(family), int32(sotype), int32(proto),
- 		nil, 0, windows.WSA_FLAG_OVERLAPPED|windows.WSA_FLAG_NO_HANDLE_INHERIT)
-+	if err == nil {
-+		return s, nil
-+	}
-+	// WSA_FLAG_NO_HANDLE_INHERIT flag is not supported on some
-+	// old versions of Windows, see
-+	// https://msdn.microsoft.com/en-us/library/windows/desktop/ms742212(v=vs.85).aspx
-+	// for details. Just use syscall.Socket, if windows.WSASocket failed.
-+
-+	// See ../syscall/exec_unix.go for description of ForkLock.
-+	syscall.ForkLock.RLock()
-+	s, err = socketFunc(family, sotype, proto)
-+	if err == nil {
-+		syscall.CloseOnExec(s)
-+	}
-+	syscall.ForkLock.RUnlock()
- 	if err != nil {
- 		return syscall.InvalidHandle, os.NewSyscallError("socket", err)
- 	}
-Index: src/syscall/exec_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/syscall/exec_windows.go b/src/syscall/exec_windows.go
---- a/src/syscall/exec_windows.go	(revision 4b29590aa510e05686ea53de16e1e571d22203d8)
-+++ b/src/syscall/exec_windows.go	(revision ae41f7abdd5d7b8b51db2c03bf819ac66b8e1eb1)
-@@ -15,7 +15,6 @@
- 	"unsafe"
- )
- 
--// ForkLock is not used on Windows.
- var ForkLock sync.RWMutex
- 
- // EscapeArg rewrites command line argument s as prescribed
-@@ -304,6 +303,9 @@
- var zeroProcAttr ProcAttr
- var zeroSysProcAttr SysProcAttr
- 
-+//go:linkname rtlGetNtVersionNumbers
-+func rtlGetNtVersionNumbers(majorVersion *uint32, minorVersion *uint32, buildNumber *uint32)
-+
- func StartProcess(argv0 string, argv []string, attr *ProcAttr) (pid int, handle uintptr, err error) {
- 	if len(argv0) == 0 {
- 		return 0, 0, EWINDOWS
-@@ -367,6 +369,17 @@
- 		}
- 	}
- 
-+	var maj, min, build uint32
-+	rtlGetNtVersionNumbers(&maj, &min, &build)
-+	isWin7 := maj < 6 || (maj == 6 && min <= 1)
-+	// NT kernel handles are divisible by 4, with the bottom 3 bits left as
-+	// a tag. The fully set tag correlates with the types of handles we're
-+	// concerned about here.  Except, the kernel will interpret some
-+	// special handle values, like -1, -2, and so forth, so kernelbase.dll
-+	// checks to see that those bottom three bits are checked, but that top
-+	// bit is not checked.
-+	isLegacyWin7ConsoleHandle := func(handle Handle) bool { return isWin7 && handle&0x10000003 == 3 }
-+
- 	p, _ := GetCurrentProcess()
- 	parentProcess := p
- 	if sys.ParentProcess != 0 {
-@@ -375,7 +388,15 @@
- 	fd := make([]Handle, len(attr.Files))
- 	for i := range attr.Files {
- 		if attr.Files[i] > 0 {
--			err := DuplicateHandle(p, Handle(attr.Files[i]), parentProcess, &fd[i], 0, true, DUPLICATE_SAME_ACCESS)
-+			destinationProcessHandle := parentProcess
-+
-+			// On Windows 7, console handles aren't real handles, and can only be duplicated
-+			// into the current process, not a parent one, which amounts to the same thing.
-+			if parentProcess != p && isLegacyWin7ConsoleHandle(Handle(attr.Files[i])) {
-+				destinationProcessHandle = p
-+			}
-+
-+			err := DuplicateHandle(p, Handle(attr.Files[i]), destinationProcessHandle, &fd[i], 0, true, DUPLICATE_SAME_ACCESS)
- 			if err != nil {
- 				return 0, 0, err
- 			}
-@@ -406,6 +427,14 @@
- 
- 	fd = append(fd, sys.AdditionalInheritedHandles...)
- 
-+	// On Windows 7, console handles aren't real handles, so don't pass them
-+	// through to PROC_THREAD_ATTRIBUTE_HANDLE_LIST.
-+	for i := range fd {
-+		if isLegacyWin7ConsoleHandle(fd[i]) {
-+			fd[i] = 0
-+		}
-+	}
-+
- 	// The presence of a NULL handle in the list is enough to cause PROC_THREAD_ATTRIBUTE_HANDLE_LIST
- 	// to treat the entire list as empty, so remove NULL handles.
- 	j := 0
-Index: src/syscall/dll_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/syscall/dll_windows.go b/src/syscall/dll_windows.go
---- a/src/syscall/dll_windows.go	(revision ae41f7abdd5d7b8b51db2c03bf819ac66b8e1eb1)
-+++ b/src/syscall/dll_windows.go	(revision ce2e1a3d2c3c0d7277b4102841db1697147d2923)
-@@ -119,14 +119,7 @@
- }
- 
- //go:linkname loadsystemlibrary
--func loadsystemlibrary(filename *uint16) (uintptr, Errno) {
--	const _LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800
--	handle, _, err := SyscallN(uintptr(__LoadLibraryExW), uintptr(unsafe.Pointer(filename)), 0, _LOAD_LIBRARY_SEARCH_SYSTEM32)
--	if handle != 0 {
--		err = 0
--	}
--	return handle, err
--}
-+func loadsystemlibrary(filename *uint16, absoluteFilepath *uint16) (handle uintptr, err Errno)
- 
- //go:linkname getprocaddress
- func getprocaddress(handle uintptr, procname *uint8) (uintptr, Errno) {
-@@ -143,6 +136,9 @@
- 	Handle Handle
- }
- 
-+//go:linkname getSystemDirectory
-+func getSystemDirectory() string // Implemented in runtime package.
-+
- // LoadDLL loads the named DLL file into memory.
- //
- // If name is not an absolute path and is not a known system DLL used by
-@@ -159,7 +155,11 @@
- 	var h uintptr
- 	var e Errno
- 	if sysdll.IsSystemDLL[name] {
--		h, e = loadsystemlibrary(namep)
-+		absoluteFilepathp, err := UTF16PtrFromString(getSystemDirectory() + name)
-+		if err != nil {
-+			return nil, err
-+		}
-+		h, e = loadsystemlibrary(namep, absoluteFilepathp)
- 	} else {
- 		h, e = loadlibrary(namep)
- 	}
-Index: src/os/removeall_at.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/os/removeall_at.go b/src/os/removeall_at.go
---- a/src/os/removeall_at.go	(revision ce2e1a3d2c3c0d7277b4102841db1697147d2923)
-+++ b/src/os/removeall_at.go	(revision 4ea1045cf3124221f055dbd2f3d2c9822934f661)
-@@ -2,7 +2,7 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
- 
--//go:build unix || wasip1 || windows
-+//go:build unix || wasip1
- 
- package os
- 
-@@ -175,3 +175,25 @@
- 	}
- 	return newDirFile(fd, name)
- }
-+
-+func rootRemoveAll(r *Root, name string) error {
-+	// Consistency with os.RemoveAll: Strip trailing /s from the name,
-+	// so RemoveAll("not_a_directory/") succeeds.
-+	for len(name) > 0 && IsPathSeparator(name[len(name)-1]) {
-+		name = name[:len(name)-1]
-+	}
-+	if endsWithDot(name) {
-+		// Consistency with os.RemoveAll: Return EINVAL when trying to remove .
-+		return &PathError{Op: "RemoveAll", Path: name, Err: syscall.EINVAL}
-+	}
-+	_, err := doInRoot(r, name, nil, func(parent sysfdType, name string) (struct{}, error) {
-+		return struct{}{}, removeAllFrom(parent, name)
-+	})
-+	if IsNotExist(err) {
-+		return nil
-+	}
-+	if err != nil {
-+		return &PathError{Op: "RemoveAll", Path: name, Err: underlyingError(err)}
-+	}
-+	return err
-+}
-Index: src/os/removeall_noat.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/os/removeall_noat.go b/src/os/removeall_noat.go
---- a/src/os/removeall_noat.go	(revision ce2e1a3d2c3c0d7277b4102841db1697147d2923)
-+++ b/src/os/removeall_noat.go	(revision 4ea1045cf3124221f055dbd2f3d2c9822934f661)
-@@ -2,7 +2,7 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
- 
--//go:build (js && wasm) || plan9
-+//go:build (js && wasm) || plan9 || windows
- 
- package os
- 
-@@ -140,3 +140,22 @@
- 	}
- 	return err
- }
-+
-+func rootRemoveAll(r *Root, name string) error {
-+	if endsWithDot(name) {
-+		// Consistency with os.RemoveAll: Return EINVAL when trying to remove .
-+		return &PathError{Op: "RemoveAll", Path: name, Err: syscall.EINVAL}
-+	}
-+	if err := checkPathEscapesLstat(r, name); err != nil {
-+		if err == syscall.ENOTDIR {
-+			// Some intermediate path component is not a directory.
-+			// RemoveAll treats this as success (since the target doesn't exist).
-+			return nil
-+		}
-+		return &PathError{Op: "RemoveAll", Path: name, Err: err}
-+	}
-+	if err := RemoveAll(joinPath(r.root.name, name)); err != nil {
-+		return &PathError{Op: "RemoveAll", Path: name, Err: underlyingError(err)}
-+	}
-+	return nil
-+}
-Index: src/os/root_noopenat.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/os/root_noopenat.go b/src/os/root_noopenat.go
---- a/src/os/root_noopenat.go	(revision ce2e1a3d2c3c0d7277b4102841db1697147d2923)
-+++ b/src/os/root_noopenat.go	(revision 4ea1045cf3124221f055dbd2f3d2c9822934f661)
-@@ -11,7 +11,6 @@
- 	"internal/filepathlite"
- 	"internal/stringslite"
- 	"sync/atomic"
--	"syscall"
- 	"time"
- )
- 
-@@ -185,25 +184,6 @@
- 	}
- 	return nil
- }
--
--func rootRemoveAll(r *Root, name string) error {
--	if endsWithDot(name) {
--		// Consistency with os.RemoveAll: Return EINVAL when trying to remove .
--		return &PathError{Op: "RemoveAll", Path: name, Err: syscall.EINVAL}
--	}
--	if err := checkPathEscapesLstat(r, name); err != nil {
--		if err == syscall.ENOTDIR {
--			// Some intermediate path component is not a directory.
--			// RemoveAll treats this as success (since the target doesn't exist).
--			return nil
--		}
--		return &PathError{Op: "RemoveAll", Path: name, Err: err}
--	}
--	if err := RemoveAll(joinPath(r.root.name, name)); err != nil {
--		return &PathError{Op: "RemoveAll", Path: name, Err: underlyingError(err)}
--	}
--	return nil
--}
- 
- func rootReadlink(r *Root, name string) (string, error) {
- 	if err := checkPathEscapesLstat(r, name); err != nil {
-Index: src/os/root_openat.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/os/root_openat.go b/src/os/root_openat.go
---- a/src/os/root_openat.go	(revision ce2e1a3d2c3c0d7277b4102841db1697147d2923)
-+++ b/src/os/root_openat.go	(revision 4ea1045cf3124221f055dbd2f3d2c9822934f661)
-@@ -196,28 +196,6 @@
- 	return nil
- }
- 
--func rootRemoveAll(r *Root, name string) error {
--	// Consistency with os.RemoveAll: Strip trailing /s from the name,
--	// so RemoveAll("not_a_directory/") succeeds.
--	for len(name) > 0 && IsPathSeparator(name[len(name)-1]) {
--		name = name[:len(name)-1]
--	}
--	if endsWithDot(name) {
--		// Consistency with os.RemoveAll: Return EINVAL when trying to remove .
--		return &PathError{Op: "RemoveAll", Path: name, Err: syscall.EINVAL}
--	}
--	_, err := doInRoot(r, name, nil, func(parent sysfdType, name string) (struct{}, error) {
--		return struct{}{}, removeAllFrom(parent, name)
--	})
--	if IsNotExist(err) {
--		return nil
--	}
--	if err != nil {
--		return &PathError{Op: "RemoveAll", Path: name, Err: underlyingError(err)}
--	}
--	return err
--}
--
- func rootRename(r *Root, oldname, newname string) error {
- 	_, err := doInRoot(r, oldname, nil, func(oldparent sysfdType, oldname string) (struct{}, error) {
- 		_, err := doInRoot(r, newname, nil, func(newparent sysfdType, newname string) (struct{}, error) {
-Index: src/os/root_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/os/root_windows.go b/src/os/root_windows.go
---- a/src/os/root_windows.go	(revision ce2e1a3d2c3c0d7277b4102841db1697147d2923)
-+++ b/src/os/root_windows.go	(revision 4ea1045cf3124221f055dbd2f3d2c9822934f661)
-@@ -402,3 +402,14 @@
- 	}
- 	return fi.Mode(), nil
- }
-+
-+func checkPathEscapes(r *Root, name string) error {
-+	if !filepathlite.IsLocal(name) {
-+		return errPathEscapes
-+	}
-+	return nil
-+}
-+
-+func checkPathEscapesLstat(r *Root, name string) error {
-+	return checkPathEscapes(r, name)
-+}
-Index: src/os/exec_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/os/exec_windows.go b/src/os/exec_windows.go
---- a/src/os/exec_windows.go	(revision 4ea1045cf3124221f055dbd2f3d2c9822934f661)
-+++ b/src/os/exec_windows.go	(revision 8149d992682ce76c6af804b507878e19fc966f7b)
-@@ -10,6 +10,7 @@
- 	"runtime"
- 	"syscall"
- 	"time"
-+	_ "unsafe"
- )
- 
- // Note that Process.handle is never nil because Windows always requires
-@@ -49,9 +50,23 @@
- 	// than statusDone.
- 	p.doRelease(statusReleased)
- 
-+	var maj, min, build uint32
-+	rtlGetNtVersionNumbers(&maj, &min, &build)
-+	if maj < 10 {
-+		// NOTE(brainman): It seems that sometimes process is not dead
-+		// when WaitForSingleObject returns. But we do not know any
-+		// other way to wait for it. Sleeping for a while seems to do
-+		// the trick sometimes.
-+		// See https://golang.org/issue/25965 for details.
-+		time.Sleep(5 * time.Millisecond)
-+	}
-+
- 	return &ProcessState{p.Pid, syscall.WaitStatus{ExitCode: ec}, &u}, nil
- }
- 
-+//go:linkname rtlGetNtVersionNumbers syscall.rtlGetNtVersionNumbers
-+func rtlGetNtVersionNumbers(majorVersion *uint32, minorVersion *uint32, buildNumber *uint32)
-+
- func (p *Process) signal(sig Signal) error {
- 	handle, status := p.handleTransientAcquire()
- 	switch status {

.github/patch/issue77731.patch

@@ -1,36 +0,0 @@
-From b8f897a9da7a82ad8584a22284ceac61262fcb7e Mon Sep 17 00:00:00 2001
-From: Jorropo <jorropo.pgm@gmail.com>
-Date: Sun, 22 Feb 2026 01:47:45 +0100
-Subject: [PATCH] runtime: fix value of ENOSYS on mips from 38 to 89
-
-Fixes #77731
-
-Change-Id: Iaca444e2d5f9e19fd2de38414b357b41471a668c
----
-
-diff --git a/src/runtime/defs_linux_mips64x.go b/src/runtime/defs_linux_mips64x.go
-index 7449d2c..4d0f103 100644
---- a/src/runtime/defs_linux_mips64x.go
-+++ b/src/runtime/defs_linux_mips64x.go
-@@ -12,7 +12,7 @@
- 	_EINTR  = 0x4
- 	_EAGAIN = 0xb
- 	_ENOMEM = 0xc
--	_ENOSYS = 0x26
-+	_ENOSYS = 0x59
- 
- 	_PROT_NONE  = 0x0
- 	_PROT_READ  = 0x1
-diff --git a/src/runtime/defs_linux_mipsx.go b/src/runtime/defs_linux_mipsx.go
-index 5a446e0..b8da4d0 100644
---- a/src/runtime/defs_linux_mipsx.go
-+++ b/src/runtime/defs_linux_mipsx.go
-@@ -12,7 +12,7 @@
- 	_EINTR  = 0x4
- 	_EAGAIN = 0xb
- 	_ENOMEM = 0xc
--	_ENOSYS = 0x26
-+	_ENOSYS = 0x59
- 
- 	_PROT_NONE  = 0x0
- 	_PROT_READ  = 0x1

.github/patch/issue77975.patch

@@ -1,253 +0,0 @@
-Subject: [PATCH] internal/poll: move rsan to heap on windows
-
-According to https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsarecvfrom,
-the memory pointed to by lpFromlen must remain available during the
-overlapped I/O, and therefore cannot be allocated on the stack.
-
-CL 685417 moved the rsan field out of the operation struct and placed
-it on stack, which violates the above requirement and causes stack
-corruption.
-
-Unfortunately, it is no longer possible to cleanly revert CL 685417.
-Instead of attempting to revert it, this CL bundles rsan together
-with rsa in the same sync.Pool. The new wsaRsa struct is still in the
-same size class, so no additional overhead is introduced by this
-change.
-
-Fixes #77975.
-
-Change-Id: I5ffbccb332515116ddc03fb7c40ffc9293cad2ab
----
-Index: src/internal/poll/fd_windows.go
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/internal/poll/fd_windows.go b/src/internal/poll/fd_windows.go
---- a/src/internal/poll/fd_windows.go	(revision 8149d992682ce76c6af804b507878e19fc966f7b)
-+++ b/src/internal/poll/fd_windows.go	(date 1773058735706)
-@@ -149,7 +149,7 @@
-
- // newWSAMsg creates a new WSAMsg with the provided parameters.
- // Use [freeWSAMsg] to free it.
--func newWSAMsg(p []byte, oob []byte, flags int, unconnected bool) *windows.WSAMsg {
-+func newWSAMsg(p []byte, oob []byte, flags int, rsa *wsaRsa) *windows.WSAMsg {
- 	// The returned object can't be allocated in the stack because it is accessed asynchronously
- 	// by Windows in between several system calls. If the stack frame is moved while that happens,
- 	// then Windows may access invalid memory.
-@@ -164,33 +164,45 @@
- 		Buf: unsafe.SliceData(oob),
- 	}
- 	msg.Flags = uint32(flags)
--	if unconnected {
--		msg.Name = wsaRsaPool.Get().(*syscall.RawSockaddrAny)
--		msg.Namelen = int32(unsafe.Sizeof(syscall.RawSockaddrAny{}))
-+	if rsa != nil {
-+		msg.Name = &rsa.name
-+		msg.Namelen = rsa.namelen
- 	}
- 	return msg
- }
-
- func freeWSAMsg(msg *windows.WSAMsg) {
- 	// Clear pointers to buffers so they can be released by garbage collector.
-+	msg.Name = nil
-+	msg.Namelen = 0
- 	msg.Buffers.Len = 0
- 	msg.Buffers.Buf = nil
- 	msg.Control.Len = 0
- 	msg.Control.Buf = nil
--	if msg.Name != nil {
--		*msg.Name = syscall.RawSockaddrAny{}
--		wsaRsaPool.Put(msg.Name)
--		msg.Name = nil
--		msg.Namelen = 0
--	}
- 	wsaMsgPool.Put(msg)
- }
-
-+// wsaRsa bundles a [syscall.RawSockaddrAny] with its length for efficient caching.
-+//
-+// When used by WSARecvFrom, wsaRsa must be on the heap. See
-+// https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsarecvfrom.
-+type wsaRsa struct {
-+	name    syscall.RawSockaddrAny
-+	namelen int32
-+}
-+
- var wsaRsaPool = sync.Pool{
- 	New: func() any {
--		return new(syscall.RawSockaddrAny)
-+		return new(wsaRsa)
- 	},
- }
-+
-+func newWSARsa() *wsaRsa {
-+	rsa := wsaRsaPool.Get().(*wsaRsa)
-+	rsa.name = syscall.RawSockaddrAny{}
-+	rsa.namelen = int32(unsafe.Sizeof(syscall.RawSockaddrAny{}))
-+	return rsa
-+}
-
- var operationPool = sync.Pool{
- 	New: func() any {
-@@ -737,19 +749,18 @@
-
- 	fd.pin('r', &buf[0])
-
--	rsa := wsaRsaPool.Get().(*syscall.RawSockaddrAny)
-+	rsa := newWSARsa()
- 	defer wsaRsaPool.Put(rsa)
- 	n, err := fd.execIO('r', func(o *operation) (qty uint32, err error) {
--		rsan := int32(unsafe.Sizeof(*rsa))
- 		var flags uint32
--		err = syscall.WSARecvFrom(fd.Sysfd, newWsaBuf(buf), 1, &qty, &flags, rsa, &rsan, &o.o, nil)
-+		err = syscall.WSARecvFrom(fd.Sysfd, newWsaBuf(buf), 1, &qty, &flags, &rsa.name, &rsa.namelen, &o.o, nil)
- 		return qty, err
- 	})
- 	err = fd.eofError(n, err)
- 	if err != nil {
- 		return n, nil, err
- 	}
--	sa, _ := rsa.Sockaddr()
-+	sa, _ := rsa.name.Sockaddr()
- 	return n, sa, nil
- }
-
-@@ -768,19 +779,18 @@
-
- 	fd.pin('r', &buf[0])
-
--	rsa := wsaRsaPool.Get().(*syscall.RawSockaddrAny)
-+	rsa := newWSARsa()
- 	defer wsaRsaPool.Put(rsa)
- 	n, err := fd.execIO('r', func(o *operation) (qty uint32, err error) {
--		rsan := int32(unsafe.Sizeof(*rsa))
- 		var flags uint32
--		err = syscall.WSARecvFrom(fd.Sysfd, newWsaBuf(buf), 1, &qty, &flags, rsa, &rsan, &o.o, nil)
-+		err = syscall.WSARecvFrom(fd.Sysfd, newWsaBuf(buf), 1, &qty, &flags, &rsa.name, &rsa.namelen, &o.o, nil)
- 		return qty, err
- 	})
- 	err = fd.eofError(n, err)
- 	if err != nil {
- 		return n, err
- 	}
--	rawToSockaddrInet4(rsa, sa4)
-+	rawToSockaddrInet4(&rsa.name, sa4)
- 	return n, err
- }
-
-@@ -799,19 +809,18 @@
-
- 	fd.pin('r', &buf[0])
-
--	rsa := wsaRsaPool.Get().(*syscall.RawSockaddrAny)
-+	rsa := newWSARsa()
- 	defer wsaRsaPool.Put(rsa)
- 	n, err := fd.execIO('r', func(o *operation) (qty uint32, err error) {
--		rsan := int32(unsafe.Sizeof(*rsa))
- 		var flags uint32
--		err = syscall.WSARecvFrom(fd.Sysfd, newWsaBuf(buf), 1, &qty, &flags, rsa, &rsan, &o.o, nil)
-+		err = syscall.WSARecvFrom(fd.Sysfd, newWsaBuf(buf), 1, &qty, &flags, &rsa.name, &rsa.namelen, &o.o, nil)
- 		return qty, err
- 	})
- 	err = fd.eofError(n, err)
- 	if err != nil {
- 		return n, err
- 	}
--	rawToSockaddrInet6(rsa, sa6)
-+	rawToSockaddrInet6(&rsa.name, sa6)
- 	return n, err
- }
-
-@@ -1371,7 +1380,9 @@
- 		p = p[:maxRW]
- 	}
-
--	msg := newWSAMsg(p, oob, flags, true)
-+	rsa := newWSARsa()
-+	defer wsaRsaPool.Put(rsa)
-+	msg := newWSAMsg(p, oob, flags, rsa)
- 	defer freeWSAMsg(msg)
- 	n, err := fd.execIO('r', func(o *operation) (qty uint32, err error) {
- 		err = windows.WSARecvMsg(fd.Sysfd, msg, &qty, &o.o, nil)
-@@ -1396,7 +1407,9 @@
- 		p = p[:maxRW]
- 	}
-
--	msg := newWSAMsg(p, oob, flags, true)
-+	rsa := newWSARsa()
-+	defer wsaRsaPool.Put(rsa)
-+	msg := newWSAMsg(p, oob, flags, rsa)
- 	defer freeWSAMsg(msg)
- 	n, err := fd.execIO('r', func(o *operation) (qty uint32, err error) {
- 		err = windows.WSARecvMsg(fd.Sysfd, msg, &qty, &o.o, nil)
-@@ -1420,7 +1433,9 @@
- 		p = p[:maxRW]
- 	}
-
--	msg := newWSAMsg(p, oob, flags, true)
-+	rsa := newWSARsa()
-+	defer wsaRsaPool.Put(rsa)
-+	msg := newWSAMsg(p, oob, flags, rsa)
- 	defer freeWSAMsg(msg)
- 	n, err := fd.execIO('r', func(o *operation) (qty uint32, err error) {
- 		err = windows.WSARecvMsg(fd.Sysfd, msg, &qty, &o.o, nil)
-@@ -1444,15 +1459,18 @@
- 	}
- 	defer fd.writeUnlock()
-
--	msg := newWSAMsg(p, oob, 0, sa != nil)
--	defer freeWSAMsg(msg)
-+	var rsa *wsaRsa
- 	if sa != nil {
-+		rsa = newWSARsa()
-+		defer wsaRsaPool.Put(rsa)
- 		var err error
--		msg.Namelen, err = sockaddrToRaw(msg.Name, sa)
-+		rsa.namelen, err = sockaddrToRaw(&rsa.name, sa)
- 		if err != nil {
- 			return 0, 0, err
- 		}
- 	}
-+	msg := newWSAMsg(p, oob, 0, rsa)
-+	defer freeWSAMsg(msg)
- 	n, err := fd.execIO('w', func(o *operation) (qty uint32, err error) {
- 		err = windows.WSASendMsg(fd.Sysfd, msg, 0, nil, &o.o, nil)
- 		return qty, err
-@@ -1471,11 +1489,14 @@
- 	}
- 	defer fd.writeUnlock()
-
--	msg := newWSAMsg(p, oob, 0, sa != nil)
--	defer freeWSAMsg(msg)
-+	var rsa *wsaRsa
- 	if sa != nil {
--		msg.Namelen = sockaddrInet4ToRaw(msg.Name, sa)
-+		rsa = newWSARsa()
-+		defer wsaRsaPool.Put(rsa)
-+		rsa.namelen = sockaddrInet4ToRaw(&rsa.name, sa)
- 	}
-+	msg := newWSAMsg(p, oob, 0, rsa)
-+	defer freeWSAMsg(msg)
- 	n, err := fd.execIO('w', func(o *operation) (qty uint32, err error) {
- 		err = windows.WSASendMsg(fd.Sysfd, msg, 0, nil, &o.o, nil)
- 		return qty, err
-@@ -1494,11 +1515,14 @@
- 	}
- 	defer fd.writeUnlock()
-
--	msg := newWSAMsg(p, oob, 0, sa != nil)
--	defer freeWSAMsg(msg)
-+	var rsa *wsaRsa
- 	if sa != nil {
--		msg.Namelen = sockaddrInet6ToRaw(msg.Name, sa)
-+		rsa = newWSARsa()
-+		defer wsaRsaPool.Put(rsa)
-+		rsa.namelen = sockaddrInet6ToRaw(&rsa.name, sa)
- 	}
-+	msg := newWSAMsg(p, oob, 0, rsa)
-+	defer freeWSAMsg(msg)
- 	n, err := fd.execIO('w', func(o *operation) (qty uint32, err error) {
- 		err = windows.WSASendMsg(fd.Sysfd, msg, 0, nil, &o.o, nil)
- 		return qty, err

.github/release/.fpm_systemd

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

.github/release/config.yaml

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

.github/release/mihomo.service

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

.github/release/mihomo@.service

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

.github/workflows/Delete.yml

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

.github/workflows/build.yml

@@ -1,10 +1,6 @@
 name: Build
 on:
   workflow_dispatch:
-    inputs:
-      version:
-        description: "Tag version to release"
-        required: true
   push:
     paths-ignore:
       - "docs/**"
@@ -14,574 +10,356 @@ on:
       - Alpha
     tags:
       - "v*"
-  pull_request:
+  pull_request_target:
     branches:
       - Alpha
+      
 concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
+  group: ${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
   
 env:
-  REGISTRY: docker.io
+  REGISTRY: ghcr.io
 jobs:
-  build:
+  Build:
+    permissions: write-all
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        jobs:
-          - { goos: darwin, goarch: amd64, goamd64: v1, output: amd64-compatible } # old style file name will be removed in next released
-          - { goos: darwin, goarch: amd64, goamd64: v3, output: amd64 }
-          - { goos: darwin, goarch: amd64, goamd64: v1, output: amd64-v1 }
-          - { goos: darwin, goarch: amd64, goamd64: v2, output: amd64-v2 }
-          - { goos: darwin, goarch: amd64, goamd64: v3, output: amd64-v3 }
-          - { goos: darwin, goarch: arm64, output: arm64 }
-
-          - { goos: linux, goarch: '386', go386: sse2, output: '386', debian: i386, rpm: i386}
-          - { goos: linux, goarch: '386', go386: softfloat, output: '386-softfloat' }
-          - { goos: linux, goarch: amd64, goamd64: v1, output: amd64-compatible} # old style file name will be removed in next released
-          - { goos: linux, goarch: amd64, goamd64: v3, output: amd64, debian: amd64, rpm: x86_64, pacman: x86_64}
-          - { goos: linux, goarch: amd64, goamd64: v1, output: amd64-v1, debian: amd64, rpm: x86_64, pacman: x86_64, test: test }
-          - { goos: linux, goarch: amd64, goamd64: v2, output: amd64-v2, debian: amd64, rpm: x86_64, pacman: x86_64}
-          - { goos: linux, goarch: amd64, goamd64: v3, output: amd64-v3, debian: amd64, rpm: x86_64, pacman: x86_64}
-          - { goos: linux, goarch: arm64, output: arm64, debian: arm64, rpm: aarch64, pacman: aarch64}  
-          - { goos: linux, goarch: arm, goarm: '5', output: armv5 }
-          - { goos: linux, goarch: arm, goarm: '6', output: armv6, debian: armel, rpm: armv6hl} 
-          - { goos: linux, goarch: arm, goarm: '7', output: armv7, debian: armhf, rpm: armv7hl, pacman: armv7hl}
-          - { goos: linux, goarch: mips, gomips: hardfloat, output: mips-hardfloat }
-          - { goos: linux, goarch: mips, gomips: softfloat, output: mips-softfloat }
-          - { goos: linux, goarch: mipsle, gomips: hardfloat, output: mipsle-hardfloat }
-          - { goos: linux, goarch: mipsle, gomips: softfloat, output: mipsle-softfloat }
-          - { goos: linux, goarch: mips64, output: mips64 }
-          - { goos: linux, goarch: mips64le, output: mips64le, debian: mips64el, rpm: mips64el }
-          - { goos: linux, goarch: loong64, output: loong64-abi1, abi: '1', debian: loongarch64, rpm: loongarch64 }
-          - { goos: linux, goarch: loong64, output: loong64-abi2, abi: '2', debian: loong64, rpm: loong64 }
-          - { goos: linux, goarch: riscv64, output: riscv64, debian: riscv64, rpm: riscv64 }
-          - { goos: linux, goarch: s390x, output: s390x, debian: s390x, rpm: s390x }
-          - { goos: linux, goarch: ppc64le, output: ppc64le, debian: ppc64el, rpm: ppc64le }
-
-          # Go 1.26 with special patch can work on Windows 7
-          # https://github.com/MetaCubeX/go/commits/release-branch.go1.26/
-          - { goos: windows, goarch: '386', output: '386' }
-          - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-compatible } # old style file name will be removed in next released
-          - { goos: windows, goarch: amd64, goamd64: v3, output: amd64 }
-          - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-v1 }
-          - { goos: windows, goarch: amd64, goamd64: v2, output: amd64-v2 }
-          - { goos: windows, goarch: amd64, goamd64: v3, output: amd64-v3 }
-          - { goos: windows, goarch: arm64, output: arm64 }
-
-          - { goos: freebsd, goarch: '386', output: '386' }
-          - { goos: freebsd, goarch: amd64, goamd64: v1, output: amd64-compatible } # old style file name will be removed in next released
-          - { goos: freebsd, goarch: amd64, goamd64: v3, output: amd64 }
-          - { goos: freebsd, goarch: amd64, goamd64: v1, output: amd64-v1 }
-          - { goos: freebsd, goarch: amd64, goamd64: v2, output: amd64-v2 }
-          - { goos: freebsd, goarch: amd64, goamd64: v3, output: amd64-v3 }
-          - { goos: freebsd, goarch: arm64, output: arm64 }
-
-          - { goos: android, goarch: '386', ndk: i686-linux-android34, output: '386' }
-          - { goos: android, goarch: amd64, ndk: x86_64-linux-android34, output: amd64 }
-          - { goos: android, goarch: arm, ndk: armv7a-linux-androideabi34, output: armv7 }
-          - { goos: android, goarch: arm64, ndk: aarch64-linux-android34, output: arm64-v8 }
-
-          # Go 1.25 with special patch can work on Windows 7
-          # https://github.com/MetaCubeX/go/commits/release-branch.go1.25/
-          - { goos: windows, goarch: '386', output: '386-go125', goversion: '1.25' }
-          - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-v1-go125, goversion: '1.25' }
-          - { goos: windows, goarch: amd64, goamd64: v2, output: amd64-v2-go125, goversion: '1.25' }
-          - { goos: windows, goarch: amd64, goamd64: v3, output: amd64-v3-go125, goversion: '1.25' }
-
-          # Go 1.24 with special patch can work on Windows 7
-          # https://github.com/MetaCubeX/go/commits/release-branch.go1.24/
-          - { goos: windows, goarch: '386', output: '386-go124', goversion: '1.24' }
-          - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-v1-go124, goversion: '1.24' }
-          - { goos: windows, goarch: amd64, goamd64: v2, output: amd64-v2-go124, goversion: '1.24' }
-          - { goos: windows, goarch: amd64, goamd64: v3, output: amd64-v3-go124, goversion: '1.24' }
-
-          # Go 1.23 with special patch can work on Windows 7
-          # https://github.com/MetaCubeX/go/commits/release-branch.go1.23/
-          - { goos: windows, goarch: '386', output: '386-go123', goversion: '1.23' }
-          - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-v1-go123, goversion: '1.23' }
-          - { goos: windows, goarch: amd64, goamd64: v2, output: amd64-v2-go123, goversion: '1.23' }
-          - { goos: windows, goarch: amd64, goamd64: v3, output: amd64-v3-go123, goversion: '1.23' }
-
-          # Go 1.22 with special patch can work on Windows 7
-          # https://github.com/MetaCubeX/go/commits/release-branch.go1.22/
-          - { goos: windows, goarch: '386', output: '386-go122', goversion: '1.22' }
-          - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-v1-go122, goversion: '1.22' }
-          - { goos: windows, goarch: amd64, goamd64: v2, output: amd64-v2-go122, goversion: '1.22' }
-          - { goos: windows, goarch: amd64, goamd64: v3, output: amd64-v3-go122, goversion: '1.22' }
-
-          # Go 1.21 can revert commit `9e4385` to work on Windows 7
-          # https://github.com/golang/go/issues/64622#issuecomment-1847475161
-          # (OR we can just use golang1.21.4 which unneeded any patch)
-          - { goos: windows, goarch: '386', output: '386-go121', goversion: '1.21' }
-          - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-v1-go121, goversion: '1.21' }
-          - { goos: windows, goarch: amd64, goamd64: v2, output: amd64-v2-go121, goversion: '1.21' }
-          - { goos: windows, goarch: amd64, goamd64: v3, output: amd64-v3-go121, goversion: '1.21' }
-
-          # Go 1.20 is the last release that will run on any release of Windows 7, 8, Server 2008 and Server 2012. Go 1.21 will require at least Windows 10 or Server 2016.
-          - { goos: windows, goarch: '386', output: '386-go120', goversion: '1.20' }
-          - { goos: windows, goarch: amd64, goamd64: v1, output: amd64-v1-go120, goversion: '1.20' }
-          - { goos: windows, goarch: amd64, goamd64: v2, output: amd64-v2-go120, goversion: '1.20' }
-          - { goos: windows, goarch: amd64, goamd64: v3, output: amd64-v3-go120, goversion: '1.20' }
-
-          # Go 1.24 is the last release that will run on macOS 11 Big Sur. Go 1.25 will require macOS 12 Monterey or later.
-          - { goos: darwin, goarch: arm64, output: arm64-go124, goversion: '1.24' }
-          - { goos: darwin, goarch: amd64, goamd64: v1, output: amd64-v1-go124, goversion: '1.24' }
-          - { goos: darwin, goarch: amd64, goamd64: v2, output: amd64-v2-go124, goversion: '1.24' }
-          - { goos: darwin, goarch: amd64, goamd64: v3, output: amd64-v3-go124, goversion: '1.24' }
-
-          # Go 1.22 is the last release that will run on macOS 10.15 Catalina. Go 1.23 will require macOS 11 Big Sur or later.
-          - { goos: darwin, goarch: arm64, output: arm64-go122, goversion: '1.22' }
-          - { goos: darwin, goarch: amd64, goamd64: v1, output: amd64-v1-go122, goversion: '1.22' }
-          - { goos: darwin, goarch: amd64, goamd64: v2, output: amd64-v2-go122, goversion: '1.22' }
-          - { goos: darwin, goarch: amd64, goamd64: v3, output: amd64-v3-go122, goversion: '1.22' }
-
-          # Go 1.20 is the last release that will run on macOS 10.13 High Sierra or 10.14 Mojave. Go 1.21 will require macOS 10.15 Catalina or later.
-          - { goos: darwin, goarch: arm64, output: arm64-go120, goversion: '1.20' }
-          - { goos: darwin, goarch: amd64, goamd64: v1, output: amd64-v1-go120, goversion: '1.20' }
-          - { goos: darwin, goarch: amd64, goamd64: v2, output: amd64-v2-go120, goversion: '1.20' }
-          - { goos: darwin, goarch: amd64, goamd64: v3, output: amd64-v3-go120, goversion: '1.20' }
-
-          # Go 1.23 is the last release that requires Linux kernel version 2.6.32 or later. Go 1.24 will require Linux kernel version 3.2 or later.
-          - { goos: linux, goarch: '386', output: '386-go123', goversion: '1.23' }
-          - { goos: linux, goarch: amd64, goamd64: v1, output: amd64-v1-go123, goversion: '1.23', test: test }
-          - { goos: linux, goarch: amd64, goamd64: v2, output: amd64-v2-go123, goversion: '1.23' }
-          - { goos: linux, goarch: amd64, goamd64: v3, output: amd64-v3-go123, goversion: '1.23' }
-
+        job:
+          - {
+              type: "WithoutCGO",
+              target: "linux-amd64 linux-amd64-compatible",
+              id: "1",
+            }
+          - {
+              type: "WithoutCGO",
+              target: "linux-armv5 linux-armv6 linux-armv7",
+              id: "2",
+            }
+          - {
+              type: "WithoutCGO",
+              target: "linux-arm64 linux-mips64 linux-mips64le",
+              id: "3",
+            }
+          - {
+              type: "WithoutCGO",
+              target: "linux-mips-softfloat linux-mips-hardfloat linux-mipsle-softfloat linux-mipsle-hardfloat",
+              id: "4",
+            }
+          - { type: "WithoutCGO", target: "linux-386 linux-riscv64", id: "5" }
+          - {
+              type: "WithoutCGO",
+              target: "freebsd-386 freebsd-amd64 freebsd-arm64",
+              id: "6",
+            }
+          - {
+              type: "WithoutCGO",
+              target: "windows-amd64-compatible windows-amd64 windows-386",
+              id: "7",
+            }
+          - {
+              type: "WithoutCGO",
+              target: "windows-arm64 windows-arm32v7",
+              id: "8",
+            }
+          - {
+              type: "WithoutCGO",
+              target: "darwin-amd64 darwin-arm64 android-arm64",
+              id: "9",
+            }
           # only for test
-          - { goos: linux, goarch: '386', output: '386-go120', goversion: '1.20' }
-          - { goos: linux, goarch: amd64, goamd64: v1, output: amd64-v1-go120, goversion: '1.20', test: test }
-          - { goos: linux, goarch: amd64, goamd64: v2, output: amd64-v2-go120, goversion: '1.20' }
-          - { goos: linux, goarch: amd64, goamd64: v3, output: amd64-v3-go120, goversion: '1.20' }
+          - { type: "WithoutCGO-GO120", target: "linux-amd64 linux-amd64-compatible",id: "1" }
+          # Go 1.20 is the last release that will run on any release of Windows 7, 8, Server 2008 and Server 2012. Go 1.21 will require at least Windows 10 or Server 2016.
+          - { type: "WithoutCGO-GO120", target: "windows-amd64-compatible windows-amd64 windows-386",id: "2" }
+          # Go 1.20 is the last release that will run on macOS 10.13 High Sierra or 10.14 Mojave. Go 1.21 will require macOS 10.15 Catalina or later.
+          - { type: "WithoutCGO-GO120", target: "darwin-amd64 darwin-arm64 android-arm64",id: "3" }
+          - { type: "WithCGO", target: "windows/*", id: "1" }
+          - { type: "WithCGO", target: "linux/386", id: "2" }
+          - { type: "WithCGO", target: "linux/amd64", id: "3" }
+          - { type: "WithCGO", target: "linux/arm64,linux/riscv64", id: "4" }
+          - { type: "WithCGO", target: "linux/arm,", id: "5" }
+          - { type: "WithCGO", target: "linux/arm-6,linux/arm-7", id: "6" }
+          - { type: "WithCGO", target: "linux/mips,linux/mipsle", id: "7" }
+          - { type: "WithCGO", target: "linux/mips64", id: "8" }
+          - { type: "WithCGO", target: "linux/mips64le", id: "9" }
+          - { type: "WithCGO", target: "darwin-10.16/*", id: "10" }
+          - { type: "WithCGO", target: "android", id: "11" }
 
     steps:
-    - uses: actions/checkout@v5
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
 
-    - name: Set up Go
-      if: ${{ matrix.jobs.goversion == '' && matrix.jobs.abi != '1' }}
-      uses: actions/setup-go@v6
-      with:
-        go-version: '1.26'
-        check-latest: true # Always check for the latest patch release
+      - name: Set variables
+        run: echo "VERSION=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+        shell: bash
 
-    - name: Set up Go
-      if: ${{ matrix.jobs.goversion != '' && matrix.jobs.abi != '1' }}
-      uses: actions/setup-go@v6
-      with:
-        go-version: ${{ matrix.jobs.goversion }}
-        check-latest: true # Always check for the latest patch release
+      - name: Set variables
+        if: ${{github.ref_name=='Alpha'}}
+        run: echo "VERSION=alpha-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+        shell: bash
 
-    - name: Set up Go1.26 loongarch abi1
-      if: ${{ matrix.jobs.goarch == 'loong64' && matrix.jobs.abi == '1' }}
-      run: |
-        wget -q https://github.com/MetaCubeX/loongarch64-golang/releases/download/1.26.0/go1.26.0.linux-amd64-abi1.tar.gz
-        mkdir -p $HOME/usr/local
-        tar zxf go1.26.0.linux-amd64-abi1.tar.gz -C $HOME/usr/local
-        echo "$HOME/usr/local/go/bin" >> $GITHUB_PATH
+      - name: Set variables
+        if: ${{github.ref_name=='Beta'}}
+        run: echo "VERSION=beta-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+        shell: bash
 
-      # TODO: remove after issue77731 merged, see: https://github.com/golang/go/issues/77731
-    - name: Apply issue77731 for Golang1.26
-      if: ${{ matrix.jobs.goversion == '' }}
-      run: |
-        cd $(go env GOROOT)
-        patch --verbose -p 1 < $GITHUB_WORKSPACE/.github/patch/issue77731.patch
+      - name: Set variables
+        if: ${{github.ref_name=='Meta'}}
+        run: echo "VERSION=meta-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+        shell: bash
 
-      # TODO: remove after issue77975 fixed, see: https://github.com/golang/go/issues/77975
-    - name: Fix issue77975 for Golang1.26
-      if: ${{ matrix.jobs.goversion == '' }}
-      run: |
-        cd $(go env GOROOT)
-        patch --verbose -p 1 < $GITHUB_WORKSPACE/.github/patch/issue77975.patch
+      - name: Set variables
+        if: ${{github.ref_name=='' || github.ref_type=='tag'}}
+        run: echo "VERSION=$(git describe --tags)" >> $GITHUB_ENV
+        shell: bash
 
-      # this patch file only works on golang1.26.x
-      # that means after golang1.27 release it must be changed
-      # see: https://github.com/MetaCubeX/go/commits/release-branch.go1.26/
-      # revert:
-      # 693def151adff1af707d82d28f55dba81ceb08e1: "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
-      # 7c1157f9544922e96945196b47b95664b1e39108: "net: remove sysSocket fallback for Windows 7"
-      # 48042aa09c2f878c4faa576948b07fe625c4707a: "syscall: remove Windows 7 console handle workaround"
-      # a17d959debdb04cd550016a3501dd09d50cd62e7: "runtime: always use LoadLibraryEx to load system libraries"
-      # f0894a00f4b756d4b9b4078af2e686b359493583: "os: remove 5ms sleep on Windows in (*Process).Wait"
-      # sepical fix:
-      # - os.RemoveAll not working on Windows7
-    - name: Revert Golang1.26 commit for Windows7/8
-      if: ${{ matrix.jobs.goos == 'windows' && matrix.jobs.goversion == '' }}
-      run: |
-        cd $(go env GOROOT)
-        patch --verbose -p 1 < $GITHUB_WORKSPACE/.github/patch/go1.26.patch
+      - name: Set ENV
+        run: |
+          sudo timedatectl set-timezone "Asia/Shanghai"
+          echo "NAME=mihomo" >> $GITHUB_ENV
+          echo "REPO=${{ github.repository }}" >> $GITHUB_ENV
+          echo "ShortSHA=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV
+          echo "BUILDTIME=$(date)" >> $GITHUB_ENV
+          echo "BRANCH=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
+        shell: bash
 
-      # this patch file only works on golang1.25.x
-      # that means after golang1.26 release it must be changed
-      # see: https://github.com/MetaCubeX/go/commits/release-branch.go1.25/
-      # revert:
-      # 693def151adff1af707d82d28f55dba81ceb08e1: "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
-      # 7c1157f9544922e96945196b47b95664b1e39108: "net: remove sysSocket fallback for Windows 7"
-      # 48042aa09c2f878c4faa576948b07fe625c4707a: "syscall: remove Windows 7 console handle workaround"
-      # a17d959debdb04cd550016a3501dd09d50cd62e7: "runtime: always use LoadLibraryEx to load system libraries"
-      # f0894a00f4b756d4b9b4078af2e686b359493583: "os: remove 5ms sleep on Windows in (*Process).Wait"
-      # sepical fix:
-      # - os.RemoveAll not working on Windows7
-    - name: Revert Golang1.25 commit for Windows7/8
-      if: ${{ matrix.jobs.goos == 'windows' && matrix.jobs.goversion == '1.25' }}
-      run: |
-        cd $(go env GOROOT)
-        patch --verbose -p 1 < $GITHUB_WORKSPACE/.github/patch/go1.25.patch
+      - name: Set ENV
+        run: |
+          echo "TAGS=with_gvisor,with_lwip" >> $GITHUB_ENV
+          echo "LDFLAGS=-X 'github.com/metacubex/mihomo/constant.Version=${VERSION}' -X 'github.com/metacubex/mihomo/constant.BuildTime=${BUILDTIME}' -w -s -buildid=" >> $GITHUB_ENV
+        shell: bash
 
-      # this patch file only works on golang1.24.x
-      # that means after golang1.25 release it must be changed
-      # see: https://github.com/MetaCubeX/go/commits/release-branch.go1.24/
-      # revert:
-      # 693def151adff1af707d82d28f55dba81ceb08e1: "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
-      # 7c1157f9544922e96945196b47b95664b1e39108: "net: remove sysSocket fallback for Windows 7"
-      # 48042aa09c2f878c4faa576948b07fe625c4707a: "syscall: remove Windows 7 console handle workaround"
-      # a17d959debdb04cd550016a3501dd09d50cd62e7: "runtime: always use LoadLibraryEx to load system libraries"
-    - name: Revert Golang1.24 commit for Windows7/8
-      if: ${{ matrix.jobs.goos == 'windows' && matrix.jobs.goversion == '1.24' }}
-      run: |
-        cd $(go env GOROOT)
-        patch --verbose -p 1 < $GITHUB_WORKSPACE/.github/patch/go1.24.patch
+      - name: Setup Go
+        if: ${{ matrix.job.type!='WithoutCGO-GO120' }}
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.21"
+          check-latest: true
 
-      # this patch file only works on golang1.23.x
-      # that means after golang1.24 release it must be changed
-      # see: https://github.com/MetaCubeX/go/commits/release-branch.go1.23/
-      # revert:
-      # 693def151adff1af707d82d28f55dba81ceb08e1: "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
-      # 7c1157f9544922e96945196b47b95664b1e39108: "net: remove sysSocket fallback for Windows 7"
-      # 48042aa09c2f878c4faa576948b07fe625c4707a: "syscall: remove Windows 7 console handle workaround"
-      # a17d959debdb04cd550016a3501dd09d50cd62e7: "runtime: always use LoadLibraryEx to load system libraries"
-    - name: Revert Golang1.23 commit for Windows7/8
-      if: ${{ matrix.jobs.goos == 'windows' && matrix.jobs.goversion == '1.23' }}
-      run: |
-        cd $(go env GOROOT)
-        patch --verbose -p 1 < $GITHUB_WORKSPACE/.github/patch/go1.23.patch
+      - name: Setup Go
+        if: ${{ matrix.job.type=='WithoutCGO-GO120' }}
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+          check-latest: true
 
-      # this patch file only works on golang1.22.x
-      # that means after golang1.23 release it must be changed
-      # see: https://github.com/MetaCubeX/go/commits/release-branch.go1.22/
-      # revert:
-      # 693def151adff1af707d82d28f55dba81ceb08e1: "crypto/rand,runtime: switch RtlGenRandom for ProcessPrng"
-      # 7c1157f9544922e96945196b47b95664b1e39108: "net: remove sysSocket fallback for Windows 7"
-      # 48042aa09c2f878c4faa576948b07fe625c4707a: "syscall: remove Windows 7 console handle workaround"
-      # a17d959debdb04cd550016a3501dd09d50cd62e7: "runtime: always use LoadLibraryEx to load system libraries"
-    - name: Revert Golang1.22 commit for Windows7/8
-      if: ${{ matrix.jobs.goos == 'windows' && matrix.jobs.goversion == '1.22' }}
-      run: |
-        cd $(go env GOROOT)
-        patch --verbose -p 1 < $GITHUB_WORKSPACE/.github/patch/go1.22.patch
+      - name: Test
+        if: ${{ matrix.job.id=='1' && matrix.job.type!='WithCGO' }}
+        run: |
+          go test ./...
 
-      # modify from https://github.com/restic/restic/issues/4636#issuecomment-1896455557
-    - name: Revert Golang1.21 commit for Windows7/8
-      if: ${{ matrix.jobs.goos == 'windows' && matrix.jobs.goversion == '1.21' }}
-      run: |
-        cd $(go env GOROOT)
-        patch --verbose -p 1 < $GITHUB_WORKSPACE/.github/patch/go1.21.patch
+      - name: Build WithoutCGO
+        if: ${{ matrix.job.type!='WithCGO' }}
+        env:
+          NAME: mihomo
+          BINDIR: bin
+        run: make -j$(($(nproc) + 1)) ${{ matrix.job.target }}
 
-    - name: Set variables
-      run: |
-        VERSION="${GITHUB_REF_NAME,,}-$(git rev-parse --short HEAD)"
-        VERSION="${VERSION//\//-}"
-        PackageVersion="$(curl -s "https://api.github.com/repos/MetaCubeX/mihomo/releases/latest" | jq -r '.tag_name' | sed 's/v//g' | awk -F '.' '{$NF = $NF + 1; print}' OFS='.').${VERSION/-/.}"
-        if [ -n "${{ github.event.inputs.version }}" ]; then
-          VERSION=${{ github.event.inputs.version }}
-          PackageVersion="${VERSION#v}"
-        fi
-        echo "VERSION=${VERSION}" >> $GITHUB_ENV
-        echo "PackageVersion=${PackageVersion}" >> $GITHUB_ENV
-      
-        echo "BUILDTIME=$(date)" >> $GITHUB_ENV
-        echo "CGO_ENABLED=0" >> $GITHUB_ENV
-        echo "BUILDTAG=-extldflags --static" >> $GITHUB_ENV
-        echo "GOTOOLCHAIN=local" >> $GITHUB_ENV
+      - uses: nttld/setup-ndk@v1
+        if: ${{ matrix.job.type=='WithCGO' && matrix.job.target=='android' }}
+        id: setup-ndk
+        with:
+          ndk-version: r26b
+          add-to-path: true
 
-    - name: Setup NDK
-      if: ${{ matrix.jobs.goos == 'android' }}
-      uses: nttld/setup-ndk@v1
-      id: setup-ndk
-      with:
-        ndk-version: r29-beta1
+      - name: Build Android
+        if: ${{ matrix.job.type=='WithCGO' && matrix.job.target=='android' }}
+        env:
+          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
+        run: |
+          mkdir bin
+          CC=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android33-clang
+          CGO_ENABLED=1 CC=${CC} GOARCH=arm64 GOOS=android go build -tags ${TAGS} -trimpath -ldflags "${LDFLAGS}" -o bin/${NAME}-android-arm64
 
-    - name: Set NDK path
-      if: ${{ matrix.jobs.goos == 'android' }}
-      run: |
-        echo "CC=${{steps.setup-ndk.outputs.ndk-path}}/toolchains/llvm/prebuilt/linux-x86_64/bin/${{matrix.jobs.ndk}}-clang" >> $GITHUB_ENV
-        echo "CGO_ENABLED=1" >> $GITHUB_ENV
-        echo "BUILDTAG=" >> $GITHUB_ENV
+      - name: Set up xgo
+        if: ${{ matrix.job.type=='WithCGO' && matrix.job.target!='android' }}
+        run: |
+          docker pull techknowlogick/xgo:latest
+          go install src.techknowlogick.com/xgo@latest
 
-    - name: Test
-      if: ${{ matrix.jobs.test == 'test' }}
-      run: |
-        go test ./...
-        echo "---test with_gvisor---"
-        go test ./... -tags "with_gvisor" -count=1
+      - name: Build by xgo
+        if: ${{ matrix.job.type=='WithCGO' && matrix.job.target!='android' }}
+        env:
+          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
+        run: |
+          mkdir bin
+          xgo --targets="${{ matrix.job.target }}" --tags="${TAGS}" -ldflags="${LDFLAGS}" --out bin/${NAME} ./
 
-    - name: Update CA
-      run: |
-        sudo apt-get update && sudo apt-get install ca-certificates
-        sudo update-ca-certificates
-        cp -f /etc/ssl/certs/ca-certificates.crt component/ca/ca-certificates.crt
+      - name: Rename
+        if: ${{ matrix.job.type=='WithCGO' }}
+        run: |
+          cd bin
+          ls -la
+          cp ../.github/rename-cgo.sh ./
+          bash ./rename-cgo.sh
+          rm ./rename-cgo.sh
+          ls -la
+          cd ..
 
-    - name: Build core
-      env:
-        GOOS: ${{matrix.jobs.goos}}
-        GOARCH: ${{matrix.jobs.goarch}}
-        GOAMD64: ${{matrix.jobs.goamd64}}
-        GO386: ${{matrix.jobs.go386}}
-        GOARM: ${{matrix.jobs.goarm}}
-        GOMIPS: ${{matrix.jobs.gomips}}
-      run: |
-        go env
-        go build -v -tags "with_gvisor" -trimpath -ldflags "${BUILDTAG} -X 'github.com/metacubex/mihomo/constant.Version=${VERSION}' -X 'github.com/metacubex/mihomo/constant.BuildTime=${BUILDTIME}' -w -s -buildid="
-        if [ "${{matrix.jobs.goos}}" = "windows" ]; then
-          cp mihomo.exe mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}.exe
-          zip -r mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}.zip mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}.exe
-        else
-          cp mihomo mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}
-          gzip -c mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}} > mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}.gz
-          rm mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}
-        fi
+      - name: Rename
+        if: ${{ matrix.job.type=='WithoutCGO-GO120' }}
+        run: |
+          cd bin
+          ls -la
+          cp ../.github/rename-go120.sh ./
+          bash ./rename-go120.sh
+          rm ./rename-go120.sh
+          ls -la
+          cd ..
 
-    - name: Package DEB
-      if: matrix.jobs.debian != ''
-      run: |
-        set -xeuo pipefail
-        sudo gem install fpm
-        cp .github/release/.fpm_systemd .fpm
+      - name: Zip
+        if: ${{  success() }}
+        run: |
+          cd bin
+          ls -la
+          chmod +x *
+          cp ../.github/release.sh ./
+          bash ./release.sh
+          rm ./release.sh
+          ls -la
+          cd ..
 
-        fpm -t deb \
-          -v "${PackageVersion}" \
-          -p "mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}.deb" \
-          --architecture ${{ matrix.jobs.debian }} \
-          mihomo=/usr/bin/mihomo
+      - name: Save version
+        run: echo ${VERSION} > bin/version.txt
+        shell: bash
 
-    - name: Package RPM
-      if: matrix.jobs.rpm != ''
-      run: |
-        set -xeuo pipefail
-        sudo gem install fpm
-        cp .github/release/.fpm_systemd .fpm
-
-        fpm -t rpm \
-          -v "${PackageVersion}" \
-          -p "mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}.rpm" \
-          --architecture ${{ matrix.jobs.rpm }} \
-          mihomo=/usr/bin/mihomo
-
-    - name: Package Pacman
-      if: matrix.jobs.pacman != ''
-      run: |
-        set -xeuo pipefail
-        sudo gem install fpm
-        sudo apt-get update && sudo apt-get install -y libarchive-tools
-        cp .github/release/.fpm_systemd .fpm
-
-        fpm -t pacman \
-          -v "${PackageVersion}" \
-          -p "mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}.pkg.tar.zst" \
-          --architecture ${{ matrix.jobs.pacman }} \
-          mihomo=/usr/bin/mihomo
-
-    - name: Save version
-      run: |
-        echo ${VERSION} > version.txt
-      shell: bash
-
-    - name: Archive production artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: "${{ matrix.jobs.goos }}-${{ matrix.jobs.output }}"
-        path: |
-          mihomo*.gz
-          mihomo*.deb
-          mihomo*.rpm
-          mihomo*.pkg.tar.zst
-          mihomo*.zip
-          version.txt
-          checksums.txt
+      - uses: actions/upload-artifact@v3
+        if: ${{  success() }}
+        with:
+          name: artifact
+          path: bin/
 
   Upload-Prerelease:
     permissions: write-all
-    if: ${{ github.event_name != 'workflow_dispatch' && github.ref_type == 'branch' && !startsWith(github.event_name, 'pull_request') }}
-    needs: [build]
+    if: ${{ github.ref_type=='branch' && github.event_name != 'pull_request' }}
+    needs: [Build]
     runs-on: ubuntu-latest
     steps:
-    - name: Download all workflow run artifacts
-      uses: actions/download-artifact@v4
-      with:
-        path: bin/
-        merge-multiple: true
-
-    - name: Calculate checksums
-      run: |
-        cd bin/
-        find . -type f -not -name "checksums.*" -not -name "version.txt" | sort | xargs sha256sum > checksums.txt
-        cat checksums.txt
-      shell: bash
-
-    - name: Delete current release assets
-      uses: 8Mi-Tech/delete-release-assets-action@main
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        tag: Prerelease-${{ github.ref_name }}
-        deleteOnlyFromDrafts: false
-    - name: Set Env
-      run: |
-        echo "BUILDTIME=$(TZ=Asia/Shanghai date)" >> $GITHUB_ENV
-      shell: bash
-
-    - name: Tag Repo
-      uses: richardsimko/update-tag@v1
-      with:
-        tag_name: Prerelease-${{ github.ref_name }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      
-    - run: |
-        cat > release.txt << 'EOF'
-        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/mihomo/wiki/FAQ)
-        [二进制文件筛选 / Binary file selector](https://metacubex.github.io/Meta-Docs/startup/#_1)
-        [查看文档 / Docs](https://metacubex.github.io/Meta-Docs/)
-        EOF
-
-    - name: Upload Prerelease
-      uses: softprops/action-gh-release@v1
-      if: ${{  success() }}
-      with:
-        tag_name: Prerelease-${{ github.ref_name }}
-        files: |
-          bin/*
-        prerelease: true
-        generate_release_notes: true
-        body_path: release.txt
-
-  Upload-Release:
-    permissions: write-all
-    if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version != '' }}
-    needs: [build]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          ref: Meta
-          fetch-depth: '0'
-          fetch-tags: 'true'
-
-      - name: Get tags
-        run: |
-          echo "CURRENTVERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
-          git fetch --tags
-          echo "PREVERSION=$(git describe --tags --abbrev=0 HEAD)" >> $GITHUB_ENV
-
-      - name: Force push Alpha branch to Meta
-        run: |
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "github-actions[bot]"
-          git fetch origin Alpha:Alpha
-          git push origin Alpha:Meta --force
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Tag the commit on Alpha
-        run: |
-          git checkout Alpha 
-          git tag ${{ github.event.inputs.version }}
-          git push origin ${{ github.event.inputs.version }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Generate release notes
-        run: |
-            cp ./.github/genReleaseNote.sh ./
-            bash ./genReleaseNote.sh -v ${PREVERSION}...${CURRENTVERSION}
-            rm ./genReleaseNote.sh
-  
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
+          name: artifact
           path: bin/
-          merge-multiple: true
-  
+
       - name: Display structure of downloaded files
         run: ls -R
         working-directory: bin
-  
-      - name: Upload Release
-        uses: softprops/action-gh-release@v2
-        if: ${{ success() }}
+
+      - name: Delete current release assets
+        uses: 8Mi-Tech/delete-release-assets-action@main
         with:
-          tag_name: ${{ github.event.inputs.version }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          tag: Prerelease-${{ github.ref_name }}
+          deleteOnlyFromDrafts: false
+
+      - name: Set Env
+        run: |
+          echo "BUILDTIME=$(TZ=Asia/Shanghai date)" >> $GITHUB_ENV
+        shell: bash
+
+      - name: Tag Repo
+        uses: richardsimko/update-tag@v1.0.6
+        with:
+          tag_name: Prerelease-${{ github.ref_name }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - run: |
+          cat > release.txt << 'EOF'
+          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/mihomo/wiki/FAQ)
+          [查看文档 / Docs](https://metacubex.github.io/Meta-Docs/)
+          EOF
+
+      - name: Upload Prerelease
+        uses: softprops/action-gh-release@v1
+        if: ${{  success() }}
+        with:
+          tag_name: Prerelease-${{ github.ref_name }}
+          files: |
+            bin/*
+          prerelease: true
+          generate_release_notes: true
+          body_path: release.txt
+
+  Upload-Release:
+    permissions: write-all
+    if: ${{ github.ref_type=='tag' }}
+    needs: [Build]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: artifact
+          path: bin/
+
+      - name: Display structure of downloaded files
+        run: ls -R
+        working-directory: bin
+
+      - name: Upload Release
+        uses: softprops/action-gh-release@v1
+        if: ${{  success() }}
+        with:
+          tag_name: ${{ github.ref_name }}
           files: bin/*
-          body_path: release.md
+          generate_release_notes: true
 
   Docker:
-    if: ${{ !startsWith(github.event_name, 'pull_request') }}
+    if: ${{ github.event_name != 'pull_request'  }}
     permissions: write-all
-    needs: [build]
+    needs: [Build]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
+          name: artifact
           path: bin/
-          merge-multiple: true
 
       - name: Display structure of downloaded files
         run: ls -R
         working-directory: bin
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
 
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
         with:
           version: latest
-      
+
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
-        if: ${{ github.event_name != 'workflow_dispatch' }}
-        id: meta_alpha
-        uses: docker/metadata-action@v5
+        id: meta
+        uses: docker/metadata-action@v4
         with:
-          images: '${{ env.REGISTRY }}/${{ github.repository }}'
-      
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version != '' }}
-        id: meta_release
-        uses: docker/metadata-action@v5
-        with:
-          images: '${{ env.REGISTRY }}/${{ github.repository }}'
-          tags: |
-            ${{ github.event.inputs.version }}
-          flavor: |
-            latest=true
-          labels: org.opencontainers.image.version=${{ github.event.inputs.version }}
-      
+          images: ${{ env.REGISTRY }}/${{ github.repository }}
+
       - name: Show files
         run: |
           ls .
           ls bin/
-      
-      - name: login to docker REGISTRY
+
+      - name: login to ghcr.io
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.DOCKER_HUB_USER }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
-        if: ${{ github.event_name != 'workflow_dispatch' }}
+        id: build-and-push
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -592,20 +370,5 @@ jobs:
             linux/amd64
             linux/arm64
             linux/arm/v7
-          tags: ${{ steps.meta_alpha.outputs.tags }}
-          labels: ${{ steps.meta_alpha.outputs.labels }}
-      
-      - name: Build and push Docker image
-        if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version != '' }}
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          platforms: |
-            linux/386
-            linux/amd64
-            linux/arm64
-            linux/arm/v7
-          tags: ${{ steps.meta_release.outputs.tags }}
-          labels: ${{ steps.meta_release.outputs.labels }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/test.yml

@@ -1,75 +0,0 @@
-name: Test
-on:
-  push:
-    paths-ignore:
-      - "docs/**"
-      - "README.md"
-      - ".github/ISSUE_TEMPLATE/**"
-    branches:
-      - Alpha
-    tags:
-      - "v*"
-  pull_request:
-    branches:
-      - Alpha
-
-jobs:
-  test:
-    strategy:
-      matrix:
-        os:
-          - 'ubuntu-latest' # amd64 linux
-          - 'windows-latest' # amd64 windows
-          - 'macos-latest' # arm64 macos
-          - 'ubuntu-24.04-arm' # arm64 linux
-          - 'macos-15-intel' # amd64 macos
-        go-version:
-          - '1.26'
-          - '1.25'
-          - '1.24'
-          - '1.23'
-          - '1.22'
-          - '1.21'
-          - '1.20'
-      fail-fast: false
-    runs-on: ${{ matrix.os }}
-    defaults:
-      run:
-        shell: bash
-    env:
-      CGO_ENABLED: 0
-      GOTOOLCHAIN: local
-      # Fix mingw trying to be smart and converting paths https://github.com/moby/moby/issues/24029#issuecomment-250412919
-      MSYS_NO_PATHCONV: true
-    steps:
-      - uses: actions/checkout@v5
-
-      - name: Setup Go
-        uses: actions/setup-go@v6
-        with:
-          go-version: ${{ matrix.go-version }}
-          check-latest: true # Always check for the latest patch release
-
-      # TODO: remove after issue77975 fixed, see: https://github.com/golang/go/issues/77975
-      - name: Fix issue77975 for Golang1.26
-        if: ${{ matrix.go-version == '1.26' }}
-        run: |
-          cd $(go env GOROOT)
-          patch --verbose -p 1 < $GITHUB_WORKSPACE/.github/patch/issue77975.patch
-
-      - name: Revert Golang commit for Windows7/8
-        if: ${{ runner.os == 'Windows' && matrix.go-version != '1.20' }}
-        run: |
-          cd $(go env GOROOT)
-          patch --verbose -p 1 < $GITHUB_WORKSPACE/.github/patch/go${{matrix.go-version}}.patch
-
-      - name: Remove inbound test for macOS
-        if: ${{ runner.os == 'macOS' }}
-        run: |
-          rm -rf listener/inbound/*_test.go
-
-      - name: Test
-        run: go test ./... -v -count=1
-
-      - name: Test with tag with_gvisor
-        run: go test ./... -v -count=1 -tags "with_gvisor"

.github/workflows/trigger-cmfa-update.yml

@@ -10,9 +10,12 @@ on:
       - Alpha
     tags:
       - "v*"
+  pull_request_target:
+    branches:
+      - Alpha
       
 jobs:
-  # Send "core-updated" to MetaCubeX/ClashMetaForAndroid to trigger update-dependencies
+  # Send "core-updated" to MetaCubeX/MihomoForAndroid to trigger update-dependencies
   trigger-CMFA-update:
     runs-on: ubuntu-latest
     steps:
@@ -24,7 +27,7 @@ jobs:
       
       - name: Trigger update-dependencies
         run: |
-          curl -X POST https://api.github.com/repos/MetaCubeX/ClashMetaForAndroid/dispatches \
+          curl -X POST https://api.github.com/repos/MetaCubeX/MihomoForAndroid/dispatches \
             -H "Accept: application/vnd.github.everest-preview+json" \
             -H "Authorization: token ${{ steps.generate-token.outputs.token }}" \
-            -d '{"event_type": "core-updated"}'
+            -d '{"event_type": "core-updated"}'

Dockerfile

@@ -4,16 +4,16 @@ RUN echo "I'm building for $TARGETPLATFORM"
 
 RUN apk add --no-cache gzip && \
     mkdir /mihomo-config && \
-    wget -O /mihomo-config/geoip.metadb https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb && \
-    wget -O /mihomo-config/geosite.dat https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat && \
-    wget -O /mihomo-config/geoip.dat https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.dat
+    wget -O /mihomo-config/geoip.metadb https://fastly.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.metadb && \
+    wget -O /mihomo-config/geosite.dat https://fastly.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.dat && \
+    wget -O /mihomo-config/geoip.dat https://fastly.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.dat
 
 COPY docker/file-name.sh /mihomo/file-name.sh
 WORKDIR /mihomo
 COPY bin/ bin/
 RUN FILE_NAME=`sh file-name.sh` && echo $FILE_NAME && \
-    FILE_NAME=`ls bin/ | egrep "$FILE_NAME.gz"|awk NR==1` && echo $FILE_NAME && \
-    mv bin/$FILE_NAME mihomo.gz && gzip -d mihomo.gz && chmod +x mihomo && echo "$FILE_NAME" > /mihomo-config/test
+    FILE_NAME=`ls bin/ | egrep "$FILE_NAME.*"|awk NR==1` && echo $FILE_NAME && \
+    mv bin/$FILE_NAME mihomo.gz && gzip -d mihomo.gz && echo "$FILE_NAME" > /mihomo-config/test
 FROM alpine:latest
 LABEL org.opencontainers.image.source="https://github.com/MetaCubeX/mihomo"
 
@@ -23,4 +23,5 @@ VOLUME ["/root/.config/mihomo/"]
 
 COPY --from=builder /mihomo-config/ /root/.config/mihomo/
 COPY --from=builder /mihomo/mihomo /mihomo
+RUN chmod +x /mihomo
 ENTRYPOINT [ "/mihomo" ]

Makefile

@@ -17,19 +17,10 @@ GOBUILD=CGO_ENABLED=0 go build -tags with_gvisor -trimpath -ldflags '-X "github.
 		-w -s -buildid='
 
 PLATFORM_LIST = \
-	darwin-386 \
-	darwin-amd64-compatible \
 	darwin-amd64 \
-	darwin-amd64-v1 \
-	darwin-amd64-v2 \
-	darwin-amd64-v3 \
 	darwin-arm64 \
-	linux-386 \
 	linux-amd64-compatible \
 	linux-amd64 \
-	linux-amd64-v1 \
-	linux-amd64-v2 \
-	linux-amd64-v3 \
 	linux-armv5 \
 	linux-armv6 \
 	linux-armv7 \
@@ -51,61 +42,37 @@ WINDOWS_ARCH_LIST = \
 	windows-386 \
 	windows-amd64-compatible \
 	windows-amd64 \
-	windows-amd64-v1 \
-	windows-amd64-v2 \
-	windows-amd64-v3 \
 	windows-arm64 \
     windows-arm32v7
 
-all:linux-amd64-v3 linux-arm64\
-	darwin-amd64-v3 darwin-arm64\
- 	windows-amd64-v3 windows-arm64\
+all:linux-amd64 linux-arm64\
+	darwin-amd64 darwin-arm64\
+ 	windows-amd64 windows-arm64\
 
 
-darwin-all: darwin-amd64-v3 darwin-arm64
+darwin-all: darwin-amd64 darwin-arm64
 
 docker:
 	GOAMD64=v1 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
-darwin-386:
-	GOARCH=386 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
-darwin-amd64-compatible:
-	GOARCH=amd64 GOOS=darwin GOAMD64=v1 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
 darwin-amd64:
 	GOARCH=amd64 GOOS=darwin GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
-darwin-amd64-v1:
+darwin-amd64-compatible:
 	GOARCH=amd64 GOOS=darwin GOAMD64=v1 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
-darwin-amd64-v2:
-	GOARCH=amd64 GOOS=darwin GOAMD64=v2 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
-darwin-amd64-v3:
-	GOARCH=amd64 GOOS=darwin GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
 darwin-arm64:
 	GOARCH=arm64 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
 linux-386:
 	GOARCH=386 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
-linux-amd64-compatible:
-	GOARCH=amd64 GOOS=linux GOAMD64=v1 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
 linux-amd64:
 	GOARCH=amd64 GOOS=linux GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
-linux-amd64-v1:
+linux-amd64-compatible:
 	GOARCH=amd64 GOOS=linux GOAMD64=v1 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
-linux-amd64-v2:
-	GOARCH=amd64 GOOS=linux GOAMD64=v2 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
-linux-amd64-v3:
-	GOARCH=amd64 GOOS=linux GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
 linux-arm64:
 	GOARCH=arm64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
@@ -157,21 +124,12 @@ freebsd-arm64:
 windows-386:
 	GOARCH=386 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
 
-windows-amd64-compatible:
-	GOARCH=amd64 GOOS=windows GOAMD64=v1 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
-
 windows-amd64:
 	GOARCH=amd64 GOOS=windows GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
 
-windows-amd64-v1:
+windows-amd64-compatible:
 	GOARCH=amd64 GOOS=windows GOAMD64=v1 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
 
-windows-amd64-v2:
-	GOARCH=amd64 GOOS=windows GOAMD64=v2 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
-
-windows-amd64-v3:
-	GOARCH=amd64 GOOS=windows GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
-
 windows-arm64:
 	GOARCH=arm64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
 
@@ -204,3 +162,7 @@ clean:
 CLANG ?= clang-14
 CFLAGS := -O2 -g -Wall -Werror $(CFLAGS)
 
+ebpf: export BPF_CLANG := $(CLANG)
+ebpf: export BPF_CFLAGS := $(CFLAGS)
+ebpf:
+	cd component/ebpf/ && go generate ./...

README.md

@@ -9,7 +9,7 @@
   <a href="https://goreportcard.com/report/github.com/MetaCubeX/mihomo">
     <img src="https://goreportcard.com/badge/github.com/MetaCubeX/mihomo?style=flat-square">
   </a>
-  <img src="https://img.shields.io/github/go-mod/go-version/MetaCubeX/mihomo/Alpha?style=flat-square">
+  <img src="https://img.shields.io/github/go-mod/go-version/MetaCubeX/mihomo?style=flat-square">
   <a href="https://github.com/MetaCubeX/mihomo/releases">
     <img src="https://img.shields.io/github/release/MetaCubeX/mihomo/all.svg?style=flat-square">
   </a>
@@ -98,4 +98,4 @@ API.
 
 This software is released under the GPL-3.0 license.
 
-**In addition, any downstream projects not affiliated with `MetaCubeX` shall not contain the word `mihomo` in their names.**
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FMetaCubeX%2Fmihomo.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2FMetaCubeX%2Fmihomo?ref=badge_large)

adapter/adapter.go

@@ -3,21 +3,21 @@ package adapter
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net"
+	"net/http"
+	"net/netip"
 	"net/url"
-	"strings"
+	"strconv"
 	"time"
 
 	"github.com/metacubex/mihomo/common/atomic"
 	"github.com/metacubex/mihomo/common/queue"
 	"github.com/metacubex/mihomo/common/utils"
-	"github.com/metacubex/mihomo/common/xsync"
-	"github.com/metacubex/mihomo/component/ca"
+	"github.com/metacubex/mihomo/component/dialer"
 	C "github.com/metacubex/mihomo/constant"
-	"github.com/metacubex/mihomo/log"
-
-	"github.com/metacubex/http"
+	"github.com/puzpuzpuz/xsync/v3"
 )
 
 var UnifiedDelay = atomic.NewBool(false)
@@ -26,21 +26,17 @@ const (
 	defaultHistoriesNum = 10
 )
 
-type internalProxyState struct {
-	alive   atomic.Bool
+type extraProxyState struct {
 	history *queue.Queue[C.DelayHistory]
+	alive   atomic.Bool
 }
 
 type Proxy struct {
 	C.ProxyAdapter
-	alive   atomic.Bool
 	history *queue.Queue[C.DelayHistory]
-	extra   xsync.Map[string, *internalProxyState]
-}
-
-// Adapter implements C.Proxy
-func (p *Proxy) Adapter() C.ProxyAdapter {
-	return p.ProxyAdapter
+	alive   atomic.Bool
+	url     string
+	extra   *xsync.MapOf[string, *extraProxyState]
 }
 
 // AliveForTestUrl implements C.Proxy
@@ -52,15 +48,29 @@ func (p *Proxy) AliveForTestUrl(url string) bool {
 	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)
+	defer cancel()
+	return p.DialContext(ctx, metadata)
+}
+
 // DialContext implements C.ProxyAdapter
-func (p *Proxy) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
-	conn, err := p.ProxyAdapter.DialContext(ctx, metadata)
+func (p *Proxy) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
+	conn, err := p.ProxyAdapter.DialContext(ctx, metadata, opts...)
 	return conn, err
 }
 
+// DialUDP implements C.ProxyAdapter
+func (p *Proxy) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), C.DefaultUDPTimeout)
+	defer cancel()
+	return p.ListenPacketContext(ctx, metadata)
+}
+
 // ListenPacketContext implements C.ProxyAdapter
-func (p *Proxy) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
-	pc, err := p.ProxyAdapter.ListenPacketContext(ctx, metadata)
+func (p *Proxy) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
+	pc, err := p.ProxyAdapter.ListenPacketContext(ctx, metadata, opts...)
 	return pc, err
 }
 
@@ -71,6 +81,7 @@ func (p *Proxy) DelayHistory() []C.DelayHistory {
 	for _, item := range queueM {
 		histories = append(histories, item)
 	}
+
 	return histories
 }
 
@@ -81,6 +92,11 @@ func (p *Proxy) DelayHistoryForTestUrl(url string) []C.DelayHistory {
 	if state, ok := p.extra.Load(url); ok {
 		queueM = state.history.Copy()
 	}
+
+	if queueM == nil {
+		queueM = p.history.Copy()
+	}
+
 	histories := []C.DelayHistory{}
 	for _, item := range queueM {
 		histories = append(histories, item)
@@ -88,46 +104,61 @@ func (p *Proxy) DelayHistoryForTestUrl(url string) []C.DelayHistory {
 	return histories
 }
 
-// ExtraDelayHistories return all delay histories for each test URL
-// implements C.Proxy
-func (p *Proxy) ExtraDelayHistories() map[string]C.ProxyState {
-	histories := map[string]C.ProxyState{}
+func (p *Proxy) ExtraDelayHistory() map[string][]C.DelayHistory {
+	extraHistory := map[string][]C.DelayHistory{}
+
+	p.extra.Range(func(k string, v *extraProxyState) bool {
 
-	p.extra.Range(func(k string, v *internalProxyState) bool {
 		testUrl := k
 		state := v
 
+		histories := []C.DelayHistory{}
 		queueM := state.history.Copy()
-		var history []C.DelayHistory
 
 		for _, item := range queueM {
-			history = append(history, item)
+			histories = append(histories, item)
 		}
 
-		histories[testUrl] = C.ProxyState{
-			Alive:   state.alive.Load(),
-			History: history,
-		}
+		extraHistory[testUrl] = histories
+
 		return true
 	})
-	return histories
+	return extraHistory
 }
 
-// LastDelayForTestUrl return last history record of the specified URL. if proxy is not alive, return the max value of uint16.
+// LastDelay return last history record. if proxy is not alive, return the max value of uint16.
 // implements C.Proxy
-func (p *Proxy) LastDelayForTestUrl(url string) (delay uint16) {
-	var maxDelay uint16 = 0xffff
+func (p *Proxy) LastDelay() (delay uint16) {
+	var max uint16 = 0xffff
+	if !p.alive.Load() {
+		return max
+	}
 
-	alive := false
-	var history C.DelayHistory
+	history := p.history.Last()
+	if history.Delay == 0 {
+		return max
+	}
+	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.alive.Load()
 		history = state.history.Last()
 	}
 
-	if !alive || history.Delay == 0 {
-		return maxDelay
+	if !alive {
+		return max
+	}
+
+	if history.Delay == 0 {
+		return max
 	}
 	return history.Delay
 }
@@ -142,61 +173,61 @@ func (p *Proxy) MarshalJSON() ([]byte, error) {
 	mapping := map[string]any{}
 	_ = json.Unmarshal(inner, &mapping)
 	mapping["history"] = p.DelayHistory()
-	mapping["extra"] = p.ExtraDelayHistories()
-	mapping["alive"] = p.alive.Load()
+	mapping["extra"] = p.ExtraDelayHistory()
+	mapping["alive"] = p.AliveForTestUrl(p.url)
 	mapping["name"] = p.Name()
 	mapping["udp"] = p.SupportUDP()
-	mapping["uot"] = p.SupportUOT()
-
-	proxyInfo := p.ProxyInfo()
-	mapping["xudp"] = proxyInfo.XUDP
-	mapping["tfo"] = proxyInfo.TFO
-	mapping["mptcp"] = proxyInfo.MPTCP
-	mapping["smux"] = proxyInfo.SMUX
-	mapping["interface"] = proxyInfo.Interface
-	mapping["routing-mark"] = proxyInfo.RoutingMark
-	mapping["provider-name"] = proxyInfo.ProviderName
-	mapping["dialer-proxy"] = proxyInfo.DialerProxy
-
+	mapping["xudp"] = p.SupportXUDP()
+	mapping["tfo"] = p.SupportTFO()
 	return json.Marshal(mapping)
 }
 
 // URLTest get the delay for the specified URL
 // implements C.Proxy
 func (p *Proxy) URLTest(ctx context.Context, url string, expectedStatus utils.IntRanges[uint16]) (t uint16, err error) {
-	var satisfied bool
-
 	defer func() {
 		alive := err == nil
-		record := C.DelayHistory{Time: time.Now()}
-		if alive {
-			record.Delay = t
-		}
 
-		p.alive.Store(alive)
-		p.history.Put(record)
-		if p.history.Len() > defaultHistoriesNum {
-			p.history.Pop()
-		}
-
-		state, _ := p.extra.LoadOrStoreFn(url, func() *internalProxyState {
-			return &internalProxyState{
-				history: queue.New[C.DelayHistory](defaultHistoriesNum),
-				alive:   atomic.NewBool(true),
+		if len(p.url) == 0 || url == p.url {
+			p.alive.Store(alive)
+			record := C.DelayHistory{Time: time.Now()}
+			if alive {
+				record.Delay = t
+			}
+			p.history.Put(record)
+			if p.history.Len() > defaultHistoriesNum {
+				p.history.Pop()
 			}
-		})
 
-		if !satisfied {
-			record.Delay = 0
-			alive = false
+			// test URL configured by the proxy provider
+			if len(p.url) == 0 {
+				p.url = url
+			}
+		} else {
+			record := C.DelayHistory{Time: time.Now()}
+			if alive {
+				record.Delay = t
+			}
+			p.history.Put(record)
+			if p.history.Len() > defaultHistoriesNum {
+				p.history.Pop()
+			}
+
+			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.alive.Store(alive)
+			state.history.Put(record)
+			if state.history.Len() > defaultHistoriesNum {
+				state.history.Pop()
+			}
 		}
-
-		state.alive.Store(alive)
-		state.history.Put(record)
-		if state.history.Len() > defaultHistoriesNum {
-			state.history.Pop()
-		}
-
 	}()
 
 	unifiedDelay := UnifiedDelay.Load()
@@ -221,11 +252,6 @@ func (p *Proxy) URLTest(ctx context.Context, url string, expectedStatus utils.In
 	}
 	req = req.WithContext(ctx)
 
-	tlsConfig, err := ca.GetTLSConfig(ca.Option{})
-	if err != nil {
-		return
-	}
-
 	transport := &http.Transport{
 		DialContext: func(context.Context, string, string) (net.Conn, error) {
 			return instance, nil
@@ -235,7 +261,6 @@ func (p *Proxy) URLTest(ctx context.Context, url string, expectedStatus utils.In
 		IdleConnTimeout:       90 * time.Second,
 		TLSHandshakeTimeout:   10 * time.Second,
 		ExpectContinueTimeout: 1 * time.Second,
-		TLSClientConfig:       tlsConfig,
 	}
 
 	client := http.Client{
@@ -258,22 +283,18 @@ func (p *Proxy) URLTest(ctx context.Context, url string, expectedStatus utils.In
 
 	if unifiedDelay {
 		second := time.Now()
-		var ignoredErr error
-		var secondResp *http.Response
-		secondResp, ignoredErr = client.Do(req)
-		if ignoredErr == nil {
-			resp = secondResp
+		resp, err = client.Do(req)
+		if err == nil {
 			_ = resp.Body.Close()
 			start = second
-		} else {
-			if strings.HasPrefix(url, "http://") {
-				log.Errorln("%s failed to get the second response from %s: %v", p.Name(), url, ignoredErr)
-				log.Warnln("It is recommended to use HTTPS for provider.health-check.url and group.url to ensure better reliability. Due to some proxy providers hijacking test addresses and not being compatible with repeated HEAD requests, using HTTP may result in failed tests.")
-			}
 		}
 	}
 
-	satisfied = resp != nil && (expectedStatus == nil || expectedStatus.Check(uint16(resp.StatusCode)))
+	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
 }
@@ -283,7 +304,8 @@ func NewProxy(adapter C.ProxyAdapter) *Proxy {
 		ProxyAdapter: adapter,
 		history:      queue.New[C.DelayHistory](defaultHistoriesNum),
 		alive:        atomic.NewBool(true),
-	}
+		url:          "",
+		extra:        xsync.NewMapOf[string, *extraProxyState]()}
 }
 
 func urlToMetadata(rawURL string) (addr C.Metadata, err error) {
@@ -304,7 +326,15 @@ func urlToMetadata(rawURL string) (addr C.Metadata, err error) {
 			return
 		}
 	}
+	uintPort, err := strconv.ParseUint(port, 10, 16)
+	if err != nil {
+		return
+	}
 
-	err = addr.SetRemoteAddress(net.JoinHostPort(u.Hostname(), port))
+	addr = C.Metadata{
+		Host:    u.Hostname(),
+		DstIP:   netip.Addr{},
+		DstPort: uint16(uintPort),
+	}
 	return
 }

adapter/inbound/addition.go

@@ -47,7 +47,7 @@ func WithDstAddr(addr net.Addr) Addition {
 func WithSrcAddr(addr net.Addr) Addition {
 	return func(metadata *C.Metadata) {
 		m := C.Metadata{}
-		if err := m.SetRemoteAddr(addr); err == nil {
+		if err := m.SetRemoteAddr(addr);err ==nil{
 			metadata.SrcIP = m.DstIP
 			metadata.SrcPort = m.DstPort
 		}
@@ -57,17 +57,9 @@ func WithSrcAddr(addr net.Addr) Addition {
 func WithInAddr(addr net.Addr) Addition {
 	return func(metadata *C.Metadata) {
 		m := C.Metadata{}
-		if err := m.SetRemoteAddr(addr); err == nil {
+		if err := m.SetRemoteAddr(addr);err ==nil{
 			metadata.InIP = m.DstIP
 			metadata.InPort = m.DstPort
 		}
 	}
 }
-
-func WithDSCP(dscp uint8) Addition {
-	return func(metadata *C.Metadata) {
-		metadata.DSCP = dscp
-	}
-}
-
-func Placeholder(metadata *C.Metadata) {}

adapter/inbound/auth.go

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

adapter/inbound/http.go

@@ -14,7 +14,7 @@ func NewHTTP(target socks5.Addr, srcConn net.Conn, conn net.Conn, additions ...A
 	metadata.Type = C.HTTP
 	metadata.RawSrcAddr = srcConn.RemoteAddr()
 	metadata.RawDstAddr = srcConn.LocalAddr()
-	ApplyAdditions(metadata, WithSrcAddr(srcConn.RemoteAddr()), WithInAddr(srcConn.LocalAddr()))
+	ApplyAdditions(metadata, WithSrcAddr(srcConn.RemoteAddr()), WithInAddr(conn.LocalAddr()))
 	ApplyAdditions(metadata, additions...)
 	return conn, metadata
 }

adapter/inbound/https.go

@@ -2,18 +2,15 @@ package inbound
 
 import (
 	"net"
+	"net/http"
 
 	C "github.com/metacubex/mihomo/constant"
-
-	"github.com/metacubex/http"
 )
 
 // NewHTTPS receive CONNECT request and return ConnContext
 func NewHTTPS(request *http.Request, conn net.Conn, additions ...Addition) (net.Conn, *C.Metadata) {
 	metadata := parseHTTPAddr(request)
 	metadata.Type = C.HTTPS
-	metadata.RawSrcAddr = conn.RemoteAddr()
-	metadata.RawDstAddr = conn.LocalAddr()
 	ApplyAdditions(metadata, WithSrcAddr(conn.RemoteAddr()), WithInAddr(conn.LocalAddr()))
 	ApplyAdditions(metadata, additions...)
 	return conn, metadata

adapter/inbound/ipfilter.go

@@ -1,47 +0,0 @@
-package inbound
-
-import (
-	"net"
-	"net/netip"
-
-	C "github.com/metacubex/mihomo/constant"
-)
-
-var lanAllowedIPs []netip.Prefix
-var lanDisAllowedIPs []netip.Prefix
-
-func SetAllowedIPs(prefixes []netip.Prefix) {
-	lanAllowedIPs = prefixes
-}
-
-func SetDisAllowedIPs(prefixes []netip.Prefix) {
-	lanDisAllowedIPs = prefixes
-}
-
-func AllowedIPs() []netip.Prefix {
-	return lanAllowedIPs
-}
-
-func DisAllowedIPs() []netip.Prefix {
-	return lanDisAllowedIPs
-}
-
-func IsRemoteAddrDisAllowed(addr net.Addr) bool {
-	m := C.Metadata{}
-	if err := m.SetRemoteAddr(addr); err != nil {
-		return false
-	}
-	ipAddr := m.AddrPort().Addr()
-	if ipAddr.IsValid() {
-		return isAllowed(ipAddr) && !isDisAllowed(ipAddr)
-	}
-	return false
-}
-
-func isAllowed(addr netip.Addr) bool {
-	return prefixesContains(lanAllowedIPs, addr)
-}
-
-func isDisAllowed(addr netip.Addr) bool {
-	return prefixesContains(lanDisAllowedIPs, addr)
-}

adapter/inbound/listen.go

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

adapter/inbound/listen_notwindows.go

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

adapter/inbound/listen_windows.go

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

adapter/inbound/mptcp_go120.go

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

adapter/inbound/mptcp_go121.go

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

adapter/inbound/util.go

@@ -2,13 +2,14 @@ package inbound
 
 import (
 	"net"
+	"net/http"
 	"net/netip"
+	"strconv"
 	"strings"
 
+	"github.com/metacubex/mihomo/common/nnip"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/transport/socks5"
-
-	"github.com/metacubex/http"
 )
 
 func parseSocksAddr(target socks5.Addr) *C.Metadata {
@@ -20,13 +21,13 @@ func parseSocksAddr(target socks5.Addr) *C.Metadata {
 		metadata.Host = strings.TrimRight(string(target[2:2+target[1]]), ".")
 		metadata.DstPort = uint16((int(target[2+target[1]]) << 8) | int(target[2+target[1]+1]))
 	case socks5.AtypIPv4:
-		metadata.DstIP, _ = netip.AddrFromSlice(target[1 : 1+net.IPv4len])
+		metadata.DstIP = nnip.IpToAddr(net.IP(target[1 : 1+net.IPv4len]))
 		metadata.DstPort = uint16((int(target[1+net.IPv4len]) << 8) | int(target[1+net.IPv4len+1]))
 	case socks5.AtypIPv6:
-		metadata.DstIP, _ = netip.AddrFromSlice(target[1 : 1+net.IPv6len])
+		ip6, _ := netip.AddrFromSlice(target[1 : 1+net.IPv6len])
+		metadata.DstIP = ip6.Unmap()
 		metadata.DstPort = uint16((int(target[1+net.IPv6len]) << 8) | int(target[1+net.IPv6len+1]))
 	}
-	metadata.DstIP = metadata.DstIP.Unmap()
 
 	return metadata
 }
@@ -41,23 +42,22 @@ func parseHTTPAddr(request *http.Request) *C.Metadata {
 	// trim FQDN (#737)
 	host = strings.TrimRight(host, ".")
 
-	metadata := &C.Metadata{}
-	_ = metadata.SetRemoteAddress(net.JoinHostPort(host, port))
+	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,
+	}
+
+	ip, err := netip.ParseAddr(host)
+	if err == nil {
+		metadata.DstIP = ip
+	}
+
 	return metadata
 }
-
-func prefixesContains(prefixes []netip.Prefix, addr netip.Addr) bool {
-	if len(prefixes) == 0 {
-		return false
-	}
-	if !addr.IsValid() {
-		return false
-	}
-	addr = addr.Unmap().WithZone("") // netip.Prefix.Contains returns false if ip has an IPv6 zone
-	for _, prefix := range prefixes {
-		if prefix.Contains(addr) {
-			return true
-		}
-	}
-	return false
-}

adapter/outbound/anytls.go

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

adapter/outbound/base.go

@@ -3,41 +3,28 @@ package outbound
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"net"
-	"runtime"
-	"sync"
+	"strings"
 	"syscall"
 
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/common/utils"
 	"github.com/metacubex/mihomo/component/dialer"
-	"github.com/metacubex/mihomo/component/proxydialer"
-	"github.com/metacubex/mihomo/component/resolver"
 	C "github.com/metacubex/mihomo/constant"
-	"github.com/metacubex/mihomo/log"
 )
 
-type ProxyAdapter interface {
-	C.ProxyAdapter
-	DialOptions() []dialer.Option
-	ResolveUDP(ctx context.Context, metadata *C.Metadata) error
-}
-
 type Base struct {
 	name   string
 	addr   string
+	iface  string
 	tp     C.AdapterType
-	pdName string
 	udp    bool
 	xudp   bool
 	tfo    bool
 	mpTcp  bool
-	iface  string
 	rmark  int
-	prefer C.DNSPrefer
-	dialer C.Dialer
 	id     string
+	prefer C.DNSPrefer
 }
 
 // Name implements C.ProxyAdapter
@@ -59,15 +46,35 @@ func (b *Base) Type() C.AdapterType {
 	return b.tp
 }
 
-func (b *Base) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
+// StreamConnContext implements C.ProxyAdapter
+func (b *Base) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+	return c, C.ErrNotSupport
+}
+
+func (b *Base) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
+	return nil, C.ErrNotSupport
+}
+
+// DialContextWithDialer implements C.ProxyAdapter
+func (b *Base) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
 	return nil, C.ErrNotSupport
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (b *Base) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (b *Base) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
 	return nil, C.ErrNotSupport
 }
 
+// ListenPacketWithDialer implements C.ProxyAdapter
+func (b *Base) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
+	return nil, C.ErrNotSupport
+}
+
+// SupportWithDialer implements C.ProxyAdapter
+func (b *Base) SupportWithDialer() C.NetWork {
+	return C.InvalidNet
+}
+
 // SupportUOT implements C.ProxyAdapter
 func (b *Base) SupportUOT() bool {
 	return false
@@ -78,16 +85,14 @@ func (b *Base) SupportUDP() bool {
 	return b.udp
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (b *Base) ProxyInfo() (info C.ProxyInfo) {
-	info.XUDP = b.xudp
-	info.TFO = b.tfo
-	info.MPTCP = b.mpTcp
-	info.SMUX = false
-	info.Interface = b.iface
-	info.RoutingMark = b.rmark
-	info.ProviderName = b.pdName
-	return
+// SupportXUDP implements C.ProxyAdapter
+func (b *Base) SupportXUDP() bool {
+	return b.xudp
+}
+
+// SupportTFO implements C.ProxyAdapter
+func (b *Base) SupportTFO() bool {
+	return b.tfo
 }
 
 // IsL3Protocol implements C.ProxyAdapter
@@ -114,7 +119,7 @@ func (b *Base) Unwrap(metadata *C.Metadata, touch bool) C.Proxy {
 }
 
 // DialOptions return []dialer.Option from struct
-func (b *Base) DialOptions() (opts []dialer.Option) {
+func (b *Base) DialOptions(opts ...dialer.Option) []dialer.Option {
 	if b.iface != "" {
 		opts = append(opts, dialer.WithInterface(b.iface))
 	}
@@ -146,46 +151,13 @@ func (b *Base) DialOptions() (opts []dialer.Option) {
 	return opts
 }
 
-func (b *Base) ResolveUDP(ctx context.Context, metadata *C.Metadata) error {
-	if !metadata.Resolved() {
-		ip, err := resolver.ResolveIP(ctx, metadata.Host)
-		if err != nil {
-			return fmt.Errorf("can't resolve ip: %w", err)
-		}
-		metadata.DstIP = ip
-	}
-	return nil
-}
-
-func (b *Base) Close() error {
-	return nil
-}
-
 type BasicOption struct {
-	TFO         bool        `proxy:"tfo,omitempty"`
-	MPTCP       bool        `proxy:"mptcp,omitempty"`
-	Interface   string      `proxy:"interface-name,omitempty"`
-	RoutingMark int         `proxy:"routing-mark,omitempty"`
-	IPVersion   C.DNSPrefer `proxy:"ip-version,omitempty"`
-	DialerProxy string      `proxy:"dialer-proxy,omitempty"` // don't apply this option into groups, but can set a group name in a proxy
-
-	//
-	// The following parameters are used internally, assign value by the structure decoder are disallowed
-	//
-	DialerForAPI C.Dialer `proxy:"-"` // the dialer used for API usage has higher priority than all the above configurations.
-	ProviderName string   `proxy:"-"`
-}
-
-func (b *BasicOption) NewDialer(opts []dialer.Option) C.Dialer {
-	cDialer := b.DialerForAPI
-	if cDialer == nil {
-		if b.DialerProxy != "" {
-			cDialer = proxydialer.NewByName(b.DialerProxy)
-		} else {
-			cDialer = dialer.NewDialer(opts...)
-		}
-	}
-	return cDialer
+	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"`
+	DialerProxy string `proxy:"dialer-proxy,omitempty"` // don't apply this option into groups, but can set a group name in a proxy
 }
 
 type BaseOption struct {
@@ -218,22 +190,12 @@ func NewBase(opt BaseOption) *Base {
 
 type conn struct {
 	N.ExtendedConn
-	chain       C.Chain
-	pdChain     C.Chain
-	adapterAddr string
+	chain                   C.Chain
+	actualRemoteDestination string
 }
 
 func (c *conn) RemoteDestination() string {
-	if remoteAddr := c.RemoteAddr(); remoteAddr != nil {
-		m := C.Metadata{}
-		if err := m.SetRemoteAddr(remoteAddr); err == nil {
-			if m.Valid() {
-				return m.String()
-			}
-		}
-	}
-	host, _, _ := net.SplitHostPort(c.adapterAddr)
-	return host
+	return c.actualRemoteDestination
 }
 
 // Chains implements C.Connection
@@ -241,15 +203,9 @@ func (c *conn) Chains() C.Chain {
 	return c.chain
 }
 
-// ProviderChains implements C.Connection
-func (c *conn) ProviderChains() C.Chain {
-	return c.pdChain
-}
-
 // AppendToChains implements C.Connection
 func (c *conn) AppendToChains(a C.ProxyAdapter) {
 	c.chain = append(c.chain, a.Name())
-	c.pdChain = append(c.pdChain, a.ProxyInfo().ProviderName)
 }
 
 func (c *conn) Upstream() any {
@@ -264,36 +220,23 @@ func (c *conn) ReaderReplaceable() bool {
 	return true
 }
 
-func (c *conn) AddRef(ref any) {
-	c.ExtendedConn = N.NewRefConn(c.ExtendedConn, ref) // add ref for autoCloseProxyAdapter
-}
-
 func NewConn(c net.Conn, a C.ProxyAdapter) C.Conn {
 	if _, ok := c.(syscall.Conn); !ok { // exclusion system conn like *net.TCPConn
 		c = N.NewDeadlineConn(c) // most conn from outbound can't handle readDeadline correctly
 	}
-	cc := &conn{N.NewExtendedConn(c), nil, nil, a.Addr()}
-	cc.AppendToChains(a)
-	return cc
+	return &conn{N.NewExtendedConn(c), []string{a.Name()}, parseRemoteDestination(a.Addr())}
 }
 
 type packetConn struct {
 	N.EnhancePacketConn
-	chain       C.Chain
-	pdChain     C.Chain
-	adapterName string
-	connID      string
-	adapterAddr string
-	resolveUDP  func(ctx context.Context, metadata *C.Metadata) error
-}
-
-func (c *packetConn) ResolveUDP(ctx context.Context, metadata *C.Metadata) error {
-	return c.resolveUDP(ctx, metadata)
+	chain                   C.Chain
+	adapterName             string
+	connID                  string
+	actualRemoteDestination string
 }
 
 func (c *packetConn) RemoteDestination() string {
-	host, _, _ := net.SplitHostPort(c.adapterAddr)
-	return host
+	return c.actualRemoteDestination
 }
 
 // Chains implements C.Connection
@@ -301,15 +244,9 @@ func (c *packetConn) Chains() C.Chain {
 	return c.chain
 }
 
-// ProviderChains implements C.Connection
-func (c *packetConn) ProviderChains() C.Chain {
-	return c.pdChain
-}
-
 // AppendToChains implements C.Connection
 func (c *packetConn) AppendToChains(a C.ProxyAdapter) {
 	c.chain = append(c.chain, a.Name())
-	c.pdChain = append(c.pdChain, a.ProxyInfo().ProviderName)
 }
 
 func (c *packetConn) LocalAddr() net.Addr {
@@ -329,66 +266,22 @@ func (c *packetConn) ReaderReplaceable() bool {
 	return true
 }
 
-func (c *packetConn) AddRef(ref any) {
-	c.EnhancePacketConn = N.NewRefPacketConn(c.EnhancePacketConn, ref) // add ref for autoCloseProxyAdapter
-}
-
-func newPacketConn(pc net.PacketConn, a ProxyAdapter) C.PacketConn {
+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
 	}
-	cpc := &packetConn{epc, nil, nil, a.Name(), utils.NewUUIDV4().String(), a.Addr(), a.ResolveUDP}
-	cpc.AppendToChains(a)
-	return cpc
+	return &packetConn{epc, []string{a.Name()}, a.Name(), utils.NewUUIDV4().String(), parseRemoteDestination(a.Addr())}
 }
 
-type AddRef interface {
-	AddRef(ref any)
-}
-
-type autoCloseProxyAdapter struct {
-	ProxyAdapter
-	closeOnce sync.Once
-	closeErr  error
-}
-
-func (p *autoCloseProxyAdapter) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := p.ProxyAdapter.DialContext(ctx, metadata)
-	if err != nil {
-		return nil, err
+func parseRemoteDestination(addr string) string {
+	if dst, _, err := net.SplitHostPort(addr); err == nil {
+		return dst
+	} else {
+		if addrError, ok := err.(*net.AddrError); ok && strings.Contains(addrError.Err, "missing port") {
+			return dst
+		} else {
+			return ""
+		}
 	}
-	if c, ok := c.(AddRef); ok {
-		c.AddRef(p)
-	}
-	return c, nil
-}
-
-func (p *autoCloseProxyAdapter) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	pc, err := p.ProxyAdapter.ListenPacketContext(ctx, metadata)
-	if err != nil {
-		return nil, err
-	}
-	if pc, ok := pc.(AddRef); ok {
-		pc.AddRef(p)
-	}
-	return pc, nil
-}
-
-func (p *autoCloseProxyAdapter) Close() error {
-	p.closeOnce.Do(func() {
-		log.Debugln("Closing outdated proxy [%s]", p.Name())
-		runtime.SetFinalizer(p, nil)
-		p.closeErr = p.ProxyAdapter.Close()
-	})
-	return p.closeErr
-}
-
-func NewAutoCloseProxyAdapter(adapter ProxyAdapter) ProxyAdapter {
-	proxy := &autoCloseProxyAdapter{
-		ProxyAdapter: adapter,
-	}
-	// auto close ProxyAdapter
-	runtime.SetFinalizer(proxy, (*autoCloseProxyAdapter).Close)
-	return proxy
 }

adapter/outbound/direct.go

@@ -2,17 +2,17 @@ package outbound
 
 import (
 	"context"
-	"fmt"
+	"errors"
+	"net/netip"
 
+	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/component/dialer"
-	"github.com/metacubex/mihomo/component/loopback"
 	"github.com/metacubex/mihomo/component/resolver"
 	C "github.com/metacubex/mihomo/constant"
 )
 
 type Direct struct {
 	*Base
-	loopBack *loopback.Detector
 }
 
 type DirectOption struct {
@@ -21,47 +21,31 @@ type DirectOption struct {
 }
 
 // DialContext implements C.ProxyAdapter
-func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
-	if err := d.loopBack.CheckConn(metadata); err != nil {
-		return nil, err
-	}
-	opts := d.DialOptions()
-	opts = append(opts, dialer.WithResolver(resolver.DirectHostResolver))
-	c, err := dialer.DialContext(ctx, "tcp", metadata.RemoteAddress(), opts...)
+func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
+	opts = append(opts, dialer.WithResolver(resolver.DefaultResolver))
+	c, err := dialer.DialContext(ctx, "tcp", metadata.RemoteAddress(), d.Base.DialOptions(opts...)...)
 	if err != nil {
 		return nil, err
 	}
-	return d.loopBack.NewConn(NewConn(c, d)), nil
+	N.TCPKeepAlive(c)
+	return NewConn(c, d), nil
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (d *Direct) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
-	if err := d.loopBack.CheckPacketConn(metadata); err != nil {
-		return nil, err
-	}
-	if err := d.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
-	}
-	pc, err := dialer.NewDialer(d.DialOptions()...).ListenPacket(ctx, "udp", "", metadata.AddrPort())
-	if err != nil {
-		return nil, err
-	}
-	return d.loopBack.NewPacketConn(newPacketConn(pc, d)), nil
-}
-
-func (d *Direct) ResolveUDP(ctx context.Context, metadata *C.Metadata) error {
-	if (!metadata.Resolved() || resolver.DirectHostResolver != resolver.DefaultResolver) && metadata.Host != "" {
-		ip, err := resolver.ResolveIPWithResolver(ctx, metadata.Host, resolver.DirectHostResolver)
+func (d *Direct) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
+	// net.UDPConn.WriteTo only working with *net.UDPAddr, so we need a net.UDPAddr
+	if !metadata.Resolved() {
+		ip, err := resolver.ResolveIPWithResolver(ctx, metadata.Host, resolver.DefaultResolver)
 		if err != nil {
-			return fmt.Errorf("can't resolve ip: %w", err)
+			return nil, errors.New("can't resolve ip")
 		}
 		metadata.DstIP = ip
 	}
-	return nil
-}
-
-func (d *Direct) IsL3Protocol(metadata *C.Metadata) bool {
-	return true // tell DNSDialer don't send domain to DialContext, avoid lookback to DefaultResolver
+	pc, err := dialer.NewDialer(d.Base.DialOptions(opts...)...).ListenPacket(ctx, "udp", "", netip.AddrPortFrom(metadata.DstIP, metadata.DstPort))
+	if err != nil {
+		return nil, err
+	}
+	return newPacketConn(pc, d), nil
 }
 
 func NewDirectWithOption(option DirectOption) *Direct {
@@ -69,15 +53,13 @@ func NewDirectWithOption(option DirectOption) *Direct {
 		Base: &Base{
 			name:   option.Name,
 			tp:     C.Direct,
-			pdName: option.ProviderName,
 			udp:    true,
 			tfo:    option.TFO,
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
+			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
-		loopBack: loopback.NewDetector(),
 	}
 }
 
@@ -89,7 +71,6 @@ func NewDirect() *Direct {
 			udp:    true,
 			prefer: C.DualStack,
 		},
-		loopBack: loopback.NewDetector(),
 	}
 }
 
@@ -101,6 +82,5 @@ func NewCompatible() *Direct {
 			udp:    true,
 			prefer: C.DualStack,
 		},
-		loopBack: loopback.NewDetector(),
 	}
 }

adapter/outbound/dns.go

@@ -1,170 +0,0 @@
-package outbound
-
-import (
-	"context"
-	"net"
-	"net/netip"
-	"time"
-
-	N "github.com/metacubex/mihomo/common/net"
-	"github.com/metacubex/mihomo/common/pool"
-	"github.com/metacubex/mihomo/component/resolver"
-	C "github.com/metacubex/mihomo/constant"
-	"github.com/metacubex/mihomo/log"
-)
-
-type Dns struct {
-	*Base
-}
-
-type DnsOption struct {
-	BasicOption
-	Name string `proxy:"name"`
-}
-
-// DialContext implements C.ProxyAdapter
-func (d *Dns) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
-	left, right := N.Pipe()
-	go resolver.RelayDnsConn(context.Background(), right, 0)
-	return NewConn(left, d), nil
-}
-
-// ListenPacketContext implements C.ProxyAdapter
-func (d *Dns) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
-	log.Debugln("[DNS] hijack udp:%s from %s", metadata.RemoteAddress(), metadata.SourceAddrPort())
-	if err := d.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
-	}
-
-	ctx, cancel := context.WithCancel(context.Background())
-
-	return newPacketConn(&dnsPacketConn{
-		response: make(chan dnsPacket, 1),
-		ctx:      ctx,
-		cancel:   cancel,
-	}, d), nil
-}
-
-func (d *Dns) ResolveUDP(ctx context.Context, metadata *C.Metadata) error {
-	if !metadata.Resolved() {
-		metadata.DstIP = netip.AddrFrom4([4]byte{127, 0, 0, 2})
-	}
-	return nil
-}
-
-type dnsPacket struct {
-	data []byte
-	put  func()
-	addr net.Addr
-}
-
-// dnsPacketConn implements net.PacketConn
-type dnsPacketConn struct {
-	response chan dnsPacket
-	ctx      context.Context
-	cancel   context.CancelFunc
-}
-
-func (d *dnsPacketConn) WaitReadFrom() (data []byte, put func(), addr net.Addr, err error) {
-	select {
-	case packet := <-d.response:
-		return packet.data, packet.put, packet.addr, nil
-	case <-d.ctx.Done():
-		return nil, nil, nil, net.ErrClosed
-	}
-}
-
-func (d *dnsPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
-	select {
-	case packet := <-d.response:
-		n = copy(p, packet.data)
-		if packet.put != nil {
-			packet.put()
-		}
-		return n, packet.addr, nil
-	case <-d.ctx.Done():
-		return 0, nil, net.ErrClosed
-	}
-}
-
-func (d *dnsPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
-	select {
-	case <-d.ctx.Done():
-		return 0, net.ErrClosed
-	default:
-	}
-
-	if len(p) > resolver.SafeDnsPacketSize {
-		// wtf???
-		return len(p), nil
-	}
-
-	buf := pool.Get(resolver.SafeDnsPacketSize)
-	put := func() { _ = pool.Put(buf) }
-	copy(buf, p) // avoid p be changed after WriteTo returned
-
-	go func() { // don't block the WriteTo function
-		ctx, cancel := context.WithTimeout(d.ctx, resolver.DefaultDnsRelayTimeout)
-		defer cancel()
-
-		buf, err = resolver.RelayDnsPacket(ctx, buf[:len(p)], buf)
-		if err != nil {
-			put()
-			return
-		}
-
-		packet := dnsPacket{
-			data: buf,
-			put:  put,
-			addr: addr,
-		}
-		select {
-		case d.response <- packet:
-			break
-		case <-d.ctx.Done():
-			put()
-		}
-	}()
-	return len(p), nil
-}
-
-func (d *dnsPacketConn) Close() error {
-	d.cancel()
-	return nil
-}
-
-func (*dnsPacketConn) LocalAddr() net.Addr {
-	return &net.UDPAddr{
-		IP:   net.IPv4(127, 0, 0, 1),
-		Port: 53,
-		Zone: "",
-	}
-}
-
-func (*dnsPacketConn) SetDeadline(t time.Time) error {
-	return nil
-}
-
-func (*dnsPacketConn) SetReadDeadline(t time.Time) error {
-	return nil
-}
-
-func (*dnsPacketConn) SetWriteDeadline(t time.Time) error {
-	return nil
-}
-
-func NewDnsWithOption(option DnsOption) *Dns {
-	return &Dns{
-		Base: &Base{
-			name:   option.Name,
-			tp:     C.Dns,
-			pdName: option.ProviderName,
-			udp:    true,
-			tfo:    option.TFO,
-			mpTcp:  option.MPTCP,
-			iface:  option.Interface,
-			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
-		},
-	}
-}

adapter/outbound/ech.go

@@ -1,41 +0,0 @@
-package outbound
-
-import (
-	"context"
-	"encoding/base64"
-	"fmt"
-
-	"github.com/metacubex/mihomo/component/ech"
-	"github.com/metacubex/mihomo/component/resolver"
-)
-
-type ECHOptions struct {
-	Enable bool   `proxy:"enable,omitempty" obfs:"enable,omitempty"`
-	Config string `proxy:"config,omitempty" obfs:"config,omitempty"`
-
-	QueryServerName string `proxy:"query-server-name,omitempty" obfs:"query-server-name,omitempty"`
-}
-
-func (o ECHOptions) Parse() (*ech.Config, error) {
-	if !o.Enable {
-		return nil, nil
-	}
-	echConfig := &ech.Config{}
-	if o.Config != "" {
-		list, err := base64.StdEncoding.DecodeString(o.Config)
-		if err != nil {
-			return nil, fmt.Errorf("base64 decode ech config string failed: %v", err)
-		}
-		echConfig.GetEncryptedClientHelloConfigList = func(ctx context.Context, serverName string) ([]byte, error) {
-			return list, nil
-		}
-	} else {
-		echConfig.GetEncryptedClientHelloConfigList = func(ctx context.Context, serverName string) ([]byte, error) {
-			if o.QueryServerName != "" { // overrides the domain name used for ECH HTTPS record queries
-				serverName = o.QueryServerName
-			}
-			return resolver.ResolveECHWithResolver(ctx, serverName, resolver.ProxyServerHostResolver)
-		}
-	}
-	return echConfig, nil
-}

adapter/outbound/http.go

@@ -3,18 +3,21 @@ package outbound
 import (
 	"bufio"
 	"context"
+	"crypto/tls"
 	"encoding/base64"
 	"errors"
 	"fmt"
+
+	"io"
 	"net"
+	"net/http"
 	"strconv"
 
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/component/ca"
+	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/component/proxydialer"
 	C "github.com/metacubex/mihomo/constant"
-
-	"github.com/metacubex/http"
-	"github.com/metacubex/tls"
 )
 
 type Http struct {
@@ -36,8 +39,6 @@ type HttpOption struct {
 	SNI            string            `proxy:"sni,omitempty"`
 	SkipCertVerify bool              `proxy:"skip-cert-verify,omitempty"`
 	Fingerprint    string            `proxy:"fingerprint,omitempty"`
-	Certificate    string            `proxy:"certificate,omitempty"`
-	PrivateKey     string            `proxy:"private-key,omitempty"`
 	Headers        map[string]string `proxy:"headers,omitempty"`
 }
 
@@ -52,18 +53,30 @@ func (h *Http) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Me
 		}
 	}
 
-	if err := h.shakeHandContext(ctx, c, metadata); err != nil {
+	if err := h.shakeHand(metadata, c); err != nil {
 		return nil, err
 	}
 	return c, nil
 }
 
 // DialContext implements C.ProxyAdapter
-func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := h.dialer.DialContext(ctx, "tcp", h.addr)
+func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
+	return h.DialContextWithDialer(ctx, dialer.NewDialer(h.Base.DialOptions(opts...)...), metadata)
+}
+
+// DialContextWithDialer implements C.ProxyAdapter
+func (h *Http) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
+	if len(h.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(h.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
+	}
+	c, err := dialer.DialContext(ctx, "tcp", h.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", h.addr, err)
 	}
+	N.TCPKeepAlive(c)
 
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
@@ -77,19 +90,12 @@ func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn,
 	return NewConn(c, h), nil
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (h *Http) ProxyInfo() C.ProxyInfo {
-	info := h.Base.ProxyInfo()
-	info.DialerProxy = h.option.DialerProxy
-	return info
+// SupportWithDialer implements C.ProxyAdapter
+func (h *Http) SupportWithDialer() C.NetWork {
+	return C.TCP
 }
 
-func (h *Http) shakeHandContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (err error) {
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
-
+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{
@@ -113,13 +119,13 @@ func (h *Http) shakeHandContext(ctx context.Context, c net.Conn, metadata *C.Met
 
 	HeaderString += "\r\n"
 
-	_, err = c.Write([]byte(HeaderString))
+	_, err := rw.Write([]byte(HeaderString))
 
 	if err != nil {
 		return err
 	}
 
-	resp, err := http.ReadResponse(bufio.NewReader(c), nil)
+	resp, err := http.ReadResponse(bufio.NewReader(rw), nil)
 
 	if err != nil {
 		return err
@@ -152,37 +158,29 @@ func NewHttp(option HttpOption) (*Http, error) {
 			sni = option.SNI
 		}
 		var err error
-		tlsConfig, err = ca.GetTLSConfig(ca.Option{
-			TLSConfig: &tls.Config{
-				InsecureSkipVerify: option.SkipCertVerify,
-				ServerName:         sni,
-			},
-			Fingerprint: option.Fingerprint,
-			Certificate: option.Certificate,
-			PrivateKey:  option.PrivateKey,
-		})
+		tlsConfig, err = ca.GetSpecifiedFingerprintTLSConfig(&tls.Config{
+			InsecureSkipVerify: option.SkipCertVerify,
+			ServerName:         sni,
+		}, option.Fingerprint)
 		if err != nil {
 			return nil, err
 		}
 	}
 
-	outbound := &Http{
+	return &Http{
 		Base: &Base{
 			name:   option.Name,
 			addr:   net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
 			tp:     C.Http,
-			pdName: option.ProviderName,
 			tfo:    option.TFO,
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
+			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		user:      option.UserName,
 		pass:      option.Password,
 		tlsConfig: tlsConfig,
 		option:    &option,
-	}
-	outbound.dialer = option.NewDialer(outbound.DialOptions())
-	return outbound, nil
+	}, nil
 }

adapter/outbound/hysteria.go

@@ -2,6 +2,7 @@ package outbound
 
 import (
 	"context"
+	"crypto/tls"
 	"encoding/base64"
 	"fmt"
 	"net"
@@ -9,9 +10,13 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/metacubex/quic-go"
+	"github.com/metacubex/quic-go/congestion"
+	M "github.com/sagernet/sing/common/metadata"
+
 	"github.com/metacubex/mihomo/component/ca"
 	"github.com/metacubex/mihomo/component/dialer"
-	"github.com/metacubex/mihomo/component/ech"
+	"github.com/metacubex/mihomo/component/proxydialer"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/log"
 	hyCongestion "github.com/metacubex/mihomo/transport/hysteria/congestion"
@@ -20,12 +25,6 @@ import (
 	"github.com/metacubex/mihomo/transport/hysteria/pmtud_fix"
 	"github.com/metacubex/mihomo/transport/hysteria/transport"
 	"github.com/metacubex/mihomo/transport/hysteria/utils"
-
-	"github.com/metacubex/tls"
-
-	"github.com/metacubex/quic-go"
-	"github.com/metacubex/quic-go/congestion"
-	M "github.com/metacubex/sing/common/metadata"
 )
 
 const (
@@ -44,13 +43,10 @@ type Hysteria struct {
 
 	option *HysteriaOption
 	client *core.Client
-
-	tlsConfig *tls.Config
-	echConfig *ech.Config
 }
 
-func (h *Hysteria) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
-	tcpConn, err := h.client.DialTCP(metadata.String(), metadata.DstPort, h.genHdc(ctx))
+func (h *Hysteria) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
+	tcpConn, err := h.client.DialTCP(metadata.String(), metadata.DstPort, h.genHdc(ctx, opts...))
 	if err != nil {
 		return nil, err
 	}
@@ -58,72 +54,61 @@ func (h *Hysteria) DialContext(ctx context.Context, metadata *C.Metadata) (C.Con
 	return NewConn(tcpConn, h), nil
 }
 
-func (h *Hysteria) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
-	if err := h.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
-	}
-	udpConn, err := h.client.DialUDP(h.genHdc(ctx))
+func (h *Hysteria) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
+	udpConn, err := h.client.DialUDP(h.genHdc(ctx, opts...))
 	if err != nil {
 		return nil, err
 	}
 	return newPacketConn(&hyPacketConn{udpConn}, h), nil
 }
 
-func (h *Hysteria) genHdc(ctx context.Context) utils.PacketDialer {
+func (h *Hysteria) genHdc(ctx context.Context, opts ...dialer.Option) utils.PacketDialer {
 	return &hyDialerWithContext{
 		ctx: context.Background(),
-		hyDialer: func(network string, rAddr net.Addr) (net.PacketConn, error) {
-			rAddrPort, _ := netip.ParseAddrPort(rAddr.String())
-			return h.dialer.ListenPacket(ctx, network, "", rAddrPort)
+		hyDialer: func(network string) (net.PacketConn, error) {
+			var err error
+			var cDialer C.Dialer = dialer.NewDialer(h.Base.DialOptions(opts...)...)
+			if len(h.option.DialerProxy) > 0 {
+				cDialer, err = proxydialer.NewByName(h.option.DialerProxy, cDialer)
+				if err != nil {
+					return nil, err
+				}
+			}
+			rAddrPort, _ := netip.ParseAddrPort(h.Addr())
+			return cDialer.ListenPacket(ctx, network, "", rAddrPort)
 		},
 		remoteAddr: func(addr string) (net.Addr, error) {
-			udpAddr, err := resolveUDPAddr(ctx, "udp", addr, h.prefer)
-			if err != nil {
-				return nil, err
-			}
-			err = h.echConfig.ClientHandle(ctx, h.tlsConfig)
-			if err != nil {
-				return nil, err
-			}
-			return udpAddr, nil
+			return resolveUDPAddrWithPrefer(ctx, "udp", addr, h.prefer)
 		},
 	}
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (h *Hysteria) ProxyInfo() C.ProxyInfo {
-	info := h.Base.ProxyInfo()
-	info.DialerProxy = h.option.DialerProxy
-	return info
-}
-
 type HysteriaOption struct {
 	BasicOption
-	Name                string     `proxy:"name"`
-	Server              string     `proxy:"server"`
-	Port                int        `proxy:"port,omitempty"`
-	Ports               string     `proxy:"ports,omitempty"`
-	Protocol            string     `proxy:"protocol,omitempty"`
-	ObfsProtocol        string     `proxy:"obfs-protocol,omitempty"` // compatible with Stash
-	Up                  string     `proxy:"up"`
-	UpSpeed             int        `proxy:"up-speed,omitempty"` // compatible with Stash
-	Down                string     `proxy:"down"`
-	DownSpeed           int        `proxy:"down-speed,omitempty"` // compatible with Stash
-	Auth                string     `proxy:"auth,omitempty"`
-	AuthString          string     `proxy:"auth-str,omitempty"`
-	Obfs                string     `proxy:"obfs,omitempty"`
-	SNI                 string     `proxy:"sni,omitempty"`
-	ECHOpts             ECHOptions `proxy:"ech-opts,omitempty"`
-	SkipCertVerify      bool       `proxy:"skip-cert-verify,omitempty"`
-	Fingerprint         string     `proxy:"fingerprint,omitempty"`
-	Certificate         string     `proxy:"certificate,omitempty"`
-	PrivateKey          string     `proxy:"private-key,omitempty"`
-	ALPN                []string   `proxy:"alpn,omitempty"`
-	ReceiveWindowConn   int        `proxy:"recv-window-conn,omitempty"`
-	ReceiveWindow       int        `proxy:"recv-window,omitempty"`
-	DisableMTUDiscovery bool       `proxy:"disable-mtu-discovery,omitempty"`
-	FastOpen            bool       `proxy:"fast-open,omitempty"`
-	HopInterval         int        `proxy:"hop-interval,omitempty"`
+	Name                string   `proxy:"name"`
+	Server              string   `proxy:"server"`
+	Port                int      `proxy:"port,omitempty"`
+	Ports               string   `proxy:"ports,omitempty"`
+	Protocol            string   `proxy:"protocol,omitempty"`
+	ObfsProtocol        string   `proxy:"obfs-protocol,omitempty"` // compatible with Stash
+	Up                  string   `proxy:"up"`
+	UpSpeed             int      `proxy:"up-speed,omitempty"` // compatible with Stash
+	Down                string   `proxy:"down"`
+	DownSpeed           int      `proxy:"down-speed,omitempty"` // compatible with Stash
+	Auth                string   `proxy:"auth,omitempty"`
+	AuthString          string   `proxy:"auth-str,omitempty"`
+	Obfs                string   `proxy:"obfs,omitempty"`
+	SNI                 string   `proxy:"sni,omitempty"`
+	SkipCertVerify      bool     `proxy:"skip-cert-verify,omitempty"`
+	Fingerprint         string   `proxy:"fingerprint,omitempty"`
+	ALPN                []string `proxy:"alpn,omitempty"`
+	CustomCA            string   `proxy:"ca,omitempty"`
+	CustomCAString      string   `proxy:"ca-str,omitempty"`
+	ReceiveWindowConn   int      `proxy:"recv-window-conn,omitempty"`
+	ReceiveWindow       int      `proxy:"recv-window,omitempty"`
+	DisableMTUDiscovery bool     `proxy:"disable-mtu-discovery,omitempty"`
+	FastOpen            bool     `proxy:"fast-open,omitempty"`
+	HopInterval         int      `proxy:"hop-interval,omitempty"`
 }
 
 func (c *HysteriaOption) Speed() (uint64, uint64, error) {
@@ -142,7 +127,11 @@ func (c *HysteriaOption) Speed() (uint64, uint64, error) {
 }
 
 func NewHysteria(option HysteriaOption) (*Hysteria, error) {
-	clientTransport := &transport.ClientTransport{}
+	clientTransport := &transport.ClientTransport{
+		Dialer: &net.Dialer{
+			Timeout: 8 * time.Second,
+		},
+	}
 	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
 	ports := option.Ports
 
@@ -151,32 +140,23 @@ func NewHysteria(option HysteriaOption) (*Hysteria, error) {
 		serverName = option.SNI
 	}
 
-	tlsConfig, err := ca.GetTLSConfig(ca.Option{
-		TLSConfig: &tls.Config{
-			ServerName:         serverName,
-			InsecureSkipVerify: option.SkipCertVerify,
-			MinVersion:         tls.VersionTLS13,
-		},
-		Fingerprint: option.Fingerprint,
-		Certificate: option.Certificate,
-		PrivateKey:  option.PrivateKey,
-	})
+	tlsConfig := &tls.Config{
+		ServerName:         serverName,
+		InsecureSkipVerify: option.SkipCertVerify,
+		MinVersion:         tls.VersionTLS13,
+	}
+
+	var err error
+	tlsConfig, err = ca.GetTLSConfig(tlsConfig, option.Fingerprint, option.CustomCA, option.CustomCAString)
 	if err != nil {
 		return nil, err
 	}
 
-	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{DefaultALPN}
 	}
-
-	echConfig, err := option.ECHOpts.Parse()
-	if err != nil {
-		return nil, err
-	}
-	tlsClientConfig := tlsConfig
-
 	quicConfig := &quic.Config{
 		InitialStreamReceiveWindow:     uint64(option.ReceiveWindowConn),
 		MaxStreamReceiveWindow:         uint64(option.ReceiveWindowConn),
@@ -231,41 +211,27 @@ func NewHysteria(option HysteriaOption) (*Hysteria, error) {
 		down = uint64(option.DownSpeed * mbpsToBps)
 	}
 	client, err := core.NewClient(
-		addr, ports, option.Protocol, auth, tlsClientConfig, quicConfig, clientTransport, up, down, func(refBPS uint64) congestion.CongestionControl {
+		addr, ports, option.Protocol, auth, tlsConfig, quicConfig, clientTransport, up, down, func(refBPS uint64) congestion.CongestionControl {
 			return hyCongestion.NewBrutalSender(congestion.ByteCount(refBPS))
 		}, obfuscator, hopInterval, option.FastOpen,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("hysteria %s create error: %w", addr, err)
 	}
-	outbound := &Hysteria{
+	return &Hysteria{
 		Base: &Base{
 			name:   option.Name,
 			addr:   addr,
 			tp:     C.Hysteria,
-			pdName: option.ProviderName,
 			udp:    true,
 			tfo:    option.FastOpen,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
+			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
-		option:    &option,
-		client:    client,
-		tlsConfig: tlsClientConfig,
-		echConfig: echConfig,
-	}
-	outbound.dialer = option.NewDialer(outbound.DialOptions())
-
-	return outbound, nil
-}
-
-// Close implements C.ProxyAdapter
-func (h *Hysteria) Close() error {
-	if h.client != nil {
-		return h.client.Close()
-	}
-	return nil
+		option: &option,
+		client: client,
+	}, nil
 }
 
 type hyPacketConn struct {
@@ -302,7 +268,7 @@ func (c *hyPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
 }
 
 type hyDialerWithContext struct {
-	hyDialer   func(network string, rAddr net.Addr) (net.PacketConn, error)
+	hyDialer   func(network string) (net.PacketConn, error)
 	ctx        context.Context
 	remoteAddr func(host string) (net.Addr, error)
 }
@@ -312,7 +278,7 @@ func (h *hyDialerWithContext) ListenPacket(rAddr net.Addr) (net.PacketConn, erro
 	if addrPort, err := netip.ParseAddrPort(rAddr.String()); err == nil {
 		network = dialer.ParseNetwork(network, addrPort.Addr())
 	}
-	return h.hyDialer(network, rAddr)
+	return h.hyDialer(network)
 }
 
 func (h *hyDialerWithContext) Context() context.Context {

adapter/outbound/hysteria2.go

@@ -2,81 +2,69 @@ package outbound
 
 import (
 	"context"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"net"
+	"runtime"
 	"strconv"
-	"time"
 
-	N "github.com/metacubex/mihomo/common/net"
-	"github.com/metacubex/mihomo/common/utils"
+	CN "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/component/ca"
+	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/proxydialer"
 	C "github.com/metacubex/mihomo/constant"
-	"github.com/metacubex/mihomo/log"
 	tuicCommon "github.com/metacubex/mihomo/transport/tuic/common"
 
-	"github.com/metacubex/quic-go"
 	"github.com/metacubex/sing-quic/hysteria2"
-	M "github.com/metacubex/sing/common/metadata"
-	"github.com/metacubex/tls"
+
+	M "github.com/sagernet/sing/common/metadata"
 )
 
 func init() {
 	hysteria2.SetCongestionController = tuicCommon.SetCongestionController
 }
 
-const minHopInterval = 5
-const defaultHopInterval = 30
-
 type Hysteria2 struct {
 	*Base
 
 	option *Hysteria2Option
 	client *hysteria2.Client
+	dialer proxydialer.SingDialer
 }
 
 type Hysteria2Option struct {
 	BasicOption
-	Name           string     `proxy:"name"`
-	Server         string     `proxy:"server"`
-	Port           int        `proxy:"port,omitempty"`
-	Ports          string     `proxy:"ports,omitempty"`
-	HopInterval    int        `proxy:"hop-interval,omitempty"`
-	Up             string     `proxy:"up,omitempty"`
-	Down           string     `proxy:"down,omitempty"`
-	Password       string     `proxy:"password,omitempty"`
-	Obfs           string     `proxy:"obfs,omitempty"`
-	ObfsPassword   string     `proxy:"obfs-password,omitempty"`
-	SNI            string     `proxy:"sni,omitempty"`
-	ECHOpts        ECHOptions `proxy:"ech-opts,omitempty"`
-	SkipCertVerify bool       `proxy:"skip-cert-verify,omitempty"`
-	Fingerprint    string     `proxy:"fingerprint,omitempty"`
-	Certificate    string     `proxy:"certificate,omitempty"`
-	PrivateKey     string     `proxy:"private-key,omitempty"`
-	ALPN           []string   `proxy:"alpn,omitempty"`
-	CWND           int        `proxy:"cwnd,omitempty"`
-	UdpMTU         int        `proxy:"udp-mtu,omitempty"`
-
-	// quic-go special config
-	InitialStreamReceiveWindow     uint64 `proxy:"initial-stream-receive-window,omitempty"`
-	MaxStreamReceiveWindow         uint64 `proxy:"max-stream-receive-window,omitempty"`
-	InitialConnectionReceiveWindow uint64 `proxy:"initial-connection-receive-window,omitempty"`
-	MaxConnectionReceiveWindow     uint64 `proxy:"max-connection-receive-window,omitempty"`
+	Name           string   `proxy:"name"`
+	Server         string   `proxy:"server"`
+	Port           int      `proxy:"port"`
+	Up             string   `proxy:"up,omitempty"`
+	Down           string   `proxy:"down,omitempty"`
+	Password       string   `proxy:"password,omitempty"`
+	Obfs           string   `proxy:"obfs,omitempty"`
+	ObfsPassword   string   `proxy:"obfs-password,omitempty"`
+	SNI            string   `proxy:"sni,omitempty"`
+	SkipCertVerify bool     `proxy:"skip-cert-verify,omitempty"`
+	Fingerprint    string   `proxy:"fingerprint,omitempty"`
+	ALPN           []string `proxy:"alpn,omitempty"`
+	CustomCA       string   `proxy:"ca,omitempty"`
+	CustomCAString string   `proxy:"ca-str,omitempty"`
+	CWND           int      `proxy:"cwnd,omitempty"`
 }
 
-func (h *Hysteria2) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
+func (h *Hysteria2) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
+	options := h.Base.DialOptions(opts...)
+	h.dialer.SetDialer(dialer.NewDialer(options...))
 	c, err := h.client.DialConn(ctx, M.ParseSocksaddrHostPort(metadata.String(), metadata.DstPort))
 	if err != nil {
 		return nil, err
 	}
-	return NewConn(c, h), nil
+	return NewConn(CN.NewRefConn(c, h), h), nil
 }
 
-func (h *Hysteria2) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if err = h.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
-	}
+func (h *Hysteria2) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
+	options := h.Base.DialOptions(opts...)
+	h.dialer.SetDialer(dialer.NewDialer(options...))
 	pc, err := h.client.ListenPacket(ctx)
 	if err != nil {
 		return nil, err
@@ -84,42 +72,17 @@ func (h *Hysteria2) ListenPacketContext(ctx context.Context, metadata *C.Metadat
 	if pc == nil {
 		return nil, errors.New("packetConn is nil")
 	}
-	return newPacketConn(N.NewThreadSafePacketConn(pc), h), nil
+	return newPacketConn(CN.NewRefPacketConn(CN.NewThreadSafePacketConn(pc), h), h), nil
 }
 
-// Close implements C.ProxyAdapter
-func (h *Hysteria2) Close() error {
+func closeHysteria2(h *Hysteria2) {
 	if h.client != nil {
-		return h.client.CloseWithError(errors.New("proxy removed"))
+		_ = h.client.CloseWithError(errors.New("proxy removed"))
 	}
-	return nil
-}
-
-// ProxyInfo implements C.ProxyAdapter
-func (h *Hysteria2) ProxyInfo() C.ProxyInfo {
-	info := h.Base.ProxyInfo()
-	info.DialerProxy = h.option.DialerProxy
-	return info
 }
 
 func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {
 	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
-	outbound := &Hysteria2{
-		Base: &Base{
-			name:   option.Name,
-			addr:   addr,
-			tp:     C.Hysteria2,
-			pdName: option.ProviderName,
-			udp:    true,
-			iface:  option.Interface,
-			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
-		},
-		option: &option,
-	}
-	outbound.dialer = option.NewDialer(outbound.DialOptions())
-	singDialer := proxydialer.NewSingDialer(outbound.dialer)
-
 	var salamanderPassword string
 	if len(option.Obfs) > 0 {
 		if option.ObfsPassword == "" {
@@ -138,99 +101,57 @@ func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {
 		serverName = option.SNI
 	}
 
-	tlsConfig, err := ca.GetTLSConfig(ca.Option{
-		TLSConfig: &tls.Config{
-			ServerName:         serverName,
-			InsecureSkipVerify: option.SkipCertVerify,
-			MinVersion:         tls.VersionTLS13,
-		},
-		Fingerprint: option.Fingerprint,
-		Certificate: option.Certificate,
-		PrivateKey:  option.PrivateKey,
-	})
+	tlsConfig := &tls.Config{
+		ServerName:         serverName,
+		InsecureSkipVerify: option.SkipCertVerify,
+		MinVersion:         tls.VersionTLS13,
+	}
+
+	var err error
+	tlsConfig, err = ca.GetTLSConfig(tlsConfig, option.Fingerprint, option.CustomCA, option.CustomCAString)
 	if err != nil {
 		return nil, err
 	}
 
-	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
 	}
 
-	tlsClientConfig := tlsConfig
-	echConfig, err := option.ECHOpts.Parse()
-	if err != nil {
-		return nil, err
-	}
-
-	if option.UdpMTU == 0 {
-		// "1200" from quic-go's MaxDatagramSize
-		// "-3" from quic-go's DatagramFrame.MaxDataLen
-		option.UdpMTU = 1200 - 3
-	}
-
-	quicConfig := &quic.Config{
-		InitialStreamReceiveWindow:     option.InitialStreamReceiveWindow,
-		MaxStreamReceiveWindow:         option.MaxStreamReceiveWindow,
-		InitialConnectionReceiveWindow: option.InitialConnectionReceiveWindow,
-		MaxConnectionReceiveWindow:     option.MaxConnectionReceiveWindow,
-	}
+	singDialer := proxydialer.NewByNameSingDialer(option.DialerProxy, dialer.NewDialer())
 
 	clientOptions := hysteria2.ClientOptions{
 		Context:            context.TODO(),
 		Dialer:             singDialer,
-		Logger:             log.SingLogger,
+		ServerAddress:      M.ParseSocksaddrHostPort(option.Server, uint16(option.Port)),
 		SendBPS:            StringToBps(option.Up),
 		ReceiveBPS:         StringToBps(option.Down),
 		SalamanderPassword: salamanderPassword,
 		Password:           option.Password,
-		TLSConfig:          tlsClientConfig,
-		QUICConfig:         quicConfig,
+		TLSConfig:          tlsConfig,
 		UDPDisabled:        false,
 		CWND:               option.CWND,
-		UdpMTU:             option.UdpMTU,
-		ServerAddress: func(ctx context.Context) (*net.UDPAddr, error) {
-			udpAddr, err := resolveUDPAddr(ctx, "udp", addr, option.IPVersion)
-			if err != nil {
-				return nil, err
-			}
-			err = echConfig.ClientHandle(ctx, tlsClientConfig)
-			if err != nil {
-				return nil, err
-			}
-			return udpAddr, nil
-		},
-	}
-
-	var ranges utils.IntRanges[uint16]
-	var serverPorts []uint16
-	if option.Ports != "" {
-		ranges, err = utils.NewUnsignedRanges[uint16](option.Ports)
-		if err != nil {
-			return nil, err
-		}
-		ranges.Range(func(port uint16) bool {
-			serverPorts = append(serverPorts, port)
-			return true
-		})
-		if len(serverPorts) > 0 {
-			if option.HopInterval == 0 {
-				option.HopInterval = defaultHopInterval
-			} else if option.HopInterval < minHopInterval {
-				option.HopInterval = minHopInterval
-			}
-			clientOptions.HopInterval = time.Duration(option.HopInterval) * time.Second
-			clientOptions.ServerPorts = serverPorts
-		}
-	}
-	if option.Port == 0 && len(serverPorts) == 0 {
-		return nil, errors.New("invalid port")
 	}
 
 	client, err := hysteria2.NewClient(clientOptions)
 	if err != nil {
 		return nil, err
 	}
-	outbound.client = client
+
+	outbound := &Hysteria2{
+		Base: &Base{
+			name:   option.Name,
+			addr:   addr,
+			tp:     C.Hysteria2,
+			udp:    true,
+			iface:  option.Interface,
+			rmark:  option.RoutingMark,
+			prefer: C.NewDNSPrefer(option.IPVersion),
+		},
+		option: &option,
+		client: client,
+		dialer: singDialer,
+	}
+	runtime.SetFinalizer(outbound, closeHysteria2)
 
 	return outbound, nil
 }

adapter/outbound/masque.go

@@ -1,397 +0,0 @@
-package outbound
-
-import (
-	"context"
-	"crypto/ecdsa"
-	"crypto/x509"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"net"
-	"net/netip"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/metacubex/mihomo/common/atomic"
-	"github.com/metacubex/mihomo/common/contextutils"
-	"github.com/metacubex/mihomo/common/pool"
-	"github.com/metacubex/mihomo/component/dialer"
-	"github.com/metacubex/mihomo/component/resolver"
-	C "github.com/metacubex/mihomo/constant"
-	"github.com/metacubex/mihomo/dns"
-	"github.com/metacubex/mihomo/log"
-	"github.com/metacubex/mihomo/transport/masque"
-	"github.com/metacubex/mihomo/transport/tuic/common"
-
-	connectip "github.com/metacubex/connect-ip-go"
-	"github.com/metacubex/quic-go"
-	wireguard "github.com/metacubex/sing-wireguard"
-	M "github.com/metacubex/sing/common/metadata"
-	"github.com/metacubex/tls"
-)
-
-type Masque struct {
-	*Base
-	tlsConfig  *tls.Config
-	quicConfig *quic.Config
-	tunDevice  wireguard.Device
-	resolver   resolver.Resolver
-	uri        string
-
-	runCtx    context.Context
-	runCancel context.CancelFunc
-	runMutex  sync.Mutex
-	running   atomic.Bool
-	runDevice atomic.Bool
-
-	option MasqueOption
-}
-
-type MasqueOption struct {
-	BasicOption
-	Name       string `proxy:"name"`
-	Server     string `proxy:"server"`
-	Port       int    `proxy:"port"`
-	PrivateKey string `proxy:"private-key"`
-	PublicKey  string `proxy:"public-key"`
-	Ip         string `proxy:"ip,omitempty"`
-	Ipv6       string `proxy:"ipv6,omitempty"`
-	URI        string `proxy:"uri,omitempty"`
-	SNI        string `proxy:"sni,omitempty"`
-	MTU        int    `proxy:"mtu,omitempty"`
-	UDP        bool   `proxy:"udp,omitempty"`
-
-	CongestionController string `proxy:"congestion-controller,omitempty"`
-	CWND                 int    `proxy:"cwnd,omitempty"`
-
-	RemoteDnsResolve bool     `proxy:"remote-dns-resolve,omitempty"`
-	Dns              []string `proxy:"dns,omitempty"`
-}
-
-func (option MasqueOption) Prefixes() ([]netip.Prefix, error) {
-	localPrefixes := make([]netip.Prefix, 0, 2)
-	if len(option.Ip) > 0 {
-		if !strings.Contains(option.Ip, "/") {
-			option.Ip = option.Ip + "/32"
-		}
-		if prefix, err := netip.ParsePrefix(option.Ip); err == nil {
-			localPrefixes = append(localPrefixes, prefix)
-		} else {
-			return nil, fmt.Errorf("ip address parse error: %w", err)
-		}
-	}
-	if len(option.Ipv6) > 0 {
-		if !strings.Contains(option.Ipv6, "/") {
-			option.Ipv6 = option.Ipv6 + "/128"
-		}
-		if prefix, err := netip.ParsePrefix(option.Ipv6); err == nil {
-			localPrefixes = append(localPrefixes, prefix)
-		} else {
-			return nil, fmt.Errorf("ipv6 address parse error: %w", err)
-		}
-	}
-	if len(localPrefixes) == 0 {
-		return nil, errors.New("missing local address")
-	}
-	return localPrefixes, nil
-}
-
-func NewMasque(option MasqueOption) (*Masque, error) {
-	outbound := &Masque{
-		Base: &Base{
-			name:   option.Name,
-			addr:   net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
-			tp:     C.Masque,
-			pdName: option.ProviderName,
-			udp:    option.UDP,
-			iface:  option.Interface,
-			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
-		},
-	}
-	outbound.dialer = option.NewDialer(outbound.DialOptions())
-
-	ctx, cancel := context.WithCancel(context.Background())
-	outbound.runCtx = ctx
-	outbound.runCancel = cancel
-
-	privKeyB64, err := base64.StdEncoding.DecodeString(option.PrivateKey)
-	if err != nil {
-		return nil, fmt.Errorf("failed to decode private key: %v", err)
-	}
-	privKey, err := x509.ParseECPrivateKey(privKeyB64)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse private key: %v", err)
-	}
-
-	endpointPubKeyB64, err := base64.StdEncoding.DecodeString(option.PublicKey)
-	if err != nil {
-		return nil, fmt.Errorf("failed to decode public key: %v", err)
-	}
-	pubKey, err := x509.ParsePKIXPublicKey(endpointPubKeyB64)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse public key: %v", err)
-	}
-	ecPubKey, ok := pubKey.(*ecdsa.PublicKey)
-	if !ok {
-		return nil, fmt.Errorf("failed to assert public key as ECDSA")
-	}
-
-	uri := option.URI
-	if uri == "" {
-		uri = masque.ConnectURI
-	}
-	outbound.uri = uri
-
-	sni := option.SNI
-	if sni == "" {
-		sni = masque.ConnectSNI
-	}
-
-	tlsConfig, err := masque.PrepareTlsConfig(privKey, ecPubKey, sni)
-	if err != nil {
-		return nil, fmt.Errorf("failed to prepare TLS config: %v\n", err)
-	}
-	outbound.tlsConfig = tlsConfig
-
-	outbound.quicConfig = &quic.Config{
-		EnableDatagrams:   true,
-		InitialPacketSize: 1242,
-		KeepAlivePeriod:   30 * time.Second,
-	}
-
-	prefixes, err := option.Prefixes()
-	if err != nil {
-		return nil, err
-	}
-
-	outbound.option = option
-
-	mtu := option.MTU
-	if mtu == 0 {
-		mtu = 1280
-	}
-	if len(prefixes) == 0 {
-		return nil, errors.New("missing local address")
-	}
-	outbound.tunDevice, err = wireguard.NewStackDevice(prefixes, uint32(mtu))
-	if err != nil {
-		return nil, fmt.Errorf("create device: %w", err)
-	}
-
-	var has6 bool
-	for _, address := range prefixes {
-		if !address.Addr().Unmap().Is4() {
-			has6 = true
-			break
-		}
-	}
-
-	if option.RemoteDnsResolve && len(option.Dns) > 0 {
-		nss, err := dns.ParseNameServer(option.Dns)
-		if err != nil {
-			return nil, err
-		}
-		for i := range nss {
-			nss[i].ProxyAdapter = outbound
-		}
-		outbound.resolver = dns.NewResolver(dns.Config{
-			Main: nss,
-			IPv6: has6,
-		})
-	}
-
-	return outbound, nil
-}
-
-func (w *Masque) run(ctx context.Context) error {
-	if w.running.Load() {
-		return nil
-	}
-	w.runMutex.Lock()
-	defer w.runMutex.Unlock()
-	// double-check like sync.Once
-	if w.running.Load() {
-		return nil
-	}
-
-	if w.runCtx.Err() != nil {
-		return w.runCtx.Err()
-	}
-
-	if !w.runDevice.Load() {
-		err := w.tunDevice.Start()
-		if err != nil {
-			return err
-		}
-		w.runDevice.Store(true)
-	}
-
-	udpAddr, err := resolveUDPAddr(ctx, "udp", w.addr, w.prefer)
-	if err != nil {
-		return err
-	}
-
-	pc, err := w.dialer.ListenPacket(ctx, "udp", "", udpAddr.AddrPort())
-	if err != nil {
-		return err
-	}
-
-	quicConn, err := quic.Dial(ctx, pc, udpAddr, w.tlsConfig, w.quicConfig)
-	if err != nil {
-		return err
-	}
-
-	common.SetCongestionController(quicConn, w.option.CongestionController, w.option.CWND)
-
-	tr, ipConn, err := masque.ConnectTunnel(ctx, quicConn, w.uri)
-	if err != nil {
-		_ = pc.Close()
-		return err
-	}
-
-	w.running.Store(true)
-
-	runCtx, runCancel := context.WithCancel(w.runCtx)
-	contextutils.AfterFunc(runCtx, func() {
-		w.running.Store(false)
-		_ = ipConn.Close()
-		_ = tr.Close()
-		_ = pc.Close()
-	})
-
-	go func() {
-		defer runCancel()
-		buf := pool.Get(pool.UDPBufferSize)
-		defer pool.Put(buf)
-		bufs := [][]byte{buf}
-		sizes := []int{0}
-		for runCtx.Err() == nil {
-			_, err := w.tunDevice.Read(bufs, sizes, 0)
-			if err != nil {
-				log.Errorln("[Masque](%s) error reading from TUN device: %v", w.name, err)
-				return
-			}
-			icmp, err := ipConn.WritePacket(buf[:sizes[0]])
-			if err != nil {
-				if errors.As(err, new(*connectip.CloseError)) {
-					log.Errorln("[Masque](%s) connection closed while writing to IP connection: %v", w.name, err)
-					return
-				}
-				log.Warnln("[Masque](%s) error writing to IP connection: %v, continuing...", w.name, err)
-				continue
-			}
-
-			if len(icmp) > 0 {
-				if _, err := w.tunDevice.Write([][]byte{icmp}, 0); err != nil {
-					log.Warnln("[Masque](%s) error writing ICMP to TUN device: %v, continuing...", w.name, err)
-				}
-			}
-		}
-	}()
-
-	go func() {
-		defer runCancel()
-		buf := pool.Get(pool.UDPBufferSize)
-		defer pool.Put(buf)
-		for runCtx.Err() == nil {
-			n, err := ipConn.ReadPacket(buf)
-			if err != nil {
-				if errors.As(err, new(*connectip.CloseError)) {
-					log.Errorln("[Masque](%s) connection closed while writing to IP connection: %v", w.name, err)
-					return
-				}
-				log.Warnln("[Masque](%s) error reading from IP connection: %v, continuing...", w.name, err)
-				continue
-			}
-			if _, err := w.tunDevice.Write([][]byte{buf[:n]}, 0); err != nil {
-				log.Errorln("[Masque](%s) error writing to TUN device: %v", w.name, err)
-				return
-			}
-		}
-	}()
-
-	return nil
-}
-
-// Close implements C.ProxyAdapter
-func (w *Masque) Close() error {
-	w.runCancel()
-	if w.tunDevice != nil {
-		w.tunDevice.Close()
-	}
-	return nil
-}
-
-func (w *Masque) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	var conn net.Conn
-	if err = w.run(ctx); err != nil {
-		return nil, err
-	}
-	if !metadata.Resolved() || w.resolver != nil {
-		r := resolver.DefaultResolver
-		if w.resolver != nil {
-			r = w.resolver
-		}
-		options := w.DialOptions()
-		options = append(options, dialer.WithResolver(r))
-		options = append(options, dialer.WithNetDialer(wgNetDialer{tunDevice: w.tunDevice}))
-		conn, err = dialer.NewDialer(options...).DialContext(ctx, "tcp", metadata.RemoteAddress())
-	} else {
-		conn, err = w.tunDevice.DialContext(ctx, "tcp", M.SocksaddrFrom(metadata.DstIP, metadata.DstPort).Unwrap())
-	}
-	if err != nil {
-		return nil, err
-	}
-	if conn == nil {
-		return nil, errors.New("conn is nil")
-	}
-	return NewConn(conn, w), nil
-}
-
-func (w *Masque) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	var pc net.PacketConn
-	if err = w.run(ctx); err != nil {
-		return nil, err
-	}
-	if err = w.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
-	}
-	pc, err = w.tunDevice.ListenPacket(ctx, M.SocksaddrFrom(metadata.DstIP, metadata.DstPort).Unwrap())
-	if err != nil {
-		return nil, err
-	}
-	if pc == nil {
-		return nil, errors.New("packetConn is nil")
-	}
-	return newPacketConn(pc, w), nil
-}
-
-func (w *Masque) ResolveUDP(ctx context.Context, metadata *C.Metadata) error {
-	if (!metadata.Resolved() || w.resolver != nil) && metadata.Host != "" {
-		r := resolver.DefaultResolver
-		if w.resolver != nil {
-			r = w.resolver
-		}
-		ip, err := resolver.ResolveIPWithResolver(ctx, metadata.Host, r)
-		if err != nil {
-			return fmt.Errorf("can't resolve ip: %w", err)
-		}
-		metadata.DstIP = ip
-	}
-	return nil
-}
-
-// ProxyInfo implements C.ProxyAdapter
-func (w *Masque) ProxyInfo() C.ProxyInfo {
-	info := w.Base.ProxyInfo()
-	info.DialerProxy = w.option.DialerProxy
-	return info
-}
-
-// IsL3Protocol implements C.ProxyAdapter
-func (w *Masque) IsL3Protocol(metadata *C.Metadata) bool {
-	return true
-}

adapter/outbound/mieru.go

@@ -1,370 +0,0 @@
-package outbound
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"net/netip"
-	"strconv"
-	"sync"
-
-	N "github.com/metacubex/mihomo/common/net"
-	"github.com/metacubex/mihomo/component/resolver"
-	C "github.com/metacubex/mihomo/constant"
-
-	mieruclient "github.com/enfein/mieru/v3/apis/client"
-	mierucommon "github.com/enfein/mieru/v3/apis/common"
-	mierumodel "github.com/enfein/mieru/v3/apis/model"
-	mierutp "github.com/enfein/mieru/v3/apis/trafficpattern"
-	mierupb "github.com/enfein/mieru/v3/pkg/appctl/appctlpb"
-	"google.golang.org/protobuf/proto"
-)
-
-type Mieru struct {
-	*Base
-	option *MieruOption
-	client mieruclient.Client
-	mu     sync.Mutex
-}
-
-type MieruOption struct {
-	BasicOption
-	Name           string `proxy:"name"`
-	Server         string `proxy:"server"`
-	Port           int    `proxy:"port,omitempty"`
-	PortRange      string `proxy:"port-range,omitempty"`
-	Transport      string `proxy:"transport"`
-	UDP            bool   `proxy:"udp,omitempty"`
-	UserName       string `proxy:"username"`
-	Password       string `proxy:"password"`
-	Multiplexing   string `proxy:"multiplexing,omitempty"`
-	HandshakeMode  string `proxy:"handshake-mode,omitempty"`
-	TrafficPattern string `proxy:"traffic-pattern,omitempty"`
-}
-
-type mieruPacketDialer struct {
-	C.Dialer
-}
-
-var _ mierucommon.PacketDialer = (*mieruPacketDialer)(nil)
-
-func (pd mieruPacketDialer) ListenPacket(ctx context.Context, network, laddr, raddr string) (net.PacketConn, error) {
-	rAddrPort, err := netip.ParseAddrPort(raddr)
-	if err != nil {
-		return nil, fmt.Errorf("invalid address %s: %w", raddr, err)
-	}
-	return pd.Dialer.ListenPacket(ctx, network, laddr, rAddrPort)
-}
-
-type mieruDNSResolver struct {
-	prefer C.DNSPrefer
-}
-
-var _ mierucommon.DNSResolver = (*mieruDNSResolver)(nil)
-
-func (dr mieruDNSResolver) LookupIP(ctx context.Context, network, host string) (_ []net.IP, err error) {
-	var ip netip.Addr
-	switch dr.prefer {
-	case C.IPv4Only:
-		ip, err = resolver.ResolveIPv4WithResolver(ctx, host, resolver.ProxyServerHostResolver)
-	case C.IPv6Only:
-		ip, err = resolver.ResolveIPv6WithResolver(ctx, host, resolver.ProxyServerHostResolver)
-	case C.IPv6Prefer:
-		ip, err = resolver.ResolveIPPrefer6WithResolver(ctx, host, resolver.ProxyServerHostResolver)
-	default:
-		ip, err = resolver.ResolveIPWithResolver(ctx, host, resolver.ProxyServerHostResolver)
-	}
-	if err != nil {
-		return nil, fmt.Errorf("can't resolve ip: %w", err)
-	}
-	// TODO: handle IP4P (due to interface limitations, it's currently impossible to modify the port here)
-	return []net.IP{ip.AsSlice()}, nil
-}
-
-// DialContext implements C.ProxyAdapter
-func (m *Mieru) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
-	if err := m.ensureClientIsRunning(); err != nil {
-		return nil, err
-	}
-	addr := metadataToMieruNetAddrSpec(metadata)
-	c, err := m.client.DialContext(ctx, addr)
-	if err != nil {
-		return nil, fmt.Errorf("dial to %s failed: %w", addr, err)
-	}
-	return NewConn(c, m), nil
-}
-
-// ListenPacketContext implements C.ProxyAdapter
-func (m *Mieru) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if err = m.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
-	}
-	if err := m.ensureClientIsRunning(); err != nil {
-		return nil, err
-	}
-	c, err := m.client.DialContext(ctx, metadata.UDPAddr())
-	if err != nil {
-		return nil, fmt.Errorf("dial to %s failed: %w", metadata.UDPAddr(), err)
-	}
-	return newPacketConn(N.NewThreadSafePacketConn(mierucommon.NewUDPAssociateWrapper(mierucommon.NewPacketOverStreamTunnel(c))), m), nil
-}
-
-// SupportUOT implements C.ProxyAdapter
-func (m *Mieru) SupportUOT() bool {
-	return true
-}
-
-// ProxyInfo implements C.ProxyAdapter
-func (m *Mieru) ProxyInfo() C.ProxyInfo {
-	info := m.Base.ProxyInfo()
-	info.DialerProxy = m.option.DialerProxy
-	return info
-}
-
-func (m *Mieru) ensureClientIsRunning() error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if m.client.IsRunning() {
-		return nil
-	}
-
-	// Create a dialer and add it to the client config, before starting the client.
-	config, err := m.client.Load()
-	if err != nil {
-		return err
-	}
-	config.Dialer = m.dialer
-	config.PacketDialer = mieruPacketDialer{Dialer: m.dialer}
-	config.Resolver = mieruDNSResolver{prefer: m.prefer}
-	if err := m.client.Store(config); err != nil {
-		return err
-	}
-
-	if err := m.client.Start(); err != nil {
-		return fmt.Errorf("failed to start mieru client: %w", err)
-	}
-	return nil
-}
-
-func NewMieru(option MieruOption) (*Mieru, error) {
-	config, err := buildMieruClientConfig(option)
-	if err != nil {
-		return nil, fmt.Errorf("failed to build mieru client config: %w", err)
-	}
-	c := mieruclient.NewClient()
-	if err := c.Store(config); err != nil {
-		return nil, fmt.Errorf("failed to store mieru client config: %w", err)
-	}
-	// Client is started lazily on the first use.
-
-	var addr string
-	if option.Port != 0 {
-		addr = net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
-	} else {
-		beginPort, _, _ := beginAndEndPortFromPortRange(option.PortRange)
-		addr = net.JoinHostPort(option.Server, strconv.Itoa(beginPort))
-	}
-	outbound := &Mieru{
-		Base: &Base{
-			name:   option.Name,
-			addr:   addr,
-			tp:     C.Mieru,
-			pdName: option.ProviderName,
-			udp:    option.UDP,
-			xudp:   false,
-			iface:  option.Interface,
-			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
-		},
-		option: &option,
-		client: c,
-	}
-	outbound.dialer = option.NewDialer(outbound.DialOptions())
-	return outbound, nil
-}
-
-// Close implements C.ProxyAdapter
-func (m *Mieru) Close() error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	if m.client != nil && m.client.IsRunning() {
-		return m.client.Stop()
-	}
-	return nil
-}
-
-func metadataToMieruNetAddrSpec(metadata *C.Metadata) mierumodel.NetAddrSpec {
-	spec := mierumodel.NetAddrSpec{
-		Net: metadata.NetWork.String(),
-	}
-	if metadata.Host != "" {
-		spec.AddrSpec = mierumodel.AddrSpec{
-			FQDN: metadata.Host,
-			Port: int(metadata.DstPort),
-		}
-	} else {
-		spec.AddrSpec = mierumodel.AddrSpec{
-			IP:   metadata.DstIP.AsSlice(),
-			Port: int(metadata.DstPort),
-		}
-	}
-	return spec
-}
-
-func buildMieruClientConfig(option MieruOption) (*mieruclient.ClientConfig, error) {
-	if err := validateMieruOption(option); err != nil {
-		return nil, fmt.Errorf("failed to validate mieru option: %w", err)
-	}
-
-	var transportProtocol = mierupb.TransportProtocol_UNKNOWN_TRANSPORT_PROTOCOL.Enum()
-	switch option.Transport {
-	case "TCP":
-		transportProtocol = mierupb.TransportProtocol_TCP.Enum()
-	case "UDP":
-		transportProtocol = mierupb.TransportProtocol_UDP.Enum()
-	}
-	var server *mierupb.ServerEndpoint
-	if net.ParseIP(option.Server) != nil {
-		// server is an IP address
-		if option.PortRange != "" {
-			server = &mierupb.ServerEndpoint{
-				IpAddress: proto.String(option.Server),
-				PortBindings: []*mierupb.PortBinding{
-					{
-						PortRange: proto.String(option.PortRange),
-						Protocol:  transportProtocol,
-					},
-				},
-			}
-		} else {
-			server = &mierupb.ServerEndpoint{
-				IpAddress: proto.String(option.Server),
-				PortBindings: []*mierupb.PortBinding{
-					{
-						Port:     proto.Int32(int32(option.Port)),
-						Protocol: transportProtocol,
-					},
-				},
-			}
-		}
-	} else {
-		// server is a domain name
-		if option.PortRange != "" {
-			server = &mierupb.ServerEndpoint{
-				DomainName: proto.String(option.Server),
-				PortBindings: []*mierupb.PortBinding{
-					{
-						PortRange: proto.String(option.PortRange),
-						Protocol:  transportProtocol,
-					},
-				},
-			}
-		} else {
-			server = &mierupb.ServerEndpoint{
-				DomainName: proto.String(option.Server),
-				PortBindings: []*mierupb.PortBinding{
-					{
-						Port:     proto.Int32(int32(option.Port)),
-						Protocol: transportProtocol,
-					},
-				},
-			}
-		}
-	}
-	config := &mieruclient.ClientConfig{
-		Profile: &mierupb.ClientProfile{
-			ProfileName: proto.String(option.Name),
-			User: &mierupb.User{
-				Name:     proto.String(option.UserName),
-				Password: proto.String(option.Password),
-			},
-			Servers: []*mierupb.ServerEndpoint{server},
-		},
-		DNSConfig: &mierucommon.ClientDNSConfig{
-			BypassDialerDNS: true,
-		},
-	}
-	if multiplexing, ok := mierupb.MultiplexingLevel_value[option.Multiplexing]; ok {
-		config.Profile.Multiplexing = &mierupb.MultiplexingConfig{
-			Level: mierupb.MultiplexingLevel(multiplexing).Enum(),
-		}
-	}
-	if handshakeMode, ok := mierupb.HandshakeMode_value[option.HandshakeMode]; ok {
-		config.Profile.HandshakeMode = (*mierupb.HandshakeMode)(&handshakeMode)
-	}
-	if option.TrafficPattern != "" {
-		trafficPattern, _ := mierutp.Decode(option.TrafficPattern)
-		config.Profile.TrafficPattern = trafficPattern
-	}
-	return config, nil
-}
-
-func validateMieruOption(option MieruOption) error {
-	if option.Name == "" {
-		return fmt.Errorf("name is empty")
-	}
-	if option.Server == "" {
-		return fmt.Errorf("server is empty")
-	}
-	if option.Port == 0 && option.PortRange == "" {
-		return fmt.Errorf("either port or port-range must be set")
-	}
-	if option.Port != 0 && option.PortRange != "" {
-		return fmt.Errorf("port and port-range cannot be set at the same time")
-	}
-	if option.Port != 0 && (option.Port < 1 || option.Port > 65535) {
-		return fmt.Errorf("port must be between 1 and 65535")
-	}
-	if option.PortRange != "" {
-		begin, end, err := beginAndEndPortFromPortRange(option.PortRange)
-		if err != nil {
-			return fmt.Errorf("invalid port-range format")
-		}
-		if begin < 1 || begin > 65535 {
-			return fmt.Errorf("begin port must be between 1 and 65535")
-		}
-		if end < 1 || end > 65535 {
-			return fmt.Errorf("end port must be between 1 and 65535")
-		}
-		if begin > end {
-			return fmt.Errorf("begin port must be less than or equal to end port")
-		}
-	}
-
-	if option.Transport != "TCP" && option.Transport != "UDP" {
-		return fmt.Errorf("transport must be TCP or UDP")
-	}
-	if option.UserName == "" {
-		return fmt.Errorf("username is empty")
-	}
-	if option.Password == "" {
-		return fmt.Errorf("password is empty")
-	}
-	if option.Multiplexing != "" {
-		if _, ok := mierupb.MultiplexingLevel_value[option.Multiplexing]; !ok {
-			return fmt.Errorf("invalid multiplexing level: %s", option.Multiplexing)
-		}
-	}
-	if option.HandshakeMode != "" {
-		if _, ok := mierupb.HandshakeMode_value[option.HandshakeMode]; !ok {
-			return fmt.Errorf("invalid handshake mode: %s", option.HandshakeMode)
-		}
-	}
-	if option.TrafficPattern != "" {
-		trafficPattern, err := mierutp.Decode(option.TrafficPattern)
-		if err != nil {
-			return fmt.Errorf("failed to decode traffic pattern %q: %w", option.TrafficPattern, err)
-		}
-		if err := mierutp.Validate(trafficPattern); err != nil {
-			return fmt.Errorf("invalid traffic pattern %q: %w", option.TrafficPattern, err)
-		}
-	}
-	return nil
-}
-
-func beginAndEndPortFromPortRange(portRange string) (int, int, error) {
-	var begin, end int
-	_, err := fmt.Sscanf(portRange, "%d-%d", &begin, &end)
-	return begin, end, err
-}

adapter/outbound/mieru_test.go

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

adapter/outbound/reality.go

@@ -1,41 +1,29 @@
 package outbound
 
 import (
-	"crypto/ecdh"
 	"encoding/base64"
 	"encoding/hex"
 	"errors"
-	"fmt"
 
 	tlsC "github.com/metacubex/mihomo/component/tls"
+
+	"golang.org/x/crypto/curve25519"
 )
 
 type RealityOptions struct {
 	PublicKey string `proxy:"public-key"`
-	ShortID   string `proxy:"short-id,omitempty"`
-
-	SupportX25519MLKEM768 bool `proxy:"support-x25519mlkem768,omitempty"`
+	ShortID   string `proxy:"short-id"`
 }
 
 func (o RealityOptions) Parse() (*tlsC.RealityConfig, error) {
 	if o.PublicKey != "" {
 		config := new(tlsC.RealityConfig)
-		config.SupportX25519MLKEM768 = o.SupportX25519MLKEM768
 
-		const x25519ScalarSize = 32
-		publicKey, err := base64.RawURLEncoding.DecodeString(o.PublicKey)
-		if err != nil || len(publicKey) != x25519ScalarSize {
+		n, err := base64.RawURLEncoding.Decode(config.PublicKey[:], []byte(o.PublicKey))
+		if err != nil || n != curve25519.ScalarSize {
 			return nil, errors.New("invalid REALITY public key")
 		}
-		config.PublicKey, err = ecdh.X25519().NewPublicKey(publicKey)
-		if err != nil {
-			return nil, fmt.Errorf("fail to create REALITY public key: %w", err)
-		}
 
-		n := hex.DecodedLen(len(o.ShortID))
-		if n > tlsC.RealityMaxShortIDLen {
-			return nil, errors.New("invalid REALITY short id")
-		}
 		n, err = hex.Decode(config.ShortID[:], []byte(o.ShortID))
 		if err != nil || n > tlsC.RealityMaxShortIDLen {
 			return nil, errors.New("invalid REALITY short ID")

adapter/outbound/reject.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"io"
 	"net"
-	"net/netip"
 	"time"
 
 	"github.com/metacubex/mihomo/common/buf"
+	"github.com/metacubex/mihomo/component/dialer"
 	C "github.com/metacubex/mihomo/constant"
 )
 
@@ -17,12 +17,11 @@ type Reject struct {
 }
 
 type RejectOption struct {
-	BasicOption
 	Name string `proxy:"name"`
 }
 
 // DialContext implements C.ProxyAdapter
-func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
+func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
 	if r.drop {
 		return NewConn(dropConn{}, r), nil
 	}
@@ -30,25 +29,18 @@ func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn,
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (r *Reject) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
-	if err := r.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
+func (r *Reject) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
+	if r.drop {
+		return newPacketConn(&dropPacketConn{}, r), nil
 	}
 	return newPacketConn(&nopPacketConn{}, r), nil
 }
 
-func (r *Reject) ResolveUDP(ctx context.Context, metadata *C.Metadata) error {
-	if !metadata.Resolved() {
-		metadata.DstIP = netip.IPv4Unspecified()
-	}
-	return nil
-}
-
 func NewRejectWithOption(option RejectOption) *Reject {
 	return &Reject{
 		Base: &Base{
 			name: option.Name,
-			tp:   C.Reject,
+			tp:   C.Direct,
 			udp:  true,
 		},
 	}
@@ -137,3 +129,22 @@ func (rw dropConn) RemoteAddr() net.Addr                 { return nil }
 func (rw dropConn) SetDeadline(time.Time) error          { return nil }
 func (rw dropConn) SetReadDeadline(time.Time) error      { return nil }
 func (rw dropConn) SetWriteDeadline(time.Time) error     { return nil }
+
+type dropPacketConn struct{}
+
+func (npc dropPacketConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
+	time.Sleep(C.DefaultDropTime)
+	return len(b), nil
+}
+func (npc dropPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
+	time.Sleep(C.DefaultDropTime)
+	return 0, nil, io.EOF
+}
+func (npc dropPacketConn) WaitReadFrom() ([]byte, func(), net.Addr, error) {
+	return nil, nil, nil, io.EOF
+}
+func (npc dropPacketConn) Close() error                     { return nil }
+func (npc dropPacketConn) LocalAddr() net.Addr              { return udpAddrIPv4Unspecified }
+func (npc dropPacketConn) SetDeadline(time.Time) error      { return nil }
+func (npc dropPacketConn) SetReadDeadline(time.Time) error  { return nil }
+func (npc dropPacketConn) SetWriteDeadline(time.Time) error { return nil }

adapter/outbound/shadowsocks.go

@@ -2,25 +2,26 @@ package outbound
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net"
 	"strconv"
 
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/common/structure"
+	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/component/proxydialer"
+	"github.com/metacubex/mihomo/component/resolver"
 	C "github.com/metacubex/mihomo/constant"
-	"github.com/metacubex/mihomo/ntp"
-	gost "github.com/metacubex/mihomo/transport/gost-plugin"
-	"github.com/metacubex/mihomo/transport/kcptun"
 	"github.com/metacubex/mihomo/transport/restls"
 	obfs "github.com/metacubex/mihomo/transport/simple-obfs"
 	shadowtls "github.com/metacubex/mihomo/transport/sing-shadowtls"
 	v2rayObfs "github.com/metacubex/mihomo/transport/v2ray-plugin"
 
+	restlsC "github.com/3andne/restls-client-go"
 	shadowsocks "github.com/metacubex/sing-shadowsocks2"
-	"github.com/metacubex/sing/common/bufio"
-	M "github.com/metacubex/sing/common/metadata"
-	"github.com/metacubex/sing/common/uot"
+	M "github.com/sagernet/sing/common/metadata"
+	"github.com/sagernet/sing/common/uot"
 )
 
 type ShadowSocks struct {
@@ -32,10 +33,8 @@ type ShadowSocks struct {
 	obfsMode        string
 	obfsOption      *simpleObfsOption
 	v2rayOption     *v2rayObfs.Option
-	gostOption      *gost.Option
 	shadowTLSOption *shadowtls.ShadowTLSOption
-	restlsConfig    *restls.Config
-	kcptunClient    *kcptun.Client
+	restlsConfig    *restlsC.Config
 }
 
 type ShadowSocksOption struct {
@@ -63,10 +62,7 @@ type v2rayObfsOption struct {
 	Host                     string            `obfs:"host,omitempty"`
 	Path                     string            `obfs:"path,omitempty"`
 	TLS                      bool              `obfs:"tls,omitempty"`
-	ECHOpts                  ECHOptions        `obfs:"ech-opts,omitempty"`
 	Fingerprint              string            `obfs:"fingerprint,omitempty"`
-	Certificate              string            `obfs:"certificate,omitempty"`
-	PrivateKey               string            `obfs:"private-key,omitempty"`
 	Headers                  map[string]string `obfs:"headers,omitempty"`
 	SkipCertVerify           bool              `obfs:"skip-cert-verify,omitempty"`
 	Mux                      bool              `obfs:"mux,omitempty"`
@@ -74,29 +70,12 @@ type v2rayObfsOption struct {
 	V2rayHttpUpgradeFastOpen bool              `obfs:"v2ray-http-upgrade-fast-open,omitempty"`
 }
 
-type gostObfsOption struct {
-	Mode           string            `obfs:"mode"`
-	Host           string            `obfs:"host,omitempty"`
-	Path           string            `obfs:"path,omitempty"`
-	TLS            bool              `obfs:"tls,omitempty"`
-	ECHOpts        ECHOptions        `obfs:"ech-opts,omitempty"`
-	Fingerprint    string            `obfs:"fingerprint,omitempty"`
-	Certificate    string            `obfs:"certificate,omitempty"`
-	PrivateKey     string            `obfs:"private-key,omitempty"`
-	Headers        map[string]string `obfs:"headers,omitempty"`
-	SkipCertVerify bool              `obfs:"skip-cert-verify,omitempty"`
-	Mux            bool              `obfs:"mux,omitempty"`
-}
-
 type shadowTLSOption struct {
-	Password       string   `obfs:"password,omitempty"`
-	Host           string   `obfs:"host"`
-	Fingerprint    string   `obfs:"fingerprint,omitempty"`
-	Certificate    string   `obfs:"certificate,omitempty"`
-	PrivateKey     string   `obfs:"private-key,omitempty"`
-	SkipCertVerify bool     `obfs:"skip-cert-verify,omitempty"`
-	Version        int      `obfs:"version,omitempty"`
-	ALPN           []string `obfs:"alpn,omitempty"`
+	Password       string `obfs:"password"`
+	Host           string `obfs:"host"`
+	Fingerprint    string `obfs:"fingerprint,omitempty"`
+	SkipCertVerify bool   `obfs:"skip-cert-verify,omitempty"`
+	Version        int    `obfs:"version,omitempty"`
 }
 
 type restlsOption struct {
@@ -106,36 +85,8 @@ type restlsOption struct {
 	RestlsScript string `obfs:"restls-script,omitempty"`
 }
 
-type kcpTunOption struct {
-	Key          string `obfs:"key,omitempty"`
-	Crypt        string `obfs:"crypt,omitempty"`
-	Mode         string `obfs:"mode,omitempty"`
-	Conn         int    `obfs:"conn,omitempty"`
-	AutoExpire   int    `obfs:"autoexpire,omitempty"`
-	ScavengeTTL  int    `obfs:"scavengettl,omitempty"`
-	MTU          int    `obfs:"mtu,omitempty"`
-	RateLimit    int    `obfs:"ratelimit,omitempty"`
-	SndWnd       int    `obfs:"sndwnd,omitempty"`
-	RcvWnd       int    `obfs:"rcvwnd,omitempty"`
-	DataShard    int    `obfs:"datashard,omitempty"`
-	ParityShard  int    `obfs:"parityshard,omitempty"`
-	DSCP         int    `obfs:"dscp,omitempty"`
-	NoComp       bool   `obfs:"nocomp,omitempty"`
-	AckNodelay   bool   `obfs:"acknodelay,omitempty"`
-	NoDelay      int    `obfs:"nodelay,omitempty"`
-	Interval     int    `obfs:"interval,omitempty"`
-	Resend       int    `obfs:"resend,omitempty"`
-	NoCongestion int    `obfs:"nc,omitempty"`
-	SockBuf      int    `obfs:"sockbuf,omitempty"`
-	SmuxVer      int    `obfs:"smuxver,omitempty"`
-	SmuxBuf      int    `obfs:"smuxbuf,omitempty"`
-	FrameSize    int    `obfs:"framesize,omitempty"`
-	StreamBuf    int    `obfs:"streambuf,omitempty"`
-	KeepAlive    int    `obfs:"keepalive,omitempty"`
-}
-
 // StreamConnContext implements C.ProxyAdapter
-func (ss *ShadowSocks) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ net.Conn, err error) {
+func (ss *ShadowSocks) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	useEarly := false
 	switch ss.obfsMode {
 	case "tls":
@@ -144,23 +95,20 @@ func (ss *ShadowSocks) StreamConnContext(ctx context.Context, c net.Conn, metada
 		_, port, _ := net.SplitHostPort(ss.addr)
 		c = obfs.NewHTTPObfs(c, ss.obfsOption.Host, port)
 	case "websocket":
-		if ss.v2rayOption != nil {
-			c, err = v2rayObfs.NewV2rayObfs(ctx, c, ss.v2rayOption)
-		} else if ss.gostOption != nil {
-			c, err = gost.NewGostWebsocket(ctx, c, ss.gostOption)
-		} else {
-			return nil, fmt.Errorf("plugin options is required")
-		}
+		var err error
+		c, err = v2rayObfs.NewV2rayObfs(ctx, c, ss.v2rayOption)
 		if err != nil {
 			return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
 		}
 	case shadowtls.Mode:
+		var err error
 		c, err = shadowtls.NewShadowTLS(ctx, c, ss.shadowTLSOption)
 		if err != nil {
 			return nil, err
 		}
 		useEarly = true
 	case restls.Mode:
+		var err error
 		c, err = restls.NewRestls(ctx, c, ss.restlsConfig)
 		if err != nil {
 			return nil, fmt.Errorf("%s (restls) connect error: %w", ss.addr, err)
@@ -168,12 +116,6 @@ func (ss *ShadowSocks) StreamConnContext(ctx context.Context, c net.Conn, metada
 		useEarly = true
 	}
 	useEarly = useEarly || N.NeedHandshake(c)
-	if !useEarly {
-		if ctx.Done() != nil {
-			done := N.SetupContextForConn(ctx, c)
-			defer done(&err)
-		}
-	}
 	if metadata.NetWork == C.UDP && ss.option.UDPOverTCP {
 		uotDestination := uot.RequestDestination(uint8(ss.option.UDPOverTCPVersion))
 		if useEarly {
@@ -190,31 +132,23 @@ func (ss *ShadowSocks) StreamConnContext(ctx context.Context, c net.Conn, metada
 }
 
 // DialContext implements C.ProxyAdapter
-func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	var c net.Conn
-	if ss.kcptunClient != nil {
-		c, err = ss.kcptunClient.OpenStream(ctx, func(ctx context.Context) (net.PacketConn, net.Addr, error) {
-			if err = ss.ResolveUDP(ctx, metadata); err != nil {
-				return nil, nil, err
-			}
-			addr, err := resolveUDPAddr(ctx, "udp", ss.addr, ss.prefer)
-			if err != nil {
-				return nil, nil, err
-			}
+func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
+	return ss.DialContextWithDialer(ctx, dialer.NewDialer(ss.Base.DialOptions(opts...)...), metadata)
+}
 
-			pc, err := ss.dialer.ListenPacket(ctx, "udp", "", addr.AddrPort())
-			if err != nil {
-				return nil, nil, err
-			}
-
-			return pc, addr, nil
-		})
-	} else {
-		c, err = ss.dialer.DialContext(ctx, "tcp", ss.addr)
+// DialContextWithDialer implements C.ProxyAdapter
+func (ss *ShadowSocks) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
+	if len(ss.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(ss.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
 	}
+	c, err := dialer.DialContext(ctx, "tcp", ss.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
 	}
+	N.TCPKeepAlive(c)
 
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
@@ -225,48 +159,60 @@ func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata) (_
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (ss *ShadowSocks) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (ss *ShadowSocks) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
+	return ss.ListenPacketWithDialer(ctx, dialer.NewDialer(ss.Base.DialOptions(opts...)...), metadata)
+}
+
+// ListenPacketWithDialer implements C.ProxyAdapter
+func (ss *ShadowSocks) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
+	if len(ss.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(ss.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
+	}
 	if ss.option.UDPOverTCP {
-		tcpConn, err := ss.DialContext(ctx, metadata)
+		tcpConn, err := ss.DialContextWithDialer(ctx, dialer, metadata)
 		if err != nil {
 			return nil, err
 		}
 		return ss.ListenPacketOnStreamConn(ctx, tcpConn, metadata)
 	}
-	if err := ss.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
-	}
-	addr, err := resolveUDPAddr(ctx, "udp", ss.addr, ss.prefer)
+	addr, err := resolveUDPAddrWithPrefer(ctx, "udp", ss.addr, ss.prefer)
 	if err != nil {
 		return nil, err
 	}
 
-	pc, err := ss.dialer.ListenPacket(ctx, "udp", "", addr.AddrPort())
+	pc, err := dialer.ListenPacket(ctx, "udp", "", addr.AddrPort())
 	if err != nil {
 		return nil, err
 	}
-	pc = ss.method.DialPacketConn(bufio.NewBindPacketConn(pc, addr))
+	pc = ss.method.DialPacketConn(N.NewBindPacketConn(pc, addr))
 	return newPacketConn(pc, ss), nil
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (ss *ShadowSocks) ProxyInfo() C.ProxyInfo {
-	info := ss.Base.ProxyInfo()
-	info.DialerProxy = ss.option.DialerProxy
-	return info
+// SupportWithDialer implements C.ProxyAdapter
+func (ss *ShadowSocks) SupportWithDialer() C.NetWork {
+	return C.ALLNet
 }
 
 // ListenPacketOnStreamConn implements C.ProxyAdapter
 func (ss *ShadowSocks) ListenPacketOnStreamConn(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ C.PacketConn, err error) {
 	if ss.option.UDPOverTCP {
-		if err = ss.ResolveUDP(ctx, metadata); err != nil {
-			return nil, err
+		// ss uot 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 ss.option.UDPOverTCPVersion == uot.LegacyVersion {
-			return newPacketConn(N.NewThreadSafePacketConn(uot.NewConn(c, uot.Request{Destination: destination})), ss), nil
+			return newPacketConn(uot.NewConn(c, uot.Request{Destination: destination}), ss), nil
 		} else {
-			return newPacketConn(N.NewThreadSafePacketConn(uot.NewLazyConn(c, uot.Request{Destination: destination})), ss), nil
+			return newPacketConn(uot.NewLazyConn(c, uot.Request{Destination: destination}), ss), nil
 		}
 	}
 	return nil, C.ErrNotSupport
@@ -277,29 +223,19 @@ func (ss *ShadowSocks) SupportUOT() bool {
 	return ss.option.UDPOverTCP
 }
 
-func (ss *ShadowSocks) Close() error {
-	if ss.kcptunClient != nil {
-		return ss.kcptunClient.Close()
-	}
-	return nil
-}
-
 func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
-	method, err := shadowsocks.CreateMethod(option.Cipher, shadowsocks.MethodOptions{
+	method, err := shadowsocks.CreateMethod(context.Background(), option.Cipher, shadowsocks.MethodOptions{
 		Password: option.Password,
-		TimeFunc: ntp.Now,
 	})
 	if err != nil {
-		return nil, fmt.Errorf("ss %s cipher: %s initialize error: %w", addr, option.Cipher, err)
+		return nil, fmt.Errorf("ss %s initialize error: %w", addr, err)
 	}
 
 	var v2rayOption *v2rayObfs.Option
-	var gostOption *gost.Option
 	var obfsOption *simpleObfsOption
 	var shadowTLSOpt *shadowtls.ShadowTLSOption
-	var restlsConfig *restls.Config
-	var kcptunClient *kcptun.Client
+	var restlsConfig *restlsC.Config
 	obfsMode := ""
 
 	decoder := structure.NewDecoder(structure.Option{TagName: "obfs", WeaklyTypedInput: true})
@@ -336,45 +272,6 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 		if opts.TLS {
 			v2rayOption.TLS = true
 			v2rayOption.SkipCertVerify = opts.SkipCertVerify
-			v2rayOption.Fingerprint = opts.Fingerprint
-			v2rayOption.Certificate = opts.Certificate
-			v2rayOption.PrivateKey = opts.PrivateKey
-
-			echConfig, err := opts.ECHOpts.Parse()
-			if err != nil {
-				return nil, fmt.Errorf("ss %s initialize v2ray-plugin error: %w", addr, err)
-			}
-			v2rayOption.ECHConfig = echConfig
-		}
-	} else if option.Plugin == "gost-plugin" {
-		opts := gostObfsOption{Host: "bing.com", Mux: true}
-		if err := decoder.Decode(option.PluginOpts, &opts); err != nil {
-			return nil, fmt.Errorf("ss %s initialize gost-plugin error: %w", addr, err)
-		}
-
-		if opts.Mode != "websocket" {
-			return nil, fmt.Errorf("ss %s obfs mode error: %s", addr, opts.Mode)
-		}
-		obfsMode = opts.Mode
-		gostOption = &gost.Option{
-			Host:    opts.Host,
-			Path:    opts.Path,
-			Headers: opts.Headers,
-			Mux:     opts.Mux,
-		}
-
-		if opts.TLS {
-			gostOption.TLS = true
-			gostOption.SkipCertVerify = opts.SkipCertVerify
-			gostOption.Fingerprint = opts.Fingerprint
-			gostOption.Certificate = opts.Certificate
-			gostOption.PrivateKey = opts.PrivateKey
-
-			echConfig, err := opts.ECHOpts.Parse()
-			if err != nil {
-				return nil, fmt.Errorf("ss %s initialize gost-plugin error: %w", addr, err)
-			}
-			gostOption.ECHConfig = echConfig
 		}
 	} else if option.Plugin == shadowtls.Mode {
 		obfsMode = shadowtls.Mode
@@ -389,18 +286,10 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 			Password:          opt.Password,
 			Host:              opt.Host,
 			Fingerprint:       opt.Fingerprint,
-			Certificate:       opt.Certificate,
-			PrivateKey:        opt.PrivateKey,
 			ClientFingerprint: option.ClientFingerprint,
 			SkipCertVerify:    opt.SkipCertVerify,
 			Version:           opt.Version,
 		}
-
-		if opt.ALPN != nil { // structure's Decode will ensure value not nil when input has value even it was set an empty array
-			shadowTLSOpt.ALPN = opt.ALPN
-		} else {
-			shadowTLSOpt.ALPN = shadowtls.DefaultALPN
-		}
 	} else if option.Plugin == restls.Mode {
 		obfsMode = restls.Mode
 		restlsOpt := &restlsOption{}
@@ -408,46 +297,11 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 			return nil, fmt.Errorf("ss %s initialize restls-plugin error: %w", addr, err)
 		}
 
-		restlsConfig, err = restls.NewRestlsConfig(restlsOpt.Host, restlsOpt.Password, restlsOpt.VersionHint, restlsOpt.RestlsScript, option.ClientFingerprint)
+		restlsConfig, err = restlsC.NewRestlsConfig(restlsOpt.Host, restlsOpt.Password, restlsOpt.VersionHint, restlsOpt.RestlsScript, option.ClientFingerprint)
 		if err != nil {
 			return nil, fmt.Errorf("ss %s initialize restls-plugin error: %w", addr, err)
 		}
 
-	} else if option.Plugin == kcptun.Mode {
-		obfsMode = kcptun.Mode
-		kcptunOpt := &kcpTunOption{}
-		if err := decoder.Decode(option.PluginOpts, kcptunOpt); err != nil {
-			return nil, fmt.Errorf("ss %s initialize kcptun-plugin error: %w", addr, err)
-		}
-
-		kcptunClient = kcptun.NewClient(kcptun.Config{
-			Key:          kcptunOpt.Key,
-			Crypt:        kcptunOpt.Crypt,
-			Mode:         kcptunOpt.Mode,
-			Conn:         kcptunOpt.Conn,
-			AutoExpire:   kcptunOpt.AutoExpire,
-			ScavengeTTL:  kcptunOpt.ScavengeTTL,
-			MTU:          kcptunOpt.MTU,
-			RateLimit:    kcptunOpt.RateLimit,
-			SndWnd:       kcptunOpt.SndWnd,
-			RcvWnd:       kcptunOpt.RcvWnd,
-			DataShard:    kcptunOpt.DataShard,
-			ParityShard:  kcptunOpt.ParityShard,
-			DSCP:         kcptunOpt.DSCP,
-			NoComp:       kcptunOpt.NoComp,
-			AckNodelay:   kcptunOpt.AckNodelay,
-			NoDelay:      kcptunOpt.NoDelay,
-			Interval:     kcptunOpt.Interval,
-			Resend:       kcptunOpt.Resend,
-			NoCongestion: kcptunOpt.NoCongestion,
-			SockBuf:      kcptunOpt.SockBuf,
-			SmuxVer:      kcptunOpt.SmuxVer,
-			SmuxBuf:      kcptunOpt.SmuxBuf,
-			FrameSize:    kcptunOpt.FrameSize,
-			StreamBuf:    kcptunOpt.StreamBuf,
-			KeepAlive:    kcptunOpt.KeepAlive,
-		})
-		option.UDPOverTCP = true // must open uot
 	}
 	switch option.UDPOverTCPVersion {
 	case uot.Version, uot.LegacyVersion:
@@ -457,30 +311,25 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 		return nil, fmt.Errorf("ss %s unknown udp over tcp protocol version: %d", addr, option.UDPOverTCPVersion)
 	}
 
-	outbound := &ShadowSocks{
+	return &ShadowSocks{
 		Base: &Base{
 			name:   option.Name,
 			addr:   addr,
 			tp:     C.Shadowsocks,
-			pdName: option.ProviderName,
 			udp:    option.UDP,
 			tfo:    option.TFO,
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
+			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		method: method,
 
 		option:          &option,
 		obfsMode:        obfsMode,
 		v2rayOption:     v2rayOption,
-		gostOption:      gostOption,
 		obfsOption:      obfsOption,
 		shadowTLSOption: shadowTLSOpt,
 		restlsConfig:    restlsConfig,
-		kcptunClient:    kcptunClient,
-	}
-	outbound.dialer = option.NewDialer(outbound.DialOptions())
-	return outbound, nil
+	}, nil
 }

adapter/outbound/shadowsocksr.go

@@ -8,6 +8,8 @@ import (
 	"strconv"
 
 	N "github.com/metacubex/mihomo/common/net"
+	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/component/proxydialer"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/transport/shadowsocks/core"
 	"github.com/metacubex/mihomo/transport/shadowsocks/shadowaead"
@@ -40,15 +42,12 @@ type ShadowSocksROption struct {
 }
 
 // StreamConnContext implements C.ProxyAdapter
-func (ssr *ShadowSocksR) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ net.Conn, err error) {
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
+func (ssr *ShadowSocksR) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	c = ssr.obfs.StreamConn(c)
 	c = ssr.cipher.StreamConn(c)
 	var (
-		iv []byte
+		iv  []byte
+		err error
 	)
 	switch conn := c.(type) {
 	case *shadowstream.Conn:
@@ -65,11 +64,23 @@ func (ssr *ShadowSocksR) StreamConnContext(ctx context.Context, c net.Conn, meta
 }
 
 // DialContext implements C.ProxyAdapter
-func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := ssr.dialer.DialContext(ctx, "tcp", ssr.addr)
+func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
+	return ssr.DialContextWithDialer(ctx, dialer.NewDialer(ssr.Base.DialOptions(opts...)...), metadata)
+}
+
+// DialContextWithDialer implements C.ProxyAdapter
+func (ssr *ShadowSocksR) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
+	if len(ssr.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(ssr.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
+	}
+	c, err := dialer.DialContext(ctx, "tcp", ssr.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", ssr.addr, err)
 	}
+	N.TCPKeepAlive(c)
 
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
@@ -80,16 +91,24 @@ func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata)
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (ssr *ShadowSocksR) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
-	if err := ssr.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
+func (ssr *ShadowSocksR) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
+	return ssr.ListenPacketWithDialer(ctx, dialer.NewDialer(ssr.Base.DialOptions(opts...)...), metadata)
+}
+
+// ListenPacketWithDialer implements C.ProxyAdapter
+func (ssr *ShadowSocksR) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
+	if len(ssr.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(ssr.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
 	}
-	addr, err := resolveUDPAddr(ctx, "udp", ssr.addr, ssr.prefer)
+	addr, err := resolveUDPAddrWithPrefer(ctx, "udp", ssr.addr, ssr.prefer)
 	if err != nil {
 		return nil, err
 	}
 
-	pc, err := ssr.dialer.ListenPacket(ctx, "udp", "", addr.AddrPort())
+	pc, err := dialer.ListenPacket(ctx, "udp", "", addr.AddrPort())
 	if err != nil {
 		return nil, err
 	}
@@ -99,11 +118,9 @@ func (ssr *ShadowSocksR) ListenPacketContext(ctx context.Context, metadata *C.Me
 	return newPacketConn(&ssrPacketConn{EnhancePacketConn: epc, rAddr: addr}, ssr), nil
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (ssr *ShadowSocksR) ProxyInfo() C.ProxyInfo {
-	info := ssr.Base.ProxyInfo()
-	info.DialerProxy = ssr.option.DialerProxy
-	return info
+// SupportWithDialer implements C.ProxyAdapter
+func (ssr *ShadowSocksR) SupportWithDialer() C.NetWork {
+	return C.ALLNet
 }
 
 func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) {
@@ -118,7 +135,7 @@ func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) {
 	password := option.Password
 	coreCiph, err := core.PickCipher(cipher, nil, password)
 	if err != nil {
-		return nil, fmt.Errorf("ssr %s cipher: %s initialize error: %w", addr, cipher, err)
+		return nil, fmt.Errorf("ssr %s initialize error: %w", addr, err)
 	}
 	var (
 		ivSize int
@@ -157,26 +174,23 @@ func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) {
 		return nil, fmt.Errorf("ssr %s initialize protocol error: %w", addr, err)
 	}
 
-	outbound := &ShadowSocksR{
+	return &ShadowSocksR{
 		Base: &Base{
 			name:   option.Name,
 			addr:   addr,
 			tp:     C.ShadowsocksR,
-			pdName: option.ProviderName,
 			udp:    option.UDP,
 			tfo:    option.TFO,
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
+			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		option:   &option,
 		cipher:   coreCiph,
 		obfs:     obfs,
 		protocol: protocol,
-	}
-	outbound.dialer = option.NewDialer(outbound.DialOptions())
-	return outbound, nil
+	}, nil
 }
 
 type ssrPacketConn struct {
@@ -226,14 +240,13 @@ func (spc *ssrPacketConn) WaitReadFrom() (data []byte, put func(), addr net.Addr
 		return nil, nil, nil, errors.New("parse addr error")
 	}
 
-	udpAddr := _addr.UDPAddr()
-	if udpAddr == nil {
+	addr = _addr.UDPAddr()
+	if addr == nil {
 		if put != nil {
 			put()
 		}
 		return nil, nil, nil, errors.New("parse addr error")
 	}
-	addr = udpAddr
 
 	data = data[len(_addr):]
 	return

adapter/outbound/singmux.go

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

adapter/outbound/snell.go

@@ -8,6 +8,8 @@ import (
 
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/common/structure"
+	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/component/proxydialer"
 	C "github.com/metacubex/mihomo/constant"
 	obfs "github.com/metacubex/mihomo/transport/simple-obfs"
 	"github.com/metacubex/mihomo/transport/snell"
@@ -40,7 +42,7 @@ type streamOption struct {
 	obfsOption *simpleObfsOption
 }
 
-func snellStreamConn(c net.Conn, option streamOption) *snell.Snell {
+func streamConn(c net.Conn, option streamOption) *snell.Snell {
 	switch option.obfsOption.Mode {
 	case "tls":
 		c = obfs.NewTLSObfs(c, option.obfsOption.Host)
@@ -53,44 +55,46 @@ func snellStreamConn(c net.Conn, option streamOption) *snell.Snell {
 
 // StreamConnContext implements C.ProxyAdapter
 func (s *Snell) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
-	c = snellStreamConn(c, streamOption{s.psk, s.version, s.addr, s.obfsOption})
-	err := s.writeHeaderContext(ctx, c, metadata)
+	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)
 	return c, err
 }
 
-func (s *Snell) writeHeaderContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (err error) {
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
-
-	if metadata.NetWork == C.UDP {
-		err = snell.WriteUDPHeader(c, s.version)
-		return
-	}
-	err = snell.WriteHeader(c, metadata.String(), uint(metadata.DstPort), s.version)
-	return
-}
-
 // DialContext implements C.ProxyAdapter
-func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	if s.version == snell.Version2 {
+func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
+	if s.version == snell.Version2 && len(opts) == 0 {
 		c, err := s.pool.Get()
 		if err != nil {
 			return nil, err
 		}
 
-		if err = s.writeHeaderContext(ctx, c, metadata); err != nil {
-			_ = c.Close()
+		if err = snell.WriteHeader(c, metadata.String(), uint(metadata.DstPort), s.version); err != nil {
+			c.Close()
 			return nil, err
 		}
 		return NewConn(c, s), err
 	}
 
-	c, err := s.dialer.DialContext(ctx, "tcp", s.addr)
+	return s.DialContextWithDialer(ctx, dialer.NewDialer(s.Base.DialOptions(opts...)...), metadata)
+}
+
+// DialContextWithDialer implements C.ProxyAdapter
+func (s *Snell) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
+	if len(s.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(s.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
+	}
+	c, err := dialer.DialContext(ctx, "tcp", s.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", s.addr, err)
 	}
+	N.TCPKeepAlive(c)
 
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
@@ -101,34 +105,45 @@ func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (s *Snell) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (s *Snell) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
+	return s.ListenPacketWithDialer(ctx, dialer.NewDialer(s.Base.DialOptions(opts...)...), metadata)
+}
+
+// ListenPacketWithDialer implements C.ProxyAdapter
+func (s *Snell) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (C.PacketConn, error) {
 	var err error
-	if err = s.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
+	if len(s.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(s.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
 	}
-	c, err := s.dialer.DialContext(ctx, "tcp", s.addr)
+	c, err := dialer.DialContext(ctx, "tcp", s.addr)
 	if err != nil {
 		return nil, err
 	}
+	N.TCPKeepAlive(c)
+	c = streamConn(c, streamOption{s.psk, s.version, s.addr, s.obfsOption})
 
-	c, err = s.StreamConnContext(ctx, c, metadata)
+	err = snell.WriteUDPHeader(c, s.version)
+	if err != nil {
+		return nil, err
+	}
 
 	pc := snell.PacketConn(c)
 	return newPacketConn(pc, s), nil
 }
 
+// SupportWithDialer implements C.ProxyAdapter
+func (s *Snell) SupportWithDialer() C.NetWork {
+	return C.ALLNet
+}
+
 // SupportUOT implements C.ProxyAdapter
 func (s *Snell) SupportUOT() bool {
 	return true
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (s *Snell) ProxyInfo() C.ProxyInfo {
-	info := s.Base.ProxyInfo()
-	info.DialerProxy = s.option.DialerProxy
-	return info
-}
-
 func NewSnell(option SnellOption) (*Snell, error) {
 	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
 	psk := []byte(option.Psk)
@@ -165,29 +180,36 @@ func NewSnell(option SnellOption) (*Snell, error) {
 			name:   option.Name,
 			addr:   addr,
 			tp:     C.Snell,
-			pdName: option.ProviderName,
 			udp:    option.UDP,
 			tfo:    option.TFO,
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
+			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		option:     &option,
 		psk:        psk,
 		obfsOption: obfsOption,
 		version:    option.Version,
 	}
-	s.dialer = option.NewDialer(s.DialOptions())
 
 	if option.Version == snell.Version2 {
 		s.pool = snell.NewPool(func(ctx context.Context) (*snell.Snell, error) {
-			c, err := s.dialer.DialContext(ctx, "tcp", addr)
+			var err error
+			var cDialer C.Dialer = dialer.NewDialer(s.Base.DialOptions()...)
+			if len(s.option.DialerProxy) > 0 {
+				cDialer, err = proxydialer.NewByName(s.option.DialerProxy, cDialer)
+				if err != nil {
+					return nil, err
+				}
+			}
+			c, err := cDialer.DialContext(ctx, "tcp", addr)
 			if err != nil {
 				return nil, err
 			}
 
-			return snellStreamConn(c, streamOption{psk, option.Version, addr, obfsOption}), nil
+			N.TCPKeepAlive(c)
+			return streamConn(c, streamOption{psk, option.Version, addr, obfsOption}), nil
 		})
 	}
 	return s, nil

adapter/outbound/socks5.go

@@ -2,6 +2,7 @@ package outbound
 
 import (
 	"context"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"io"
@@ -11,10 +12,10 @@ import (
 
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/component/ca"
+	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/component/proxydialer"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/transport/socks5"
-
-	"github.com/metacubex/tls"
 )
 
 type Socks5 struct {
@@ -38,8 +39,6 @@ type Socks5Option struct {
 	UDP            bool   `proxy:"udp,omitempty"`
 	SkipCertVerify bool   `proxy:"skip-cert-verify,omitempty"`
 	Fingerprint    string `proxy:"fingerprint,omitempty"`
-	Certificate    string `proxy:"certificate,omitempty"`
-	PrivateKey     string `proxy:"private-key,omitempty"`
 }
 
 // StreamConnContext implements C.ProxyAdapter
@@ -60,18 +59,30 @@ func (ss *Socks5) StreamConnContext(ctx context.Context, c net.Conn, metadata *C
 			Password: ss.pass,
 		}
 	}
-	if _, err := ss.clientHandshakeContext(ctx, c, serializesSocksAddr(metadata), socks5.CmdConnect, user); err != nil {
+	if _, err := socks5.ClientHandshake(c, serializesSocksAddr(metadata), socks5.CmdConnect, user); err != nil {
 		return nil, err
 	}
 	return c, nil
 }
 
 // DialContext implements C.ProxyAdapter
-func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := ss.dialer.DialContext(ctx, "tcp", ss.addr)
+func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
+	return ss.DialContextWithDialer(ctx, dialer.NewDialer(ss.Base.DialOptions(opts...)...), metadata)
+}
+
+// DialContextWithDialer implements C.ProxyAdapter
+func (ss *Socks5) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
+	if len(ss.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(ss.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
+	}
+	c, err := dialer.DialContext(ctx, "tcp", ss.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
 	}
+	N.TCPKeepAlive(c)
 
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
@@ -85,12 +96,21 @@ func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Co
 	return NewConn(c, ss), nil
 }
 
+// SupportWithDialer implements C.ProxyAdapter
+func (ss *Socks5) SupportWithDialer() C.NetWork {
+	return C.TCP
+}
+
 // ListenPacketContext implements C.ProxyAdapter
-func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if err = ss.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
+func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
+	var cDialer C.Dialer = dialer.NewDialer(ss.Base.DialOptions(opts...)...)
+	if len(ss.option.DialerProxy) > 0 {
+		cDialer, err = proxydialer.NewByName(ss.option.DialerProxy, cDialer)
+		if err != nil {
+			return nil, err
+		}
 	}
-	c, err := ss.dialer.DialContext(ctx, "tcp", ss.addr)
+	c, err := cDialer.DialContext(ctx, "tcp", ss.addr)
 	if err != nil {
 		err = fmt.Errorf("%s connect error: %w", ss.addr, err)
 		return
@@ -108,6 +128,7 @@ func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata)
 		safeConnClose(c, err)
 	}(c)
 
+	N.TCPKeepAlive(c)
 	var user *socks5.User
 	if ss.user != "" {
 		user = &socks5.User{
@@ -117,7 +138,7 @@ func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata)
 	}
 
 	udpAssocateAddr := socks5.AddrFromStdAddrPort(netip.AddrPortFrom(netip.IPv4Unspecified(), 0))
-	bindAddr, err := ss.clientHandshakeContext(ctx, c, udpAssocateAddr, socks5.CmdUDPAssociate, user)
+	bindAddr, err := socks5.ClientHandshake(c, udpAssocateAddr, socks5.CmdUDPAssociate, user)
 	if err != nil {
 		err = fmt.Errorf("client hanshake error: %w", err)
 		return
@@ -129,7 +150,7 @@ func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata)
 		err = errors.New("invalid UDP bind address")
 		return
 	} else if bindUDPAddr.IP.IsUnspecified() {
-		serverAddr, err := resolveUDPAddr(ctx, "udp", ss.Addr(), C.IPv4Prefer)
+		serverAddr, err := resolveUDPAddr(ctx, "udp", ss.Addr())
 		if err != nil {
 			return nil, err
 		}
@@ -137,7 +158,7 @@ func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata)
 		bindUDPAddr.IP = serverAddr.IP
 	}
 
-	pc, err := ss.dialer.ListenPacket(ctx, "udp", "", bindUDPAddr.AddrPort())
+	pc, err := cDialer.ListenPacket(ctx, "udp", "", bindUDPAddr.AddrPort())
 	if err != nil {
 		return
 	}
@@ -153,51 +174,32 @@ func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata)
 	return newPacketConn(&socksPacketConn{PacketConn: pc, rAddr: bindUDPAddr, tcpConn: c}, ss), nil
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (ss *Socks5) ProxyInfo() C.ProxyInfo {
-	info := ss.Base.ProxyInfo()
-	info.DialerProxy = ss.option.DialerProxy
-	return info
-}
-
-func (ss *Socks5) clientHandshakeContext(ctx context.Context, c net.Conn, addr socks5.Addr, command socks5.Command, user *socks5.User) (_ socks5.Addr, err error) {
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
-	return socks5.ClientHandshake(c, addr, command, user)
-}
-
 func NewSocks5(option Socks5Option) (*Socks5, error) {
 	var tlsConfig *tls.Config
 	if option.TLS {
+		tlsConfig = &tls.Config{
+			InsecureSkipVerify: option.SkipCertVerify,
+			ServerName:         option.Server,
+		}
+
 		var err error
-		tlsConfig, err = ca.GetTLSConfig(ca.Option{
-			TLSConfig: &tls.Config{
-				InsecureSkipVerify: option.SkipCertVerify,
-				ServerName:         option.Server,
-			},
-			Fingerprint: option.Fingerprint,
-			Certificate: option.Certificate,
-			PrivateKey:  option.PrivateKey,
-		})
+		tlsConfig, err = ca.GetSpecifiedFingerprintTLSConfig(tlsConfig, option.Fingerprint)
 		if err != nil {
 			return nil, err
 		}
 	}
 
-	outbound := &Socks5{
+	return &Socks5{
 		Base: &Base{
 			name:   option.Name,
 			addr:   net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
 			tp:     C.Socks5,
-			pdName: option.ProviderName,
 			udp:    option.UDP,
 			tfo:    option.TFO,
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
+			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		option:         &option,
 		user:           option.UserName,
@@ -205,9 +207,7 @@ func NewSocks5(option Socks5Option) (*Socks5, error) {
 		tls:            option.TLS,
 		skipCertVerify: option.SkipCertVerify,
 		tlsConfig:      tlsConfig,
-	}
-	outbound.dialer = option.NewDialer(outbound.DialOptions())
-	return outbound, nil
+	}, nil
 }
 
 type socksPacketConn struct {

adapter/outbound/ssh.go

@@ -1,200 +0,0 @@
-package outbound
-
-import (
-	"bytes"
-	"context"
-	"encoding/base64"
-	"fmt"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-
-	N "github.com/metacubex/mihomo/common/net"
-	C "github.com/metacubex/mihomo/constant"
-
-	"github.com/metacubex/randv2"
-	"golang.org/x/crypto/ssh"
-)
-
-type Ssh struct {
-	*Base
-
-	option *SshOption
-
-	config *ssh.ClientConfig
-	client *ssh.Client
-	cMutex sync.Mutex
-}
-
-type SshOption struct {
-	BasicOption
-	Name                 string   `proxy:"name"`
-	Server               string   `proxy:"server"`
-	Port                 int      `proxy:"port"`
-	UserName             string   `proxy:"username"`
-	Password             string   `proxy:"password,omitempty"`
-	PrivateKey           string   `proxy:"private-key,omitempty"`
-	PrivateKeyPassphrase string   `proxy:"private-key-passphrase,omitempty"`
-	HostKey              []string `proxy:"host-key,omitempty"`
-	HostKeyAlgorithms    []string `proxy:"host-key-algorithms,omitempty"`
-}
-
-func (s *Ssh) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	client, err := s.connect(ctx, s.addr)
-	if err != nil {
-		return nil, err
-	}
-	c, err := client.DialContext(ctx, "tcp", metadata.RemoteAddress())
-	if err != nil {
-		return nil, err
-	}
-
-	return NewConn(c, s), nil
-}
-
-func (s *Ssh) connect(ctx context.Context, addr string) (client *ssh.Client, err error) {
-	s.cMutex.Lock()
-	defer s.cMutex.Unlock()
-	if s.client != nil {
-		return s.client, nil
-	}
-	c, err := s.dialer.DialContext(ctx, "tcp", addr)
-	if err != nil {
-		return nil, err
-	}
-
-	defer func(c net.Conn) {
-		safeConnClose(c, err)
-	}(c)
-
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
-
-	clientConn, chans, reqs, err := ssh.NewClientConn(c, addr, s.config)
-	if err != nil {
-		return nil, err
-	}
-	client = ssh.NewClient(clientConn, chans, reqs)
-
-	s.client = client
-
-	go func() {
-		_ = client.Wait() // wait shutdown
-		_ = client.Close()
-		s.cMutex.Lock()
-		defer s.cMutex.Unlock()
-		if s.client == client {
-			s.client = nil
-		}
-	}()
-
-	return client, nil
-}
-
-// ProxyInfo implements C.ProxyAdapter
-func (s *Ssh) ProxyInfo() C.ProxyInfo {
-	info := s.Base.ProxyInfo()
-	info.DialerProxy = s.option.DialerProxy
-	return info
-}
-
-// Close implements C.ProxyAdapter
-func (s *Ssh) Close() error {
-	s.cMutex.Lock()
-	defer s.cMutex.Unlock()
-	if s.client != nil {
-		return s.client.Close()
-	}
-	return nil
-}
-
-func NewSsh(option SshOption) (*Ssh, error) {
-	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
-
-	config := ssh.ClientConfig{
-		User:              option.UserName,
-		HostKeyCallback:   ssh.InsecureIgnoreHostKey(),
-		HostKeyAlgorithms: option.HostKeyAlgorithms,
-	}
-
-	if option.PrivateKey != "" {
-		var b []byte
-		var err error
-		if strings.Contains(option.PrivateKey, "PRIVATE KEY") {
-			b = []byte(option.PrivateKey)
-		} else {
-			path := C.Path.Resolve(option.PrivateKey)
-			if !C.Path.IsSafePath(path) {
-				return nil, C.Path.ErrNotSafePath(path)
-			}
-			b, err = os.ReadFile(path)
-			if err != nil {
-				return nil, err
-			}
-		}
-		var pKey ssh.Signer
-		if option.PrivateKeyPassphrase != "" {
-			pKey, err = ssh.ParsePrivateKeyWithPassphrase(b, []byte(option.PrivateKeyPassphrase))
-		} else {
-			pKey, err = ssh.ParsePrivateKey(b)
-		}
-		if err != nil {
-			return nil, err
-		}
-
-		config.Auth = append(config.Auth, ssh.PublicKeys(pKey))
-	}
-
-	if option.Password != "" {
-		config.Auth = append(config.Auth, ssh.Password(option.Password))
-	}
-
-	if len(option.HostKey) != 0 {
-		keys := make([]ssh.PublicKey, len(option.HostKey))
-		for i, hostKey := range option.HostKey {
-			key, _, _, _, err := ssh.ParseAuthorizedKey([]byte(hostKey))
-			if err != nil {
-				return nil, fmt.Errorf("parse host key :%s", key)
-			}
-			keys[i] = key
-		}
-		config.HostKeyCallback = func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-			serverKey := key.Marshal()
-			for _, hostKey := range keys {
-				if bytes.Equal(serverKey, hostKey.Marshal()) {
-					return nil
-				}
-			}
-			return fmt.Errorf("host key mismatch, server send :%s %s", key.Type(), base64.StdEncoding.EncodeToString(serverKey))
-		}
-	}
-
-	version := "SSH-2.0-OpenSSH_"
-	if randv2.IntN(2) == 0 {
-		version += "7." + strconv.Itoa(randv2.IntN(10))
-	} else {
-		version += "8." + strconv.Itoa(randv2.IntN(9))
-	}
-	config.ClientVersion = version
-
-	outbound := &Ssh{
-		Base: &Base{
-			name:   option.Name,
-			addr:   addr,
-			tp:     C.Ssh,
-			pdName: option.ProviderName,
-			udp:    false,
-			iface:  option.Interface,
-			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
-		},
-		option: &option,
-		config: &config,
-	}
-	outbound.dialer = option.NewDialer(outbound.DialOptions())
-	return outbound, nil
-}

adapter/outbound/sudoku.go

@@ -1,451 +0,0 @@
-package outbound
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-	"sync"
-
-	N "github.com/metacubex/mihomo/common/net"
-	C "github.com/metacubex/mihomo/constant"
-	"github.com/metacubex/mihomo/transport/sudoku"
-	"github.com/metacubex/mihomo/transport/sudoku/obfs/httpmask"
-)
-
-type Sudoku struct {
-	*Base
-	option   *SudokuOption
-	baseConf sudoku.ProtocolConfig
-
-	muxMu     sync.Mutex
-	muxClient *sudoku.MultiplexClient
-
-	httpMaskMu     sync.Mutex
-	httpMaskClient *httpmask.TunnelClient
-	httpMaskKey    string
-}
-
-type SudokuOption struct {
-	BasicOption
-	Name               string                 `proxy:"name"`
-	Server             string                 `proxy:"server"`
-	Port               int                    `proxy:"port"`
-	Key                string                 `proxy:"key"`
-	AEADMethod         string                 `proxy:"aead-method,omitempty"`
-	PaddingMin         *int                   `proxy:"padding-min,omitempty"`
-	PaddingMax         *int                   `proxy:"padding-max,omitempty"`
-	TableType          string                 `proxy:"table-type,omitempty"` // "prefer_ascii" or "prefer_entropy"
-	EnablePureDownlink *bool                  `proxy:"enable-pure-downlink,omitempty"`
-	HTTPMask           *bool                  `proxy:"http-mask,omitempty"`
-	HTTPMaskMode       string                 `proxy:"http-mask-mode,omitempty"`      // "legacy" (default), "stream", "poll", "auto", "ws"
-	HTTPMaskTLS        bool                   `proxy:"http-mask-tls,omitempty"`       // only for http-mask-mode stream/poll/auto
-	HTTPMaskHost       string                 `proxy:"http-mask-host,omitempty"`      // optional Host/SNI override (domain or domain:port)
-	PathRoot           string                 `proxy:"path-root,omitempty"`           // optional first-level path prefix for HTTP tunnel endpoints
-	HTTPMaskMultiplex  string                 `proxy:"http-mask-multiplex,omitempty"` // "off" (default), "auto" (reuse h1/h2), "on" (single tunnel, multi-target)
-	HTTPMaskOptions    *SudokuHTTPMaskOptions `proxy:"httpmask,omitempty"`
-	CustomTable        string                 `proxy:"custom-table,omitempty"`  // optional custom byte layout, e.g. xpxvvpvv
-	CustomTables       []string               `proxy:"custom-tables,omitempty"` // optional table rotation patterns, overrides custom-table when non-empty
-}
-
-type SudokuHTTPMaskOptions struct {
-	Disable   bool   `proxy:"disable,omitempty"`
-	Mode      string `proxy:"mode,omitempty"`
-	TLS       bool   `proxy:"tls,omitempty"`
-	Host      string `proxy:"host,omitempty"`
-	PathRoot  string `proxy:"path_root,omitempty"`
-	Multiplex string `proxy:"multiplex,omitempty"`
-}
-
-// DialContext implements C.ProxyAdapter
-func (s *Sudoku) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	cfg, err := s.buildConfig(metadata)
-	if err != nil {
-		return nil, err
-	}
-
-	muxMode := normalizeHTTPMaskMultiplex(cfg.HTTPMaskMultiplex)
-	if muxMode == "on" && !cfg.DisableHTTPMask && httpTunnelModeEnabled(cfg.HTTPMaskMode) {
-		stream, muxErr := s.dialMultiplex(ctx, cfg.TargetAddress)
-		if muxErr == nil {
-			return NewConn(stream, s), nil
-		}
-		return nil, muxErr
-	}
-
-	c, err := s.dialAndHandshake(ctx, cfg)
-	if err != nil {
-		return nil, err
-	}
-	defer func() { safeConnClose(c, err) }()
-
-	addrBuf, err := sudoku.EncodeAddress(cfg.TargetAddress)
-	if err != nil {
-		return nil, fmt.Errorf("encode target address failed: %w", err)
-	}
-
-	if err = sudoku.WriteKIPMessage(c, sudoku.KIPTypeOpenTCP, addrBuf); err != nil {
-		return nil, fmt.Errorf("send target address failed: %w", err)
-	}
-
-	return NewConn(c, s), nil
-}
-
-// ListenPacketContext implements C.ProxyAdapter
-func (s *Sudoku) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
-	if err := s.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
-	}
-
-	cfg, err := s.buildConfig(metadata)
-	if err != nil {
-		return nil, err
-	}
-
-	c, err := s.dialAndHandshake(ctx, cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	if err = sudoku.WriteKIPMessage(c, sudoku.KIPTypeStartUoT, nil); err != nil {
-		_ = c.Close()
-		return nil, fmt.Errorf("start uot failed: %w", err)
-	}
-
-	return newPacketConn(N.NewThreadSafePacketConn(sudoku.NewUoTPacketConn(c)), s), nil
-}
-
-// SupportUOT implements C.ProxyAdapter
-func (s *Sudoku) SupportUOT() bool {
-	return true
-}
-
-// ProxyInfo implements C.ProxyAdapter
-func (s *Sudoku) ProxyInfo() C.ProxyInfo {
-	info := s.Base.ProxyInfo()
-	info.DialerProxy = s.option.DialerProxy
-	return info
-}
-
-func (s *Sudoku) buildConfig(metadata *C.Metadata) (*sudoku.ProtocolConfig, error) {
-	if metadata == nil || metadata.DstPort == 0 || !metadata.Valid() {
-		return nil, fmt.Errorf("invalid metadata for sudoku outbound")
-	}
-
-	cfg := s.baseConf
-	cfg.TargetAddress = metadata.RemoteAddress()
-
-	if err := cfg.ValidateClient(); err != nil {
-		return nil, err
-	}
-	return &cfg, nil
-}
-
-func NewSudoku(option SudokuOption) (*Sudoku, error) {
-	if option.Server == "" {
-		return nil, fmt.Errorf("server is required")
-	}
-	if option.Port <= 0 || option.Port > 65535 {
-		return nil, fmt.Errorf("invalid port: %d", option.Port)
-	}
-	if option.Key == "" {
-		return nil, fmt.Errorf("key is required")
-	}
-
-	defaultConf := sudoku.DefaultConfig()
-	tableType, err := sudoku.NormalizeTableType(option.TableType)
-	if err != nil {
-		return nil, err
-	}
-	paddingMin, paddingMax := sudoku.ResolvePadding(option.PaddingMin, option.PaddingMax, defaultConf.PaddingMin, defaultConf.PaddingMax)
-	enablePureDownlink := sudoku.DerefBool(option.EnablePureDownlink, defaultConf.EnablePureDownlink)
-
-	disableHTTPMask := defaultConf.DisableHTTPMask
-	if option.HTTPMask != nil {
-		disableHTTPMask = !*option.HTTPMask
-	}
-	httpMaskMode := defaultConf.HTTPMaskMode
-	if option.HTTPMaskMode != "" {
-		httpMaskMode = option.HTTPMaskMode
-	}
-	httpMaskTLS := option.HTTPMaskTLS
-	httpMaskHost := option.HTTPMaskHost
-	pathRoot := strings.TrimSpace(option.PathRoot)
-	httpMaskMultiplex := defaultConf.HTTPMaskMultiplex
-	if option.HTTPMaskMultiplex != "" {
-		httpMaskMultiplex = option.HTTPMaskMultiplex
-	}
-
-	if hm := option.HTTPMaskOptions; hm != nil {
-		disableHTTPMask = hm.Disable
-		if hm.Mode != "" {
-			httpMaskMode = hm.Mode
-		}
-		httpMaskTLS = hm.TLS
-		httpMaskHost = hm.Host
-		if pr := strings.TrimSpace(hm.PathRoot); pr != "" {
-			pathRoot = pr
-		}
-		if mux := strings.TrimSpace(hm.Multiplex); mux != "" {
-			httpMaskMultiplex = mux
-		} else {
-			httpMaskMultiplex = defaultConf.HTTPMaskMultiplex
-		}
-	}
-
-	baseConf := sudoku.ProtocolConfig{
-		ServerAddress:           net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
-		Key:                     option.Key,
-		AEADMethod:              defaultConf.AEADMethod,
-		PaddingMin:              paddingMin,
-		PaddingMax:              paddingMax,
-		EnablePureDownlink:      enablePureDownlink,
-		HandshakeTimeoutSeconds: defaultConf.HandshakeTimeoutSeconds,
-		DisableHTTPMask:         disableHTTPMask,
-		HTTPMaskMode:            httpMaskMode,
-		HTTPMaskTLSEnabled:      httpMaskTLS,
-		HTTPMaskHost:            httpMaskHost,
-		HTTPMaskPathRoot:        pathRoot,
-		HTTPMaskMultiplex:       httpMaskMultiplex,
-	}
-	tables, err := sudoku.NewClientTablesWithCustomPatterns(sudoku.ClientAEADSeed(option.Key), tableType, option.CustomTable, option.CustomTables)
-	if err != nil {
-		return nil, fmt.Errorf("build table(s) failed: %w", err)
-	}
-	if len(tables) == 1 {
-		baseConf.Table = tables[0]
-	} else {
-		baseConf.Tables = tables
-	}
-	if option.AEADMethod != "" {
-		baseConf.AEADMethod = option.AEADMethod
-	}
-
-	outbound := &Sudoku{
-		Base: &Base{
-			name:   option.Name,
-			addr:   baseConf.ServerAddress,
-			tp:     C.Sudoku,
-			pdName: option.ProviderName,
-			udp:    true,
-			tfo:    option.TFO,
-			mpTcp:  option.MPTCP,
-			iface:  option.Interface,
-			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
-		},
-		option:   &option,
-		baseConf: baseConf,
-	}
-	outbound.dialer = option.NewDialer(outbound.DialOptions())
-	return outbound, nil
-}
-
-func (s *Sudoku) Close() error {
-	s.resetMuxClient()
-	s.resetHTTPMaskClient()
-	return s.Base.Close()
-}
-
-func normalizeHTTPMaskMultiplex(mode string) string {
-	switch strings.ToLower(strings.TrimSpace(mode)) {
-	case "", "off":
-		return "off"
-	case "auto":
-		return "auto"
-	case "on":
-		return "on"
-	default:
-		return "off"
-	}
-}
-
-func httpTunnelModeEnabled(mode string) bool {
-	switch strings.ToLower(strings.TrimSpace(mode)) {
-	case "stream", "poll", "auto", "ws":
-		return true
-	default:
-		return false
-	}
-}
-
-func (s *Sudoku) dialAndHandshake(ctx context.Context, cfg *sudoku.ProtocolConfig) (_ net.Conn, err error) {
-	if cfg == nil {
-		return nil, fmt.Errorf("config is required")
-	}
-
-	handshakeCfg := *cfg
-	if !handshakeCfg.DisableHTTPMask && httpTunnelModeEnabled(handshakeCfg.HTTPMaskMode) {
-		handshakeCfg.DisableHTTPMask = true
-	}
-
-	upgrade := func(raw net.Conn) (net.Conn, error) {
-		return sudoku.ClientHandshake(raw, &handshakeCfg)
-	}
-
-	var (
-		c             net.Conn
-		handshakeDone bool
-	)
-	if !cfg.DisableHTTPMask && httpTunnelModeEnabled(cfg.HTTPMaskMode) {
-		muxMode := normalizeHTTPMaskMultiplex(cfg.HTTPMaskMultiplex)
-		if muxMode == "auto" && strings.ToLower(strings.TrimSpace(cfg.HTTPMaskMode)) != "ws" {
-			if client, cerr := s.getOrCreateHTTPMaskClient(cfg); cerr == nil && client != nil {
-				c, err = client.DialTunnel(ctx, httpmask.TunnelDialOptions{
-					Mode:         cfg.HTTPMaskMode,
-					TLSEnabled:   cfg.HTTPMaskTLSEnabled,
-					HostOverride: cfg.HTTPMaskHost,
-					PathRoot:     cfg.HTTPMaskPathRoot,
-					AuthKey:      sudoku.ClientAEADSeed(cfg.Key),
-					Upgrade:      upgrade,
-					Multiplex:    cfg.HTTPMaskMultiplex,
-					DialContext:  s.dialer.DialContext,
-				})
-				if err != nil {
-					s.resetHTTPMaskClient()
-				}
-			}
-		}
-		if c == nil && err == nil {
-			c, err = sudoku.DialHTTPMaskTunnel(ctx, cfg.ServerAddress, cfg, s.dialer.DialContext, upgrade)
-		}
-		if err == nil && c != nil {
-			handshakeDone = true
-		}
-	}
-	if c == nil && err == nil {
-		c, err = s.dialer.DialContext(ctx, "tcp", s.addr)
-	}
-	if err != nil {
-		return nil, fmt.Errorf("%s connect error: %w", s.addr, err)
-	}
-
-	defer func() { safeConnClose(c, err) }()
-
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
-
-	if !handshakeDone {
-		c, err = sudoku.ClientHandshake(c, &handshakeCfg)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return c, nil
-}
-
-func (s *Sudoku) dialMultiplex(ctx context.Context, targetAddress string) (net.Conn, error) {
-	for attempt := 0; attempt < 2; attempt++ {
-		client, err := s.getOrCreateMuxClient(ctx)
-		if err != nil {
-			return nil, err
-		}
-
-		stream, err := client.Dial(ctx, targetAddress)
-		if err != nil {
-			s.resetMuxClient()
-			continue
-		}
-
-		return stream, nil
-	}
-	return nil, fmt.Errorf("multiplex open stream failed")
-}
-
-func (s *Sudoku) getOrCreateMuxClient(ctx context.Context) (*sudoku.MultiplexClient, error) {
-	if s == nil {
-		return nil, fmt.Errorf("nil adapter")
-	}
-
-	s.muxMu.Lock()
-	if s.muxClient != nil && !s.muxClient.IsClosed() {
-		client := s.muxClient
-		s.muxMu.Unlock()
-		return client, nil
-	}
-	s.muxMu.Unlock()
-
-	s.muxMu.Lock()
-	defer s.muxMu.Unlock()
-
-	if s.muxClient != nil && !s.muxClient.IsClosed() {
-		return s.muxClient, nil
-	}
-
-	baseCfg := s.baseConf
-	baseConn, err := s.dialAndHandshake(ctx, &baseCfg)
-	if err != nil {
-		return nil, err
-	}
-
-	client, err := sudoku.StartMultiplexClient(baseConn)
-	if err != nil {
-		_ = baseConn.Close()
-		return nil, err
-	}
-
-	s.muxClient = client
-	return client, nil
-}
-
-func (s *Sudoku) resetMuxClient() {
-	s.muxMu.Lock()
-	defer s.muxMu.Unlock()
-	if s.muxClient != nil {
-		_ = s.muxClient.Close()
-		s.muxClient = nil
-	}
-}
-
-func (s *Sudoku) resetHTTPMaskClient() {
-	s.httpMaskMu.Lock()
-	defer s.httpMaskMu.Unlock()
-	if s.httpMaskClient != nil {
-		s.httpMaskClient.CloseIdleConnections()
-		s.httpMaskClient = nil
-		s.httpMaskKey = ""
-	}
-}
-
-func (s *Sudoku) getOrCreateHTTPMaskClient(cfg *sudoku.ProtocolConfig) (*httpmask.TunnelClient, error) {
-	if s == nil || cfg == nil {
-		return nil, fmt.Errorf("nil adapter or config")
-	}
-
-	key := cfg.ServerAddress + "|" + strconv.FormatBool(cfg.HTTPMaskTLSEnabled) + "|" + strings.TrimSpace(cfg.HTTPMaskHost)
-
-	s.httpMaskMu.Lock()
-	if s.httpMaskClient != nil && s.httpMaskKey == key {
-		client := s.httpMaskClient
-		s.httpMaskMu.Unlock()
-		return client, nil
-	}
-	s.httpMaskMu.Unlock()
-
-	client, err := httpmask.NewTunnelClient(cfg.ServerAddress, httpmask.TunnelClientOptions{
-		TLSEnabled:   cfg.HTTPMaskTLSEnabled,
-		HostOverride: cfg.HTTPMaskHost,
-		DialContext:  s.dialer.DialContext,
-		MaxIdleConns: 32,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	s.httpMaskMu.Lock()
-	defer s.httpMaskMu.Unlock()
-	if s.httpMaskClient != nil && s.httpMaskKey == key {
-		client.CloseIdleConnections()
-		return s.httpMaskClient, nil
-	}
-	if s.httpMaskClient != nil {
-		s.httpMaskClient.CloseIdleConnections()
-	}
-	s.httpMaskClient = client
-	s.httpMaskKey = key
-	return client, nil
-}

adapter/outbound/trojan.go

@@ -2,38 +2,33 @@ package outbound
 
 import (
 	"context"
-	"errors"
+	"crypto/tls"
 	"fmt"
 	"net"
+	"net/http"
 	"strconv"
 
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/component/ca"
-	"github.com/metacubex/mihomo/component/ech"
+	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/component/proxydialer"
 	tlsC "github.com/metacubex/mihomo/component/tls"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/transport/gun"
-	"github.com/metacubex/mihomo/transport/shadowsocks/core"
 	"github.com/metacubex/mihomo/transport/trojan"
-	"github.com/metacubex/mihomo/transport/vmess"
-
-	"github.com/metacubex/http"
-	"github.com/metacubex/tls"
 )
 
 type Trojan struct {
 	*Base
-	option      *TrojanOption
-	hexPassword [trojan.KeyLength]byte
+	instance *trojan.Trojan
+	option   *TrojanOption
 
 	// for gun mux
+	gunTLSConfig *tls.Config
 	gunConfig    *gun.Config
-	gunTransport *gun.TransportWrap
+	transport    *gun.TransportWrap
 
 	realityConfig *tlsC.RealityConfig
-	echConfig     *ech.Config
-
-	ssCipher core.Cipher
 }
 
 type TrojanOption struct {
@@ -46,40 +41,23 @@ type TrojanOption struct {
 	SNI               string         `proxy:"sni,omitempty"`
 	SkipCertVerify    bool           `proxy:"skip-cert-verify,omitempty"`
 	Fingerprint       string         `proxy:"fingerprint,omitempty"`
-	Certificate       string         `proxy:"certificate,omitempty"`
-	PrivateKey        string         `proxy:"private-key,omitempty"`
 	UDP               bool           `proxy:"udp,omitempty"`
 	Network           string         `proxy:"network,omitempty"`
-	ECHOpts           ECHOptions     `proxy:"ech-opts,omitempty"`
 	RealityOpts       RealityOptions `proxy:"reality-opts,omitempty"`
 	GrpcOpts          GrpcOptions    `proxy:"grpc-opts,omitempty"`
 	WSOpts            WSOptions      `proxy:"ws-opts,omitempty"`
-	SSOpts            TrojanSSOption `proxy:"ss-opts,omitempty"`
 	ClientFingerprint string         `proxy:"client-fingerprint,omitempty"`
 }
 
-// TrojanSSOption from https://github.com/p4gefau1t/trojan-go/blob/v0.10.6/tunnel/shadowsocks/config.go#L5
-type TrojanSSOption struct {
-	Enabled  bool   `proxy:"enabled,omitempty"`
-	Method   string `proxy:"method,omitempty"`
-	Password string `proxy:"password,omitempty"`
-}
-
-func (t *Trojan) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ net.Conn, err error) {
-	switch t.option.Network {
-	case "ws":
+func (t *Trojan) plainStream(ctx context.Context, c net.Conn) (net.Conn, error) {
+	if t.option.Network == "ws" {
 		host, port, _ := net.SplitHostPort(t.addr)
-
-		wsOpts := &vmess.WebsocketConfig{
+		wsOpts := &trojan.WebsocketOption{
 			Host:                     host,
 			Port:                     port,
 			Path:                     t.option.WSOpts.Path,
-			MaxEarlyData:             t.option.WSOpts.MaxEarlyData,
-			EarlyDataHeaderName:      t.option.WSOpts.EarlyDataHeaderName,
 			V2rayHttpUpgrade:         t.option.WSOpts.V2rayHttpUpgrade,
 			V2rayHttpUpgradeFastOpen: t.option.WSOpts.V2rayHttpUpgradeFastOpen,
-			ClientFingerprint:        t.option.ClientFingerprint,
-			ECHConfig:                t.echConfig,
 			Headers:                  http.Header{},
 		}
 
@@ -93,98 +71,71 @@ func (t *Trojan) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.
 			}
 		}
 
-		alpn := trojan.DefaultWebsocketALPN
-		if t.option.ALPN != nil { // structure's Decode will ensure value not nil when input has value even it was set an empty array
-			alpn = t.option.ALPN
-		}
+		return t.instance.StreamWebsocketConn(ctx, c, wsOpts)
+	}
 
-		wsOpts.TLS = true
-		wsOpts.TLSConfig, err = ca.GetTLSConfig(ca.Option{
-			TLSConfig: &tls.Config{
-				NextProtos:         alpn,
-				MinVersion:         tls.VersionTLS12,
-				InsecureSkipVerify: t.option.SkipCertVerify,
-				ServerName:         t.option.SNI,
-			},
-			Fingerprint: t.option.Fingerprint,
-			Certificate: t.option.Certificate,
-			PrivateKey:  t.option.PrivateKey,
-		})
+	return t.instance.StreamConn(ctx, c)
+}
+
+// StreamConnContext implements C.ProxyAdapter
+func (t *Trojan) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+	var err error
+
+	if tlsC.HaveGlobalFingerprint() && len(t.option.ClientFingerprint) == 0 {
+		t.option.ClientFingerprint = tlsC.GetGlobalFingerprint()
+	}
+
+	if t.transport != nil {
+		c, err = gun.StreamGunWithConn(c, t.gunTLSConfig, t.gunConfig, t.realityConfig)
+	} else {
+		c, err = t.plainStream(ctx, c)
+	}
+
+	if err != nil {
+		return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
+	}
+
+	if metadata.NetWork == C.UDP {
+		err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata))
+		return c, err
+	}
+	err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
+	return c, err
+}
+
+// DialContext implements C.ProxyAdapter
+func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
+	// gun transport
+	if t.transport != nil && len(opts) == 0 {
+		c, err := gun.StreamGunWithTransport(t.transport, t.gunConfig)
 		if err != nil {
 			return nil, err
 		}
 
-		c, err = vmess.StreamWebsocketConn(ctx, c, wsOpts)
-	case "grpc":
-		break // already handle in gun transport
-	default:
-		// default tcp network
-		// handle TLS
-		alpn := trojan.DefaultALPN
-		if t.option.ALPN != nil { // structure's Decode will ensure value not nil when input has value even it was set an empty array
-			alpn = t.option.ALPN
+		if err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata)); err != nil {
+			c.Close()
+			return nil, err
 		}
-		c, err = vmess.StreamTLSConn(ctx, c, &vmess.TLSConfig{
-			Host:              t.option.SNI,
-			SkipCertVerify:    t.option.SkipCertVerify,
-			FingerPrint:       t.option.Fingerprint,
-			Certificate:       t.option.Certificate,
-			PrivateKey:        t.option.PrivateKey,
-			ClientFingerprint: t.option.ClientFingerprint,
-			NextProtos:        alpn,
-			ECH:               t.echConfig,
-			Reality:           t.realityConfig,
-		})
+
+		return NewConn(c, t), nil
 	}
+	return t.DialContextWithDialer(ctx, dialer.NewDialer(t.Base.DialOptions(opts...)...), metadata)
+}
+
+// DialContextWithDialer implements C.ProxyAdapter
+func (t *Trojan) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
+	if len(t.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(t.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
+	}
+	c, err := dialer.DialContext(ctx, "tcp", t.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
 	}
+	N.TCPKeepAlive(c)
 
-	return t.streamConnContext(ctx, c, metadata)
-}
-
-func (t *Trojan) streamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ net.Conn, err error) {
-	if t.ssCipher != nil {
-		c = t.ssCipher.StreamConn(c)
-	}
-
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
-	command := trojan.CommandTCP
-	if metadata.NetWork == C.UDP {
-		command = trojan.CommandUDP
-	}
-	err = trojan.WriteHeader(c, t.hexPassword, command, serializesSocksAddr(metadata))
-	return c, err
-}
-
-func (t *Trojan) writeHeaderContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (err error) {
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
-	command := trojan.CommandTCP
-	if metadata.NetWork == C.UDP {
-		command = trojan.CommandUDP
-	}
-	err = trojan.WriteHeader(c, t.hexPassword, command, serializesSocksAddr(metadata))
-	return err
-}
-
-// DialContext implements C.ProxyAdapter
-func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	var c net.Conn
-	// gun transport
-	if t.gunTransport != nil {
-		c, err = gun.StreamGunWithTransport(t.gunTransport, t.gunConfig)
-	} else {
-		c, err = t.dialer.DialContext(ctx, "tcp", t.addr)
-	}
-	if err != nil {
-		return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
-	}
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
 	}(c)
@@ -198,31 +149,67 @@ func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Con
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (t *Trojan) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if err = t.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
-	}
-
+func (t *Trojan) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
 	var c net.Conn
+
 	// grpc transport
-	if t.gunTransport != nil {
-		c, err = gun.StreamGunWithTransport(t.gunTransport, t.gunConfig)
-	} else {
-		c, err = t.dialer.DialContext(ctx, "tcp", t.addr)
+	if t.transport != nil && len(opts) == 0 {
+		c, err = gun.StreamGunWithTransport(t.transport, t.gunConfig)
+		if err != nil {
+			return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
+		}
+		defer func(c net.Conn) {
+			safeConnClose(c, err)
+		}(c)
+		err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata))
+		if err != nil {
+			return nil, err
+		}
+
+		pc := t.instance.PacketConn(c)
+		return newPacketConn(pc, t), err
 	}
+	return t.ListenPacketWithDialer(ctx, dialer.NewDialer(t.Base.DialOptions(opts...)...), metadata)
+}
+
+// ListenPacketWithDialer implements C.ProxyAdapter
+func (t *Trojan) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
+	if len(t.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(t.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
+	}
+	c, err := dialer.DialContext(ctx, "tcp", t.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
 	}
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
 	}(c)
+	N.TCPKeepAlive(c)
+	c, err = t.plainStream(ctx, c)
+	if err != nil {
+		return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
+	}
 
-	c, err = t.StreamConnContext(ctx, c, metadata)
+	err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata))
 	if err != nil {
 		return nil, err
 	}
 
-	pc := trojan.NewPacketConn(c)
+	pc := t.instance.PacketConn(c)
+	return newPacketConn(pc, t), err
+}
+
+// SupportWithDialer implements C.ProxyAdapter
+func (t *Trojan) SupportWithDialer() C.NetWork {
+	return C.ALLNet
+}
+
+// ListenPacketOnStreamConn implements C.ProxyAdapter
+func (t *Trojan) ListenPacketOnStreamConn(c net.Conn, metadata *C.Metadata) (_ C.PacketConn, err error) {
+	pc := t.instance.PacketConn(c)
 	return newPacketConn(pc, t), err
 }
 
@@ -231,26 +218,20 @@ func (t *Trojan) SupportUOT() bool {
 	return true
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (t *Trojan) ProxyInfo() C.ProxyInfo {
-	info := t.Base.ProxyInfo()
-	info.DialerProxy = t.option.DialerProxy
-	return info
-}
-
-// Close implements C.ProxyAdapter
-func (t *Trojan) Close() error {
-	if t.gunTransport != nil {
-		return t.gunTransport.Close()
-	}
-	return nil
-}
-
 func NewTrojan(option TrojanOption) (*Trojan, error) {
 	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
 
-	if option.SNI == "" {
-		option.SNI = option.Server
+	tOption := &trojan.Option{
+		Password:          option.Password,
+		ALPN:              option.ALPN,
+		ServerName:        option.Server,
+		SkipCertVerify:    option.SkipCertVerify,
+		Fingerprint:       option.Fingerprint,
+		ClientFingerprint: option.ClientFingerprint,
+	}
+
+	if option.SNI != "" {
+		tOption.ServerName = option.SNI
 	}
 
 	t := &Trojan{
@@ -258,71 +239,61 @@ func NewTrojan(option TrojanOption) (*Trojan, error) {
 			name:   option.Name,
 			addr:   addr,
 			tp:     C.Trojan,
-			pdName: option.ProviderName,
 			udp:    option.UDP,
 			tfo:    option.TFO,
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
+			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
-		option:      &option,
-		hexPassword: trojan.Key(option.Password),
+		instance: trojan.New(tOption),
+		option:   &option,
 	}
-	t.dialer = option.NewDialer(t.DialOptions())
 
 	var err error
 	t.realityConfig, err = option.RealityOpts.Parse()
 	if err != nil {
 		return nil, err
 	}
-
-	t.echConfig, err = option.ECHOpts.Parse()
-	if err != nil {
-		return nil, err
-	}
-
-	if option.SSOpts.Enabled {
-		if option.SSOpts.Password == "" {
-			return nil, errors.New("empty password")
-		}
-		if option.SSOpts.Method == "" {
-			option.SSOpts.Method = "AES-128-GCM"
-		}
-		ciph, err := core.PickCipher(option.SSOpts.Method, nil, option.SSOpts.Password)
-		if err != nil {
-			return nil, err
-		}
-		t.ssCipher = ciph
-	}
+	tOption.Reality = t.realityConfig
 
 	if option.Network == "grpc" {
-		dialFn := func(ctx context.Context, network, addr string) (net.Conn, error) {
-			c, err := t.dialer.DialContext(ctx, "tcp", t.addr)
+		dialFn := func(network, addr string) (net.Conn, error) {
+			var err error
+			var cDialer C.Dialer = dialer.NewDialer(t.Base.DialOptions()...)
+			if len(t.option.DialerProxy) > 0 {
+				cDialer, err = proxydialer.NewByName(t.option.DialerProxy, cDialer)
+				if err != nil {
+					return nil, err
+				}
+			}
+			c, err := cDialer.DialContext(context.Background(), "tcp", t.addr)
 			if err != nil {
 				return nil, fmt.Errorf("%s connect error: %s", t.addr, err.Error())
 			}
+			N.TCPKeepAlive(c)
 			return c, nil
 		}
 
-		tlsConfig := &vmess.TLSConfig{
-			Host:              option.SNI,
-			SkipCertVerify:    option.SkipCertVerify,
-			FingerPrint:       option.Fingerprint,
-			Certificate:       option.Certificate,
-			PrivateKey:        option.PrivateKey,
-			ClientFingerprint: option.ClientFingerprint,
-			NextProtos:        []string{"h2"},
-			ECH:               t.echConfig,
-			Reality:           t.realityConfig,
+		tlsConfig := &tls.Config{
+			NextProtos:         option.ALPN,
+			MinVersion:         tls.VersionTLS12,
+			InsecureSkipVerify: tOption.SkipCertVerify,
+			ServerName:         tOption.ServerName,
 		}
 
-		t.gunTransport = gun.NewHTTP2Client(dialFn, tlsConfig)
+		var err error
+		tlsConfig, err = ca.GetSpecifiedFingerprintTLSConfig(tlsConfig, option.Fingerprint)
+		if err != nil {
+			return nil, err
+		}
 
+		t.transport = gun.NewHTTP2Client(dialFn, tlsConfig, tOption.ClientFingerprint, t.realityConfig)
+
+		t.gunTLSConfig = tlsConfig
 		t.gunConfig = &gun.Config{
 			ServiceName: option.GrpcOpts.GrpcServiceName,
-			UserAgent:   option.GrpcOpts.GrpcUserAgent,
-			Host:        option.SNI,
+			Host:        tOption.ServerName,
 		}
 	}
 

adapter/outbound/trusttunnel.go

@@ -1,144 +0,0 @@
-package outbound
-
-import (
-	"context"
-	"net"
-	"net/netip"
-	"strconv"
-
-	N "github.com/metacubex/mihomo/common/net"
-	C "github.com/metacubex/mihomo/constant"
-	"github.com/metacubex/mihomo/transport/trusttunnel"
-	"github.com/metacubex/mihomo/transport/vmess"
-)
-
-type TrustTunnel struct {
-	*Base
-	client *trusttunnel.Client
-	option *TrustTunnelOption
-}
-
-type TrustTunnelOption struct {
-	BasicOption
-	Name              string     `proxy:"name"`
-	Server            string     `proxy:"server"`
-	Port              int        `proxy:"port"`
-	UserName          string     `proxy:"username,omitempty"`
-	Password          string     `proxy:"password,omitempty"`
-	ALPN              []string   `proxy:"alpn,omitempty"`
-	SNI               string     `proxy:"sni,omitempty"`
-	ECHOpts           ECHOptions `proxy:"ech-opts,omitempty"`
-	ClientFingerprint string     `proxy:"client-fingerprint,omitempty"`
-	SkipCertVerify    bool       `proxy:"skip-cert-verify,omitempty"`
-	Fingerprint       string     `proxy:"fingerprint,omitempty"`
-	Certificate       string     `proxy:"certificate,omitempty"`
-	PrivateKey        string     `proxy:"private-key,omitempty"`
-	UDP               bool       `proxy:"udp,omitempty"`
-	HealthCheck       bool       `proxy:"health-check,omitempty"`
-
-	Quic                 bool   `proxy:"quic,omitempty"`
-	CongestionController string `proxy:"congestion-controller,omitempty"`
-	CWND                 int    `proxy:"cwnd,omitempty"`
-}
-
-func (t *TrustTunnel) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := t.client.Dial(ctx, metadata.RemoteAddress())
-	if err != nil {
-		return nil, err
-	}
-	return NewConn(c, t), nil
-}
-
-func (t *TrustTunnel) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if err = t.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
-	}
-
-	pc, err := t.client.ListenPacket(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	return newPacketConn(N.NewThreadSafePacketConn(pc), t), nil
-}
-
-// SupportUOT implements C.ProxyAdapter
-func (t *TrustTunnel) SupportUOT() bool {
-	return true
-}
-
-// ProxyInfo implements C.ProxyAdapter
-func (t *TrustTunnel) ProxyInfo() C.ProxyInfo {
-	info := t.Base.ProxyInfo()
-	info.DialerProxy = t.option.DialerProxy
-	return info
-}
-
-// Close implements C.ProxyAdapter
-func (t *TrustTunnel) Close() error {
-	return t.client.Close()
-}
-
-func NewTrustTunnel(option TrustTunnelOption) (*TrustTunnel, error) {
-	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
-	outbound := &TrustTunnel{
-		Base: &Base{
-			name:   option.Name,
-			addr:   addr,
-			tp:     C.TrustTunnel,
-			pdName: option.ProviderName,
-			udp:    option.UDP,
-			tfo:    option.TFO,
-			mpTcp:  option.MPTCP,
-			iface:  option.Interface,
-			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
-		},
-		option: &option,
-	}
-	outbound.dialer = option.NewDialer(outbound.DialOptions())
-
-	tOption := trusttunnel.ClientOptions{
-		Dialer: outbound.dialer,
-		ResolvUDP: func(ctx context.Context, server string) (netip.AddrPort, error) {
-			udpAddr, err := resolveUDPAddr(ctx, "udp", server, option.IPVersion)
-			if err != nil {
-				return netip.AddrPort{}, err
-			}
-			return udpAddr.AddrPort(), nil
-		},
-		Server:                addr,
-		Username:              option.UserName,
-		Password:              option.Password,
-		QUIC:                  option.Quic,
-		QUICCongestionControl: option.CongestionController,
-		QUICCwnd:              option.CWND,
-		HealthCheck:           option.HealthCheck,
-	}
-	echConfig, err := option.ECHOpts.Parse()
-	if err != nil {
-		return nil, err
-	}
-	tlsConfig := &vmess.TLSConfig{
-		Host:              option.SNI,
-		SkipCertVerify:    option.SkipCertVerify,
-		NextProtos:        option.ALPN,
-		FingerPrint:       option.Fingerprint,
-		Certificate:       option.Certificate,
-		PrivateKey:        option.PrivateKey,
-		ClientFingerprint: option.ClientFingerprint,
-		ECH:               echConfig,
-	}
-	if tlsConfig.Host == "" {
-		tlsConfig.Host = option.Server
-	}
-	tOption.TLSConfig = tlsConfig
-
-	client, err := trusttunnel.NewClient(context.TODO(), tOption)
-	if err != nil {
-		return nil, err
-	}
-	outbound.client = client
-
-	return outbound, nil
-}

adapter/outbound/tuic.go

@@ -2,6 +2,8 @@ package outbound
 
 import (
 	"context"
+	"crypto/tls"
+	"errors"
 	"fmt"
 	"math"
 	"net"
@@ -9,24 +11,22 @@ import (
 	"time"
 
 	"github.com/metacubex/mihomo/component/ca"
-	"github.com/metacubex/mihomo/component/ech"
+	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/component/proxydialer"
+	"github.com/metacubex/mihomo/component/resolver"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/transport/tuic"
 
 	"github.com/gofrs/uuid/v5"
 	"github.com/metacubex/quic-go"
-	M "github.com/metacubex/sing/common/metadata"
-	"github.com/metacubex/sing/common/uot"
-	"github.com/metacubex/tls"
+	M "github.com/sagernet/sing/common/metadata"
+	"github.com/sagernet/sing/common/uot"
 )
 
 type Tuic struct {
 	*Base
 	option *TuicOption
 	client *tuic.PoolClient
-
-	tlsConfig *tls.Config
-	echConfig *ech.Config
 }
 
 type TuicOption struct {
@@ -47,27 +47,31 @@ type TuicOption struct {
 	DisableSni            bool     `proxy:"disable-sni,omitempty"`
 	MaxUdpRelayPacketSize int      `proxy:"max-udp-relay-packet-size,omitempty"`
 
-	FastOpen             bool       `proxy:"fast-open,omitempty"`
-	MaxOpenStreams       int        `proxy:"max-open-streams,omitempty"`
-	CWND                 int        `proxy:"cwnd,omitempty"`
-	SkipCertVerify       bool       `proxy:"skip-cert-verify,omitempty"`
-	Fingerprint          string     `proxy:"fingerprint,omitempty"`
-	Certificate          string     `proxy:"certificate,omitempty"`
-	PrivateKey           string     `proxy:"private-key,omitempty"`
-	ReceiveWindowConn    int        `proxy:"recv-window-conn,omitempty"`
-	ReceiveWindow        int        `proxy:"recv-window,omitempty"`
-	DisableMTUDiscovery  bool       `proxy:"disable-mtu-discovery,omitempty"`
-	MaxDatagramFrameSize int        `proxy:"max-datagram-frame-size,omitempty"`
-	SNI                  string     `proxy:"sni,omitempty"`
-	ECHOpts              ECHOptions `proxy:"ech-opts,omitempty"`
+	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"`
+	CustomCAString       string `proxy:"ca-str,omitempty"`
+	ReceiveWindowConn    int    `proxy:"recv-window-conn,omitempty"`
+	ReceiveWindow        int    `proxy:"recv-window,omitempty"`
+	DisableMTUDiscovery  bool   `proxy:"disable-mtu-discovery,omitempty"`
+	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
-func (t *Tuic) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
-	conn, err := t.client.DialContext(ctx, metadata)
+func (t *Tuic) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
+	return t.DialContextWithDialer(ctx, dialer.NewDialer(t.Base.DialOptions(opts...)...), metadata)
+}
+
+// DialContextWithDialer implements C.ProxyAdapter
+func (t *Tuic) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (C.Conn, error) {
+	conn, err := t.client.DialContextWithDialer(ctx, metadata, dialer, t.dialWithDialer)
 	if err != nil {
 		return nil, err
 	}
@@ -75,22 +79,30 @@ func (t *Tuic) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, e
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (t *Tuic) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if err = t.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
-	}
+func (t *Tuic) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
+	return t.ListenPacketWithDialer(ctx, dialer.NewDialer(t.Base.DialOptions(opts...)...), metadata)
+}
 
+// ListenPacketWithDialer implements C.ProxyAdapter
+func (t *Tuic) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
 	if t.option.UDPOverStream {
 		uotDestination := uot.RequestDestination(uint8(t.option.UDPOverStreamVersion))
 		uotMetadata := *metadata
 		uotMetadata.Host = uotDestination.Fqdn
 		uotMetadata.DstPort = uotDestination.Port
-		c, err := t.DialContext(ctx, &uotMetadata)
+		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 {
@@ -99,25 +111,32 @@ func (t *Tuic) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_
 			return newPacketConn(uot.NewLazyConn(c, uot.Request{Destination: destination}), t), nil
 		}
 	}
-	pc, err := t.client.ListenPacket(ctx, metadata)
+	pc, err := t.client.ListenPacketWithDialer(ctx, metadata, dialer, t.dialWithDialer)
 	if err != nil {
 		return nil, err
 	}
 	return newPacketConn(pc, t), nil
 }
 
-func (t *Tuic) dial(ctx context.Context) (transport *quic.Transport, addr net.Addr, err error) {
-	udpAddr, err := resolveUDPAddr(ctx, "udp", t.addr, t.prefer)
-	if err != nil {
-		return nil, nil, err
+// SupportWithDialer implements C.ProxyAdapter
+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) {
+	if len(t.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(t.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, nil, err
+		}
 	}
-	err = t.echConfig.ClientHandle(ctx, t.tlsConfig)
+	udpAddr, err := resolveUDPAddrWithPrefer(ctx, "udp", t.addr, t.prefer)
 	if err != nil {
 		return nil, nil, err
 	}
 	addr = udpAddr
 	var pc net.PacketConn
-	pc, err = t.dialer.ListenPacket(ctx, "udp", "", udpAddr.AddrPort())
+	pc, err = dialer.ListenPacket(ctx, "udp", "", udpAddr.AddrPort())
 	if err != nil {
 		return nil, nil, err
 	}
@@ -127,30 +146,20 @@ func (t *Tuic) dial(ctx context.Context) (transport *quic.Transport, addr net.Ad
 	return
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (t *Tuic) ProxyInfo() C.ProxyInfo {
-	info := t.Base.ProxyInfo()
-	info.DialerProxy = t.option.DialerProxy
-	return info
-}
-
 func NewTuic(option TuicOption) (*Tuic, error) {
 	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
 	serverName := option.Server
+	tlsConfig := &tls.Config{
+		ServerName:         serverName,
+		InsecureSkipVerify: option.SkipCertVerify,
+		MinVersion:         tls.VersionTLS13,
+	}
 	if option.SNI != "" {
-		serverName = option.SNI
+		tlsConfig.ServerName = option.SNI
 	}
 
-	tlsConfig, err := ca.GetTLSConfig(ca.Option{
-		TLSConfig: &tls.Config{
-			ServerName:         serverName,
-			InsecureSkipVerify: option.SkipCertVerify,
-			MinVersion:         tls.VersionTLS13,
-		},
-		Fingerprint: option.Fingerprint,
-		Certificate: option.Certificate,
-		PrivateKey:  option.PrivateKey,
-	})
+	var err error
+	tlsConfig, err = ca.GetTLSConfig(tlsConfig, option.Fingerprint, option.CustomCA, option.CustomCAString)
 	if err != nil {
 		return nil, err
 	}
@@ -232,12 +241,6 @@ func NewTuic(option TuicOption) (*Tuic, error) {
 		tlsConfig.InsecureSkipVerify = true // tls: either ServerName or InsecureSkipVerify must be specified in the tls.Config
 	}
 
-	tlsClientConfig := tlsConfig
-	echConfig, err := option.ECHOpts.Parse()
-	if err != nil {
-		return nil, err
-	}
-
 	switch option.UDPOverStreamVersion {
 	case uot.Version, uot.LegacyVersion:
 	case 0:
@@ -251,18 +254,14 @@ func NewTuic(option TuicOption) (*Tuic, error) {
 			name:   option.Name,
 			addr:   addr,
 			tp:     C.Tuic,
-			pdName: option.ProviderName,
 			udp:    true,
 			tfo:    option.FastOpen,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
+			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
-		option:    &option,
-		tlsConfig: tlsClientConfig,
-		echConfig: echConfig,
+		option: &option,
 	}
-	t.dialer = option.NewDialer(t.DialOptions())
 
 	clientMaxOpenStreams := int64(option.MaxOpenStreams)
 
@@ -278,7 +277,7 @@ func NewTuic(option TuicOption) (*Tuic, error) {
 	if len(option.Token) > 0 {
 		tkn := tuic.GenTKN(option.Token)
 		clientOption := &tuic.ClientOptionV4{
-			TlsConfig:             tlsClientConfig,
+			TlsConfig:             tlsConfig,
 			QuicConfig:            quicConfig,
 			Token:                 tkn,
 			UdpRelayMode:          udpRelayMode,
@@ -291,14 +290,14 @@ func NewTuic(option TuicOption) (*Tuic, error) {
 			CWND:                  option.CWND,
 		}
 
-		t.client = tuic.NewPoolClientV4(clientOption, t.dial)
+		t.client = tuic.NewPoolClientV4(clientOption)
 	} else {
 		maxUdpRelayPacketSize := option.MaxUdpRelayPacketSize
 		if maxUdpRelayPacketSize > tuic.MaxFragSizeV5 {
 			maxUdpRelayPacketSize = tuic.MaxFragSizeV5
 		}
 		clientOption := &tuic.ClientOptionV5{
-			TlsConfig:             tlsClientConfig,
+			TlsConfig:             tlsConfig,
 			QuicConfig:            quicConfig,
 			Uuid:                  uuid.FromStringOrNil(option.UUID),
 			Password:              option.Password,
@@ -310,7 +309,7 @@ func NewTuic(option TuicOption) (*Tuic, error) {
 			CWND:                  option.CWND,
 		}
 
-		t.client = tuic.NewPoolClientV5(clientOption, t.dial)
+		t.client = tuic.NewPoolClientV5(clientOption)
 	}
 
 	return t, nil

adapter/outbound/util.go

@@ -3,71 +3,119 @@ package outbound
 import (
 	"bytes"
 	"context"
+	"crypto/tls"
 	"fmt"
 	"net"
 	"net/netip"
 	"regexp"
 	"strconv"
+	"sync"
 
 	"github.com/metacubex/mihomo/component/resolver"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/transport/socks5"
 )
 
+var (
+	globalClientSessionCache tls.ClientSessionCache
+	once                     sync.Once
+)
+
+func getClientSessionCache() tls.ClientSessionCache {
+	once.Do(func() {
+		globalClientSessionCache = tls.NewLRUClientSessionCache(128)
+	})
+	return globalClientSessionCache
+}
+
 func serializesSocksAddr(metadata *C.Metadata) []byte {
 	var buf [][]byte
 	addrType := metadata.AddrType()
+	aType := uint8(addrType)
 	p := uint(metadata.DstPort)
 	port := []byte{uint8(p >> 8), uint8(p & 0xff)}
 	switch addrType {
-	case C.AtypDomainName:
+	case socks5.AtypDomainName:
 		lenM := uint8(len(metadata.Host))
 		host := []byte(metadata.Host)
-		buf = [][]byte{{socks5.AtypDomainName, lenM}, host, port}
-	case C.AtypIPv4:
+		buf = [][]byte{{aType, lenM}, host, port}
+	case socks5.AtypIPv4:
 		host := metadata.DstIP.AsSlice()
-		buf = [][]byte{{socks5.AtypIPv4}, host, port}
-	case C.AtypIPv6:
+		buf = [][]byte{{aType}, host, port}
+	case socks5.AtypIPv6:
 		host := metadata.DstIP.AsSlice()
-		buf = [][]byte{{socks5.AtypIPv6}, host, port}
+		buf = [][]byte{{aType}, host, port}
 	}
 	return bytes.Join(buf, nil)
 }
 
-func resolveUDPAddr(ctx context.Context, network, address string, prefer C.DNSPrefer) (*net.UDPAddr, error) {
+func resolveUDPAddr(ctx context.Context, network, address string) (*net.UDPAddr, error) {
 	host, port, err := net.SplitHostPort(address)
 	if err != nil {
 		return nil, err
 	}
 
+	ip, err := resolver.ResolveProxyServerHost(ctx, host)
+	if err != nil {
+		return nil, err
+	}
+	return net.ResolveUDPAddr(network, net.JoinHostPort(ip.String(), port))
+}
+
+func resolveUDPAddrWithPrefer(ctx context.Context, network, address string, prefer C.DNSPrefer) (*net.UDPAddr, error) {
+	host, port, err := net.SplitHostPort(address)
+	if err != nil {
+		return nil, err
+	}
 	var ip netip.Addr
+	var fallback netip.Addr
 	switch prefer {
 	case C.IPv4Only:
-		ip, err = resolver.ResolveIPv4WithResolver(ctx, host, resolver.ProxyServerHostResolver)
+		ip, err = resolver.ResolveIPv4ProxyServerHost(ctx, host)
 	case C.IPv6Only:
-		ip, err = resolver.ResolveIPv6WithResolver(ctx, host, resolver.ProxyServerHostResolver)
+		ip, err = resolver.ResolveIPv6ProxyServerHost(ctx, host)
 	case C.IPv6Prefer:
-		ip, err = resolver.ResolveIPPrefer6WithResolver(ctx, host, resolver.ProxyServerHostResolver)
+		var ips []netip.Addr
+		ips, err = resolver.LookupIPProxyServerHost(ctx, host)
+		if err == nil {
+			for _, addr := range ips {
+				if addr.Is6() {
+					ip = addr
+					break
+				} else {
+					if !fallback.IsValid() {
+						fallback = addr
+					}
+				}
+			}
+		}
 	default:
-		ip, err = resolver.ResolveIPWithResolver(ctx, host, resolver.ProxyServerHostResolver)
+		// C.IPv4Prefer, C.DualStack and other
+		var ips []netip.Addr
+		ips, err = resolver.LookupIPProxyServerHost(ctx, host)
+		if err == nil {
+			for _, addr := range ips {
+				if addr.Is4() {
+					ip = addr
+					break
+				} else {
+					if !fallback.IsValid() {
+						fallback = addr
+					}
+				}
+			}
+
+		}
+	}
+
+	if !ip.IsValid() && fallback.IsValid() {
+		ip = fallback
 	}
 
 	if err != nil {
 		return nil, err
 	}
-
-	ip, port = resolver.LookupIP4P(ip, port)
-
-	var uint16Port uint16
-	if port, err := strconv.ParseUint(port, 10, 16); err == nil {
-		uint16Port = uint16(port)
-	} else {
-		return nil, err
-	}
-	// our resolver always unmap before return, so unneeded unmap at here
-	// which is different with net.ResolveUDPAddr maybe return 4in6 address
-	// 4in6 addresses can cause some strange effects on sing-based code
-	return net.UDPAddrFromAddrPort(netip.AddrPortFrom(ip, uint16Port)), nil
+	return net.ResolveUDPAddr(network, net.JoinHostPort(ip.String(), port))
 }
 
 func safeConnClose(c net.Conn, err error) {
@@ -92,25 +140,24 @@ func StringToBps(s string) uint64 {
 	if m == nil {
 		return 0
 	}
-	var n uint64 = 1
+	var n uint64
 	switch m[2] {
-	case "T":
-		n *= 1000
-		fallthrough
-	case "G":
-		n *= 1000
-		fallthrough
-	case "M":
-		n *= 1000
-		fallthrough
 	case "K":
-		n *= 1000
+		n = 1 << 10
+	case "M":
+		n = 1 << 20
+	case "G":
+		n = 1 << 30
+	case "T":
+		n = 1 << 40
+	default:
+		n = 1
 	}
 	v, _ := strconv.ParseUint(m[1], 10, 64)
-	n *= v
+	n = v * n
 	if m[3] == "b" {
 		// Bits, need to convert to bytes
-		n /= 8
+		n = n >> 3
 	}
 	return n
 }

adapter/outbound/vless.go

@@ -2,27 +2,39 @@ package outbound
 
 import (
 	"context"
+	"crypto/tls"
+	"encoding/binary"
+	"errors"
 	"fmt"
+	"io"
 	"net"
+	"net/http"
 	"strconv"
+	"sync"
 
 	"github.com/metacubex/mihomo/common/convert"
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/common/utils"
 	"github.com/metacubex/mihomo/component/ca"
-	"github.com/metacubex/mihomo/component/ech"
+	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/component/proxydialer"
+	"github.com/metacubex/mihomo/component/resolver"
 	tlsC "github.com/metacubex/mihomo/component/tls"
 	C "github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/transport/gun"
+	"github.com/metacubex/mihomo/transport/socks5"
 	"github.com/metacubex/mihomo/transport/vless"
-	"github.com/metacubex/mihomo/transport/vless/encryption"
 	"github.com/metacubex/mihomo/transport/vmess"
 
-	"github.com/metacubex/http"
 	vmessSing "github.com/metacubex/sing-vmess"
 	"github.com/metacubex/sing-vmess/packetaddr"
-	M "github.com/metacubex/sing/common/metadata"
-	"github.com/metacubex/tls"
+	M "github.com/sagernet/sing/common/metadata"
+)
+
+const (
+	// max packet length
+	maxLength = 1024 << 3
 )
 
 type Vless struct {
@@ -30,14 +42,12 @@ type Vless struct {
 	client *vless.Client
 	option *VlessOption
 
-	encryption *encryption.ClientInstance
-
 	// for gun mux
+	gunTLSConfig *tls.Config
 	gunConfig    *gun.Config
-	gunTransport *gun.TransportWrap
+	transport    *gun.TransportWrap
 
 	realityConfig *tlsC.RealityConfig
-	echConfig     *ech.Config
 }
 
 type VlessOption struct {
@@ -53,24 +63,27 @@ type VlessOption struct {
 	PacketAddr        bool              `proxy:"packet-addr,omitempty"`
 	XUDP              bool              `proxy:"xudp,omitempty"`
 	PacketEncoding    string            `proxy:"packet-encoding,omitempty"`
-	Encryption        string            `proxy:"encryption,omitempty"`
 	Network           string            `proxy:"network,omitempty"`
-	ECHOpts           ECHOptions        `proxy:"ech-opts,omitempty"`
 	RealityOpts       RealityOptions    `proxy:"reality-opts,omitempty"`
 	HTTPOpts          HTTPOptions       `proxy:"http-opts,omitempty"`
 	HTTP2Opts         HTTP2Options      `proxy:"h2-opts,omitempty"`
 	GrpcOpts          GrpcOptions       `proxy:"grpc-opts,omitempty"`
 	WSOpts            WSOptions         `proxy:"ws-opts,omitempty"`
+	WSPath            string            `proxy:"ws-path,omitempty"`
 	WSHeaders         map[string]string `proxy:"ws-headers,omitempty"`
 	SkipCertVerify    bool              `proxy:"skip-cert-verify,omitempty"`
 	Fingerprint       string            `proxy:"fingerprint,omitempty"`
-	Certificate       string            `proxy:"certificate,omitempty"`
-	PrivateKey        string            `proxy:"private-key,omitempty"`
 	ServerName        string            `proxy:"servername,omitempty"`
 	ClientFingerprint string            `proxy:"client-fingerprint,omitempty"`
 }
 
-func (v *Vless) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ net.Conn, err error) {
+func (v *Vless) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+	var err error
+
+	if tlsC.HaveGlobalFingerprint() && len(v.option.ClientFingerprint) == 0 {
+		v.option.ClientFingerprint = tlsC.GetGlobalFingerprint()
+	}
+
 	switch v.option.Network {
 	case "ws":
 		host, port, _ := net.SplitHostPort(v.addr)
@@ -83,7 +96,6 @@ func (v *Vless) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			V2rayHttpUpgrade:         v.option.WSOpts.V2rayHttpUpgrade,
 			V2rayHttpUpgradeFastOpen: v.option.WSOpts.V2rayHttpUpgradeFastOpen,
 			ClientFingerprint:        v.option.ClientFingerprint,
-			ECHConfig:                v.echConfig,
 			Headers:                  http.Header{},
 		}
 
@@ -94,17 +106,14 @@ func (v *Vless) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 		}
 		if v.option.TLS {
 			wsOpts.TLS = true
-			wsOpts.TLSConfig, err = ca.GetTLSConfig(ca.Option{
-				TLSConfig: &tls.Config{
-					MinVersion:         tls.VersionTLS12,
-					ServerName:         host,
-					InsecureSkipVerify: v.option.SkipCertVerify,
-					NextProtos:         []string{"http/1.1"},
-				},
-				Fingerprint: v.option.Fingerprint,
-				Certificate: v.option.Certificate,
-				PrivateKey:  v.option.PrivateKey,
-			})
+			tlsConfig := &tls.Config{
+				MinVersion:         tls.VersionTLS12,
+				ServerName:         host,
+				InsecureSkipVerify: v.option.SkipCertVerify,
+				NextProtos:         []string{"http/1.1"},
+			}
+
+			wsOpts.TLSConfig, err = ca.GetSpecifiedFingerprintTLSConfig(tlsConfig, v.option.Fingerprint)
 			if err != nil {
 				return nil, err
 			}
@@ -148,9 +157,9 @@ func (v *Vless) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			Path:  v.option.HTTP2Opts.Path,
 		}
 
-		c, err = vmess.StreamH2Conn(ctx, c, h2Opts)
+		c, err = vmess.StreamH2Conn(c, h2Opts)
 	case "grpc":
-		break // already handle in gun transport
+		c, err = gun.StreamGunWithConn(c, v.gunTLSConfig, v.gunConfig, v.realityConfig)
 	default:
 		// default tcp network
 		// handle TLS
@@ -161,20 +170,10 @@ func (v *Vless) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 		return nil, err
 	}
 
-	return v.streamConnContext(ctx, c, metadata)
+	return v.streamConn(c, metadata)
 }
 
-func (v *Vless) streamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (conn net.Conn, err error) {
-	if ctx.Done() != nil {
-		done := N.SetupContextForConn(ctx, c)
-		defer done(&err)
-	}
-	if v.encryption != nil {
-		c, err = v.encryption.Handshake(c)
-		if err != nil {
-			return
-		}
-	}
+func (v *Vless) streamConn(c net.Conn, metadata *C.Metadata) (conn net.Conn, err error) {
 	if metadata.NetWork == C.UDP {
 		if v.option.PacketAddr {
 			metadata = &C.Metadata{
@@ -190,6 +189,9 @@ func (v *Vless) streamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			}
 		}
 		conn, err = v.client.StreamConn(c, parseVlessAddr(metadata, v.option.XUDP))
+		if v.option.PacketAddr {
+			conn = packetaddr.NewBindConn(conn)
+		}
 	} else {
 		conn, err = v.client.StreamConn(c, parseVlessAddr(metadata, false))
 	}
@@ -207,10 +209,7 @@ func (v *Vless) streamTLSConn(ctx context.Context, conn net.Conn, isH2 bool) (ne
 			Host:              host,
 			SkipCertVerify:    v.option.SkipCertVerify,
 			FingerPrint:       v.option.Fingerprint,
-			Certificate:       v.option.Certificate,
-			PrivateKey:        v.option.PrivateKey,
 			ClientFingerprint: v.option.ClientFingerprint,
-			ECH:               v.echConfig,
 			Reality:           v.realityConfig,
 			NextProtos:        v.option.ALPN,
 		}
@@ -230,17 +229,40 @@ func (v *Vless) streamTLSConn(ctx context.Context, conn net.Conn, isH2 bool) (ne
 }
 
 // DialContext implements C.ProxyAdapter
-func (v *Vless) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	var c net.Conn
+func (v *Vless) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
 	// gun transport
-	if v.gunTransport != nil {
-		c, err = gun.StreamGunWithTransport(v.gunTransport, v.gunConfig)
-	} else {
-		c, err = v.dialer.DialContext(ctx, "tcp", v.addr)
+	if v.transport != nil && len(opts) == 0 {
+		c, err := gun.StreamGunWithTransport(v.transport, v.gunConfig)
+		if err != nil {
+			return nil, err
+		}
+		defer func(c net.Conn) {
+			safeConnClose(c, err)
+		}(c)
+
+		c, err = v.client.StreamConn(c, parseVlessAddr(metadata, v.option.XUDP))
+		if err != nil {
+			return nil, err
+		}
+
+		return NewConn(c, v), nil
 	}
+	return v.DialContextWithDialer(ctx, dialer.NewDialer(v.Base.DialOptions(opts...)...), metadata)
+}
+
+// DialContextWithDialer implements C.ProxyAdapter
+func (v *Vless) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
+	if len(v.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(v.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
+	}
+	c, err := dialer.DialContext(ctx, "tcp", v.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 	}
+	N.TCPKeepAlive(c)
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
 	}(c)
@@ -253,20 +275,59 @@ func (v *Vless) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (v *Vless) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if err = v.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
+func (v *Vless) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
+	// vless use stream-oriented udp with a special address, so we need a net.UDPAddr
+	if !metadata.Resolved() {
+		ip, err := resolver.ResolveIP(ctx, metadata.Host)
+		if err != nil {
+			return nil, errors.New("can't resolve ip")
+		}
+		metadata.DstIP = ip
 	}
 	var c net.Conn
 	// gun transport
-	if v.gunTransport != nil {
-		c, err = gun.StreamGunWithTransport(v.gunTransport, v.gunConfig)
-	} else {
-		c, err = v.dialer.DialContext(ctx, "tcp", v.addr)
+	if v.transport != nil && len(opts) == 0 {
+		c, err = gun.StreamGunWithTransport(v.transport, v.gunConfig)
+		if err != nil {
+			return nil, err
+		}
+		defer func(c net.Conn) {
+			safeConnClose(c, err)
+		}(c)
+
+		c, err = v.streamConn(c, metadata)
+		if err != nil {
+			return nil, fmt.Errorf("new vless client error: %v", err)
+		}
+
+		return v.ListenPacketOnStreamConn(ctx, c, metadata)
 	}
+	return v.ListenPacketWithDialer(ctx, dialer.NewDialer(v.Base.DialOptions(opts...)...), metadata)
+}
+
+// ListenPacketWithDialer implements C.ProxyAdapter
+func (v *Vless) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
+	if len(v.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(v.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// vless use stream-oriented udp with a special address, so we need a net.UDPAddr
+	if !metadata.Resolved() {
+		ip, err := resolver.ResolveIP(ctx, metadata.Host)
+		if err != nil {
+			return nil, errors.New("can't resolve ip")
+		}
+		metadata.DstIP = ip
+	}
+
+	c, err := dialer.DialContext(ctx, "tcp", v.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 	}
+	N.TCPKeepAlive(c)
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
 	}(c)
@@ -279,10 +340,20 @@ func (v *Vless) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (
 	return v.ListenPacketOnStreamConn(ctx, c, metadata)
 }
 
+// SupportWithDialer implements C.ProxyAdapter
+func (v *Vless) SupportWithDialer() C.NetWork {
+	return C.ALLNet
+}
+
 // ListenPacketOnStreamConn implements C.ProxyAdapter
 func (v *Vless) ListenPacketOnStreamConn(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if err = v.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
+	// vless use stream-oriented udp with a special address, so we need a net.UDPAddr
+	if !metadata.Resolved() {
+		ip, err := resolver.ResolveIP(ctx, metadata.Host)
+		if err != nil {
+			return nil, errors.New("can't resolve ip")
+		}
+		metadata.DstIP = ip
 	}
 
 	if v.option.XUDP {
@@ -297,11 +368,12 @@ func (v *Vless) ListenPacketOnStreamConn(ctx context.Context, c net.Conn, metada
 		), v), nil
 	} else if v.option.PacketAddr {
 		return newPacketConn(N.NewThreadSafePacketConn(
-			packetaddr.NewConn(v.client.PacketConn(c, metadata.UDPAddr()),
-				M.SocksaddrFromNet(metadata.UDPAddr())),
+			packetaddr.NewConn(&vlessPacketConn{
+				Conn: c, rAddr: metadata.UDPAddr(),
+			}, M.SocksaddrFromNet(metadata.UDPAddr())),
 		), v), nil
 	}
-	return newPacketConn(N.NewThreadSafePacketConn(v.client.PacketConn(c, metadata.UDPAddr())), v), nil
+	return newPacketConn(&vlessPacketConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil
 }
 
 // SupportUOT implements C.ProxyAdapter
@@ -309,34 +381,19 @@ func (v *Vless) SupportUOT() bool {
 	return true
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (v *Vless) ProxyInfo() C.ProxyInfo {
-	info := v.Base.ProxyInfo()
-	info.DialerProxy = v.option.DialerProxy
-	return info
-}
-
-// Close implements C.ProxyAdapter
-func (v *Vless) Close() error {
-	if v.gunTransport != nil {
-		return v.gunTransport.Close()
-	}
-	return nil
-}
-
 func parseVlessAddr(metadata *C.Metadata, xudp bool) *vless.DstAddr {
 	var addrType byte
 	var addr []byte
 	switch metadata.AddrType() {
-	case C.AtypIPv4:
+	case socks5.AtypIPv4:
 		addrType = vless.AtypIPv4
 		addr = make([]byte, net.IPv4len)
 		copy(addr[:], metadata.DstIP.AsSlice())
-	case C.AtypIPv6:
+	case socks5.AtypIPv6:
 		addrType = vless.AtypIPv6
 		addr = make([]byte, net.IPv6len)
 		copy(addr[:], metadata.DstIP.AsSlice())
-	case C.AtypDomainName:
+	case socks5.AtypDomainName:
 		addrType = vless.AtypDomainName
 		addr = make([]byte, len(metadata.Host)+1)
 		addr[0] = byte(len(metadata.Host))
@@ -352,16 +409,113 @@ func parseVlessAddr(metadata *C.Metadata, xudp bool) *vless.DstAddr {
 	}
 }
 
+type vlessPacketConn struct {
+	net.Conn
+	rAddr  net.Addr
+	remain int
+	mux    sync.Mutex
+	cache  [2]byte
+}
+
+func (c *vlessPacketConn) writePacket(payload []byte) (int, error) {
+	binary.BigEndian.PutUint16(c.cache[:], uint16(len(payload)))
+
+	if _, err := c.Conn.Write(c.cache[:]); err != nil {
+		return 0, err
+	}
+
+	return c.Conn.Write(payload)
+}
+
+func (c *vlessPacketConn) WriteTo(b []byte, addr net.Addr) (int, error) {
+	total := len(b)
+	if total == 0 {
+		return 0, nil
+	}
+
+	if total <= maxLength {
+		return c.writePacket(b)
+	}
+
+	offset := 0
+
+	for offset < total {
+		cursor := offset + maxLength
+		if cursor > total {
+			cursor = total
+		}
+
+		n, err := c.writePacket(b[offset:cursor])
+		if err != nil {
+			return offset + n, err
+		}
+
+		offset = cursor
+		if offset == total {
+			break
+		}
+	}
+
+	return total, nil
+}
+
+func (c *vlessPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
+	c.mux.Lock()
+	defer c.mux.Unlock()
+
+	if c.remain > 0 {
+		length := len(b)
+		if c.remain < length {
+			length = c.remain
+		}
+
+		n, err := c.Conn.Read(b[:length])
+		if err != nil {
+			return 0, c.rAddr, err
+		}
+
+		c.remain -= n
+		return n, c.rAddr, nil
+	}
+
+	if _, err := c.Conn.Read(b[:2]); err != nil {
+		return 0, c.rAddr, err
+	}
+
+	total := int(binary.BigEndian.Uint16(b[:2]))
+	if total == 0 {
+		return 0, c.rAddr, nil
+	}
+
+	length := len(b)
+	if length > total {
+		length = total
+	}
+
+	if _, err := io.ReadFull(c.Conn, b[:length]); err != nil {
+		return 0, c.rAddr, errors.New("read packet error")
+	}
+
+	c.remain = total - length
+
+	return length, c.rAddr, nil
+}
+
 func NewVless(option VlessOption) (*Vless, error) {
 	var addons *vless.Addons
-	if len(option.Flow) >= 16 {
+	if option.Network != "ws" && len(option.Flow) >= 16 {
 		option.Flow = option.Flow[:16]
-		if option.Flow != vless.XRV {
+		switch option.Flow {
+		case vless.XRV:
+			log.Warnln("To use %s, ensure your server is upgrade to Xray-core v1.8.0+", vless.XRV)
+			addons = &vless.Addons{
+				Flow: option.Flow,
+			}
+		case vless.XRO, vless.XRD, vless.XRS:
+			log.Fatalln("Legacy XTLS protocol %s is deprecated and no longer supported", option.Flow)
+		default:
 			return nil, fmt.Errorf("unsupported xtls flow type: %s", option.Flow)
 		}
-		addons = &vless.Addons{
-			Flow: option.Flow,
-		}
 	}
 
 	switch option.PacketEncoding {
@@ -387,79 +541,70 @@ func NewVless(option VlessOption) (*Vless, error) {
 			name:   option.Name,
 			addr:   net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
 			tp:     C.Vless,
-			pdName: option.ProviderName,
 			udp:    option.UDP,
 			xudp:   option.XUDP,
 			tfo:    option.TFO,
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
+			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		client: client,
 		option: &option,
 	}
-	v.dialer = option.NewDialer(v.DialOptions())
-
-	v.encryption, err = encryption.NewClient(option.Encryption)
-	if err != nil {
-		return nil, err
-	}
 
 	v.realityConfig, err = v.option.RealityOpts.Parse()
 	if err != nil {
 		return nil, err
 	}
 
-	v.echConfig, err = v.option.ECHOpts.Parse()
-	if err != nil {
-		return nil, err
-	}
-
 	switch option.Network {
 	case "h2":
 		if len(option.HTTP2Opts.Host) == 0 {
 			option.HTTP2Opts.Host = append(option.HTTP2Opts.Host, "www.example.com")
 		}
 	case "grpc":
-		dialFn := func(ctx context.Context, network, addr string) (net.Conn, error) {
-			c, err := v.dialer.DialContext(ctx, "tcp", v.addr)
+		dialFn := func(network, addr string) (net.Conn, error) {
+			var err error
+			var cDialer C.Dialer = dialer.NewDialer(v.Base.DialOptions()...)
+			if len(v.option.DialerProxy) > 0 {
+				cDialer, err = proxydialer.NewByName(v.option.DialerProxy, cDialer)
+				if err != nil {
+					return nil, err
+				}
+			}
+			c, err := cDialer.DialContext(context.Background(), "tcp", v.addr)
 			if err != nil {
 				return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 			}
+			N.TCPKeepAlive(c)
 			return c, nil
 		}
 
 		gunConfig := &gun.Config{
-			ServiceName: option.GrpcOpts.GrpcServiceName,
-			UserAgent:   option.GrpcOpts.GrpcUserAgent,
-			Host:        option.ServerName,
+			ServiceName:       v.option.GrpcOpts.GrpcServiceName,
+			Host:              v.option.ServerName,
+			ClientFingerprint: v.option.ClientFingerprint,
 		}
 		if option.ServerName == "" {
 			gunConfig.Host = v.addr
 		}
-		var tlsConfig *vmess.TLSConfig
+		var tlsConfig *tls.Config
 		if option.TLS {
-			tlsConfig = &vmess.TLSConfig{
-				Host:              option.ServerName,
-				SkipCertVerify:    option.SkipCertVerify,
-				FingerPrint:       option.Fingerprint,
-				Certificate:       option.Certificate,
-				PrivateKey:        option.PrivateKey,
-				ClientFingerprint: option.ClientFingerprint,
-				NextProtos:        []string{"h2"},
-				ECH:               v.echConfig,
-				Reality:           v.realityConfig,
-			}
+			tlsConfig = ca.GetGlobalTLSConfig(&tls.Config{
+				InsecureSkipVerify: v.option.SkipCertVerify,
+				ServerName:         v.option.ServerName,
+			})
 			if option.ServerName == "" {
 				host, _, _ := net.SplitHostPort(v.addr)
-				tlsConfig.Host = host
+				tlsConfig.ServerName = host
 			}
 		}
 
+		v.gunTLSConfig = tlsConfig
 		v.gunConfig = gunConfig
 
-		v.gunTransport = gun.NewHTTP2Client(dialFn, tlsConfig)
+		v.transport = gun.NewHTTP2Client(dialFn, tlsConfig, v.option.ClientFingerprint, v.realityConfig)
 	}
 
 	return v, nil

adapter/outbound/vmess.go

@@ -2,9 +2,11 @@ package outbound
 
 import (
 	"context"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"net"
+	"net/http"
 	"strconv"
 	"strings"
 	"sync"
@@ -12,18 +14,18 @@ import (
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/common/utils"
 	"github.com/metacubex/mihomo/component/ca"
-	"github.com/metacubex/mihomo/component/ech"
+	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/component/proxydialer"
+	"github.com/metacubex/mihomo/component/resolver"
 	tlsC "github.com/metacubex/mihomo/component/tls"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/ntp"
 	"github.com/metacubex/mihomo/transport/gun"
 	mihomoVMess "github.com/metacubex/mihomo/transport/vmess"
 
-	"github.com/metacubex/http"
 	vmess "github.com/metacubex/sing-vmess"
 	"github.com/metacubex/sing-vmess/packetaddr"
-	M "github.com/metacubex/sing/common/metadata"
-	"github.com/metacubex/tls"
+	M "github.com/sagernet/sing/common/metadata"
 )
 
 var ErrUDPRemoteAddrMismatch = errors.New("udp packet dropped due to mismatched remote address")
@@ -34,11 +36,11 @@ type Vmess struct {
 	option *VmessOption
 
 	// for gun mux
+	gunTLSConfig *tls.Config
 	gunConfig    *gun.Config
-	gunTransport *gun.TransportWrap
+	transport    *gun.TransportWrap
 
 	realityConfig *tlsC.RealityConfig
-	echConfig     *ech.Config
 }
 
 type VmessOption struct {
@@ -55,10 +57,7 @@ type VmessOption struct {
 	ALPN                []string       `proxy:"alpn,omitempty"`
 	SkipCertVerify      bool           `proxy:"skip-cert-verify,omitempty"`
 	Fingerprint         string         `proxy:"fingerprint,omitempty"`
-	Certificate         string         `proxy:"certificate,omitempty"`
-	PrivateKey          string         `proxy:"private-key,omitempty"`
 	ServerName          string         `proxy:"servername,omitempty"`
-	ECHOpts             ECHOptions     `proxy:"ech-opts,omitempty"`
 	RealityOpts         RealityOptions `proxy:"reality-opts,omitempty"`
 	HTTPOpts            HTTPOptions    `proxy:"http-opts,omitempty"`
 	HTTP2Opts           HTTP2Options   `proxy:"h2-opts,omitempty"`
@@ -85,7 +84,6 @@ type HTTP2Options struct {
 
 type GrpcOptions struct {
 	GrpcServiceName string `proxy:"grpc-service-name,omitempty"`
-	GrpcUserAgent   string `proxy:"grpc-user-agent,omitempty"`
 }
 
 type WSOptions struct {
@@ -97,7 +95,14 @@ type WSOptions struct {
 	V2rayHttpUpgradeFastOpen bool              `proxy:"v2ray-http-upgrade-fast-open,omitempty"`
 }
 
-func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ net.Conn, err error) {
+// StreamConnContext implements C.ProxyAdapter
+func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+	var err error
+
+	if tlsC.HaveGlobalFingerprint() && (len(v.option.ClientFingerprint) == 0) {
+		v.option.ClientFingerprint = tlsC.GetGlobalFingerprint()
+	}
+
 	switch v.option.Network {
 	case "ws":
 		host, port, _ := net.SplitHostPort(v.addr)
@@ -110,7 +115,6 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			V2rayHttpUpgrade:         v.option.WSOpts.V2rayHttpUpgrade,
 			V2rayHttpUpgradeFastOpen: v.option.WSOpts.V2rayHttpUpgradeFastOpen,
 			ClientFingerprint:        v.option.ClientFingerprint,
-			ECHConfig:                v.echConfig,
 			Headers:                  http.Header{},
 		}
 
@@ -122,16 +126,13 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 
 		if v.option.TLS {
 			wsOpts.TLS = true
-			wsOpts.TLSConfig, err = ca.GetTLSConfig(ca.Option{
-				TLSConfig: &tls.Config{
-					ServerName:         host,
-					InsecureSkipVerify: v.option.SkipCertVerify,
-					NextProtos:         []string{"http/1.1"},
-				},
-				Fingerprint: v.option.Fingerprint,
-				Certificate: v.option.Certificate,
-				PrivateKey:  v.option.PrivateKey,
-			})
+			tlsConfig := &tls.Config{
+				ServerName:         host,
+				InsecureSkipVerify: v.option.SkipCertVerify,
+				NextProtos:         []string{"http/1.1"},
+			}
+
+			wsOpts.TLSConfig, err = ca.GetSpecifiedFingerprintTLSConfig(tlsConfig, v.option.Fingerprint)
 			if err != nil {
 				return nil, err
 			}
@@ -151,7 +152,6 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 				Host:              host,
 				SkipCertVerify:    v.option.SkipCertVerify,
 				ClientFingerprint: v.option.ClientFingerprint,
-				ECH:               v.echConfig,
 				Reality:           v.realityConfig,
 				NextProtos:        v.option.ALPN,
 			}
@@ -179,9 +179,6 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 		tlsOpts := mihomoVMess.TLSConfig{
 			Host:              host,
 			SkipCertVerify:    v.option.SkipCertVerify,
-			FingerPrint:       v.option.Fingerprint,
-			Certificate:       v.option.Certificate,
-			PrivateKey:        v.option.PrivateKey,
 			NextProtos:        []string{"h2"},
 			ClientFingerprint: v.option.ClientFingerprint,
 			Reality:           v.realityConfig,
@@ -201,9 +198,9 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			Path:  v.option.HTTP2Opts.Path,
 		}
 
-		c, err = mihomoVMess.StreamH2Conn(ctx, c, h2Opts)
+		c, err = mihomoVMess.StreamH2Conn(c, h2Opts)
 	case "grpc":
-		break // already handle in gun transport
+		c, err = gun.StreamGunWithConn(c, v.gunTLSConfig, v.gunConfig, v.realityConfig)
 	default:
 		// handle TLS
 		if v.option.TLS {
@@ -211,11 +208,7 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			tlsOpts := &mihomoVMess.TLSConfig{
 				Host:              host,
 				SkipCertVerify:    v.option.SkipCertVerify,
-				FingerPrint:       v.option.Fingerprint,
-				Certificate:       v.option.Certificate,
-				PrivateKey:        v.option.PrivateKey,
 				ClientFingerprint: v.option.ClientFingerprint,
-				ECH:               v.echConfig,
 				Reality:           v.realityConfig,
 				NextProtos:        v.option.ALPN,
 			}
@@ -231,24 +224,17 @@ func (v *Vmess) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 	if err != nil {
 		return nil, err
 	}
-	return v.streamConnContext(ctx, c, metadata)
+	return v.streamConn(c, metadata)
 }
 
-func (v *Vmess) streamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (conn net.Conn, err error) {
-	useEarly := N.NeedHandshake(c)
-	if !useEarly {
-		if ctx.Done() != nil {
-			done := N.SetupContextForConn(ctx, c)
-			defer done(&err)
-		}
-	}
+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 useEarly {
+			if N.NeedHandshake(c) {
 				conn = v.client.DialEarlyXUDPPacketConn(c,
 					globalID,
 					M.SocksaddrFromNet(metadata.UDPAddr()))
@@ -258,7 +244,7 @@ func (v *Vmess) streamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 					M.SocksaddrFromNet(metadata.UDPAddr()))
 			}
 		} else if v.option.PacketAddr {
-			if useEarly {
+			if N.NeedHandshake(c) {
 				conn = v.client.DialEarlyPacketConn(c,
 					M.ParseSocksaddrHostPort(packetaddr.SeqPacketMagicAddress, 443))
 			} else {
@@ -267,7 +253,7 @@ func (v *Vmess) streamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			}
 			conn = packetaddr.NewBindConn(conn)
 		} else {
-			if useEarly {
+			if N.NeedHandshake(c) {
 				conn = v.client.DialEarlyPacketConn(c,
 					M.SocksaddrFromNet(metadata.UDPAddr()))
 			} else {
@@ -276,7 +262,7 @@ func (v *Vmess) streamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 			}
 		}
 	} else {
-		if useEarly {
+		if N.NeedHandshake(c) {
 			conn = v.client.DialEarlyConn(c,
 				M.ParseSocksaddrHostPort(metadata.String(), metadata.DstPort))
 		} else {
@@ -291,17 +277,40 @@ func (v *Vmess) streamConnContext(ctx context.Context, c net.Conn, metadata *C.M
 }
 
 // DialContext implements C.ProxyAdapter
-func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
-	var c net.Conn
+func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
 	// gun transport
-	if v.gunTransport != nil {
-		c, err = gun.StreamGunWithTransport(v.gunTransport, v.gunConfig)
-	} else {
-		c, err = v.dialer.DialContext(ctx, "tcp", v.addr)
+	if v.transport != nil && len(opts) == 0 {
+		c, err := gun.StreamGunWithTransport(v.transport, v.gunConfig)
+		if err != nil {
+			return nil, err
+		}
+		defer func(c net.Conn) {
+			safeConnClose(c, err)
+		}(c)
+
+		c, err = v.client.DialConn(c, M.ParseSocksaddrHostPort(metadata.String(), metadata.DstPort))
+		if err != nil {
+			return nil, err
+		}
+
+		return NewConn(c, v), nil
 	}
+	return v.DialContextWithDialer(ctx, dialer.NewDialer(v.Base.DialOptions(opts...)...), metadata)
+}
+
+// DialContextWithDialer implements C.ProxyAdapter
+func (v *Vmess) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
+	if len(v.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(v.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
+	}
+	c, err := dialer.DialContext(ctx, "tcp", v.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 	}
+	N.TCPKeepAlive(c)
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
 	}(c)
@@ -311,20 +320,58 @@ func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (v *Vmess) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if err = v.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
+func (v *Vmess) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
+	// vmess use stream-oriented udp with a special address, so we need a net.UDPAddr
+	if !metadata.Resolved() {
+		ip, err := resolver.ResolveIP(ctx, metadata.Host)
+		if err != nil {
+			return nil, errors.New("can't resolve ip")
+		}
+		metadata.DstIP = ip
 	}
 	var c net.Conn
 	// gun transport
-	if v.gunTransport != nil {
-		c, err = gun.StreamGunWithTransport(v.gunTransport, v.gunConfig)
-	} else {
-		c, err = v.dialer.DialContext(ctx, "tcp", v.addr)
+	if v.transport != nil && len(opts) == 0 {
+		c, err = gun.StreamGunWithTransport(v.transport, v.gunConfig)
+		if err != nil {
+			return nil, err
+		}
+		defer func(c net.Conn) {
+			safeConnClose(c, err)
+		}(c)
+
+		c, err = v.streamConn(c, metadata)
+		if err != nil {
+			return nil, fmt.Errorf("new vmess client error: %v", err)
+		}
+		return v.ListenPacketOnStreamConn(ctx, c, metadata)
 	}
+	return v.ListenPacketWithDialer(ctx, dialer.NewDialer(v.Base.DialOptions(opts...)...), metadata)
+}
+
+// ListenPacketWithDialer implements C.ProxyAdapter
+func (v *Vmess) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
+	if len(v.option.DialerProxy) > 0 {
+		dialer, err = proxydialer.NewByName(v.option.DialerProxy, dialer)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// vmess use stream-oriented udp with a special address, so we need a net.UDPAddr
+	if !metadata.Resolved() {
+		ip, err := resolver.ResolveIP(ctx, metadata.Host)
+		if err != nil {
+			return nil, errors.New("can't resolve ip")
+		}
+		metadata.DstIP = ip
+	}
+
+	c, err := dialer.DialContext(ctx, "tcp", v.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 	}
+	N.TCPKeepAlive(c)
 	defer func(c net.Conn) {
 		safeConnClose(c, err)
 	}(c)
@@ -336,25 +383,20 @@ func (v *Vmess) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (
 	return v.ListenPacketOnStreamConn(ctx, c, metadata)
 }
 
-// ProxyInfo implements C.ProxyAdapter
-func (v *Vmess) ProxyInfo() C.ProxyInfo {
-	info := v.Base.ProxyInfo()
-	info.DialerProxy = v.option.DialerProxy
-	return info
-}
-
-// Close implements C.ProxyAdapter
-func (v *Vmess) Close() error {
-	if v.gunTransport != nil {
-		return v.gunTransport.Close()
-	}
-	return nil
+// SupportWithDialer implements C.ProxyAdapter
+func (v *Vmess) SupportWithDialer() C.NetWork {
+	return C.ALLNet
 }
 
 // ListenPacketOnStreamConn implements C.ProxyAdapter
 func (v *Vmess) ListenPacketOnStreamConn(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if err = v.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
+	// vmess use stream-oriented udp with a special address, so we need a net.UDPAddr
+	if !metadata.Resolved() {
+		ip, err := resolver.ResolveIP(ctx, metadata.Host)
+		if err != nil {
+			return nil, errors.New("can't resolve ip")
+		}
+		metadata.DstIP = ip
 	}
 
 	if pc, ok := c.(net.PacketConn); ok {
@@ -398,29 +440,17 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 			name:   option.Name,
 			addr:   net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
 			tp:     C.Vmess,
-			pdName: option.ProviderName,
 			udp:    option.UDP,
 			xudp:   option.XUDP,
 			tfo:    option.TFO,
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
+			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		client: client,
 		option: &option,
 	}
-	v.dialer = option.NewDialer(v.DialOptions())
-
-	v.realityConfig, err = v.option.RealityOpts.Parse()
-	if err != nil {
-		return nil, err
-	}
-
-	v.echConfig, err = v.option.ECHOpts.Parse()
-	if err != nil {
-		return nil, err
-	}
 
 	switch option.Network {
 	case "h2":
@@ -428,44 +458,52 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 			option.HTTP2Opts.Host = append(option.HTTP2Opts.Host, "www.example.com")
 		}
 	case "grpc":
-		dialFn := func(ctx context.Context, network, addr string) (net.Conn, error) {
-			c, err := v.dialer.DialContext(ctx, "tcp", v.addr)
+		dialFn := func(network, addr string) (net.Conn, error) {
+			var err error
+			var cDialer C.Dialer = dialer.NewDialer(v.Base.DialOptions()...)
+			if len(v.option.DialerProxy) > 0 {
+				cDialer, err = proxydialer.NewByName(v.option.DialerProxy, cDialer)
+				if err != nil {
+					return nil, err
+				}
+			}
+			c, err := cDialer.DialContext(context.Background(), "tcp", v.addr)
 			if err != nil {
 				return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 			}
+			N.TCPKeepAlive(c)
 			return c, nil
 		}
 
 		gunConfig := &gun.Config{
-			ServiceName: option.GrpcOpts.GrpcServiceName,
-			UserAgent:   option.GrpcOpts.GrpcUserAgent,
-			Host:        option.ServerName,
+			ServiceName:       v.option.GrpcOpts.GrpcServiceName,
+			Host:              v.option.ServerName,
+			ClientFingerprint: v.option.ClientFingerprint,
 		}
 		if option.ServerName == "" {
 			gunConfig.Host = v.addr
 		}
-		var tlsConfig *mihomoVMess.TLSConfig
+		var tlsConfig *tls.Config
 		if option.TLS {
-			tlsConfig = &mihomoVMess.TLSConfig{
-				Host:              option.ServerName,
-				SkipCertVerify:    option.SkipCertVerify,
-				FingerPrint:       option.Fingerprint,
-				Certificate:       option.Certificate,
-				PrivateKey:        option.PrivateKey,
-				ClientFingerprint: option.ClientFingerprint,
-				NextProtos:        []string{"h2"},
-				ECH:               v.echConfig,
-				Reality:           v.realityConfig,
-			}
+			tlsConfig = ca.GetGlobalTLSConfig(&tls.Config{
+				InsecureSkipVerify: v.option.SkipCertVerify,
+				ServerName:         v.option.ServerName,
+			})
 			if option.ServerName == "" {
 				host, _, _ := net.SplitHostPort(v.addr)
-				tlsConfig.Host = host
+				tlsConfig.ServerName = host
 			}
 		}
 
+		v.gunTLSConfig = tlsConfig
 		v.gunConfig = gunConfig
 
-		v.gunTransport = gun.NewHTTP2Client(dialFn, tlsConfig)
+		v.transport = gun.NewHTTP2Client(dialFn, tlsConfig, v.option.ClientFingerprint, v.realityConfig)
+	}
+
+	v.realityConfig, err = v.option.RealityOpts.Parse()
+	if err != nil {
+		return nil, err
 	}
 
 	return v, nil

adapter/outbound/wireguard.go

@@ -4,110 +4,71 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"net"
 	"net/netip"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync"
-	"time"
 
-	"github.com/metacubex/mihomo/common/atomic"
+	CN "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/proxydialer"
 	"github.com/metacubex/mihomo/component/resolver"
-	"github.com/metacubex/mihomo/component/slowdown"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/dns"
 	"github.com/metacubex/mihomo/log"
 
-	amnezia "github.com/metacubex/amneziawg-go/device"
 	wireguard "github.com/metacubex/sing-wireguard"
-	"github.com/metacubex/wireguard-go/device"
 
-	"github.com/metacubex/sing/common/debug"
-	E "github.com/metacubex/sing/common/exceptions"
-	M "github.com/metacubex/sing/common/metadata"
+	"github.com/sagernet/sing/common"
+	"github.com/sagernet/sing/common/debug"
+	E "github.com/sagernet/sing/common/exceptions"
+	M "github.com/sagernet/sing/common/metadata"
+	"github.com/sagernet/wireguard-go/device"
 )
 
-type wireguardGoDevice interface {
-	Close()
-	IpcSet(uapiConf string) error
-}
-
 type WireGuard struct {
 	*Base
 	bind      *wireguard.ClientBind
-	device    wireguardGoDevice
+	device    *device.Device
 	tunDevice wireguard.Device
-	resolver  resolver.Resolver
-
-	initOk        atomic.Bool
-	initMutex     sync.Mutex
-	initErr       error
-	option        WireGuardOption
-	connectAddr   M.Socksaddr
-	localPrefixes []netip.Prefix
-
-	serverAddrMap   map[M.Socksaddr]netip.AddrPort
-	serverAddrTime  atomic.TypedValue[time.Time]
-	serverAddrMutex sync.Mutex
+	dialer    proxydialer.SingDialer
+	startOnce sync.Once
+	startErr  error
+	resolver  *dns.Resolver
+	refP      *refProxyAdapter
 }
 
 type WireGuardOption struct {
 	BasicOption
 	WireGuardPeerOption
 	Name                string `proxy:"name"`
-	Ip                  string `proxy:"ip,omitempty"`
-	Ipv6                string `proxy:"ipv6,omitempty"`
 	PrivateKey          string `proxy:"private-key"`
 	Workers             int    `proxy:"workers,omitempty"`
 	MTU                 int    `proxy:"mtu,omitempty"`
 	UDP                 bool   `proxy:"udp,omitempty"`
 	PersistentKeepalive int    `proxy:"persistent-keepalive,omitempty"`
 
-	AmneziaWGOption *AmneziaWGOption `proxy:"amnezia-wg-option,omitempty"`
-
 	Peers []WireGuardPeerOption `proxy:"peers,omitempty"`
 
 	RemoteDnsResolve bool     `proxy:"remote-dns-resolve,omitempty"`
 	Dns              []string `proxy:"dns,omitempty"`
-
-	RefreshServerIPInterval int `proxy:"refresh-server-ip-interval,omitempty"`
 }
 
 type WireGuardPeerOption struct {
-	Server       string   `proxy:"server,omitempty"`
-	Port         int      `proxy:"port,omitempty"`
+	Server       string   `proxy:"server"`
+	Port         int      `proxy:"port"`
+	Ip           string   `proxy:"ip,omitempty"`
+	Ipv6         string   `proxy:"ipv6,omitempty"`
 	PublicKey    string   `proxy:"public-key,omitempty"`
 	PreSharedKey string   `proxy:"pre-shared-key,omitempty"`
 	Reserved     []uint8  `proxy:"reserved,omitempty"`
 	AllowedIPs   []string `proxy:"allowed-ips,omitempty"`
 }
 
-type AmneziaWGOption struct {
-	JC    int    `proxy:"jc,omitempty"`
-	JMin  int    `proxy:"jmin,omitempty"`
-	JMax  int    `proxy:"jmax,omitempty"`
-	S1    int    `proxy:"s1,omitempty"`
-	S2    int    `proxy:"s2,omitempty"`
-	S3    int    `proxy:"s3,omitempty"`    // AmneziaWG v1.5 and v2
-	S4    int    `proxy:"s4,omitempty"`    // AmneziaWG v1.5 and v2
-	H1    string `proxy:"h1,omitempty"`    // In AmneziaWG v1.x, it was uint32, but our WeaklyTypedInput can handle this situation
-	H2    string `proxy:"h2,omitempty"`    // In AmneziaWG v1.x, it was uint32, but our WeaklyTypedInput can handle this situation
-	H3    string `proxy:"h3,omitempty"`    // In AmneziaWG v1.x, it was uint32, but our WeaklyTypedInput can handle this situation
-	H4    string `proxy:"h4,omitempty"`    // In AmneziaWG v1.x, it was uint32, but our WeaklyTypedInput can handle this situation
-	I1    string `proxy:"i1,omitempty"`    // AmneziaWG v1.5 and v2
-	I2    string `proxy:"i2,omitempty"`    // AmneziaWG v1.5 and v2
-	I3    string `proxy:"i3,omitempty"`    // AmneziaWG v1.5 and v2
-	I4    string `proxy:"i4,omitempty"`    // AmneziaWG v1.5 and v2
-	I5    string `proxy:"i5,omitempty"`    // AmneziaWG v1.5 and v2
-	J1    string `proxy:"j1,omitempty"`    // AmneziaWG v1.5 only (removed in v2)
-	J2    string `proxy:"j2,omitempty"`    // AmneziaWG v1.5 only (removed in v2)
-	J3    string `proxy:"j3,omitempty"`    // AmneziaWG v1.5 only (removed in v2)
-	Itime int64  `proxy:"itime,omitempty"` // AmneziaWG v1.5 only (removed in v2)
-}
-
 type wgSingErrorHandler struct {
 	name string
 }
@@ -136,7 +97,7 @@ func (option WireGuardPeerOption) Addr() M.Socksaddr {
 	return M.ParseSocksaddrHostPort(option.Server, uint16(option.Port))
 }
 
-func (option WireGuardOption) Prefixes() ([]netip.Prefix, error) {
+func (option WireGuardPeerOption) Prefixes() ([]netip.Prefix, error) {
 	localPrefixes := make([]netip.Prefix, 0, 2)
 	if len(option.Ip) > 0 {
 		if !strings.Contains(option.Ip, "/") {
@@ -170,15 +131,14 @@ func NewWireGuard(option WireGuardOption) (*WireGuard, error) {
 			name:   option.Name,
 			addr:   net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
 			tp:     C.WireGuard,
-			pdName: option.ProviderName,
 			udp:    option.UDP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: option.IPVersion,
+			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
+		dialer: proxydialer.NewByNameSingDialer(option.DialerProxy, dialer.NewDialer()),
 	}
-	outbound.dialer = option.NewDialer(outbound.DialOptions())
-	singDialer := proxydialer.NewSingDialer(proxydialer.NewSlowDownDialer(outbound.dialer, slowdown.New()))
+	runtime.SetFinalizer(outbound, closeWireGuard)
 
 	var reserved [3]uint8
 	if len(option.Reserved) > 0 {
@@ -188,116 +148,162 @@ func NewWireGuard(option WireGuardOption) (*WireGuard, error) {
 		copy(reserved[:], option.Reserved)
 	}
 	var isConnect bool
+	var connectAddr M.Socksaddr
 	if len(option.Peers) < 2 {
 		isConnect = true
 		if len(option.Peers) == 1 {
-			outbound.connectAddr = option.Peers[0].Addr()
+			connectAddr = option.Peers[0].Addr()
 		} else {
-			outbound.connectAddr = option.Addr()
+			connectAddr = option.Addr()
 		}
 	}
-	outbound.bind = wireguard.NewClientBind(context.Background(), wgSingErrorHandler{outbound.Name()}, singDialer, isConnect, outbound.connectAddr.AddrPort(), reserved)
+	outbound.bind = wireguard.NewClientBind(context.Background(), wgSingErrorHandler{outbound.Name()}, outbound.dialer, isConnect, connectAddr, reserved)
 
-	var err error
-	outbound.localPrefixes, err = option.Prefixes()
-	if err != nil {
-		return nil, err
-	}
+	var localPrefixes []netip.Prefix
 
+	var privateKey string
 	{
 		bytes, err := base64.StdEncoding.DecodeString(option.PrivateKey)
 		if err != nil {
 			return nil, E.Cause(err, "decode private key")
 		}
-		option.PrivateKey = hex.EncodeToString(bytes)
+		privateKey = hex.EncodeToString(bytes)
 	}
-
-	if len(option.Peers) > 0 {
-		for i := range option.Peers {
-			peer := &option.Peers[i] // we need modify option here
-			bytes, err := base64.StdEncoding.DecodeString(peer.PublicKey)
-			if err != nil {
-				return nil, E.Cause(err, "decode public key for peer ", i)
+	ipcConf := "private_key=" + privateKey
+	if peersLen := len(option.Peers); peersLen > 0 {
+		localPrefixes = make([]netip.Prefix, 0, peersLen*2)
+		for i, peer := range option.Peers {
+			var peerPublicKey, preSharedKey string
+			{
+				bytes, err := base64.StdEncoding.DecodeString(peer.PublicKey)
+				if err != nil {
+					return nil, E.Cause(err, "decode public key for peer ", i)
+				}
+				peerPublicKey = hex.EncodeToString(bytes)
 			}
-			peer.PublicKey = hex.EncodeToString(bytes)
-
 			if peer.PreSharedKey != "" {
 				bytes, err := base64.StdEncoding.DecodeString(peer.PreSharedKey)
 				if err != nil {
 					return nil, E.Cause(err, "decode pre shared key for peer ", i)
 				}
-				peer.PreSharedKey = hex.EncodeToString(bytes)
+				preSharedKey = hex.EncodeToString(bytes)
+			}
+			destination := peer.Addr()
+			ipcConf += "\npublic_key=" + peerPublicKey
+			ipcConf += "\nendpoint=" + destination.String()
+			if preSharedKey != "" {
+				ipcConf += "\npreshared_key=" + preSharedKey
 			}
-
 			if len(peer.AllowedIPs) == 0 {
 				return nil, E.New("missing allowed_ips for peer ", i)
 			}
-
+			for _, allowedIP := range peer.AllowedIPs {
+				ipcConf += "\nallowed_ip=" + allowedIP
+			}
 			if len(peer.Reserved) > 0 {
 				if len(peer.Reserved) != 3 {
 					return nil, E.New("invalid reserved value for peer ", i, ", required 3 bytes, got ", len(peer.Reserved))
 				}
+				copy(reserved[:], option.Reserved)
+				outbound.bind.SetReservedForEndpoint(destination, reserved)
 			}
+			prefixes, err := peer.Prefixes()
+			if err != nil {
+				return nil, err
+			}
+			localPrefixes = append(localPrefixes, prefixes...)
 		}
 	} else {
+		var peerPublicKey, preSharedKey string
 		{
 			bytes, err := base64.StdEncoding.DecodeString(option.PublicKey)
 			if err != nil {
 				return nil, E.Cause(err, "decode peer public key")
 			}
-			option.PublicKey = hex.EncodeToString(bytes)
+			peerPublicKey = hex.EncodeToString(bytes)
 		}
 		if option.PreSharedKey != "" {
 			bytes, err := base64.StdEncoding.DecodeString(option.PreSharedKey)
 			if err != nil {
 				return nil, E.Cause(err, "decode pre shared key")
 			}
-			option.PreSharedKey = hex.EncodeToString(bytes)
+			preSharedKey = hex.EncodeToString(bytes)
+		}
+		ipcConf += "\npublic_key=" + peerPublicKey
+		ipcConf += "\nendpoint=" + connectAddr.String()
+		if preSharedKey != "" {
+			ipcConf += "\npreshared_key=" + preSharedKey
+		}
+		var err error
+		localPrefixes, err = option.Prefixes()
+		if err != nil {
+			return nil, err
+		}
+		var has4, has6 bool
+		for _, address := range localPrefixes {
+			if address.Addr().Is4() {
+				has4 = true
+			} else {
+				has6 = true
+			}
+		}
+		if has4 {
+			ipcConf += "\nallowed_ip=0.0.0.0/0"
+		}
+		if has6 {
+			ipcConf += "\nallowed_ip=::/0"
 		}
 	}
-	outbound.option = option
 
+	if option.PersistentKeepalive != 0 {
+		ipcConf += fmt.Sprintf("\npersistent_keepalive_interval=%d", option.PersistentKeepalive)
+	}
 	mtu := option.MTU
 	if mtu == 0 {
 		mtu = 1408
 	}
-	if len(outbound.localPrefixes) == 0 {
+	if len(localPrefixes) == 0 {
 		return nil, E.New("missing local address")
 	}
-	outbound.tunDevice, err = wireguard.NewStackDevice(outbound.localPrefixes, uint32(mtu))
+	var err error
+	outbound.tunDevice, err = wireguard.NewStackDevice(localPrefixes, uint32(mtu))
 	if err != nil {
 		return nil, E.Cause(err, "create WireGuard device")
 	}
-	logger := &device.Logger{
+	outbound.device = device.NewDevice(context.Background(), outbound.tunDevice, outbound.bind, &device.Logger{
 		Verbosef: func(format string, args ...interface{}) {
 			log.SingLogger.Debug(fmt.Sprintf("[WG](%s) %s", option.Name, fmt.Sprintf(format, args...)))
 		},
 		Errorf: func(format string, args ...interface{}) {
 			log.SingLogger.Error(fmt.Sprintf("[WG](%s) %s", option.Name, fmt.Sprintf(format, args...)))
 		},
+	}, option.Workers)
+	if debug.Enabled {
+		log.SingLogger.Trace(fmt.Sprintf("[WG](%s) created wireguard ipc conf: \n %s", option.Name, ipcConf))
 	}
-	if option.AmneziaWGOption != nil {
-		outbound.bind.SetParseReserved(false) // AmneziaWG don't need parse reserved
-		outbound.device = amnezia.NewDevice(outbound.tunDevice, outbound.bind, logger, option.Workers)
-	} else {
-		outbound.device = device.NewDevice(outbound.tunDevice, outbound.bind, logger, option.Workers)
+	err = outbound.device.IpcSet(ipcConf)
+	if err != nil {
+		return nil, E.Cause(err, "setup wireguard")
 	}
+	//err = outbound.tunDevice.Start()
 
 	var has6 bool
-	for _, address := range outbound.localPrefixes {
+	for _, address := range localPrefixes {
 		if !address.Addr().Unmap().Is4() {
 			has6 = true
 			break
 		}
 	}
 
+	refP := &refProxyAdapter{}
+	outbound.refP = refP
 	if option.RemoteDnsResolve && len(option.Dns) > 0 {
 		nss, err := dns.ParseNameServer(option.Dns)
 		if err != nil {
 			return nil, err
 		}
 		for i := range nss {
-			nss[i].ProxyAdapter = outbound
+			nss[i].ProxyAdapter = refP
 		}
 		outbound.resolver = dns.NewResolver(dns.Config{
 			Main: nss,
@@ -308,259 +314,30 @@ func NewWireGuard(option WireGuardOption) (*WireGuard, error) {
 	return outbound, nil
 }
 
-func (w *WireGuard) resolve(ctx context.Context, address M.Socksaddr) (netip.AddrPort, error) {
-	if address.Addr.IsValid() {
-		return address.AddrPort(), nil
-	}
-	udpAddr, err := resolveUDPAddr(ctx, "udp", address.String(), w.prefer)
-	if err != nil {
-		return netip.AddrPort{}, err
-	}
-	// net.ResolveUDPAddr maybe return 4in6 address, so unmap at here
-	addrPort := udpAddr.AddrPort()
-	return netip.AddrPortFrom(addrPort.Addr().Unmap(), addrPort.Port()), nil
-}
-
-func (w *WireGuard) init(ctx context.Context) error {
-	err := w.init0(ctx)
-	if err != nil {
-		return err
-	}
-	w.updateServerAddr(ctx)
-	return nil
-}
-
-func (w *WireGuard) init0(ctx context.Context) error {
-	if w.initOk.Load() {
-		return nil
-	}
-	w.initMutex.Lock()
-	defer w.initMutex.Unlock()
-	// double check like sync.Once
-	if w.initOk.Load() {
-		return nil
-	}
-	if w.initErr != nil {
-		return w.initErr
-	}
-
-	w.bind.ResetReservedForEndpoint()
-	w.serverAddrMap = make(map[M.Socksaddr]netip.AddrPort)
-	ipcConf, err := w.genIpcConf(ctx, false)
-	if err != nil {
-		// !!! do not set initErr here !!!
-		// let us can retry domain resolve in next time
-		return err
-	}
-
-	if debug.Enabled {
-		log.SingLogger.Trace(fmt.Sprintf("[WG](%s) created wireguard ipc conf: \n %s", w.option.Name, ipcConf))
-	}
-	err = w.device.IpcSet(ipcConf)
-	if err != nil {
-		w.initErr = E.Cause(err, "setup wireguard")
-		return w.initErr
-	}
-	w.serverAddrTime.Store(time.Now())
-
-	err = w.tunDevice.Start()
-	if err != nil {
-		w.initErr = err
-		return w.initErr
-	}
-
-	w.initOk.Store(true)
-	return nil
-}
-
-func (w *WireGuard) updateServerAddr(ctx context.Context) {
-	if w.option.RefreshServerIPInterval != 0 && time.Since(w.serverAddrTime.Load()) > time.Second*time.Duration(w.option.RefreshServerIPInterval) {
-		if w.serverAddrMutex.TryLock() {
-			defer w.serverAddrMutex.Unlock()
-			ipcConf, err := w.genIpcConf(ctx, true)
-			if err != nil {
-				log.Warnln("[WG](%s)UpdateServerAddr failed to generate wireguard ipc conf: %s", w.option.Name, err)
-				return
-			}
-			err = w.device.IpcSet(ipcConf)
-			if err != nil {
-				log.Warnln("[WG](%s)UpdateServerAddr failed to update wireguard ipc conf: %s", w.option.Name, err)
-				return
-			}
-			w.serverAddrTime.Store(time.Now())
-		}
-	}
-}
-
-func (w *WireGuard) genIpcConf(ctx context.Context, updateOnly bool) (string, error) {
-	ipcConf := ""
-	if !updateOnly {
-		ipcConf += "private_key=" + w.option.PrivateKey + "\n"
-		if w.option.AmneziaWGOption != nil {
-			if w.option.AmneziaWGOption.JC != 0 {
-				ipcConf += "jc=" + strconv.Itoa(w.option.AmneziaWGOption.JC) + "\n"
-			}
-			if w.option.AmneziaWGOption.JMin != 0 {
-				ipcConf += "jmin=" + strconv.Itoa(w.option.AmneziaWGOption.JMin) + "\n"
-			}
-			if w.option.AmneziaWGOption.JMax != 0 {
-				ipcConf += "jmax=" + strconv.Itoa(w.option.AmneziaWGOption.JMax) + "\n"
-			}
-			if w.option.AmneziaWGOption.S1 != 0 {
-				ipcConf += "s1=" + strconv.Itoa(w.option.AmneziaWGOption.S1) + "\n"
-			}
-			if w.option.AmneziaWGOption.S2 != 0 {
-				ipcConf += "s2=" + strconv.Itoa(w.option.AmneziaWGOption.S2) + "\n"
-			}
-			if w.option.AmneziaWGOption.S3 != 0 {
-				ipcConf += "s3=" + strconv.Itoa(w.option.AmneziaWGOption.S3) + "\n"
-			}
-			if w.option.AmneziaWGOption.S4 != 0 {
-				ipcConf += "s4=" + strconv.Itoa(w.option.AmneziaWGOption.S4) + "\n"
-			}
-			if w.option.AmneziaWGOption.H1 != "" {
-				ipcConf += "h1=" + w.option.AmneziaWGOption.H1 + "\n"
-			}
-			if w.option.AmneziaWGOption.H2 != "" {
-				ipcConf += "h2=" + w.option.AmneziaWGOption.H2 + "\n"
-			}
-			if w.option.AmneziaWGOption.H3 != "" {
-				ipcConf += "h3=" + w.option.AmneziaWGOption.H3 + "\n"
-			}
-			if w.option.AmneziaWGOption.H4 != "" {
-				ipcConf += "h4=" + w.option.AmneziaWGOption.H4 + "\n"
-			}
-			if w.option.AmneziaWGOption.I1 != "" {
-				ipcConf += "i1=" + w.option.AmneziaWGOption.I1 + "\n"
-			}
-			if w.option.AmneziaWGOption.I2 != "" {
-				ipcConf += "i2=" + w.option.AmneziaWGOption.I2 + "\n"
-			}
-			if w.option.AmneziaWGOption.I3 != "" {
-				ipcConf += "i3=" + w.option.AmneziaWGOption.I3 + "\n"
-			}
-			if w.option.AmneziaWGOption.I4 != "" {
-				ipcConf += "i4=" + w.option.AmneziaWGOption.I4 + "\n"
-			}
-			if w.option.AmneziaWGOption.I5 != "" {
-				ipcConf += "i5=" + w.option.AmneziaWGOption.I5 + "\n"
-			}
-			if w.option.AmneziaWGOption.J1 != "" {
-				ipcConf += "j1=" + w.option.AmneziaWGOption.J1 + "\n"
-			}
-			if w.option.AmneziaWGOption.J2 != "" {
-				ipcConf += "j2=" + w.option.AmneziaWGOption.J2 + "\n"
-			}
-			if w.option.AmneziaWGOption.J3 != "" {
-				ipcConf += "j3=" + w.option.AmneziaWGOption.J3 + "\n"
-			}
-			if w.option.AmneziaWGOption.Itime != 0 {
-				ipcConf += "itime=" + strconv.FormatInt(int64(w.option.AmneziaWGOption.Itime), 10) + "\n"
-			}
-		}
-	}
-	if len(w.option.Peers) > 0 {
-		for i, peer := range w.option.Peers {
-			peerAddr := peer.Addr()
-			destination, err := w.resolve(ctx, peerAddr)
-			if err != nil {
-				return "", E.Cause(err, "resolve endpoint domain for peer ", i)
-			}
-			if w.serverAddrMap[peerAddr] != destination {
-				w.serverAddrMap[peerAddr] = destination
-			} else if updateOnly {
-				continue
-			}
-
-			if len(w.option.Peers) == 1 { // must call SetConnectAddr if isConnect == true
-				w.bind.SetConnectAddr(destination)
-			}
-			ipcConf += "public_key=" + peer.PublicKey + "\n"
-			if updateOnly {
-				ipcConf += "update_only=true\n"
-			}
-			ipcConf += "endpoint=" + destination.String() + "\n"
-			if len(peer.Reserved) > 0 {
-				var reserved [3]uint8
-				copy(reserved[:], w.option.Reserved)
-				w.bind.SetReservedForEndpoint(destination, reserved)
-			}
-			if updateOnly {
-				continue
-			}
-			if peer.PreSharedKey != "" {
-				ipcConf += "preshared_key=" + peer.PreSharedKey + "\n"
-			}
-			for _, allowedIP := range peer.AllowedIPs {
-				ipcConf += "allowed_ip=" + allowedIP + "\n"
-			}
-			if w.option.PersistentKeepalive != 0 {
-				ipcConf += fmt.Sprintf("persistent_keepalive_interval=%d\n", w.option.PersistentKeepalive)
-			}
-		}
-	} else {
-		destination, err := w.resolve(ctx, w.connectAddr)
-		if err != nil {
-			return "", E.Cause(err, "resolve endpoint domain")
-		}
-		if w.serverAddrMap[w.connectAddr] != destination {
-			w.serverAddrMap[w.connectAddr] = destination
-		} else if updateOnly {
-			return "", nil
-		}
-		w.bind.SetConnectAddr(destination) // must call SetConnectAddr if isConnect == true
-		ipcConf += "public_key=" + w.option.PublicKey + "\n"
-		if updateOnly {
-			ipcConf += "update_only=true\n"
-		}
-		ipcConf += "endpoint=" + destination.String() + "\n"
-		if updateOnly {
-			return ipcConf, nil
-		}
-		if w.option.PreSharedKey != "" {
-			ipcConf += "preshared_key=" + w.option.PreSharedKey + "\n"
-		}
-		var has4, has6 bool
-		for _, address := range w.localPrefixes {
-			if address.Addr().Is4() {
-				has4 = true
-			} else {
-				has6 = true
-			}
-		}
-		if has4 {
-			ipcConf += "allowed_ip=0.0.0.0/0\n"
-		}
-		if has6 {
-			ipcConf += "allowed_ip=::/0\n"
-		}
-
-		if w.option.PersistentKeepalive != 0 {
-			ipcConf += fmt.Sprintf("persistent_keepalive_interval=%d\n", w.option.PersistentKeepalive)
-		}
-	}
-	return ipcConf, nil
-}
-
-// Close implements C.ProxyAdapter
-func (w *WireGuard) Close() error {
+func closeWireGuard(w *WireGuard) {
 	if w.device != nil {
 		w.device.Close()
 	}
-	return nil
+	_ = common.Close(w.tunDevice)
 }
 
-func (w *WireGuard) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.Conn, err error) {
+func (w *WireGuard) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
+	options := w.Base.DialOptions(opts...)
+	w.dialer.SetDialer(dialer.NewDialer(options...))
 	var conn net.Conn
-	if err = w.init(ctx); err != nil {
-		return nil, err
+	w.startOnce.Do(func() {
+		w.startErr = w.tunDevice.Start()
+	})
+	if w.startErr != nil {
+		return nil, w.startErr
 	}
 	if !metadata.Resolved() || w.resolver != nil {
 		r := resolver.DefaultResolver
 		if w.resolver != nil {
+			w.refP.SetProxyAdapter(w)
+			defer w.refP.ClearProxyAdapter()
 			r = w.resolver
 		}
-		options := w.DialOptions()
 		options = append(options, dialer.WithResolver(r))
 		options = append(options, dialer.WithNetDialer(wgNetDialer{tunDevice: w.tunDevice}))
 		conn, err = dialer.NewDialer(options...).DialContext(ctx, "tcp", metadata.RemoteAddress())
@@ -573,16 +350,34 @@ func (w *WireGuard) DialContext(ctx context.Context, metadata *C.Metadata) (_ C.
 	if conn == nil {
 		return nil, E.New("conn is nil")
 	}
-	return NewConn(conn, w), nil
+	return NewConn(CN.NewRefConn(conn, w), w), nil
 }
 
-func (w *WireGuard) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (_ C.PacketConn, err error) {
+func (w *WireGuard) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
+	options := w.Base.DialOptions(opts...)
+	w.dialer.SetDialer(dialer.NewDialer(options...))
 	var pc net.PacketConn
-	if err = w.init(ctx); err != nil {
+	w.startOnce.Do(func() {
+		w.startErr = w.tunDevice.Start()
+	})
+	if w.startErr != nil {
+		return nil, w.startErr
+	}
+	if err != nil {
 		return nil, err
 	}
-	if err = w.ResolveUDP(ctx, metadata); err != nil {
-		return nil, err
+	if (!metadata.Resolved() || w.resolver != nil) && metadata.Host != "" {
+		r := resolver.DefaultResolver
+		if w.resolver != nil {
+			w.refP.SetProxyAdapter(w)
+			defer w.refP.ClearProxyAdapter()
+			r = w.resolver
+		}
+		ip, err := resolver.ResolveIPWithResolver(ctx, metadata.Host, r)
+		if err != nil {
+			return nil, errors.New("can't resolve ip")
+		}
+		metadata.DstIP = ip
 	}
 	pc, err = w.tunDevice.ListenPacket(ctx, M.SocksaddrFrom(metadata.DstIP, metadata.DstPort).Unwrap())
 	if err != nil {
@@ -591,32 +386,146 @@ func (w *WireGuard) ListenPacketContext(ctx context.Context, metadata *C.Metadat
 	if pc == nil {
 		return nil, E.New("packetConn is nil")
 	}
-	return newPacketConn(pc, w), nil
-}
-
-func (w *WireGuard) ResolveUDP(ctx context.Context, metadata *C.Metadata) error {
-	if (!metadata.Resolved() || w.resolver != nil) && metadata.Host != "" {
-		r := resolver.DefaultResolver
-		if w.resolver != nil {
-			r = w.resolver
-		}
-		ip, err := resolver.ResolveIPWithResolver(ctx, metadata.Host, r)
-		if err != nil {
-			return fmt.Errorf("can't resolve ip: %w", err)
-		}
-		metadata.DstIP = ip
-	}
-	return nil
-}
-
-// ProxyInfo implements C.ProxyAdapter
-func (w *WireGuard) ProxyInfo() C.ProxyInfo {
-	info := w.Base.ProxyInfo()
-	info.DialerProxy = w.option.DialerProxy
-	return info
+	return newPacketConn(CN.NewRefPacketConn(pc, w), w), nil
 }
 
 // IsL3Protocol implements C.ProxyAdapter
 func (w *WireGuard) IsL3Protocol(metadata *C.Metadata) bool {
 	return true
 }
+
+type refProxyAdapter struct {
+	proxyAdapter C.ProxyAdapter
+	count        int
+	mutex        sync.Mutex
+}
+
+func (r *refProxyAdapter) SetProxyAdapter(proxyAdapter C.ProxyAdapter) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+	r.proxyAdapter = proxyAdapter
+	r.count++
+}
+
+func (r *refProxyAdapter) ClearProxyAdapter() {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+	r.count--
+	if r.count == 0 {
+		r.proxyAdapter = nil
+	}
+}
+
+func (r *refProxyAdapter) Name() string {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.Name()
+	}
+	return ""
+}
+
+func (r *refProxyAdapter) Type() C.AdapterType {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.Type()
+	}
+	return C.AdapterType(0)
+}
+
+func (r *refProxyAdapter) Addr() string {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.Addr()
+	}
+	return ""
+}
+
+func (r *refProxyAdapter) SupportUDP() bool {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.SupportUDP()
+	}
+	return false
+}
+
+func (r *refProxyAdapter) SupportXUDP() bool {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.SupportXUDP()
+	}
+	return false
+}
+
+func (r *refProxyAdapter) SupportTFO() bool {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.SupportTFO()
+	}
+	return false
+}
+
+func (r *refProxyAdapter) MarshalJSON() ([]byte, error) {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.MarshalJSON()
+	}
+	return nil, C.ErrNotSupport
+}
+
+func (r *refProxyAdapter) StreamConnContext(ctx context.Context, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.StreamConnContext(ctx, c, metadata)
+	}
+	return nil, C.ErrNotSupport
+}
+
+func (r *refProxyAdapter) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.DialContext(ctx, metadata, opts...)
+	}
+	return nil, C.ErrNotSupport
+}
+
+func (r *refProxyAdapter) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.ListenPacketContext(ctx, metadata, opts...)
+	}
+	return nil, C.ErrNotSupport
+}
+
+func (r *refProxyAdapter) SupportUOT() bool {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.SupportUOT()
+	}
+	return false
+}
+
+func (r *refProxyAdapter) SupportWithDialer() C.NetWork {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.SupportWithDialer()
+	}
+	return C.InvalidNet
+}
+
+func (r *refProxyAdapter) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (C.Conn, error) {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.DialContextWithDialer(ctx, dialer, metadata)
+	}
+	return nil, C.ErrNotSupport
+}
+
+func (r *refProxyAdapter) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (C.PacketConn, error) {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.ListenPacketWithDialer(ctx, dialer, metadata)
+	}
+	return nil, C.ErrNotSupport
+}
+
+func (r *refProxyAdapter) IsL3Protocol(metadata *C.Metadata) bool {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.IsL3Protocol(metadata)
+	}
+	return false
+}
+
+func (r *refProxyAdapter) Unwrap(metadata *C.Metadata, touch bool) C.Proxy {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.Unwrap(metadata, touch)
+	}
+	return nil
+}
+
+var _ C.ProxyAdapter = (*refProxyAdapter)(nil)

adapter/outboundgroup/fallback.go

@@ -6,11 +6,13 @@ import (
 	"errors"
 	"time"
 
+	"github.com/metacubex/mihomo/adapter/outbound"
 	"github.com/metacubex/mihomo/common/callback"
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/common/utils"
+	"github.com/metacubex/mihomo/component/dialer"
 	C "github.com/metacubex/mihomo/constant"
-	P "github.com/metacubex/mihomo/constant/provider"
+	"github.com/metacubex/mihomo/constant/provider"
 )
 
 type Fallback struct {
@@ -19,8 +21,6 @@ type Fallback struct {
 	testUrl        string
 	selected       string
 	expectedStatus string
-	Hidden         bool
-	Icon           string
 }
 
 func (f *Fallback) Now() string {
@@ -29,13 +29,13 @@ func (f *Fallback) Now() string {
 }
 
 // DialContext implements C.ProxyAdapter
-func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata) (C.Conn, error) {
+func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
 	proxy := f.findAliveProxy(true)
-	c, err := proxy.DialContext(ctx, metadata)
+	c, err := proxy.DialContext(ctx, metadata, f.Base.DialOptions(opts...)...)
 	if err == nil {
 		c.AppendToChains(f)
 	} else {
-		f.onDialFailed(proxy.Type(), err, f.healthCheck)
+		f.onDialFailed(proxy.Type(), err)
 	}
 
 	if N.NeedHandshake(c) {
@@ -43,7 +43,7 @@ func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata) (C.Con
 			if err == nil {
 				f.onDialSuccess()
 			} else {
-				f.onDialFailed(proxy.Type(), err, f.healthCheck)
+				f.onDialFailed(proxy.Type(), err)
 			}
 		})
 	}
@@ -52,9 +52,9 @@ func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata) (C.Con
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (f *Fallback) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
+func (f *Fallback) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
 	proxy := f.findAliveProxy(true)
-	pc, err := proxy.ListenPacketContext(ctx, metadata)
+	pc, err := proxy.ListenPacketContext(ctx, metadata, f.Base.DialOptions(opts...)...)
 	if err == nil {
 		pc.AppendToChains(f)
 	}
@@ -89,9 +89,6 @@ func (f *Fallback) MarshalJSON() ([]byte, error) {
 		"all":            all,
 		"testUrl":        f.testUrl,
 		"expectedStatus": f.expectedStatus,
-		"fixed":          f.selected,
-		"hidden":         f.Hidden,
-		"icon":           f.Icon,
 	})
 }
 
@@ -139,7 +136,7 @@ func (f *Fallback) Set(name string) error {
 	if !p.AliveForTestUrl(f.testUrl) {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(5000))
 		defer cancel()
-		expectedStatus, _ := utils.NewUnsignedRanges[uint16](f.expectedStatus)
+		expectedStatus, _ := utils.NewIntRanges[uint16](f.expectedStatus)
 		_, _ = p.URLTest(ctx, f.testUrl, expectedStatus)
 	}
 
@@ -150,30 +147,22 @@ func (f *Fallback) ForceSet(name string) {
 	f.selected = name
 }
 
-func (f *Fallback) Providers() []P.ProxyProvider {
-	return f.providers
-}
-
-func (f *Fallback) Proxies() []C.Proxy {
-	return f.GetProxies(false)
-}
-
-func NewFallback(option *GroupCommonOption, providers []P.ProxyProvider) *Fallback {
+func NewFallback(option *GroupCommonOption, providers []provider.ProxyProvider) *Fallback {
 	return &Fallback{
 		GroupBase: NewGroupBase(GroupBaseOption{
-			Name:           option.Name,
-			Type:           C.Fallback,
-			Filter:         option.Filter,
-			ExcludeFilter:  option.ExcludeFilter,
-			ExcludeType:    option.ExcludeType,
-			TestTimeout:    option.TestTimeout,
-			MaxFailedTimes: option.MaxFailedTimes,
-			Providers:      providers,
+			outbound.BaseOption{
+				Name:        option.Name,
+				Type:        C.Fallback,
+				Interface:   option.Interface,
+				RoutingMark: option.RoutingMark,
+			},
+			option.Filter,
+			option.ExcludeFilter,
+			option.ExcludeType,
+			providers,
 		}),
 		disableUDP:     option.DisableUDP,
 		testUrl:        option.URL,
 		expectedStatus: option.ExpectedStatus,
-		Hidden:         option.Hidden,
-		Icon:           option.Icon,
 	}
 }

adapter/outboundgroup/groupbase.go

@@ -2,7 +2,6 @@ package outboundgroup
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"strings"
 	"sync"
@@ -12,83 +11,65 @@ import (
 	"github.com/metacubex/mihomo/common/atomic"
 	"github.com/metacubex/mihomo/common/utils"
 	C "github.com/metacubex/mihomo/constant"
-	P "github.com/metacubex/mihomo/constant/provider"
+	"github.com/metacubex/mihomo/constant/provider"
+	types "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/tunnel"
 
 	"github.com/dlclark/regexp2"
-	"golang.org/x/exp/slices"
 )
 
 type GroupBase struct {
 	*outbound.Base
-	filterRegs        []*regexp2.Regexp
-	excludeFilterRegs []*regexp2.Regexp
-	excludeTypeArray  []string
-	providers         []P.ProxyProvider
-	failedTestMux     sync.Mutex
-	failedTimes       int
-	failedTime        time.Time
-	failedTesting     atomic.Bool
-	TestTimeout       int
-	maxFailedTimes    int
-
-	// for GetProxies
-	getProxiesMutex  sync.Mutex
-	providerVersions []uint32
-	providerProxies  []C.Proxy
+	filterRegs       []*regexp2.Regexp
+	excludeFilterReg *regexp2.Regexp
+	excludeTypeArray []string
+	providers        []provider.ProxyProvider
+	failedTestMux    sync.Mutex
+	failedTimes      int
+	failedTime       time.Time
+	failedTesting    atomic.Bool
+	proxies          [][]C.Proxy
+	versions         []atomic.Uint32
 }
 
 type GroupBaseOption struct {
-	Name           string
-	Type           C.AdapterType
-	Filter         string
-	ExcludeFilter  string
-	ExcludeType    string
-	TestTimeout    int
-	MaxFailedTimes int
-	Providers      []P.ProxyProvider
+	outbound.BaseOption
+	filter        string
+	excludeFilter string
+	excludeType   string
+	providers     []provider.ProxyProvider
 }
 
 func NewGroupBase(opt GroupBaseOption) *GroupBase {
-	var excludeTypeArray []string
-	if opt.ExcludeType != "" {
-		excludeTypeArray = strings.Split(opt.ExcludeType, "|")
+	var excludeFilterReg *regexp2.Regexp
+	if opt.excludeFilter != "" {
+		excludeFilterReg = regexp2.MustCompile(opt.excludeFilter, 0)
 	}
-
-	var excludeFilterRegs []*regexp2.Regexp
-	if opt.ExcludeFilter != "" {
-		for _, excludeFilter := range strings.Split(opt.ExcludeFilter, "`") {
-			excludeFilterReg := regexp2.MustCompile(excludeFilter, regexp2.None)
-			excludeFilterRegs = append(excludeFilterRegs, excludeFilterReg)
-		}
+	var excludeTypeArray []string
+	if opt.excludeType != "" {
+		excludeTypeArray = strings.Split(opt.excludeType, "|")
 	}
 
 	var filterRegs []*regexp2.Regexp
-	if opt.Filter != "" {
-		for _, filter := range strings.Split(opt.Filter, "`") {
-			filterReg := regexp2.MustCompile(filter, regexp2.None)
+	if opt.filter != "" {
+		for _, filter := range strings.Split(opt.filter, "`") {
+			filterReg := regexp2.MustCompile(filter, 0)
 			filterRegs = append(filterRegs, filterReg)
 		}
 	}
 
 	gb := &GroupBase{
-		Base:              outbound.NewBase(outbound.BaseOption{Name: opt.Name, Type: opt.Type}),
-		filterRegs:        filterRegs,
-		excludeFilterRegs: excludeFilterRegs,
-		excludeTypeArray:  excludeTypeArray,
-		providers:         opt.Providers,
-		failedTesting:     atomic.NewBool(false),
-		TestTimeout:       opt.TestTimeout,
-		maxFailedTimes:    opt.MaxFailedTimes,
+		Base:             outbound.NewBase(opt.BaseOption),
+		filterRegs:       filterRegs,
+		excludeFilterReg: excludeFilterReg,
+		excludeTypeArray: excludeTypeArray,
+		providers:        opt.providers,
+		failedTesting:    atomic.NewBool(false),
 	}
 
-	if gb.TestTimeout == 0 {
-		gb.TestTimeout = 5000
-	}
-	if gb.maxFailedTimes == 0 {
-		gb.maxFailedTimes = 5
-	}
+	gb.proxies = make([][]C.Proxy, len(opt.providers))
+	gb.versions = make([]atomic.Uint32, len(opt.providers))
 
 	return gb
 }
@@ -100,62 +81,63 @@ func (gb *GroupBase) Touch() {
 }
 
 func (gb *GroupBase) GetProxies(touch bool) []C.Proxy {
-	providerVersions := make([]uint32, len(gb.providers))
-	for i, pd := range gb.providers {
-		if touch { // touch first
-			pd.Touch()
-		}
-		providerVersions[i] = pd.Version()
-	}
-
-	// thread safe
-	gb.getProxiesMutex.Lock()
-	defer gb.getProxiesMutex.Unlock()
-
-	// return the cached proxies if version not changed
-	if slices.Equal(providerVersions, gb.providerVersions) {
-		return gb.providerProxies
-	}
-
 	var proxies []C.Proxy
 	if len(gb.filterRegs) == 0 {
 		for _, pd := range gb.providers {
+			if touch {
+				pd.Touch()
+			}
 			proxies = append(proxies, pd.Proxies()...)
 		}
 	} else {
-		for _, pd := range gb.providers {
-			if pd.VehicleType() == P.Compatible { // compatible provider unneeded filter
-				proxies = append(proxies, pd.Proxies()...)
+		for i, pd := range gb.providers {
+			if touch {
+				pd.Touch()
+			}
+
+			if pd.VehicleType() == types.Compatible {
+				gb.versions[i].Store(pd.Version())
+				gb.proxies[i] = pd.Proxies()
 				continue
 			}
 
-			var newProxies []C.Proxy
-			proxiesSet := map[string]struct{}{}
-			for _, filterReg := range gb.filterRegs {
-				for _, p := range pd.Proxies() {
-					name := p.Name()
-					if mat, _ := filterReg.MatchString(name); mat {
-						if _, ok := proxiesSet[name]; !ok {
-							proxiesSet[name] = struct{}{}
-							newProxies = append(newProxies, p)
+			version := gb.versions[i].Load()
+			if version != pd.Version() && gb.versions[i].CompareAndSwap(version, pd.Version()) {
+				var (
+					proxies    []C.Proxy
+					newProxies []C.Proxy
+				)
+
+				proxies = pd.Proxies()
+				proxiesSet := map[string]struct{}{}
+				for _, filterReg := range gb.filterRegs {
+					for _, p := range proxies {
+						name := p.Name()
+						if mat, _ := filterReg.FindStringMatch(name); mat != nil {
+							if _, ok := proxiesSet[name]; !ok {
+								proxiesSet[name] = struct{}{}
+								newProxies = append(newProxies, p)
+							}
 						}
 					}
 				}
+
+				gb.proxies[i] = newProxies
 			}
-			proxies = append(proxies, newProxies...)
+		}
+
+		for _, p := range gb.proxies {
+			proxies = append(proxies, p...)
 		}
 	}
 
-	// Multiple filers means that proxies are sorted in the order in which the filers appear.
-	// Although the filter has been performed once in the previous process,
-	// when there are multiple providers, the array needs to be reordered as a whole.
 	if len(gb.providers) > 1 && len(gb.filterRegs) > 1 {
 		var newProxies []C.Proxy
 		proxiesSet := map[string]struct{}{}
 		for _, filterReg := range gb.filterRegs {
 			for _, p := range proxies {
 				name := p.Name()
-				if mat, _ := filterReg.MatchString(name); mat {
+				if mat, _ := filterReg.FindStringMatch(name); mat != nil {
 					if _, ok := proxiesSet[name]; !ok {
 						proxiesSet[name] = struct{}{}
 						newProxies = append(newProxies, p)
@@ -172,31 +154,32 @@ func (gb *GroupBase) GetProxies(touch bool) []C.Proxy {
 		}
 		proxies = newProxies
 	}
-
-	if len(gb.excludeFilterRegs) > 0 {
+	if gb.excludeTypeArray != nil {
 		var newProxies []C.Proxy
-	LOOP1:
 		for _, p := range proxies {
-			name := p.Name()
-			for _, excludeFilterReg := range gb.excludeFilterRegs {
-				if mat, _ := excludeFilterReg.MatchString(name); mat {
-					continue LOOP1
+			mType := p.Type().String()
+			flag := false
+			for i := range gb.excludeTypeArray {
+				if strings.EqualFold(mType, gb.excludeTypeArray[i]) {
+					flag = true
+					break
 				}
+
+			}
+			if flag {
+				continue
 			}
 			newProxies = append(newProxies, p)
 		}
 		proxies = newProxies
 	}
 
-	if gb.excludeTypeArray != nil {
+	if gb.excludeFilterReg != nil {
 		var newProxies []C.Proxy
-	LOOP2:
 		for _, p := range proxies {
-			mType := p.Type().String()
-			for _, excludeType := range gb.excludeTypeArray {
-				if strings.EqualFold(mType, excludeType) {
-					continue LOOP2
-				}
+			name := p.Name()
+			if mat, _ := gb.excludeFilterReg.FindStringMatch(name); mat != nil {
+				continue
 			}
 			newProxies = append(newProxies, p)
 		}
@@ -204,13 +187,9 @@ func (gb *GroupBase) GetProxies(touch bool) []C.Proxy {
 	}
 
 	if len(proxies) == 0 {
-		return []C.Proxy{tunnel.Proxies()["COMPATIBLE"]}
+		return append(proxies, tunnel.Proxies()["COMPATIBLE"])
 	}
 
-	// only cache when proxies not empty
-	gb.providerVersions = providerVersions
-	gb.providerProxies = proxies
-
 	return proxies
 }
 
@@ -242,21 +221,17 @@ func (gb *GroupBase) URLTest(ctx context.Context, url string, expectedStatus uti
 	}
 }
 
-func (gb *GroupBase) onDialFailed(adapterType C.AdapterType, err error, fn func()) {
+func (gb *GroupBase) onDialFailed(adapterType C.AdapterType, err error) {
 	if adapterType == C.Direct || adapterType == C.Compatible || adapterType == C.Reject || adapterType == C.Pass || adapterType == C.RejectDrop {
 		return
 	}
 
-	if errors.Is(err, C.ErrNotSupport) {
+	if strings.Contains(err.Error(), "connection refused") {
+		go gb.healthCheck()
 		return
 	}
 
 	go func() {
-		if strings.Contains(err.Error(), "connection refused") {
-			fn()
-			return
-		}
-
 		gb.failedTestMux.Lock()
 		defer gb.failedTestMux.Unlock()
 
@@ -265,15 +240,15 @@ func (gb *GroupBase) onDialFailed(adapterType C.AdapterType, err error, fn func(
 			log.Debugln("ProxyGroup: %s first failed", gb.Name())
 			gb.failedTime = time.Now()
 		} else {
-			if time.Since(gb.failedTime) > time.Duration(gb.TestTimeout)*time.Millisecond {
+			if time.Since(gb.failedTime) > gb.failedTimeoutInterval() {
 				gb.failedTimes = 0
 				return
 			}
 
 			log.Debugln("ProxyGroup: %s failed count: %d", gb.Name(), gb.failedTimes)
-			if gb.failedTimes >= gb.maxFailedTimes {
-				log.Warnln("because %s failed multiple times, activate health check", gb.Name())
-				fn()
+			if gb.failedTimes >= gb.maxFailedTimes() {
+				log.Warnln("because %s failed multiple times, active health check", gb.Name())
+				gb.healthCheck()
 			}
 		}
 	}()
@@ -300,8 +275,20 @@ func (gb *GroupBase) healthCheck() {
 	gb.failedTimes = 0
 }
 
+func (gb *GroupBase) failedIntervalTime() int64 {
+	return 5 * time.Second.Milliseconds()
+}
+
 func (gb *GroupBase) onDialSuccess() {
 	if !gb.failedTesting.Load() {
 		gb.failedTimes = 0
 	}
 }
+
+func (gb *GroupBase) maxFailedTimes() int {
+	return 5
+}
+
+func (gb *GroupBase) failedTimeoutInterval() time.Duration {
+	return 5 * time.Second
+}

adapter/outboundgroup/loadbalance.go

@@ -9,12 +9,14 @@ import (
 	"sync"
 	"time"
 
+	"github.com/metacubex/mihomo/adapter/outbound"
 	"github.com/metacubex/mihomo/common/callback"
 	"github.com/metacubex/mihomo/common/lru"
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/common/utils"
+	"github.com/metacubex/mihomo/component/dialer"
 	C "github.com/metacubex/mihomo/constant"
-	P "github.com/metacubex/mihomo/constant/provider"
+	"github.com/metacubex/mihomo/constant/provider"
 
 	"golang.org/x/net/publicsuffix"
 )
@@ -27,8 +29,6 @@ type LoadBalance struct {
 	strategyFn     strategyFn
 	testUrl        string
 	expectedStatus string
-	Hidden         bool
-	Icon           string
 }
 
 var errStrategy = errors.New("unsupported strategy")
@@ -86,14 +86,14 @@ func jumpHash(key uint64, buckets int32) int32 {
 }
 
 // DialContext implements C.ProxyAdapter
-func (lb *LoadBalance) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Conn, err error) {
+func (lb *LoadBalance) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (c C.Conn, err error) {
 	proxy := lb.Unwrap(metadata, true)
-	c, err = proxy.DialContext(ctx, metadata)
+	c, err = proxy.DialContext(ctx, metadata, lb.Base.DialOptions(opts...)...)
 
 	if err == nil {
 		c.AppendToChains(lb)
 	} else {
-		lb.onDialFailed(proxy.Type(), err, lb.healthCheck)
+		lb.onDialFailed(proxy.Type(), err)
 	}
 
 	if N.NeedHandshake(c) {
@@ -101,7 +101,7 @@ func (lb *LoadBalance) DialContext(ctx context.Context, metadata *C.Metadata) (c
 			if err == nil {
 				lb.onDialSuccess()
 			} else {
-				lb.onDialFailed(proxy.Type(), err, lb.healthCheck)
+				lb.onDialFailed(proxy.Type(), err)
 			}
 		})
 	}
@@ -110,7 +110,7 @@ func (lb *LoadBalance) DialContext(ctx context.Context, metadata *C.Metadata) (c
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (lb *LoadBalance) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (pc C.PacketConn, err error) {
+func (lb *LoadBalance) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (pc C.PacketConn, err error) {
 	defer func() {
 		if err == nil {
 			pc.AppendToChains(lb)
@@ -118,7 +118,7 @@ func (lb *LoadBalance) ListenPacketContext(ctx context.Context, metadata *C.Meta
 	}()
 
 	proxy := lb.Unwrap(metadata, true)
-	return proxy.ListenPacketContext(ctx, metadata)
+	return proxy.ListenPacketContext(ctx, metadata, lb.Base.DialOptions(opts...)...)
 }
 
 // SupportUDP implements C.ProxyAdapter
@@ -150,6 +150,7 @@ func strategyRoundRobin(url string) strategyFn {
 		for ; i < length; i++ {
 			id := (idx + i) % length
 			proxy := proxies[id]
+			// if proxy.Alive() {
 			if proxy.AliveForTestUrl(url) {
 				i++
 				return proxy
@@ -168,6 +169,7 @@ func strategyConsistentHashing(url string) strategyFn {
 		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) {
 				return proxy
 			}
@@ -175,6 +177,7 @@ func strategyConsistentHashing(url string) strategyFn {
 
 		// when availability is poor, traverse the entire list to get the available nodes
 		for _, proxy := range proxies {
+			// if proxy.Alive() {
 			if proxy.AliveForTestUrl(url) {
 				return proxy
 			}
@@ -194,15 +197,17 @@ func strategyStickySessions(url string) strategyFn {
 		key := utils.MapHash(getKeyWithSrcAndDst(metadata))
 		length := len(proxies)
 		idx, has := lruCache.Get(key)
-		if !has || idx >= length {
+		if !has {
 			idx = int(jumpHash(key+uint64(time.Now().UnixNano()), int32(length)))
 		}
 
 		nowIdx := idx
 		for i := 1; i < maxRetry; i++ {
 			proxy := proxies[nowIdx]
+			// if proxy.Alive() {
 			if proxy.AliveForTestUrl(url) {
-				if !has || nowIdx != idx {
+				if nowIdx != idx {
+					lruCache.Delete(key)
 					lruCache.Set(key, nowIdx)
 				}
 
@@ -212,6 +217,7 @@ func strategyStickySessions(url string) strategyFn {
 			}
 		}
 
+		lruCache.Delete(key)
 		lruCache.Set(key, 0)
 		return proxies[0]
 	}
@@ -234,24 +240,10 @@ func (lb *LoadBalance) MarshalJSON() ([]byte, error) {
 		"all":            all,
 		"testUrl":        lb.testUrl,
 		"expectedStatus": lb.expectedStatus,
-		"hidden":         lb.Hidden,
-		"icon":           lb.Icon,
 	})
 }
 
-func (lb *LoadBalance) Providers() []P.ProxyProvider {
-	return lb.providers
-}
-
-func (lb *LoadBalance) Proxies() []C.Proxy {
-	return lb.GetProxies(false)
-}
-
-func (lb *LoadBalance) Now() string {
-	return ""
-}
-
-func NewLoadBalance(option *GroupCommonOption, providers []P.ProxyProvider, strategy string) (lb *LoadBalance, err error) {
+func NewLoadBalance(option *GroupCommonOption, providers []provider.ProxyProvider, strategy string) (lb *LoadBalance, err error) {
 	var strategyFn strategyFn
 	switch strategy {
 	case "consistent-hashing":
@@ -265,20 +257,20 @@ func NewLoadBalance(option *GroupCommonOption, providers []P.ProxyProvider, stra
 	}
 	return &LoadBalance{
 		GroupBase: NewGroupBase(GroupBaseOption{
-			Name:           option.Name,
-			Type:           C.LoadBalance,
-			Filter:         option.Filter,
-			ExcludeFilter:  option.ExcludeFilter,
-			ExcludeType:    option.ExcludeType,
-			TestTimeout:    option.TestTimeout,
-			MaxFailedTimes: option.MaxFailedTimes,
-			Providers:      providers,
+			outbound.BaseOption{
+				Name:        option.Name,
+				Type:        C.LoadBalance,
+				Interface:   option.Interface,
+				RoutingMark: option.RoutingMark,
+			},
+			option.Filter,
+			option.ExcludeFilter,
+			option.ExcludeType,
+			providers,
 		}),
 		strategyFn:     strategyFn,
 		disableUDP:     option.DisableUDP,
 		testUrl:        option.URL,
 		expectedStatus: option.ExpectedStatus,
-		Hidden:         option.Hidden,
-		Icon:           option.Icon,
 	}, nil
 }

adapter/outboundgroup/parser.go

@@ -5,14 +5,12 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/dlclark/regexp2"
-
+	"github.com/metacubex/mihomo/adapter/outbound"
 	"github.com/metacubex/mihomo/adapter/provider"
 	"github.com/metacubex/mihomo/common/structure"
 	"github.com/metacubex/mihomo/common/utils"
 	C "github.com/metacubex/mihomo/constant"
-	P "github.com/metacubex/mihomo/constant/provider"
-	"github.com/metacubex/mihomo/log"
+	types "github.com/metacubex/mihomo/constant/provider"
 )
 
 var (
@@ -23,28 +21,23 @@ var (
 )
 
 type GroupCommonOption struct {
+	outbound.BasicOption
 	Name                string   `group:"name"`
 	Type                string   `group:"type"`
 	Proxies             []string `group:"proxies,omitempty"`
 	Use                 []string `group:"use,omitempty"`
 	URL                 string   `group:"url,omitempty"`
 	Interval            int      `group:"interval,omitempty"`
-	TestTimeout         int      `group:"timeout,omitempty"`
-	MaxFailedTimes      int      `group:"max-failed-times,omitempty"`
 	Lazy                bool     `group:"lazy,omitempty"`
 	DisableUDP          bool     `group:"disable-udp,omitempty"`
 	Filter              string   `group:"filter,omitempty"`
 	ExcludeFilter       string   `group:"exclude-filter,omitempty"`
 	ExcludeType         string   `group:"exclude-type,omitempty"`
 	ExpectedStatus      string   `group:"expected-status,omitempty"`
-	IncludeAll          bool     `group:"include-all,omitempty"`
-	IncludeAllProxies   bool     `group:"include-all-proxies,omitempty"`
 	IncludeAllProviders bool     `group:"include-all-providers,omitempty"`
-	Hidden              bool     `group:"hidden,omitempty"`
-	Icon                string   `group:"icon,omitempty"`
 }
 
-func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, providersMap map[string]P.ProxyProvider, AllProxies []string, AllProviders []string) (C.ProxyAdapter, error) {
+func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, providersMap map[string]types.ProxyProvider) (C.ProxyAdapter, error) {
 	decoder := structure.NewDecoder(structure.Option{TagName: "group", WeaklyTypedInput: true})
 
 	groupOption := &GroupCommonOption{
@@ -58,55 +51,26 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
 		return nil, errFormat
 	}
 
-	if _, ok := config["routing-mark"]; ok {
-		log.Errorln("The group [%s] with routing-mark configuration was removed, please set it directly on the proxy instead", groupOption.Name)
-	}
-	if _, ok := config["interface-name"]; ok {
-		log.Errorln("The group [%s] with interface-name configuration was removed, please set it directly on the proxy instead", groupOption.Name)
-	}
-	if _, ok := config["dialer-proxy"]; ok {
-		log.Errorln("The group [%s] with dialer-proxy configuration is not allowed, please set it directly on the proxy instead", groupOption.Name)
-	}
-
 	groupName := groupOption.Name
 
-	providers := []P.ProxyProvider{}
-
-	if groupOption.IncludeAll {
-		groupOption.IncludeAllProviders = true
-		groupOption.IncludeAllProxies = true
-	}
+	providers := []types.ProxyProvider{}
 
+	var GroupUse []string
+	visited := make(map[string]bool)
 	if groupOption.IncludeAllProviders {
-		groupOption.Use = AllProviders
-	}
-	if groupOption.IncludeAllProxies {
-		if groupOption.Filter != "" {
-			var filterRegs []*regexp2.Regexp
-			for _, filter := range strings.Split(groupOption.Filter, "`") {
-				filterReg := regexp2.MustCompile(filter, regexp2.None)
-				filterRegs = append(filterRegs, filterReg)
-			}
-			for _, p := range AllProxies {
-				for _, filterReg := range filterRegs {
-					if mat, _ := filterReg.MatchString(p); mat {
-						groupOption.Proxies = append(groupOption.Proxies, p)
-					}
-				}
-			}
-		} else {
-			groupOption.Proxies = append(groupOption.Proxies, AllProxies...)
-		}
-		if len(groupOption.Proxies) == 0 && len(groupOption.Use) == 0 {
-			groupOption.Proxies = []string{"COMPATIBLE"}
+		for name := range provider.ProxyProviderName {
+			GroupUse = append(GroupUse, name)
+			visited[name] = true
 		}
+	} else {
+		GroupUse = groupOption.Use
 	}
 
-	if len(groupOption.Proxies) == 0 && len(groupOption.Use) == 0 {
+	if len(groupOption.Proxies) == 0 && len(GroupUse) == 0 {
 		return nil, fmt.Errorf("%s: %w", groupName, errMissProxy)
 	}
 
-	expectedStatus, err := utils.NewUnsignedRanges[uint16](groupOption.ExpectedStatus)
+	expectedStatus, err := utils.NewIntRanges[uint16](groupOption.ExpectedStatus)
 	if err != nil {
 		return nil, fmt.Errorf("%s: %w", groupName, err)
 	}
@@ -116,29 +80,7 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
 		status = "*"
 	}
 	groupOption.ExpectedStatus = status
-
-	if len(groupOption.Use) != 0 {
-		PDs, err := getProviders(providersMap, groupOption.Use)
-		if err != nil {
-			return nil, fmt.Errorf("%s: %w", groupName, err)
-		}
-
-		// if test URL is empty, use the first health check URL of providers
-		if groupOption.URL == "" {
-			for _, pd := range PDs {
-				if pd.HealthCheckURL() != "" {
-					groupOption.URL = pd.HealthCheckURL()
-					break
-				}
-			}
-			if groupOption.URL == "" {
-				groupOption.URL = C.DefaultTestURL
-			}
-		} else {
-			addTestUrlToProviders(PDs, groupOption.URL, expectedStatus, groupOption.Filter, uint(groupOption.Interval))
-		}
-		providers = append(providers, PDs...)
-	}
+	testUrl := groupOption.URL
 
 	if len(groupOption.Proxies) != 0 {
 		ps, err := getProxies(proxyMap, groupOption.Proxies)
@@ -150,28 +92,43 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
 			return nil, fmt.Errorf("%s: %w", groupName, errDuplicateProvider)
 		}
 
-		if groupOption.URL == "" {
-			groupOption.URL = C.DefaultTestURL
-		}
-
-		// select don't need auto health check
+		// select don't need health check
 		if groupOption.Type != "select" && groupOption.Type != "relay" {
+			if groupOption.URL == "" {
+				groupOption.URL = C.DefaultTestURL
+				testUrl = groupOption.URL
+			}
+
 			if groupOption.Interval == 0 {
 				groupOption.Interval = 300
 			}
 		}
 
-		hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.TestTimeout), uint(groupOption.Interval), groupOption.Lazy, expectedStatus)
+		hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.Interval), true, expectedStatus)
 
 		pd, err := provider.NewCompatibleProvider(groupName, ps, hc)
 		if err != nil {
 			return nil, fmt.Errorf("%s: %w", groupName, err)
 		}
 
-		providers = append([]P.ProxyProvider{pd}, providers...)
+		providers = append(providers, pd)
 		providersMap[groupName] = pd
 	}
 
+	if len(GroupUse) != 0 {
+		list, err := getProviders(providersMap, GroupUse)
+		if err != nil {
+			return nil, fmt.Errorf("%s: %w", groupName, err)
+		}
+
+		// different proxy groups use different test URL
+		addTestUrlToProviders(list, testUrl, expectedStatus, groupOption.Filter, uint(groupOption.Interval))
+
+		providers = append(providers, list...)
+	} else {
+		groupOption.Filter = ""
+	}
+
 	var group C.ProxyAdapter
 	switch groupOption.Type {
 	case "url-test":
@@ -185,7 +142,7 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
 		strategy := parseStrategy(config)
 		return NewLoadBalance(groupOption, providers, strategy)
 	case "relay":
-		return nil, fmt.Errorf("%w: The group [%s] with relay type was removed, please using dialer-proxy instead", errType, groupName)
+		group = NewRelay(groupOption, providers)
 	default:
 		return nil, fmt.Errorf("%w: %s", errType, groupOption.Type)
 	}
@@ -205,15 +162,15 @@ func getProxies(mapping map[string]C.Proxy, list []string) ([]C.Proxy, error) {
 	return ps, nil
 }
 
-func getProviders(mapping map[string]P.ProxyProvider, list []string) ([]P.ProxyProvider, error) {
-	var ps []P.ProxyProvider
+func getProviders(mapping map[string]types.ProxyProvider, list []string) ([]types.ProxyProvider, error) {
+	var ps []types.ProxyProvider
 	for _, name := range list {
 		p, ok := mapping[name]
 		if !ok {
 			return nil, fmt.Errorf("'%s' not found", name)
 		}
 
-		if p.VehicleType() == P.Compatible {
+		if p.VehicleType() == types.Compatible {
 			return nil, fmt.Errorf("proxy group %s can't contains in `use`", name)
 		}
 		ps = append(ps, p)
@@ -221,7 +178,7 @@ func getProviders(mapping map[string]P.ProxyProvider, list []string) ([]P.ProxyP
 	return ps, nil
 }
 
-func addTestUrlToProviders(providers []P.ProxyProvider, url string, expectedStatus utils.IntRanges[uint16], filter string, interval uint) {
+func addTestUrlToProviders(providers []types.ProxyProvider, url string, expectedStatus utils.IntRanges[uint16], filter string, interval uint) {
 	if len(providers) == 0 || len(url) == 0 {
 		return
 	}

adapter/outboundgroup/patch_android.go

@@ -0,0 +1,64 @@
+//go:build android && cmfa
+
+package outboundgroup
+
+import (
+	C "github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/constant/provider"
+)
+
+type ProxyGroup interface {
+	C.ProxyAdapter
+
+	Providers() []provider.ProxyProvider
+	Proxies() []C.Proxy
+	Now() string
+}
+
+func (f *Fallback) Providers() []provider.ProxyProvider {
+	return f.providers
+}
+
+func (lb *LoadBalance) Providers() []provider.ProxyProvider {
+	return lb.providers
+}
+
+func (f *Fallback) Proxies() []C.Proxy {
+	return f.GetProxies(false)
+}
+
+func (lb *LoadBalance) Proxies() []C.Proxy {
+	return lb.GetProxies(false)
+}
+
+func (lb *LoadBalance) Now() string {
+	return ""
+}
+
+func (r *Relay) Providers() []provider.ProxyProvider {
+	return r.providers
+}
+
+func (r *Relay) Proxies() []C.Proxy {
+	return r.GetProxies(false)
+}
+
+func (r *Relay) Now() string {
+	return ""
+}
+
+func (s *Selector) Providers() []provider.ProxyProvider {
+	return s.providers
+}
+
+func (s *Selector) Proxies() []C.Proxy {
+	return s.GetProxies(false)
+}
+
+func (u *URLTest) Providers() []provider.ProxyProvider {
+	return u.providers
+}
+
+func (u *URLTest) Proxies() []C.Proxy {
+	return u.GetProxies(false)
+}

adapter/outboundgroup/relay.go

@@ -0,0 +1,161 @@
+package outboundgroup
+
+import (
+	"context"
+	"encoding/json"
+	"github.com/metacubex/mihomo/adapter/outbound"
+	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/component/proxydialer"
+	C "github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/constant/provider"
+)
+
+type Relay struct {
+	*GroupBase
+}
+
+// DialContext implements C.ProxyAdapter
+func (r *Relay) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
+	proxies, chainProxies := r.proxies(metadata, true)
+
+	switch len(proxies) {
+	case 0:
+		return outbound.NewDirect().DialContext(ctx, metadata, r.Base.DialOptions(opts...)...)
+	case 1:
+		return proxies[0].DialContext(ctx, metadata, r.Base.DialOptions(opts...)...)
+	}
+	var d C.Dialer
+	d = dialer.NewDialer(r.Base.DialOptions(opts...)...)
+	for _, proxy := range proxies[:len(proxies)-1] {
+		d = proxydialer.New(proxy, d, false)
+	}
+	last := proxies[len(proxies)-1]
+	conn, err := last.DialContextWithDialer(ctx, d, metadata)
+	if err != nil {
+		return nil, err
+	}
+
+	for i := len(chainProxies) - 2; i >= 0; i-- {
+		conn.AppendToChains(chainProxies[i])
+	}
+
+	conn.AppendToChains(r)
+
+	return conn, nil
+}
+
+// ListenPacketContext implements C.ProxyAdapter
+func (r *Relay) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
+	proxies, chainProxies := r.proxies(metadata, true)
+
+	switch len(proxies) {
+	case 0:
+		return outbound.NewDirect().ListenPacketContext(ctx, metadata, r.Base.DialOptions(opts...)...)
+	case 1:
+		return proxies[0].ListenPacketContext(ctx, metadata, r.Base.DialOptions(opts...)...)
+	}
+
+	var d C.Dialer
+	d = dialer.NewDialer(r.Base.DialOptions(opts...)...)
+	for _, proxy := range proxies[:len(proxies)-1] {
+		d = proxydialer.New(proxy, d, false)
+	}
+	last := proxies[len(proxies)-1]
+	pc, err := last.ListenPacketWithDialer(ctx, d, metadata)
+	if err != nil {
+		return nil, err
+	}
+
+	for i := len(chainProxies) - 2; i >= 0; i-- {
+		pc.AppendToChains(chainProxies[i])
+	}
+
+	pc.AppendToChains(r)
+
+	return pc, nil
+}
+
+// SupportUDP implements C.ProxyAdapter
+func (r *Relay) SupportUDP() bool {
+	proxies, _ := r.proxies(nil, false)
+	if len(proxies) == 0 { // C.Direct
+		return true
+	}
+	for i := len(proxies) - 1; i >= 0; i-- {
+		proxy := proxies[i]
+		if !proxy.SupportUDP() {
+			return false
+		}
+		if proxy.SupportUOT() {
+			return true
+		}
+		switch proxy.SupportWithDialer() {
+		case C.ALLNet:
+		case C.UDP:
+		default: // C.TCP and C.InvalidNet
+			return false
+		}
+	}
+	return true
+}
+
+// MarshalJSON implements C.ProxyAdapter
+func (r *Relay) MarshalJSON() ([]byte, error) {
+	all := []string{}
+	for _, proxy := range r.GetProxies(false) {
+		all = append(all, proxy.Name())
+	}
+	return json.Marshal(map[string]any{
+		"type": r.Type().String(),
+		"all":  all,
+	})
+}
+
+func (r *Relay) proxies(metadata *C.Metadata, touch bool) ([]C.Proxy, []C.Proxy) {
+	rawProxies := r.GetProxies(touch)
+
+	var proxies []C.Proxy
+	var chainProxies []C.Proxy
+	var targetProxies []C.Proxy
+
+	for n, proxy := range rawProxies {
+		proxies = append(proxies, proxy)
+		chainProxies = append(chainProxies, proxy)
+		subproxy := proxy.Unwrap(metadata, touch)
+		for subproxy != nil {
+			chainProxies = append(chainProxies, subproxy)
+			proxies[n] = subproxy
+			subproxy = subproxy.Unwrap(metadata, touch)
+		}
+	}
+
+	for _, proxy := range proxies {
+		if proxy.Type() != C.Direct && proxy.Type() != C.Compatible {
+			targetProxies = append(targetProxies, proxy)
+		}
+	}
+
+	return targetProxies, chainProxies
+}
+
+func (r *Relay) Addr() string {
+	proxies, _ := r.proxies(nil, false)
+	return proxies[len(proxies)-1].Addr()
+}
+
+func NewRelay(option *GroupCommonOption, providers []provider.ProxyProvider) *Relay {
+	return &Relay{
+		GroupBase: NewGroupBase(GroupBaseOption{
+			outbound.BaseOption{
+				Name:        option.Name,
+				Type:        C.Relay,
+				Interface:   option.Interface,
+				RoutingMark: option.RoutingMark,
+			},
+			"",
+			"",
+			"",
+			providers,
+		}),
+	}
+}

adapter/outboundgroup/selector.go

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

adapter/outboundgroup/urltest.go

@@ -6,12 +6,13 @@ import (
 	"errors"
 	"time"
 
+	"github.com/metacubex/mihomo/adapter/outbound"
 	"github.com/metacubex/mihomo/common/callback"
 	N "github.com/metacubex/mihomo/common/net"
 	"github.com/metacubex/mihomo/common/singledo"
-	"github.com/metacubex/mihomo/common/utils"
+	"github.com/metacubex/mihomo/component/dialer"
 	C "github.com/metacubex/mihomo/constant"
-	P "github.com/metacubex/mihomo/constant/provider"
+	"github.com/metacubex/mihomo/constant/provider"
 )
 
 type urlTestOption func(*URLTest)
@@ -29,8 +30,6 @@ type URLTest struct {
 	expectedStatus string
 	tolerance      uint16
 	disableUDP     bool
-	Hidden         bool
-	Icon           string
 	fastNode       C.Proxy
 	fastSingle     *singledo.Single[C.Proxy]
 }
@@ -50,23 +49,23 @@ func (u *URLTest) Set(name string) error {
 	if p == nil {
 		return errors.New("proxy not exist")
 	}
-	u.ForceSet(name)
+	u.selected = name
+	u.fast(false)
 	return nil
 }
 
 func (u *URLTest) ForceSet(name string) {
 	u.selected = name
-	u.fastSingle.Reset()
 }
 
 // DialContext implements C.ProxyAdapter
-func (u *URLTest) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Conn, err error) {
+func (u *URLTest) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (c C.Conn, err error) {
 	proxy := u.fast(true)
-	c, err = proxy.DialContext(ctx, metadata)
+	c, err = proxy.DialContext(ctx, metadata, u.Base.DialOptions(opts...)...)
 	if err == nil {
 		c.AppendToChains(u)
 	} else {
-		u.onDialFailed(proxy.Type(), err, u.healthCheck)
+		u.onDialFailed(proxy.Type(), err)
 	}
 
 	if N.NeedHandshake(c) {
@@ -74,7 +73,7 @@ func (u *URLTest) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Co
 			if err == nil {
 				u.onDialSuccess()
 			} else {
-				u.onDialFailed(proxy.Type(), err, u.healthCheck)
+				u.onDialFailed(proxy.Type(), err)
 			}
 		})
 	}
@@ -83,13 +82,10 @@ func (u *URLTest) DialContext(ctx context.Context, metadata *C.Metadata) (c C.Co
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (u *URLTest) ListenPacketContext(ctx context.Context, metadata *C.Metadata) (C.PacketConn, error) {
-	proxy := u.fast(true)
-	pc, err := proxy.ListenPacketContext(ctx, metadata)
+func (u *URLTest) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
+	pc, err := u.fast(true).ListenPacketContext(ctx, metadata, u.Base.DialOptions(opts...)...)
 	if err == nil {
 		pc.AppendToChains(u)
-	} else {
-		u.onDialFailed(proxy.Type(), err, u.healthCheck)
 	}
 
 	return pc, err
@@ -100,29 +96,24 @@ func (u *URLTest) Unwrap(metadata *C.Metadata, touch bool) C.Proxy {
 	return u.fast(touch)
 }
 
-func (u *URLTest) healthCheck() {
-	u.fastSingle.Reset()
-	u.GroupBase.healthCheck()
-	u.fastSingle.Reset()
-}
-
 func (u *URLTest) fast(touch bool) C.Proxy {
-	elm, _, shared := u.fastSingle.Do(func() (C.Proxy, error) {
-		proxies := u.GetProxies(touch)
-		if u.selected != "" {
-			for _, proxy := range proxies {
-				if !proxy.AliveForTestUrl(u.testUrl) {
-					continue
-				}
-				if proxy.Name() == u.selected {
-					u.fastNode = proxy
-					return proxy, nil
-				}
+
+	proxies := u.GetProxies(touch)
+	if u.selected != "" {
+		for _, proxy := range proxies {
+			if !proxy.AliveForTestUrl(u.testUrl) {
+				continue
+			}
+			if proxy.Name() == u.selected {
+				u.fastNode = proxy
+				return proxy
 			}
 		}
+	}
 
+	elm, _, shared := u.fastSingle.Do(func() (C.Proxy, error) {
 		fast := proxies[0]
-		minDelay := fast.LastDelayForTestUrl(u.testUrl)
+		min := fast.LastDelayForTestUrl(u.testUrl)
 		fastNotExist := true
 
 		for _, proxy := range proxies[1:] {
@@ -135,9 +126,9 @@ func (u *URLTest) fast(touch bool) C.Proxy {
 			}
 
 			delay := proxy.LastDelayForTestUrl(u.testUrl)
-			if delay < minDelay {
+			if delay < min {
 				fast = proxy
-				minDelay = delay
+				min = delay
 			}
 
 		}
@@ -179,24 +170,9 @@ func (u *URLTest) MarshalJSON() ([]byte, error) {
 		"all":            all,
 		"testUrl":        u.testUrl,
 		"expectedStatus": u.expectedStatus,
-		"fixed":          u.selected,
-		"hidden":         u.Hidden,
-		"icon":           u.Icon,
 	})
 }
 
-func (u *URLTest) Providers() []P.ProxyProvider {
-	return u.providers
-}
-
-func (u *URLTest) Proxies() []C.Proxy {
-	return u.GetProxies(false)
-}
-
-func (u *URLTest) URLTest(ctx context.Context, url string, expectedStatus utils.IntRanges[uint16]) (map[string]uint16, error) {
-	return u.GroupBase.URLTest(ctx, u.testUrl, expectedStatus)
-}
-
 func parseURLTestOption(config map[string]any) []urlTestOption {
 	opts := []urlTestOption{}
 
@@ -210,24 +186,25 @@ func parseURLTestOption(config map[string]any) []urlTestOption {
 	return opts
 }
 
-func NewURLTest(option *GroupCommonOption, providers []P.ProxyProvider, options ...urlTestOption) *URLTest {
+func NewURLTest(option *GroupCommonOption, providers []provider.ProxyProvider, options ...urlTestOption) *URLTest {
 	urlTest := &URLTest{
 		GroupBase: NewGroupBase(GroupBaseOption{
-			Name:           option.Name,
-			Type:           C.URLTest,
-			Filter:         option.Filter,
-			ExcludeFilter:  option.ExcludeFilter,
-			ExcludeType:    option.ExcludeType,
-			TestTimeout:    option.TestTimeout,
-			MaxFailedTimes: option.MaxFailedTimes,
-			Providers:      providers,
+			outbound.BaseOption{
+				Name:        option.Name,
+				Type:        C.URLTest,
+				Interface:   option.Interface,
+				RoutingMark: option.RoutingMark,
+			},
+
+			option.Filter,
+			option.ExcludeFilter,
+			option.ExcludeType,
+			providers,
 		}),
 		fastSingle:     singledo.NewSingle[C.Proxy](time.Second * 10),
 		disableUDP:     option.DisableUDP,
 		testUrl:        option.URL,
 		expectedStatus: option.ExpectedStatus,
-		Hidden:         option.Hidden,
-		Icon:           option.Icon,
 	}
 
 	for _, option := range options {

adapter/outboundgroup/util.go

@@ -1,34 +1,6 @@
 package outboundgroup
 
-import (
-	"context"
-
-	"github.com/metacubex/mihomo/common/utils"
-	C "github.com/metacubex/mihomo/constant"
-	P "github.com/metacubex/mihomo/constant/provider"
-)
-
-type ProxyGroup interface {
-	C.ProxyAdapter
-
-	Providers() []P.ProxyProvider
-	Proxies() []C.Proxy
-	Now() string
-	Touch()
-
-	URLTest(ctx context.Context, url string, expectedStatus utils.IntRanges[uint16]) (mp map[string]uint16, err error)
-}
-
-var _ ProxyGroup = (*Fallback)(nil)
-var _ ProxyGroup = (*LoadBalance)(nil)
-var _ ProxyGroup = (*URLTest)(nil)
-var _ ProxyGroup = (*Selector)(nil)
-
 type SelectAble interface {
 	Set(string) error
 	ForceSet(name string)
 }
-
-var _ SelectAble = (*Fallback)(nil)
-var _ SelectAble = (*URLTest)(nil)
-var _ SelectAble = (*Selector)(nil)

adapter/parser.go

@@ -3,176 +3,130 @@ package adapter
 import (
 	"fmt"
 
+	tlsC "github.com/metacubex/mihomo/component/tls"
+
 	"github.com/metacubex/mihomo/adapter/outbound"
 	"github.com/metacubex/mihomo/common/structure"
 	C "github.com/metacubex/mihomo/constant"
 )
 
-func ParseProxy(mapping map[string]any, options ...ProxyOption) (C.Proxy, error) {
+func ParseProxy(mapping map[string]any) (C.Proxy, error) {
 	decoder := structure.NewDecoder(structure.Option{TagName: "proxy", WeaklyTypedInput: true, KeyReplacer: structure.DefaultKeyReplacer})
 	proxyType, existType := mapping["type"].(string)
 	if !existType {
 		return nil, fmt.Errorf("missing type")
 	}
 
-	opt := applyProxyOptions(options...)
-	basicOption := outbound.BasicOption{
-		DialerForAPI: opt.DialerForAPI,
-		ProviderName: opt.ProviderName,
-	}
-
 	var (
-		proxy outbound.ProxyAdapter
+		proxy C.ProxyAdapter
 		err   error
 	)
 	switch proxyType {
 	case "ss":
-		ssOption := &outbound.ShadowSocksOption{BasicOption: basicOption}
+		ssOption := &outbound.ShadowSocksOption{ClientFingerprint: tlsC.GetGlobalFingerprint()}
 		err = decoder.Decode(mapping, ssOption)
 		if err != nil {
 			break
 		}
 		proxy, err = outbound.NewShadowSocks(*ssOption)
 	case "ssr":
-		ssrOption := &outbound.ShadowSocksROption{BasicOption: basicOption}
+		ssrOption := &outbound.ShadowSocksROption{}
 		err = decoder.Decode(mapping, ssrOption)
 		if err != nil {
 			break
 		}
 		proxy, err = outbound.NewShadowSocksR(*ssrOption)
 	case "socks5":
-		socksOption := &outbound.Socks5Option{BasicOption: basicOption}
+		socksOption := &outbound.Socks5Option{}
 		err = decoder.Decode(mapping, socksOption)
 		if err != nil {
 			break
 		}
 		proxy, err = outbound.NewSocks5(*socksOption)
 	case "http":
-		httpOption := &outbound.HttpOption{BasicOption: basicOption}
+		httpOption := &outbound.HttpOption{}
 		err = decoder.Decode(mapping, httpOption)
 		if err != nil {
 			break
 		}
 		proxy, err = outbound.NewHttp(*httpOption)
 	case "vmess":
-		vmessOption := &outbound.VmessOption{BasicOption: basicOption}
+		vmessOption := &outbound.VmessOption{
+			HTTPOpts: outbound.HTTPOptions{
+				Method: "GET",
+				Path:   []string{"/"},
+			},
+			ClientFingerprint: tlsC.GetGlobalFingerprint(),
+		}
+
 		err = decoder.Decode(mapping, vmessOption)
 		if err != nil {
 			break
 		}
 		proxy, err = outbound.NewVmess(*vmessOption)
 	case "vless":
-		vlessOption := &outbound.VlessOption{BasicOption: basicOption}
+		vlessOption := &outbound.VlessOption{ClientFingerprint: tlsC.GetGlobalFingerprint()}
 		err = decoder.Decode(mapping, vlessOption)
 		if err != nil {
 			break
 		}
 		proxy, err = outbound.NewVless(*vlessOption)
 	case "snell":
-		snellOption := &outbound.SnellOption{BasicOption: basicOption}
+		snellOption := &outbound.SnellOption{}
 		err = decoder.Decode(mapping, snellOption)
 		if err != nil {
 			break
 		}
 		proxy, err = outbound.NewSnell(*snellOption)
 	case "trojan":
-		trojanOption := &outbound.TrojanOption{BasicOption: basicOption}
+		trojanOption := &outbound.TrojanOption{ClientFingerprint: tlsC.GetGlobalFingerprint()}
 		err = decoder.Decode(mapping, trojanOption)
 		if err != nil {
 			break
 		}
 		proxy, err = outbound.NewTrojan(*trojanOption)
 	case "hysteria":
-		hyOption := &outbound.HysteriaOption{BasicOption: basicOption}
+		hyOption := &outbound.HysteriaOption{}
 		err = decoder.Decode(mapping, hyOption)
 		if err != nil {
 			break
 		}
 		proxy, err = outbound.NewHysteria(*hyOption)
 	case "hysteria2":
-		hyOption := &outbound.Hysteria2Option{BasicOption: basicOption}
+		hyOption := &outbound.Hysteria2Option{}
 		err = decoder.Decode(mapping, hyOption)
 		if err != nil {
 			break
 		}
 		proxy, err = outbound.NewHysteria2(*hyOption)
 	case "wireguard":
-		wgOption := &outbound.WireGuardOption{BasicOption: basicOption}
+		wgOption := &outbound.WireGuardOption{}
 		err = decoder.Decode(mapping, wgOption)
 		if err != nil {
 			break
 		}
 		proxy, err = outbound.NewWireGuard(*wgOption)
 	case "tuic":
-		tuicOption := &outbound.TuicOption{BasicOption: basicOption}
+		tuicOption := &outbound.TuicOption{}
 		err = decoder.Decode(mapping, tuicOption)
 		if err != nil {
 			break
 		}
 		proxy, err = outbound.NewTuic(*tuicOption)
 	case "direct":
-		directOption := &outbound.DirectOption{BasicOption: basicOption}
+		directOption := &outbound.DirectOption{}
 		err = decoder.Decode(mapping, directOption)
 		if err != nil {
 			break
 		}
 		proxy = outbound.NewDirectWithOption(*directOption)
-	case "dns":
-		dnsOptions := &outbound.DnsOption{BasicOption: basicOption}
-		err = decoder.Decode(mapping, dnsOptions)
-		if err != nil {
-			break
-		}
-		proxy = outbound.NewDnsWithOption(*dnsOptions)
 	case "reject":
-		rejectOption := &outbound.RejectOption{BasicOption: basicOption}
+		rejectOption := &outbound.RejectOption{}
 		err = decoder.Decode(mapping, rejectOption)
 		if err != nil {
 			break
 		}
 		proxy = outbound.NewRejectWithOption(*rejectOption)
-	case "ssh":
-		sshOption := &outbound.SshOption{BasicOption: basicOption}
-		err = decoder.Decode(mapping, sshOption)
-		if err != nil {
-			break
-		}
-		proxy, err = outbound.NewSsh(*sshOption)
-	case "mieru":
-		mieruOption := &outbound.MieruOption{BasicOption: basicOption}
-		err = decoder.Decode(mapping, mieruOption)
-		if err != nil {
-			break
-		}
-		proxy, err = outbound.NewMieru(*mieruOption)
-	case "anytls":
-		anytlsOption := &outbound.AnyTLSOption{BasicOption: basicOption}
-		err = decoder.Decode(mapping, anytlsOption)
-		if err != nil {
-			break
-		}
-		proxy, err = outbound.NewAnyTLS(*anytlsOption)
-	case "sudoku":
-		sudokuOption := &outbound.SudokuOption{BasicOption: basicOption}
-		err = decoder.Decode(mapping, sudokuOption)
-		if err != nil {
-			break
-		}
-		proxy, err = outbound.NewSudoku(*sudokuOption)
-	case "masque":
-		masqueOption := &outbound.MasqueOption{BasicOption: basicOption}
-		err = decoder.Decode(mapping, masqueOption)
-		if err != nil {
-			break
-		}
-		proxy, err = outbound.NewMasque(*masqueOption)
-	case "trusttunnel":
-		trustTunnelOption := &outbound.TrustTunnelOption{BasicOption: basicOption}
-		err = decoder.Decode(mapping, trustTunnelOption)
-		if err != nil {
-			break
-		}
-		proxy, err = outbound.NewTrustTunnel(*trustTunnelOption)
 	default:
 		return nil, fmt.Errorf("unsupport proxy type: %s", proxyType)
 	}
@@ -188,40 +142,12 @@ func ParseProxy(mapping map[string]any, options ...ProxyOption) (C.Proxy, error)
 			return nil, err
 		}
 		if muxOption.Enabled {
-			proxy, err = outbound.NewSingMux(*muxOption, proxy)
+			proxy, err = outbound.NewSingMux(*muxOption, proxy, proxy.(outbound.ProxyBase))
 			if err != nil {
 				return nil, err
 			}
 		}
 	}
 
-	proxy = outbound.NewAutoCloseProxyAdapter(proxy)
 	return NewProxy(proxy), nil
 }
-
-type proxyOption struct {
-	DialerForAPI C.Dialer
-	ProviderName string
-}
-
-func applyProxyOptions(options ...ProxyOption) proxyOption {
-	opt := proxyOption{}
-	for _, o := range options {
-		o(&opt)
-	}
-	return opt
-}
-
-type ProxyOption func(opt *proxyOption)
-
-func WithDialerForAPI(dialer C.Dialer) ProxyOption {
-	return func(opt *proxyOption) {
-		opt.DialerForAPI = dialer
-	}
-}
-
-func WithProviderName(name string) ProxyOption {
-	return func(opt *proxyOption) {
-		opt.ProviderName = name
-	}
-}

adapter/provider/healthcheck.go

@@ -7,13 +7,17 @@ import (
 	"time"
 
 	"github.com/metacubex/mihomo/common/atomic"
+	"github.com/metacubex/mihomo/common/batch"
 	"github.com/metacubex/mihomo/common/singledo"
 	"github.com/metacubex/mihomo/common/utils"
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/log"
 
 	"github.com/dlclark/regexp2"
-	"golang.org/x/sync/errgroup"
+)
+
+const (
+	defaultURLTestTimeout = time.Second * 5
 )
 
 type HealthCheckOption struct {
@@ -27,23 +31,27 @@ type extraOption struct {
 }
 
 type HealthCheck struct {
-	ctx            context.Context
-	ctxCancel      context.CancelFunc
 	url            string
 	extra          map[string]*extraOption
 	mu             sync.Mutex
+	started        atomic.Bool
 	proxies        []C.Proxy
 	interval       time.Duration
 	lazy           bool
 	expectedStatus utils.IntRanges[uint16]
 	lastTouch      atomic.TypedValue[time.Time]
+	done           chan struct{}
 	singleDo       *singledo.Single[struct{}]
-	timeout        time.Duration
 }
 
 func (hc *HealthCheck) process() {
+	if hc.started.Load() {
+		log.Warnln("Skip start health check timer due to it's started")
+		return
+	}
+
 	ticker := time.NewTicker(hc.interval)
-	go hc.check()
+	hc.start()
 	for {
 		select {
 		case <-ticker.C:
@@ -54,14 +62,15 @@ func (hc *HealthCheck) process() {
 			} else {
 				log.Debugln("Skip once health check because we are lazy")
 			}
-		case <-hc.ctx.Done():
+		case <-hc.done:
 			ticker.Stop()
+			hc.stop()
 			return
 		}
 	}
 }
 
-func (hc *HealthCheck) setProxies(proxies []C.Proxy) {
+func (hc *HealthCheck) setProxy(proxies []C.Proxy) {
 	hc.proxies = proxies
 }
 
@@ -98,6 +107,10 @@ func (hc *HealthCheck) registerHealthCheckTask(url string, expectedStatus utils.
 	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) {
@@ -120,6 +133,14 @@ func (hc *HealthCheck) touch() {
 	hc.lastTouch.Store(time.Now())
 }
 
+func (hc *HealthCheck) start() {
+	hc.started.Store(true)
+}
+
+func (hc *HealthCheck) stop() {
+	hc.started.Store(false)
+}
+
 func (hc *HealthCheck) check() {
 	if len(hc.proxies) == 0 {
 		return
@@ -128,8 +149,7 @@ func (hc *HealthCheck) check() {
 	_, _, _ = hc.singleDo.Do(func() (struct{}, error) {
 		id := utils.NewUUIDV4().String()
 		log.Debugln("Start New Health Checking {%s}", id)
-		b := new(errgroup.Group)
-		b.SetLimit(10)
+		b, _ := batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](10))
 
 		// execute default health check
 		option := &extraOption{filters: nil, expectedStatus: hc.expectedStatus}
@@ -141,13 +161,13 @@ func (hc *HealthCheck) check() {
 				hc.execute(b, url, id, option)
 			}
 		}
-		_ = b.Wait()
+		b.Wait()
 		log.Debugln("Finish A Health Checking {%s}", id)
 		return struct{}{}, nil
 	})
 }
 
-func (hc *HealthCheck) execute(b *errgroup.Group, url, uid string, option *extraOption) {
+func (hc *HealthCheck) execute(b *batch.Batch[bool], url, uid string, option *extraOption) {
 	url = strings.TrimSpace(url)
 	if len(url) == 0 {
 		log.Debugln("Health Check has been skipped due to testUrl is empty, {%s}", uid)
@@ -164,54 +184,49 @@ func (hc *HealthCheck) execute(b *errgroup.Group, url, uid string, option *extra
 				filters = append(filters, filter)
 			}
 
-			filterReg = regexp2.MustCompile(strings.Join(filters, "|"), regexp2.None)
+			filterReg = regexp2.MustCompile(strings.Join(filters, "|"), 0)
 		}
 	}
 
 	for _, proxy := range hc.proxies {
 		// skip proxies that do not require health check
 		if filterReg != nil {
-			if match, _ := filterReg.MatchString(proxy.Name()); !match {
+			if match, _ := filterReg.FindStringMatch(proxy.Name()); match == nil {
 				continue
 			}
 		}
 
 		p := proxy
-		b.Go(func() error {
-			ctx, cancel := context.WithTimeout(hc.ctx, hc.timeout)
+		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)
 			log.Debugln("Health Checked, proxy: %s, url: %s, alive: %t, delay: %d ms uid: {%s}", p.Name(), url, p.AliveForTestUrl(url), p.LastDelayForTestUrl(url), uid)
-			return nil
+			return false, nil
 		})
 	}
 }
 
 func (hc *HealthCheck) close() {
-	hc.ctxCancel()
+	hc.done <- struct{}{}
 }
 
-func NewHealthCheck(proxies []C.Proxy, url string, timeout uint, interval uint, lazy bool, expectedStatus utils.IntRanges[uint16]) *HealthCheck {
-	if url == "" {
-		expectedStatus = nil
+func NewHealthCheck(proxies []C.Proxy, url string, interval uint, lazy bool, expectedStatus utils.IntRanges[uint16]) *HealthCheck {
+	if len(url) == 0 {
 		interval = 0
+		expectedStatus = nil
+		url = C.DefaultTestURL
 	}
-	if timeout == 0 {
-		timeout = 5000
-	}
-	ctx, cancel := context.WithCancel(context.Background())
 
 	return &HealthCheck{
-		ctx:            ctx,
-		ctxCancel:      cancel,
 		proxies:        proxies,
 		url:            url,
-		timeout:        time.Duration(timeout) * time.Millisecond,
 		extra:          map[string]*extraOption{},
 		interval:       time.Duration(interval) * time.Second,
 		lazy:           lazy,
 		expectedStatus: expectedStatus,
+		done:           make(chan struct{}, 1),
 		singleDo:       singledo.NewSingle[struct{}](time.Second),
 	}
 }

adapter/provider/override.go

@@ -1,88 +0,0 @@
-package provider
-
-import (
-	"encoding"
-	"fmt"
-
-	"github.com/dlclark/regexp2"
-)
-
-type overrideSchema struct {
-	TFO            *bool   `provider:"tfo,omitempty"`
-	MPTcp          *bool   `provider:"mptcp,omitempty"`
-	UDP            *bool   `provider:"udp,omitempty"`
-	UDPOverTCP     *bool   `provider:"udp-over-tcp,omitempty"`
-	Up             *string `provider:"up,omitempty"`
-	Down           *string `provider:"down,omitempty"`
-	DialerProxy    *string `provider:"dialer-proxy,omitempty"`
-	SkipCertVerify *bool   `provider:"skip-cert-verify,omitempty"`
-	Interface      *string `provider:"interface-name,omitempty"`
-	RoutingMark    *int    `provider:"routing-mark,omitempty"`
-	IPVersion      *string `provider:"ip-version,omitempty"`
-
-	AdditionalPrefix *string                   `provider:"additional-prefix,omitempty"`
-	AdditionalSuffix *string                   `provider:"additional-suffix,omitempty"`
-	ProxyName        []overrideProxyNameSchema `provider:"proxy-name,omitempty"`
-}
-
-type overrideProxyNameSchema struct {
-	// matching expression for regex replacement
-	Pattern *regexp2.Regexp `provider:"pattern"`
-	// the new content after regex matching
-	Target string `provider:"target"`
-}
-
-var _ encoding.TextUnmarshaler = (*regexp2.Regexp)(nil) // ensure *regexp2.Regexp can decode direct by structure package
-
-func (o *overrideSchema) Apply(mapping map[string]any) error {
-	if o.TFO != nil {
-		mapping["tfo"] = *o.TFO
-	}
-	if o.MPTcp != nil {
-		mapping["mptcp"] = *o.MPTcp
-	}
-	if o.UDP != nil {
-		mapping["udp"] = *o.UDP
-	}
-	if o.UDPOverTCP != nil {
-		mapping["udp-over-tcp"] = *o.UDPOverTCP
-	}
-	if o.Up != nil {
-		mapping["up"] = *o.Up
-	}
-	if o.Down != nil {
-		mapping["down"] = *o.Down
-	}
-	if o.DialerProxy != nil {
-		mapping["dialer-proxy"] = *o.DialerProxy
-	}
-	if o.SkipCertVerify != nil {
-		mapping["skip-cert-verify"] = *o.SkipCertVerify
-	}
-	if o.Interface != nil {
-		mapping["interface-name"] = *o.Interface
-	}
-	if o.RoutingMark != nil {
-		mapping["routing-mark"] = *o.RoutingMark
-	}
-	if o.IPVersion != nil {
-		mapping["ip-version"] = *o.IPVersion
-	}
-
-	for _, expr := range o.ProxyName {
-		name := mapping["name"].(string)
-		newName, err := expr.Pattern.Replace(name, expr.Target, 0, -1)
-		if err != nil {
-			return fmt.Errorf("proxy name replace error: %w", err)
-		}
-		mapping["name"] = newName
-	}
-	if o.AdditionalPrefix != nil {
-		mapping["name"] = fmt.Sprintf("%s%s", *o.AdditionalPrefix, mapping["name"])
-	}
-	if o.AdditionalSuffix != nil {
-		mapping["name"] = fmt.Sprintf("%s%s", mapping["name"], *o.AdditionalSuffix)
-	}
-
-	return nil
-}

adapter/provider/parser.go

@@ -9,41 +9,46 @@ import (
 	"github.com/metacubex/mihomo/common/utils"
 	"github.com/metacubex/mihomo/component/resource"
 	C "github.com/metacubex/mihomo/constant"
-	P "github.com/metacubex/mihomo/constant/provider"
+	"github.com/metacubex/mihomo/constant/features"
+	types "github.com/metacubex/mihomo/constant/provider"
 )
 
 var (
 	errVehicleType = errors.New("unsupport vehicle type")
+	errSubPath     = errors.New("path is not subpath of home directory")
 )
 
 type healthCheckSchema struct {
 	Enable         bool   `provider:"enable"`
 	URL            string `provider:"url"`
 	Interval       int    `provider:"interval"`
-	TestTimeout    int    `provider:"timeout,omitempty"`
 	Lazy           bool   `provider:"lazy,omitempty"`
 	ExpectedStatus string `provider:"expected-status,omitempty"`
 }
 
-type proxyProviderSchema struct {
-	Type          string           `provider:"type"`
-	Path          string           `provider:"path,omitempty"`
-	URL           string           `provider:"url,omitempty"`
-	Proxy         string           `provider:"proxy,omitempty"`
-	Interval      int              `provider:"interval,omitempty"`
-	Filter        string           `provider:"filter,omitempty"`
-	ExcludeFilter string           `provider:"exclude-filter,omitempty"`
-	ExcludeType   string           `provider:"exclude-type,omitempty"`
-	DialerProxy   string           `provider:"dialer-proxy,omitempty"`
-	SizeLimit     int64            `provider:"size-limit,omitempty"`
-	Payload       []map[string]any `provider:"payload,omitempty"`
-
-	HealthCheck healthCheckSchema   `provider:"health-check,omitempty"`
-	Override    overrideSchema      `provider:"override,omitempty"`
-	Header      map[string][]string `provider:"header,omitempty"`
+type OverrideSchema struct {
+	UDP            *bool   `provider:"udp,omitempty"`
+	Up             *string `provider:"up,omitempty"`
+	Down           *string `provider:"down,omitempty"`
+	DialerProxy    *string `provider:"dialer-proxy,omitempty"`
+	SkipCertVerify *bool   `provider:"skip-cert-verify,omitempty"`
 }
 
-func ParseProxyProvider(name string, mapping map[string]any) (P.ProxyProvider, error) {
+type proxyProviderSchema struct {
+	Type          string `provider:"type"`
+	Path          string `provider:"path,omitempty"`
+	URL           string `provider:"url,omitempty"`
+	Interval      int    `provider:"interval,omitempty"`
+	Filter        string `provider:"filter,omitempty"`
+	ExcludeFilter string `provider:"exclude-filter,omitempty"`
+	ExcludeType   string `provider:"exclude-type,omitempty"`
+	DialerProxy   string `provider:"dialer-proxy,omitempty"`
+
+	HealthCheck healthCheckSchema `provider:"health-check,omitempty"`
+	Override    OverrideSchema    `provider:"override,omitempty"`
+}
+
+func ParseProxyProvider(name string, mapping map[string]any) (types.ProxyProvider, error) {
 	decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
 
 	schema := &proxyProviderSchema{
@@ -55,49 +60,43 @@ func ParseProxyProvider(name string, mapping map[string]any) (P.ProxyProvider, e
 		return nil, err
 	}
 
-	expectedStatus, err := utils.NewUnsignedRanges[uint16](schema.HealthCheck.ExpectedStatus)
+	expectedStatus, err := utils.NewIntRanges[uint16](schema.HealthCheck.ExpectedStatus)
 	if err != nil {
 		return nil, err
 	}
 
 	var hcInterval uint
 	if schema.HealthCheck.Enable {
-		if schema.HealthCheck.Interval == 0 {
-			schema.HealthCheck.Interval = 300
-		}
 		hcInterval = uint(schema.HealthCheck.Interval)
 	}
-	hc := NewHealthCheck([]C.Proxy{}, schema.HealthCheck.URL, uint(schema.HealthCheck.TestTimeout), hcInterval, schema.HealthCheck.Lazy, expectedStatus)
+	hc := NewHealthCheck([]C.Proxy{}, schema.HealthCheck.URL, hcInterval, schema.HealthCheck.Lazy, expectedStatus)
 
-	parser, err := NewProxiesParser(name, schema.Filter, schema.ExcludeFilter, schema.ExcludeType, schema.DialerProxy, schema.Override)
-	if err != nil {
-		return nil, err
-	}
-
-	var vehicle P.Vehicle
+	var vehicle types.Vehicle
 	switch schema.Type {
 	case "file":
 		path := C.Path.Resolve(schema.Path)
-		if !C.Path.IsSafePath(path) {
-			return nil, C.Path.ErrNotSafePath(path)
-		}
 		vehicle = resource.NewFileVehicle(path)
 	case "http":
-		path := C.Path.GetPathByHash("proxies", schema.URL)
 		if schema.Path != "" {
-			path = C.Path.Resolve(schema.Path)
-			if !C.Path.IsSafePath(path) {
-				return nil, C.Path.ErrNotSafePath(path)
+			path := C.Path.Resolve(schema.Path)
+			if !features.CMFA && !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)
 		}
-		vehicle = resource.NewHTTPVehicle(schema.URL, path, schema.Proxy, schema.Header, resource.DefaultHttpTimeout, schema.SizeLimit)
-	case "inline":
-		return NewInlineProvider(name, schema.Payload, parser, hc)
 	default:
 		return nil, fmt.Errorf("%w: %s", errVehicleType, schema.Type)
 	}
 
 	interval := time.Duration(uint(schema.Interval)) * time.Second
+	filter := schema.Filter
+	excludeFilter := schema.ExcludeFilter
+	excludeType := schema.ExcludeType
+	dialerProxy := schema.DialerProxy
+	override := schema.Override
 
-	return NewProxySetProvider(name, interval, schema.Payload, parser, vehicle, hc)
+	return NewProxySetProvider(name, interval, filter, excludeFilter, excludeType, dialerProxy, override, vehicle, hc)
 }

adapter/provider/patch_android.go

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

adapter/provider/provider.go

@@ -1,28 +1,31 @@
 package provider
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
 	"runtime"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/common/convert"
 	"github.com/metacubex/mihomo/common/utils"
-	"github.com/metacubex/mihomo/common/yaml"
-	"github.com/metacubex/mihomo/component/profile/cachefile"
+	mihomoHttp "github.com/metacubex/mihomo/component/http"
 	"github.com/metacubex/mihomo/component/resource"
 	C "github.com/metacubex/mihomo/constant"
-	P "github.com/metacubex/mihomo/constant/provider"
+	types "github.com/metacubex/mihomo/constant/provider"
+	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/tunnel/statistic"
 
 	"github.com/dlclark/regexp2"
-	"github.com/metacubex/http"
+	"gopkg.in/yaml.v3"
 )
 
+var ProxyProviderName = make(map[string]struct{})
+
 const (
 	ReservedName = "default"
 )
@@ -31,141 +34,129 @@ type ProxySchema struct {
 	Proxies []map[string]any `yaml:"proxies"`
 }
 
-type providerForApi struct {
-	Name             string            `json:"name"`
-	Type             string            `json:"type"`
-	VehicleType      string            `json:"vehicleType"`
-	Proxies          []C.Proxy         `json:"proxies"`
-	TestUrl          string            `json:"testUrl"`
-	ExpectedStatus   string            `json:"expectedStatus"`
-	UpdatedAt        time.Time         `json:"updatedAt,omitempty"`
-	SubscriptionInfo *SubscriptionInfo `json:"subscriptionInfo,omitempty"`
-}
-
-type baseProvider struct {
-	mutex       sync.RWMutex
-	name        string
-	proxies     []C.Proxy
-	healthCheck *HealthCheck
-	version     uint32
-}
-
-func (bp *baseProvider) Name() string {
-	return bp.name
-}
-
-func (bp *baseProvider) Version() uint32 {
-	bp.mutex.RLock()
-	defer bp.mutex.RUnlock()
-	return bp.version
-}
-
-func (bp *baseProvider) Initial() error {
-	if bp.healthCheck.auto() {
-		go bp.healthCheck.process()
-	}
-	return nil
-}
-
-func (bp *baseProvider) HealthCheck() {
-	bp.healthCheck.check()
-}
-
-func (bp *baseProvider) Type() P.ProviderType {
-	return P.Proxy
-}
-
-func (bp *baseProvider) Proxies() []C.Proxy {
-	bp.mutex.RLock()
-	defer bp.mutex.RUnlock()
-	return bp.proxies
-}
-
-func (bp *baseProvider) Count() int {
-	bp.mutex.RLock()
-	defer bp.mutex.RUnlock()
-	return len(bp.proxies)
-}
-
-func (bp *baseProvider) Touch() {
-	bp.healthCheck.touch()
-}
-
-func (bp *baseProvider) HealthCheckURL() string {
-	return bp.healthCheck.url
-}
-
-func (bp *baseProvider) RegisterHealthCheckTask(url string, expectedStatus utils.IntRanges[uint16], filter string, interval uint) {
-	bp.healthCheck.registerHealthCheckTask(url, expectedStatus, filter, interval)
-}
-
-func (bp *baseProvider) setProxies(proxies []C.Proxy) {
-	bp.mutex.Lock()
-	defer bp.mutex.Unlock()
-	bp.proxies = proxies
-	bp.version += 1
-	bp.healthCheck.setProxies(proxies)
-	if bp.healthCheck.auto() {
-		go bp.healthCheck.check()
-	}
-}
-
-func (bp *baseProvider) Close() error {
-	bp.healthCheck.close()
-	return nil
-}
-
 // ProxySetProvider for auto gc
 type ProxySetProvider struct {
 	*proxySetProvider
 }
 
 type proxySetProvider struct {
-	baseProvider
 	*resource.Fetcher[[]C.Proxy]
+	proxies          []C.Proxy
+	healthCheck      *HealthCheck
+	version          uint32
 	subscriptionInfo *SubscriptionInfo
 }
 
 func (pp *proxySetProvider) MarshalJSON() ([]byte, error) {
-	return json.Marshal(providerForApi{
-		Name:             pp.Name(),
-		Type:             pp.Type().String(),
-		VehicleType:      pp.VehicleType().String(),
-		Proxies:          pp.Proxies(),
-		TestUrl:          pp.healthCheck.url,
-		ExpectedStatus:   pp.healthCheck.expectedStatus.String(),
-		UpdatedAt:        pp.UpdatedAt(),
-		SubscriptionInfo: pp.subscriptionInfo,
+	expectedStatus := "*"
+	if pp.healthCheck.expectedStatus != nil {
+		expectedStatus = pp.healthCheck.expectedStatus.ToString()
+	}
+
+	return json.Marshal(map[string]any{
+		"name":             pp.Name(),
+		"type":             pp.Type().String(),
+		"vehicleType":      pp.VehicleType().String(),
+		"proxies":          pp.Proxies(),
+		"testUrl":          pp.healthCheck.url,
+		"expectedStatus":   expectedStatus,
+		"updatedAt":        pp.UpdatedAt,
+		"subscriptionInfo": pp.subscriptionInfo,
 	})
 }
 
+func (pp *proxySetProvider) Version() uint32 {
+	return pp.version
+}
+
 func (pp *proxySetProvider) Name() string {
 	return pp.Fetcher.Name()
 }
 
+func (pp *proxySetProvider) HealthCheck() {
+	pp.healthCheck.check()
+}
+
 func (pp *proxySetProvider) Update() error {
-	_, _, err := pp.Fetcher.Update()
+	elm, same, err := pp.Fetcher.Update()
+	if err == nil && !same {
+		pp.OnUpdate(elm)
+	}
 	return err
 }
 
 func (pp *proxySetProvider) Initial() error {
-	if err := pp.baseProvider.Initial(); err != nil {
-		return err
-	}
-	_, err := pp.Fetcher.Initial()
+	elm, err := pp.Fetcher.Initial()
 	if err != nil {
 		return err
 	}
-	if subscriptionInfo := cachefile.Cache().GetSubscriptionInfo(pp.Name()); subscriptionInfo != "" {
-		pp.subscriptionInfo = NewSubscriptionInfo(subscriptionInfo)
-	}
+	pp.OnUpdate(elm)
+	pp.getSubscriptionInfo()
 	pp.closeAllConnections()
 	return nil
 }
 
+func (pp *proxySetProvider) Type() types.ProviderType {
+	return types.Proxy
+}
+
+func (pp *proxySetProvider) Proxies() []C.Proxy {
+	return pp.proxies
+}
+
+func (pp *proxySetProvider) Touch() {
+	pp.healthCheck.touch()
+}
+
+func (pp *proxySetProvider) RegisterHealthCheckTask(url string, expectedStatus utils.IntRanges[uint16], filter string, interval uint) {
+	pp.healthCheck.registerHealthCheckTask(url, expectedStatus, filter, interval)
+}
+
+func (pp *proxySetProvider) setProxies(proxies []C.Proxy) {
+	pp.proxies = proxies
+	pp.healthCheck.setProxy(proxies)
+	if pp.healthCheck.auto() {
+		go pp.healthCheck.check()
+	}
+}
+
+func (pp *proxySetProvider) getSubscriptionInfo() {
+	if pp.VehicleType() != types.HTTP {
+		return
+	}
+	go func() {
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*90)
+		defer cancel()
+		resp, err := mihomoHttp.HttpRequest(ctx, pp.Vehicle().(*resource.HTTPVehicle).Url(),
+			http.MethodGet, http.Header{"User-Agent": {C.UA}}, nil)
+		if err != nil {
+			return
+		}
+		defer resp.Body.Close()
+
+		userInfoStr := strings.TrimSpace(resp.Header.Get("subscription-userinfo"))
+		if userInfoStr == "" {
+			resp2, err := mihomoHttp.HttpRequest(ctx, pp.Vehicle().(*resource.HTTPVehicle).Url(),
+				http.MethodGet, http.Header{"User-Agent": {"Quantumultx"}}, nil)
+			if err != nil {
+				return
+			}
+			defer resp2.Body.Close()
+			userInfoStr = strings.TrimSpace(resp2.Header.Get("subscription-userinfo"))
+			if userInfoStr == "" {
+				return
+			}
+		}
+		pp.subscriptionInfo, err = NewSubscriptionInfo(userInfoStr)
+		if err != nil {
+			log.Warnln("[Provider] get subscription-userinfo: %e", err)
+		}
+	}()
+}
+
 func (pp *proxySetProvider) closeAllConnections() {
 	statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
-		for _, chain := range c.ProviderChains() {
+		for _, chain := range c.Chains() {
 			if chain == pp.Name() {
 				_ = c.Close()
 				break
@@ -175,145 +166,117 @@ func (pp *proxySetProvider) closeAllConnections() {
 	})
 }
 
-func (pp *proxySetProvider) Close() error {
-	_ = pp.baseProvider.Close()
-	return pp.Fetcher.Close()
+func stopProxyProvider(pd *ProxySetProvider) {
+	pd.healthCheck.close()
+	_ = pd.Fetcher.Destroy()
 }
 
-func NewProxySetProvider(name string, interval time.Duration, payload []map[string]any, parser resource.Parser[[]C.Proxy], vehicle P.Vehicle, hc *HealthCheck) (*ProxySetProvider, error) {
+func NewProxySetProvider(name string, interval time.Duration, filter string, excludeFilter string, excludeType string, dialerProxy string, override OverrideSchema, vehicle types.Vehicle, hc *HealthCheck) (*ProxySetProvider, error) {
+	excludeFilterReg, err := regexp2.Compile(excludeFilter, 0)
+	if err != nil {
+		return nil, fmt.Errorf("invalid excludeFilter regex: %w", err)
+	}
+	var excludeTypeArray []string
+	if excludeType != "" {
+		excludeTypeArray = strings.Split(excludeType, "|")
+	}
+
+	var filterRegs []*regexp2.Regexp
+	for _, filter := range strings.Split(filter, "`") {
+		filterReg, err := regexp2.Compile(filter, 0)
+		if err != nil {
+			return nil, fmt.Errorf("invalid filter regex: %w", err)
+		}
+		filterRegs = append(filterRegs, filterReg)
+	}
+
+	if hc.auto() {
+		go hc.process()
+	}
+
 	pd := &proxySetProvider{
-		baseProvider: baseProvider{
-			name:        name,
-			proxies:     []C.Proxy{},
-			healthCheck: hc,
-		},
+		proxies:     []C.Proxy{},
+		healthCheck: hc,
 	}
 
-	if len(payload) > 0 { // using as fallback proxies
-		ps := ProxySchema{Proxies: payload}
-		buf, err := yaml.Marshal(ps)
-		if err != nil {
-			return nil, err
-		}
-		proxies, err := parser(buf)
-		if err != nil {
-			return nil, err
-		}
-		pd.proxies = proxies
-		// direct call setProxies on hc to avoid starting a health check process immediately, it should be done by Initial()
-		hc.setProxies(proxies)
-	}
-
-	fetcher := resource.NewFetcher[[]C.Proxy](name, interval, vehicle, parser, pd.setProxies)
+	fetcher := resource.NewFetcher[[]C.Proxy](name, interval, vehicle, proxiesParseAndFilter(filter, excludeFilter, excludeTypeArray, filterRegs, excludeFilterReg, dialerProxy, override), proxiesOnUpdate(pd))
 	pd.Fetcher = fetcher
-	if httpVehicle, ok := vehicle.(*resource.HTTPVehicle); ok {
-		httpVehicle.SetInRead(func(resp *http.Response) {
-			if subscriptionInfo := resp.Header.Get("subscription-userinfo"); subscriptionInfo != "" {
-				cachefile.Cache().SetSubscriptionInfo(name, subscriptionInfo)
-				pd.subscriptionInfo = NewSubscriptionInfo(subscriptionInfo)
-			}
-		})
-	}
-
+	ProxyProviderName[name] = struct{}{}
 	wrapper := &ProxySetProvider{pd}
-	runtime.SetFinalizer(wrapper, (*ProxySetProvider).Close)
+	runtime.SetFinalizer(wrapper, stopProxyProvider)
 	return wrapper, nil
 }
 
-func (pp *ProxySetProvider) Close() error {
-	runtime.SetFinalizer(pp, nil)
-	return pp.proxySetProvider.Close()
-}
-
-// InlineProvider for auto gc
-type InlineProvider struct {
-	*inlineProvider
-}
-
-type inlineProvider struct {
-	baseProvider
-	updateAt time.Time
-}
-
-func (ip *inlineProvider) MarshalJSON() ([]byte, error) {
-	return json.Marshal(providerForApi{
-		Name:           ip.Name(),
-		Type:           ip.Type().String(),
-		VehicleType:    ip.VehicleType().String(),
-		Proxies:        ip.Proxies(),
-		TestUrl:        ip.healthCheck.url,
-		ExpectedStatus: ip.healthCheck.expectedStatus.String(),
-		UpdatedAt:      ip.updateAt,
-	})
-}
-
-func (ip *inlineProvider) VehicleType() P.VehicleType {
-	return P.Inline
-}
-
-func (ip *inlineProvider) Update() error {
-	// make api update happy
-	ip.updateAt = time.Now()
-	return nil
-}
-
-func NewInlineProvider(name string, payload []map[string]any, parser resource.Parser[[]C.Proxy], hc *HealthCheck) (*InlineProvider, error) {
-	ps := ProxySchema{Proxies: payload}
-	buf, err := yaml.Marshal(ps)
-	if err != nil {
-		return nil, err
-	}
-	proxies, err := parser(buf)
-	if err != nil {
-		return nil, err
-	}
-	// direct call setProxies on hc to avoid starting a health check process immediately, it should be done by Initial()
-	hc.setProxies(proxies)
-
-	ip := &inlineProvider{
-		baseProvider: baseProvider{
-			name:        name,
-			proxies:     proxies,
-			healthCheck: hc,
-		},
-		updateAt: time.Now(),
-	}
-	wrapper := &InlineProvider{ip}
-	runtime.SetFinalizer(wrapper, (*InlineProvider).Close)
-	return wrapper, nil
-}
-
-func (ip *InlineProvider) Close() error {
-	runtime.SetFinalizer(ip, nil)
-	return ip.baseProvider.Close()
-}
-
 // CompatibleProvider for auto gc
 type CompatibleProvider struct {
 	*compatibleProvider
 }
 
 type compatibleProvider struct {
-	baseProvider
+	name        string
+	healthCheck *HealthCheck
+	proxies     []C.Proxy
+	version     uint32
 }
 
 func (cp *compatibleProvider) MarshalJSON() ([]byte, error) {
-	return json.Marshal(providerForApi{
-		Name:           cp.Name(),
-		Type:           cp.Type().String(),
-		VehicleType:    cp.VehicleType().String(),
-		Proxies:        cp.Proxies(),
-		TestUrl:        cp.healthCheck.url,
-		ExpectedStatus: cp.healthCheck.expectedStatus.String(),
+	expectedStatus := "*"
+	if cp.healthCheck.expectedStatus != nil {
+		expectedStatus = cp.healthCheck.expectedStatus.ToString()
+	}
+
+	return json.Marshal(map[string]any{
+		"name":           cp.Name(),
+		"type":           cp.Type().String(),
+		"vehicleType":    cp.VehicleType().String(),
+		"proxies":        cp.Proxies(),
+		"testUrl":        cp.healthCheck.url,
+		"expectedStatus": expectedStatus,
 	})
 }
 
+func (cp *compatibleProvider) Version() uint32 {
+	return cp.version
+}
+
+func (cp *compatibleProvider) Name() string {
+	return cp.name
+}
+
+func (cp *compatibleProvider) HealthCheck() {
+	cp.healthCheck.check()
+}
+
 func (cp *compatibleProvider) Update() error {
 	return nil
 }
 
-func (cp *compatibleProvider) VehicleType() P.VehicleType {
-	return P.Compatible
+func (cp *compatibleProvider) Initial() error {
+	return nil
+}
+
+func (cp *compatibleProvider) VehicleType() types.VehicleType {
+	return types.Compatible
+}
+
+func (cp *compatibleProvider) Type() types.ProviderType {
+	return types.Proxy
+}
+
+func (cp *compatibleProvider) Proxies() []C.Proxy {
+	return cp.proxies
+}
+
+func (cp *compatibleProvider) Touch() {
+	cp.healthCheck.touch()
+}
+
+func (cp *compatibleProvider) RegisterHealthCheckTask(url string, expectedStatus utils.IntRanges[uint16], filter string, interval uint) {
+	cp.healthCheck.registerHealthCheckTask(url, expectedStatus, filter, interval)
+}
+
+func stopCompatibleProvider(pd *CompatibleProvider) {
+	pd.healthCheck.close()
 }
 
 func NewCompatibleProvider(name string, proxies []C.Proxy, hc *HealthCheck) (*CompatibleProvider, error) {
@@ -321,50 +284,30 @@ func NewCompatibleProvider(name string, proxies []C.Proxy, hc *HealthCheck) (*Co
 		return nil, errors.New("provider need one proxy at least")
 	}
 
+	if hc.auto() {
+		go hc.process()
+	}
+
 	pd := &compatibleProvider{
-		baseProvider: baseProvider{
-			name:        name,
-			proxies:     proxies,
-			healthCheck: hc,
-		},
+		name:        name,
+		proxies:     proxies,
+		healthCheck: hc,
 	}
 
 	wrapper := &CompatibleProvider{pd}
-	runtime.SetFinalizer(wrapper, (*CompatibleProvider).Close)
+	runtime.SetFinalizer(wrapper, stopCompatibleProvider)
 	return wrapper, nil
 }
 
-func (cp *CompatibleProvider) Close() error {
-	runtime.SetFinalizer(cp, nil)
-	return cp.compatibleProvider.Close()
+func proxiesOnUpdate(pd *proxySetProvider) func([]C.Proxy) {
+	return func(elm []C.Proxy) {
+		pd.setProxies(elm)
+		pd.version += 1
+		pd.getSubscriptionInfo()
+	}
 }
 
-func NewProxiesParser(pdName string, filter string, excludeFilter string, excludeType string, dialerProxy string, override overrideSchema) (resource.Parser[[]C.Proxy], error) {
-	var excludeTypeArray []string
-	if excludeType != "" {
-		excludeTypeArray = strings.Split(excludeType, "|")
-	}
-
-	var excludeFilterRegs []*regexp2.Regexp
-	if excludeFilter != "" {
-		for _, excludeFilter := range strings.Split(excludeFilter, "`") {
-			excludeFilterReg, err := regexp2.Compile(excludeFilter, regexp2.None)
-			if err != nil {
-				return nil, fmt.Errorf("invalid excludeFilter regex: %w", err)
-			}
-			excludeFilterRegs = append(excludeFilterRegs, excludeFilterReg)
-		}
-	}
-
-	var filterRegs []*regexp2.Regexp
-	for _, filter := range strings.Split(filter, "`") {
-		filterReg, err := regexp2.Compile(filter, regexp2.None)
-		if err != nil {
-			return nil, fmt.Errorf("invalid filter regex: %w", err)
-		}
-		filterRegs = append(filterRegs, filterReg)
-	}
-
+func proxiesParseAndFilter(filter string, excludeFilter string, excludeTypeArray []string, filterRegs []*regexp2.Regexp, excludeFilterReg *regexp2.Regexp, dialerProxy string, override OverrideSchema) resource.Parser[[]C.Proxy] {
 	return func(buf []byte) ([]C.Proxy, error) {
 		schema := &ProxySchema{}
 
@@ -383,9 +326,8 @@ func NewProxiesParser(pdName string, filter string, excludeFilter string, exclud
 		proxies := []C.Proxy{}
 		proxiesSet := map[string]struct{}{}
 		for _, filterReg := range filterRegs {
-		LOOP1:
 			for idx, mapping := range schema.Proxies {
-				if len(excludeTypeArray) > 0 {
+				if nil != excludeTypeArray && len(excludeTypeArray) > 0 {
 					mType, ok := mapping["type"]
 					if !ok {
 						continue
@@ -394,11 +336,18 @@ func NewProxiesParser(pdName string, filter string, excludeFilter string, exclud
 					if !ok {
 						continue
 					}
-					for _, excludeType := range excludeTypeArray {
-						if strings.EqualFold(pType, excludeType) {
-							continue LOOP1
+					flag := false
+					for i := range excludeTypeArray {
+						if strings.EqualFold(pType, excludeTypeArray[i]) {
+							flag = true
+							break
 						}
+
 					}
+					if flag {
+						continue
+					}
+
 				}
 				mName, ok := mapping["name"]
 				if !ok {
@@ -408,15 +357,13 @@ func NewProxiesParser(pdName string, filter string, excludeFilter string, exclud
 				if !ok {
 					continue
 				}
-				if len(excludeFilterRegs) > 0 {
-					for _, excludeFilterReg := range excludeFilterRegs {
-						if mat, _ := excludeFilterReg.MatchString(name); mat {
-							continue LOOP1
-						}
+				if len(excludeFilter) > 0 {
+					if mat, _ := excludeFilterReg.FindStringMatch(name); mat != nil {
+						continue
 					}
 				}
 				if len(filter) > 0 {
-					if mat, _ := filterReg.MatchString(name); !mat {
+					if mat, _ := filterReg.FindStringMatch(name); mat == nil {
 						continue
 					}
 				}
@@ -428,12 +375,23 @@ func NewProxiesParser(pdName string, filter string, excludeFilter string, exclud
 					mapping["dialer-proxy"] = dialerProxy
 				}
 
-				err := override.Apply(mapping)
-				if err != nil {
-					return nil, fmt.Errorf("proxy %d override error: %w", idx, err)
+				if override.UDP != nil {
+					mapping["udp"] = *override.UDP
+				}
+				if override.Up != nil {
+					mapping["up"] = *override.Up
+				}
+				if override.Down != nil {
+					mapping["down"] = *override.Down
+				}
+				if override.DialerProxy != nil {
+					mapping["dialer-proxy"] = *override.DialerProxy
+				}
+				if override.SkipCertVerify != nil {
+					mapping["skip-cert-verify"] = *override.SkipCertVerify
 				}
 
-				proxy, err := adapter.ParseProxy(mapping, adapter.WithProviderName(pdName))
+				proxy, err := adapter.ParseProxy(mapping)
 				if err != nil {
 					return nil, fmt.Errorf("proxy %d error: %w", idx, err)
 				}
@@ -451,5 +409,5 @@ func NewProxiesParser(pdName string, filter string, excludeFilter string, exclud
 		}
 
 		return proxies, nil
-	}, nil
+	}
 }

adapter/provider/subscription_info.go

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

android_tz.go

@@ -1,23 +0,0 @@
-// Copyright 2014 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.
-//go:build android && cgo
-// +build android,cgo
-
-// kanged from https://github.com/golang/mobile/blob/c713f31d574bb632a93f169b2cc99c9e753fef0e/app/android.go#L89
-
-package main
-
-// #include <time.h>
-import "C"
-import "time"
-
-func init() {
-	var currentT C.time_t
-	var currentTM C.struct_tm
-	C.time(&currentT)
-	C.localtime_r(&currentT, &currentTM)
-	tzOffset := int(currentTM.tm_gmtoff)
-	tz := C.GoString(currentTM.tm_zone)
-	time.Local = time.FixedZone(tz, tzOffset)
-}

common/arc/arc.go

@@ -20,21 +20,29 @@ func WithSize[K comparable, V any](maxSize int) Option[K, V] {
 }
 
 type ARC[K comparable, V any] struct {
-	p     int
-	c     int
-	t1    *list.List[*entry[K, V]]
-	b1    *list.List[*entry[K, V]]
-	t2    *list.List[*entry[K, V]]
-	b2    *list.List[*entry[K, V]]
-	mutex sync.Mutex
-	len   int
-	cache map[K]*entry[K, V]
+	p           int
+	c           int
+	t1          *list.List[*entry[K, V]]
+	b1          *list.List[*entry[K, V]]
+	t2          *list.List[*entry[K, V]]
+	b2          *list.List[*entry[K, V]]
+	mutex       sync.Mutex
+	len         int
+	cache       map[K]*entry[K, V]
+	staleReturn bool
 }
 
 // New returns a new Adaptive Replacement Cache (ARC).
 func New[K comparable, V any](options ...Option[K, V]) *ARC[K, V] {
-	arc := &ARC[K, V]{}
-	arc.Clear()
+	arc := &ARC[K, V]{
+		p:     0,
+		t1:    list.New[*entry[K, V]](),
+		b1:    list.New[*entry[K, V]](),
+		t2:    list.New[*entry[K, V]](),
+		b2:    list.New[*entry[K, V]](),
+		len:   0,
+		cache: make(map[K]*entry[K, V]),
+	}
 
 	for _, option := range options {
 		option(arc)
@@ -42,19 +50,6 @@ func New[K comparable, V any](options ...Option[K, V]) *ARC[K, V] {
 	return arc
 }
 
-func (a *ARC[K, V]) Clear() {
-	a.mutex.Lock()
-	defer a.mutex.Unlock()
-
-	a.p = 0
-	a.t1 = list.New[*entry[K, V]]()
-	a.b1 = list.New[*entry[K, V]]()
-	a.t2 = list.New[*entry[K, V]]()
-	a.b2 = list.New[*entry[K, V]]()
-	a.len = 0
-	a.cache = make(map[K]*entry[K, V])
-}
-
 // Set inserts a new key-value pair into the cache.
 // This optimizes future access to this entry (side effect).
 func (a *ARC[K, V]) Set(key K, value V) {
@@ -79,22 +74,20 @@ func (a *ARC[K, V]) SetWithExpire(key K, value V, expires time.Time) {
 
 func (a *ARC[K, V]) setWithExpire(key K, value V, expires time.Time) {
 	ent, ok := a.cache[key]
-	if !ok {
+	if ok != true {
 		a.len++
 		ent := &entry[K, V]{key: key, value: value, ghost: false, expires: expires.Unix()}
 		a.req(ent)
 		a.cache[key] = ent
-		return
+	} else {
+		if ent.ghost {
+			a.len++
+		}
+		ent.value = value
+		ent.ghost = false
+		ent.expires = expires.Unix()
+		a.req(ent)
 	}
-
-	if ent.ghost {
-		a.len++
-	}
-
-	ent.value = value
-	ent.ghost = false
-	ent.expires = expires.Unix()
-	a.req(ent)
 }
 
 // Get retrieves a previously via Set inserted entry.
@@ -104,25 +97,25 @@ func (a *ARC[K, V]) Get(key K) (value V, ok bool) {
 	defer a.mutex.Unlock()
 
 	ent, ok := a.get(key)
-	if !ok {
-		return lo.Empty[V](), false
+	if ok {
+		return ent.value, true
 	}
-	return ent.value, true
+	return lo.Empty[V](), false
 }
 
 func (a *ARC[K, V]) get(key K) (e *entry[K, V], ok bool) {
 	ent, ok := a.cache[key]
-	if !ok {
-		return ent, false
+	if ok {
+		a.req(ent)
+		return ent, !ent.ghost
 	}
-	a.req(ent)
-	return ent, !ent.ghost
+	return ent, false
 }
 
 // GetWithExpire returns any representation of a cached response,
 // a time.Time Give expected expires,
 // and a bool set to true if the key was found.
-// This method will NOT update the expires.
+// This method will NOT check the maxAge of element and will NOT update the expires.
 func (a *ARC[K, V]) GetWithExpire(key K) (V, time.Time, bool) {
 	a.mutex.Lock()
 	defer a.mutex.Unlock()
@@ -145,11 +138,10 @@ func (a *ARC[K, V]) Len() int {
 }
 
 func (a *ARC[K, V]) req(ent *entry[K, V]) {
-	switch {
-	case ent.ll == a.t1 || ent.ll == a.t2:
+	if ent.ll == a.t1 || ent.ll == a.t2 {
 		// Case I
 		ent.setMRU(a.t2)
-	case ent.ll == a.b1:
+	} else if ent.ll == a.b1 {
 		// Case II
 		// Cache Miss in t1 and t2
 
@@ -160,11 +152,16 @@ func (a *ARC[K, V]) req(ent *entry[K, V]) {
 		} else {
 			d = a.b2.Len() / a.b1.Len()
 		}
-		a.p = min(a.p+d, a.c)
+
+		// a.p = min(a.p+d, a.c)
+		a.p = a.p + d
+		if a.c < a.p {
+			a.p = a.c
+		}
 
 		a.replace(ent)
 		ent.setMRU(a.t2)
-	case ent.ll == a.b2:
+	} else if ent.ll == a.b2 {
 		// Case III
 		// Cache Miss in t1 and t2
 
@@ -175,30 +172,35 @@ func (a *ARC[K, V]) req(ent *entry[K, V]) {
 		} else {
 			d = a.b1.Len() / a.b2.Len()
 		}
-		a.p = max(a.p-d, 0)
+		//a.p = max(a.p-d, 0)
+		a.p = a.p - d
+		if a.p < 0 {
+			a.p = 0
+		}
 
 		a.replace(ent)
 		ent.setMRU(a.t2)
-	case ent.ll == nil && a.t1.Len()+a.b1.Len() == a.c:
-		// Case IV A
-		if a.t1.Len() < a.c {
-			a.delLRU(a.b1)
-			a.replace(ent)
-		} else {
-			a.delLRU(a.t1)
-		}
-		ent.setMRU(a.t1)
-	case ent.ll == nil && a.t1.Len()+a.b1.Len() < a.c:
-		// Case IV B
-		if a.t1.Len()+a.t2.Len()+a.b1.Len()+a.b2.Len() >= a.c {
-			if a.t1.Len()+a.t2.Len()+a.b1.Len()+a.b2.Len() == 2*a.c {
-				a.delLRU(a.b2)
+	} else if ent.ll == nil {
+		// Case IV
+
+		if a.t1.Len()+a.b1.Len() == a.c {
+			// Case A
+			if a.t1.Len() < a.c {
+				a.delLRU(a.b1)
+				a.replace(ent)
+			} else {
+				a.delLRU(a.t1)
+			}
+		} else if a.t1.Len()+a.b1.Len() < a.c {
+			// Case B
+			if a.t1.Len()+a.t2.Len()+a.b1.Len()+a.b2.Len() >= a.c {
+				if a.t1.Len()+a.t2.Len()+a.b1.Len()+a.b2.Len() == 2*a.c {
+					a.delLRU(a.b2)
+				}
+				a.replace(ent)
 			}
-			a.replace(ent)
 		}
-		ent.setMRU(a.t1)
-	case ent.ll == nil:
-		// Case IV, not A nor B
+
 		ent.setMRU(a.t1)
 	}
 }
@@ -225,17 +227,3 @@ func (a *ARC[K, V]) replace(ent *entry[K, V]) {
 		lru.setMRU(a.b2)
 	}
 }
-
-func min(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-func max(a int, b int) int {
-	if a < b {
-		return b
-	}
-	return a
-}

common/arc/arc_test.go

@@ -1,105 +1,59 @@
 package arc
 
-import (
-	"testing"
-)
+import "testing"
 
-func TestInsertion(t *testing.T) {
+func TestBasic(t *testing.T) {
 	cache := New[string, string](WithSize[string, string](3))
-	if got, want := cache.Len(), 0; got != want {
-		t.Errorf("empty cache.Len(): got %d want %d", cache.Len(), want)
+	if cache.Len() != 0 {
+		t.Error("Empty cache should have length 0")
 	}
 
-	const (
-		k1 = "Hello"
-		k2 = "Hallo"
-		k3 = "Ciao"
-		k4 = "Salut"
-
-		v1 = "World"
-		v2 = "Worlds"
-		v3 = "Welt"
-	)
-
-	// Insert the first value
-	cache.Set(k1, v1)
-	if got, want := cache.Len(), 1; got != want {
-		t.Errorf("insertion of key #%d: cache.Len(): got %d want %d", want, cache.Len(), want)
-	}
-	if got, ok := cache.Get(k1); !ok || got != v1 {
-		t.Errorf("cache.Get(%v): got (%v,%t) want (%v,true)", k1, got, ok, v1)
+	cache.Set("Hello", "World")
+	if cache.Len() != 1 {
+		t.Error("Cache should have length 1")
 	}
 
-	// Replace existing value for a given key
-	cache.Set(k1, v2)
-	if got, want := cache.Len(), 1; got != want {
-		t.Errorf("re-insertion: cache.Len(): got %d want %d", cache.Len(), want)
-	}
-	if got, ok := cache.Get(k1); !ok || got != v2 {
-		t.Errorf("re-insertion: cache.Get(%v): got (%v,%t) want (%v,true)", k1, got, ok, v2)
+	var val interface{}
+	var ok bool
+
+	if val, ok = cache.Get("Hello"); val != "World" || ok != true {
+		t.Error("Didn't set \"Hello\" to \"World\"")
 	}
 
-	// Add a second different key
-	cache.Set(k2, v3)
-	if got, want := cache.Len(), 2; got != want {
-		t.Errorf("insertion of key #%d: cache.Len(): got %d want %d", want, cache.Len(), want)
-	}
-	if got, ok := cache.Get(k1); !ok || got != v2 {
-		t.Errorf("cache.Get(%v): got (%v,%t) want (%v,true)", k1, got, ok, v2)
-	}
-	if got, ok := cache.Get(k2); !ok || got != v3 {
-		t.Errorf("cache.Get(%v): got (%v,%t) want (%v,true)", k2, got, ok, v3)
+	cache.Set("Hello", "World1")
+	if cache.Len() != 1 {
+		t.Error("Inserting the same entry multiple times shouldn't increase cache size")
 	}
 
-	// Fill cache
-	cache.Set(k3, v1)
-	if got, want := cache.Len(), 3; got != want {
-		t.Errorf("insertion of key #%d: cache.Len(): got %d want %d", want, cache.Len(), want)
+	if val, ok = cache.Get("Hello"); val != "World1" || ok != true {
+		t.Error("Didn't update \"Hello\" to \"World1\"")
 	}
 
-	// Exceed size, this should not exceed size:
-	cache.Set(k4, v1)
-	if got, want := cache.Len(), 3; got != want {
-		t.Errorf("insertion of key out of size: cache.Len(): got %d want %d", cache.Len(), want)
+	cache.Set("Hallo", "Welt")
+	if cache.Len() != 2 {
+		t.Error("Inserting two different entries should result into lenght=2")
+	}
+
+	if val, ok = cache.Get("Hallo"); val != "Welt" || ok != true {
+		t.Error("Didn't set \"Hallo\" to \"Welt\"")
 	}
 }
 
-func TestEviction(t *testing.T) {
-	size := 3
-	cache := New[string, string](WithSize[string, string](size))
-	if got, want := cache.Len(), 0; got != want {
-		t.Errorf("empty cache.Len(): got %d want %d", cache.Len(), want)
+func TestBasicReplace(t *testing.T) {
+	cache := New[string, string](WithSize[string, string](3))
+
+	cache.Set("Hello", "Hallo")
+	cache.Set("World", "Welt")
+	cache.Get("World")
+	cache.Set("Cache", "Cache")
+	cache.Set("Replace", "Ersetzen")
+
+	value, ok := cache.Get("World")
+	if !ok || value != "Welt" {
+		t.Error("ARC should have replaced \"Hello\"")
 	}
 
-	tests := []struct {
-		k, v string
-	}{
-		{"k1", "v1"},
-		{"k2", "v2"},
-		{"k3", "v3"},
-		{"k4", "v4"},
-	}
-	for i, tt := range tests[:size] {
-		cache.Set(tt.k, tt.v)
-		if got, want := cache.Len(), i+1; got != want {
-			t.Errorf("insertion of key #%d: cache.Len(): got %d want %d", want, cache.Len(), want)
-		}
-	}
-
-	// Exceed size and check we don't outgrow it:
-	cache.Set(tests[size].k, tests[size].v)
-	if got := cache.Len(); got != size {
-		t.Errorf("insertion of overflow key #%d: cache.Len(): got %d want %d", 4, cache.Len(), size)
-	}
-
-	// Check that LRU got evicted:
-	if got, ok := cache.Get(tests[0].k); ok || got != "" {
-		t.Errorf("cache.Get(%v): got (%v,%t) want (<nil>,true)", tests[0].k, got, ok)
-	}
-
-	for _, tt := range tests[1:] {
-		if got, ok := cache.Get(tt.k); !ok || got != tt.v {
-			t.Errorf("cache.Get(%v): got (%v,%t) want (%v,true)", tt.k, got, ok, tt.v)
-		}
+	if cache.Len() != 3 {
+		t.Error("ARC should have a maximum size of 3")
 	}
 }

common/atomic/enum.go

@@ -1,63 +0,0 @@
-package atomic
-
-import (
-	"encoding/json"
-	"fmt"
-	"sync/atomic"
-)
-
-type Int32Enum[T ~int32] struct {
-	value atomic.Int32
-}
-
-func (i *Int32Enum[T]) MarshalJSON() ([]byte, error) {
-	return json.Marshal(i.Load())
-}
-
-func (i *Int32Enum[T]) UnmarshalJSON(b []byte) error {
-	var v T
-	if err := json.Unmarshal(b, &v); err != nil {
-		return err
-	}
-	i.Store(v)
-	return nil
-}
-
-func (i *Int32Enum[T]) MarshalYAML() (any, error) {
-	return i.Load(), nil
-}
-
-func (i *Int32Enum[T]) UnmarshalYAML(unmarshal func(any) error) error {
-	var v T
-	if err := unmarshal(&v); err != nil {
-		return err
-	}
-	i.Store(v)
-	return nil
-}
-
-func (i *Int32Enum[T]) String() string {
-	return fmt.Sprint(i.Load())
-}
-
-func (i *Int32Enum[T]) Store(v T) {
-	i.value.Store(int32(v))
-}
-
-func (i *Int32Enum[T]) Load() T {
-	return T(i.value.Load())
-}
-
-func (i *Int32Enum[T]) Swap(new T) T {
-	return T(i.value.Swap(int32(new)))
-}
-
-func (i *Int32Enum[T]) CompareAndSwap(old, new T) bool {
-	return i.value.CompareAndSwap(int32(old), int32(new))
-}
-
-func NewInt32Enum[T ~int32](v T) *Int32Enum[T] {
-	a := &Int32Enum[T]{}
-	a.Store(v)
-	return a
-}

common/atomic/type.go

@@ -29,19 +29,6 @@ func (i *Bool) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-func (i *Bool) MarshalYAML() (any, error) {
-	return i.Load(), nil
-}
-
-func (i *Bool) UnmarshalYAML(unmarshal func(any) error) error {
-	var v bool
-	if err := unmarshal(&v); err != nil {
-		return err
-	}
-	i.Store(v)
-	return nil
-}
-
 func (i *Bool) String() string {
 	v := i.Load()
 	return strconv.FormatBool(v)
@@ -71,19 +58,6 @@ func (p *Pointer[T]) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-func (p *Pointer[T]) MarshalYAML() (any, error) {
-	return p.Load(), nil
-}
-
-func (p *Pointer[T]) UnmarshalYAML(unmarshal func(any) error) error {
-	var v *T
-	if err := unmarshal(&v); err != nil {
-		return err
-	}
-	p.Store(v)
-	return nil
-}
-
 func (p *Pointer[T]) String() string {
 	return fmt.Sprint(p.Load())
 }
@@ -110,19 +84,6 @@ func (i *Int32) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-func (i *Int32) MarshalYAML() (any, error) {
-	return i.Load(), nil
-}
-
-func (i *Int32) UnmarshalYAML(unmarshal func(any) error) error {
-	var v int32
-	if err := unmarshal(&v); err != nil {
-		return err
-	}
-	i.Store(v)
-	return nil
-}
-
 func (i *Int32) String() string {
 	v := i.Load()
 	return strconv.FormatInt(int64(v), 10)
@@ -150,19 +111,6 @@ func (i *Int64) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-func (i *Int64) MarshalYAML() (any, error) {
-	return i.Load(), nil
-}
-
-func (i *Int64) UnmarshalYAML(unmarshal func(any) error) error {
-	var v int64
-	if err := unmarshal(&v); err != nil {
-		return err
-	}
-	i.Store(v)
-	return nil
-}
-
 func (i *Int64) String() string {
 	v := i.Load()
 	return strconv.FormatInt(int64(v), 10)
@@ -190,19 +138,6 @@ func (i *Uint32) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-func (i *Uint32) MarshalYAML() (any, error) {
-	return i.Load(), nil
-}
-
-func (i *Uint32) UnmarshalYAML(unmarshal func(any) error) error {
-	var v uint32
-	if err := unmarshal(&v); err != nil {
-		return err
-	}
-	i.Store(v)
-	return nil
-}
-
 func (i *Uint32) String() string {
 	v := i.Load()
 	return strconv.FormatUint(uint64(v), 10)
@@ -230,19 +165,6 @@ func (i *Uint64) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-func (i *Uint64) MarshalYAML() (any, error) {
-	return i.Load(), nil
-}
-
-func (i *Uint64) UnmarshalYAML(unmarshal func(any) error) error {
-	var v uint64
-	if err := unmarshal(&v); err != nil {
-		return err
-	}
-	i.Store(v)
-	return nil
-}
-
 func (i *Uint64) String() string {
 	v := i.Load()
 	return strconv.FormatUint(uint64(v), 10)
@@ -270,19 +192,6 @@ func (i *Uintptr) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-func (i *Uintptr) MarshalYAML() (any, error) {
-	return i.Load(), nil
-}
-
-func (i *Uintptr) UnmarshalYAML(unmarshal func(any) error) error {
-	var v uintptr
-	if err := unmarshal(&v); err != nil {
-		return err
-	}
-	i.Store(v)
-	return nil
-}
-
 func (i *Uintptr) String() string {
 	v := i.Load()
 	return strconv.FormatUint(uint64(v), 10)

common/atomic/value.go

@@ -5,50 +5,38 @@ import (
 	"sync/atomic"
 )
 
+func DefaultValue[T any]() T {
+	var defaultValue T
+	return defaultValue
+}
+
 type TypedValue[T any] struct {
-	value atomic.Pointer[T]
+	_     noCopy
+	value atomic.Value
 }
 
-func (t *TypedValue[T]) Load() (v T) {
-	v, _ = t.LoadOk()
-	return
-}
-
-func (t *TypedValue[T]) LoadOk() (v T, ok bool) {
+func (t *TypedValue[T]) Load() T {
 	value := t.value.Load()
 	if value == nil {
-		return
+		return DefaultValue[T]()
 	}
-	return *value, true
+	return value.(T)
 }
 
 func (t *TypedValue[T]) Store(value T) {
-	t.value.Store(&value)
+	t.value.Store(value)
 }
 
-func (t *TypedValue[T]) Swap(new T) (v T) {
-	old := t.value.Swap(&new)
+func (t *TypedValue[T]) Swap(new T) T {
+	old := t.value.Swap(new)
 	if old == nil {
-		return
+		return DefaultValue[T]()
 	}
-	return *old
+	return old.(T)
 }
 
 func (t *TypedValue[T]) CompareAndSwap(old, new T) bool {
-	for {
-		currentP := t.value.Load()
-		var currentValue T
-		if currentP != nil {
-			currentValue = *currentP
-		}
-		// Compare old and current via runtime equality check.
-		if any(currentValue) != any(old) {
-			return false
-		}
-		if t.value.CompareAndSwap(currentP, &new) {
-			return true
-		}
-	}
+	return t.value.CompareAndSwap(old, new)
 }
 
 func (t *TypedValue[T]) MarshalJSON() ([]byte, error) {
@@ -64,20 +52,13 @@ func (t *TypedValue[T]) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-func (t *TypedValue[T]) MarshalYAML() (any, error) {
-	return t.Load(), nil
-}
-
-func (t *TypedValue[T]) UnmarshalYAML(unmarshal func(any) error) error {
-	var v T
-	if err := unmarshal(&v); err != nil {
-		return err
-	}
-	t.Store(v)
-	return nil
-}
-
 func NewTypedValue[T any](t T) (v TypedValue[T]) {
 	v.Store(t)
 	return
 }
+
+type noCopy struct{}
+
+// Lock is a no-op used by -copylocks checker from `go vet`.
+func (*noCopy) Lock()   {}
+func (*noCopy) Unlock() {}

common/atomic/value_test.go

@@ -1,169 +0,0 @@
-package atomic
-
-import (
-	"io"
-	"os"
-	"testing"
-)
-
-func TestTypedValue(t *testing.T) {
-	{
-		var v TypedValue[int]
-		got, gotOk := v.LoadOk()
-		if got != 0 || gotOk {
-			t.Fatalf("LoadOk = (%v, %v), want (0, false)", got, gotOk)
-		}
-		v.Store(1)
-		got, gotOk = v.LoadOk()
-		if got != 1 || !gotOk {
-			t.Fatalf("LoadOk = (%v, %v), want (1, true)", got, gotOk)
-		}
-	}
-
-	{
-		var v TypedValue[error]
-		got, gotOk := v.LoadOk()
-		if got != nil || gotOk {
-			t.Fatalf("LoadOk = (%v, %v), want (nil, false)", got, gotOk)
-		}
-		v.Store(io.EOF)
-		got, gotOk = v.LoadOk()
-		if got != io.EOF || !gotOk {
-			t.Fatalf("LoadOk = (%v, %v), want (EOF, true)", got, gotOk)
-		}
-		err := &os.PathError{}
-		v.Store(err)
-		got, gotOk = v.LoadOk()
-		if got != err || !gotOk {
-			t.Fatalf("LoadOk = (%v, %v), want (%v, true)", got, gotOk, err)
-		}
-		v.Store(nil)
-		got, gotOk = v.LoadOk()
-		if got != nil || !gotOk {
-			t.Fatalf("LoadOk = (%v, %v), want (nil, true)", got, gotOk)
-		}
-	}
-
-	{
-		e1, e2, e3 := io.EOF, &os.PathError{}, &os.PathError{}
-		var v TypedValue[error]
-		if v.CompareAndSwap(e1, e2) != false {
-			t.Fatalf("CompareAndSwap = true, want false")
-		}
-		if value := v.Load(); value != nil {
-			t.Fatalf("Load = (%v), want (%v)", value, nil)
-		}
-		if v.CompareAndSwap(nil, e1) != true {
-			t.Fatalf("CompareAndSwap = false, want true")
-		}
-		if value := v.Load(); value != e1 {
-			t.Fatalf("Load = (%v), want (%v)", value, e1)
-		}
-		if v.CompareAndSwap(e2, e3) != false {
-			t.Fatalf("CompareAndSwap = true, want false")
-		}
-		if value := v.Load(); value != e1 {
-			t.Fatalf("Load = (%v), want (%v)", value, e1)
-		}
-		if v.CompareAndSwap(e1, e2) != true {
-			t.Fatalf("CompareAndSwap = false, want true")
-		}
-		if value := v.Load(); value != e2 {
-			t.Fatalf("Load = (%v), want (%v)", value, e2)
-		}
-		if v.CompareAndSwap(e3, e2) != false {
-			t.Fatalf("CompareAndSwap = true, want false")
-		}
-		if value := v.Load(); value != e2 {
-			t.Fatalf("Load = (%v), want (%v)", value, e2)
-		}
-		if v.CompareAndSwap(nil, e3) != false {
-			t.Fatalf("CompareAndSwap = true, want false")
-		}
-		if value := v.Load(); value != e2 {
-			t.Fatalf("Load = (%v), want (%v)", value, e2)
-		}
-	}
-
-	{
-		c1, c2, c3 := make(chan struct{}), make(chan struct{}), make(chan struct{})
-		var v TypedValue[chan struct{}]
-		if v.CompareAndSwap(c1, c2) != false {
-			t.Fatalf("CompareAndSwap = true, want false")
-		}
-		if value := v.Load(); value != nil {
-			t.Fatalf("Load = (%v), want (%v)", value, nil)
-		}
-		if v.CompareAndSwap(nil, c1) != true {
-			t.Fatalf("CompareAndSwap = false, want true")
-		}
-		if value := v.Load(); value != c1 {
-			t.Fatalf("Load = (%v), want (%v)", value, c1)
-		}
-		if v.CompareAndSwap(c2, c3) != false {
-			t.Fatalf("CompareAndSwap = true, want false")
-		}
-		if value := v.Load(); value != c1 {
-			t.Fatalf("Load = (%v), want (%v)", value, c1)
-		}
-		if v.CompareAndSwap(c1, c2) != true {
-			t.Fatalf("CompareAndSwap = false, want true")
-		}
-		if value := v.Load(); value != c2 {
-			t.Fatalf("Load = (%v), want (%v)", value, c2)
-		}
-		if v.CompareAndSwap(c3, c2) != false {
-			t.Fatalf("CompareAndSwap = true, want false")
-		}
-		if value := v.Load(); value != c2 {
-			t.Fatalf("Load = (%v), want (%v)", value, c2)
-		}
-		if v.CompareAndSwap(nil, c3) != false {
-			t.Fatalf("CompareAndSwap = true, want false")
-		}
-		if value := v.Load(); value != c2 {
-			t.Fatalf("Load = (%v), want (%v)", value, c2)
-		}
-	}
-
-	{
-		c1, c2, c3 := &io.LimitedReader{}, &io.SectionReader{}, &io.SectionReader{}
-		var v TypedValue[io.Reader]
-		if v.CompareAndSwap(c1, c2) != false {
-			t.Fatalf("CompareAndSwap = true, want false")
-		}
-		if value := v.Load(); value != nil {
-			t.Fatalf("Load = (%v), want (%v)", value, nil)
-		}
-		if v.CompareAndSwap(nil, c1) != true {
-			t.Fatalf("CompareAndSwap = false, want true")
-		}
-		if value := v.Load(); value != c1 {
-			t.Fatalf("Load = (%v), want (%v)", value, c1)
-		}
-		if v.CompareAndSwap(c2, c3) != false {
-			t.Fatalf("CompareAndSwap = true, want false")
-		}
-		if value := v.Load(); value != c1 {
-			t.Fatalf("Load = (%v), want (%v)", value, c1)
-		}
-		if v.CompareAndSwap(c1, c2) != true {
-			t.Fatalf("CompareAndSwap = false, want true")
-		}
-		if value := v.Load(); value != c2 {
-			t.Fatalf("Load = (%v), want (%v)", value, c2)
-		}
-		if v.CompareAndSwap(c3, c2) != false {
-			t.Fatalf("CompareAndSwap = true, want false")
-		}
-		if value := v.Load(); value != c2 {
-			t.Fatalf("Load = (%v), want (%v)", value, c2)
-		}
-		if v.CompareAndSwap(nil, c3) != false {
-			t.Fatalf("CompareAndSwap = true, want false")
-		}
-		if value := v.Load(); value != c2 {
-			t.Fatalf("Load = (%v), want (%v)", value, c2)
-		}
-	}
-}

common/buf/sing.go

@@ -1,59 +1,21 @@
 package buf
 
 import (
-	"github.com/metacubex/sing/common/buf"
+	"github.com/sagernet/sing/common"
+	"github.com/sagernet/sing/common/buf"
 )
 
 const BufferSize = buf.BufferSize
 
 type Buffer = buf.Buffer
 
-func New() *Buffer {
-	return buf.New()
-}
+var New = buf.New
+var NewPacket = buf.NewPacket
+var NewSize = buf.NewSize
+var With = buf.With
+var As = buf.As
 
-func NewPacket() *Buffer {
-	return buf.NewPacket()
-}
-
-func NewSize(size int) *Buffer {
-	return buf.NewSize(size)
-}
-
-func With(data []byte) *Buffer {
-	return buf.With(data)
-}
-
-func As(data []byte) *Buffer {
-	return buf.As(data)
-}
-
-func ReleaseMulti(buffers []*Buffer) {
-	buf.ReleaseMulti(buffers)
-}
-
-func Error(_ any, err error) error {
-	return err
-}
-
-func Must(errs ...error) {
-	for _, err := range errs {
-		if err != nil {
-			panic(err)
-		}
-	}
-}
-
-func Must1[T any](result T, err error) T {
-	if err != nil {
-		panic(err)
-	}
-	return result
-}
-
-func Must2[T any, T2 any](result T, result2 T2, err error) (T, T2) {
-	if err != nil {
-		panic(err)
-	}
-	return result, result2
-}
+var (
+	Must  = common.Must
+	Error = common.Error
+)

common/callback/close_callback.go

@@ -1,61 +0,0 @@
-package callback
-
-import (
-	"sync"
-
-	C "github.com/metacubex/mihomo/constant"
-)
-
-type closeCallbackConn struct {
-	C.Conn
-	closeFunc func()
-	closeOnce sync.Once
-}
-
-func (w *closeCallbackConn) Close() error {
-	w.closeOnce.Do(w.closeFunc)
-	return w.Conn.Close()
-}
-
-func (w *closeCallbackConn) ReaderReplaceable() bool {
-	return true
-}
-
-func (w *closeCallbackConn) WriterReplaceable() bool {
-	return true
-}
-
-func (w *closeCallbackConn) Upstream() any {
-	return w.Conn
-}
-
-func NewCloseCallbackConn(conn C.Conn, callback func()) C.Conn {
-	return &closeCallbackConn{Conn: conn, closeFunc: callback}
-}
-
-type closeCallbackPacketConn struct {
-	C.PacketConn
-	closeFunc func()
-	closeOnce sync.Once
-}
-
-func (w *closeCallbackPacketConn) Close() error {
-	w.closeOnce.Do(w.closeFunc)
-	return w.PacketConn.Close()
-}
-
-func (w *closeCallbackPacketConn) ReaderReplaceable() bool {
-	return true
-}
-
-func (w *closeCallbackPacketConn) WriterReplaceable() bool {
-	return true
-}
-
-func (w *closeCallbackPacketConn) Upstream() any {
-	return w.PacketConn
-}
-
-func NewCloseCallbackPacketConn(conn C.PacketConn, callback func()) C.PacketConn {
-	return &closeCallbackPacketConn{PacketConn: conn, closeFunc: callback}
-}

common/contextutils/afterfunc_compact.go

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

common/contextutils/afterfunc_go120.go

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

common/contextutils/afterfunc_go121.go

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

common/contextutils/afterfunc_test.go

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

common/convert/base64.go

@@ -2,7 +2,6 @@ package convert
 
 import (
 	"encoding/base64"
-	"fmt"
 	"strings"
 )
 
@@ -44,22 +43,3 @@ func decodeUrlSafe(data string) string {
 	}
 	return string(dcBuf)
 }
-
-func TryDecodeBase64(s string) (decoded []byte, err error) {
-	if len(s)%4 == 0 {
-		if decoded, err = base64.StdEncoding.DecodeString(s); err == nil {
-			return
-		}
-		if decoded, err = base64.URLEncoding.DecodeString(s); err == nil {
-			return
-		}
-	} else {
-		if decoded, err = base64.RawStdEncoding.DecodeString(s); err == nil {
-			return
-		}
-		if decoded, err = base64.RawURLEncoding.DecodeString(s); err == nil {
-			return
-		}
-	}
-	return nil, fmt.Errorf("invalid base64-encoded string")
-}

common/convert/converter.go

@@ -68,8 +68,7 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			hysteria["skip-cert-verify"], _ = strconv.ParseBool(query.Get("insecure"))
 
 			proxies = append(proxies, hysteria)
-
-		case "hysteria2", "hy2":
+		case "hysteria2":
 			urlHysteria2, err := url.Parse(line)
 			if err != nil {
 				continue
@@ -80,7 +79,7 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			hysteria2 := make(map[string]any, 20)
 
 			hysteria2["name"] = name
-			hysteria2["type"] = "hysteria2"
+			hysteria2["type"] = scheme
 			hysteria2["server"] = urlHysteria2.Hostname()
 			if port := urlHysteria2.Port(); port != "" {
 				hysteria2["port"] = port
@@ -102,7 +101,6 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			hysteria2["up"] = query.Get("up")
 
 			proxies = append(proxies, hysteria2)
-
 		case "tuic":
 			// A temporary unofficial TUIC share link standard
 			// Modified from https://github.com/daeuniverse/dae/discussions/182
@@ -145,7 +143,7 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			}
 
 			proxies = append(proxies, tuic)
-
+			
 		case "trojan":
 			urlTrojan, err := url.Parse(line)
 			if err != nil {
@@ -201,10 +199,6 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 				trojan["client-fingerprint"] = fingerprint
 			}
 
-			if pcs := query.Get("pcs"); pcs != "" {
-				trojan["fingerprint"] = pcs
-			}
-
 			proxies = append(proxies, trojan)
 
 		case "vless":
@@ -212,9 +206,6 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			if err != nil {
 				continue
 			}
-			if decodedHost, err := tryDecodeBase64([]byte(urlVLess.Host)); err == nil {
-				urlVLess.Host = string(decodedHost)
-			}
 			query := urlVLess.Query()
 			vless := make(map[string]any, 20)
 			err = handleVShareLink(names, urlVLess, scheme, vless)
@@ -225,9 +216,6 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			if flow := query.Get("flow"); flow != "" {
 				vless["flow"] = strings.ToLower(flow)
 			}
-			if encryption := query.Get("encryption"); encryption != "" {
-				vless["encryption"] = encryption
-			}
 			proxies = append(proxies, vless)
 
 		case "vmess":
@@ -285,24 +273,22 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			vmess["skip-cert-verify"] = false
 
 			vmess["cipher"] = "auto"
-			if cipher, ok := values["scy"].(string); ok && cipher != "" {
+			if cipher, ok := values["scy"]; ok && cipher != "" {
 				vmess["cipher"] = cipher
 			}
 
-			if sni, ok := values["sni"].(string); ok && sni != "" {
+			if sni, ok := values["sni"]; ok && sni != "" {
 				vmess["servername"] = sni
 			}
 
-			network, ok := values["net"].(string)
-			if ok {
-				network = strings.ToLower(network)
-				if values["type"] == "http" {
-					network = "http"
-				} else if network == "http" {
-					network = "h2"
-				}
-				vmess["network"] = network
+			network, _ := values["net"].(string)
+			network = strings.ToLower(network)
+			if values["type"] == "http" {
+				network = "http"
+			} else if network == "http" {
+				network = "h2"
 			}
+			vmess["network"] = network
 
 			tls, ok := values["tls"].(string)
 			if ok {
@@ -319,12 +305,12 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			case "http":
 				headers := make(map[string]any)
 				httpOpts := make(map[string]any)
-				if host, ok := values["host"].(string); ok && host != "" {
-					headers["Host"] = []string{host}
+				if host, ok := values["host"]; ok && host != "" {
+					headers["Host"] = []string{host.(string)}
 				}
 				httpOpts["path"] = []string{"/"}
-				if path, ok := values["path"].(string); ok && path != "" {
-					httpOpts["path"] = []string{path}
+				if path, ok := values["path"]; ok && path != "" {
+					httpOpts["path"] = []string{path.(string)}
 				}
 				httpOpts["headers"] = headers
 
@@ -333,8 +319,8 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			case "h2":
 				headers := make(map[string]any)
 				h2Opts := make(map[string]any)
-				if host, ok := values["host"].(string); ok && host != "" {
-					headers["Host"] = []string{host}
+				if host, ok := values["host"]; ok && host != "" {
+					headers["Host"] = []string{host.(string)}
 				}
 
 				h2Opts["path"] = values["path"]
@@ -342,38 +328,15 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 
 				vmess["h2-opts"] = h2Opts
 
-			case "ws", "httpupgrade":
+			case "ws":
 				headers := make(map[string]any)
 				wsOpts := make(map[string]any)
-				wsOpts["path"] = "/"
-				if host, ok := values["host"].(string); ok && host != "" {
-					headers["Host"] = host
+				wsOpts["path"] = []string{"/"}
+				if host, ok := values["host"]; ok && host != "" {
+					headers["Host"] = host.(string)
 				}
-				if path, ok := values["path"].(string); ok && path != "" {
-					path := path
-					pathURL, err := url.Parse(path)
-					if err == nil {
-						query := pathURL.Query()
-						if earlyData := query.Get("ed"); earlyData != "" {
-							med, err := strconv.Atoi(earlyData)
-							if err == nil {
-								switch network {
-								case "ws":
-									wsOpts["max-early-data"] = med
-									wsOpts["early-data-header-name"] = "Sec-WebSocket-Protocol"
-								case "httpupgrade":
-									wsOpts["v2ray-http-upgrade-fast-open"] = true
-								}
-								query.Del("ed")
-								pathURL.RawQuery = query.Encode()
-								path = pathURL.String()
-							}
-						}
-						if earlyDataHeader := query.Get("eh"); earlyDataHeader != "" {
-							wsOpts["early-data-header-name"] = earlyDataHeader
-						}
-					}
-					wsOpts["path"] = path
+				if path, ok := values["path"]; ok && path != "" {
+					wsOpts["path"] = path.(string)
 				}
 				wsOpts["headers"] = headers
 				vmess["ws-opts"] = wsOpts
@@ -442,36 +405,23 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			if query.Get("udp-over-tcp") == "true" || query.Get("uot") == "1" {
 				ss["udp-over-tcp"] = true
 			}
-			plugin := query.Get("plugin")
-			if strings.Contains(plugin, ";") {
-				pluginInfo, _ := url.ParseQuery("pluginName=" + strings.ReplaceAll(plugin, ";", "&"))
-				pluginName := pluginInfo.Get("pluginName")
-				if strings.Contains(pluginName, "obfs") {
-					ss["plugin"] = "obfs"
-					ss["plugin-opts"] = map[string]any{
-						"mode": pluginInfo.Get("obfs"),
-						"host": pluginInfo.Get("obfs-host"),
-					}
-				} else if strings.Contains(pluginName, "v2ray-plugin") {
-					ss["plugin"] = "v2ray-plugin"
-					ss["plugin-opts"] = map[string]any{
-						"mode": pluginInfo.Get("mode"),
-						"host": pluginInfo.Get("host"),
-						"path": pluginInfo.Get("path"),
-						"tls":  strings.Contains(plugin, "tls"),
-					}
+			if strings.Contains(query.Get("plugin"), "obfs") {
+				obfsParams := strings.Split(query.Get("plugin"), ";")
+				ss["plugin"] = "obfs"
+				ss["plugin-opts"] = map[string]any{
+					"host": obfsParams[2][10:],
+					"mode": obfsParams[1][5:],
 				}
 			}
-
 			proxies = append(proxies, ss)
 
 		case "ssr":
-			dcBuf, err := TryDecodeBase64(body)
+			dcBuf, err := encRaw.DecodeString(body)
 			if err != nil {
 				continue
 			}
 
-			// ssr://host:port:protocol:method:obfs:urlsafebase64pass/?obfsparam=urlsafebase64param&protoparam=urlsafebase64param&remarks=urlsafebase64remarks&group=urlsafebase64group&udpport=0&uot=1
+			// ssr://host:port:protocol:method:obfs:urlsafebase64pass/?obfsparam=urlsafebase64&protoparam=&remarks=urlsafebase64&group=urlsafebase64&udpport=0&uot=1
 
 			before, after, ok := strings.Cut(string(dcBuf), "/?")
 			if !ok {
@@ -500,7 +450,7 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			name := uniqueName(names, remarks)
 
 			obfsParam := decodeUrlSafe(query.Get("obfsparam"))
-			protocolParam := decodeUrlSafe(query.Get("protoparam"))
+			protocolParam := query.Get("protoparam")
 
 			ssr := make(map[string]any, 20)
 
@@ -523,101 +473,6 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			}
 
 			proxies = append(proxies, ssr)
-
-		case "socks", "socks5", "socks5h", "http", "https":
-			link, err := url.Parse(line)
-			if err != nil {
-				continue
-			}
-			server := link.Hostname()
-			if server == "" {
-				continue
-			}
-			portStr := link.Port()
-			if portStr == "" {
-				continue
-			}
-			remarks := link.Fragment
-			if remarks == "" {
-				remarks = fmt.Sprintf("%s:%s", server, portStr)
-			}
-			name := uniqueName(names, remarks)
-			encodeStr := link.User.String()
-			var username, password string
-			if encodeStr != "" {
-				decodeStr := string(DecodeBase64([]byte(encodeStr)))
-				splitStr := strings.Split(decodeStr, ":")
-
-				// todo: should use url.QueryUnescape ?
-				username = splitStr[0]
-				if len(splitStr) == 2 {
-					password = splitStr[1]
-				}
-			}
-			socks := make(map[string]any, 10)
-			socks["name"] = name
-			socks["type"] = func() string {
-				switch scheme {
-				case "socks", "socks5", "socks5h":
-					return "socks5"
-				case "http", "https":
-					return "http"
-				}
-				return scheme
-			}()
-			socks["server"] = server
-			socks["port"] = portStr
-			socks["username"] = username
-			socks["password"] = password
-			socks["skip-cert-verify"] = true
-			if scheme == "https" {
-				socks["tls"] = true
-			}
-
-			proxies = append(proxies, socks)
-
-		case "anytls":
-			// https://github.com/anytls/anytls-go/blob/main/docs/uri_scheme.md
-			link, err := url.Parse(line)
-			if err != nil {
-				continue
-			}
-			username := link.User.Username()
-			password, exist := link.User.Password()
-			if !exist {
-				password = username
-			}
-			query := link.Query()
-			server := link.Hostname()
-			if server == "" {
-				continue
-			}
-			portStr := link.Port()
-			if portStr == "" {
-				continue
-			}
-			insecure, sni := query.Get("insecure"), query.Get("sni")
-			insecureBool := insecure == "1"
-			fingerprint := query.Get("hpkp")
-
-			remarks := link.Fragment
-			if remarks == "" {
-				remarks = fmt.Sprintf("%s:%s", server, portStr)
-			}
-			name := uniqueName(names, remarks)
-			anytls := make(map[string]any, 10)
-			anytls["name"] = name
-			anytls["type"] = "anytls"
-			anytls["server"] = server
-			anytls["port"] = portStr
-			anytls["username"] = username
-			anytls["password"] = password
-			anytls["sni"] = sni
-			anytls["fingerprint"] = fingerprint
-			anytls["skip-cert-verify"] = insecureBool
-			anytls["udp"] = true
-
-			proxies = append(proxies, anytls)
 		}
 	}
 

common/convert/util.go

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

common/convert/v.go

@@ -35,9 +35,6 @@ func handleVShareLink(names map[string]int, url *url.URL, scheme string, proxy m
 		if alpn := query.Get("alpn"); alpn != "" {
 			proxy["alpn"] = strings.Split(alpn, ",")
 		}
-		if pcs := query.Get("pcs"); pcs != "" {
-			proxy["fingerprint"] = pcs
-		}
 	}
 	if sni := query.Get("sni"); sni != "" {
 		proxy["servername"] = sni
@@ -103,7 +100,7 @@ func handleVShareLink(names map[string]int, url *url.URL, scheme string, proxy m
 		h2Opts["headers"] = headers
 		proxy["h2-opts"] = h2Opts
 
-	case "ws", "httpupgrade":
+	case "ws":
 		headers := make(map[string]any)
 		wsOpts := make(map[string]any)
 		headers["User-Agent"] = RandUserAgent()
@@ -116,13 +113,7 @@ func handleVShareLink(names map[string]int, url *url.URL, scheme string, proxy m
 			if err != nil {
 				return fmt.Errorf("bad WebSocket max early data size: %v", err)
 			}
-			switch network {
-			case "ws":
-				wsOpts["max-early-data"] = med
-				wsOpts["early-data-header-name"] = "Sec-WebSocket-Protocol"
-			case "httpupgrade":
-				wsOpts["v2ray-http-upgrade-fast-open"] = true
-			}
+			wsOpts["max-early-data"] = med
 		}
 		if earlyDataHeader := query.Get("eh"); earlyDataHeader != "" {
 			wsOpts["early-data-header-name"] = earlyDataHeader

common/deque/deque.go

@@ -1,674 +0,0 @@
-package deque
-
-// copy and modified from https://github.com/gammazero/deque/blob/v1.2.0/deque.go
-// which is licensed under MIT.
-
-import (
-	"fmt"
-)
-
-// minCapacity is the smallest capacity that deque may have. Must be power of 2
-// for bitwise modulus: x % n == x & (n - 1).
-const minCapacity = 8
-
-// Deque represents a single instance of the deque data structure. A Deque
-// instance contains items of the type specified by the type argument.
-//
-// For example, to create a Deque that contains strings do one of the
-// following:
-//
-//	var stringDeque deque.Deque[string]
-//	stringDeque := new(deque.Deque[string])
-//	stringDeque := &deque.Deque[string]{}
-//
-// To create a Deque that will never resize to have space for less than 64
-// items, specify a base capacity:
-//
-//	var d deque.Deque[int]
-//	d.SetBaseCap(64)
-//
-// To ensure the Deque can store 1000 items without needing to resize while
-// items are added:
-//
-//	d.Grow(1000)
-//
-// Any values supplied to [SetBaseCap] and [Grow] are rounded up to the nearest
-// power of 2, since the Deque grows by powers of 2.
-type Deque[T any] struct {
-	buf    []T
-	head   int
-	tail   int
-	count  int
-	minCap int
-}
-
-// Cap returns the current capacity of the Deque. If q is nil, q.Cap() is zero.
-func (q *Deque[T]) Cap() int {
-	if q == nil {
-		return 0
-	}
-	return len(q.buf)
-}
-
-// Len returns the number of elements currently stored in the queue. If q is
-// nil, q.Len() returns zero.
-func (q *Deque[T]) Len() int {
-	if q == nil {
-		return 0
-	}
-	return q.count
-}
-
-// PushBack appends an element to the back of the queue. Implements FIFO when
-// elements are removed with [PopFront], and LIFO when elements are removed with
-// [PopBack].
-func (q *Deque[T]) PushBack(elem T) {
-	q.growIfFull()
-
-	q.buf[q.tail] = elem
-	// Calculate new tail position.
-	q.tail = q.next(q.tail)
-	q.count++
-}
-
-// PushFront prepends an element to the front of the queue.
-func (q *Deque[T]) PushFront(elem T) {
-	q.growIfFull()
-
-	// Calculate new head position.
-	q.head = q.prev(q.head)
-	q.buf[q.head] = elem
-	q.count++
-}
-
-// PopFront removes and returns the element from the front of the queue.
-// Implements FIFO when used with [PushBack]. If the queue is empty, the call
-// panics.
-func (q *Deque[T]) PopFront() T {
-	if q.count <= 0 {
-		panic("deque: PopFront() called on empty queue")
-	}
-	ret := q.buf[q.head]
-	var zero T
-	q.buf[q.head] = zero
-	// Calculate new head position.
-	q.head = q.next(q.head)
-	q.count--
-
-	q.shrinkIfExcess()
-	return ret
-}
-
-// IterPopFront returns an iterator that iteratively removes items from the
-// front of the deque. This is more efficient than removing items one at a time
-// because it avoids intermediate resizing. If a resize is necessary, only one
-// is done when iteration ends.
-func (q *Deque[T]) IterPopFront() func(yield func(T) bool) {
-	return func(yield func(T) bool) {
-		if q.Len() == 0 {
-			return
-		}
-		var zero T
-		for q.count != 0 {
-			ret := q.buf[q.head]
-			q.buf[q.head] = zero
-			q.head = q.next(q.head)
-			q.count--
-			if !yield(ret) {
-				break
-			}
-		}
-		q.shrinkToFit()
-	}
-}
-
-// PopBack removes and returns the element from the back of the queue.
-// Implements LIFO when used with [PushBack]. If the queue is empty, the call
-// panics.
-func (q *Deque[T]) PopBack() T {
-	if q.count <= 0 {
-		panic("deque: PopBack() called on empty queue")
-	}
-
-	// Calculate new tail position
-	q.tail = q.prev(q.tail)
-
-	// Remove value at tail.
-	ret := q.buf[q.tail]
-	var zero T
-	q.buf[q.tail] = zero
-	q.count--
-
-	q.shrinkIfExcess()
-	return ret
-}
-
-// IterPopBack returns an iterator that iteratively removes items from the back
-// of the deque. This is more efficient than removing items one at a time
-// because it avoids intermediate resizing. If a resize is necessary, only one
-// is done when iteration ends.
-func (q *Deque[T]) IterPopBack() func(yield func(T) bool) {
-	return func(yield func(T) bool) {
-		if q.Len() == 0 {
-			return
-		}
-		var zero T
-		for q.count != 0 {
-			q.tail = q.prev(q.tail)
-			ret := q.buf[q.tail]
-			q.buf[q.tail] = zero
-			q.count--
-			if !yield(ret) {
-				break
-			}
-		}
-		q.shrinkToFit()
-	}
-}
-
-// Front returns the element at the front of the queue. This is the element
-// that would be returned by [PopFront]. This call panics if the queue is
-// empty.
-func (q *Deque[T]) Front() T {
-	if q.count <= 0 {
-		panic("deque: Front() called when empty")
-	}
-	return q.buf[q.head]
-}
-
-// Back returns the element at the back of the queue. This is the element that
-// would be returned by [PopBack]. This call panics if the queue is empty.
-func (q *Deque[T]) Back() T {
-	if q.count <= 0 {
-		panic("deque: Back() called when empty")
-	}
-	return q.buf[q.prev(q.tail)]
-}
-
-// At returns the element at index i in the queue without removing the element
-// from the queue. This method accepts only non-negative index values. At(0)
-// refers to the first element and is the same as [Front]. At(Len()-1) refers
-// to the last element and is the same as [Back]. If the index is invalid, the
-// call panics.
-//
-// The purpose of At is to allow Deque to serve as a more general purpose
-// circular buffer, where items are only added to and removed from the ends of
-// the deque, but may be read from any place within the deque. Consider the
-// case of a fixed-size circular log buffer: A new entry is pushed onto one end
-// and when full the oldest is popped from the other end. All the log entries
-// in the buffer must be readable without altering the buffer contents.
-func (q *Deque[T]) At(i int) T {
-	q.checkRange(i)
-	// bitwise modulus
-	return q.buf[(q.head+i)&(len(q.buf)-1)]
-}
-
-// Set assigns the item to index i in the queue. Set indexes the deque the same
-// as [At] but perform the opposite operation. If the index is invalid, the call
-// panics.
-func (q *Deque[T]) Set(i int, item T) {
-	q.checkRange(i)
-	// bitwise modulus
-	q.buf[(q.head+i)&(len(q.buf)-1)] = item
-}
-
-// Iter returns a go iterator to range over all items in the Deque, yielding
-// each item from front (index 0) to back (index Len()-1). Modification of
-// Deque during iteration panics.
-func (q *Deque[T]) Iter() func(yield func(T) bool) {
-	return func(yield func(T) bool) {
-		origHead := q.head
-		origTail := q.tail
-		head := origHead
-		for i := -0; i < q.Len(); i++ {
-			if q.head != origHead || q.tail != origTail {
-				panic("deque: modified during iteration")
-			}
-			if !yield(q.buf[head]) {
-				return
-			}
-			head = q.next(head)
-		}
-	}
-}
-
-// RIter returns a reverse go iterator to range over all items in the Deque,
-// yielding each item from back (index Len()-1) to front (index 0).
-// Modification of Deque during iteration panics.
-func (q *Deque[T]) RIter() func(yield func(T) bool) {
-	return func(yield func(T) bool) {
-		origHead := q.head
-		origTail := q.tail
-		tail := origTail
-		for i := -0; i < q.Len(); i++ {
-			if q.head != origHead || q.tail != origTail {
-				panic("deque: modified during iteration")
-			}
-			tail = q.prev(tail)
-			if !yield(q.buf[tail]) {
-				return
-			}
-		}
-	}
-}
-
-// Clear removes all elements from the queue, but retains the current capacity.
-// This is useful when repeatedly reusing the queue at high frequency to avoid
-// GC during reuse. The queue will not be resized smaller as long as items are
-// only added. Only when items are removed is the queue subject to getting
-// resized smaller.
-func (q *Deque[T]) Clear() {
-	if q.Len() == 0 {
-		return
-	}
-	head, tail := q.head, q.tail
-	q.count = 0
-	q.head = 0
-	q.tail = 0
-
-	if head >= tail {
-		// [DEF....ABC]
-		clearSlice(q.buf[head:])
-		head = 0
-	}
-	clearSlice(q.buf[head:tail])
-}
-
-func clearSlice[S ~[]E, E any](s S) {
-	var zero E
-	for i := range s {
-		s[i] = zero
-	}
-}
-
-// Grow grows deque's capacity, if necessary, to guarantee space for another n
-// items. After Grow(n), at least n items can be written to the deque without
-// another allocation. If n is negative, Grow panics.
-func (q *Deque[T]) Grow(n int) {
-	if n < 0 {
-		panic("deque.Grow: negative count")
-	}
-	c := q.Cap()
-	l := q.Len()
-	// If already big enough.
-	if n <= c-l {
-		return
-	}
-
-	if c == 0 {
-		c = minCapacity
-	}
-
-	newLen := l + n
-	for c < newLen {
-		c <<= 1
-	}
-	if l == 0 {
-		q.buf = make([]T, c)
-		q.head = 0
-		q.tail = 0
-	} else {
-		q.resize(c)
-	}
-}
-
-// Copy copies the contents of the given src Deque into this Deque.
-//
-//	n := b.Copy(a)
-//
-// is an efficient shortcut for
-//
-//	b.Clear()
-//	n := a.Len()
-//	b.Grow(n)
-//	for i := 0; i < n; i++ {
-//		b.PushBack(a.At(i))
-//	}
-func (q *Deque[T]) Copy(src Deque[T]) int {
-	q.Clear()
-	q.Grow(src.Len())
-	n := src.CopyOutSlice(q.buf)
-	q.count = n
-	q.tail = n
-	q.head = 0
-	return n
-}
-
-// AppendToSlice appends from the Deque to the given slice. If the slice has
-// insufficient capacity to store all elements in Deque, then allocate a new
-// slice. Returns the resulting slice.
-//
-//	out = q.AppendToSlice(out)
-//
-// is an efficient shortcut for
-//
-//	for i := 0; i < q.Len(); i++ {
-//		x = append(out, q.At(i))
-//	}
-func (q *Deque[T]) AppendToSlice(out []T) []T {
-	if q.count == 0 {
-		return out
-	}
-
-	head, tail := q.head, q.tail
-
-	if head >= tail {
-		// [DEF....ABC]
-		out = append(out, q.buf[head:]...)
-		head = 0
-	}
-	return append(out, q.buf[head:tail]...)
-}
-
-// CopyInSlice replaces the contents of Deque with all the elements from the
-// given slice, in. If len(in) is zero, then this is equivalent to calling
-// [Clear].
-//
-//	q.CopyInSlice(in)
-//
-// is an efficient shortcut for
-//
-//	q.Clear()
-//	for i := range in {
-//		q.PushBack(in[i])
-//	}
-func (q *Deque[T]) CopyInSlice(in []T) {
-	// Allocate new buffer if more space needed.
-	if len(q.buf) < len(in) {
-		newCap := len(q.buf)
-		if newCap == 0 {
-			newCap = minCapacity
-			q.minCap = minCapacity
-		}
-		for newCap < len(in) {
-			newCap <<= 1
-		}
-		q.buf = make([]T, newCap)
-	} else if len(q.buf) > len(in) {
-		q.Clear()
-	}
-	n := copy(q.buf, in)
-	q.count = n
-	q.tail = n
-	q.head = 0
-}
-
-// CopyOutSlice copies elements from the Deque into the given slice, up to the
-// size of the buffer. Returns the number of elements copied, which will be the
-// minimum of q.Len() and len(out).
-//
-//	n := q.CopyOutSlice(out)
-//
-// is an efficient shortcut for
-//
-//	n := min(len(out), q.Len())
-//	for i := 0; i < n; i++ {
-//	 	out[i] = q.At(i)
-//	}
-//
-// This function is preferable to one that returns a copy of the internal
-// buffer because this allows reuse of memory receiving data, for repeated copy
-// operations.
-func (q *Deque[T]) CopyOutSlice(out []T) int {
-	if q.count == 0 || len(out) == 0 {
-		return 0
-	}
-
-	head, tail := q.head, q.tail
-	var n int
-
-	if head >= tail {
-		// [DEF....ABC]
-		n = copy(out, q.buf[head:])
-		out = out[n:]
-		if len(out) == 0 {
-			return n
-		}
-		head = 0
-	}
-	n += copy(out, q.buf[head:tail])
-
-	return n
-}
-
-// Rotate rotates the deque n steps front-to-back. If n is negative, rotates
-// back-to-front. Having Deque provide Rotate avoids resizing that could happen
-// if implementing rotation using only Pop and Push methods. If q.Len() is one
-// or less, or q is nil, then Rotate does nothing.
-func (q *Deque[T]) Rotate(n int) {
-	if q.Len() <= 1 {
-		return
-	}
-	// Rotating a multiple of q.count is same as no rotation.
-	n %= q.count
-	if n == 0 {
-		return
-	}
-
-	modBits := len(q.buf) - 1
-	// If no empty space in buffer, only move head and tail indexes.
-	if q.head == q.tail {
-		// Calculate new head and tail using bitwise modulus.
-		q.head = (q.head + n) & modBits
-		q.tail = q.head
-		return
-	}
-
-	var zero T
-
-	if n < 0 {
-		// Rotate back to front.
-		for ; n < 0; n++ {
-			// Calculate new head and tail using bitwise modulus.
-			q.head = (q.head - 1) & modBits
-			q.tail = (q.tail - 1) & modBits
-			// Put tail value at head and remove value at tail.
-			q.buf[q.head] = q.buf[q.tail]
-			q.buf[q.tail] = zero
-		}
-		return
-	}
-
-	// Rotate front to back.
-	for ; n > 0; n-- {
-		// Put head value at tail and remove value at head.
-		q.buf[q.tail] = q.buf[q.head]
-		q.buf[q.head] = zero
-		// Calculate new head and tail using bitwise modulus.
-		q.head = (q.head + 1) & modBits
-		q.tail = (q.tail + 1) & modBits
-	}
-}
-
-// Index returns the index into the Deque of the first item satisfying f(item),
-// or -1 if none do. If q is nil, then -1 is always returned. Search is linear
-// starting with index 0.
-func (q *Deque[T]) Index(f func(T) bool) int {
-	if q.Len() > 0 {
-		modBits := len(q.buf) - 1
-		for i := 0; i < q.count; i++ {
-			if f(q.buf[(q.head+i)&modBits]) {
-				return i
-			}
-		}
-	}
-	return -1
-}
-
-// RIndex is the same as Index, but searches from Back to Front. The index
-// returned is from Front to Back, where index 0 is the index of the item
-// returned by [Front].
-func (q *Deque[T]) RIndex(f func(T) bool) int {
-	if q.Len() > 0 {
-		modBits := len(q.buf) - 1
-		for i := q.count - 1; i >= 0; i-- {
-			if f(q.buf[(q.head+i)&modBits]) {
-				return i
-			}
-		}
-	}
-	return -1
-}
-
-// Insert is used to insert an element into the middle of the queue, before the
-// element at the specified index. Insert(0,e) is the same as PushFront(e) and
-// Insert(Len(),e) is the same as PushBack(e). Out of range indexes result in
-// pushing the item onto the front of back of the deque.
-//
-// Important: Deque is optimized for O(1) operations at the ends of the queue,
-// not for operations in the the middle. Complexity of this function is
-// constant plus linear in the lesser of the distances between the index and
-// either of the ends of the queue.
-func (q *Deque[T]) Insert(at int, item T) {
-	if at <= 0 {
-		q.PushFront(item)
-		return
-	}
-	if at >= q.Len() {
-		q.PushBack(item)
-		return
-	}
-	if at*2 < q.count {
-		q.PushFront(item)
-		front := q.head
-		for i := 0; i < at; i++ {
-			next := q.next(front)
-			q.buf[front], q.buf[next] = q.buf[next], q.buf[front]
-			front = next
-		}
-		return
-	}
-	swaps := q.count - at
-	q.PushBack(item)
-	back := q.prev(q.tail)
-	for i := 0; i < swaps; i++ {
-		prev := q.prev(back)
-		q.buf[back], q.buf[prev] = q.buf[prev], q.buf[back]
-		back = prev
-	}
-}
-
-// Remove removes and returns an element from the middle of the queue, at the
-// specified index. Remove(0) is the same as [PopFront] and Remove(Len()-1) is
-// the same as [PopBack]. Accepts only non-negative index values, and panics if
-// index is out of range.
-//
-// Important: Deque is optimized for O(1) operations at the ends of the queue,
-// not for operations in the the middle. Complexity of this function is
-// constant plus linear in the lesser of the distances between the index and
-// either of the ends of the queue.
-func (q *Deque[T]) Remove(at int) T {
-	q.checkRange(at)
-	rm := (q.head + at) & (len(q.buf) - 1)
-	if at*2 < q.count {
-		for i := 0; i < at; i++ {
-			prev := q.prev(rm)
-			q.buf[prev], q.buf[rm] = q.buf[rm], q.buf[prev]
-			rm = prev
-		}
-		return q.PopFront()
-	}
-	swaps := q.count - at - 1
-	for i := 0; i < swaps; i++ {
-		next := q.next(rm)
-		q.buf[rm], q.buf[next] = q.buf[next], q.buf[rm]
-		rm = next
-	}
-	return q.PopBack()
-}
-
-// SetBaseCap sets a base capacity so that at least the specified number of
-// items can always be stored without resizing.
-func (q *Deque[T]) SetBaseCap(baseCap int) {
-	minCap := minCapacity
-	for minCap < baseCap {
-		minCap <<= 1
-	}
-	q.minCap = minCap
-}
-
-// Swap exchanges the two values at idxA and idxB. It panics if either index is
-// out of range.
-func (q *Deque[T]) Swap(idxA, idxB int) {
-	q.checkRange(idxA)
-	q.checkRange(idxB)
-	if idxA == idxB {
-		return
-	}
-
-	realA := (q.head + idxA) & (len(q.buf) - 1)
-	realB := (q.head + idxB) & (len(q.buf) - 1)
-	q.buf[realA], q.buf[realB] = q.buf[realB], q.buf[realA]
-}
-
-func (q *Deque[T]) checkRange(i int) {
-	if i < 0 || i >= q.count {
-		panic(fmt.Sprintf("deque: index out of range %d with length %d", i, q.Len()))
-	}
-}
-
-// prev returns the previous buffer position wrapping around buffer.
-func (q *Deque[T]) prev(i int) int {
-	return (i - 1) & (len(q.buf) - 1) // bitwise modulus
-}
-
-// next returns the next buffer position wrapping around buffer.
-func (q *Deque[T]) next(i int) int {
-	return (i + 1) & (len(q.buf) - 1) // bitwise modulus
-}
-
-// growIfFull resizes up if the buffer is full.
-func (q *Deque[T]) growIfFull() {
-	if q.count != len(q.buf) {
-		return
-	}
-	if len(q.buf) == 0 {
-		if q.minCap == 0 {
-			q.minCap = minCapacity
-		}
-		q.buf = make([]T, q.minCap)
-		return
-	}
-	q.resize(q.count << 1)
-}
-
-// shrinkIfExcess resize down if the buffer 1/4 full.
-func (q *Deque[T]) shrinkIfExcess() {
-	if len(q.buf) > q.minCap && (q.count<<2) == len(q.buf) {
-		q.resize(q.count << 1)
-	}
-}
-
-func (q *Deque[T]) shrinkToFit() {
-	if len(q.buf) > q.minCap && (q.count<<2) <= len(q.buf) {
-		if q.count == 0 {
-			q.head = 0
-			q.tail = 0
-			q.buf = make([]T, q.minCap)
-			return
-		}
-
-		c := q.minCap
-		for c < q.count {
-			c <<= 1
-		}
-		q.resize(c)
-	}
-}
-
-// resize resizes the deque to fit exactly twice its current contents. This is
-// used to grow the queue when it is full, and also to shrink it when it is
-// only a quarter full.
-func (q *Deque[T]) resize(newSize int) {
-	newBuf := make([]T, newSize)
-	if q.tail > q.head {
-		copy(newBuf, q.buf[q.head:q.tail])
-	} else {
-		n := copy(newBuf, q.buf[q.head:])
-		copy(newBuf[n:], q.buf[:q.tail])
-	}
-
-	q.head = 0
-	q.tail = q.count
-	q.buf = newBuf
-}

common/lru/lrucache.go

@@ -68,8 +68,10 @@ type LruCache[K comparable, V any] struct {
 
 // New creates an LruCache
 func New[K comparable, V any](options ...Option[K, V]) *LruCache[K, V] {
-	lc := &LruCache[K, V]{}
-	lc.Clear()
+	lc := &LruCache[K, V]{
+		lru:   list.New[*entry[K, V]](),
+		cache: make(map[K]*list.Element[*entry[K, V]]),
+	}
 
 	for _, option := range options {
 		option(lc)
@@ -78,15 +80,7 @@ func New[K comparable, V any](options ...Option[K, V]) *LruCache[K, V] {
 	return lc
 }
 
-func (c *LruCache[K, V]) Clear() {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	c.lru = list.New[*entry[K, V]]()
-	c.cache = make(map[K]*list.Element[*entry[K, V]])
-}
-
-// Get returns any representation of a cached response and a bool
+// 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()
@@ -116,7 +110,7 @@ func (c *LruCache[K, V]) GetOrStore(key K, constructor func() V) (V, bool) {
 	return value, true
 }
 
-// GetWithExpire returns any representation of a cached response,
+// GetWithExpire returns the any representation of a cached response,
 // a time.Time Give expected expires,
 // 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.
@@ -141,7 +135,7 @@ func (c *LruCache[K, V]) Exist(key K) bool {
 	return ok
 }
 
-// Set stores any representation of a response for a given key.
+// 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()
@@ -157,7 +151,7 @@ func (c *LruCache[K, V]) set(key K, value V) {
 	c.setWithExpire(key, value, time.Unix(expires, 0))
 }
 
-// SetWithExpire stores any representation of a response for a given key and given expires.
+// SetWithExpire stores the any representation of a response for a given key and given expires.
 // The expires time will round to second.
 func (c *LruCache[K, V]) SetWithExpire(key K, value V, expires time.Time) {
 	c.mu.Lock()
@@ -229,10 +223,6 @@ func (c *LruCache[K, V]) Delete(key K) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
-	c.delete(key)
-}
-
-func (c *LruCache[K, V]) delete(key K) {
 	if le, ok := c.cache[key]; ok {
 		c.deleteElement(le)
 	}
@@ -256,32 +246,13 @@ func (c *LruCache[K, V]) deleteElement(le *list.Element[*entry[K, V]]) {
 	}
 }
 
-// Compute either sets the computed new value for the key or deletes
-// the value for the key. When the delete result of the valueFn function
-// is set to true, the value will be deleted, if it exists. When delete
-// is set to false, the value is updated to the newValue.
-// The ok result indicates whether value was computed and stored, thus, is
-// present in the map. The actual result contains the new value in cases where
-// the value was computed and stored.
-func (c *LruCache[K, V]) Compute(
-	key K,
-	valueFn func(oldValue V, loaded bool) (newValue V, delete bool),
-) (actual V, ok bool) {
+func (c *LruCache[K, V]) Clear() error {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
-	if el := c.get(key); el != nil {
-		actual, ok = el.value, true
-	}
-	if newValue, del := valueFn(actual, ok); del {
-		if ok { // data not in cache, so needn't delete
-			c.delete(key)
-		}
-		return lo.Empty[V](), false
-	} else {
-		c.set(key, newValue)
-		return newValue, true
-	}
+	c.cache = make(map[K]*list.Element[*entry[K, V]])
+
+	return nil
 }
 
 type entry[K comparable, V any] struct {

common/maphash/common.go

@@ -1,19 +0,0 @@
-package maphash
-
-import "hash/maphash"
-
-type Seed = maphash.Seed
-
-func MakeSeed() Seed {
-	return maphash.MakeSeed()
-}
-
-type Hash = maphash.Hash
-
-func Bytes(seed Seed, b []byte) uint64 {
-	return maphash.Bytes(seed, b)
-}
-
-func String(seed Seed, s string) uint64 {
-	return maphash.String(seed, s)
-}

common/maphash/comparable_go120.go

@@ -1,142 +0,0 @@
-//go:build !go1.24
-
-package maphash
-
-import "unsafe"
-
-func Comparable[T comparable](s Seed, v T) uint64 {
-	return comparableHash(*(*seedTyp)(unsafe.Pointer(&s)), v)
-}
-
-func comparableHash[T comparable](seed seedTyp, v T) uint64 {
-	s := seed.s
-	var m map[T]struct{}
-	mTyp := iTypeOf(m)
-	var hasher func(unsafe.Pointer, uintptr) uintptr
-	hasher = (*iMapType)(unsafe.Pointer(mTyp)).Hasher
-
-	p := escape(unsafe.Pointer(&v))
-
-	if ptrSize == 8 {
-		return uint64(hasher(p, uintptr(s)))
-	}
-	lo := hasher(p, uintptr(s))
-	hi := hasher(p, uintptr(s>>32))
-	return uint64(hi)<<32 | uint64(lo)
-}
-
-// WriteComparable adds x to the data hashed by h.
-func WriteComparable[T comparable](h *Hash, x T) {
-	// writeComparable (not in purego mode) directly operates on h.state
-	// without using h.buf. Mix in the buffer length so it won't
-	// commute with a buffered write, which either changes h.n or changes
-	// h.state.
-	hash := (*hashTyp)(unsafe.Pointer(h))
-	if hash.n != 0 {
-		hash.state.s = comparableHash(hash.state, hash.n)
-	}
-	hash.state.s = comparableHash(hash.state, x)
-}
-
-// go/src/hash/maphash/maphash.go
-type hashTyp struct {
-	_     [0]func() // not comparable
-	seed  seedTyp   // initial seed used for this hash
-	state seedTyp   // current hash of all flushed bytes
-	buf   [128]byte // unflushed byte buffer
-	n     int       // number of unflushed bytes
-}
-
-type seedTyp struct {
-	s uint64
-}
-
-type iTFlag uint8
-type iKind uint8
-type iNameOff int32
-
-// TypeOff is the offset to a type from moduledata.types.  See resolveTypeOff in runtime.
-type iTypeOff int32
-
-type iType struct {
-	Size_       uintptr
-	PtrBytes    uintptr // number of (prefix) bytes in the type that can contain pointers
-	Hash        uint32  // hash of type; avoids computation in hash tables
-	TFlag       iTFlag  // extra type information flags
-	Align_      uint8   // alignment of variable with this type
-	FieldAlign_ uint8   // alignment of struct field with this type
-	Kind_       iKind   // enumeration for C
-	// function for comparing objects of this type
-	// (ptr to object A, ptr to object B) -> ==?
-	Equal func(unsafe.Pointer, unsafe.Pointer) bool
-	// GCData stores the GC type data for the garbage collector.
-	// Normally, GCData points to a bitmask that describes the
-	// ptr/nonptr fields of the type. The bitmask will have at
-	// least PtrBytes/ptrSize bits.
-	// If the TFlagGCMaskOnDemand bit is set, GCData is instead a
-	// **byte and the pointer to the bitmask is one dereference away.
-	// The runtime will build the bitmask if needed.
-	// (See runtime/type.go:getGCMask.)
-	// Note: multiple types may have the same value of GCData,
-	// including when TFlagGCMaskOnDemand is set. The types will, of course,
-	// have the same pointer layout (but not necessarily the same size).
-	GCData    *byte
-	Str       iNameOff // string form
-	PtrToThis iTypeOff // type for pointer to this type, may be zero
-}
-
-type iMapType struct {
-	iType
-	Key   *iType
-	Elem  *iType
-	Group *iType // internal type representing a slot group
-	// function for hashing keys (ptr to key, seed) -> hash
-	Hasher func(unsafe.Pointer, uintptr) uintptr
-}
-
-func iTypeOf(a any) *iType {
-	eface := *(*iEmptyInterface)(unsafe.Pointer(&a))
-	// Types are either static (for compiler-created types) or
-	// heap-allocated but always reachable (for reflection-created
-	// types, held in the central map). So there is no need to
-	// escape types. noescape here help avoid unnecessary escape
-	// of v.
-	return (*iType)(noescape(unsafe.Pointer(eface.Type)))
-}
-
-type iEmptyInterface struct {
-	Type *iType
-	Data unsafe.Pointer
-}
-
-// noescape hides a pointer from escape analysis.  noescape is
-// the identity function but escape analysis doesn't think the
-// output depends on the input.  noescape is inlined and currently
-// compiles down to zero instructions.
-// USE CAREFULLY!
-//
-// nolint:all
-//
-//go:nosplit
-//goland:noinspection ALL
-func noescape(p unsafe.Pointer) unsafe.Pointer {
-	x := uintptr(p)
-	return unsafe.Pointer(x ^ 0)
-}
-
-var alwaysFalse bool
-var escapeSink any
-
-// escape forces any pointers in x to escape to the heap.
-func escape[T any](x T) T {
-	if alwaysFalse {
-		escapeSink = x
-	}
-	return x
-}
-
-// ptrSize is the size of a pointer in bytes - unsafe.Sizeof(uintptr(0)) but as an ideal constant.
-// It is also the size of the machine's native word size (that is, 4 on 32-bit systems, 8 on 64-bit).
-const ptrSize = 4 << (^uintptr(0) >> 63)
-
-const testComparableAllocations = false

common/maphash/comparable_go124.go

@@ -1,15 +0,0 @@
-//go:build go1.24
-
-package maphash
-
-import "hash/maphash"
-
-func Comparable[T comparable](seed Seed, v T) uint64 {
-	return maphash.Comparable(seed, v)
-}
-
-func WriteComparable[T comparable](h *Hash, x T) {
-	maphash.WriteComparable(h, x)
-}
-
-const testComparableAllocations = true

common/maphash/maphash_test.go

@@ -1,534 +0,0 @@
-// Copyright 2019 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 maphash
-
-import (
-	"bytes"
-	"fmt"
-	"hash"
-	"math"
-	"reflect"
-	"strings"
-	"testing"
-	"unsafe"
-
-	rand "github.com/metacubex/randv2"
-)
-
-func TestUnseededHash(t *testing.T) {
-	m := map[uint64]struct{}{}
-	for i := 0; i < 1000; i++ {
-		h := new(Hash)
-		m[h.Sum64()] = struct{}{}
-	}
-	if len(m) < 900 {
-		t.Errorf("empty hash not sufficiently random: got %d, want 1000", len(m))
-	}
-}
-
-func TestSeededHash(t *testing.T) {
-	s := MakeSeed()
-	m := map[uint64]struct{}{}
-	for i := 0; i < 1000; i++ {
-		h := new(Hash)
-		h.SetSeed(s)
-		m[h.Sum64()] = struct{}{}
-	}
-	if len(m) != 1 {
-		t.Errorf("seeded hash is random: got %d, want 1", len(m))
-	}
-}
-
-func TestHashGrouping(t *testing.T) {
-	b := bytes.Repeat([]byte("foo"), 100)
-	hh := make([]*Hash, 7)
-	for i := range hh {
-		hh[i] = new(Hash)
-	}
-	for _, h := range hh[1:] {
-		h.SetSeed(hh[0].Seed())
-	}
-	hh[0].Write(b)
-	hh[1].WriteString(string(b))
-
-	writeByte := func(h *Hash, b byte) {
-		err := h.WriteByte(b)
-		if err != nil {
-			t.Fatalf("WriteByte: %v", err)
-		}
-	}
-	writeSingleByte := func(h *Hash, b byte) {
-		_, err := h.Write([]byte{b})
-		if err != nil {
-			t.Fatalf("Write single byte: %v", err)
-		}
-	}
-	writeStringSingleByte := func(h *Hash, b byte) {
-		_, err := h.WriteString(string([]byte{b}))
-		if err != nil {
-			t.Fatalf("WriteString single byte: %v", err)
-		}
-	}
-
-	for i, x := range b {
-		writeByte(hh[2], x)
-		writeSingleByte(hh[3], x)
-		if i == 0 {
-			writeByte(hh[4], x)
-		} else {
-			writeSingleByte(hh[4], x)
-		}
-		writeStringSingleByte(hh[5], x)
-		if i == 0 {
-			writeByte(hh[6], x)
-		} else {
-			writeStringSingleByte(hh[6], x)
-		}
-	}
-
-	sum := hh[0].Sum64()
-	for i, h := range hh {
-		if sum != h.Sum64() {
-			t.Errorf("hash %d not identical to a single Write", i)
-		}
-	}
-
-	if sum1 := Bytes(hh[0].Seed(), b); sum1 != hh[0].Sum64() {
-		t.Errorf("hash using Bytes not identical to a single Write")
-	}
-
-	if sum1 := String(hh[0].Seed(), string(b)); sum1 != hh[0].Sum64() {
-		t.Errorf("hash using String not identical to a single Write")
-	}
-}
-
-func TestHashBytesVsString(t *testing.T) {
-	s := "foo"
-	b := []byte(s)
-	h1 := new(Hash)
-	h2 := new(Hash)
-	h2.SetSeed(h1.Seed())
-	n1, err1 := h1.WriteString(s)
-	if n1 != len(s) || err1 != nil {
-		t.Fatalf("WriteString(s) = %d, %v, want %d, nil", n1, err1, len(s))
-	}
-	n2, err2 := h2.Write(b)
-	if n2 != len(b) || err2 != nil {
-		t.Fatalf("Write(b) = %d, %v, want %d, nil", n2, err2, len(b))
-	}
-	if h1.Sum64() != h2.Sum64() {
-		t.Errorf("hash of string and bytes not identical")
-	}
-}
-
-func TestHashHighBytes(t *testing.T) {
-	// See issue 34925.
-	const N = 10
-	m := map[uint64]struct{}{}
-	for i := 0; i < N; i++ {
-		h := new(Hash)
-		h.WriteString("foo")
-		m[h.Sum64()>>32] = struct{}{}
-	}
-	if len(m) < N/2 {
-		t.Errorf("from %d seeds, wanted at least %d different hashes; got %d", N, N/2, len(m))
-	}
-}
-
-func TestRepeat(t *testing.T) {
-	h1 := new(Hash)
-	h1.WriteString("testing")
-	sum1 := h1.Sum64()
-
-	h1.Reset()
-	h1.WriteString("testing")
-	sum2 := h1.Sum64()
-
-	if sum1 != sum2 {
-		t.Errorf("different sum after resetting: %#x != %#x", sum1, sum2)
-	}
-
-	h2 := new(Hash)
-	h2.SetSeed(h1.Seed())
-	h2.WriteString("testing")
-	sum3 := h2.Sum64()
-
-	if sum1 != sum3 {
-		t.Errorf("different sum on the same seed: %#x != %#x", sum1, sum3)
-	}
-}
-
-func TestSeedFromSum64(t *testing.T) {
-	h1 := new(Hash)
-	h1.WriteString("foo")
-	x := h1.Sum64() // seed generated here
-	h2 := new(Hash)
-	h2.SetSeed(h1.Seed())
-	h2.WriteString("foo")
-	y := h2.Sum64()
-	if x != y {
-		t.Errorf("hashes don't match: want %x, got %x", x, y)
-	}
-}
-
-func TestSeedFromSeed(t *testing.T) {
-	h1 := new(Hash)
-	h1.WriteString("foo")
-	_ = h1.Seed() // seed generated here
-	x := h1.Sum64()
-	h2 := new(Hash)
-	h2.SetSeed(h1.Seed())
-	h2.WriteString("foo")
-	y := h2.Sum64()
-	if x != y {
-		t.Errorf("hashes don't match: want %x, got %x", x, y)
-	}
-}
-
-func TestSeedFromFlush(t *testing.T) {
-	b := make([]byte, 65)
-	h1 := new(Hash)
-	h1.Write(b) // seed generated here
-	x := h1.Sum64()
-	h2 := new(Hash)
-	h2.SetSeed(h1.Seed())
-	h2.Write(b)
-	y := h2.Sum64()
-	if x != y {
-		t.Errorf("hashes don't match: want %x, got %x", x, y)
-	}
-}
-
-func TestSeedFromReset(t *testing.T) {
-	h1 := new(Hash)
-	h1.WriteString("foo")
-	h1.Reset() // seed generated here
-	h1.WriteString("foo")
-	x := h1.Sum64()
-	h2 := new(Hash)
-	h2.SetSeed(h1.Seed())
-	h2.WriteString("foo")
-	y := h2.Sum64()
-	if x != y {
-		t.Errorf("hashes don't match: want %x, got %x", x, y)
-	}
-}
-
-func negativeZero[T float32 | float64]() T {
-	var f T
-	f = -f
-	return f
-}
-
-func TestComparable(t *testing.T) {
-	testComparable(t, int64(2))
-	testComparable(t, uint64(8))
-	testComparable(t, uintptr(12))
-	testComparable(t, any("s"))
-	testComparable(t, "s")
-	testComparable(t, true)
-	testComparable(t, new(float64))
-	testComparable(t, float64(9))
-	testComparable(t, complex128(9i+1))
-	testComparable(t, struct{}{})
-	testComparable(t, struct {
-		i int
-		u uint
-		b bool
-		f float64
-		p *int
-		a any
-	}{i: 9, u: 1, b: true, f: 9.9, p: new(int), a: 1})
-	type S struct {
-		s string
-	}
-	s1 := S{s: heapStr(t)}
-	s2 := S{s: heapStr(t)}
-	if unsafe.StringData(s1.s) == unsafe.StringData(s2.s) {
-		t.Fatalf("unexpected two heapStr ptr equal")
-	}
-	if s1.s != s2.s {
-		t.Fatalf("unexpected two heapStr value not equal")
-	}
-	testComparable(t, s1, s2)
-	testComparable(t, s1.s, s2.s)
-	testComparable(t, float32(0), negativeZero[float32]())
-	testComparable(t, float64(0), negativeZero[float64]())
-	testComparableNoEqual(t, math.NaN(), math.NaN())
-	testComparableNoEqual(t, [2]string{"a", ""}, [2]string{"", "a"})
-	testComparableNoEqual(t, struct{ a, b string }{"foo", ""}, struct{ a, b string }{"", "foo"})
-	testComparableNoEqual(t, struct{ a, b any }{int(0), struct{}{}}, struct{ a, b any }{struct{}{}, int(0)})
-}
-
-func testComparableNoEqual[T comparable](t *testing.T, v1, v2 T) {
-	seed := MakeSeed()
-	if Comparable(seed, v1) == Comparable(seed, v2) {
-		t.Fatalf("Comparable(seed, %v) == Comparable(seed, %v)", v1, v2)
-	}
-}
-
-var heapStrValue = []byte("aTestString")
-
-func heapStr(t *testing.T) string {
-	return string(heapStrValue)
-}
-
-func testComparable[T comparable](t *testing.T, v T, v2 ...T) {
-	t.Run(TypeFor[T]().String(), func(t *testing.T) {
-		var a, b T = v, v
-		if len(v2) != 0 {
-			b = v2[0]
-		}
-		var pa *T = &a
-		seed := MakeSeed()
-		if Comparable(seed, a) != Comparable(seed, b) {
-			t.Fatalf("Comparable(seed, %v) != Comparable(seed, %v)", a, b)
-		}
-		old := Comparable(seed, pa)
-		stackGrow(8192)
-		new := Comparable(seed, pa)
-		if old != new {
-			t.Fatal("Comparable(seed, ptr) != Comparable(seed, ptr)")
-		}
-	})
-}
-
-var use byte
-
-//go:noinline
-func stackGrow(dep int) {
-	if dep == 0 {
-		return
-	}
-	var local [1024]byte
-	// make sure local is allocated on the stack.
-	local[rand.Uint64()%1024] = byte(rand.Uint64())
-	use = local[rand.Uint64()%1024]
-	stackGrow(dep - 1)
-}
-
-func TestWriteComparable(t *testing.T) {
-	testWriteComparable(t, int64(2))
-	testWriteComparable(t, uint64(8))
-	testWriteComparable(t, uintptr(12))
-	testWriteComparable(t, any("s"))
-	testWriteComparable(t, "s")
-	testComparable(t, true)
-	testWriteComparable(t, new(float64))
-	testWriteComparable(t, float64(9))
-	testWriteComparable(t, complex128(9i+1))
-	testWriteComparable(t, struct{}{})
-	testWriteComparable(t, struct {
-		i int
-		u uint
-		b bool
-		f float64
-		p *int
-		a any
-	}{i: 9, u: 1, b: true, f: 9.9, p: new(int), a: 1})
-	type S struct {
-		s string
-	}
-	s1 := S{s: heapStr(t)}
-	s2 := S{s: heapStr(t)}
-	if unsafe.StringData(s1.s) == unsafe.StringData(s2.s) {
-		t.Fatalf("unexpected two heapStr ptr equal")
-	}
-	if s1.s != s2.s {
-		t.Fatalf("unexpected two heapStr value not equal")
-	}
-	testWriteComparable(t, s1, s2)
-	testWriteComparable(t, s1.s, s2.s)
-	testWriteComparable(t, float32(0), negativeZero[float32]())
-	testWriteComparable(t, float64(0), negativeZero[float64]())
-	testWriteComparableNoEqual(t, math.NaN(), math.NaN())
-	testWriteComparableNoEqual(t, [2]string{"a", ""}, [2]string{"", "a"})
-	testWriteComparableNoEqual(t, struct{ a, b string }{"foo", ""}, struct{ a, b string }{"", "foo"})
-	testWriteComparableNoEqual(t, struct{ a, b any }{int(0), struct{}{}}, struct{ a, b any }{struct{}{}, int(0)})
-}
-
-func testWriteComparableNoEqual[T comparable](t *testing.T, v1, v2 T) {
-	seed := MakeSeed()
-	h1 := Hash{}
-	h2 := Hash{}
-	*(*Seed)(unsafe.Pointer(&h1)), *(*Seed)(unsafe.Pointer(&h2)) = seed, seed
-	WriteComparable(&h1, v1)
-	WriteComparable(&h2, v2)
-	if h1.Sum64() == h2.Sum64() {
-		t.Fatalf("WriteComparable(seed, %v) == WriteComparable(seed, %v)", v1, v2)
-	}
-
-}
-
-func testWriteComparable[T comparable](t *testing.T, v T, v2 ...T) {
-	t.Run(TypeFor[T]().String(), func(t *testing.T) {
-		var a, b T = v, v
-		if len(v2) != 0 {
-			b = v2[0]
-		}
-		var pa *T = &a
-		h1 := Hash{}
-		h2 := Hash{}
-		*(*Seed)(unsafe.Pointer(&h1)) = MakeSeed()
-		h2 = h1
-		WriteComparable(&h1, a)
-		WriteComparable(&h2, b)
-		if h1.Sum64() != h2.Sum64() {
-			t.Fatalf("WriteComparable(h, %v) != WriteComparable(h, %v)", a, b)
-		}
-		WriteComparable(&h1, pa)
-		old := h1.Sum64()
-		stackGrow(8192)
-		WriteComparable(&h2, pa)
-		new := h2.Sum64()
-		if old != new {
-			t.Fatal("WriteComparable(seed, ptr) != WriteComparable(seed, ptr)")
-		}
-	})
-}
-
-func TestComparableShouldPanic(t *testing.T) {
-	s := []byte("s")
-	a := any(s)
-	defer func() {
-		e := recover()
-		err, ok := e.(error)
-		if !ok {
-			t.Fatalf("Comaparable(any([]byte)) should panic")
-		}
-		want := "hash of unhashable type []uint8"
-		if s := err.Error(); !strings.Contains(s, want) {
-			t.Fatalf("want %s, got %s", want, s)
-		}
-	}()
-	Comparable(MakeSeed(), a)
-}
-
-func TestWriteComparableNoncommute(t *testing.T) {
-	seed := MakeSeed()
-	var h1, h2 Hash
-	h1.SetSeed(seed)
-	h2.SetSeed(seed)
-
-	h1.WriteString("abc")
-	WriteComparable(&h1, 123)
-	WriteComparable(&h2, 123)
-	h2.WriteString("abc")
-
-	if h1.Sum64() == h2.Sum64() {
-		t.Errorf("WriteComparable and WriteString unexpectedly commute")
-	}
-}
-
-func TestComparableAllocations(t *testing.T) {
-	if !testComparableAllocations {
-		t.Skip("test broken in old golang version")
-	}
-	seed := MakeSeed()
-	x := heapStr(t)
-	allocs := testing.AllocsPerRun(10, func() {
-		s := "s" + x
-		Comparable(seed, s)
-	})
-	if allocs > 0 {
-		t.Errorf("got %v allocs, want 0", allocs)
-	}
-
-	type S struct {
-		a int
-		b string
-	}
-	allocs = testing.AllocsPerRun(10, func() {
-		s := S{123, "s" + x}
-		Comparable(seed, s)
-	})
-	if allocs > 0 {
-		t.Errorf("got %v allocs, want 0", allocs)
-	}
-}
-
-// Make sure a Hash implements the hash.Hash and hash.Hash64 interfaces.
-var _ hash.Hash = &Hash{}
-var _ hash.Hash64 = &Hash{}
-
-func benchmarkSize(b *testing.B, size int) {
-	h := &Hash{}
-	buf := make([]byte, size)
-	s := string(buf)
-
-	b.Run("Write", func(b *testing.B) {
-		b.SetBytes(int64(size))
-		for i := 0; i < b.N; i++ {
-			h.Reset()
-			h.Write(buf)
-			h.Sum64()
-		}
-	})
-
-	b.Run("Bytes", func(b *testing.B) {
-		b.SetBytes(int64(size))
-		seed := h.Seed()
-		for i := 0; i < b.N; i++ {
-			Bytes(seed, buf)
-		}
-	})
-
-	b.Run("String", func(b *testing.B) {
-		b.SetBytes(int64(size))
-		seed := h.Seed()
-		for i := 0; i < b.N; i++ {
-			String(seed, s)
-		}
-	})
-}
-
-func BenchmarkHash(b *testing.B) {
-	sizes := []int{4, 8, 16, 32, 64, 256, 320, 1024, 4096, 16384}
-	for _, size := range sizes {
-		b.Run(fmt.Sprint("n=", size), func(b *testing.B) {
-			benchmarkSize(b, size)
-		})
-	}
-}
-
-func benchmarkComparable[T comparable](b *testing.B, v T) {
-	b.Run(TypeFor[T]().String(), func(b *testing.B) {
-		seed := MakeSeed()
-		for i := 0; i < b.N; i++ {
-			Comparable(seed, v)
-		}
-	})
-}
-
-func BenchmarkComparable(b *testing.B) {
-	type testStruct struct {
-		i int
-		u uint
-		b bool
-		f float64
-		p *int
-		a any
-	}
-	benchmarkComparable(b, int64(2))
-	benchmarkComparable(b, uint64(8))
-	benchmarkComparable(b, uintptr(12))
-	benchmarkComparable(b, any("s"))
-	benchmarkComparable(b, "s")
-	benchmarkComparable(b, true)
-	benchmarkComparable(b, new(float64))
-	benchmarkComparable(b, float64(9))
-	benchmarkComparable(b, complex128(9i+1))
-	benchmarkComparable(b, struct{}{})
-	benchmarkComparable(b, testStruct{i: 9, u: 1, b: true, f: 9.9, p: new(int), a: 1})
-}
-
-// TypeFor returns the [Type] that represents the type argument T.
-func TypeFor[T any]() reflect.Type {
-	var v T
-	if t := reflect.TypeOf(v); t != nil {
-		return t // optimize for T being a non-interface kind
-	}
-	return reflect.TypeOf((*T)(nil)).Elem() // only for an interface kind
-}

common/net/context.go

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

common/net/context_test.go

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