Update core

Fix some issues
chen08209 · Jan 10, 2025 · 9bf85db · 9bf85db
1 parent 58acd9c
commit 9bf85db
Show file tree

Hide file tree

Showing 17 changed files with 179 additions and 179 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -67,7 +67,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.x'
+          flutter-version: pubspec.yaml
           channel: 'stable'
           cache: true
 

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -64,9 +64,7 @@
             </intent-filter>
         </activity>
 
-        <!--        <meta-data-->
-        <!--                android:name="io.flutter.embedding.android.EnableImpeller"-->
-        <!--                android:value="true" />-->
+        <meta-data android:name="io.flutter.embedding.android.EnableImpeller" android:value="false" />
 
         <activity
             android:name=".TempActivity"

diff --git a/core/Clash.Meta b/core/Clash.Meta
diff --git a/core/common.go b/core/common.go
@@ -25,7 +25,6 @@ import (
 	"github.com/samber/lo"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"sync"
 )
@@ -352,8 +351,6 @@ func applyConfig(rawConfig *config.RawConfig) error {
 	if configParams.IsPatch {
 		patchConfig()
 	} else {
-		handleCloseConnectionsUnLock()
-		runtime.GC()
 		hub.ApplyConfig(currentConfig)
 		patchSelectGroup()
 	}

diff --git a/core/go.mod b/core/go.mod
@@ -1,21 +1,14 @@
 module core
 
-go 1.21
+go 1.20
 
 replace github.com/metacubex/mihomo => ./Clash.Meta
 
-require github.com/metacubex/mihomo v1.17.1
-
 require (
-	github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab // indirect
-	github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
-	github.com/sagernet/cors v1.2.1 // indirect
-	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
-	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+	github.com/metacubex/mihomo v0.0.0-00010101000000-000000000000
+	github.com/samber/lo v1.47.0
 )
 
-replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240724044459-6f3cf5896297
-
 require (
 	github.com/3andne/restls-client-go v0.1.6 // indirect
 	github.com/RyuaNerin/go-krypto v1.2.4 // indirect
@@ -27,47 +20,51 @@ require (
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/coreos/go-iptables v0.8.0 // indirect
 	github.com/dlclark/regexp2 v1.11.4 // indirect
+	github.com/ebitengine/purego v0.8.1 // indirect
+	github.com/enfein/mieru/v3 v3.10.0 // indirect
 	github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // 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/gaukas/godicttls v0.0.4 // indirect
-	github.com/go-chi/chi/v5 v5.1.0 // indirect
+	github.com/go-chi/chi/v5 v5.2.0 // indirect
 	github.com/go-chi/render v1.0.3 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.4.0 // indirect
 	github.com/gofrs/uuid/v5 v5.3.0 // indirect
-	github.com/google/btree v1.1.2 // indirect
+	github.com/google/btree v1.1.3 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
-	github.com/hashicorp/yamux v0.1.1 // indirect
-	github.com/insomniacslk/dhcp v0.0.0-20240829085014-a3a4c1f04475 // indirect
+	github.com/hashicorp/yamux v0.1.2 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20241224095048-b56fa0d5f25d // indirect
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/klauspost/compress v1.17.9 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mdlayher/netlink v1.7.2 // indirect
 	github.com/mdlayher/socket v0.4.1 // indirect
+	github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab // indirect
 	github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 // indirect
 	github.com/metacubex/chacha v0.1.0 // indirect
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
-	github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec // indirect
-	github.com/metacubex/quic-go v0.47.1-0.20240909010619-6b38f24bfcc4 // indirect
+	github.com/metacubex/gvisor v0.0.0-20241126021258-5b028898cc5a // indirect
+	github.com/metacubex/quic-go v0.48.3-0.20241126053724-b69fea3888da // indirect
 	github.com/metacubex/randv2 v0.2.0 // indirect
 	github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4 // indirect
 	github.com/metacubex/sing-shadowsocks v0.2.8 // indirect
 	github.com/metacubex/sing-shadowsocks2 v0.2.2 // indirect
-	github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1 // indirect
+	github.com/metacubex/sing-tun v0.4.5 // indirect
 	github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 // indirect
-	github.com/metacubex/sing-wireguard v0.0.0-20240924052438-b0976fc59ea3 // indirect
-	github.com/metacubex/tfo-go v0.0.0-20241006021335-daedaf0ca7aa // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589 // indirect
+	github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422 // indirect
 	github.com/metacubex/utls v1.6.6 // indirect
+	github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
 	github.com/miekg/dns v1.1.62 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
 	github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
@@ -79,16 +76,15 @@ require (
 	github.com/puzpuzpuz/xsync/v3 v3.4.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
+	github.com/sagernet/cors v1.2.1 // indirect
 	github.com/sagernet/fswatch v0.1.1 // indirect
 	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
 	github.com/sagernet/nftables v0.3.0-beta.4 // indirect
-	github.com/sagernet/sing v0.5.0-alpha.13 // indirect
-	github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 // indirect
-	github.com/sagernet/sing-shadowtls v0.1.4 // indirect
+	github.com/sagernet/sing v0.5.1 // indirect
+	github.com/sagernet/sing-mux v0.2.1 // indirect
+	github.com/sagernet/sing-shadowtls v0.1.5 // indirect
 	github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
-	github.com/samber/lo v1.47.0
-	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
-	github.com/shoenig/go-m1cpu v0.1.6 // indirect
+	github.com/shirou/gopsutil/v4 v4.24.11 // 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
@@ -97,22 +93,24 @@ require (
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
 	github.com/vishvananda/netns v0.0.4 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 // indirect
 	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
 	golang.org/x/mod v0.20.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/text v0.19.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/time v0.7.0 // indirect
 	golang.org/x/tools v0.24.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect; indirect`
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/blake3 v1.3.0 // indirect
 )
+6 −13		.github/workflows/build.yml
+11 −2		adapter/adapter.go
+1 −8		adapter/inbound/auth.go
+7 −17		adapter/inbound/ipfilter.go
+23 −0		adapter/inbound/listen.go
+16 −0		adapter/inbound/util.go
+9 −8		adapter/outbound/base.go
+4 −14		adapter/outbound/direct.go
+7 −0		adapter/outbound/http.go
+7 −0		adapter/outbound/hysteria.go
+7 −0		adapter/outbound/hysteria2.go
+281 −0		adapter/outbound/mieru.go
+92 −0		adapter/outbound/mieru_test.go
+8 −1		adapter/outbound/shadowsocks.go
+8 −1		adapter/outbound/shadowsocksr.go
+6 −0		adapter/outbound/singmux.go
+8 −1		adapter/outbound/snell.go
+7 −0		adapter/outbound/socks5.go
+7 −0		adapter/outbound/ssh.go
+7 −0		adapter/outbound/trojan.go
+7 −0		adapter/outbound/tuic.go
+7 −0		adapter/outbound/vless.go
+7 −0		adapter/outbound/vmess.go
+3 −10		adapter/outbound/wireguard.go
+7 −0		adapter/parser.go
+20 −16		adapter/provider/parser.go
+189 −146		adapter/provider/provider.go
+0 −1		adapter/provider/subscription_info.go
+20 −0		common/structure/structure.go
+18 −0		common/structure/structure_test.go
+2 −0		component/iface/iface.go
+1 −1		component/keepalive/tcp_keepalive.go
+26 −0		component/loopback/detector.go
+21 −5		component/mmdb/reader.go
+4 −4		component/process/process_windows.go
+24 −18		component/resource/vehicle.go
+23 −5		component/sniffer/dispatcher.go
+18 −1		component/sniffer/tls_sniffer.go
+4 −4		component/updater/update_geo.go
+16 −3		constant/adapters.go
+3 −1		constant/provider/interface.go
+34 −1		docs/config.yaml
+27 −26		go.mod
+47 −46		go.sum
+1 −1		hub/executor/executor.go
+2 −2		hub/route/server.go
+4 −2		hub/route/upgrade.go
+10 −10		listener/inbound/tun.go
+5 −1		listener/sing_tun/server.go
+1 −1		log/log.go
+8 −0		main.go
+4 −0		rules/common/base.go
+4 −9		rules/common/ipasn.go
+1 −1		rules/common/ipcidr.go
+6 −8		rules/logic/logic.go
+2 −0		rules/parser.go
+14 −9		rules/provider/parse.go
+137 −45		rules/provider/provider.go
+1 −1		tunnel/statistic/manager.go
+8 −13		tunnel/statistic/tracker.go
+1 −1		tunnel/tunnel.go