Add some scenes auto close connections

Support proxies query Optimize more details
2025-05-09 16:11:20 +08:00
50 changed files with 388 additions and 521 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -73,9 +73,7 @@ android {
            applicationIdSuffix '.debug'
        }
        release {
-            minifyEnabled true
            debuggable false
-            
            if (isRelease) {
                signingConfig signingConfigs.release
            } else {
--- a/android/app/src/main/kotlin/com/follow/clash/GlobalState.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/GlobalState.kt
@@ -7,10 +7,6 @@ import com.follow.clash.plugins.VpnPlugin
 import io.flutter.FlutterInjector
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.embedding.engine.dart.DartExecutor
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.util.concurrent.locks.ReentrantLock
 import kotlin.concurrent.withLock

@@ -37,15 +33,6 @@ object GlobalState {
        return currentEngine?.plugins?.get(AppPlugin::class.java) as AppPlugin?
    }

-    fun syncStatus() {
-        CoroutineScope(Dispatchers.Default).launch {
-            val status = getCurrentVPNPlugin()?.getStatus() ?: false
-            withContext(Dispatchers.Main){
-                runState.value = if (status) RunState.START else RunState.STOP
-            }
-        }
-    }
-
    suspend fun getText(text: String): String {
        return getCurrentAppPlugin()?.getText(text) ?: ""
    }
--- a/android/app/src/main/kotlin/com/follow/clash/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/MainActivity.kt
@@ -17,7 +17,6 @@ class MainActivity : FlutterActivity() {

    override fun onDestroy() {
        GlobalState.flutterEngine = null
-        GlobalState.runState.value = RunState.STOP
        super.onDestroy()
    }
 }
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/ServicePlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/ServicePlugin.kt
@@ -51,7 +51,6 @@ data object ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
        }
    }

-
    private fun handleDestroy() {
        GlobalState.destroyServiceEngine()
    }
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/VpnPlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/VpnPlugin.kt
@@ -200,13 +200,6 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
        timerJob = null
    }

-
-    suspend fun getStatus(): Boolean? {
-        return withContext(Dispatchers.Default) {
-            flutterMethodChannel.awaitResult<Boolean>("status", null)
-        }
-    }
-
    private fun handleStartService() {
        if (flClashService == null) {
            bindService()
@@ -255,9 +248,9 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
        GlobalState.runLock.withLock {
            if (GlobalState.runState.value == RunState.STOP) return
            GlobalState.runState.value = RunState.STOP
-            flClashService?.stop()
            stopForegroundJob()
            Core.stopTun()
+            flClashService?.stop()
            GlobalState.handleTryDestroy()
        }
    }
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt
@@ -33,7 +33,6 @@ class FlClashTileService : TileService() {

    override fun onStartListening() {
        super.onStartListening()
-        GlobalState.syncStatus()
        GlobalState.runState.value?.let { updateTile(it) }
        GlobalState.runState.observeForever(observer)
    }
--- a/android/core/build.gradle.kts
+++ b/android/core/build.gradle.kts
@@ -12,6 +12,7 @@ android {

    defaultConfig {
        minSdk = 21
+        consumerProguardFiles("consumer-rules.pro")
    }

    buildTypes {
--- a/android/core/consumer-rules.pro
+++ b/android/core/consumer-rules.pro
--- a/core/Clash.Meta
+++ b/core/Clash.Meta
--- a/core/action.go
+++ b/core/action.go
@@ -87,9 +87,6 @@ func handleAction(action *Action, result func(data interface{})) {
 	case closeConnectionsMethod:
 		result(handleCloseConnections())
 		return
-	case resetConnectionsMethod:
-		result(handleResetConnections())
-		return
 	case closeConnectionMethod:
 		id := action.Data.(string)
 		result(handleCloseConnection(id))
--- a/core/android_bride.go
+++ b/core/android_bride.go
@@ -43,13 +43,13 @@ var (
 	}
 )

-func Protect(callback unsafe.Pointer, fd int) {
+func protect(callback unsafe.Pointer, fd int) {
 	if globalCallbacks.protectFunc != nil {
 		C.protect(globalCallbacks.protectFunc, callback, C.int(fd))
 	}
 }

-func ResolveProcess(callback unsafe.Pointer, protocol int, source, target string, uid int) string {
+func resolveProcess(callback unsafe.Pointer, protocol int, source, target string, uid int) string {
 	if globalCallbacks.resolveProcessFunc == nil {
 		return ""
 	}
--- a/core/common.go
+++ b/core/common.go
@@ -237,7 +237,6 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
 	targetConfig.Tun.Stack = patchConfig.Tun.Stack
 	targetConfig.Tun.RouteAddress = patchConfig.Tun.RouteAddress
-	targetConfig.Tun.AutoRoute = patchConfig.Tun.AutoRoute
 	targetConfig.GeodataLoader = patchConfig.GeodataLoader
 	targetConfig.Profile.StoreSelected = false
 	targetConfig.GeoXUrl = patchConfig.GeoXUrl
@@ -362,11 +361,10 @@ func applyConfig(rawConfig *config.RawConfig) error {
 	}
 	if configParams.IsPatch {
 		patchConfig()
-		updateListeners(false)
 	} else {
 		hub.ApplyConfig(currentConfig)
 		patchSelectGroup()
-		updateListeners(true)
 	}
+	updateListeners(false)
 	return err
 }
--- a/core/constant.go
+++ b/core/constant.go
@@ -64,7 +64,6 @@ const (
 	asyncTestDelayMethod           Method = "asyncTestDelay"
 	getConnectionsMethod           Method = "getConnections"
 	closeConnectionsMethod         Method = "closeConnections"
-	resetConnectionsMethod         Method = "resetConnectionsMethod"
 	closeConnectionMethod          Method = "closeConnection"
 	getExternalProvidersMethod     Method = "getExternalProviders"
 	getExternalProviderMethod      Method = "getExternalProvider"
--- a/core/go.mod
+++ b/core/go.mod
@@ -6,13 +6,13 @@ replace github.com/metacubex/mihomo => ./Clash.Meta

 require (
 	github.com/metacubex/mihomo v0.0.0-00010101000000-000000000000
-	github.com/samber/lo v1.50.0
+	github.com/samber/lo v1.49.1
 	golang.org/x/sync v0.11.0
 )

 require (
 	github.com/3andne/restls-client-go v0.1.6 // indirect
-	github.com/RyuaNerin/go-krypto v1.3.0 // indirect
+	github.com/RyuaNerin/go-krypto v1.2.4 // 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
@@ -21,13 +21,13 @@ require (
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/coreos/go-iptables v0.8.0 // indirect
 	github.com/dlclark/regexp2 v1.11.5 // indirect
-	github.com/ebitengine/purego v0.8.3-0.20250507171810-1638563e3615 // indirect
+	github.com/ebitengine/purego v0.8.2 // indirect
 	github.com/enfein/mieru/v3 v3.13.0 // indirect
-	github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358 // 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.9.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
 	github.com/go-chi/chi/v5 v5.2.1 // indirect
 	github.com/go-chi/render v1.0.3 // indirect
@@ -36,7 +36,7 @@ require (
 	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.2 // indirect
+	github.com/gofrs/uuid/v5 v5.3.1 // 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
@@ -54,24 +54,19 @@ require (
 	github.com/metacubex/bart v0.19.0 // indirect
 	github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 // indirect
 	github.com/metacubex/chacha v0.1.2 // indirect
-	github.com/metacubex/fswatch v0.1.1 // indirect
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
 	github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b // indirect
-	github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 // indirect
-	github.com/metacubex/quic-go v0.51.1-0.20250511032541-4e34341cf18b // indirect
+	github.com/metacubex/quic-go v0.49.1-0.20250212162123-c135a4412996 // indirect
 	github.com/metacubex/randv2 v0.2.0 // indirect
-	github.com/metacubex/sing v0.5.3-0.20250504031621-1f99e54c15b7 // indirect
-	github.com/metacubex/sing-mux v0.3.2 // indirect
-	github.com/metacubex/sing-quic v0.0.0-20250511034158-b46e0e3e81b2 // indirect
-	github.com/metacubex/sing-shadowsocks v0.2.9 // indirect
-	github.com/metacubex/sing-shadowsocks2 v0.2.3 // indirect
-	github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 // indirect
-	github.com/metacubex/sing-tun v0.4.6-0.20250503065609-efb9f0beb6f6 // indirect
-	github.com/metacubex/sing-vmess v0.2.1 // indirect
-	github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f // indirect
-	github.com/metacubex/smux v0.0.0-20250503055512-501391591dee // indirect
-	github.com/metacubex/tfo-go v0.0.0-20250503140532-decbcfccbfdf // indirect
-	github.com/metacubex/utls v1.7.0-alpha.3 // indirect
+	github.com/metacubex/sing-quic v0.0.0-20250404030904-b2cc8aab562c // indirect
+	github.com/metacubex/sing-shadowsocks v0.2.8 // indirect
+	github.com/metacubex/sing-shadowsocks2 v0.2.2 // indirect
+	github.com/metacubex/sing-shadowtls v0.0.0-20250412122235-0e9005731a63 // indirect
+	github.com/metacubex/sing-tun v0.4.6-0.20250412144348-c426cb167db5 // indirect
+	github.com/metacubex/sing-vmess v0.1.14-0.20250228002636-abc39e113b82 // 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.7.0-alpha.1 // indirect
 	github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
 	github.com/miekg/dns v1.1.63 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
@@ -83,8 +78,14 @@ require (
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/puzpuzpuz/xsync/v3 v3.5.1 // 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.2 // indirect
+	github.com/sagernet/sing-mux v0.2.1 // indirect
+	github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
 	github.com/shirou/gopsutil/v4 v4.25.1 // indirect
 	github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
 	github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
--- a/core/go.sum
+++ b/core/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/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/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/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=
@@ -26,12 +26,12 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
 github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/ebitengine/purego v0.8.3-0.20250507171810-1638563e3615 h1:W7mpP4uiOAbBOdDnRXT9EUdauFv7bz+ERT5rPIord00=
-github.com/ebitengine/purego v0.8.3-0.20250507171810-1638563e3615/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
+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-20250325060835-cd0defd64358 h1:kXYqH/sL8dS/FdoFjr12ePjnLPorPo2FsnrHNuXSDyo=
-github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I=
+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/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.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+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/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=
@@ -59,8 +59,8 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
 github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
-github.com/gofrs/uuid/v5 v5.3.2 h1:2jfO8j3XgSwlz/wHqemAEugfnTlikAYHhnqQ8Xh4fE0=
-github.com/gofrs/uuid/v5 v5.3.2/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+github.com/gofrs/uuid/v5 v5.3.1 h1:aPx49MwJbekCzOyhZDjJVb0hx3A0KLjlbLx6p2gY0p0=
+github.com/gofrs/uuid/v5 v5.3.1/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
@@ -103,43 +103,32 @@ 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.20250511032541-4e34341cf18b h1:8oDU32eJ+RRhl1FodGgPfxQxtoBAiD9D40XG2XtU/SE=
-github.com/metacubex/quic-go v0.51.1-0.20250511032541-4e34341cf18b/go.mod h1:9R1NOzCgTcWsdWvOMlmtMuF0uKzuOpsfvEf7U3I8zM0=
+github.com/metacubex/quic-go v0.49.1-0.20250212162123-c135a4412996 h1:B+AP/Pj2/jBDS/kCYjz/x+0BCOKfd2VODYevyeIt+Ds=
+github.com/metacubex/quic-go v0.49.1-0.20250212162123-c135a4412996/go.mod h1:ExVjGyEwTUjCFqx+5uxgV7MOoA3fZI+th4D40H35xmY=
 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.5.2/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
-github.com/metacubex/sing v0.5.3-0.20250504031621-1f99e54c15b7 h1:m4nSxvw46JEgxMzzmnXams+ebwabcry4Ydep/zNiesQ=
-github.com/metacubex/sing v0.5.3-0.20250504031621-1f99e54c15b7/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-20250511034158-b46e0e3e81b2 h1:wfmYgtECbEYo1slMtyo+2kMqscYYDSjU/TVgS3018F4=
-github.com/metacubex/sing-quic v0.0.0-20250511034158-b46e0e3e81b2/go.mod h1:P1kd57U6XXmXv9PbwWdznUGT0k9bKgFJXF0fEORbIlk=
-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-20250503140532-decbcfccbfdf h1:LwID1wz4tzypidd412dd4dC1H0m1TgRCQ/XvRvMJDFM=
-github.com/metacubex/tfo-go v0.0.0-20250503140532-decbcfccbfdf/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
-github.com/metacubex/utls v1.7.0-alpha.3 h1:cp1cEMUnoifiWrGHRzo+nCwPRveN9yPD8QaRFmfcYxA=
-github.com/metacubex/utls v1.7.0-alpha.3/go.mod h1:oknYT0qTOwE4hjPmZOEpzVdefnW7bAdGLvZcqmk4TLU=
+github.com/metacubex/sing-quic v0.0.0-20250404030904-b2cc8aab562c h1:OB3WmMA8YPJjE36RjD9X8xlrWGJ4orxbf2R/KAE28b0=
+github.com/metacubex/sing-quic v0.0.0-20250404030904-b2cc8aab562c/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
+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/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/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=
@@ -170,12 +159,25 @@ github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++
 github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
 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/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
+github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
 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/samber/lo v1.50.0 h1:XrG0xOeHs+4FQ8gJR97zDz5uOFMW7OwFWiFVzqopKgY=
-github.com/samber/lo v1.50.0/go.mod h1:RjZyNk6WSnUFRKK6EyOhsRJMqft3G+pg7dCWHQCWvsc=
+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 v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
+github.com/sagernet/sing v0.5.2 h1:2OZQJNKGtji/66QLxbf/T/dqtK/3+fF/zuHH9tsGK7M=
+github.com/sagernet/sing v0.5.2/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
+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.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
+github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
 github.com/shirou/gopsutil/v4 v4.25.1 h1:QSWkTc+fu9LTAWfkZwZ6j8MSUk4A2LV7rbH0ZqmLjXs=
 github.com/shirou/gopsutil/v4 v4.25.1/go.mod h1:RoUCUpndaJFtT+2zsZzzmhvbfGoDCJ7nFXKJf8GqJbI=
 github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b h1:rXHg9GrUEtWZhEkrykicdND3VPjlVbYiLdX9J7gimS8=
@@ -187,16 +189,9 @@ github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e/go.mod h1:+e
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
 github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
@@ -256,7 +251,7 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
--- a/core/hub.go
+++ b/core/hub.go
@@ -10,7 +10,6 @@ import (
 	"github.com/metacubex/mihomo/common/observable"
 	"github.com/metacubex/mihomo/common/utils"
 	"github.com/metacubex/mihomo/component/mmdb"
-	"github.com/metacubex/mihomo/component/resolver"
 	"github.com/metacubex/mihomo/component/updater"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
@@ -54,7 +53,7 @@ func handleStartListener() bool {
 	defer runLock.Unlock()
 	isRunning = true
 	updateListeners(true)
-	resolver.ResetConnection()
+	closeConnections()
 	return true
 }

@@ -268,7 +267,13 @@ func handleGetConnections() string {
 func handleCloseConnections() bool {
 	runLock.Lock()
 	defer runLock.Unlock()
-	closeConnections()
+	statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
+		err := c.Close()
+		if err != nil {
+			return false
+		}
+		return true
+	})
 	return true
 }

@@ -282,13 +287,6 @@ func closeConnections() {
 	})
 }

-func handleResetConnections() bool {
-	runLock.Lock()
-	defer runLock.Unlock()
-	resolver.ResetConnection()
-	return true
-}
-
 func handleCloseConnection(connectionId string) bool {
 	runLock.Lock()
 	defer runLock.Unlock()
--- a/core/lib_android.go
+++ b/core/lib_android.go
@@ -58,7 +58,7 @@ func (t *TunHandler) handleProtect(fd int) {
 		return
 	}

-	Protect(t.callback, fd)
+	protect(t.callback, fd)
 }

 func (t *TunHandler) handleResolveProcess(source, target net.Addr) string {
@@ -79,7 +79,7 @@ func (t *TunHandler) handleResolveProcess(source, target net.Addr) string {
 	if version < 29 {
 		uid = platform.QuerySocketUidFromProcFs(source, target)
 	}
-	return ResolveProcess(t.callback, protocol, source.String(), target.String(), uid)
+	return resolveProcess(t.callback, protocol, source.String(), target.String(), uid)
 }

 var (
--- a/lib/application.dart
+++ b/lib/application.dart
@@ -101,7 +101,7 @@ class ApplicationState extends ConsumerState<Application> {
      child: ClashManager(
        child: ConnectivityManager(
          onConnectivityChanged: () async {
-            await clashCore.resetConnections();
+            await clashCore.closeConnections();
            globalState.appController.updateLocalIp();
            globalState.appController.addCheckIpNumDebounce();
          },
--- a/lib/clash/core.dart
+++ b/lib/clash/core.dart
@@ -143,10 +143,6 @@ class ClashCore {
    clashInterface.closeConnections();
  }

-  resetConnections() {
-    clashInterface.resetConnections();
-  }
-
  Future<List<ExternalProvider>> getExternalProviders() async {
    final externalProvidersRawString =
        await clashInterface.getExternalProviders();
--- a/lib/clash/interface.dart
+++ b/lib/clash/interface.dart
@@ -66,8 +66,6 @@ mixin ClashInterface {

  FutureOr<bool> closeConnections();

-  FutureOr<bool> resetConnections();
-
  FutureOr<String> getProfile(String id);

  Future<bool> setState(CoreState state);
@@ -330,13 +328,6 @@ abstract class ClashHandlerInterface with ClashInterface {
    );
  }

-  @override
-  Future<bool> resetConnections() {
-    return invoke<bool>(
-      method: ActionMethod.resetConnections,
-    );
-  }
-
  @override
  Future<bool> closeConnection(String id) {
    return invoke<bool>(
--- a/lib/clash/lib.dart
+++ b/lib/clash/lib.dart
@@ -267,15 +267,6 @@ class ClashLibHandler {
    return true;
  }

-  DateTime? getRunTime() {
-    final runTimeRaw = clashFFI.getRunTime();
-    final runTimeString = runTimeRaw.cast<Utf8>().toDartString();
-    if (runTimeString.isEmpty) {
-      return null;
-    }
-    return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
-  }
-
  Future<String> quickStart(
    InitParams initParams,
    UpdateConfigParams updateConfigParams,
@@ -306,10 +297,15 @@ class ClashLibHandler {
    malloc.free(stateParamsChar);
    return completer.future;
  }
+
+  DateTime? getRunTime() {
+    final runTimeRaw = clashFFI.getRunTime();
+    final runTimeString = runTimeRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(runTimeRaw);
+    if (runTimeString.isEmpty) return null;
+    return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
+  }
 }

 ClashLib? get clashLib =>
    Platform.isAndroid && !globalState.isService ? ClashLib() : null;
-
-ClashLibHandler? get clashLibHandler =>
-    Platform.isAndroid ? ClashLibHandler() : null;
--- a/lib/common/common.dart
+++ b/lib/common/common.dart
@@ -4,37 +4,36 @@ export 'color.dart';
 export 'constant.dart';
 export 'context.dart';
 export 'datetime.dart';
-export 'fixed.dart';
 export 'function.dart';
 export 'future.dart';
 export 'http.dart';
 export 'icons.dart';
 export 'iterable.dart';
-export 'javascript.dart';
 export 'keyboard.dart';
 export 'launch.dart';
 export 'link.dart';
+export 'fixed.dart';
 export 'lock.dart';
 export 'measure.dart';
-export 'mixin.dart';
 export 'navigation.dart';
 export 'navigator.dart';
 export 'network.dart';
 export 'num.dart';
+export 'utils.dart';
 export 'package.dart';
 export 'path.dart';
 export 'picker.dart';
 export 'preferences.dart';
-export 'print.dart';
 export 'protocol.dart';
 export 'proxy.dart';
-export 'render.dart';
 export 'request.dart';
 export 'scroll.dart';
 export 'string.dart';
 export 'system.dart';
 export 'text.dart';
 export 'tray.dart';
-export 'utils.dart';
 export 'window.dart';
 export 'windows.dart';
+export 'render.dart';
+export 'mixin.dart';
+export 'print.dart';
--- a/lib/common/javascript.dart
+++ b/lib/common/javascript.dart
@@ -1,22 +0,0 @@
-import 'package:flutter_js/flutter_js.dart';
-
-class Javascript {
-  static Javascript? _instance;
-  late JavascriptRuntime runtime;
-
-  Javascript._internal() {
-    runtime = getJavascriptRuntime();
-  }
-
-  Future<String> evaluate(String js) async {
-    final evaluate = runtime.evaluate(js);
-    return evaluate.stringResult;
-  }
-
-  factory Javascript() {
-    _instance ??= Javascript._internal();
-    return _instance!;
-  }
-}
-
-final js = Javascript();
--- a/lib/common/path.dart
+++ b/lib/common/path.dart
@@ -73,12 +73,14 @@ class AppPath {
    return join(directory.path, profilesDirectoryName);
  }

-  Future<String> getProfilePath(String id) async {
+  Future<String?> getProfilePath(String? id) async {
+    if (id == null) return null;
    final directory = await profilesPath;
    return join(directory, "$id.yaml");
  }

-  Future<String> getProvidersPath(String id) async {
+  Future<String?> getProvidersPath(String? id) async {
+    if (id == null) return null;
    final directory = await profilesPath;
    return join(directory, "providers", id);
  }
--- a/lib/common/print.dart
+++ b/lib/common/print.dart
@@ -15,7 +15,7 @@ class CommonPrint {
  log(String? text) {
    final payload = "[FlClash] $text";
    debugPrint(payload);
-    if (!globalState.isInit) {
+    if (globalState.isService) {
      return;
    }
    globalState.appController.addLog(
--- a/lib/common/utils.dart
+++ b/lib/common/utils.dart
@@ -7,7 +7,6 @@ import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:lpinyin/lpinyin.dart';
-import 'package:yaml/yaml.dart';

 class Utils {
  Color? getDelayColor(int? delay) {
@@ -334,31 +333,6 @@ class Utils {
      meta: !control,
    );
  }
-
-  dynamic convertLoadYaml(dynamic node) {
-    if (node is YamlMap) {
-      final map = <String, dynamic>{};
-      node.nodes.forEach((key, value) {
-        String stringKey;
-        if (key is YamlScalar) {
-          stringKey = key.value.toString();
-        } else {
-          stringKey = key.toString();
-        }
-        map[stringKey] = convertLoadYaml(value.value);
-      });
-      return map;
-    } else if (node is YamlList) {
-      final list = <dynamic>[];
-      for (final item in node.nodes) {
-        list.add(convertLoadYaml(item.value));
-      }
-      return list;
-    } else if (node is YamlScalar) {
-      return node.value;
-    }
-    return node;
-  }
 }

 final utils = Utils();
--- a/lib/controller.dart
+++ b/lib/controller.dart
@@ -380,7 +380,7 @@ class AppController {
      ),
    );
    if (_ref.read(appSettingProvider).closeConnections) {
-      clashCore.resetConnections();
+      clashCore.closeConnections();
    }
    addCheckIpNumDebounce();
  }
@@ -744,15 +744,19 @@ class AppController {
    final profilePath = await appPath.getProfilePath(profileId);
    final providersPath = await appPath.getProvidersPath(profileId);
    return await Isolate.run(() async {
-      final profileFile = File(profilePath);
-      final isExists = await profileFile.exists();
-      if (isExists) {
-        profileFile.delete(recursive: true);
+      if (profilePath != null) {
+        final profileFile = File(profilePath);
+        final isExists = await profileFile.exists();
+        if (isExists) {
+          profileFile.delete(recursive: true);
+        }
      }
-      final providersFileDir = File(providersPath);
-      final providersFileIsExists = await providersFileDir.exists();
-      if (providersFileIsExists) {
-        providersFileDir.delete(recursive: true);
+      if (providersPath != null) {
+        final providersFileDir = File(providersPath);
+        final isExists = await providersFileDir.exists();
+        if (isExists) {
+          providersFileDir.delete(recursive: true);
+        }
      }
    });
  }
--- a/lib/enum/enum.dart
+++ b/lib/enum/enum.dart
@@ -256,7 +256,6 @@ enum ActionMethod {
  asyncTestDelay,
  getConnections,
  closeConnections,
-  resetConnections,
  closeConnection,
  getExternalProviders,
  getExternalProvider,
@@ -311,6 +310,7 @@ enum FunctionTag {
  proxiesTabChange,
  logs,
  requests,
+
 }

 enum DashboardWidget {
--- a/lib/fragments/connection/item.dart
+++ b/lib/fragments/connection/item.dart
@@ -78,72 +78,113 @@ class ConnectionItem extends ConsumerWidget {
    );
    return CommonPopupBox(
      targetBuilder: (open) {
-        openPopup(Offset offset) {
-          open(
-            offset: offset.translate(
-              0,
-              0,
-            ),
-          );
-        }
-
-        return InkWell(
-          child: GestureDetector(
-            onLongPressStart: (details) {
-              if (!system.isDesktop) {
-                return;
-              }
-              openPopup(details.localPosition);
-            },
-            onSecondaryTapDown: (details) {
-              if (!system.isDesktop) {
-                return;
-              }
-              openPopup(details.localPosition);
-            },
-            child: ListItem(
-              padding: const EdgeInsets.symmetric(
-                horizontal: 16,
-                vertical: 4,
-              ),
-              tileTitleAlignment: ListTileTitleAlignment.titleHeight,
-              leading: value
-                  ? GestureDetector(
-                      onTap: () {
-                        if (onClickKeyword == null) return;
-                        final process = connection.metadata.process;
-                        if (process.isEmpty) return;
-                        onClickKeyword!(process);
-                      },
-                      child: Container(
-                        margin: const EdgeInsets.only(top: 4),
-                        width: 48,
-                        height: 48,
-                        child: FutureBuilder<ImageProvider?>(
-                          future: _getPackageIcon(connection),
-                          builder: (_, snapshot) {
-                            if (!snapshot.hasData && snapshot.data == null) {
-                              return Container();
-                            } else {
-                              return Image(
-                                image: snapshot.data!,
-                                gaplessPlayback: true,
-                                width: 48,
-                                height: 48,
-                              );
-                            }
-                          },
-                        ),
-                      ),
-                    )
-                  : null,
-              title: title,
-              subtitle: subTitle,
-              trailing: trailing,
-            ),
+        return ListItem(
+          padding: const EdgeInsets.symmetric(
+            horizontal: 16,
+            vertical: 4,
          ),
-          onTap: () {},
+          tileTitleAlignment: ListTileTitleAlignment.titleHeight,
+          leading: value
+              ? GestureDetector(
+            onTap: () {
+              if (onClickKeyword == null) return;
+              final process = connection.metadata.process;
+              if (process.isEmpty) return;
+              onClickKeyword!(process);
+            },
+            child: Container(
+              margin: const EdgeInsets.only(top: 4),
+              width: 48,
+              height: 48,
+              child: FutureBuilder<ImageProvider?>(
+                future: _getPackageIcon(connection),
+                builder: (_, snapshot) {
+                  if (!snapshot.hasData && snapshot.data == null) {
+                    return Container();
+                  } else {
+                    return Image(
+                      image: snapshot.data!,
+                      gaplessPlayback: true,
+                      width: 48,
+                      height: 48,
+                    );
+                  }
+                },
+              ),
+            ),
+          )
+              : null,
+          title: title,
+          subtitle: subTitle,
+          trailing: trailing,
        );
+        // return InkWell(
+        //   child: GestureDetector(
+        //     onLongPressStart: (details) {
+        //       if (!system.isDesktop) {
+        //         return;
+        //       }
+        //       open(
+        //         offset: details.localPosition.translate(
+        //           0,
+        //           -12,
+        //         ),
+        //       );
+        //     },
+        //     onSecondaryTapDown: (details) {
+        //       if (!system.isDesktop) {
+        //         return;
+        //       }
+        //       open(
+        //         offset: details.localPosition.translate(
+        //           0,
+        //           -12,
+        //         ),
+        //       );
+        //     },
+        //     child: ListItem(
+        //       padding: const EdgeInsets.symmetric(
+        //         horizontal: 16,
+        //         vertical: 4,
+        //       ),
+        //       tileTitleAlignment: ListTileTitleAlignment.titleHeight,
+        //       leading: value
+        //           ? GestureDetector(
+        //               onTap: () {
+        //                 if (onClickKeyword == null) return;
+        //                 final process = connection.metadata.process;
+        //                 if (process.isEmpty) return;
+        //                 onClickKeyword!(process);
+        //               },
+        //               child: Container(
+        //                 margin: const EdgeInsets.only(top: 4),
+        //                 width: 48,
+        //                 height: 48,
+        //                 child: FutureBuilder<ImageProvider?>(
+        //                   future: _getPackageIcon(connection),
+        //                   builder: (_, snapshot) {
+        //                     if (!snapshot.hasData && snapshot.data == null) {
+        //                       return Container();
+        //                     } else {
+        //                       return Image(
+        //                         image: snapshot.data!,
+        //                         gaplessPlayback: true,
+        //                         width: 48,
+        //                         height: 48,
+        //                       );
+        //                     }
+        //                   },
+        //                 ),
+        //               ),
+        //             )
+        //           : null,
+        //       title: title,
+        //       subtitle: subTitle,
+        //       trailing: trailing,
+        //     ),
+        //   ),
+        //   onTap: () {},
+        // );
      },
      popup: CommonPopupMenu(
        minWidth: 160,
--- a/lib/fragments/dashboard/widgets/start_button.dart
+++ b/lib/fragments/dashboard/widgets/start_button.dart
@@ -5,17 +5,16 @@ import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

-class StartButton extends ConsumerStatefulWidget {
+class StartButton extends StatefulWidget {
  const StartButton({super.key});

  @override
-  ConsumerState<StartButton> createState() => _StartButtonState();
+  State<StartButton> createState() => _StartButtonState();
 }

-class _StartButtonState extends ConsumerState<StartButton>
+class _StartButtonState extends State<StartButton>
    with SingleTickerProviderStateMixin {
  late AnimationController _controller;
-  late Animation<double> _animation;
  bool isStart = false;

  @override
@@ -27,20 +26,6 @@ class _StartButtonState extends ConsumerState<StartButton>
      value: isStart ? 1 : 0,
      duration: const Duration(milliseconds: 200),
    );
-    _animation = CurvedAnimation(
-      parent: _controller,
-      curve: Curves.easeOutBack,
-    );
-    ref.listenManual(
-      runTimeProvider.select((state) => state != null),
-      (prev, next) {
-        if (next != isStart) {
-          isStart = next;
-          updateController();
-        }
-      },
-      fireImmediately: true,
-    );
  }

  @override
@@ -57,91 +42,101 @@ class _StartButtonState extends ConsumerState<StartButton>
      () {
        globalState.appController.updateStatus(isStart);
      },
-      duration: commonDuration,
+      duration: moreDuration,
    );
  }

  updateController() {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (isStart) {
-        _controller.forward();
-      } else {
-        _controller.reverse();
-      }
-    });
+    if (isStart) {
+      _controller.forward();
+    } else {
+      _controller.reverse();
+    }
  }

  @override
  Widget build(BuildContext context) {
-    final state = ref.watch(startButtonSelectorStateProvider);
-    if (!state.isInit || !state.hasProfile) {
-      return Container();
-    }
-    return Theme(
-      data: Theme.of(context).copyWith(
-        floatingActionButtonTheme: FloatingActionButtonThemeData(
-          sizeConstraints: BoxConstraints(
-            minWidth: 56,
-            maxWidth: 200,
-          ),
-        ),
-      ),
-      child: AnimatedBuilder(
-        animation: _controller.view,
-        builder: (_, child) {
-          final textWidth = globalState.measure
-                  .computeTextSize(
-                    Text(
-                      utils.getTimeDifference(
-                        DateTime.now(),
-                      ),
-                      style: context.textTheme.titleMedium?.toSoftBold,
+    return Consumer(
+      builder: (_, ref, child) {
+        final state = ref.watch(startButtonSelectorStateProvider);
+        if (!state.isInit || !state.hasProfile) {
+          return Container();
+        }
+        ref.listenManual(
+          runTimeProvider.select((state) => state != null),
+          (prev, next) {
+            if (next != isStart) {
+              isStart = next;
+              updateController();
+            }
+          },
+          fireImmediately: true,
+        );
+        final textWidth = globalState.measure
+                .computeTextSize(
+                  Text(
+                    utils.getTimeDifference(
+                      DateTime.now(),
                    ),
-                  )
-                  .width +
-              16;
-          return FloatingActionButton(
-            clipBehavior: Clip.antiAlias,
-            materialTapTargetSize: MaterialTapTargetSize.padded,
-            heroTag: null,
-            onPressed: () {
-              handleSwitchStart();
-            },
-            child: Row(
-              mainAxisSize: MainAxisSize.max,
-              children: [
-                Container(
-                  height: 56,
-                  width: 56,
-                  alignment: Alignment.center,
-                  child: AnimatedIcon(
-                    icon: AnimatedIcons.play_pause,
-                    progress: _animation,
+                    style: context.textTheme.titleMedium?.toSoftBold,
                  ),
-                ),
-                SizedBox(
-                  width: textWidth * _animation.value,
-                  child: child!,
                )
-              ],
-            ),
-          );
-        },
-        child: Consumer(
-          builder: (_, ref, __) {
-            final runTime = ref.watch(runTimeProvider);
-            final text = utils.getTimeText(runTime);
-            return Text(
-              text,
-              maxLines: 1,
-              overflow: TextOverflow.visible,
-              style:
-                  Theme.of(context).textTheme.titleMedium?.toSoftBold.copyWith(
-                        color: context.colorScheme.onPrimaryContainer,
+                .width +
+            16;
+        return AnimatedBuilder(
+          animation: _controller.view,
+          builder: (_, child) {
+            return SizedBox(
+              width: 56 + textWidth * _controller.value,
+              height: 56,
+              child: FloatingActionButton(
+                heroTag: null,
+                onPressed: () {
+                  handleSwitchStart();
+                },
+                child: Row(
+                  children: [
+                    Container(
+                      width: 56,
+                      height: 56,
+                      alignment: Alignment.center,
+                      child: AnimatedIcon(
+                        icon: AnimatedIcons.play_pause,
+                        progress: _controller,
                      ),
+                    ),
+                    Expanded(
+                      child: ClipRect(
+                        child: OverflowBox(
+                          maxWidth: textWidth,
+                          child: Container(
+                            alignment: Alignment.centerLeft,
+                            child: child!,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
            );
          },
-        ),
+          child: child,
+        );
+      },
+      child: Consumer(
+        builder: (_, ref, __) {
+          final runTime = ref.watch(runTimeProvider);
+          final text = utils.getTimeText(runTime);
+          return Text(
+            text,
+            style: Theme.of(context)
+                .textTheme
+                .titleMedium
+                ?.toSoftBold
+                .copyWith(color: context.colorScheme.onPrimaryContainer),
+          );
+        },
      ),
    );
  }
--- a/lib/fragments/profiles/edit_profile.dart
+++ b/lib/fragments/profiles/edit_profile.dart
@@ -47,6 +47,7 @@ class _EditProfileState extends State<EditProfile> {
      text: widget.profile.autoUpdateDuration.inMinutes.toString(),
    );
    appPath.getProfilePath(widget.profile.id).then((path) async {
+      if (path == null) return;
      fileInfoNotifier.value = await _getFileInfo(path);
    });
  }
@@ -142,10 +143,9 @@ class _EditProfileState extends State<EditProfile> {
  _editProfileFile() async {
    if (rawText == null) {
      final profilePath = await appPath.getProfilePath(widget.profile.id);
+      if (profilePath == null) return;
      final file = File(profilePath);
-      if (await file.exists()) {
-        rawText = await file.readAsString();
-      }
+      rawText = await file.readAsString();
    }
    if (!mounted) return;
    final title = widget.profile.label ?? widget.profile.id;
--- a/lib/fragments/proxies/card.dart
+++ b/lib/fragments/proxies/card.dart
@@ -133,6 +133,7 @@ class ProxyCard extends StatelessWidget {
                ref.watch(getSelectedProxyNameProvider(groupName));
            return CommonCard(
              key: key,
+              enterAnimated: true,
              onPressed: () {
                _changeProxy(ref);
              },
@@ -176,8 +177,8 @@ class ProxyCard extends StatelessWidget {
                              proxy.type,
                              style: context.textTheme.bodySmall?.copyWith(
                                overflow: TextOverflow.ellipsis,
-                                color: context
-                                    .textTheme.bodySmall?.color?.opacity80,
+                                color:
+                                    context.textTheme.bodySmall?.color?.opacity80,
                              ),
                            ),
                          ),
--- a/lib/fragments/proxies/proxies.dart
+++ b/lib/fragments/proxies/proxies.dart
@@ -41,6 +41,7 @@ class _ProxiesFragmentState extends ConsumerState<ProxiesFragment>
            );
          },
          popup: CommonPopupMenu(
+            minWidth: 180,
            items: [
              PopupMenuItemData(
                icon: Icons.tune,
--- a/lib/fragments/proxies/tab.dart
+++ b/lib/fragments/proxies/tab.dart
@@ -1,13 +1,13 @@
 import 'dart:math';

 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/models/common.dart';
 import 'package:fl_clash/providers/providers.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

-import '../../models/common.dart';
 import 'card.dart';
 import 'common.dart';

@@ -127,6 +127,8 @@ class ProxiesTabFragmentState extends ConsumerState<ProxiesTabFragment>
      return;
    }
    final currentGroup = currentGroups[groupIndex];
+    currentTabProxies = currentGroup.all;
+    currentTabTestUrl = currentGroup.testUrl;
    WidgetsBinding.instance.addPostFrameCallback((_) {
      globalState.appController.updateCurrentGroupName(
        currentGroup.name,
@@ -293,12 +295,17 @@ class ProxyGroupViewState extends ConsumerState<ProxyGroupView> {
    if (_controller.position.maxScrollExtent == 0) {
      return;
    }
+
+    final sortedProxies = globalState.appController.getSortProxies(
+      currentTabProxies,
+      currentTabTestUrl,
+    );
    _controller.animateTo(
      min(
        16 +
            getScrollToSelectedOffset(
              groupName: groupName,
-              proxies: currentTabProxies,
+              proxies: sortedProxies,
            ),
        _controller.position.maxScrollExtent,
      ),
@@ -317,8 +324,6 @@ class ProxyGroupViewState extends ConsumerState<ProxyGroupView> {
      proxies,
      state.testUrl,
    );
-    currentTabProxies = sortedProxies;
-    currentTabTestUrl = state.testUrl;
    return Align(
      alignment: Alignment.topCenter,
      child: CommonAutoHiddenScrollBar(
--- a/lib/models/generated/core.g.dart
+++ b/lib/models/generated/core.g.dart
@@ -332,7 +332,6 @@ const _$ActionMethodEnumMap = {
  ActionMethod.asyncTestDelay: 'asyncTestDelay',
  ActionMethod.getConnections: 'getConnections',
  ActionMethod.closeConnections: 'closeConnections',
-  ActionMethod.resetConnections: 'resetConnections',
  ActionMethod.closeConnection: 'closeConnection',
  ActionMethod.getExternalProviders: 'getExternalProviders',
  ActionMethod.getExternalProvider: 'getExternalProvider',
--- a/lib/models/profile.dart
+++ b/lib/models/profile.dart
@@ -11,6 +11,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 import 'clash_config.dart';

 part 'generated/profile.freezed.dart';
+
 part 'generated/profile.g.dart';

 typedef SelectedMap = Map<String, String>;
@@ -149,12 +150,12 @@ extension ProfileExtension on Profile {

  Future<bool> check() async {
    final profilePath = await appPath.getProfilePath(id);
-    return await File(profilePath).exists();
+    return await File(profilePath!).exists();
  }

  Future<File> getFile() async {
    final path = await appPath.getProfilePath(id);
-    final file = File(path);
+    final file = File(path!);
    final isExists = await file.exists();
    if (!isExists) {
      await file.create(recursive: true);
--- a/lib/pages/editor.dart
+++ b/lib/pages/editor.dart
@@ -152,59 +152,57 @@ class _EditorPageState extends ConsumerState<EditorPage> {
            ),
          ),
        ],
-        body: SafeArea(
-          child: CodeEditor(
-            findController: _findController,
-            maxLengthSingleLineRendering: 200,
-            findBuilder: (context, controller, readOnly) => FindPanel(
-              controller: controller,
-              readOnly: readOnly,
-              isMobileView: isMobileView,
-            ),
-            padding: EdgeInsets.only(
-              right: 16,
-            ),
-            focusNode: _focusNode,
-            scrollbarBuilder: (context, child, details) {
-              return CommonScrollBar(
-                controller: details.controller,
-                child: child,
-              );
-            },
-            toolbarController: ContextMenuControllerImpl(),
-            indicatorBuilder: (
-              context,
-              editingController,
-              chunkController,
-              notifier,
-            ) {
-              return Row(
-                children: [
-                  DefaultCodeLineNumber(
-                    controller: editingController,
-                    notifier: notifier,
-                  ),
-                  DefaultCodeChunkIndicator(
-                    width: 20,
-                    controller: chunkController,
-                    notifier: notifier,
-                  )
-                ],
-              );
-            },
-            shortcutsActivatorsBuilder: DefaultCodeShortcutsActivatorsBuilder(),
-            controller: _controller,
-            style: CodeEditorStyle(
-              fontSize: context.textTheme.bodyLarge?.fontSize?.ap,
-              fontFamily: FontFamily.jetBrainsMono.value,
-              codeTheme: CodeHighlightTheme(
-                languages: {
-                  'yaml': CodeHighlightThemeMode(
-                    mode: langYaml,
-                  )
-                },
-                theme: atomOneLightTheme,
-              ),
+        body: CodeEditor(
+          findController: _findController,
+          maxLengthSingleLineRendering: 200,
+          findBuilder: (context, controller, readOnly) => FindPanel(
+            controller: controller,
+            readOnly: readOnly,
+            isMobileView: isMobileView,
+          ),
+          padding: EdgeInsets.only(
+            right: 16,
+          ),
+          focusNode: _focusNode,
+          scrollbarBuilder: (context, child, details) {
+            return CommonScrollBar(
+              controller: details.controller,
+              child: child,
+            );
+          },
+          toolbarController: ContextMenuControllerImpl(),
+          indicatorBuilder: (
+            context,
+            editingController,
+            chunkController,
+            notifier,
+          ) {
+            return Row(
+              children: [
+                DefaultCodeLineNumber(
+                  controller: editingController,
+                  notifier: notifier,
+                ),
+                DefaultCodeChunkIndicator(
+                  width: 20,
+                  controller: chunkController,
+                  notifier: notifier,
+                )
+              ],
+            );
+          },
+          shortcutsActivatorsBuilder: DefaultCodeShortcutsActivatorsBuilder(),
+          controller: _controller,
+          style: CodeEditorStyle(
+            fontSize: context.textTheme.bodyLarge?.fontSize?.ap,
+            fontFamily: FontFamily.jetBrainsMono.value,
+            codeTheme: CodeHighlightTheme(
+              languages: {
+                'yaml': CodeHighlightThemeMode(
+                  mode: langYaml,
+                )
+              },
+              theme: atomOneLightTheme,
            ),
          ),
        ),
--- a/lib/plugins/vpn.dart
+++ b/lib/plugins/vpn.dart
@@ -27,8 +27,6 @@ class Vpn {
            return await handleGetStartForegroundParams!();
          }
          return "";
-        case "status":
-          return clashLibHandler?.getRunTime() != null;
        default:
          for (final VpnListener listener in _listeners) {
            switch (call.method) {
--- a/lib/providers/generated/state.g.dart
+++ b/lib/providers/generated/state.g.dart
@@ -292,7 +292,7 @@ final groupNamesStateProvider = AutoDisposeProvider<GroupNamesState>.internal(
 // ignore: unused_element
 typedef GroupNamesStateRef = AutoDisposeProviderRef<GroupNamesState>;
 String _$proxyGroupSelectorStateHash() =>
-    r'27d42af16ed77f2d22017edbb34ab60f45566be3';
+    r'50940ff452859b02af0095cb7c4bcda813847645';

 /// Copied from Dart SDK
 class _SystemHash {
--- a/lib/providers/state.dart
+++ b/lib/providers/state.dart
@@ -230,11 +230,8 @@ ProxiesListSelectorState proxiesListSelectorState(Ref ref) {
  final proxiesStyle = ref.watch(proxiesStyleSettingProvider);
  final sortNum = ref.watch(sortNumProvider);
  final columns = ref.watch(getProxiesColumnsProvider);
-  final query = ref.watch(
-    proxiesQueryProvider.select(
-      (state) => state.toLowerCase(),
-    ),
-  );
+  final query =
+      ref.watch(proxiesQueryProvider.select((state) => state.toLowerCase()));
  return ProxiesListSelectorState(
    groupNames: groupNames,
    currentUnfoldSet: currentUnfoldSet,
@@ -292,7 +289,7 @@ ProxyGroupSelectorState proxyGroupSelectorState(Ref ref, String groupName) {
  final query =
      ref.watch(proxiesQueryProvider.select((state) => state.toLowerCase()));
  final proxies = group?.all.where((item) {
-        return item.name.toLowerCase().contains(query);
+        return item.name.contains(query);
      }).toList() ??
      [];
  return ProxyGroupSelectorState(
--- a/lib/state.dart
+++ b/lib/state.dart
@@ -1,7 +1,4 @@
 import 'dart:async';
-import 'dart:io';
-import 'dart:isolate';
-
 import 'package:animations/animations.dart';
 import 'package:dio/dio.dart';
 import 'package:dynamic_color/dynamic_color.dart';
@@ -16,7 +13,6 @@ import 'package:flutter/material.dart';
 import 'package:material_color_utilities/palettes/core_palette.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
-import 'package:yaml/yaml.dart';

 import 'common/common.dart';
 import 'controller.dart';
@@ -44,19 +40,11 @@ class GlobalState {
  DateTime? startTime;
  UpdateTasks tasks = [];
  final navigatorKey = GlobalKey<NavigatorState>();
-  AppController? _appController;
+  late AppController appController;
  GlobalKey<CommonScaffoldState> homeScaffoldKey = GlobalKey();
-  bool isInit = false;

  bool get isStart => startTime != null && startTime!.isBeforeNow;

-  AppController get appController => _appController!;
-
-  set appController(AppController appController) {
-    _appController = appController;
-    isInit = true;
-  }
-
  GlobalState._internal();

  factory GlobalState() {
@@ -191,23 +179,6 @@ class GlobalState {
    );
  }

-  Future<Map<String, dynamic>> getProfileData(String? id) async {
-    if (id == null || id.isEmpty) {
-      return {};
-    }
-    final profilePath = await appPath.getProfilePath(id);
-    try {
-      final data = await Isolate.run<dynamic>(() async {
-        final file = File(profilePath);
-        final value = await file.readAsString();
-        return loadYaml(value);
-      });
-      return utils.convertLoadYaml(data) as Map<String, dynamic>;
-    } catch (_) {
-      return {};
-    }
-  }
-
  Future<T?> showCommonDialog<T>({
    required Widget child,
    bool dismissible = true,
--- a/lib/widgets/popup.dart
+++ b/lib/widgets/popup.dart
@@ -64,7 +64,7 @@ class CommonPopupRoute<T> extends PopupRoute<T> {
              opacity: 0.1 + 0.9 * animationValue,
              child: Transform.scale(
                alignment: align,
-                scale: 0.7 + 0.3 * animationValue,
+                scale: 0.8 + 0.2 * animationValue,
                child: Transform.translate(
                  offset: Offset(0, -10) * (1 - animationValue),
                  child: child!,
@@ -103,13 +103,11 @@ typedef PopupOpen = Function({
 class CommonPopupBox extends StatefulWidget {
  final Widget Function(PopupOpen open) targetBuilder;
  final Widget popup;
-  final Align? align;

  const CommonPopupBox({
    super.key,
    required this.targetBuilder,
    required this.popup,
-    this.align,
  });

  @override
@@ -148,10 +146,7 @@ class _CommonPopupBoxState extends State<CommonPopupBox> {
    final viewPadding = MediaQuery.of(context).viewPadding;
    _targetOffsetValueNotifier.value = renderBox
        .localToGlobal(
-          Offset.zero.translate(
-            viewPadding.right,
-            viewPadding.top,
-          ),
+          Offset.zero.translate(viewPadding.right, viewPadding.top),
        )
        .translate(
          _offset.dx,
@@ -213,7 +208,7 @@ class CommonPopupMenu extends StatelessWidget {
  const CommonPopupMenu({
    super.key,
    required this.items,
-    this.minWidth = 200,
+    this.minWidth = 160,
    this.minItemVerticalPadding = 16,
    this.fontSize = 15,
  });
@@ -278,7 +273,7 @@ class CommonPopupMenu extends StatelessWidget {
    return IntrinsicHeight(
      child: IntrinsicWidth(
        child: Card(
-          elevation: 12,
+          elevation: 8,
          color: context.colorScheme.surfaceContainer,
          clipBehavior: Clip.antiAlias,
          shape: RoundedRectangleBorder(
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@@ -8,7 +8,6 @@

 #include <dynamic_color/dynamic_color_plugin.h>
 #include <file_selector_linux/file_selector_plugin.h>
-#include <flutter_js/flutter_js_plugin.h>
 #include <gtk/gtk_plugin.h>
 #include <hotkey_manager_linux/hotkey_manager_linux_plugin.h>
 #include <screen_retriever_linux/screen_retriever_linux_plugin.h>
@@ -23,9 +22,6 @@ void fl_register_plugins(FlPluginRegistry* registry) {
  g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
      fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
  file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
-  g_autoptr(FlPluginRegistrar) flutter_js_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterJsPlugin");
-  flutter_js_plugin_register_with_registrar(flutter_js_registrar);
  g_autoptr(FlPluginRegistrar) gtk_registrar =
      fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
  gtk_plugin_register_with_registrar(gtk_registrar);
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@@ -5,7 +5,6 @@
 list(APPEND FLUTTER_PLUGIN_LIST
  dynamic_color
  file_selector_linux
-  flutter_js
  gtk
  hotkey_manager_linux
  screen_retriever_linux
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -11,7 +11,6 @@ import device_info_plus
 import dynamic_color
 import file_picker
 import file_selector_macos
-import flutter_js
 import hotkey_manager_macos
 import mobile_scanner
 import package_info_plus
@@ -31,7 +30,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
  FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
  FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
-  FlutterJsPlugin.register(with: registry.registrar(forPlugin: "FlutterJsPlugin"))
  HotkeyManagerMacosPlugin.register(with: registry.registrar(forPlugin: "HotkeyManagerMacosPlugin"))
  MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -11,8 +11,6 @@ PODS:
    - FlutterMacOS
  - file_selector_macos (0.0.1):
    - FlutterMacOS
-  - flutter_js (0.0.1):
-    - FlutterMacOS
  - FlutterMacOS (1.0.0)
  - HotKey (0.2.0)
  - hotkey_manager_macos (0.0.1):
@@ -50,7 +48,6 @@ DEPENDENCIES:
  - dynamic_color (from `Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos`)
  - file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
  - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`)
-  - flutter_js (from `Flutter/ephemeral/.symlinks/plugins/flutter_js/macos`)
  - FlutterMacOS (from `Flutter/ephemeral`)
  - hotkey_manager_macos (from `Flutter/ephemeral/.symlinks/plugins/hotkey_manager_macos/macos`)
  - mobile_scanner (from `Flutter/ephemeral/.symlinks/plugins/mobile_scanner/darwin`)
@@ -81,8 +78,6 @@ EXTERNAL SOURCES:
    :path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos
  file_selector_macos:
    :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos
-  flutter_js:
-    :path: Flutter/ephemeral/.symlinks/plugins/flutter_js/macos
  FlutterMacOS:
    :path: Flutter/ephemeral
  hotkey_manager_macos:
@@ -115,7 +110,6 @@ SPEC CHECKSUMS:
  dynamic_color: b820c000cc68df65e7ba7ff177cb98404ce56651
  file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
  file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31
-  flutter_js: 79c3c70d33ba464c67d8eb88639a61aa718cd8b8
  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
  HotKey: e96d8a2ddbf4591131e2bb3f54e69554d90cdca6
  hotkey_manager_macos: a4317849af96d2430fa89944d3c58977ca089fbe
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -486,15 +486,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.4.1"
-  flutter_js:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: master
-      resolved-ref: c0e10a5dab0e22cd616ec92ae71471d76369cbfe
-      url: "https://github.com/chen08209/flutter_js"
-    source: git
-    version: "0.8.3"
  flutter_lints:
    dependency: "direct dev"
    description:
@@ -1338,14 +1329,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.4.1"
-  sync_http:
-    dependency: transitive
-    description:
-      name: sync_http
-      sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.1"
  synchronized:
    dependency: transitive
    description:
@@ -1578,7 +1561,7 @@ packages:
    source: hosted
    version: "6.5.0"
  yaml:
-    dependency: "direct main"
+    dependency: transitive
    description:
      name: yaml
      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: fl_clash
 description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
 publish_to: 'none'
-version: 0.8.85+202505171
+version: 0.8.85+202505091
 environment:
  sdk: '>=3.1.0 <4.0.0'

@@ -53,11 +53,6 @@ dependencies:
  riverpod_annotation: ^2.6.1
  riverpod: ^2.6.1
  material_color_utilities: ^0.11.1
-  flutter_js:
-    git:
-      url: https://github.com/chen08209/flutter_js
-      ref: master
-  yaml: ^3.1.3
 dev_dependencies:
  flutter_test:
    sdk: flutter
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -10,7 +10,6 @@
 #include <connectivity_plus/connectivity_plus_windows_plugin.h>
 #include <dynamic_color/dynamic_color_plugin_c_api.h>
 #include <file_selector_windows/file_selector_windows.h>
-#include <flutter_js/flutter_js_plugin.h>
 #include <hotkey_manager_windows/hotkey_manager_windows_plugin_c_api.h>
 #include <proxy/proxy_plugin_c_api.h>
 #include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
@@ -28,8 +27,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
      registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
  FileSelectorWindowsRegisterWithRegistrar(
      registry->GetRegistrarForPlugin("FileSelectorWindows"));
-  FlutterJsPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("FlutterJsPlugin"));
  HotkeyManagerWindowsPluginCApiRegisterWithRegistrar(
      registry->GetRegistrarForPlugin("HotkeyManagerWindowsPluginCApi"));
  ProxyPluginCApiRegisterWithRegistrar(
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -7,7 +7,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
  connectivity_plus
  dynamic_color
  file_selector_windows
-  flutter_js
  hotkey_manager_windows
  proxy
  screen_retriever_windows