From 9e57b298bfb577c19dc01b8e990948577cda7a8e Mon Sep 17 00:00:00 2001 From: wwqgtxx Date: Sat, 3 May 2025 15:06:13 +0800 Subject: [PATCH] chore: update dependencies --- adapter/outbound/anytls.go | 4 +- adapter/outbound/hysteria.go | 2 +- adapter/outbound/hysteria2.go | 2 +- adapter/outbound/shadowsocks.go | 6 +-- adapter/outbound/singmux.go | 6 +-- adapter/outbound/tuic.go | 4 +- adapter/outbound/vless.go | 2 +- adapter/outbound/vmess.go | 2 +- adapter/outbound/wireguard.go | 6 +-- common/buf/sing.go | 4 +- common/net/deadline/conn.go | 6 +-- common/net/deadline/packet_sing.go | 8 ++-- common/net/deadline/pipe_sing.go | 4 +- common/net/packet/packet_sing.go | 8 ++-- common/net/packet/ref_sing.go | 6 +-- common/net/packet/thread_sing.go | 6 +-- common/net/sing.go | 6 +-- common/pool/sing.go | 2 +- component/proxydialer/sing.go | 4 +- component/proxydialer/slowdown_sing.go | 2 +- component/resource/fetcher.go | 2 +- go.mod | 36 +++++++------- go.sum | 66 +++++++++++++------------- listener/anytls/server.go | 6 +-- listener/sing/context.go | 2 +- listener/sing/dialer.go | 4 +- listener/sing/sing.go | 16 +++---- listener/sing_hysteria2/server.go | 2 +- listener/sing_shadowsocks/server.go | 10 ++-- listener/sing_tun/dns.go | 8 ++-- listener/sing_tun/iface.go | 2 +- listener/sing_tun/server.go | 10 ++-- listener/sing_vless/server.go | 4 +- listener/sing_vmess/server.go | 4 +- listener/trojan/server.go | 2 +- log/sing.go | 2 +- ntp/service.go | 4 +- transport/anytls/client.go | 4 +- transport/gost-plugin/websocket.go | 2 +- transport/vless/vision/vision.go | 2 +- 40 files changed, 138 insertions(+), 140 deletions(-) diff --git a/adapter/outbound/anytls.go b/adapter/outbound/anytls.go index ad5c6c0f..0e3b07de 100644 --- a/adapter/outbound/anytls.go +++ b/adapter/outbound/anytls.go @@ -15,8 +15,8 @@ import ( "github.com/metacubex/mihomo/transport/anytls" "github.com/metacubex/mihomo/transport/vmess" - M "github.com/sagernet/sing/common/metadata" - "github.com/sagernet/sing/common/uot" + M "github.com/metacubex/sing/common/metadata" + "github.com/metacubex/sing/common/uot" ) type AnyTLS struct { diff --git a/adapter/outbound/hysteria.go b/adapter/outbound/hysteria.go index 5863fd3b..55caf58b 100644 --- a/adapter/outbound/hysteria.go +++ b/adapter/outbound/hysteria.go @@ -25,7 +25,7 @@ import ( "github.com/metacubex/quic-go" "github.com/metacubex/quic-go/congestion" - M "github.com/sagernet/sing/common/metadata" + M "github.com/metacubex/sing/common/metadata" ) const ( diff --git a/adapter/outbound/hysteria2.go b/adapter/outbound/hysteria2.go index 4b55d24b..131a8b3c 100644 --- a/adapter/outbound/hysteria2.go +++ b/adapter/outbound/hysteria2.go @@ -22,7 +22,7 @@ import ( "github.com/metacubex/quic-go" "github.com/metacubex/randv2" "github.com/metacubex/sing-quic/hysteria2" - M "github.com/sagernet/sing/common/metadata" + M "github.com/metacubex/sing/common/metadata" ) func init() { diff --git a/adapter/outbound/shadowsocks.go b/adapter/outbound/shadowsocks.go index 41ea03a4..0b215ca4 100644 --- a/adapter/outbound/shadowsocks.go +++ b/adapter/outbound/shadowsocks.go @@ -20,9 +20,9 @@ import ( v2rayObfs "github.com/metacubex/mihomo/transport/v2ray-plugin" shadowsocks "github.com/metacubex/sing-shadowsocks2" - "github.com/sagernet/sing/common/bufio" - M "github.com/sagernet/sing/common/metadata" - "github.com/sagernet/sing/common/uot" + "github.com/metacubex/sing/common/bufio" + M "github.com/metacubex/sing/common/metadata" + "github.com/metacubex/sing/common/uot" ) type ShadowSocks struct { diff --git a/adapter/outbound/singmux.go b/adapter/outbound/singmux.go index 88294c6d..819f2387 100644 --- a/adapter/outbound/singmux.go +++ b/adapter/outbound/singmux.go @@ -11,9 +11,9 @@ import ( C "github.com/metacubex/mihomo/constant" "github.com/metacubex/mihomo/log" - mux "github.com/sagernet/sing-mux" - E "github.com/sagernet/sing/common/exceptions" - M "github.com/sagernet/sing/common/metadata" + mux "github.com/metacubex/sing-mux" + E "github.com/metacubex/sing/common/exceptions" + M "github.com/metacubex/sing/common/metadata" ) type SingMux struct { diff --git a/adapter/outbound/tuic.go b/adapter/outbound/tuic.go index 01fe9da2..f062f830 100644 --- a/adapter/outbound/tuic.go +++ b/adapter/outbound/tuic.go @@ -20,8 +20,8 @@ import ( "github.com/gofrs/uuid/v5" "github.com/metacubex/quic-go" - M "github.com/sagernet/sing/common/metadata" - "github.com/sagernet/sing/common/uot" + M "github.com/metacubex/sing/common/metadata" + "github.com/metacubex/sing/common/uot" ) type Tuic struct { diff --git a/adapter/outbound/vless.go b/adapter/outbound/vless.go index 3baf66cc..b075e719 100644 --- a/adapter/outbound/vless.go +++ b/adapter/outbound/vless.go @@ -27,7 +27,7 @@ import ( vmessSing "github.com/metacubex/sing-vmess" "github.com/metacubex/sing-vmess/packetaddr" - M "github.com/sagernet/sing/common/metadata" + M "github.com/metacubex/sing/common/metadata" ) const ( diff --git a/adapter/outbound/vmess.go b/adapter/outbound/vmess.go index 34c89236..23da3beb 100644 --- a/adapter/outbound/vmess.go +++ b/adapter/outbound/vmess.go @@ -25,7 +25,7 @@ import ( vmess "github.com/metacubex/sing-vmess" "github.com/metacubex/sing-vmess/packetaddr" - M "github.com/sagernet/sing/common/metadata" + M "github.com/metacubex/sing/common/metadata" ) var ErrUDPRemoteAddrMismatch = errors.New("udp packet dropped due to mismatched remote address") diff --git a/adapter/outbound/wireguard.go b/adapter/outbound/wireguard.go index 75ea5fd5..db0ef95a 100644 --- a/adapter/outbound/wireguard.go +++ b/adapter/outbound/wireguard.go @@ -26,9 +26,9 @@ import ( wireguard "github.com/metacubex/sing-wireguard" "github.com/metacubex/wireguard-go/device" - "github.com/sagernet/sing/common/debug" - E "github.com/sagernet/sing/common/exceptions" - M "github.com/sagernet/sing/common/metadata" + "github.com/metacubex/sing/common/debug" + E "github.com/metacubex/sing/common/exceptions" + M "github.com/metacubex/sing/common/metadata" ) type wireguardGoDevice interface { diff --git a/common/buf/sing.go b/common/buf/sing.go index 0907a95c..59c650ad 100644 --- a/common/buf/sing.go +++ b/common/buf/sing.go @@ -1,8 +1,8 @@ package buf import ( - "github.com/sagernet/sing/common" - "github.com/sagernet/sing/common/buf" + "github.com/metacubex/sing/common" + "github.com/metacubex/sing/common/buf" ) const BufferSize = buf.BufferSize diff --git a/common/net/deadline/conn.go b/common/net/deadline/conn.go index fdf9334f..03ee7f6a 100644 --- a/common/net/deadline/conn.go +++ b/common/net/deadline/conn.go @@ -7,9 +7,9 @@ import ( "github.com/metacubex/mihomo/common/atomic" - "github.com/sagernet/sing/common/buf" - "github.com/sagernet/sing/common/bufio" - "github.com/sagernet/sing/common/network" + "github.com/metacubex/sing/common/buf" + "github.com/metacubex/sing/common/bufio" + "github.com/metacubex/sing/common/network" ) type connReadResult struct { diff --git a/common/net/deadline/packet_sing.go b/common/net/deadline/packet_sing.go index d54748b0..71a1c515 100644 --- a/common/net/deadline/packet_sing.go +++ b/common/net/deadline/packet_sing.go @@ -6,10 +6,10 @@ import ( "github.com/metacubex/mihomo/common/net/packet" - "github.com/sagernet/sing/common/buf" - "github.com/sagernet/sing/common/bufio" - M "github.com/sagernet/sing/common/metadata" - N "github.com/sagernet/sing/common/network" + "github.com/metacubex/sing/common/buf" + "github.com/metacubex/sing/common/bufio" + M "github.com/metacubex/sing/common/metadata" + N "github.com/metacubex/sing/common/network" ) type SingPacketConn struct { diff --git a/common/net/deadline/pipe_sing.go b/common/net/deadline/pipe_sing.go index 0f6d378d..e39bde75 100644 --- a/common/net/deadline/pipe_sing.go +++ b/common/net/deadline/pipe_sing.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/sagernet/sing/common/buf" - N "github.com/sagernet/sing/common/network" + "github.com/metacubex/sing/common/buf" + N "github.com/metacubex/sing/common/network" ) type pipeAddr struct{} diff --git a/common/net/packet/packet_sing.go b/common/net/packet/packet_sing.go index 6e25eb4d..fac7c0d9 100644 --- a/common/net/packet/packet_sing.go +++ b/common/net/packet/packet_sing.go @@ -3,10 +3,10 @@ package packet import ( "net" - "github.com/sagernet/sing/common/buf" - "github.com/sagernet/sing/common/bufio" - M "github.com/sagernet/sing/common/metadata" - N "github.com/sagernet/sing/common/network" + "github.com/metacubex/sing/common/buf" + "github.com/metacubex/sing/common/bufio" + M "github.com/metacubex/sing/common/metadata" + N "github.com/metacubex/sing/common/network" ) type SingPacketConn = N.NetPacketConn diff --git a/common/net/packet/ref_sing.go b/common/net/packet/ref_sing.go index 2ca955fa..851694b2 100644 --- a/common/net/packet/ref_sing.go +++ b/common/net/packet/ref_sing.go @@ -3,9 +3,9 @@ package packet import ( "runtime" - "github.com/sagernet/sing/common/buf" - M "github.com/sagernet/sing/common/metadata" - N "github.com/sagernet/sing/common/network" + "github.com/metacubex/sing/common/buf" + M "github.com/metacubex/sing/common/metadata" + N "github.com/metacubex/sing/common/network" ) type refSingPacketConn struct { diff --git a/common/net/packet/thread_sing.go b/common/net/packet/thread_sing.go index 0869a512..53e7a48d 100644 --- a/common/net/packet/thread_sing.go +++ b/common/net/packet/thread_sing.go @@ -1,9 +1,9 @@ package packet import ( - "github.com/sagernet/sing/common/buf" - M "github.com/sagernet/sing/common/metadata" - N "github.com/sagernet/sing/common/network" + "github.com/metacubex/sing/common/buf" + M "github.com/metacubex/sing/common/metadata" + N "github.com/metacubex/sing/common/network" ) type threadSafeSingPacketConn struct { diff --git a/common/net/sing.go b/common/net/sing.go index d726f440..2cd1d726 100644 --- a/common/net/sing.go +++ b/common/net/sing.go @@ -7,9 +7,9 @@ import ( "github.com/metacubex/mihomo/common/net/deadline" - "github.com/sagernet/sing/common" - "github.com/sagernet/sing/common/bufio" - "github.com/sagernet/sing/common/network" + "github.com/metacubex/sing/common" + "github.com/metacubex/sing/common/bufio" + "github.com/metacubex/sing/common/network" ) var NewExtendedConn = bufio.NewExtendedConn diff --git a/common/pool/sing.go b/common/pool/sing.go index c246ae9f..a2c2b060 100644 --- a/common/pool/sing.go +++ b/common/pool/sing.go @@ -1,6 +1,6 @@ package pool -import "github.com/sagernet/sing/common/buf" +import "github.com/metacubex/sing/common/buf" func init() { buf.DefaultAllocator = defaultAllocator diff --git a/component/proxydialer/sing.go b/component/proxydialer/sing.go index 71180c01..51d685e8 100644 --- a/component/proxydialer/sing.go +++ b/component/proxydialer/sing.go @@ -6,8 +6,8 @@ import ( C "github.com/metacubex/mihomo/constant" - M "github.com/sagernet/sing/common/metadata" - N "github.com/sagernet/sing/common/network" + M "github.com/metacubex/sing/common/metadata" + N "github.com/metacubex/sing/common/network" ) type SingDialer interface { diff --git a/component/proxydialer/slowdown_sing.go b/component/proxydialer/slowdown_sing.go index cc3a46aa..c9442670 100644 --- a/component/proxydialer/slowdown_sing.go +++ b/component/proxydialer/slowdown_sing.go @@ -5,7 +5,7 @@ import ( "net" "github.com/metacubex/mihomo/component/slowdown" - M "github.com/sagernet/sing/common/metadata" + M "github.com/metacubex/sing/common/metadata" ) type SlowDownSingDialer struct { diff --git a/component/resource/fetcher.go b/component/resource/fetcher.go index de41fded..3658e1a1 100644 --- a/component/resource/fetcher.go +++ b/component/resource/fetcher.go @@ -11,7 +11,7 @@ import ( types "github.com/metacubex/mihomo/constant/provider" "github.com/metacubex/mihomo/log" - "github.com/sagernet/fswatch" + "github.com/metacubex/fswatch" "github.com/samber/lo" ) diff --git a/go.mod b/go.mod index b1705d86..9060075a 100644 --- a/go.mod +++ b/go.mod @@ -21,18 +21,22 @@ require ( github.com/metacubex/bart v0.19.0 github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 github.com/metacubex/chacha v0.1.2 + github.com/metacubex/fswatch v0.1.1 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 github.com/metacubex/quic-go v0.51.1-0.20250423035655-e3948b36ce14 github.com/metacubex/randv2 v0.2.0 - github.com/metacubex/sing-quic v0.0.0-20250423042228-20af53d3de7e - github.com/metacubex/sing-shadowsocks v0.2.8 - github.com/metacubex/sing-shadowsocks2 v0.2.2 - github.com/metacubex/sing-shadowtls v0.0.0-20250412122235-0e9005731a63 - github.com/metacubex/sing-tun v0.4.6-0.20250412144348-c426cb167db5 - github.com/metacubex/sing-vmess v0.1.14-0.20250228002636-abc39e113b82 - github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589 + github.com/metacubex/sing v0.5.2 + github.com/metacubex/sing-mux v0.3.2 + github.com/metacubex/sing-quic v0.0.0-20250503063219-9663baa38af1 + github.com/metacubex/sing-shadowsocks v0.2.9 + github.com/metacubex/sing-shadowsocks2 v0.2.3 + github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 + github.com/metacubex/sing-tun v0.4.6-0.20250503065609-efb9f0beb6f6 + github.com/metacubex/sing-vmess v0.2.1 + github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f + github.com/metacubex/smux v0.0.0-20250503055512-501391591dee github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422 - github.com/metacubex/utls v1.7.0-alpha.1 + github.com/metacubex/utls v1.7.0-alpha.2 github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 github.com/miekg/dns v1.1.63 // lastest version compatible with golang1.20 github.com/mroth/weightedrand/v2 v2.1.0 @@ -40,11 +44,7 @@ require ( github.com/oschwald/maxminddb-golang v1.12.0 // lastest version compatible with golang1.20 github.com/puzpuzpuz/xsync/v3 v3.5.1 github.com/sagernet/cors v1.2.1 - github.com/sagernet/fswatch v0.1.1 github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a - github.com/sagernet/sing v0.5.2 - github.com/sagernet/sing-mux v0.2.1 - github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 github.com/samber/lo v1.50.0 github.com/shirou/gopsutil/v4 v4.25.1 // lastest version compatible with golang1.20 github.com/sirupsen/logrus v1.9.3 @@ -57,7 +57,7 @@ require ( golang.org/x/crypto v0.33.0 // lastest version compatible with golang1.20 golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // lastest version compatible with golang1.20 golang.org/x/net v0.35.0 // lastest version compatible with golang1.20 - golang.org/x/sync v0.11.0 + golang.org/x/sync v0.11.0 // lastest version compatible with golang1.20 golang.org/x/sys v0.30.0 // lastest version compatible with golang1.20 google.golang.org/protobuf v1.34.2 // lastest version compatible with golang1.20 gopkg.in/yaml.v3 v3.0.1 @@ -65,7 +65,7 @@ require ( ) require ( - github.com/RyuaNerin/go-krypto v1.2.4 // indirect + github.com/RyuaNerin/go-krypto v1.3.0 // indirect github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect github.com/ajg/form v1.5.1 // indirect github.com/andybalholm/brotli v1.0.6 // indirect @@ -73,11 +73,11 @@ require ( github.com/cloudflare/circl v1.3.7 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/ebitengine/purego v0.8.2 // indirect - github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect + github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358 // indirect github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/gaukas/godicttls v0.0.4 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect @@ -92,13 +92,13 @@ require ( github.com/mailru/easyjson v0.7.7 // indirect github.com/mdlayher/socket v0.4.1 // indirect github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b // indirect + github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 // indirect github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect github.com/onsi/ginkgo/v2 v2.9.5 // indirect github.com/pierrec/lz4/v4 v4.1.14 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/quic-go/qpack v0.4.0 // indirect - github.com/sagernet/nftables v0.3.0-beta.4 // indirect github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e // indirect @@ -115,5 +115,3 @@ require ( golang.org/x/time v0.7.0 // indirect golang.org/x/tools v0.24.0 // indirect ) - -replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20250228041610-d94509dc612a diff --git a/go.sum b/go.sum index 78faf1df..4d336507 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/3andne/restls-client-go v0.1.6 h1:tRx/YilqW7iHpgmEL4E1D8dAsuB0tFF3uvncS+B6I08= github.com/3andne/restls-client-go v0.1.6/go.mod h1:iEdTZNt9kzPIxjIGSMScUFSBrUH6bFRNg0BWlP4orEY= -github.com/RyuaNerin/elliptic2 v1.0.0/go.mod h1:wWB8fWrJI/6EPJkyV/r1Rj0hxUgrusmqSj8JN6yNf/A= -github.com/RyuaNerin/go-krypto v1.2.4 h1:mXuNdK6M317aPV0llW6Xpjbo4moOlPF7Yxz4tb4b4Go= -github.com/RyuaNerin/go-krypto v1.2.4/go.mod h1:QqCYkoutU3yInyD9INt2PGolVRsc3W4oraQadVGXJ/8= +github.com/RyuaNerin/go-krypto v1.3.0 h1:smavTzSMAx8iuVlGb4pEwl9MD2qicqMzuXR2QWp2/Pg= +github.com/RyuaNerin/go-krypto v1.3.0/go.mod h1:9R9TU936laAIqAmjcHo/LsaXYOZlymudOAxjaBf62UM= +github.com/RyuaNerin/testingutil v0.1.0 h1:IYT6JL57RV3U2ml3dLHZsVtPOP6yNK7WUVdzzlpNrss= github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4q90ylaVAbnYyx0JYqK4YcGok= github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344/go.mod h1:9pIqrY6SXNL8vjRQE5Hd/OL5GyK/9MrGUWs87z/eFfk= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= @@ -30,8 +30,8 @@ github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/enfein/mieru/v3 v3.13.0 h1:eGyxLGkb+lut9ebmx+BGwLJ5UMbEc/wGIYO0AXEKy98= github.com/enfein/mieru/v3 v3.13.0/go.mod h1:zJBUCsi5rxyvHM8fjFf+GLaEl4OEjjBXr1s5F6Qd3hM= -github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 h1:/5RkVc9Rc81XmMyVqawCiDyrBHZbLAZgTTCqou4mwj8= -github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I= +github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358 h1:kXYqH/sL8dS/FdoFjr12ePjnLPorPo2FsnrHNuXSDyo= +github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I= github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g= github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391/go.mod h1:K2R7GhgxrlJzHw2qiPWsCZXf/kXEJN9PLnQK73Ll0po= github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c h1:RUzBDdZ+e/HEe2Nh8lYsduiPAZygUfVXJn0Ncj5sHMg= @@ -39,8 +39,8 @@ github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 h1:tlDMEdcPRQKBE github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1/go.mod h1:4RfsapbGx2j/vU5xC/5/9qB3kn9Awp1YDiEnN43QrJ4= github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 h1:fuGucgPk5dN6wzfnxl3D0D3rVLw4v2SbBT9jb4VnxzA= github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010/go.mod h1:JtBcj7sBuTTRupn7c2bFspMDIObMJsVK8TeUvpShPok= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= +github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk= github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI= github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8= @@ -103,34 +103,42 @@ github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 h1:oBowHVKZycNtAFb github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399/go.mod h1:4xcieuIK+M4bGQmQYZVqEaIYqjS1ahO4kXG7EmDgEro= github.com/metacubex/chacha v0.1.2 h1:QulCq3eVm3TO6+4nVIWJtmSe7BT2GMrgVHuAoqRQnlc= github.com/metacubex/chacha v0.1.2/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8= +github.com/metacubex/fswatch v0.1.1 h1:jqU7C/v+g0qc2RUFgmAOPoVvfl2BXXUXEumn6oQuxhU= +github.com/metacubex/fswatch v0.1.1/go.mod h1:czrTT7Zlbz7vWft8RQu9Qqh+JoX+Nnb+UabuyN1YsgI= github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvOzK9ubNCCkQ+ldc4YSH/rILn53l/xGBFHHI= github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88= github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b h1:RUh4OdVPz/jDrM9MQ2ySuqu2aeBqcA8rtfWUYLZ8RtI= github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b/go.mod h1:8LpS0IJW1VmWzUm3ylb0e2SK5QDm5lO/2qwWLZgRpBU= +github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 h1:1Qpuy+sU3DmyX9HwI+CrBT/oLNJngvBorR2RbajJcqo= +github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793/go.mod h1:RjRNb4G52yAgfR+Oe/kp9G4PJJ97Fnj89eY1BFO3YyA= github.com/metacubex/quic-go v0.51.1-0.20250423035655-e3948b36ce14 h1:vhB4KEgiN89xXtLlyYWczu3AxgN2T1lp0kIDYT4Faag= github.com/metacubex/quic-go v0.51.1-0.20250423035655-e3948b36ce14/go.mod h1:9R1NOzCgTcWsdWvOMlmtMuF0uKzuOpsfvEf7U3I8zM0= github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs= github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY= -github.com/metacubex/sing v0.0.0-20250228041610-d94509dc612a h1:xjPXdDTlIKq4U/KnKpoCtkxD03T8GimtQrvHy/3dN00= -github.com/metacubex/sing v0.0.0-20250228041610-d94509dc612a/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= -github.com/metacubex/sing-quic v0.0.0-20250423042228-20af53d3de7e h1:tg+2w+6O5umHGW6gNlMjKFll3mEMHGGkXM60nCtB/BI= -github.com/metacubex/sing-quic v0.0.0-20250423042228-20af53d3de7e/go.mod h1:GUYUT+3v6Re4XZeSzwu7UcSf8S9jOQaw8YEsY5ehNTI= -github.com/metacubex/sing-shadowsocks v0.2.8 h1:wIhlaigswzjPw4hej75sEvWte3QR0+AJRafgwBHO5B4= -github.com/metacubex/sing-shadowsocks v0.2.8/go.mod h1:X3x88XtJpBxG0W0/ECOJL6Ib0SJ3xdniAkU/6/RMWU0= -github.com/metacubex/sing-shadowsocks2 v0.2.2 h1:eaf42uVx4Lr21S6MDYs0ZdTvGA0GEhDpb9no4+gdXPo= -github.com/metacubex/sing-shadowsocks2 v0.2.2/go.mod h1:BhOug03a/RbI7y6hp6q+6ITM1dXjnLTmeWBHSTwvv2Q= -github.com/metacubex/sing-shadowtls v0.0.0-20250412122235-0e9005731a63 h1:vy/8ZYYtWUXYnOnw/NF8ThG1W/RqM/h5rkun+OXZMH0= -github.com/metacubex/sing-shadowtls v0.0.0-20250412122235-0e9005731a63/go.mod h1:eDZ2JpkSkewGmUlCoLSn2MRFn1D0jKPIys/6aogFx7U= -github.com/metacubex/sing-tun v0.4.6-0.20250412144348-c426cb167db5 h1:hcsz5e5lqhBxn3iQQDIF60FLZ8PQT542GTQZ+1wcIGo= -github.com/metacubex/sing-tun v0.4.6-0.20250412144348-c426cb167db5/go.mod h1:V0N4rr0dWPBEE20ESkTXdbtx2riQYcb6YtwC5w/9wl0= -github.com/metacubex/sing-vmess v0.1.14-0.20250228002636-abc39e113b82 h1:zZp5uct9+/0Hb1jKGyqDjCU4/72t43rs7qOq3Rc9oU8= -github.com/metacubex/sing-vmess v0.1.14-0.20250228002636-abc39e113b82/go.mod h1:nE7Mdzj/QUDwgRi/8BASPtsxtIFZTHA4Yst5GgwbGCQ= -github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589 h1:Z6bNy0HLTjx6BKIkV48sV/yia/GP8Bnyb5JQuGgSGzg= -github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589/go.mod h1:4NclTLIZuk+QkHVCGrP87rHi/y8YjgPytxTgApJNMhc= +github.com/metacubex/sing v0.5.2 h1:uHi2iheXFdB9BY7tHqF40zdAcEHWmZAF6oHskugwh0w= +github.com/metacubex/sing v0.5.2/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w= +github.com/metacubex/sing-mux v0.3.2 h1:nJv52pyRivHcaZJKk2JgxpaVvj1GAXG81scSa9N7ncw= +github.com/metacubex/sing-mux v0.3.2/go.mod h1:3rt1soewn0O6j89GCLmwAQFsq257u0jf2zQSPhTL3Bw= +github.com/metacubex/sing-quic v0.0.0-20250503063219-9663baa38af1 h1:n3FqMNoRzVQr03Qf0ZlvimlJlKI8sG6gOUnJy6xy2QQ= +github.com/metacubex/sing-quic v0.0.0-20250503063219-9663baa38af1/go.mod h1:mqtr9bgM9eLvLKQqiLOi5I6AJHkvqAw2a61ABZcLuoE= +github.com/metacubex/sing-shadowsocks v0.2.9 h1:2e++13WNN7EGjGtvrGLUzW1xrCdQbW2gIFpgw5GEw00= +github.com/metacubex/sing-shadowsocks v0.2.9/go.mod h1:CJSEGO4FWQAWe+ZiLZxCweGdjRR60A61SIoVjdjQeBA= +github.com/metacubex/sing-shadowsocks2 v0.2.3 h1:v3rNS/5Ywh0NIZ6VU/NmdERQIN5RePzyxCFeQsU4Cx0= +github.com/metacubex/sing-shadowsocks2 v0.2.3/go.mod h1:/WNy/Q8ahLCoPRriWuFZFD0Jy+JNp1MEQl28Zw6SaF8= +github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 h1:gXU+MYPm7Wme3/OAY2FFzVq9d9GxPHOqu5AQfg/ddhI= +github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2/go.mod h1:mbfboaXauKJNIHJYxQRa+NJs4JU9NZfkA+I33dS2+9E= +github.com/metacubex/sing-tun v0.4.6-0.20250503065609-efb9f0beb6f6 h1:TAwL91XPa6x1QK55CRm+VTzPvLPUfEr/uFDnOZArqEU= +github.com/metacubex/sing-tun v0.4.6-0.20250503065609-efb9f0beb6f6/go.mod h1:HDaHDL6onAX2ZGbAGUXKp++PohRdNb7Nzt6zxzhox+U= +github.com/metacubex/sing-vmess v0.2.1 h1:I6gM3VUjtvJ15D805EUbNH+SRBuqzJeFnuIbKYUsWZ0= +github.com/metacubex/sing-vmess v0.2.1/go.mod h1:DsODWItJtOMZNna8Qhheg8r3tUivrcO3vWgaTYKnfTo= +github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f h1:Sr/DYKYofKHKc4GF3qkRGNuj6XA6c0eqPgEDN+VAsYU= +github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f/go.mod h1:jpAkVLPnCpGSfNyVmj6Cq4YbuZsFepm/Dc+9BAOcR80= +github.com/metacubex/smux v0.0.0-20250503055512-501391591dee h1:lp6hJ+4wCLZu113awp7P6odM2okB5s60HUyF0FMqKmo= +github.com/metacubex/smux v0.0.0-20250503055512-501391591dee/go.mod h1:4bPD8HWx9jPJ9aE4uadgyN7D1/Wz3KmPy+vale8sKLE= github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422 h1:zGeQt3UyNydIVrMRB97AA5WsYEau/TyCnRtTf1yUmJY= github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw= -github.com/metacubex/utls v1.7.0-alpha.1 h1:oMFsPh2oTlALJ7vKXPJuqgy0YeiZ+q/LLw+ZdxZ80l4= -github.com/metacubex/utls v1.7.0-alpha.1/go.mod h1:oknYT0qTOwE4hjPmZOEpzVdefnW7bAdGLvZcqmk4TLU= +github.com/metacubex/utls v1.7.0-alpha.2 h1:kLRg6zDV12R1uclL5qW9Tx4RD6ztGIIrTZWY5zrJXCg= +github.com/metacubex/utls v1.7.0-alpha.2/go.mod h1:oknYT0qTOwE4hjPmZOEpzVdefnW7bAdGLvZcqmk4TLU= github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 h1:hJLQviGySBuaynlCwf/oYgIxbVbGRUIKZCxdya9YrbQ= github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181/go.mod h1:phewKljNYiTVT31Gcif8RiCKnTUOgVWFJjccqYM8s+Y= github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY= @@ -164,16 +172,8 @@ github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= github.com/sagernet/cors v1.2.1 h1:Cv5Z8y9YSD6Gm+qSpNrL3LO4lD3eQVvbFYJSG7JCMHQ= github.com/sagernet/cors v1.2.1/go.mod h1:O64VyOjjhrkLmQIjF4KGRrJO/5dVXFdpEmCW/eISRAI= -github.com/sagernet/fswatch v0.1.1 h1:YqID+93B7VRfqIH3PArW/XpJv5H4OLEVWDfProGoRQs= -github.com/sagernet/fswatch v0.1.1/go.mod h1:nz85laH0mkQqJfaOrqPpkwtU1znMFNVTpT/5oRsVz/o= github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis= github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM= -github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I= -github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8= -github.com/sagernet/sing-mux v0.2.1 h1:N/3MHymfnFZRd29tE3TaXwPUVVgKvxhtOkiCMLp9HVo= -github.com/sagernet/sing-mux v0.2.1/go.mod h1:dm3BWL6NvES9pbib7llpylrq7Gq+LjlzG+0RacdxcyE= -github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ= -github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7/go.mod h1:FP9X2xjT/Az1EsG/orYYoC+5MojWnuI7hrffz8fGwwo= github.com/samber/lo v1.50.0 h1:XrG0xOeHs+4FQ8gJR97zDz5uOFMW7OwFWiFVzqopKgY= github.com/samber/lo v1.50.0/go.mod h1:RjZyNk6WSnUFRKK6EyOhsRJMqft3G+pg7dCWHQCWvsc= github.com/shirou/gopsutil/v4 v4.25.1 h1:QSWkTc+fu9LTAWfkZwZ6j8MSUk4A2LV7rbH0ZqmLjXs= diff --git a/listener/anytls/server.go b/listener/anytls/server.go index f06aafd2..db0a5503 100644 --- a/listener/anytls/server.go +++ b/listener/anytls/server.go @@ -19,9 +19,9 @@ import ( "github.com/metacubex/mihomo/transport/anytls/padding" "github.com/metacubex/mihomo/transport/anytls/session" - "github.com/sagernet/sing/common/auth" - "github.com/sagernet/sing/common/bufio" - M "github.com/sagernet/sing/common/metadata" + "github.com/metacubex/sing/common/auth" + "github.com/metacubex/sing/common/bufio" + M "github.com/metacubex/sing/common/metadata" ) type Listener struct { diff --git a/listener/sing/context.go b/listener/sing/context.go index e1e8b452..0193cb88 100644 --- a/listener/sing/context.go +++ b/listener/sing/context.go @@ -6,7 +6,7 @@ import ( "github.com/metacubex/mihomo/adapter/inbound" - "github.com/sagernet/sing/common/auth" + "github.com/metacubex/sing/common/auth" ) type contextKey string diff --git a/listener/sing/dialer.go b/listener/sing/dialer.go index 9c8305b6..d3998d6e 100644 --- a/listener/sing/dialer.go +++ b/listener/sing/dialer.go @@ -8,8 +8,8 @@ import ( C "github.com/metacubex/mihomo/constant" "github.com/metacubex/mihomo/listener/inner" - M "github.com/sagernet/sing/common/metadata" - N "github.com/sagernet/sing/common/network" + M "github.com/metacubex/sing/common/metadata" + N "github.com/metacubex/sing/common/network" ) type Dialer struct { diff --git a/listener/sing/sing.go b/listener/sing/sing.go index af7cdbc9..a2ce9b0a 100644 --- a/listener/sing/sing.go +++ b/listener/sing/sing.go @@ -14,15 +14,15 @@ import ( C "github.com/metacubex/mihomo/constant" "github.com/metacubex/mihomo/log" + mux "github.com/metacubex/sing-mux" vmess "github.com/metacubex/sing-vmess" - mux "github.com/sagernet/sing-mux" - "github.com/sagernet/sing/common/buf" - "github.com/sagernet/sing/common/bufio" - "github.com/sagernet/sing/common/bufio/deadline" - E "github.com/sagernet/sing/common/exceptions" - M "github.com/sagernet/sing/common/metadata" - "github.com/sagernet/sing/common/network" - "github.com/sagernet/sing/common/uot" + "github.com/metacubex/sing/common/buf" + "github.com/metacubex/sing/common/bufio" + "github.com/metacubex/sing/common/bufio/deadline" + E "github.com/metacubex/sing/common/exceptions" + M "github.com/metacubex/sing/common/metadata" + "github.com/metacubex/sing/common/network" + "github.com/metacubex/sing/common/uot" ) const UDPTimeout = 5 * time.Minute diff --git a/listener/sing_hysteria2/server.go b/listener/sing_hysteria2/server.go index 92bd1397..88c7ad2c 100644 --- a/listener/sing_hysteria2/server.go +++ b/listener/sing_hysteria2/server.go @@ -24,7 +24,7 @@ import ( "github.com/metacubex/sing-quic/hysteria2" "github.com/metacubex/quic-go" - E "github.com/sagernet/sing/common/exceptions" + E "github.com/metacubex/sing/common/exceptions" ) type Listener struct { diff --git a/listener/sing_shadowsocks/server.go b/listener/sing_shadowsocks/server.go index 020aa782..52b062ed 100644 --- a/listener/sing_shadowsocks/server.go +++ b/listener/sing_shadowsocks/server.go @@ -19,11 +19,11 @@ import ( "github.com/metacubex/sing-shadowsocks/shadowaead" "github.com/metacubex/sing-shadowsocks/shadowaead_2022" shadowtls "github.com/metacubex/sing-shadowtls" - "github.com/sagernet/sing/common" - "github.com/sagernet/sing/common/buf" - "github.com/sagernet/sing/common/bufio" - M "github.com/sagernet/sing/common/metadata" - "github.com/sagernet/sing/common/network" + "github.com/metacubex/sing/common" + "github.com/metacubex/sing/common/buf" + "github.com/metacubex/sing/common/bufio" + M "github.com/metacubex/sing/common/metadata" + "github.com/metacubex/sing/common/network" ) type Listener struct { diff --git a/listener/sing_tun/dns.go b/listener/sing_tun/dns.go index 505f16ac..ab565848 100644 --- a/listener/sing_tun/dns.go +++ b/listener/sing_tun/dns.go @@ -12,10 +12,10 @@ import ( "github.com/metacubex/mihomo/listener/sing" "github.com/metacubex/mihomo/log" - "github.com/sagernet/sing/common/buf" - "github.com/sagernet/sing/common/bufio" - M "github.com/sagernet/sing/common/metadata" - "github.com/sagernet/sing/common/network" + "github.com/metacubex/sing/common/buf" + "github.com/metacubex/sing/common/bufio" + M "github.com/metacubex/sing/common/metadata" + "github.com/metacubex/sing/common/network" ) type ListenerHandler struct { diff --git a/listener/sing_tun/iface.go b/listener/sing_tun/iface.go index 3551a853..ddb6c841 100644 --- a/listener/sing_tun/iface.go +++ b/listener/sing_tun/iface.go @@ -6,7 +6,7 @@ import ( "github.com/metacubex/mihomo/component/iface" - "github.com/metacubex/sing-tun/control" + "github.com/metacubex/sing/common/control" ) type defaultInterfaceFinder struct{} diff --git a/listener/sing_tun/server.go b/listener/sing_tun/server.go index df5ea0c5..6998f0c1 100644 --- a/listener/sing_tun/server.go +++ b/listener/sing_tun/server.go @@ -24,11 +24,11 @@ import ( "golang.org/x/exp/constraints" tun "github.com/metacubex/sing-tun" - "github.com/metacubex/sing-tun/control" - "github.com/sagernet/sing/common" - E "github.com/sagernet/sing/common/exceptions" - F "github.com/sagernet/sing/common/format" - "github.com/sagernet/sing/common/ranges" + "github.com/metacubex/sing/common" + "github.com/metacubex/sing/common/control" + E "github.com/metacubex/sing/common/exceptions" + F "github.com/metacubex/sing/common/format" + "github.com/metacubex/sing/common/ranges" "go4.org/netipx" "golang.org/x/exp/maps" diff --git a/listener/sing_vless/server.go b/listener/sing_vless/server.go index b2eeb37b..97a62fe4 100644 --- a/listener/sing_vless/server.go +++ b/listener/sing_vless/server.go @@ -22,8 +22,8 @@ import ( mihomoVMess "github.com/metacubex/mihomo/transport/vmess" "github.com/metacubex/sing-vmess/vless" - "github.com/sagernet/sing/common" - "github.com/sagernet/sing/common/metadata" + "github.com/metacubex/sing/common" + "github.com/metacubex/sing/common/metadata" ) func init() { diff --git a/listener/sing_vmess/server.go b/listener/sing_vmess/server.go index 657ed2fb..b5a9378f 100644 --- a/listener/sing_vmess/server.go +++ b/listener/sing_vmess/server.go @@ -20,8 +20,8 @@ import ( mihomoVMess "github.com/metacubex/mihomo/transport/vmess" vmess "github.com/metacubex/sing-vmess" - "github.com/sagernet/sing/common" - "github.com/sagernet/sing/common/metadata" + "github.com/metacubex/sing/common" + "github.com/metacubex/sing/common/metadata" ) type Listener struct { diff --git a/listener/trojan/server.go b/listener/trojan/server.go index f239cb3b..d3ca98d7 100644 --- a/listener/trojan/server.go +++ b/listener/trojan/server.go @@ -20,7 +20,7 @@ import ( "github.com/metacubex/mihomo/transport/trojan" mihomoVMess "github.com/metacubex/mihomo/transport/vmess" - "github.com/sagernet/smux" + "github.com/metacubex/smux" ) type Listener struct { diff --git a/log/sing.go b/log/sing.go index 7fdd3f12..854b7b87 100644 --- a/log/sing.go +++ b/log/sing.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - L "github.com/sagernet/sing/common/logger" + L "github.com/metacubex/sing/common/logger" ) type singLogger struct{} diff --git a/ntp/service.go b/ntp/service.go index d4582c99..6fb7453e 100644 --- a/ntp/service.go +++ b/ntp/service.go @@ -9,8 +9,8 @@ import ( "github.com/metacubex/mihomo/component/proxydialer" "github.com/metacubex/mihomo/log" - M "github.com/sagernet/sing/common/metadata" - "github.com/sagernet/sing/common/ntp" + M "github.com/metacubex/sing/common/metadata" + "github.com/metacubex/sing/common/ntp" ) var offset time.Duration diff --git a/transport/anytls/client.go b/transport/anytls/client.go index abd8364a..44633ae3 100644 --- a/transport/anytls/client.go +++ b/transport/anytls/client.go @@ -13,8 +13,8 @@ import ( "github.com/metacubex/mihomo/transport/anytls/session" "github.com/metacubex/mihomo/transport/vmess" - M "github.com/sagernet/sing/common/metadata" - N "github.com/sagernet/sing/common/network" + M "github.com/metacubex/sing/common/metadata" + N "github.com/metacubex/sing/common/network" ) type ClientConfig struct { diff --git a/transport/gost-plugin/websocket.go b/transport/gost-plugin/websocket.go index e60af595..23d06b94 100644 --- a/transport/gost-plugin/websocket.go +++ b/transport/gost-plugin/websocket.go @@ -8,7 +8,7 @@ import ( "github.com/metacubex/mihomo/component/ca" "github.com/metacubex/mihomo/transport/vmess" - smux "github.com/sagernet/smux" + smux "github.com/metacubex/smux" ) // Option is options of gost websocket diff --git a/transport/vless/vision/vision.go b/transport/vless/vision/vision.go index ac0b0534..28fd2fce 100644 --- a/transport/vless/vision/vision.go +++ b/transport/vless/vision/vision.go @@ -14,7 +14,7 @@ import ( tlsC "github.com/metacubex/mihomo/component/tls" "github.com/gofrs/uuid/v5" - "github.com/sagernet/sing/common" + "github.com/metacubex/sing/common" ) var ErrNotTLS13 = errors.New("XTLS Vision based on TLS 1.3 outer connection")