核心依赖变更mihomo

core/build.gradle.kts

@@ -20,11 +20,11 @@ val golangSource = file("src/main/golang/native")
 golang {
     sourceSets {
         create("meta-alpha") {
-            tags.set(listOf("foss","with_gvisor"))
+            tags.set(listOf("foss","with_gvisor","cmfa"))
             srcDir.set(file("src/foss/golang"))
         }
         create("meta") {
-            tags.set(listOf("foss","with_gvisor"))
+            tags.set(listOf("foss","with_gvisor","cmfa"))
             srcDir.set(file("src/foss/golang"))
         }
         all {

core/src/foss/golang/go.mod

@@ -8,7 +8,7 @@ require cfa/blob v0.0.0-00010101000000-000000000000 // indirect
 
 require (
 	github.com/3andne/restls-client-go v0.1.6 // indirect
-	github.com/Dreamacro/clash v1.7.0 // indirect
+	github.com/metacubex/mihomo v1.7.0 // indirect
 	github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34 // indirect
 	github.com/RyuaNerin/go-krypto v1.0.2 // indirect
 	github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
@@ -48,7 +48,7 @@ require (
 	github.com/metacubex/sing-quic v0.0.0-20231008050747-a684db516966 // indirect
 	github.com/metacubex/sing-shadowsocks v0.2.5 // indirect
 	github.com/metacubex/sing-shadowsocks2 v0.1.4 // indirect
-	github.com/metacubex/sing-tun v0.1.15-0.20231102032628-0f8a17217e56 // indirect
+	github.com/metacubex/sing-tun v0.1.15-0.20231103033938-170591e8d5bd // indirect
 	github.com/metacubex/sing-vmess v0.1.9-0.20230921005247-a0488d7dac74 // indirect
 	github.com/metacubex/sing-wireguard v0.0.0-20231001110902-321836559170 // indirect
 	github.com/miekg/dns v1.1.56 // indirect
@@ -104,10 +104,10 @@ require (
 	lukechampine.com/blake3 v1.2.1 // indirect
 )
 
-replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20231001053806-1230641572b9
+replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240111014253-f1818b6a82b2
 
 replace cfa => ../../main/golang
 
-replace github.com/Dreamacro/clash => ./clash
+replace github.com/metacubex/mihomo => ./clash
 
 replace cfa/blob => ../../../build/intermediates/golang_blob

core/src/foss/golang/go.sum

@@ -101,8 +101,8 @@ github.com/metacubex/sing-shadowsocks v0.2.5 h1:O2RRSHlKGEpAVG/OHJQxyHqDy8uvvdCW
 github.com/metacubex/sing-shadowsocks v0.2.5/go.mod h1:Xz2uW9BEYGEoA8B4XEpoxt7ERHClFCwsMAvWaruoyMo=
 github.com/metacubex/sing-shadowsocks2 v0.1.4 h1:OOCf8lgsVcpTOJUeaFAMzyKVebaQOBnKirDdUdBoKIE=
 github.com/metacubex/sing-shadowsocks2 v0.1.4/go.mod h1:Qz028sLfdY3qxGRm9FDI+IM2Ae3ty2wR7HIzD/56h/k=
-github.com/metacubex/sing-tun v0.1.15-0.20231102032628-0f8a17217e56 h1:ietLSuWRlYrNukGEEn/WXioB4OKPebqpZCc93MRKxEU=
+github.com/metacubex/sing-tun v0.1.15-0.20231103033938-170591e8d5bd h1:k0+92eARqyTAovGhg2AxdsMWHjUsdiGCnR5NuXF3CQY=
-github.com/metacubex/sing-tun v0.1.15-0.20231102032628-0f8a17217e56/go.mod h1:Q7zmpJ+qOvMMXyUoYlxGQuWkqALUpXzFSSqO+KLPyzA=
+github.com/metacubex/sing-tun v0.1.15-0.20231103033938-170591e8d5bd/go.mod h1:Q7zmpJ+qOvMMXyUoYlxGQuWkqALUpXzFSSqO+KLPyzA=
 github.com/metacubex/sing-vmess v0.1.9-0.20230921005247-a0488d7dac74 h1:FtupiyFkaVjFvRa7B/uDtRWg5BNsoyPC9MTev3sDasY=
 github.com/metacubex/sing-vmess v0.1.9-0.20230921005247-a0488d7dac74/go.mod h1:8EWBZpc+qNvf5gmvjAtMHK1/DpcWqzfcBL842K00BsM=
 github.com/metacubex/sing-wireguard v0.0.0-20231001110902-321836559170 h1:DBGA0hmrP4pVIwLiXUONdphjcppED+plmVaKf1oqkwk=

core/src/main/golang/go.mod

@@ -3,7 +3,7 @@ module cfa
 go 1.20
 
 require (
-	github.com/Dreamacro/clash v1.7.0
+	github.com/metacubex/mihomo v1.7.0
 	github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34
 	github.com/dlclark/regexp2 v1.10.0
 	github.com/miekg/dns v1.1.56
@@ -12,9 +12,9 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-replace github.com/Dreamacro/clash => ../../foss/golang/clash
+replace github.com/metacubex/mihomo => ../../foss/golang/clash
 
-replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20231001053806-1230641572b9
+replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240111014253-f1818b6a82b2
 
 require (
 	github.com/3andne/restls-client-go v0.1.6 // indirect
@@ -55,7 +55,7 @@ require (
 	github.com/metacubex/sing-quic v0.0.0-20231008050747-a684db516966 // indirect
 	github.com/metacubex/sing-shadowsocks v0.2.5 // indirect
 	github.com/metacubex/sing-shadowsocks2 v0.1.4 // indirect
-	github.com/metacubex/sing-tun v0.1.15-0.20231102032628-0f8a17217e56 // indirect
+	github.com/metacubex/sing-tun v0.1.15-0.20231103033938-170591e8d5bd // indirect
 	github.com/metacubex/sing-vmess v0.1.9-0.20230921005247-a0488d7dac74 // indirect
 	github.com/metacubex/sing-wireguard v0.0.0-20231001110902-321836559170 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect

core/src/main/golang/go.sum

@@ -101,8 +101,8 @@ github.com/metacubex/sing-shadowsocks v0.2.5 h1:O2RRSHlKGEpAVG/OHJQxyHqDy8uvvdCW
 github.com/metacubex/sing-shadowsocks v0.2.5/go.mod h1:Xz2uW9BEYGEoA8B4XEpoxt7ERHClFCwsMAvWaruoyMo=
 github.com/metacubex/sing-shadowsocks2 v0.1.4 h1:OOCf8lgsVcpTOJUeaFAMzyKVebaQOBnKirDdUdBoKIE=
 github.com/metacubex/sing-shadowsocks2 v0.1.4/go.mod h1:Qz028sLfdY3qxGRm9FDI+IM2Ae3ty2wR7HIzD/56h/k=
-github.com/metacubex/sing-tun v0.1.15-0.20231102032628-0f8a17217e56 h1:ietLSuWRlYrNukGEEn/WXioB4OKPebqpZCc93MRKxEU=
+github.com/metacubex/sing-tun v0.1.15-0.20231103033938-170591e8d5bd h1:k0+92eARqyTAovGhg2AxdsMWHjUsdiGCnR5NuXF3CQY=
-github.com/metacubex/sing-tun v0.1.15-0.20231102032628-0f8a17217e56/go.mod h1:Q7zmpJ+qOvMMXyUoYlxGQuWkqALUpXzFSSqO+KLPyzA=
+github.com/metacubex/sing-tun v0.1.15-0.20231103033938-170591e8d5bd/go.mod h1:Q7zmpJ+qOvMMXyUoYlxGQuWkqALUpXzFSSqO+KLPyzA=
 github.com/metacubex/sing-vmess v0.1.9-0.20230921005247-a0488d7dac74 h1:FtupiyFkaVjFvRa7B/uDtRWg5BNsoyPC9MTev3sDasY=
 github.com/metacubex/sing-vmess v0.1.9-0.20230921005247-a0488d7dac74/go.mod h1:8EWBZpc+qNvf5gmvjAtMHK1/DpcWqzfcBL842K00BsM=
 github.com/metacubex/sing-wireguard v0.0.0-20231001110902-321836559170 h1:DBGA0hmrP4pVIwLiXUONdphjcppED+plmVaKf1oqkwk=

core/src/main/golang/native/all/imports.go

@@ -12,5 +12,5 @@ import (
 
 	_ "golang.org/x/sync/semaphore"
 
-	_ "github.com/Dreamacro/clash/log"
+	_ "github.com/metacubex/mihomo/log"
 )

core/src/main/golang/native/app.go

@@ -9,7 +9,7 @@ import (
 
 	"cfa/native/app"
 
-	"github.com/Dreamacro/clash/log"
+	"github.com/metacubex/mihomo/log"
 )
 
 func openRemoteContent(url string) (int, error) {

core/src/main/golang/native/app/dns.go

@@ -3,7 +3,7 @@ package app
 import (
 	"strings"
 
-	"github.com/Dreamacro/clash/dns"
+	"github.com/metacubex/mihomo/dns"
 )
 
 func NotifyDnsChanged(dnsList string) {

core/src/main/golang/native/app/ui.go

@@ -3,7 +3,7 @@ package app
 import (
 	"github.com/dlclark/regexp2"
 
-	"github.com/Dreamacro/clash/log"
+	"github.com/metacubex/mihomo/log"
 )
 
 var uiSubtitlePattern *regexp2.Regexp

core/src/main/golang/native/config/fetch.go

@@ -14,7 +14,7 @@ import (
 
 	"cfa/native/app"
 
-	clashHttp "github.com/Dreamacro/clash/component/http"
+	clashHttp "github.com/metacubex/mihomo/component/http"
 )
 
 type Status struct {

core/src/main/golang/native/config/load.go

@@ -9,10 +9,10 @@ import (
 	"gopkg.in/yaml.v2"
 
 	"cfa/native/app"
-	"github.com/Dreamacro/clash/log"
+	"github.com/metacubex/mihomo/log"
 
-	"github.com/Dreamacro/clash/config"
+	"github.com/metacubex/mihomo/config"
-	"github.com/Dreamacro/clash/hub/executor"
+	"github.com/metacubex/mihomo/hub/executor"
 )
 
 func logDns(cfg *config.RawConfig) {

core/src/main/golang/native/config/override.go

@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/Dreamacro/clash/constant"
+	"github.com/metacubex/mihomo/constant"
 )
 
 type OverrideSlot int

core/src/main/golang/native/config/process.go

@@ -9,11 +9,11 @@ import (
 	"github.com/dlclark/regexp2"
 
 	"cfa/native/common"
-	C "github.com/Dreamacro/clash/constant"
+	C "github.com/metacubex/mihomo/constant"
-	"github.com/Dreamacro/clash/log"
+	"github.com/metacubex/mihomo/log"
 
-	"github.com/Dreamacro/clash/config"
+	"github.com/metacubex/mihomo/config"
-	"github.com/Dreamacro/clash/dns"
+	"github.com/metacubex/mihomo/dns"
 )
 
 var processors = []processor{

core/src/main/golang/native/config/provider.go

@@ -3,7 +3,7 @@ package config
 import (
 	"io"
 
-	"github.com/Dreamacro/clash/config"
+	"github.com/metacubex/mihomo/config"
 )
 
 func forEachProviders(rawCfg *config.RawConfig, fun func(index int, total int, key string, provider map[string]any)) {

core/src/main/golang/native/debug.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	_ "net/http/pprof"
 
-	"github.com/Dreamacro/clash/log"
+	"github.com/metacubex/mihomo/log"
 )
 
 func init() {

core/src/main/golang/native/delegate/init.go

@@ -6,15 +6,15 @@ import (
 
 	"cfa/blob"
 
-	"github.com/Dreamacro/clash/component/process"
+	"github.com/metacubex/mihomo/component/process"
-	"github.com/Dreamacro/clash/log"
+	"github.com/metacubex/mihomo/log"
 
 	"cfa/native/app"
 	"cfa/native/platform"
 
-	"github.com/Dreamacro/clash/component/dialer"
+	"github.com/metacubex/mihomo/component/dialer"
-	"github.com/Dreamacro/clash/component/mmdb"
+	"github.com/metacubex/mihomo/component/mmdb"
-	"github.com/Dreamacro/clash/constant"
+	"github.com/metacubex/mihomo/constant"
 )
 
 var errBlocked = errors.New("blocked")

core/src/main/golang/native/log_open.go

@@ -10,7 +10,7 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/Dreamacro/clash/log"
+	"github.com/metacubex/mihomo/log"
 )
 
 type message struct {

core/src/main/golang/native/log_premium.go

@@ -10,7 +10,7 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/Dreamacro/clash/log"
+	"github.com/metacubex/mihomo/log"
 )
 
 type message struct {

core/src/main/golang/native/main.go

@@ -14,7 +14,7 @@ import (
 	"cfa/native/delegate"
 	"cfa/native/tunnel"
 
-	"github.com/Dreamacro/clash/log"
+	"github.com/metacubex/mihomo/log"
 )
 
 func main() {

core/src/main/golang/native/proxy/http.go

@@ -3,8 +3,8 @@ package proxy
 import (
 	"sync"
 
-	"github.com/Dreamacro/clash/listener/http"
+	"github.com/metacubex/mihomo/listener/http"
-	"github.com/Dreamacro/clash/tunnel"
+	"github.com/metacubex/mihomo/tunnel"
 )
 
 var listener *http.Listener

core/src/main/golang/native/tun/dns.go

@@ -3,7 +3,7 @@ package tun
 import (
 	"net"
 
-	"github.com/Dreamacro/clash/dns"
+	"github.com/metacubex/mihomo/dns"
 
 	D "github.com/miekg/dns"
 )

core/src/main/golang/native/tun/metadata_open.go

@@ -5,7 +5,7 @@ package tun
 import (
 	"net"
 
-	C "github.com/Dreamacro/clash/constant"
+	C "github.com/metacubex/mihomo/constant"
 )
 
 func createMetadata(lAddr, rAddr *net.TCPAddr) *C.Metadata {

core/src/main/golang/native/tun/metadata_premium.go

@@ -7,7 +7,7 @@ import (
 	"net/netip"
 	"strconv"
 
-	C "github.com/Dreamacro/clash/constant"
+	C "github.com/metacubex/mihomo/constant"
 )
 
 func createMetadata(lAddr, rAddr *net.TCPAddr) *C.Metadata {

core/src/main/golang/native/tun/tun.go

@@ -9,12 +9,12 @@ import (
 
 	"github.com/Kr328/tun2socket"
 
-	"github.com/Dreamacro/clash/adapter/inbound"
+	"github.com/metacubex/mihomo/adapter/inbound"
-	"github.com/Dreamacro/clash/common/pool"
+	"github.com/metacubex/mihomo/common/pool"
-	C "github.com/Dreamacro/clash/constant"
+	C "github.com/metacubex/mihomo/constant"
-	"github.com/Dreamacro/clash/log"
+	"github.com/metacubex/mihomo/log"
-	"github.com/Dreamacro/clash/transport/socks5"
+	"github.com/metacubex/mihomo/transport/socks5"
-	"github.com/Dreamacro/clash/tunnel"
+	"github.com/metacubex/mihomo/tunnel"
 )
 
 var _, ipv4LoopBack, _ = net.ParseCIDR("127.0.0.0/8")

core/src/main/golang/native/tunnel/conn.go

@@ -1,8 +1,8 @@
 package tunnel
 
 import (
-	C "github.com/Dreamacro/clash/constant"
+	C "github.com/metacubex/mihomo/constant"
-	"github.com/Dreamacro/clash/tunnel/statistic"
+	"github.com/metacubex/mihomo/tunnel/statistic"
 )
 
 func CloseAllConnections() {

core/src/main/golang/native/tunnel/connectivity.go

@@ -3,11 +3,11 @@ package tunnel
 import (
 	"sync"
 
-	"github.com/Dreamacro/clash/adapter"
+	"github.com/metacubex/mihomo/adapter"
-	"github.com/Dreamacro/clash/adapter/outboundgroup"
+	"github.com/metacubex/mihomo/adapter/outboundgroup"
-	"github.com/Dreamacro/clash/constant/provider"
+	"github.com/metacubex/mihomo/constant/provider"
-	"github.com/Dreamacro/clash/log"
+	"github.com/metacubex/mihomo/log"
-	"github.com/Dreamacro/clash/tunnel"
+	"github.com/metacubex/mihomo/tunnel"
 )
 
 func HealthCheck(name string) {

core/src/main/golang/native/tunnel/geoip.go

@@ -3,7 +3,7 @@ package tunnel
 import (
 	"fmt"
 
-	"github.com/Dreamacro/clash/component/mmdb"
+	"github.com/metacubex/mihomo/component/mmdb"
 	"github.com/oschwald/maxminddb-golang"
 )
 

core/src/main/golang/native/tunnel/providers_open.go

@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"time"
 
-	P "github.com/Dreamacro/clash/adapter/provider"
+	P "github.com/metacubex/mihomo/adapter/provider"
-	"github.com/Dreamacro/clash/constant/provider"
+	"github.com/metacubex/mihomo/constant/provider"
-	"github.com/Dreamacro/clash/log"
+	"github.com/metacubex/mihomo/log"
-	"github.com/Dreamacro/clash/tunnel"
+	"github.com/metacubex/mihomo/tunnel"
 )
 
 var ErrInvalidType = errors.New("invalid type")

core/src/main/golang/native/tunnel/providers_premium.go

@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"time"
 
-	P "github.com/Dreamacro/clash/adapter/provider"
+	P "github.com/metacubex/mihomo/adapter/provider"
-	"github.com/Dreamacro/clash/constant/provider"
+	"github.com/metacubex/mihomo/constant/provider"
-	"github.com/Dreamacro/clash/log"
+	"github.com/metacubex/mihomo/log"
-	"github.com/Dreamacro/clash/tunnel"
+	"github.com/metacubex/mihomo/tunnel"
 )
 
 var ErrInvalidType = errors.New("invalid type")

core/src/main/golang/native/tunnel/proxies.go

@@ -6,13 +6,13 @@ import (
 
 	"github.com/dlclark/regexp2"
 
-	"github.com/Dreamacro/clash/adapter"
+	"github.com/metacubex/mihomo/adapter"
 
-	"github.com/Dreamacro/clash/adapter/outboundgroup"
+	"github.com/metacubex/mihomo/adapter/outboundgroup"
-	C "github.com/Dreamacro/clash/constant"
+	C "github.com/metacubex/mihomo/constant"
-	"github.com/Dreamacro/clash/constant/provider"
+	"github.com/metacubex/mihomo/constant/provider"
-	"github.com/Dreamacro/clash/log"
+	"github.com/metacubex/mihomo/log"
-	"github.com/Dreamacro/clash/tunnel"
+	"github.com/metacubex/mihomo/tunnel"
 )
 
 type SortMode int

core/src/main/golang/native/tunnel/state.go

@@ -1,7 +1,7 @@
 package tunnel
 
 import (
-	"github.com/Dreamacro/clash/tunnel"
+	"github.com/metacubex/mihomo/tunnel"
 )
 
 func QueryMode() string {

core/src/main/golang/native/tunnel/statistic.go

@@ -1,7 +1,7 @@
 package tunnel
 
 import (
-	"github.com/Dreamacro/clash/tunnel/statistic"
+	"github.com/metacubex/mihomo/tunnel/statistic"
 )
 
 func ResetStatistic() {

core/src/main/golang/native/tunnel/suspend.go

@@ -1,6 +1,6 @@
 package tunnel
 
-import "github.com/Dreamacro/clash/adapter/provider"
+import "github.com/metacubex/mihomo/adapter/provider"
 
 func Suspend(s bool) {
 	provider.Suspend(s)