Add android separates the core process

Support core status check and force restart

Optimize proxies page and access page

Update flutter and pub dependencies

Optimize more details

.github/workflows/build.yaml

@@ -22,14 +22,14 @@ jobs:
             os: ubuntu-22.04
             arch: amd64
           - platform: macos
-            os: macos-15-intel
+            os: macos-13
             arch: amd64
           - platform: macos
             os: macos-latest
             arch: arm64
-          #          - platform: windows
-          #            os: windows-11-arm
-          #            arch: arm64
+          - platform: windows
+            os: windows-11-arm
+            arch: arm64
           - platform: linux
             os: ubuntu-24.04-arm
             arch: arm64
@@ -64,25 +64,22 @@ jobs:
           cache-dependency-path: |
             core/go.sum
 
+      - name: Setup Flutter Master
+        if: startsWith(matrix.os, 'windows-11-arm') || startsWith(matrix.os, 'ubuntu-24.04-arm')
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'master'
+          cache: true
       - name: Setup Flutter
         if: ${{ !(startsWith(matrix.os, 'windows-11-arm') || startsWith(matrix.os, 'ubuntu-24.04-arm')) }}
         uses: subosito/flutter-action@v2
         with:
-          channel: stable
-          flutter-version: 3.35.7
-          cache: true
-      - name: Setup Flutter With Other
-        if: startsWith(matrix.os, 'windows-11-arm') || startsWith(matrix.os, 'ubuntu-24.04-arm')
-        uses: subosito/flutter-action@v2
-        with:
-          channel: master
-          flutter-version: 3.35.7
+          channel: 'stable'
           cache: true
+      #          flutter-version: 3.29.3
 
       - name: Get Flutter Dependency
-        run: |
-          flutter --version
-          flutter pub get
+        run: flutter pub get
 
       - name: Setup
         run: dart setup.dart ${{ matrix.platform }} ${{ matrix.arch && format('--arch {0}', matrix.arch) }} ${{ env.IS_STABLE == 'true' && '--env stable' || '' }}
@@ -107,26 +104,34 @@ jobs:
       - name: Generate
         if: ${{ env.IS_STABLE == 'true' }}
         run: |
-          last_ver=$(grep -m1 '^## ' CHANGELOG.md 2>/dev/null | sed 's/^## //')
-          
-          tags=($(git tag --merged HEAD --sort=-creatordate))
-          
-          temp="NEW_CHANGELOG.md" > "$temp"
-          
-          for i in "${!tags[@]}"; do
-              curr="${tags[i]}"
-              [[ "$curr" == "$last_ver" ]] && break
-          
-              prev="${tags[i+1]}"
-              range="${prev:+$prev..}$curr"
-          
-              echo -e "## $curr\n" >> "$temp"
-              git log --no-merges --pretty=format:"%B" "$range" | \
-              awk '!/Update changelog/ && NF {print "- " $0 "\n"}' >> "$temp"
+          tags=($(git tag --merged $(git rev-parse HEAD) --sort=-creatordate))
+          preTag=$(grep -oP '^## \K.*' CHANGELOG.md | head -n 1)
+          currentTag=""
+          for ((i = 0; i <= ${#tags[@]}; i++)); do
+            if (( i < ${#tags[@]} )); then
+              tag=${tags[$i]}
+            else
+              tag=""
+            fi
+            if [ -n "$currentTag" ]; then
+              if [ "$(echo -e "$currentTag\n$preTag" | sort -V | head -n 1)" == "$currentTag" ]; then
+                break
+              fi
+            fi
+            if [ -n "$currentTag" ]; then
+              echo "## $currentTag" >> NEW_CHANGELOG.md
+              echo "" >> NEW_CHANGELOG.md
+              if [ -n "$tag" ]; then
+                git log --pretty=format:"%B" "$tag..$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
+              else
+                git log --pretty=format:"%B" "$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
+              fi
+              echo "" >> NEW_CHANGELOG.md
+            fi
+            currentTag=$tag
           done
-          [ -f CHANGELOG.md ] && cat CHANGELOG.md >> "$temp"
-          
-          mv "$temp" CHANGELOG.md
+          cat CHANGELOG.md >> NEW_CHANGELOG.md
+          cat NEW_CHANGELOG.md > CHANGELOG.md
 
       - name: Commit
         if: ${{ env.IS_STABLE == 'true' }}
@@ -176,24 +181,31 @@ jobs:
 
       - name: Generate release.md
         run: |
-          tags=($(git tag --merged HEAD --sort=-creatordate))
-          preTag=$(curl -s "https://api.github.com/repos/chen08209/FlClash/releases/latest" | \
-          sed -nE 's/.*"tag_name": "([^"]+)".*/\1/p')
-          
-          [ -z "$preTag" ] && preTag=""
-          
-          out="release.md" > "$out"
-          
-          for i in "${!tags[@]}"; do
-            curr="${tags[i]}"
-            [[ "$curr" == "$preTag" ]] && break
-          
-            prev="${tags[i+1]}"
-            range="${prev:+$prev..}$curr"
-          
-            git log --no-merges --pretty=format:"%B" "$range" | \
-            awk '!/Update changelog/ && NF {print "- " $0 "\n"}' >> "$out"
+          tags=($(git tag --merged $(git rev-parse HEAD) --sort=-creatordate))
+          preTag=$(curl --silent "https://api.github.com/repos/chen08209/FlClash/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' || echo "")
+          currentTag=""
+          for ((i = 0; i <= ${#tags[@]}; i++)); do
+            if (( i < ${#tags[@]} )); then
+              tag=${tags[$i]}
+            else
+              tag=""
+            fi
+            if [ -n "$currentTag" ]; then
+              if [ "$(echo -e "$currentTag\n$preTag" | sort -V | head -n 1)" == "$currentTag" ]; then
+                break
+              fi
+            fi
+            if [ -n "$currentTag" ]; then
+              if [ -n "$tag" ]; then
+                git log --pretty=format:"%B" "$tag..$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> release.md
+              else
+                git log --pretty=format:"%B" "$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> release.md
+              fi
+              echo "" >> release.md
+            fi
+            currentTag=$tag
           done
+
       - name: Push to telegram
         env:
           TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}

.gitignore

@@ -21,7 +21,7 @@ migrate_working_dir/
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
-.vscode/
+#.vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/
@@ -41,30 +41,15 @@ app.*.symbols
 # Obfuscation related
 app.*.map.json
 
-#AI generated
-CLAUDE.md
-/.claude
-
-
 # Android Studio will place build artifacts here
 /android/app/debug
 /android/app/profile
 /android/app/release
-/android/**/.cxx
-/android/**/build
-/android/common/**/.**/
-/android/common/local.*
-/android/core/**/includes/
-/android/core/**/cmake-build-*/
-/android/core/**/jniLibs/
 
-#FlClash
+
+
+#libclash
 /libclash/
-/android/app/src/main/jniLibs/
-/services/helper/target
-/macos/**/Package.resolved
-devtools_options.yaml
 
-# FVM Version Cache
-.fvm/
-.fvmrc
+#jniLibs
+/android/app/src/main/jniLibs/

.gitmodules

@@ -6,9 +6,5 @@
 	path = plugins/flutter_distributor
 	url = git@github.com:chen08209/flutter_distributor.git
 	branch = FlClash
-[submodule "plugins/tray_manager"]
-	path = plugins/tray_manager
-	url = git@github.com:chen08209/tray_manager.git
-	branch = main
 
 

.metadata

@@ -1,11 +1,11 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: "adc901062556672b4138e18a4dc62a4be8f4b3c2"
-  channel: "stable"
+  revision: 796c8ef79279f9c774545b3771238c3098dbefab
+  channel: stable
 
 project_type: app
 
@@ -13,11 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
-      base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
+      create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+      base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+    - platform: android
+      create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+      base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+    - platform: ios
+      create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+      base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+    - platform: linux
+      create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+      base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+    - platform: macos
+      create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+      base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+    - platform: web
+      create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+      base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
     - platform: windows
-      create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
-      base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
+      create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+      base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
 
   # User provided section
 

.run/main.dart.run.xml

@@ -1,7 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="main.dart" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="additionalArgs" value="--dart-define-from-file env.json" />
-    <option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
-    <method v="2" />
-  </configuration>
-</component>

CHANGELOG.md

@@ -1,59 +1,3 @@
-## v0.8.92
-
-- Add sqlite store
-
-- Optimize android quick action
-
-- Optimize backup and restore
-
-- Optimize more details
-
-## v0.8.91
-
-- Fix windows some issues
-
-- Optimize overwrite handle
-
-- Optimize access control page
-
-- Optimize some details
-
-## v0.8.90
-
-- Fix android tile service
-
-- Support append system DNS
-
-- Fix some issues
-
-- Update changelog
-
-## v0.8.89
-
-- Fix some issues
-
-- Optimize Windows service mode
-
-- Update core
-
-- Update changelog
-
-## v0.8.88
-
-- Add android separates the core process
-
-- Support core status check and force restart
-
-- Optimize proxies page and access page
-
-- Update flutter and pub dependencies
-
-- Update go version
-
-- Optimize more details
-
-- Update changelog
-
 ## v0.8.87
 
 - Optimize desktop view

Makefile

@@ -0,0 +1,10 @@
+android_arm64:
+	dart ./setup.dart android --arch arm64
+macos_arm64:
+	dart ./setup.dart macos --arch arm64
+android_app:
+	dart ./setup.dart android
+android_arm64_core:
+	dart ./setup.dart android --arch arm64 --out core
+macos_arm64_core:
+	dart ./setup.dart macos --arch arm64  --out core

android/app/build.gradle.kts

@@ -64,17 +64,16 @@ android {
     buildTypes {
         debug {
             isMinifyEnabled = false
-            applicationIdSuffix = ".dev"
+            applicationIdSuffix = ".debug"
         }
 
         release {
             isMinifyEnabled = true
             isShrinkResources = true
-            if (isRelease) {
-                signingConfig = signingConfigs.getByName("release")
+            signingConfig = if (isRelease) {
+                signingConfigs.getByName("release")
             } else {
-                signingConfig = signingConfigs.getByName("debug")
-                applicationIdSuffix = ".dev"
+                signingConfigs.getByName("debug")
             }
 
             proguardFiles(

android/app/google-services.json

@@ -41,25 +41,6 @@
           "other_platform_oauth_client": []
         }
       }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:000000000000:android:0000000000000000",
-        "android_client_info": {
-          "package_name": "com.follow.clash.dev"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "0"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": []
-        }
-      }
     }
   ]
 }

android/app/src/main/kotlin/com/follow/clash/BroadcastReceiver.kt

@@ -20,9 +20,7 @@ class BroadcastReceiver : BroadcastReceiver() {
 
             BroadcastAction.SERVICE_DESTROYED.action -> {
                 GlobalState.log("Receiver service destroyed")
-                GlobalState.launch {
-                    State.handleStopServiceAction()
-                }
+                State.handleStopServiceAction()
             }
         }
     }

android/app/src/main/kotlin/com/follow/clash/Ext.kt

@@ -1,18 +1,13 @@
 package com.follow.clash
 
-import android.app.Application
-import android.content.Context.MODE_PRIVATE
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
-import android.widget.Toast
 import androidx.core.graphics.drawable.toBitmap
 import com.follow.clash.common.GlobalState
-import com.follow.clash.models.SharedState
-import com.google.gson.Gson
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.MethodChannel
@@ -26,30 +21,6 @@ import kotlin.coroutines.resume
 
 private const val ICON_TTL_DAYS = 1L
 
-val Application.sharedState: SharedState
-    get() {
-        try {
-            val sp = getSharedPreferences("FlutterSharedPreferences", MODE_PRIVATE)
-            val res = sp.getString("flutter.sharedState", "")
-            return Gson().fromJson(res, SharedState::class.java)
-        } catch (_: Exception) {
-            return SharedState()
-        }
-    }
-
-
-private var lastToast: Toast? = null
-
-fun Application.showToast(text: String?) {
-    Handler(Looper.getMainLooper()).post {
-        lastToast?.cancel()
-        lastToast = Toast.makeText(this, text, Toast.LENGTH_LONG).apply {
-            show()
-        }
-    }
-
-}
-
 suspend fun PackageManager.getPackageIconPath(packageName: String): String =
     withContext(Dispatchers.IO) {
         val cacheDir = GlobalState.application.cacheDir
@@ -147,4 +118,4 @@ fun <T> MethodChannel.invokeMethodOnMainThread(
             }
         })
     }
-}
+}

android/app/src/main/kotlin/com/follow/clash/MainActivity.kt

@@ -1,6 +1,7 @@
 package com.follow.clash
 
 import android.os.Bundle
+import androidx.lifecycle.lifecycleScope
 import com.follow.clash.common.GlobalState
 import com.follow.clash.plugins.AppPlugin
 import com.follow.clash.plugins.ServicePlugin
@@ -17,6 +18,9 @@ class MainActivity : FlutterActivity(),
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        lifecycleScope.launch {
+            State.destroyServiceEngine()
+        }
     }
 
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {

android/app/src/main/kotlin/com/follow/clash/Service.kt

@@ -1,15 +1,12 @@
 package com.follow.clash
 
-import com.follow.clash.common.GlobalState
 import com.follow.clash.common.ServiceDelegate
 import com.follow.clash.common.formatString
 import com.follow.clash.common.intent
-import com.follow.clash.service.IAckInterface
 import com.follow.clash.service.ICallbackInterface
 import com.follow.clash.service.IEventInterface
 import com.follow.clash.service.IRemoteInterface
 import com.follow.clash.service.IResultInterface
-import com.follow.clash.service.IVoidInterface
 import com.follow.clash.service.RemoteService
 import com.follow.clash.service.models.NotificationParams
 import com.follow.clash.service.models.VpnOptions
@@ -42,61 +39,21 @@ object Service {
         delegate.unbind()
     }
 
-    suspend fun invokeAction(data: String, cb: ((result: String) -> Unit)?): Result<Unit> {
+    suspend fun invokeAction(data: String, cb: (result: String) -> Unit): Result<Unit> {
         val res = mutableListOf<ByteArray>()
         return delegate.useService {
             it.invokeAction(
                 data, object : ICallbackInterface.Stub() {
-                    override fun onResult(
-                        result: ByteArray?, isSuccess: Boolean, ack: IAckInterface?
-                    ) {
+                    override fun onResult(result: ByteArray?, isSuccess: Boolean) {
                         res.add(result ?: byteArrayOf())
-                        ack?.onAck()
                         if (isSuccess) {
-                            cb?.let { cb ->
-                                cb(res.formatString())
-                            }
+                            cb(res.formatString())
                         }
                     }
                 })
         }
     }
 
-    suspend fun quickSetup(
-        initParamsString: String,
-        setupParamsString: String,
-        onStarted: (() -> Unit)?,
-        onResult: ((result: String) -> Unit)?,
-    ): Result<Unit> {
-        val res = mutableListOf<ByteArray>()
-        return delegate.useService {
-            it.quickSetup(
-                initParamsString,
-                setupParamsString,
-                object : ICallbackInterface.Stub() {
-                    override fun onResult(
-                        result: ByteArray?, isSuccess: Boolean, ack: IAckInterface?
-                    ) {
-                        res.add(result ?: byteArrayOf())
-                        ack?.onAck()
-                        if (isSuccess) {
-                            onResult?.let { cb ->
-                                cb(res.formatString())
-                            }
-                        }
-                    }
-                },
-                object : IVoidInterface.Stub() {
-                    override fun invoke() {
-                        onStarted?.let { onStarted ->
-                            onStarted()
-                        }
-                    }
-                }
-            )
-        }
-    }
-
     suspend fun setEventListener(
         cb: ((result: String?) -> Unit)?
     ): Result<Unit> {
@@ -106,13 +63,12 @@ object Service {
                 when (cb != null) {
                     true -> object : IEventInterface.Stub() {
                         override fun onEvent(
-                            id: String, data: ByteArray?, isSuccess: Boolean, ack: IAckInterface?
+                            id: String, data: ByteArray?, isSuccess: Boolean
                         ) {
                             if (results[id] == null) {
                                 results[id] = mutableListOf()
                             }
                             results[id]?.add(data ?: byteArrayOf())
-                            ack?.onAck()
                             if (isSuccess) {
                                 cb(results[id]?.formatString())
                                 results.remove(id)
@@ -121,7 +77,8 @@ object Service {
                     }
 
                     false -> null
-                })
+                }
+            )
         }
     }
 
@@ -143,11 +100,11 @@ object Service {
 
     private suspend fun awaitIResultInterface(
         block: (IResultInterface) -> Unit
-    ): Long = suspendCancellableCoroutine { continuation ->
+    ): Unit = suspendCancellableCoroutine { continuation ->
         val callback = object : IResultInterface.Stub() {
-            override fun onResult(time: Long) {
+            override fun onResult() {
                 if (continuation.isActive) {
-                    continuation.resume(time)
+                    continuation.resume(Unit)
                 }
             }
         }
@@ -155,7 +112,6 @@ object Service {
         try {
             block(callback)
         } catch (e: Exception) {
-            GlobalState.log("awaitIResultInterface $e")
             if (continuation.isActive) {
                 continuation.resumeWithException(e)
             }
@@ -163,25 +119,19 @@ object Service {
     }
 
 
-    suspend fun startService(options: VpnOptions, runTime: Long): Long {
-        return delegate.useService {
+    suspend fun startService(options: VpnOptions) {
+        delegate.useService {
             awaitIResultInterface { callback ->
-                it.startService(options, runTime, callback)
+                it.startService(options, callback)
             }
-        }.getOrNull() ?: 0L
+        }
     }
 
-    suspend fun stopService(): Long {
-        return delegate.useService {
+    suspend fun stopService() {
+        delegate.useService {
             awaitIResultInterface { callback ->
                 it.stopService(callback)
             }
-        }.getOrNull() ?: 0L
-    }
-
-    suspend fun getRunTime(): Long {
-        return delegate.useService {
-            it.runTime
-        }.getOrNull() ?: 0L
+        }
     }
 }

android/app/src/main/kotlin/com/follow/clash/State.kt

@@ -1,17 +1,18 @@
 package com.follow.clash
 
-import android.net.VpnService
 import com.follow.clash.common.GlobalState
-import com.follow.clash.models.SharedState
 import com.follow.clash.plugins.AppPlugin
+import com.follow.clash.plugins.ServicePlugin
 import com.follow.clash.plugins.TilePlugin
-import com.follow.clash.service.models.NotificationParams
-import com.google.gson.Gson
+import io.flutter.FlutterInjector
 import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.embedding.engine.dart.DartExecutor
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
 
 enum class RunState {
     START, PENDING, STOP
@@ -24,17 +25,20 @@ object State {
 
     var runTime: Long = 0
 
-    var sharedState: SharedState = SharedState()
-
     val runStateFlow: MutableStateFlow<RunState> = MutableStateFlow(RunState.STOP)
 
     var flutterEngine: FlutterEngine? = null
+    var serviceFlutterEngine: FlutterEngine? = null
 
     val appPlugin: AppPlugin?
-        get() = flutterEngine?.plugin<AppPlugin>()
+        get() = flutterEngine?.plugin<AppPlugin>() ?: serviceFlutterEngine?.plugin<AppPlugin>()
+
+    val servicePlugin: ServicePlugin?
+        get() = flutterEngine?.plugin<ServicePlugin>()
+            ?: serviceFlutterEngine?.plugin<ServicePlugin>()
 
     val tilePlugin: TilePlugin?
-        get() = flutterEngine?.plugin<TilePlugin>()
+        get() = flutterEngine?.plugin<TilePlugin>() ?: serviceFlutterEngine?.plugin<TilePlugin>()
 
     suspend fun handleToggleAction() {
         var action: (suspend () -> Unit)?
@@ -48,54 +52,25 @@ object State {
         action?.invoke()
     }
 
-    suspend fun handleSyncState() {
-        runLock.withLock {
-            try {
-                Service.bind()
-                runTime = Service.getRunTime()
-                val runState = when (runTime == 0L) {
-                    true -> RunState.STOP
-                    false -> RunState.START
-                }
-                runStateFlow.tryEmit(runState)
-            } catch (_: Exception) {
-                runStateFlow.tryEmit(RunState.STOP)
-            }
-        }
-    }
-
     suspend fun handleStartServiceAction() {
-        runLock.withLock {
-            if (runStateFlow.value != RunState.STOP) {
-                return
-            }
-            tilePlugin?.handleStart()
-            if (flutterEngine != null) {
-                return
-            }
-            startServiceWithPref()
+        tilePlugin?.handleStart()
+        if (flutterEngine != null) {
+            return
         }
-
+        startServiceWithEngine()
     }
 
-    suspend fun handleStopServiceAction() {
-        runLock.withLock {
-            if (runStateFlow.value != RunState.START) {
-                return
-            }
-            tilePlugin?.handleStop()
-            if (flutterEngine != null) {
-                return
-            }
-            GlobalState.application.showToast(sharedState.stopTip)
-            handleStopService()
+    fun handleStopServiceAction() {
+        tilePlugin?.handleStop()
+        if (flutterEngine != null || serviceFlutterEngine != null) {
+            return
         }
+        handleStopService()
     }
 
     fun handleStartService() {
-        val appPlugin = flutterEngine?.plugin<AppPlugin>()
         if (appPlugin != null) {
-            appPlugin.requestNotificationsPermission {
+            appPlugin?.requestNotificationsPermission {
                 startService()
             }
             return
@@ -103,100 +78,68 @@ object State {
         startService()
     }
 
-    private fun startServiceWithPref() {
-        GlobalState.launch {
-            runLock.withLock {
-                if (runStateFlow.value != RunState.STOP) {
-                    return@launch
+    suspend fun destroyServiceEngine() {
+        runLock.withLock {
+            withContext(Dispatchers.Main) {
+                runCatching {
+                    serviceFlutterEngine?.destroy()
+                    serviceFlutterEngine = null
                 }
-                sharedState = GlobalState.application.sharedState
-                setupAndStart()
             }
         }
     }
 
-    suspend fun syncState() {
-        GlobalState.setCrashlytics(sharedState.crashlytics)
-        Service.updateNotificationParams(
-            NotificationParams(
-                title = sharedState.currentProfileName,
-                stopText = sharedState.stopText,
-                onlyStatisticsProxy = sharedState.onlyStatisticsProxy
-            )
-        )
-        Service.setCrashlytics(sharedState.crashlytics)
-    }
-
-    private suspend fun setupAndStart() {
-        Service.bind()
-        syncState()
-        GlobalState.application.showToast(sharedState.startTip)
-        val initParams = mutableMapOf<String, Any>()
-        initParams["home-dir"] = GlobalState.application.filesDir.path
-        initParams["version"] = android.os.Build.VERSION.SDK_INT
-        val initParamsString = Gson().toJson(initParams)
-        val setupParamsString = Gson().toJson(sharedState.setupParams)
-        Service.quickSetup(
-            initParamsString,
-            setupParamsString,
-            onStarted = {
-                startService()
-            },
-            onResult = {
-                if (it.isNotEmpty()) {
-                    GlobalState.application.showToast(it)
-                }
-            },
-        )
+    suspend fun startServiceWithEngine() {
+        runLock.withLock {
+            withContext(Dispatchers.Main) {
+                serviceFlutterEngine = FlutterEngine(GlobalState.application)
+                serviceFlutterEngine?.plugins?.add(ServicePlugin())
+                serviceFlutterEngine?.plugins?.add(AppPlugin())
+                serviceFlutterEngine?.plugins?.add(TilePlugin())
+                val dartEntrypoint = DartExecutor.DartEntrypoint(
+                    FlutterInjector.instance().flutterLoader().findAppBundlePath(), "_service"
+                )
+                serviceFlutterEngine?.dartExecutor?.executeDartEntrypoint(dartEntrypoint)
+            }
+        }
     }
 
     private fun startService() {
         GlobalState.launch {
             runLock.withLock {
-                if (runStateFlow.value != RunState.STOP) {
+                if (runStateFlow.value == RunState.PENDING || runStateFlow.value == RunState.START) {
                     return@launch
                 }
-                try {
-                    runStateFlow.tryEmit(RunState.PENDING)
-                    val options = sharedState.vpnOptions ?: return@launch
-                    appPlugin?.let {
-                        it.prepare(options.enable) {
-                            runTime = Service.startService(options, runTime)
-                            runStateFlow.tryEmit(RunState.START)
-                        }
-                    } ?: run {
-                        val intent = VpnService.prepare(GlobalState.application)
-                        if (intent != null) {
-                            return@launch
-                        }
-                        runTime = Service.startService(options, runTime)
-                        runStateFlow.tryEmit(RunState.START)
-                    }
-                } finally {
-                    if (runStateFlow.value == RunState.PENDING) {
-                        runStateFlow.tryEmit(RunState.STOP)
-                    }
+                runStateFlow.tryEmit(RunState.PENDING)
+                if (servicePlugin == null) {
+                    return@launch
+                }
+                val options = servicePlugin?.handleGetVpnOptions()
+                if (options == null) {
+                    return@launch
+                }
+                appPlugin?.prepare(options.enable) {
+                    Service.startService(options)
+                    runTime = System.currentTimeMillis()
+                    runStateFlow.tryEmit(RunState.START)
                 }
             }
         }
+
     }
 
     fun handleStopService() {
         GlobalState.launch {
             runLock.withLock {
-                if (runStateFlow.value != RunState.START) {
+                if (runStateFlow.value == RunState.PENDING || runStateFlow.value == RunState.STOP) {
                     return@launch
                 }
-                try {
-                    runStateFlow.tryEmit(RunState.PENDING)
-                    runTime = Service.stopService()
-                    runStateFlow.tryEmit(RunState.STOP)
-                } finally {
-                    if (runStateFlow.value == RunState.PENDING) {
-                        runStateFlow.tryEmit(RunState.START)
-                    }
-                }
+                runStateFlow.tryEmit(RunState.PENDING)
+                Service.stopService()
+                runStateFlow.tryEmit(RunState.STOP)
+                runTime = 0
             }
+            destroyServiceEngine()
         }
     }
 }

android/app/src/main/kotlin/com/follow/clash/TempActivity.kt

@@ -21,9 +21,7 @@ class TempActivity : Activity(),
             }
 
             QuickAction.STOP.action -> {
-                launch {
-                    State.handleStopServiceAction()
-                }
+                State.handleStopServiceAction()
             }
 
             QuickAction.TOGGLE.action -> {

android/app/src/main/kotlin/com/follow/clash/TileService.kt

@@ -31,7 +31,6 @@ class TileService : TileService() {
         scope?.cancel()
         scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
         scope?.launch {
-            State.handleSyncState()
             State.runStateFlow.collect {
                 updateTile(it)
             }
@@ -45,7 +44,8 @@ class TileService : TileService() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             startActivityAndCollapse(pendingIntent)
         } else {
-            @Suppress("DEPRECATION") startActivityAndCollapse(intent)
+            @Suppress("DEPRECATION")
+            startActivityAndCollapse(intent)
         }
     }
 

android/app/src/main/kotlin/com/follow/clash/models/State.kt

@@ -1,22 +1,9 @@
 package com.follow.clash.models
 
-import com.follow.clash.service.models.VpnOptions
-import com.google.gson.annotations.SerializedName
 
-data class SharedState(
-    val startTip: String = "Starting VPN...",
-    val stopTip: String = "Stopping VPN...",
+data class AppState(
     val crashlytics: Boolean = true,
     val currentProfileName: String = "FlClash",
     val stopText: String = "Stop",
     val onlyStatisticsProxy: Boolean = false,
-    val vpnOptions: VpnOptions? = null,
-    val setupParams: SetupParams? = null,
-)
-
-data class SetupParams(
-    @SerializedName("test-url")
-    val testUrl: String,
-    @SerializedName("selected-map")
-    val selectedMap: Map<String, String>,
 )

android/app/src/main/kotlin/com/follow/clash/plugins/AppPlugin.kt

@@ -9,6 +9,7 @@ import android.content.pm.ComponentInfo
 import android.content.pm.PackageManager
 import android.net.VpnService
 import android.os.Build
+import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.getSystemService
@@ -23,7 +24,6 @@ import com.follow.clash.common.QuickAction
 import com.follow.clash.common.quickIntent
 import com.follow.clash.getPackageIconPath
 import com.follow.clash.models.Package
-import com.follow.clash.showToast
 import com.google.gson.Gson
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.plugins.FlutterPlugin
@@ -193,7 +193,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     }
 
     private fun tip(message: String?) {
-        GlobalState.application.showToast(message)
+        Toast.makeText(GlobalState.application, message, Toast.LENGTH_LONG).show()
     }
 
     @Suppress("DEPRECATION")

android/app/src/main/kotlin/com/follow/clash/plugins/ServicePlugin.kt

@@ -3,9 +3,13 @@ package com.follow.clash.plugins
 import com.follow.clash.RunState
 import com.follow.clash.Service
 import com.follow.clash.State
+import com.follow.clash.awaitResult
 import com.follow.clash.common.Components
+import com.follow.clash.common.GlobalState
 import com.follow.clash.invokeMethodOnMainThread
-import com.follow.clash.models.SharedState
+import com.follow.clash.models.AppState
+import com.follow.clash.service.models.NotificationParams
+import com.follow.clash.service.models.VpnOptions
 import com.google.gson.Gson
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.MethodCall
@@ -90,6 +94,11 @@ class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
         result.success(true)
     }
 
+    suspend fun handleGetVpnOptions(): VpnOptions? {
+        val res = flutterMethodChannel.awaitResult<String>("getVpnOptions", null)
+        return Gson().fromJson(res, VpnOptions::class.java)
+    }
+
     val semaphore = Semaphore(10)
 
     fun handleSendEvent(value: String?) {
@@ -107,14 +116,21 @@ class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
 
     private fun handleSyncState(call: MethodCall, result: MethodChannel.Result) {
         val data = call.arguments<String>()!!
-        State.sharedState = Gson().fromJson(data, SharedState::class.java)
+        val params = Gson().fromJson(data, AppState::class.java)
+        GlobalState.setCrashlytics(params.crashlytics)
         launch {
-            State.syncState()
+            Service.updateNotificationParams(
+                NotificationParams(
+                    title = params.currentProfileName,
+                    stopText = params.stopText,
+                    onlyStatisticsProxy = params.onlyStatisticsProxy
+                )
+            )
+            Service.setCrashlytics(params.crashlytics)
             result.success("")
         }
     }
 
-
     fun handleInit(result: MethodChannel.Result) {
         Service.bind()
         launch {
@@ -131,9 +147,6 @@ class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
     }
 
     private fun handleGetRunTime(result: MethodChannel.Result) {
-        launch {
-            State.handleSyncState()
-            result.success(State.runTime)
-        }
+        return result.success(State.runTime)
     }
 }

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,25 +1,25 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportWidth="240"
-        android:viewportHeight="240">
-    <group android:scaleX="0.924"
-           android:scaleY="0.924"
-           android:translateX="9.12"
-           android:translateY="9.12">
-        <group android:scaleX="0.63461536"
-               android:scaleY="0.63461536"
-               android:translateX="45.96154"
-               android:translateY="43.846153">
-            <path
-                    android:pathData="M60.65,89.6L154.18,35.6A18,18 107.59,0 1,178.77 42.19L178.77,42.19A18,18 107.59,0 1,172.18 66.78L78.65,120.78A18,18 106.67,0 1,54.06 114.19L54.06,114.19A18,18 106.67,0 1,60.65 89.6z"
-                    android:fillColor="#6666FB"/>
-            <path
-                    android:pathData="M84.65,131.17L131.42,104.17A18,18 107.83,0 1,156 110.76L156,110.76A18,18 107.83,0 1,149.42 135.35L102.65,162.35A18,18 106.67,0 1,78.06 155.76L78.06,155.76A18,18 106.67,0 1,84.65 131.17z"
-                    android:fillColor="#336AB6"/>
-            <path
-                    android:pathData="M108.65,172.74L108.65,172.74A18,18 116.03,0 1,133.24 179.33L133.24,179.33A18,18 116.03,0 1,126.65 203.92L126.65,203.92A18,18 116.03,0 1,102.06 197.33L102.06,197.33A18,18 116.03,0 1,108.65 172.74z"
-                    android:fillColor="#5CA8E9"/>
-        </group>
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="240"
+    android:viewportHeight="240">
+  <group android:scaleX="0.924"
+      android:scaleY="0.924"
+      android:translateX="9.12"
+      android:translateY="9.12">
+    <group android:scaleX="0.63461536"
+        android:scaleY="0.63461536"
+        android:translateX="45.96154"
+        android:translateY="43.846153">
+      <path
+          android:pathData="M60.65,89.6L154.18,35.6A18,18 107.59,0 1,178.77 42.19L178.77,42.19A18,18 107.59,0 1,172.18 66.78L78.65,120.78A18,18 106.67,0 1,54.06 114.19L54.06,114.19A18,18 106.67,0 1,60.65 89.6z"
+          android:fillColor="#6666FB"/>
+      <path
+          android:pathData="M84.65,131.17L131.42,104.17A18,18 107.83,0 1,156 110.76L156,110.76A18,18 107.83,0 1,149.42 135.35L102.65,162.35A18,18 106.67,0 1,78.06 155.76L78.06,155.76A18,18 106.67,0 1,84.65 131.17z"
+          android:fillColor="#336AB6"/>
+      <path
+          android:pathData="M108.65,172.74L108.65,172.74A18,18 116.03,0 1,133.24 179.33L133.24,179.33A18,18 116.03,0 1,126.65 203.92L126.65,203.92A18,18 116.03,0 1,102.06 197.33L102.06,197.33A18,18 116.03,0 1,108.65 172.74z"
+          android:fillColor="#5CA8E9"/>
     </group>
+  </group>
 </vector>

android/build.gradle.kts

@@ -1,10 +1,19 @@
+buildscript {
+    dependencies {
+        classpath(libs.build.kotlin)
+    }
+}
+
+plugins {
+    id("com.android.library") apply false
+}
+
 allprojects {
     repositories {
         google()
         mavenCentral()
     }
 }
-
 val newBuildDir: Directory =
     rootProject.layout.buildDirectory
         .dir("../../build")
@@ -22,3 +31,4 @@ subprojects {
 tasks.register<Delete>("clean") {
     delete(rootProject.layout.buildDirectory)
 }
+

android/common/src/main/java/com/follow/clash/common/Ext.kt

@@ -220,6 +220,7 @@ val Long.formatBytes: String
 fun String.chunkedForAidl(charset: Charset = Charsets.UTF_8): List<ByteArray> {
     val allBytes = toByteArray(charset)
     val total = allBytes.size
+
     val maxBytes = when {
         total <= 100 * 1024 -> total
         total <= 1024 * 1024 -> 64 * 1024

android/common/src/main/java/com/follow/clash/common/Service.kt

@@ -11,7 +11,6 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -60,9 +59,7 @@ class ServiceDelegate<T>(
             withTimeout(timeoutMillis) {
                 val state = serviceState.filterNotNull().first()
                 state.first?.let {
-                    withContext(Dispatchers.Default) {
-                        block(it)
-                    }
+                    block(it)
                 } ?: throw Exception(state.second)
             }
         }

android/core/src/main/cpp/CMakeLists.txt

@@ -8,9 +8,25 @@ message("CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}")
 
 
 if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-    set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
-    add_compile_options(-O3 -flto -g0 -fno-exceptions -fno-rtti)
-    add_link_options(-flto -Wl,--gc-sections,--strip-all)
+    #    set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
+    add_compile_options(-O3)
+
+    add_compile_options(-flto)
+
+    add_compile_options(-g0)
+
+    add_compile_options(-ffunction-sections -fdata-sections)
+
+    add_compile_options(-fno-exceptions -fno-rtti)
+
+    add_link_options(
+            -flto
+            -Wl,--gc-sections
+            -Wl,--strip-all
+            -Wl,--exclude-libs=ALL
+    )
+
+    add_compile_options(-fvisibility=hidden -fvisibility-inlines-hidden)
 endif ()
 
 set(LIB_CLASH_PATH "${CMAKE_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libclash.so")

android/core/src/main/cpp/core.cpp

@@ -70,14 +70,6 @@ Java_com_follow_clash_core_Core_suspended(JNIEnv *env, jobject thiz, jboolean su
     suspend(suspended);
 }
 
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_follow_clash_core_Core_quickSetup(JNIEnv *env, jobject thiz, jstring init_params_string,
-                                           jstring setup_params_string, jobject cb) {
-    const auto interface = new_global(cb);
-    quickSetup(interface, get_string(init_params_string), get_string(setup_params_string));
-}
-
 
 static jmethodID m_tun_interface_protect;
 static jmethodID m_tun_interface_resolve_process;
@@ -107,12 +99,12 @@ call_tun_interface_resolve_process_impl(void *tun_interface, const int protocol,
                                         const int uid) {
     ATTACH_JNI();
     const auto packageName = reinterpret_cast<jstring>(env->CallObjectMethod(
-            static_cast<jobject>(tun_interface),
-            m_tun_interface_resolve_process,
-            protocol,
-            new_string(source),
-            new_string(target),
-            uid));
+        static_cast<jobject>(tun_interface),
+        m_tun_interface_resolve_process,
+        protocol,
+        new_string(source),
+        new_string(target),
+        uid));
     return get_string(packageName);
 }
 
@@ -199,10 +191,4 @@ extern "C"
 JNIEXPORT void JNICALL
 Java_com_follow_clash_core_Core_suspended(JNIEnv *env, jobject thiz, jboolean suspended) {
 }
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_follow_clash_core_Core_quickSetup(JNIEnv *env, jobject thiz, jstring init_params_string,
-                                           jstring setup_params_string, jobject cb) {
-}
-#endif
+#endif

android/core/src/main/java/com/follow/clash/core/Core.kt

@@ -102,28 +102,6 @@ data object Core {
         }
     }
 
-    fun quickSetup(
-        initParamsString: String,
-        setupParamsString: String,
-        cb: (result: String?) -> Unit,
-    ) {
-        quickSetup(
-            initParamsString,
-            setupParamsString,
-            object : InvokeInterface {
-                override fun onResult(result: String?) {
-                    cb(result)
-                }
-            },
-        )
-    }
-
-    private external fun quickSetup(
-        initParamsString: String,
-        setupParamsString: String,
-        cb: InvokeInterface
-    )
-
     external fun stopTun()
 
     external fun getTraffic(onlyStatisticsProxy: Boolean): String

android/service/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
             android:process=":remote">
             <property
                 android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="proxy" />
+                android:value="service" />
         </service>
 
         <service

android/service/src/main/aidl/com/follow/clash/service/IAckInterface.aidl

@@ -1,8 +0,0 @@
-// IAckInterface.aidl
-package com.follow.clash.service;
-
-import com.follow.clash.service.IAckInterface;
-
-interface IAckInterface {
-   oneway void onAck();
-}

android/service/src/main/aidl/com/follow/clash/service/ICallbackInterface.aidl

@@ -1,8 +1,6 @@
 // ICallbackInterface.aidl
 package com.follow.clash.service;
 
-import com.follow.clash.service.IAckInterface;
-
 interface ICallbackInterface {
-    oneway void onResult(in byte[] data,in boolean isSuccess, in IAckInterface ack);
+    oneway void onResult(in byte[] data,in boolean isSuccess);
 }

android/service/src/main/aidl/com/follow/clash/service/IEventInterface.aidl

@@ -1,8 +1,6 @@
 // IEventInterface.aidl
 package com.follow.clash.service;
 
-import com.follow.clash.service.IAckInterface;
-
 interface IEventInterface {
-    oneway void onEvent(in String id, in byte[] data,in boolean isSuccess, in IAckInterface ack);
+    oneway void onEvent(in String id, in byte[] data,in boolean isSuccess);
 }

android/service/src/main/aidl/com/follow/clash/service/IRemoteInterface.aidl

@@ -4,17 +4,14 @@ package com.follow.clash.service;
 import com.follow.clash.service.ICallbackInterface;
 import com.follow.clash.service.IEventInterface;
 import com.follow.clash.service.IResultInterface;
-import com.follow.clash.service.IVoidInterface;
 import com.follow.clash.service.models.VpnOptions;
 import com.follow.clash.service.models.NotificationParams;
 
 interface IRemoteInterface {
-    void invokeAction(in String data, in ICallbackInterface callback);
-    void quickSetup(in String initParamsString, in String setupParamsString, in ICallbackInterface callback, in IVoidInterface onStarted);
-    void updateNotificationParams(in NotificationParams params);
-    void startService(in VpnOptions options, in long runTime, in IResultInterface result);
-    void stopService(in IResultInterface result);
-    void setEventListener(in IEventInterface event);
-    void setCrashlytics(in boolean enable);
-    long getRunTime();
+    oneway void invokeAction(in String data, in ICallbackInterface callback);
+    oneway void updateNotificationParams(in NotificationParams params);
+    oneway void startService(in VpnOptions options, in IResultInterface result);
+    oneway void stopService(in IResultInterface result);
+    oneway void setEventListener(in IEventInterface event);
+    oneway void setCrashlytics(in boolean enable);
 }

android/service/src/main/aidl/com/follow/clash/service/IResultInterface.aidl

@@ -2,5 +2,5 @@
 package com.follow.clash.service;
 
 interface IResultInterface {
-    oneway void onResult(in long runTime);
+    oneway void onResult();
 }

android/service/src/main/aidl/com/follow/clash/service/IVoidInterface.aidl

@@ -1,6 +0,0 @@
-// IVoidInterface.aidl
-package com.follow.clash.service;
-
-interface IVoidInterface {
-    oneway void invoke();
-}

android/service/src/main/java/com/follow/clash/service/CommonService.kt

@@ -50,11 +50,7 @@ class CommonService : Service(), IBaseService,
     }
 
     override fun start() {
-        try {
-            loader.load()
-        } catch (_: Exception) {
-            stop()
-        }
+        loader.load()
     }
 
     override fun stop() {

android/service/src/main/java/com/follow/clash/service/RemoteService.kt

@@ -8,22 +8,23 @@ import com.follow.clash.common.ServiceDelegate
 import com.follow.clash.common.chunkedForAidl
 import com.follow.clash.common.intent
 import com.follow.clash.core.Core
-import com.follow.clash.service.State.delegate
-import com.follow.clash.service.State.intent
-import com.follow.clash.service.State.runLock
 import com.follow.clash.service.models.NotificationParams
 import com.follow.clash.service.models.VpnOptions
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import java.util.UUID
-import kotlin.coroutines.resume
 
 class RemoteService : Service(),
     CoroutineScope by CoroutineScope(SupervisorJob() + Dispatchers.Default) {
+    private var delegate: ServiceDelegate<IBaseService>? = null
+    private var intent: Intent? = null
+
+    val runLock = Mutex()
+
     private fun handleStopService(result: IResultInterface) {
         launch {
             runLock.withLock {
@@ -31,8 +32,7 @@ class RemoteService : Service(),
                     service.stop()
                     delegate?.unbind()
                 }
-                State.runTime = 0
-                result.onResult(0)
+                result.onResult()
             }
         }
     }
@@ -43,7 +43,7 @@ class RemoteService : Service(),
         delegate = null
     }
 
-    private fun handleStartService(runTime: Long, result: IResultInterface) {
+    private fun handleStartService(result: IResultInterface) {
         launch {
             runLock.withLock {
                 val nextIntent = when (State.options?.enable == true) {
@@ -65,11 +65,7 @@ class RemoteService : Service(),
                 delegate?.useService { service ->
                     service.start()
                 }
-                State.runTime = when (runTime != 0L) {
-                    true -> runTime
-                    false -> System.currentTimeMillis()
-                }
-                result.onResult(State.runTime)
+                result.onResult()
             }
         }
     }
@@ -77,69 +73,26 @@ class RemoteService : Service(),
     private val binder = object : IRemoteInterface.Stub() {
         override fun invokeAction(data: String, callback: ICallbackInterface) {
             Core.invokeAction(data) {
-                launch {
-                    runCatching {
-                        val chunks = it?.chunkedForAidl() ?: listOf()
-                        for ((index, chunk) in chunks.withIndex()) {
-                            suspendCancellableCoroutine { cont ->
-                                callback.onResult(
-                                    chunk,
-                                    index == chunks.lastIndex,
-                                    object : IAckInterface.Stub() {
-                                        override fun onAck() {
-                                            cont.resume(Unit)
-                                        }
-                                    },
-                                )
-                            }
-                        }
+                runCatching {
+                    val chunks = it?.chunkedForAidl() ?: listOf()
+                    val totalSize = chunks.size
+                    chunks.forEachIndexed { index, chunk ->
+                        callback.onResult(chunk, totalSize - 1 == index)
                     }
                 }
             }
         }
 
-        override fun quickSetup(
-            initParamsString: String,
-            setupParamsString: String,
-            callback: ICallbackInterface,
-            onStarted: IVoidInterface
-        ) {
-            Core.quickSetup(initParamsString, setupParamsString) {
-                launch {
-                    runCatching {
-                        val chunks = it?.chunkedForAidl() ?: listOf()
-                        for ((index, chunk) in chunks.withIndex()) {
-                            suspendCancellableCoroutine { cont ->
-                                callback.onResult(
-                                    chunk,
-                                    index == chunks.lastIndex,
-                                    object : IAckInterface.Stub() {
-                                        override fun onAck() {
-                                            cont.resume(Unit)
-                                        }
-                                    },
-                                )
-                            }
-                        }
-                    }
-                }
-            }
-            onStarted()
-        }
-
         override fun updateNotificationParams(params: NotificationParams?) {
             State.notificationParamsFlow.tryEmit(params)
         }
 
-
         override fun startService(
             options: VpnOptions,
-            runtime: Long,
             result: IResultInterface,
         ) {
-            GlobalState.log("remote startService")
             State.options = options
-            handleStartService(runtime, result)
+            handleStartService(result)
         }
 
         override fun stopService(result: IResultInterface) {
@@ -147,27 +100,15 @@ class RemoteService : Service(),
         }
 
         override fun setEventListener(eventListener: IEventInterface?) {
-            GlobalState.log("RemoveEventListener ${eventListener == null}")
+            GlobalState.log("isRemoveEventListener is ${eventListener == null}")
             when (eventListener != null) {
                 true -> Core.callSetEventListener {
-                    launch {
-                        runCatching {
-                            val id = UUID.randomUUID().toString()
-                            val chunks = it?.chunkedForAidl() ?: listOf()
-                            for ((index, chunk) in chunks.withIndex()) {
-                                suspendCancellableCoroutine { cont ->
-                                    eventListener.onEvent(
-                                        id,
-                                        chunk,
-                                        index == chunks.lastIndex,
-                                        object : IAckInterface.Stub() {
-                                            override fun onAck() {
-                                                cont.resume(Unit)
-                                            }
-                                        },
-                                    )
-                                }
-                            }
+                    runCatching {
+                        val id = UUID.randomUUID().toString()
+                        val chunks = it?.chunkedForAidl() ?: listOf()
+                        val totalSize = chunks.size
+                        chunks.forEachIndexed { index, chunk ->
+                            eventListener.onEvent(id, chunk, totalSize - 1 == index)
                         }
                     }
                 }
@@ -179,18 +120,9 @@ class RemoteService : Service(),
         override fun setCrashlytics(enable: Boolean) {
             GlobalState.setCrashlytics(enable)
         }
-
-        override fun getRunTime(): Long {
-            return State.runTime
-        }
     }
 
     override fun onBind(intent: Intent?): IBinder {
         return binder
     }
-
-    override fun onDestroy() {
-        GlobalState.log("Remote service destroy")
-        super.onDestroy()
-    }
 }

android/service/src/main/java/com/follow/clash/service/State.kt

@@ -1,22 +1,12 @@
 package com.follow.clash.service
 
-import android.content.Intent
-import com.follow.clash.common.ServiceDelegate
 import com.follow.clash.service.models.NotificationParams
 import com.follow.clash.service.models.VpnOptions
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.sync.Mutex
 
 object State {
     var options: VpnOptions? = null
     var notificationParamsFlow: MutableStateFlow<NotificationParams?> = MutableStateFlow(
         NotificationParams()
     )
-
-    val runLock = Mutex()
-    var runTime: Long = 0L
-
-    var delegate: ServiceDelegate<IBaseService>? = null
-
-    var intent: Intent? = null
 }

android/service/src/main/java/com/follow/clash/service/VpnService.kt

@@ -187,7 +187,7 @@ class VpnService : SystemVpnService(), IBaseService,
                 addDnsServer(DNS6)
             }
             setMtu(9000)
-            options.accessControlProps.let { accessControl ->
+            options.accessControl.let { accessControl ->
                 if (accessControl.enable) {
                     when (accessControl.mode) {
                         AccessControlMode.ACCEPT_SELECTED -> {
@@ -213,7 +213,6 @@ class VpnService : SystemVpnService(), IBaseService,
                 allowBypass()
             }
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && options.systemProxy) {
-                GlobalState.log("Open http proxy")
                 setHttpProxy(
                     ProxyInfo.buildDirectProxy(
                         "127.0.0.1", options.port, options.bypassDomain
@@ -234,13 +233,9 @@ class VpnService : SystemVpnService(), IBaseService,
     }
 
     override fun start() {
-        try {
-            loader.load()
-            State.options?.let {
-                handleStart(it)
-            }
-        } catch (_: Exception) {
-            stop()
+        loader.load()
+        State.options?.let {
+            handleStart(it)
         }
     }
 

android/service/src/main/java/com/follow/clash/service/models/Traffic.kt

@@ -1,6 +1,5 @@
 package com.follow.clash.service.models
 
-import com.follow.clash.common.GlobalState
 import com.follow.clash.common.formatBytes
 import com.follow.clash.core.Core
 import com.google.gson.Gson
@@ -18,8 +17,7 @@ fun Core.getSpeedTrafficText(onlyStatisticsProxy: Boolean): String {
         val res = getTraffic(onlyStatisticsProxy)
         val traffic = Gson().fromJson(res, Traffic::class.java)
         return traffic.speedText
-    } catch (e: Exception) {
-        GlobalState.log(e.message + "")
+    } catch (_: Exception) {
         return ""
     }
 }

android/service/src/main/java/com/follow/clash/service/models/VpnOptions.kt

@@ -6,7 +6,7 @@ import kotlinx.parcelize.Parcelize
 import java.net.InetAddress
 
 @Parcelize
-data class AccessControlProps(
+data class AccessControl(
     val enable: Boolean,
     val mode: AccessControlMode,
     val acceptList: List<String>,
@@ -19,7 +19,7 @@ data class VpnOptions(
     val port: Int,
     val ipv6: Boolean,
     val dnsHijacking: Boolean,
-    val accessControlProps: AccessControlProps,
+    val accessControl: AccessControl,
     val allowBypass: Boolean,
     val systemProxy: Boolean,
     val bypassDomain: List<String>,

android/service/src/main/java/com/follow/clash/service/modules/NotificationModule.kt

@@ -47,6 +47,9 @@ class NotificationModule(private val service: Service) : Module() {
     private val scope = CoroutineScope(Dispatchers.Default)
 
     override fun onInstall() {
+        State.notificationParamsFlow.value?.let {
+            update(it.extended)
+        }
         scope.launch {
             val screenFlow = service.receiveBroadcastFlow {
                 addAction(Intent.ACTION_SCREEN_ON)
@@ -66,12 +69,6 @@ class NotificationModule(private val service: Service) : Module() {
                 .collect { (params, _) ->
                     update(params!!)
                 }
-
-            State.notificationParamsFlow.value?.let {
-                update(it.extended)
-            } ?: run {
-                update(NotificationParams().extended)
-            }
         }
     }
 

android/settings.gradle.kts

@@ -1,12 +1,11 @@
 pluginManagement {
-    val flutterSdkPath =
-        run {
-            val properties = java.util.Properties()
-            file("local.properties").inputStream().use { properties.load(it) }
-            val flutterSdkPath = properties.getProperty("flutter.sdk")
-            require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
-            flutterSdkPath
-        }
+    val flutterSdkPath = run {
+        val properties = java.util.Properties()
+        file("local.properties").inputStream().use { properties.load(it) }
+        val flutterSdkPath = properties.getProperty("flutter.sdk")
+        require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+        flutterSdkPath
+    }
 
     includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 

arb/intl_en.arb

@@ -129,8 +129,14 @@
   "compatibleDesc": "Opening it will lose part of its application ability and gain the support of full amount of Clash.",
   "notSelectedTip": "The current proxy group cannot be selected.",
   "tip": "tip",
+  "backupAndRecovery": "Backup and Recovery",
+  "backupAndRecoveryDesc": "Sync data via WebDAV or file",
   "account": "Account",
   "backup": "Backup",
+  "recovery": "Recovery",
+  "recoveryProfiles": "Only recovery profiles",
+  "recoveryAll": "Recovery all data",
+  "recoverySuccess": "Recovery success",
   "backupSuccess": "Backup success",
   "noInfo": "No info",
   "pleaseBindWebDAV": "Please bind WebDAV",
@@ -213,7 +219,9 @@
   "local": "Local",
   "remote": "Remote",
   "remoteBackupDesc": "Backup local data to WebDAV",
+  "remoteRecoveryDesc": "Recovery data from WebDAV",
   "localBackupDesc": "Backup local data to local",
+  "localRecoveryDesc": "Recovery data from file",
   "mode": "Mode",
   "time": "Time",
   "source": "Source",
@@ -332,8 +340,6 @@
   "none": "none",
   "basicConfig": "Basic configuration",
   "basicConfigDesc": "Modify the basic configuration globally",
-  "advancedConfig": "Advanced configuration",
-  "advancedConfigDesc": "Provide diverse configuration options",
   "selectedCountTitle": "{count} items have been selected",
   "addRule": "Add rule",
   "ruleName": "Rule name",
@@ -373,9 +379,9 @@
   "systemApp": "System APP",
   "noNetworkApp": "No network APP",
   "contactMe": "Contact me",
-  "restoreStrategy": "Restore strategy",
-  "restoreStrategy_override": "Override",
-  "restoreStrategy_compatible": "Compatible",
+  "recoveryStrategy": "Recovery strategy",
+  "recoveryStrategy_override": "Override",
+  "recoveryStrategy_compatible": "Compatible",
   "logsTest": "Logs test",
   "emptyTip": "{label} cannot be empty",
   "urlTip": "{label} must be a url",
@@ -384,7 +390,7 @@
   "existsTip": "Current {label} already exists",
   "deleteTip": "Are you sure you want to delete the current {label}?",
   "deleteMultipTip": "Are you sure you want to delete the selected {label}?",
-  "nullTip": "No {label} yet",
+  "nullTip": "No {label} at the moment",
   "script": "Script",
   "color": "Color",
   "rename": "Rename",
@@ -426,55 +432,5 @@
   "dataCollectionTip": "Data Collection Notice",
   "dataCollectionContent": "This app uses Firebase Crashlytics to collect crash information to improve app stability.\nThe collected data includes device information and crash details, but does not contain personal sensitive data.\nYou can disable this feature in settings.",
   "crashlytics": "Crash Analysis",
-  "crashlyticsTip": "When enabled, automatically uploads crash logs without sensitive information when the app crashes",
-  "appendSystemDns": "Append System DNS",
-  "appendSystemDnsTip": "Forcefully append system DNS to the configuration",
-  "editRule": "Edit rule",
-  "overrideMode": "Override mode",
-  "standardModeDesc": "Standard mode, override basic configuration, provide simple rule addition capability",
-  "scriptModeDesc": "Script mode, use external extension scripts, provide one-click override configuration capability",
-  "addedRules": "Added rules",
-  "controlGlobalAddedRules": "Control global added rules",
-  "overrideScript": "Override script",
-  "goToConfigureScript": "Go to configure script",
-  "editGlobalRules": "Edit global rules",
-  "externalFetch": "External fetch",
-  "confirmForceCrashCore": "Are you sure you want to force crash the core?",
-  "confirmClearAllData": "Are you sure you want to clear all data?",
-  "loading": "Loading...",
-  "loadTest": "Load test",
-  "yearsAgo": "{count, plural, =1{1 year ago} other{{count} years ago}}",
-  "monthsAgo": "{count, plural, =1{1 month ago} other{{count} months ago}}",
-  "daysAgo": "{count, plural, =1{1 day ago} other{{count} days ago}}",
-  "hoursAgo": "{count, plural, =1{1 hour ago} other{{count} hours ago}}",
-  "minutesAgo": "{count, plural, =1{1 minute ago} other{{count} minutes ago}}",
-  "justNow": "Just now",
-  "noLongerRemind": "Don't remind again",
-  "accessControlSettings": "Access Control Settings",
-  "turnOn": "Turn On",
-  "turnOff": "Turn Off",
-  "coreConfigChangeDetected": "Core configuration change detected",
-  "reload": "Reload",
-  "vpnConfigChangeDetected": "VPN configuration change detected",
-  "restart": "Restart",
-  "speedStatistics": "Speed statistics",
-  "resetPageChangesTip": "The current page has changes. Are you sure you want to reset?",
-  "overwriteTypeCustom": "Custom",
-  "overwriteTypeCustomDesc": "Custom mode, fully customize proxy groups and rules",
-  "unknownNetworkError": "Unknown network error",
-  "networkRequestException": "Network request exception, please try again later.",
-  "restoreException": "Recovery exception",
-  "networkException": "Network exception, please check your connection and try again",
-  "invalidBackupFile": "Invalid backup file",
-  "pruneCache": "Prune cache",
-  "backupAndRestore": "Backup and Restore",
-  "backupAndRestoreDesc": "Sync data via WebDAV or files",
-  "restore": "Restore",
-  "restoreSuccess": "Restore success",
-  "restoreFromWebDAVDesc": "Restore data via WebDAV",
-  "restoreFromFileDesc": "Restore data via file",
-  "restoreOnlyConfig": "Restore configuration files only",
-  "restoreAllData": "Restore all data",
-  "addProfile": "Add Profile",
-  "delayTest": "Delay Test"
+  "crashlyticsTip": "When enabled, automatically uploads crash logs without sensitive information when the app crashes"
 }

arb/intl_ja.arb

@@ -129,8 +129,14 @@
   "compatibleDesc": "有効化すると一部機能を失いますが、Clashの完全サポートを獲得",
   "notSelectedTip": "現在のプロキシグループは選択できません",
   "tip": "ヒント",
+  "backupAndRecovery": "バックアップと復元",
+  "backupAndRecoveryDesc": "WebDAVまたはファイルでデータを同期",
   "account": "アカウント",
   "backup": "バックアップ",
+  "recovery": "復元",
+  "recoveryProfiles": "プロファイルのみ復元",
+  "recoveryAll": "全データ復元",
+  "recoverySuccess": "復元成功",
   "backupSuccess": "バックアップ成功",
   "noInfo": "情報なし",
   "pleaseBindWebDAV": "WebDAVをバインドしてください",
@@ -213,7 +219,9 @@
   "local": "ローカル",
   "remote": "リモート",
   "remoteBackupDesc": "WebDAVにデータをバックアップ",
+  "remoteRecoveryDesc": "WebDAVからデータを復元",
   "localBackupDesc": "ローカルにデータをバックアップ",
+  "localRecoveryDesc": "ファイルからデータを復元",
   "mode": "モード",
   "time": "時間",
   "source": "ソース",
@@ -332,8 +340,6 @@
   "none": "なし",
   "basicConfig": "基本設定",
   "basicConfigDesc": "基本設定をグローバルに変更",
-  "advancedConfig": "高度な設定",
-  "advancedConfigDesc": "多様な設定を提供",
   "selectedCountTitle": "{count} 項目が選択されています",
   "addRule": "ルールを追加",
   "ruleName": "ルール名",
@@ -374,9 +380,9 @@
   "systemApp": "システムアプリ",
   "noNetworkApp": "ネットワークなしアプリ",
   "contactMe": "連絡する",
-  "restoreStrategy": "復元ストラテジー",
-  "restoreStrategy_override": "上書き",
-  "restoreStrategy_compatible": "互換",
+  "recoveryStrategy": "リカバリー戦略",
+  "recoveryStrategy_override": "オーバーライド",
+  "recoveryStrategy_compatible": "互換性",
   "logsTest": "ログテスト",
   "emptyTip": "{label}は空欄にできません",
   "urlTip": "{label}はURLである必要があります",
@@ -385,7 +391,7 @@
   "existsTip": "現在の{label}は既に存在しています",
   "deleteTip": "現在の{label}を削除してもよろしいですか？",
   "deleteMultipTip": "選択された{label}を削除してもよろしいですか？",
-  "nullTip": "まだ{label}はありません",
+  "nullTip": "現在{label}はありません",
   "script": "スクリプト",
   "color": "カラー",
   "rename": "リネーム",
@@ -427,55 +433,5 @@
   "dataCollectionTip": "データ収集説明",
   "dataCollectionContent": "本アプリはFirebase Crashlyticsを使用してクラッシュ情報を収集し、アプリの安定性を向上させます。\n収集されるデータにはデバイス情報とクラッシュ詳細が含まれますが、個人の機密データは含まれません。\n設定でこの機能を無効にすることができます。",
   "crashlytics": "クラッシュ分析",
-  "crashlyticsTip": "有効にすると、アプリがクラッシュした際に機密情報を含まないクラッシュログを自動的にアップロードします",
-  "appendSystemDns": "システムDNSを追加",
-  "appendSystemDnsTip": "設定にシステムDNSを強制的に追加します",
-  "editRule": "ルールを編集",
-  "overrideMode": "上書きモード",
-  "standardModeDesc": "標準モード、基本設定を上書きし、シンプルなルール追加機能を提供",
-  "scriptModeDesc": "スクリプトモード、外部拡張スクリプトを使用し、ワンクリックで設定を上書きする機能を提供",
-  "addedRules": "追加ルール",
-  "controlGlobalAddedRules": "グローバル追加ルールを制御",
-  "overrideScript": "上書きスクリプト",
-  "goToConfigureScript": "スクリプト設定に移動",
-  "editGlobalRules": "グローバルルールを編集",
-  "externalFetch": "外部取得",
-  "confirmForceCrashCore": "コアを強制的にクラッシュさせてもよろしいですか？",
-  "confirmClearAllData": "すべてのデータをクリアしてもよろしいですか？",
-  "loading": "読み込み中...",
-  "loadTest": "読み込みテスト",
-  "yearsAgo": "{count}年前",
-  "monthsAgo": "{count}ヶ月前",
-  "daysAgo": "{count}日前",
-  "hoursAgo": "{count}時間前",
-  "minutesAgo": "{count}分前",
-  "justNow": "たった今",
-  "noLongerRemind": "今後表示しない",
-  "accessControlSettings": "アクセス制御設定",
-  "turnOn": "オン",
-  "turnOff": "オフ",
-  "coreConfigChangeDetected": "コア設定の変更が検出されました",
-  "reload": "リロード",
-  "vpnConfigChangeDetected": "VPN設定の変更が検出されました",
-  "restart": "再起動",
-  "speedStatistics": "速度統計",
-  "resetPageChangesTip": "現在のページに変更があります。リセットしてもよろしいですか？",
-  "overwriteTypeCustom": "カスタム",
-  "overwriteTypeCustomDesc": "カスタムモード、プロキシグループとルールを完全にカスタマイズ可能",
-  "unknownNetworkError": "不明なネットワークエラー",
-  "networkRequestException": "ネットワーク要求例外、後でもう一度試してください。",
-  "restoreException": "復元例外",
-  "networkException": "ネットワーク例外、接続を確認してもう一度お試しください",
-  "invalidBackupFile": "無効なバックアップファイル",
-  "pruneCache": "キャッシュの削除",
-  "backupAndRestore": "バックアップと復元",
-  "backupAndRestoreDesc": "WebDAVまたはファイルを介してデータを同期する",
-  "restore": "復元",
-  "restoreSuccess": "復元に成功しました",
-  "restoreFromWebDAVDesc": "WebDAVを介してデータを復元する",
-  "restoreFromFileDesc": "ファイルを介してデータを復元する",
-  "restoreOnlyConfig": "設定ファイルのみを復元する",
-  "restoreAllData": "すべてのデータを復元する",
-  "addProfile": "プロファイルを追加",
-  "delayTest": "遅延テスト"
+  "crashlyticsTip": "有効にすると、アプリがクラッシュした際に機密情報を含まないクラッシュログを自動的にアップロードします"
 }

arb/intl_ru.arb

@@ -340,8 +340,6 @@
   "none": "Нет",
   "basicConfig": "Базовая конфигурация",
   "basicConfigDesc": "Глобальное изменение базовых настроек",
-  "advancedConfig": "Расширенная конфигурация",
-  "advancedConfigDesc": "Предоставляет разнообразные варианты конфигурации",
   "selectedCountTitle": "Выбрано {count} элементов",
   "addRule": "Добавить правило",
   "ruleName": "Название правила",
@@ -382,9 +380,9 @@
   "systemApp": "Системное приложение",
   "noNetworkApp": "Приложение без сети",
   "contactMe": "Свяжитесь со мной",
-  "restoreStrategy": "Стратегия восстановления",
-  "restoreStrategy_override": "Перезаписать",
-  "restoreStrategy_compatible": "Совместимый",
+  "recoveryStrategy": "Стратегия восстановления",
+  "recoveryStrategy_override": "Переопределение",
+  "recoveryStrategy_compatible": "Совместимый",
   "logsTest": "Тест журналов",
   "emptyTip": "{label} не может быть пустым",
   "urlTip": "{label} должен быть URL",
@@ -393,7 +391,7 @@
   "existsTip": "Текущий {label} уже существует",
   "deleteTip": "Вы уверены, что хотите удалить текущий {label}?",
   "deleteMultipTip": "Вы уверены, что хотите удалить выбранные {label}?",
-  "nullTip": "{label} пока отсутствуют",
+  "nullTip": "Сейчас {label} нет",
   "script": "Скрипт",
   "color": "Цвет",
   "rename": "Переименовать",
@@ -435,55 +433,5 @@
   "dataCollectionTip": "Уведомление о сборе данных",
   "dataCollectionContent": "Это приложение использует Firebase Crashlytics для сбора информации о сбоях nhằm улучшения стабильности приложения.\nСобираемые данные включают информацию об устройстве и подробности о сбоях, но не содержат персональных конфиденциальных данных.\nВы можете отключить эту функцию в настройках.",
   "crashlytics": "Анализ сбоев",
-  "crashlyticsTip": "При включении автоматически загружает журналы сбоев без конфиденциальной информации, когда приложение выходит из строя",
-  "appendSystemDns": "Добавить системный DNS",
-  "appendSystemDnsTip": "Принудительно добавить системный DNS к конфигурации",
-  "editRule": "Редактировать правило",
-  "overrideMode": "Режим переопределения",
-  "standardModeDesc": "Стандартный режим, переопределение базовой конфигурации, предоставление возможности простого добавления правил",
-  "scriptModeDesc": "Режим скрипта, использование внешних расширяющих скриптов, предоставление возможности переопределения конфигурации одним кликом",
-  "addedRules": "Добавленные правила",
-  "controlGlobalAddedRules": "Управление глобальными добавленными правилами",
-  "overrideScript": "Скрипт переопределения",
-  "goToConfigureScript": "Перейти к настройке скрипта",
-  "editGlobalRules": "Редактировать глобальные правила",
-  "externalFetch": "Внешнее получение",
-  "confirmForceCrashCore": "Вы уверены, что хотите принудительно аварийно завершить работу ядра?",
-  "confirmClearAllData": "Вы уверены, что хотите очистить все данные?",
-  "loading": "Загрузка...",
-  "loadTest": "Тест загрузки",
-  "yearsAgo": "{count, plural, one{{count} год назад} few{{count} года назад} many{{count} лет назад} other{{count} года назад}}",
-  "monthsAgo": "{count, plural, one{{count} месяц назад} few{{count} месяца назад} many{{count} месяцев назад} other{{count} месяца назад}}",
-  "daysAgo": "{count, plural, one{{count} день назад} few{{count} дня назад} many{{count} дней назад} other{{count} дня назад}}",
-  "hoursAgo": "{count, plural, one{{count} час назад} few{{count} часа назад} many{{count} часов назад} other{{count} часа назад}}",
-  "minutesAgo": "{count, plural, one{{count} минута назад} few{{count} минуты назад} many{{count} минут назад} other{{count} минуты назад}}",
-  "justNow": "Только что",
-  "noLongerRemind": "Больше не напоминать",
-  "accessControlSettings": "Настройки контроля доступа",
-  "turnOn": "Включить",
-  "turnOff": "Выключить",
-  "coreConfigChangeDetected": "Обнаружено изменение конфигурации ядра",
-  "reload": "Перезагрузить",
-  "vpnConfigChangeDetected": "Обнаружено изменение конфигурации VPN",
-  "restart": "Перезапустить",
-  "speedStatistics": "Статистика скорости",
-  "resetPageChangesTip": "На текущей странице есть изменения. Вы уверены, что хотите сбросить?",
-  "overwriteTypeCustom": "Пользовательский",
-  "overwriteTypeCustomDesc": "Пользовательский режим, полная настройка групп прокси и правил",
-  "unknownNetworkError": "Неизвестная сетевая ошибка",
-  "networkRequestException": "Исключение сетевого запроса, пожалуйста, попробуйте позже.",
-  "restoreException": "Ошибка восстановления",
-  "networkException": "Ошибка сети, проверьте соединение и попробуйте еще раз",
-  "invalidBackupFile": "Неверный файл резервной копии",
-  "pruneCache": "Очистить кэш",
-  "backupAndRestore": "Резервное копирование и восстановление",
-  "backupAndRestoreDesc": "Синхронизация данных через WebDAV или файлы",
-  "restore": "Восстановить",
-  "restoreSuccess": "Восстановление успешно",
-  "restoreFromWebDAVDesc": "Восстановить данные через WebDAV",
-  "restoreFromFileDesc": "Восстановить данные из файла",
-  "restoreOnlyConfig": "Восстановить только файлы конфигурации",
-  "restoreAllData": "Восстановить все данные",
-  "addProfile": "Добавить профиль",
-  "delayTest": "Тест задержки"
+  "crashlyticsTip": "При включении автоматически загружает журналы сбоев без конфиденциальной информации, когда приложение выходит из строя"
 }

arb/intl_zh_CN.arb

@@ -129,8 +129,14 @@
   "compatibleDesc": "开启将失去部分应用能力，获得全量的Clash的支持",
   "notSelectedTip": "当前代理组无法选中",
   "tip": "提示",
+  "backupAndRecovery": "备份与恢复",
+  "backupAndRecoveryDesc": "通过WebDAV或者文件同步数据",
   "account": "账号",
   "backup": "备份",
+  "recovery": "恢复",
+  "recoveryProfiles": "仅恢复配置文件",
+  "recoveryAll": "恢复所有数据",
+  "recoverySuccess": "恢复成功",
   "backupSuccess": "备份成功",
   "noInfo": "暂无信息",
   "pleaseBindWebDAV": "请绑定WebDAV",
@@ -213,7 +219,9 @@
   "local": "本地",
   "remote": "远程",
   "remoteBackupDesc": "备份数据到WebDAV",
+  "remoteRecoveryDesc": "通过WebDAV恢复数据",
   "localBackupDesc": "备份数据到本地",
+  "localRecoveryDesc": "通过文件恢复数据",
   "mode": "模式",
   "time": "时间",
   "source": "来源",
@@ -332,8 +340,6 @@
   "none": "无",
   "basicConfig": "基本配置",
   "basicConfigDesc": "全局修改基本配置",
-  "advancedConfig": "进阶配置",
-  "advancedConfigDesc": "提供多样化配置",
   "selectedCountTitle": "已选择 {count} 项",
   "addRule": "添加规则",
   "ruleName": "规则名称",
@@ -374,9 +380,9 @@
   "systemApp": "系统应用",
   "noNetworkApp": "无网络应用",
   "contactMe": "联系我",
-  "restoreStrategy": "恢复策略",
-  "restoreStrategy_override": "覆盖",
-  "restoreStrategy_compatible": "兼容",
+  "recoveryStrategy": "恢复策略",
+  "recoveryStrategy_override": "覆盖",
+  "recoveryStrategy_compatible": "兼容",
   "logsTest": "日志测试",
   "emptyTip": "{label}不能为空",
   "urlTip": "{label}必须为URL",
@@ -427,55 +433,5 @@
   "dataCollectionTip": "数据收集说明",
   "dataCollectionContent": "本应用使用 Firebase Crashlytics 收集崩溃信息以改进应用稳定性。\n收集的数据包括设备信息和崩溃详情，不包含个人敏感数据。\n您可以在设置中关闭此功能。",
   "crashlytics": "崩溃分析",
-  "crashlyticsTip": "开启后，应用崩溃时自动上传不包含敏感信息的崩溃日志",
-  "appendSystemDns": "追加系统DNS",
-  "appendSystemDnsTip": "强制为配置附加系统DNS",
-  "editRule": "编辑规则",
-  "overrideMode": "覆写模式",
-  "standardModeDesc": "标准模式，覆写基本配置，提供简单追加规则能力",
-  "scriptModeDesc": "脚本模式，使用外部扩展脚本，提供一键覆写配置的能力",
-  "addedRules": "附加规则",
-  "controlGlobalAddedRules": "控制全局附加规则",
-  "overrideScript": "覆写脚本",
-  "goToConfigureScript": "前往配置脚本",
-  "editGlobalRules": "编辑全局规则",
-  "externalFetch": "外部获取",
-  "confirmForceCrashCore": "确定要强制崩溃核心？",
-  "confirmClearAllData": "确定要清除所有数据？",
-  "loading": "加载中...",
-  "loadTest": "加载测试",
-  "yearsAgo": "{count} 年前",
-  "monthsAgo": "{count} 个月前",
-  "daysAgo": "{count} 天前",
-  "hoursAgo": "{count} 小时前",
-  "minutesAgo": "{count} 分钟前",
-  "justNow": "刚刚",
-  "noLongerRemind": "不再提示",
-  "accessControlSettings": "访问控制设置",
-  "turnOn": "开启",
-  "turnOff": "关闭",
-  "coreConfigChangeDetected": "检测到核心配置更改",
-  "reload": "重载",
-  "vpnConfigChangeDetected": "检测到VPN相关配置改动",
-  "restart": "重启",
-  "speedStatistics": "网速统计",
-  "resetPageChangesTip": "当前页面存在更改，确定重置吗？",
-  "overwriteTypeCustom": "自定义",
-  "overwriteTypeCustomDesc": "自定义模式，支持完全自定义修改代理组以及规则",
-  "unknownNetworkError": "未知网络错误",
-  "networkRequestException": "网络请求异常，请稍后再试。",
-  "restoreException": "恢复异常",
-  "networkException": "网络异常，请检查连接后重试",
-  "invalidBackupFile": "无效备份文件",
-  "pruneCache": "修剪缓存",
-  "backupAndRestore": "备份与恢复",
-  "backupAndRestoreDesc": "通过WebDAV或者文件同步数据",
-  "restore": "恢复",
-  "restoreSuccess": "恢复成功",
-  "restoreFromWebDAVDesc": "通过WebDAV恢复数据",
-  "restoreFromFileDesc": "通过文件恢复数据",
-  "restoreOnlyConfig": "仅恢复配置文件",
-  "restoreAllData": "恢复所有数据",
-  "addProfile": "添加配置",
-  "delayTest": "延迟测试"
+  "crashlyticsTip": "开启后，应用崩溃时自动上传不包含敏感信息的崩溃日志"
 }

assets/images/empty/connection.svg

@@ -1,23 +0,0 @@
-<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect x="75" y="50" width="150" height="180" rx="24" fill="#FDF7FF" stroke="#E8DEF8" stroke-width="2"/>
-
-    <rect x="95" y="90" width="36" height="12" rx="4" fill="#E8DEF8"/>
-    <rect x="140" y="90" width="65" height="12" rx="6" fill="#E8DEF8"/>
-
-    <path d="M95 118H205" stroke="#E8DEF8" stroke-width="2" stroke-dasharray="4 4"/>
-
-    <rect x="95" y="138" width="40" height="12" rx="6" fill="#E8DEF8" opacity="0.7"/>
-    <rect x="145" y="138" width="50" height="12" rx="6" fill="#E8DEF8" opacity="0.5"/>
-
-    <rect x="95" y="162" width="55" height="12" rx="6" fill="#E8DEF8" opacity="0.7"/>
-    <rect x="160" y="162" width="30" height="12" rx="6" fill="#E8DEF8" opacity="0.5"/>
-
-    <g transform="translate(210, 210)">
-        <circle cx="0" cy="0" r="38" fill="#6750A4" stroke="#FDF7FF" stroke-width="6"/>
-
-        <path d="M-10 16V-16M-10 -16L-18 -8M-10 -16L-2 -8" stroke="#FDF7FF" stroke-width="5" stroke-linecap="round"
-              stroke-linejoin="round"/>
-        <path d="M10 -16V16M10 16L2 8M10 16L18 8" stroke="#FDF7FF" stroke-width="5" stroke-linecap="round"
-              stroke-linejoin="round"/>
-    </g>
-</svg>

assets/images/empty/data.svg

@@ -1,9 +0,0 @@
-<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect x="75" y="50" width="150" height="180" rx="24" fill="#FDF7FF" stroke="#E8DEF8" stroke-width="2"/>
-    <rect x="100" y="90" width="100" height="12" rx="6" fill="#E8DEF8"/>
-    <rect x="100" y="115" width="70" height="12" rx="6" fill="#E8DEF8"/>
-    <rect x="100" y="140" width="80" height="12" rx="6" fill="#E8DEF8"/>
-    <rect x="155" y="170" width="80" height="60" rx="12" fill="#6750A4"/>
-    <rect x="150" y="165" width="90" height="18" rx="6" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"/>
-    <rect x="185" y="200" width="20" height="6" rx="3" fill="#FDF7FF" opacity="0.8"/>
-</svg>

assets/images/empty/log.svg

@@ -1,25 +0,0 @@
-<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M90 200C90 180 100 165 150 165C200 165 210 180 210 200V220C210 231.046 201.046 240 190 240H110C98.9543 240 90 231.046 90 220V200Z"
-          fill="#E8DEF8"/>
-
-    <rect x="75" y="85" width="150" height="100" rx="30" fill="#6750A4"/>
-
-    <rect x="85" y="95" width="130" height="80" rx="22" fill="#6750A4" stroke="#7D66B5" stroke-width="2"/>
-
-    <path d="M110 135 C110 142 118 148 128 148 C138 148 146 142 146 135" stroke="#FDF7FF" stroke-width="4"
-          stroke-linecap="round"/>
-    <path d="M154 135 C154 142 162 148 172 148 C182 148 190 142 190 135" stroke="#FDF7FF" stroke-width="4"
-          stroke-linecap="round"/>
-    <circle cx="150" cy="160" r="4" fill="#E8DEF8" opacity="0.5"/>
-
-    <path d="M150 85 V 65" stroke="#6750A4" stroke-width="4" stroke-linecap="round"/>
-    <circle cx="150" cy="60" r="8" fill="#6750A4"/>
-    <circle cx="150" cy="60" r="3" fill="#FDF7FF"/>
-
-    <path d="M220 70 L235 70 L220 85 H235" stroke="#6750A4" stroke-width="3" stroke-linecap="round"
-          stroke-linejoin="round"/>
-    <path d="M245 40 L255 40 L245 50 H255" stroke="#E8DEF8" stroke-width="2" stroke-linecap="round"
-          stroke-linejoin="round"/>
-
-    <path d="M90 185 H210" stroke="#000" stroke-width="4" stroke-opacity="0.1" stroke-linecap="round"/>
-</svg>

assets/images/empty/profile.svg

@@ -1,37 +0,0 @@
-<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
-
-    <path d="M60 94V84C60 72.9543 68.9543 64 80 64H130C141.046 64 150 72.9543 150 84V94H220C231.046 94 240 102.954 240 114V210C240 221.046 231.046 230 220 230H80C68.9543 230 60 221.046 60 210V94Z"
-          fill="#FDF7FF" stroke="#E8DEF8" stroke-width="2"/>
-
-
-    <rect x="90" y="124" width="60" height="12" rx="6" fill="#E8DEF8"/>
-
-
-    <rect x="90" y="154" width="50" height="12" rx="6" fill="#E8DEF8"/>
-
-    <rect x="90" y="184" width="40" height="12" rx="6" fill="#E8DEF8"/>
-    <rect x="180" y="184" width="30" height="12" rx="6" fill="#E8DEF8" opacity="0.6"/>
-    <circle cx="186" cy="190" r="6" fill="#E8DEF8"/>
-
-    <g transform="translate(210, 210)">
-        <path fill-rule="evenodd" clip-rule="evenodd"
-              d="M0 -32 C-17.67 -32 -32 -17.67 -32 0 C-32 17.67 -17.67 32 0 32 C17.67 32 32 17.67 32 0 C32 -17.67 17.67 -32 0 -32ZM0 -8 C-4.42 -8 -8 -4.42 -8 0 C-8 4.42 -4.42 8 0 8 C4.42 8 8 4.42 8 0 C8 -4.42 4.42 -8 0 -8Z"
-              fill="#6750A4" stroke="#FDF7FF" stroke-width="6"/>
-
-        <rect x="-5" y="-38" width="10" height="12" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"/>
-        <rect x="-5" y="26" width="10" height="12" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"/>
-        <rect x="-38" y="-5" width="12" height="10" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"/>
-        <rect x="26" y="-5" width="12" height="10" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"/>
-        <rect x="-5" y="-38" width="10" height="12" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"
-              transform="rotate(45)"/>
-        <rect x="-5" y="26" width="10" height="12" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"
-              transform="rotate(45)"/>
-        <rect x="-38" y="-5" width="12" height="10" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"
-              transform="rotate(45)"/>
-        <rect x="26" y="-5" width="12" height="10" rx="3" fill="#6750A4" stroke="#FDF7FF" stroke-width="2"
-              transform="rotate(45)"/>
-
-        <circle cx="0" cy="0" r="22" fill="#6750A4"/>
-        <circle cx="0" cy="0" r="8" fill="#FDF7FF" opacity="0.8"/>
-    </g>
-</svg>

assets/images/empty/proxy.svg

@@ -1,18 +0,0 @@
-<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect x="75" y="50" width="150" height="180" rx="24" fill="#FDF7FF" stroke="#E8DEF8" stroke-width="2"/>
-    <rect x="95" y="90" width="110" height="16" rx="4" fill="#E8DEF8"/>
-    <circle cx="105" cy="98" r="3" fill="#FDF7FF"/>
-    <circle cx="115" cy="98" r="3" fill="#FDF7FF"/>
-    <rect x="95" y="120" width="110" height="16" rx="4" fill="#E8DEF8"/>
-    <circle cx="105" cy="128" r="3" fill="#FDF7FF"/>
-    <circle cx="115" cy="128" r="3" fill="#FDF7FF"/>
-    <rect x="95" y="150" width="80" height="16" rx="4" fill="#E8DEF8"/>
-    <circle cx="105" cy="158" r="3" fill="#FDF7FF"/>
-    <circle cx="115" cy="158" r="3" fill="#FDF7FF"/>
-    <circle cx="195" cy="195" r="30" fill="#6750A4"/>
-    <rect x="180" y="193" width="30" height="4" rx="2" fill="#FDF7FF" transform="rotate(45 195 195)"/>
-    <circle cx="183" cy="183" r="4" fill="#FDF7FF"/>
-    <circle cx="207" cy="207" r="4" fill="#FDF7FF"/>
-    <path d="M175 158 H190 V165" stroke="#E8DEF8" stroke-width="2" stroke-linecap="round"/>
-    
-</svg>

assets/images/empty/rule.svg

@@ -1,31 +0,0 @@
-<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
-
-    <rect x="75" y="50" width="150" height="180" rx="24" fill="#FDF7FF" stroke="#E8DEF8" stroke-width="2"/>
-
-
-    <rect x="95" y="90" width="80" height="12" rx="6" fill="#E8DEF8"/>
-
-    <rect x="185" y="90" width="25" height="12" rx="6" fill="#E8DEF8" opacity="0.7"/>
-
-
-    <rect x="95" y="125" width="60" height="12" rx="6" fill="#E8DEF8"/>
-    <rect x="165" y="125" width="45" height="12" rx="6" fill="#E8DEF8" opacity="0.7"/>
-
-
-    <rect x="95" y="160" width="70" height="12" rx="6" fill="#E8DEF8"/>
-    <rect x="175" y="160" width="35" height="12" rx="6" fill="#E8DEF8" opacity="0.7"/>
-
-
-    <g transform="translate(210, 210)">
-        <circle cx="0" cy="0" r="36" fill="#6750A4" stroke="#FDF7FF" stroke-width="6"/>
-
-        <circle cx="0" cy="0" r="24" stroke="#FDF7FF" stroke-width="3"/>
-
-        <path d="M-24 0C-24 0 -12 8 0 8C12 8 24 0 24 0" stroke="#FDF7FF" stroke-width="3" stroke-linecap="round"
-              stroke-linejoin="round"/>
-
-        <ellipse cx="0" cy="0" rx="10" ry="24" stroke="#FDF7FF" stroke-width="3"/>
-        
-        <circle cx="14" cy="-12" r="3" fill="#FDF7FF"/>
-    </g>
-</svg>

assets/images/empty/script.svg

@@ -1,19 +0,0 @@
-<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect x="75" y="50" width="150" height="180" rx="24" fill="#FDF7FF" stroke="#E8DEF8" stroke-width="2"/>
-
-    <rect x="100" y="90" width="30" height="12" rx="6" fill="#E8DEF8"/>
-    <rect x="136" y="90" width="50" height="12" rx="6" fill="#E8DEF8"/>
-
-    <rect x="120" y="120" width="80" height="12" rx="6" fill="#E8DEF8"/>
-
-    <rect x="120" y="150" width="50" height="12" rx="6" fill="#E8DEF8"/>
-
-    <rect x="100" y="180" width="20" height="12" rx="6" fill="#E8DEF8"/>
-
-    <g transform="translate(165, 160)">
-        <rect x="0" y="0" width="80" height="80" rx="20" fill="#6750A4" stroke="#FDF7FF" stroke-width="4"/>
-        <path d="M28 30L18 40L28 50" stroke="#FDF7FF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-        <path d="M52 30L62 40L52 50" stroke="#FDF7FF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-        <path d="M46 26L34 54" stroke="#FDF7FF" stroke-width="4" stroke-linecap="round" opacity="0.8"/>
-    </g>
-</svg>

build.yaml

@@ -6,7 +6,6 @@ targets:
           build_extensions:
             '^lib/models/{{}}.dart': 'lib/models/generated/{{}}.g.dart'
             '^lib/providers/{{}}.dart': 'lib/providers/generated/{{}}.g.dart'
-            '^lib/database/{{}}.dart': 'lib/database/generated/{{}}.g.dart'
       freezed:
         options:
           build_extensions:

core/action.go

@@ -53,8 +53,8 @@ func handleAction(action *Action, result ActionResult) {
 		result.success(handleShutdown())
 		return
 	case validateConfigMethod:
-		path := action.Data.(string)
-		result.success(handleValidateConfig(path))
+		data := []byte(action.Data.(string))
+		result.success(handleValidateConfig(data))
 		return
 	case updateConfigMethod:
 		data := []byte(action.Data.(string))

core/common.go

@@ -17,7 +17,6 @@ import (
 	"github.com/metacubex/mihomo/constant/features"
 	cp "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/hub"
-	"github.com/metacubex/mihomo/hub/executor"
 	"github.com/metacubex/mihomo/hub/route"
 	"github.com/metacubex/mihomo/listener"
 	"github.com/metacubex/mihomo/log"
@@ -25,7 +24,6 @@ import (
 	"github.com/metacubex/mihomo/tunnel"
 	"os"
 	"path/filepath"
-	"runtime"
 	"sync"
 )
 
@@ -37,6 +35,12 @@ var (
 	mBatch, _     = batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](50))
 )
 
+type ExternalProviders []ExternalProvider
+
+func (a ExternalProviders) Len() int           { return len(a) }
+func (a ExternalProviders) Less(i, j int) bool { return a[i].Name < a[j].Name }
+func (a ExternalProviders) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+
 func getExternalProvidersRaw() map[string]cp.Provider {
 	eps := make(map[string]cp.Provider)
 	for n, p := range tunnel.Providers() {
@@ -235,13 +239,30 @@ func updateConfig(params *UpdateParams) {
 	updateListeners()
 }
 
-func applyConfig(params *SetupParams) error {
-	runtime.GC()
+func parseWithPath(path string) (*config.Config, error) {
+	buf, err := readFile(path)
+	if err != nil {
+		return nil, err
+	}
+	rawConfig := config.DefaultRawConfig()
+	err = UnmarshalJson(buf, rawConfig)
+	if err != nil {
+		return nil, err
+	}
+	parseRawConfig, err := config.ParseRawConfig(rawConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	return parseRawConfig, nil
+}
+
+func setupConfig(params *SetupParams) error {
 	runLock.Lock()
 	defer runLock.Unlock()
 	var err error
 	constant.DefaultTestURL = params.TestURL
-	currentConfig, err = executor.ParseWithPath(filepath.Join(constant.Path.HomeDir(), "config.yaml"))
+	currentConfig, err = parseWithPath(filepath.Join(constant.Path.HomeDir(), "config.json"))
 	if err != nil {
 		currentConfig, _ = config.ParseRawConfig(config.DefaultRawConfig())
 	}

core/constant.go

@@ -66,11 +66,6 @@ type ExternalProvider struct {
 	SubscriptionInfo *provider.SubscriptionInfo `json:"subscription-info"`
 }
 
-type ProxiesData struct {
-	Proxies map[string]constant.Proxy `json:"proxies"`
-	All     []string                  `json:"all"`
-}
-
 const (
 	messageMethod                  Method = "message"
 	initClashMethod                Method = "initClash"

core/go.mod

@@ -10,7 +10,6 @@ require (
 )
 
 require (
-	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/RyuaNerin/go-krypto v1.3.0 // indirect
 	github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
 	github.com/ajg/form v1.5.1 // indirect
@@ -19,85 +18,87 @@ require (
 	github.com/buger/jsonparser v1.1.1 // indirect
 	github.com/coreos/go-iptables v0.8.0 // indirect
 	github.com/dlclark/regexp2 v1.11.5 // indirect
-	github.com/enfein/mieru/v3 v3.26.2 // indirect
+	github.com/ebitengine/purego v0.8.4 // indirect
+	github.com/enfein/mieru/v3 v3.19.1 // indirect
 	github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358 // indirect
 	github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
 	github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect
 	github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
+	github.com/go-chi/chi/v5 v5.2.3 // 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.4.0 // indirect
-	github.com/golang/snappy v1.0.0 // indirect
+	github.com/gofrs/uuid/v5 v5.3.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-20240727154555-813a5fbdbec8 // indirect
+	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
+	github.com/hashicorp/yamux v0.1.2 // indirect
 	github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905 // indirect
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/klauspost/compress v1.17.9 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
-	github.com/klauspost/reedsolomon v1.12.3 // indirect
+	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // 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-20251104174305-5a0e9f7e361d // indirect
+	github.com/metacubex/amneziawg-go v0.0.0-20250820070344-732c0c9d418a // indirect
 	github.com/metacubex/ascon v0.1.0 // indirect
-	github.com/metacubex/bart v0.26.0 // indirect
+	github.com/metacubex/bart v0.20.5 // indirect
 	github.com/metacubex/bbolt v0.0.0-20250725135710-010dbbbb7a5b // indirect
 	github.com/metacubex/blake3 v0.1.0 // indirect
 	github.com/metacubex/chacha v0.1.5 // indirect
-	github.com/metacubex/chi v0.1.0 // indirect
-	github.com/metacubex/cpu v0.1.0 // 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-20251227095601-261ec1326fe8 // indirect
-	github.com/metacubex/hkdf v0.1.0 // indirect
-	github.com/metacubex/hpke v0.1.0 // indirect
-	github.com/metacubex/http v0.1.0 // indirect
-	github.com/metacubex/kcp-go v0.0.0-20260105040817-550693377604 // indirect
-	github.com/metacubex/mlkem v0.1.0 // indirect
+	github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b // indirect
 	github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 // indirect
-	github.com/metacubex/qpack v0.6.0 // indirect
-	github.com/metacubex/quic-go v0.59.1-0.20260112033758-aa29579f2001 // indirect
+	github.com/metacubex/quic-go v0.54.1-0.20250730114134-a1ae705fe295 // indirect
 	github.com/metacubex/randv2 v0.2.0 // indirect
 	github.com/metacubex/restls-client-go v0.1.7 // indirect
-	github.com/metacubex/sing v0.5.6 // indirect
-	github.com/metacubex/sing-mux v0.3.4 // indirect
-	github.com/metacubex/sing-quic v0.0.0-20260112044712-65d17608159e // indirect
+	github.com/metacubex/sing v0.5.5 // indirect
+	github.com/metacubex/sing-mux v0.3.3-0.20250813083925-d7c9aeaeeaac // indirect
+	github.com/metacubex/sing-quic v0.0.0-20250718154553-1b193bec4cbb // indirect
 	github.com/metacubex/sing-shadowsocks v0.2.12 // indirect
-	github.com/metacubex/sing-shadowsocks2 v0.2.7 // indirect
+	github.com/metacubex/sing-shadowsocks2 v0.2.6 // indirect
 	github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 // indirect
-	github.com/metacubex/sing-tun v0.4.11 // indirect
-	github.com/metacubex/sing-vmess v0.2.4 // indirect
+	github.com/metacubex/sing-tun v0.4.7 // indirect
+	github.com/metacubex/sing-vmess v0.2.4-0.20250822020810-4856053566f0 // indirect
 	github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f // indirect
-	github.com/metacubex/smux v0.0.0-20260105030934-d0c8756d3141 // indirect
-	github.com/metacubex/tfo-go v0.0.0-20251130171125-413e892ac443 // indirect
-	github.com/metacubex/tls v0.1.1 // indirect
-	github.com/metacubex/utls v1.8.4 // indirect
+	github.com/metacubex/smux v0.0.0-20250503055512-501391591dee // indirect
+	github.com/metacubex/tfo-go v0.0.0-20250827083229-aa432b865617 // indirect
+	github.com/metacubex/utls v1.8.1-0.20250823120917-12f5ba126142 // indirect
 	github.com/metacubex/wireguard-go v0.0.0-20250820062549-a6cecdd7f57f // indirect
-	github.com/metacubex/yamux v0.0.0-20250918083631-dd5f17c0be49 // indirect
 	github.com/miekg/dns v1.1.63 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
 	github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
+	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
 	github.com/openacid/low v0.1.21 // indirect
 	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
 	github.com/pierrec/lz4/v4 v4.1.14 // indirect
+	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/quic-go/qpack v0.4.0 // indirect
+	github.com/sagernet/cors v1.2.1 // indirect
 	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
-	github.com/samber/lo v1.52.0 // indirect
+	github.com/samber/lo v1.51.0 // 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
 	github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	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.33.0 // indirect
 	golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
@@ -105,7 +106,7 @@ require (
 	golang.org/x/net v0.35.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
 	golang.org/x/text v0.22.0 // indirect
-	golang.org/x/time v0.10.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

core/go.sum

@@ -1,5 +1,3 @@
-filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
-filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 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=
@@ -14,6 +12,9 @@ github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xW
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/coreos/go-iptables v0.8.0 h1:MPc2P89IhuVpLI7ETL/2tx3XZ61VeICZjYqDEgNsPRc=
 github.com/coreos/go-iptables v0.8.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -21,8 +22,10 @@ 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/enfein/mieru/v3 v3.26.2 h1:U/2XJc+3vrJD9r815FoFdwToQFEcqSOzzzWIPPhjfEU=
-github.com/enfein/mieru/v3 v3.26.2/go.mod h1:zJBUCsi5rxyvHM8fjFf+GLaEl4OEjjBXr1s5F6Qd3hM=
+github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0omw=
+github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/enfein/mieru/v3 v3.19.1 h1:19b9kgFC7oJXX9RLEO5Pi1gO6yek5cWlpK7IJVUoE8I=
+github.com/enfein/mieru/v3 v3.19.1/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/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
@@ -36,26 +39,37 @@ github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
 github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
+github.com/go-chi/chi/v5 v5.2.3 h1:WQIt9uxdsAbgIYgid+BpYc+liqQZGMHRaUwp0JUcvdE=
+github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
+github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
+github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
+github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 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.4.0 h1:EfbpCTjqMuGyq5ZJwxqzn3Cbr2d0rUZU7v5ycAk/e/0=
-github.com/gofrs/uuid/v5 v5.4.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+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/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
-github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
 github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k=
-github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
+github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8=
+github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905 h1:q3OEI9RaN/wwcx+qgGo6ZaoJkCiDYe/gjDLfq7lQQF4=
 github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905/go.mod h1:VvGYjkZoJyKqlmT1yzakUs4mfKMNB0XdODP0+rdml6k=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
@@ -64,94 +78,76 @@ github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtL
 github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
 github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
-github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
-github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
-github.com/klauspost/reedsolomon v1.12.3 h1:tzUznbfc3OFwJaTebv/QdhnFf2Xvb7gZ24XaHLBPmdc=
-github.com/klauspost/reedsolomon v1.12.3/go.mod h1:3K5rXwABAvzGeR01r6pWZieUALXO/Tq7bFKGIb4m4WI=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g=
 github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
 github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
 github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
-github.com/metacubex/amneziawg-go v0.0.0-20251104174305-5a0e9f7e361d h1:vAJ0ZT4aO803F1uw2roIA9yH7Sxzox34tVVyye1bz6c=
-github.com/metacubex/amneziawg-go v0.0.0-20251104174305-5a0e9f7e361d/go.mod h1:MsM/5czONyXMJ3PRr5DbQ4O/BxzAnJWOIcJdLzW6qHY=
+github.com/metacubex/amneziawg-go v0.0.0-20250820070344-732c0c9d418a h1:c1QSGpacSeQdBdWcEKZKGuWLcqIG2wxHEygAcXuDwS4=
+github.com/metacubex/amneziawg-go v0.0.0-20250820070344-732c0c9d418a/go.mod h1:MsM/5czONyXMJ3PRr5DbQ4O/BxzAnJWOIcJdLzW6qHY=
 github.com/metacubex/ascon v0.1.0 h1:6ZWxmXYszT1XXtwkf6nxfFhc/OTtQ9R3Vyj1jN32lGM=
 github.com/metacubex/ascon v0.1.0/go.mod h1:eV5oim4cVPPdEL8/EYaTZ0iIKARH9pnhAK/fcT5Kacc=
-github.com/metacubex/bart v0.26.0 h1:d/bBTvVatfVWGfQbiDpYKI1bXUJgjaabB2KpK1Tnk6w=
-github.com/metacubex/bart v0.26.0/go.mod h1:DCcyfP4MC+Zy7sLK7XeGuMw+P5K9mIRsYOBgiE8icsI=
+github.com/metacubex/bart v0.20.5 h1:XkgLZ17QxfxkqKdGsojoM2Zu01mmHyyQSFzt2/calTM=
+github.com/metacubex/bart v0.20.5/go.mod h1:DCcyfP4MC+Zy7sLK7XeGuMw+P5K9mIRsYOBgiE8icsI=
 github.com/metacubex/bbolt v0.0.0-20250725135710-010dbbbb7a5b h1:j7dadXD8I2KTmMt8jg1JcaP1ANL3JEObJPdANKcSYPY=
 github.com/metacubex/bbolt v0.0.0-20250725135710-010dbbbb7a5b/go.mod h1:+WmP0VJZDkDszvpa83HzfUp6QzARl/IKkMorH4+nODw=
 github.com/metacubex/blake3 v0.1.0 h1:KGnjh/56REO7U+cgZA8dnBhxdP7jByrG7hTP+bu6cqY=
 github.com/metacubex/blake3 v0.1.0/go.mod h1:CCkLdzFrqf7xmxCdhQFvJsRRV2mwOLDoSPg6vUTB9Uk=
 github.com/metacubex/chacha v0.1.5 h1:fKWMb/5c7ZrY8Uoqi79PPFxl+qwR7X/q0OrsAubyX2M=
 github.com/metacubex/chacha v0.1.5/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
-github.com/metacubex/chi v0.1.0 h1:rjNDyDj50nRpicG43CNkIw4ssiCbmDL8d7wJXKlUCsg=
-github.com/metacubex/chi v0.1.0/go.mod h1:zM5u5oMQt8b2DjvDHvzadKrP6B2ztmasL1YHRMbVV+g=
-github.com/metacubex/cpu v0.1.0 h1:8PeTdV9j6UKbN1K5Jvtbi/Jock7dknvzyYuLb8Conmk=
-github.com/metacubex/cpu v0.1.0/go.mod h1:09VEt4dSRLR+bOA8l4w4NDuzGZ8n5dkMv7e8axgEeTU=
 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-20251227095601-261ec1326fe8 h1:hUL81H0Ic/XIDkvtn9M1pmfDdfid7JzYQToY4Ps1TvQ=
-github.com/metacubex/gvisor v0.0.0-20251227095601-261ec1326fe8/go.mod h1:8LpS0IJW1VmWzUm3ylb0e2SK5QDm5lO/2qwWLZgRpBU=
-github.com/metacubex/hkdf v0.1.0 h1:fPA6VzXK8cU1foc/TOmGCDmSa7pZbxlnqhl3RNsthaA=
-github.com/metacubex/hkdf v0.1.0/go.mod h1:3seEfds3smgTAXqUGn+tgEJH3uXdsUjOiduG/2EtvZ4=
-github.com/metacubex/hpke v0.1.0 h1:gu2jUNhraehWi0P/z5HX2md3d7L1FhPQE6/Q0E9r9xQ=
-github.com/metacubex/hpke v0.1.0/go.mod h1:vfDm6gfgrwlXUxKDkWbcE44hXtmc1uxLDm2BcR11b3U=
-github.com/metacubex/http v0.1.0 h1:Jcy0I9zKjYijSUaksZU34XEe2xNdoFkgUTB7z7K5q0o=
-github.com/metacubex/http v0.1.0/go.mod h1:Nxx0zZAo2AhRfanyL+fmmK6ACMtVsfpwIl1aFAik2Eg=
-github.com/metacubex/kcp-go v0.0.0-20260105040817-550693377604 h1:hJwCVlE3ojViC35MGHB+FBr8TuIf3BUFn2EQ1VIamsI=
-github.com/metacubex/kcp-go v0.0.0-20260105040817-550693377604/go.mod h1:lpmN3m269b3V5jFCWtffqBLS4U3QQoIid9ugtO+OhVc=
-github.com/metacubex/mlkem v0.1.0 h1:wFClitonSFcmipzzQvax75beLQU+D7JuC+VK1RzSL8I=
-github.com/metacubex/mlkem v0.1.0/go.mod h1:amhaXZVeYNShuy9BILcR7P0gbeo/QLZsnqCdL8U2PDQ=
+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/qpack v0.6.0 h1:YqClGIMOpiRYLjV1qOs483Od08MdPgRnHjt90FuaAKw=
-github.com/metacubex/qpack v0.6.0/go.mod h1:lKGSi7Xk94IMvHGOmxS9eIei3bvIqpOAImEBsaOwTkA=
-github.com/metacubex/quic-go v0.59.1-0.20260112033758-aa29579f2001 h1:RlT3bFCIDM/NR9GWaDbFCrweOwpHRfgaT9c0zuRlPhY=
-github.com/metacubex/quic-go v0.59.1-0.20260112033758-aa29579f2001/go.mod h1:oNzMrmylS897M3zSMuapIdwSwfq6F2qW01Z3NhVRJhk=
+github.com/metacubex/quic-go v0.54.1-0.20250730114134-a1ae705fe295 h1:8JVlYuE8uSJAvmyCd4TjvDxs57xjb0WxEoaWafK5+qs=
+github.com/metacubex/quic-go v0.54.1-0.20250730114134-a1ae705fe295/go.mod h1:1lktQFtCD17FZliVypbrDHwbsFSsmz2xz2TRXydvB5c=
 github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
 github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
 github.com/metacubex/restls-client-go v0.1.7 h1:eCwiXCTQb5WJu9IlgYvDBA1OgrINv58dEe7hcN5H15k=
 github.com/metacubex/restls-client-go v0.1.7/go.mod h1:BN/U52vPw7j8VTSh2vleD/MnmVKCov84mS5VcjVHH4g=
-github.com/metacubex/sing v0.5.6 h1:mEPDCadsCj3DB8gn+t/EtposlYuALEkExa/LUguw6/c=
-github.com/metacubex/sing v0.5.6/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
-github.com/metacubex/sing-mux v0.3.4 h1:tf4r27CIkzaxq9kBlAXQkgMXq2HPp5Mta60Kb4RCZF0=
-github.com/metacubex/sing-mux v0.3.4/go.mod h1:SEJfAuykNj/ozbPqngEYqyggwSr81+L7Nu09NRD5mh4=
-github.com/metacubex/sing-quic v0.0.0-20260112044712-65d17608159e h1:MLxp42z9Jd6LtY2suyawnl24oNzIsFxWc15bNeDIGxA=
-github.com/metacubex/sing-quic v0.0.0-20260112044712-65d17608159e/go.mod h1:+lgKTd52xAarGtqugALISShyw4KxnoEpYe2u0zJh26w=
+github.com/metacubex/sing v0.5.2/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
+github.com/metacubex/sing v0.5.5 h1:m5U8iHvRAUxlme3FZlE/LPIGHjU8oMCUzXWGbQQAC1E=
+github.com/metacubex/sing v0.5.5/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
+github.com/metacubex/sing-mux v0.3.3-0.20250813083925-d7c9aeaeeaac h1:wDH/Jh/yqWbzPktqJP+Y1cUG8hchcrzKzUxJiSpnaQs=
+github.com/metacubex/sing-mux v0.3.3-0.20250813083925-d7c9aeaeeaac/go.mod h1:3rt1soewn0O6j89GCLmwAQFsq257u0jf2zQSPhTL3Bw=
+github.com/metacubex/sing-quic v0.0.0-20250718154553-1b193bec4cbb h1:U/m3h8lp/j7i8zFgfvScLdZa1/Y8dd74oO7iZaQq80s=
+github.com/metacubex/sing-quic v0.0.0-20250718154553-1b193bec4cbb/go.mod h1:B60FxaPHjR1SeQB0IiLrgwgvKsaoASfOWdiqhLjmMGA=
 github.com/metacubex/sing-shadowsocks v0.2.12 h1:Wqzo8bYXrK5aWqxu/TjlTnYZzAKtKsaFQBdr6IHFaBE=
 github.com/metacubex/sing-shadowsocks v0.2.12/go.mod h1:2e5EIaw0rxKrm1YTRmiMnDulwbGxH9hAFlrwQLQMQkU=
-github.com/metacubex/sing-shadowsocks2 v0.2.7 h1:hSuuc0YpsfiqYqt1o+fP4m34BQz4e6wVj3PPBVhor3A=
-github.com/metacubex/sing-shadowsocks2 v0.2.7/go.mod h1:vOEbfKC60txi0ca+yUlqEwOGc3Obl6cnSgx9Gf45KjE=
+github.com/metacubex/sing-shadowsocks2 v0.2.6 h1:ZR1kYT0f0Vi64iQSS09OdhFfppiNkh7kjgRdMm0SB98=
+github.com/metacubex/sing-shadowsocks2 v0.2.6/go.mod h1:vOEbfKC60txi0ca+yUlqEwOGc3Obl6cnSgx9Gf45KjE=
 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.11 h1:NG5zpvYPbBXf+9GSUmDaGCDwl3hZXV677tbRAw0QtCM=
-github.com/metacubex/sing-tun v0.4.11/go.mod h1:L/TjQY5JEGy8nvsuYmy/XgMFMCPiF0+AWSFCYfS6r9w=
-github.com/metacubex/sing-vmess v0.2.4 h1:Tx6AGgCiEf400E/xyDuYyafsel6sGbR8oF7RkAaus6I=
-github.com/metacubex/sing-vmess v0.2.4/go.mod h1:21R5R1u90uUvBQF0owoooEu96/SAYYD56nDrwm6nFaM=
+github.com/metacubex/sing-tun v0.4.7 h1:ZDY/W+1c7PeWWKeKRyUo18fySF/TWjB0i5ui81Ar778=
+github.com/metacubex/sing-tun v0.4.7/go.mod h1:xHecZRwBnKWe6zG9amAK9cXf91lF6blgjBqm+VvOrmU=
+github.com/metacubex/sing-vmess v0.2.4-0.20250822020810-4856053566f0 h1:WZepq4TOZa6WewB8tGAZrrL+bL2R2ivoBzuEgAeolWc=
+github.com/metacubex/sing-vmess v0.2.4-0.20250822020810-4856053566f0/go.mod h1:21R5R1u90uUvBQF0owoooEu96/SAYYD56nDrwm6nFaM=
 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-20260105030934-d0c8756d3141 h1:DK2l6m2Fc85H2BhiAPgbJygiWhesPlfGmF+9Vw6ARdk=
-github.com/metacubex/smux v0.0.0-20260105030934-d0c8756d3141/go.mod h1:/yI4OiGOSn0SURhZdJF3CbtPg3nwK700bG8TZLMBvAg=
-github.com/metacubex/tfo-go v0.0.0-20251130171125-413e892ac443 h1:H6TnfM12tOoTizYE/qBHH3nEuibIelmHI+BVSxVJr8o=
-github.com/metacubex/tfo-go v0.0.0-20251130171125-413e892ac443/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
-github.com/metacubex/tls v0.1.1 h1:BEcZrsPTTfNf4sKZ02EbZodv4UIj7fgHWa1Eqo12Bc0=
-github.com/metacubex/tls v0.1.1/go.mod h1:0XeVdL0cBw+8i5Hqy3lVeP9IyD/LFTq02ExvHM6rzEM=
-github.com/metacubex/utls v1.8.4 h1:HmL9nUApDdWSkgUyodfwF6hSjtiwCGGdyhaSpEejKpg=
-github.com/metacubex/utls v1.8.4/go.mod h1:kncGGVhFaoGn5M3pFe3SXhZCzsbCJayNOH4UEqTKTko=
+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-20250827083229-aa432b865617 h1:yN3mQ4cT9sPUciw/rO0Isc/8QlO86DB6g9SEMRgQ8Cw=
+github.com/metacubex/tfo-go v0.0.0-20250827083229-aa432b865617/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
+github.com/metacubex/utls v1.8.1-0.20250823120917-12f5ba126142 h1:csEbKOzRAxJXffOeZnnS3/kA/F55JiTbKv5jcYqCXms=
+github.com/metacubex/utls v1.8.1-0.20250823120917-12f5ba126142/go.mod h1:67I3skhEY4Sya8f1YxELwWPoeQdXqZCrWNYLvq8gn2U=
 github.com/metacubex/wireguard-go v0.0.0-20250820062549-a6cecdd7f57f h1:FGBPRb1zUabhPhDrlKEjQ9lgIwQ6cHL4x8M9lrERhbk=
 github.com/metacubex/wireguard-go v0.0.0-20250820062549-a6cecdd7f57f/go.mod h1:oPGcV994OGJedmmxrcK9+ni7jUEMGhR+uVQAdaduIP4=
-github.com/metacubex/yamux v0.0.0-20250918083631-dd5f17c0be49 h1:lhlqpYHopuTLx9xQt22kSA9HtnyTDmk5XjjQVCGHe2E=
-github.com/metacubex/yamux v0.0.0-20250918083631-dd5f17c0be49/go.mod h1:MBeEa9IVBphH7vc3LNtW6ZujVXFizotPo3OEiHQ+TNU=
 github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
 github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs=
 github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
 github.com/mroth/weightedrand/v2 v2.1.0/go.mod h1:f2faGsfOGOwc1p94wzHKKZyTpcJUW7OJ/9U4yfiNAOU=
 github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4=
 github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7/go.mod h1:UqoUn6cHESlliMhOnKLWr+CBH+e3bazUPvFj1XZwAjs=
+github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
+github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
+github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
 github.com/openacid/errors v0.8.1/go.mod h1:GUQEJJOJE3W9skHm8E8Y4phdl2LLEN8iD7c5gcGgdx0=
 github.com/openacid/low v0.1.21 h1:Tr2GNu4N/+rGRYdOsEHOE89cxUIaDViZbVmKz29uKGo=
 github.com/openacid/low v0.1.21/go.mod h1:q+MsKI6Pz2xsCkzV4BLj7NR5M4EX0sGz5AqotpZDVh0=
@@ -164,10 +160,18 @@ github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFu
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
+github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
+github.com/sagernet/cors v1.2.1 h1:Cv5Z8y9YSD6Gm+qSpNrL3LO4lD3eQVvbFYJSG7JCMHQ=
+github.com/sagernet/cors v1.2.1/go.mod h1:O64VyOjjhrkLmQIjF4KGRrJO/5dVXFdpEmCW/eISRAI=
 github.com/sagernet/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.52.0 h1:Rvi+3BFHES3A8meP33VPAxiBZX/Aws5RxrschYGjomw=
-github.com/samber/lo v1.52.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
+github.com/samber/lo v1.51.0 h1:kysRYLbHy/MB7kQZf5DSN50JHmMsNEdeY24VzJFu7wI=
+github.com/samber/lo v1.51.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
+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=
 github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b/go.mod h1:X7qrxNQViEaAN9LNZOPl9PfvQtp3V3c7LTo0dvGi0fM=
 github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c h1:DjKMC30y6yjG3IxDaeAj3PCoRr+IsO+bzyT+Se2m2Hk=
@@ -177,10 +181,21 @@ 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.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+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.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=
+github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
+github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
+github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
+github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
 github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 h1:tHNk7XK9GkmKUR6Gh8gVBKXc2MVSZ4G/NnWLtzw4gNA=
 github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
@@ -194,12 +209,14 @@ github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAh
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
-github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae h1:J0GxkO96kL4WF+AIT3M4mfUVinOCPgf2uUWYFUzN0sM=
+github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
+github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 h1:UNrDfkQqiEYzdMlNsVvBYOAJWZjdktqFE9tQh5BT2+4=
 gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7/go.mod h1:E+rxHvJG9H6PUdzq9NRG6csuLN3XUx98BfGOVWNYnXs=
 gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec h1:FpfFs4EhNehiVfzQttTuxanPIT43FtkkCFypIod8LHo=
 gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec/go.mod h1:BZ1RAoRPbCxum9Grlv5aeksu2H8BiKehBYooU2LFiOQ=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
+go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -223,24 +240,30 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.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.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=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
 golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
-golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
-golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
+golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
 golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
 google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

core/hub.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"cmp"
 	"context"
 	"encoding/json"
 	"github.com/metacubex/mihomo/adapter"
@@ -13,18 +12,16 @@ import (
 	"github.com/metacubex/mihomo/component/updater"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
-	"github.com/metacubex/mihomo/constant/features"
 	cp "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/hub/executor"
 	"github.com/metacubex/mihomo/listener"
 	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/tunnel"
 	"github.com/metacubex/mihomo/tunnel/statistic"
-	"golang.org/x/exp/slices"
 	"net"
 	"os"
 	"runtime"
-	"runtime/debug"
+	"sort"
 	"strconv"
 	"time"
 )
@@ -36,16 +33,16 @@ var (
 )
 
 func handleInitClash(paramsString string) bool {
-	runLock.Lock()
-	defer runLock.Unlock()
 	var params = InitParams{}
 	err := json.Unmarshal([]byte(paramsString), &params)
 	if err != nil {
 		return false
 	}
 	version = params.Version
-	constant.SetHomeDir(params.HomeDir)
-	isInit = true
+	if !isInit {
+		constant.SetHomeDir(params.HomeDir)
+		isInit = true
+	}
 	return isInit
 }
 
@@ -72,76 +69,32 @@ func handleGetIsInit() bool {
 }
 
 func handleForceGC() {
-	log.Infoln("[APP] request force GC")
-	runtime.GC()
-	if features.Android {
-		debug.FreeOSMemory()
-	}
+	go func() {
+		log.Infoln("[APP] request force GC")
+		runtime.GC()
+	}()
 }
 
 func handleShutdown() bool {
 	stopListeners()
 	executor.Shutdown()
-	handleForceGC()
+	runtime.GC()
 	isInit = false
 	return true
 }
 
-func handleValidateConfig(path string) string {
-	buf, err := readFile(path)
-	_, err = config.UnmarshalRawConfig(buf)
+func handleValidateConfig(bytes []byte) string {
+	_, err := config.UnmarshalRawConfig(bytes)
 	if err != nil {
 		return err.Error()
 	}
 	return ""
 }
 
-func handleGetProxies() ProxiesData {
+func handleGetProxies() map[string]constant.Proxy {
 	runLock.Lock()
 	defer runLock.Unlock()
-
-	nameList := config.GetProxyNameList()
-
-	proxies := make(map[string]constant.Proxy)
-
-	for name, proxy := range tunnel.Proxies() {
-		proxies[name] = proxy
-	}
-	for _, p := range tunnel.Providers() {
-		for _, proxy := range p.Proxies() {
-			proxies[proxy.Name()] = proxy
-		}
-	}
-
-	hasGlobal := false
-	allNames := make([]string, 0, len(nameList)+1)
-
-	for _, name := range nameList {
-		if name == "GLOBAL" {
-			hasGlobal = true
-		}
-
-		p, ok := proxies[name]
-		if !ok || p == nil {
-			continue
-		}
-		switch p.Type() {
-		case constant.Selector, constant.URLTest, constant.Fallback, constant.Relay, constant.LoadBalance:
-			allNames = append(allNames, name)
-		default:
-		}
-	}
-
-	if !hasGlobal {
-		if p, ok := proxies["GLOBAL"]; ok && p != nil {
-			allNames = append([]string{"GLOBAL"}, allNames...)
-		}
-	}
-
-	return ProxiesData{
-		All:     allNames,
-		Proxies: proxies,
-	}
+	return tunnel.ProxiesWithProviders()
 }
 
 func handleChangeProxy(data string, fn func(string string)) {
@@ -184,7 +137,7 @@ func handleChangeProxy(data string, fn func(string string)) {
 }
 
 func handleGetTraffic(onlyStatisticsProxy bool) string {
-	up, down := statistic.DefaultManager.NowTraffic(onlyStatisticsProxy)
+	up, down := statistic.DefaultManager.Current(onlyStatisticsProxy)
 	traffic := map[string]int64{
 		"up":   up,
 		"down": down,
@@ -198,7 +151,7 @@ func handleGetTraffic(onlyStatisticsProxy bool) string {
 }
 
 func handleGetTotalTraffic(onlyStatisticsProxy bool) string {
-	up, down := statistic.DefaultManager.TotalTraffic(onlyStatisticsProxy)
+	up, down := statistic.DefaultManager.Total(onlyStatisticsProxy)
 	traffic := map[string]int64{
 		"up":   up,
 		"down": down,
@@ -328,9 +281,7 @@ func handleGetExternalProviders() string {
 		}
 		eps = append(eps, *externalProvider)
 	}
-	slices.SortFunc(eps, func(a, b ExternalProvider) int {
-		return cmp.Compare(a.Name, b.Name)
-	})
+	sort.Sort(ExternalProviders(eps))
 	data, err := json.Marshal(eps)
 	if err != nil {
 		return ""
@@ -532,17 +483,14 @@ func handleDelFile(path string, result ActionResult) {
 }
 
 func handleSetupConfig(bytes []byte) string {
-	if !isInit {
-		return "not initialized"
-	}
 	var params = defaultSetupParams()
 	err := UnmarshalJson(bytes, params)
 	if err != nil {
 		log.Errorln("unmarshalRawConfig error %v", err)
-		_ = applyConfig(defaultSetupParams())
+		_ = setupConfig(defaultSetupParams())
 		return err.Error()
 	}
-	err = applyConfig(params)
+	err = setupConfig(params)
 	if err != nil {
 		return err.Error()
 	}

core/lib.go

@@ -37,8 +37,6 @@ type TunHandler struct {
 }
 
 func (th *TunHandler) start(fd int, stack, address, dns string) {
-	runLock.Lock()
-	defer runLock.Unlock()
 	_ = th.limit.Acquire(context.TODO(), 4)
 	defer th.limit.Release(4)
 	th.initHook()
@@ -201,29 +199,9 @@ func invokeAction(callback unsafe.Pointer, paramsChar *C.char) {
 //export startTUN
 func startTUN(callback unsafe.Pointer, fd C.int, stackChar, addressChar, dnsChar *C.char) bool {
 	handleStartTun(callback, int(fd), takeCString(stackChar), takeCString(addressChar), takeCString(dnsChar))
-	if !isRunning {
-		handleStartListener()
-	} else {
-		handleResetConnections()
-	}
 	return true
 }
 
-//export quickSetup
-func quickSetup(callback unsafe.Pointer, initParamsChar *C.char, setupParamsChar *C.char) {
-	go func() {
-		initParamsString := takeCString(initParamsChar)
-		setupParamsString := takeCString(setupParamsChar)
-		if !handleInitClash(initParamsString) {
-			invokeResult(callback, "init failed")
-			return
-		}
-		isRunning = true
-		message := handleSetupConfig([]byte(setupParamsString))
-		invokeResult(callback, message)
-	}()
-}
-
 //export setEventListener
 func setEventListener(listener unsafe.Pointer) {
 	if eventListener != nil || listener == nil {
@@ -261,9 +239,6 @@ func sendMessage(message Message) {
 //export stopTun
 func stopTun() {
 	handleStopTun()
-	if isRunning {
-		handleStopListener()
-	}
 }
 
 //export suspend

lib/application.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:fl_clash/common/common.dart';
@@ -25,15 +24,15 @@ class Application extends ConsumerStatefulWidget {
 }
 
 class ApplicationState extends ConsumerState<Application> {
+  Timer? _autoUpdateGroupTaskTimer;
   Timer? _autoUpdateProfilesTaskTimer;
-  bool _preHasVpn = false;
 
   final _pageTransitionsTheme = const PageTransitionsTheme(
     builders: <TargetPlatform, PageTransitionsBuilder>{
-      TargetPlatform.android: commonSharedXPageTransitions,
-      TargetPlatform.windows: commonSharedXPageTransitions,
-      TargetPlatform.linux: commonSharedXPageTransitions,
-      TargetPlatform.macOS: commonSharedXPageTransitions,
+      TargetPlatform.android: CommonPageTransitionsBuilder(),
+      TargetPlatform.windows: CommonPageTransitionsBuilder(),
+      TargetPlatform.linux: CommonPageTransitionsBuilder(),
+      TargetPlatform.macOS: CommonPageTransitionsBuilder(),
     },
   );
 
@@ -47,22 +46,22 @@ class ApplicationState extends ConsumerState<Application> {
   @override
   void initState() {
     super.initState();
+    _autoUpdateProfilesTask();
+    globalState.appController = AppController(context, ref);
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
       final currentContext = globalState.navigatorKey.currentContext;
       if (currentContext != null) {
-        await appController.attach(currentContext, ref);
-      } else {
-        exit(0);
+        globalState.appController = AppController(currentContext, ref);
       }
-      _autoUpdateProfilesTask();
-      appController.initLink();
+      await globalState.appController.init();
+      globalState.appController.initLink();
       app?.initShortcuts();
     });
   }
 
   void _autoUpdateProfilesTask() {
     _autoUpdateProfilesTaskTimer = Timer(const Duration(minutes: 20), () async {
-      await appController.autoUpdateProfiles();
+      await globalState.appController.autoUpdateProfiles();
       _autoUpdateProfilesTask();
     });
   }
@@ -83,13 +82,11 @@ class ApplicationState extends ConsumerState<Application> {
       child: CoreManager(
         child: ConnectivityManager(
           onConnectivityChanged: (results) async {
-            commonPrint.log('connectivityChanged ${results.toString()}');
-            appController.updateLocalIp();
-            final hasVpn = results.contains(ConnectivityResult.vpn);
-            if (_preHasVpn == hasVpn) {
-              appController.addCheckIp();
+            if (!results.contains(ConnectivityResult.vpn)) {
+              coreController.closeConnections();
             }
-            _preHasVpn = hasVpn;
+            globalState.appController.updateLocalIp();
+            globalState.appController.addCheckIpNumDebounce();
           },
           child: child,
         ),
@@ -105,7 +102,7 @@ class ApplicationState extends ConsumerState<Application> {
   }
 
   Widget _buildApp({required Widget child}) {
-    return StatusManager(child: ThemeManager(child: child));
+    return MessageManager(child: ThemeManager(child: child));
   }
 
   @override
@@ -165,9 +162,11 @@ class ApplicationState extends ConsumerState<Application> {
   @override
   Future<void> dispose() async {
     linkManager.destroy();
+    _autoUpdateGroupTaskTimer?.cancel();
     _autoUpdateProfilesTaskTimer?.cancel();
     await coreController.destroy();
-    await appController.handleExit();
+    await globalState.appController.savePreferences();
+    await globalState.appController.handleExit();
     super.dispose();
   }
 }

lib/common/app_localizations.dart

@@ -1,3 +1,3 @@
 import 'package:fl_clash/l10n/l10n.dart';
 
-final appLocalizations = AppLocalizations.current;
+final appLocalizations = AppLocalizations.current;

lib/common/archive.dart

@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:archive/archive_io.dart';
@@ -6,9 +7,6 @@ import 'package:path/path.dart';
 extension ArchiveExt on Archive {
   void addDirectoryToArchive(String dirPath, String parentPath) {
     final dir = Directory(dirPath);
-    if (!dir.existsSync()) {
-      return;
-    }
     final entities = dir.listSync(recursive: false);
     for (final entity in entities) {
       final relativePath = relative(entity.path, from: parentPath);
@@ -17,11 +15,14 @@ extension ArchiveExt on Archive {
         final archiveFile = ArchiveFile(relativePath, data.length, data);
         addFile(archiveFile);
       }
+      // else if (entity is Directory) {
+      //   addDirectoryToArchive(entity.path, parentPath);
+      // }
     }
   }
 
-  // void addTextFile<T>(String name, T raw) {
-  //   final data = json.encode(raw);
-  //   addFile(ArchiveFile.string(name, data));
-  // }
+  void addTextFile<T>(String name, T raw) {
+    final data = json.encode(raw);
+    addFile(ArchiveFile.string(name, data));
+  }
 }

lib/common/common.dart

@@ -6,21 +6,17 @@ export 'constant.dart';
 export 'context.dart';
 export 'converter.dart';
 export 'datetime.dart';
-export 'file.dart';
 export 'fixed.dart';
 export 'function.dart';
 export 'future.dart';
-export 'hive.dart';
 export 'http.dart';
 export 'icons.dart';
-export 'indexing.dart';
 export 'iterable.dart';
 export 'keyboard.dart';
 export 'launch.dart';
 export 'link.dart';
 export 'lock.dart';
 export 'measure.dart';
-export 'migration.dart';
 export 'mixin.dart';
 export 'navigation.dart';
 export 'navigator.dart';
@@ -36,12 +32,9 @@ export 'proxy.dart';
 export 'render.dart';
 export 'request.dart';
 export 'scroll.dart';
-export 'snowflake.dart';
 export 'string.dart';
 export 'system.dart';
-export 'task.dart';
 export 'text.dart';
 export 'tray.dart';
 export 'utils.dart';
 export 'window.dart';
-export 'yaml.dart';

lib/common/compute.dart

@@ -1,65 +1,65 @@
-import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 
+import 'string.dart';
+
 List<Group> computeSort({
   required List<Group> groups,
   required ProxiesSortType sortType,
   required DelayMap delayMap,
-  required Map<String, String> selectedMap,
+  required SelectedMap selectedMap,
   required String defaultTestUrl,
 }) {
-  List<Proxy> sortOfDelay({
-    required List<Group> groups,
-    required List<Proxy> proxies,
-    required DelayMap delayMap,
-    required Map<String, String> selectedMap,
-    required String testUrl,
-  }) {
-    return List.from(proxies)..sort((a, b) {
-      final aDelayState = computeProxyDelayState(
-        proxyName: a.name,
-        testUrl: testUrl,
-        groups: groups,
-        selectedMap: selectedMap,
-        delayMap: delayMap,
-      );
-      final bDelayState = computeProxyDelayState(
-        proxyName: b.name,
-        testUrl: testUrl,
-        groups: groups,
-        selectedMap: selectedMap,
-        delayMap: delayMap,
-      );
-      return aDelayState.compareTo(bDelayState);
-    });
-  }
-
-  List<Proxy> sortOfName(List<Proxy> proxies) {
-    return List.of(proxies)..sort((a, b) => a.name.compareTo(b.name));
-  }
-
   return groups.map((group) {
     final proxies = group.all;
     final newProxies = switch (sortType) {
       ProxiesSortType.none => proxies,
-      ProxiesSortType.delay => sortOfDelay(
+      ProxiesSortType.delay => _sortOfDelay(
         groups: groups,
         proxies: proxies,
         delayMap: delayMap,
         selectedMap: selectedMap,
-        testUrl: group.testUrl.takeFirstValid([defaultTestUrl]),
+        testUrl: group.testUrl.getSafeValue(defaultTestUrl),
       ),
-      ProxiesSortType.name => sortOfName(proxies),
+      ProxiesSortType.name => _sortOfName(proxies),
     };
     return group.copyWith(all: newProxies);
   }).toList();
 }
 
-SelectedProxyState getRealSelectedProxyState(
+DelayState computeProxyDelayState({
+  required String proxyName,
+  required String testUrl,
+  required List<Group> groups,
+  required SelectedMap selectedMap,
+  required DelayMap delayMap,
+}) {
+  final state = computeRealSelectedProxyState(
+    proxyName,
+    groups: groups,
+    selectedMap: selectedMap,
+  );
+  final currentDelayMap = delayMap[state.testUrl.getSafeValue(testUrl)] ?? {};
+  final delay = currentDelayMap[state.proxyName];
+  return DelayState(delay: delay ?? 0, group: state.group);
+}
+
+SelectedProxyState computeRealSelectedProxyState(
+  String proxyName, {
+  required List<Group> groups,
+  required SelectedMap selectedMap,
+}) {
+  return _getRealSelectedProxyState(
+    SelectedProxyState(proxyName: proxyName),
+    groups: groups,
+    selectedMap: selectedMap,
+  );
+}
+
+SelectedProxyState _getRealSelectedProxyState(
   SelectedProxyState state, {
   required List<Group> groups,
-  required Map<String, String> selectedMap,
+  required SelectedMap selectedMap,
 }) {
   if (state.proxyName.isEmpty) return state;
   final index = groups.indexWhere((element) => element.name == state.proxyName);
@@ -72,39 +72,39 @@ SelectedProxyState getRealSelectedProxyState(
   if (currentSelectedName.isEmpty) {
     return newState;
   }
-  return getRealSelectedProxyState(
+  return _getRealSelectedProxyState(
     newState.copyWith(proxyName: currentSelectedName, testUrl: group.testUrl),
     groups: groups,
     selectedMap: selectedMap,
   );
 }
 
-SelectedProxyState computeRealSelectedProxyState(
-  String proxyName, {
+List<Proxy> _sortOfDelay({
   required List<Group> groups,
-  required Map<String, String> selectedMap,
+  required List<Proxy> proxies,
+  required DelayMap delayMap,
+  required SelectedMap selectedMap,
+  required String testUrl,
 }) {
-  return getRealSelectedProxyState(
-    SelectedProxyState(proxyName: proxyName),
-    groups: groups,
-    selectedMap: selectedMap,
-  );
+  return List.from(proxies)..sort((a, b) {
+    final aDelayState = computeProxyDelayState(
+      proxyName: a.name,
+      testUrl: testUrl,
+      groups: groups,
+      selectedMap: selectedMap,
+      delayMap: delayMap,
+    );
+    final bDelayState = computeProxyDelayState(
+      proxyName: b.name,
+      testUrl: testUrl,
+      groups: groups,
+      selectedMap: selectedMap,
+      delayMap: delayMap,
+    );
+    return aDelayState.compareTo(bDelayState);
+  });
 }
 
-DelayState computeProxyDelayState({
-  required String proxyName,
-  required String testUrl,
-  required List<Group> groups,
-  required Map<String, String> selectedMap,
-  required DelayMap delayMap,
-}) {
-  final state = computeRealSelectedProxyState(
-    proxyName,
-    groups: groups,
-    selectedMap: selectedMap,
-  );
-  final currentDelayMap =
-      delayMap[state.testUrl.takeFirstValid([testUrl])] ?? {};
-  final delay = currentDelayMap[state.proxyName];
-  return DelayState(delay: delay ?? 0, group: state.group);
+List<Proxy> _sortOfName(List<Proxy> proxies) {
+  return List.of(proxies)..sort((a, b) => a.name.compareTo(b.name));
 }

lib/common/constant.dart

@@ -20,17 +20,9 @@ const helperPort = 47890;
 const maxTextScale = 1.4;
 const minTextScale = 0.8;
 final baseInfoEdgeInsets = EdgeInsets.symmetric(
-  vertical: 16.mAp,
-  horizontal: 16.mAp,
+  vertical: 16.ap,
+  horizontal: 16.ap,
 );
-final listHeaderPadding = EdgeInsets.only(
-  left: 16.mAp,
-  right: 8.mAp,
-  top: 24.mAp,
-  bottom: 8.mAp,
-);
-
-const watchExecution = true;
 
 final defaultTextScaleFactor =
     WidgetsBinding.instance.platformDispatcher.textScaleFactor;
@@ -65,26 +57,18 @@ final commonFilter = ImageFilter.blur(
   tileMode: TileMode.mirror,
 );
 
-const listEquality = ListEquality();
 const navigationItemListEquality = ListEquality<NavigationItem>();
 const trackerInfoListEquality = ListEquality<TrackerInfo>();
 const stringListEquality = ListEquality<String>();
 const intListEquality = ListEquality<int>();
 const logListEquality = ListEquality<Log>();
 const groupListEquality = ListEquality<Group>();
-const ruleListEquality = ListEquality<Rule>();
-const scriptListEquality = ListEquality<Script>();
 const externalProviderListEquality = ListEquality<ExternalProvider>();
 const packageListEquality = ListEquality<Package>();
-const profileListEquality = ListEquality<Profile>();
 const hotKeyActionListEquality = ListEquality<HotKeyAction>();
 const stringAndStringMapEquality = MapEquality<String, String>();
-const stringAndStringMapEntryListEquality =
-    ListEquality<MapEntry<String, String>>();
 const stringAndStringMapEntryIterableEquality =
     IterableEquality<MapEntry<String, String>>();
-const stringAndObjectMapEntryIterableEquality =
-    IterableEquality<MapEntry<String, Object?>>();
 const delayMapEquality = MapEquality<String, Map<String, int?>>();
 const stringSetEquality = SetEquality<String>();
 const keyboardModifierListEquality = SetEquality<KeyboardModifier>();
@@ -102,8 +86,7 @@ const profilesStoreKey = PageStorageKey<String>('profiles');
 const defaultPrimaryColor = 0XFFD8C0C3;
 
 double getWidgetHeight(num lines) {
-  final space = 14.mAp;
-  return max(lines * (80.ap + space) - space, 0);
+  return max(lines * 80 + (lines - 1) * 16, 0).ap;
 }
 
 const maxLength = 1000;
@@ -126,6 +109,3 @@ const scriptTemplate = '''
 const main = (config) => {
   return config;
 }''';
-
-const backupDatabaseName = 'database.sqlite';
-const configJsonName = 'config.json';

lib/common/context.dart

@@ -1,6 +1,4 @@
-import 'package:fl_clash/l10n/l10n.dart';
-import 'package:fl_clash/manager/manager.dart';
-import 'package:fl_clash/models/state.dart';
+import 'package:fl_clash/manager/message_manager.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
 
@@ -9,11 +7,8 @@ extension BuildContextExtension on BuildContext {
     return findAncestorStateOfType<CommonScaffoldState>();
   }
 
-  void showNotifier(String text, {MessageActionState? actionState}) {
-    return findAncestorStateOfType<StatusManagerState>()?.message(
-      text,
-      actionState: actionState,
-    );
+  void showNotifier(String text) {
+    return findAncestorStateOfType<MessageManagerState>()?.message(text);
   }
 
   void showSnackBar(String message, {SnackBarAction? action}) {
@@ -47,8 +42,6 @@ extension BuildContextExtension on BuildContext {
 
   TextTheme get textTheme => Theme.of(this).textTheme;
 
-  AppLocalizations get appLocalizations => AppLocalizations.of(this);
-
   T? findLastStateOfType<T extends State>() {
     T? state;
 

lib/common/datetime.dart

@@ -17,25 +17,23 @@ extension DateTimeExtension on DateTime {
     final difference = currentDateTime.difference(this);
     final days = difference.inDays;
     if (days >= 365) {
-      final years = (days / 365).floor();
-      return appLocalizations.yearsAgo(years);
+      return '${(days / 365).floor()} ${appLocalizations.years}${appLocalizations.ago}';
     }
     if (days >= 30) {
-      final months = (days / 30).floor();
-      return appLocalizations.monthsAgo(months);
+      return '${(days / 30).floor()} ${appLocalizations.months}${appLocalizations.ago}';
     }
     if (days >= 1) {
-      return appLocalizations.daysAgo(days);
+      return '$days ${appLocalizations.days}${appLocalizations.ago}';
     }
     final hours = difference.inHours;
     if (hours >= 1) {
-      return appLocalizations.hoursAgo(hours);
+      return '$hours ${appLocalizations.hours}${appLocalizations.ago}';
     }
     final minutes = difference.inMinutes;
     if (minutes >= 1) {
-      return appLocalizations.minutesAgo(minutes);
+      return '$minutes ${appLocalizations.minutes}${appLocalizations.ago}';
     }
-    return appLocalizations.justNow;
+    return appLocalizations.just;
   }
 
   String get show {

lib/common/dav_client.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:typed_data';
 
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/models.dart';
@@ -9,10 +10,19 @@ class DAVClient {
   Completer<bool> pingCompleter = Completer();
   late String fileName;
 
-  DAVClient(DAVProps dav) {
-    client = newClient(dav.uri, user: dav.user, password: dav.password);
+  DAVClient(DAV dav) {
+    client = newClient(
+      dav.uri,
+      user: dav.user,
+      password: dav.password,
+    );
     fileName = dav.fileName;
-    client.setHeaders({'accept-charset': 'utf-8', 'Content-Type': 'text/xml'});
+    client.setHeaders(
+      {
+        'accept-charset': 'utf-8',
+        'Content-Type': 'text/xml',
+      },
+    );
     client.setConnectTimeout(8000);
     client.setSendTimeout(60000);
     client.setReceiveTimeout(60000);
@@ -32,16 +42,15 @@ class DAVClient {
 
   String get backupFile => '$root/$fileName';
 
-  Future<bool> backup(String localFilePath) async {
+  Future<bool> backup(Uint8List data) async {
     await client.mkdir(root);
-    await client.writeFromFile(localFilePath, backupFile);
+    await client.write(backupFile, data);
     return true;
   }
 
-  Future<bool> restore() async {
+  Future<List<int>> recovery() async {
     await client.mkdir(root);
-    final backupFilePath = await appPath.backupFilePath;
-    await client.read2File(backupFile, backupFilePath);
-    return true;
+    final data = await client.read(backupFile);
+    return data;
   }
 }

lib/common/file.dart

@@ -1,38 +0,0 @@
-import 'dart:io';
-
-extension FileExt on File {
-  Future<void> safeCopy(String newPath) async {
-    if (!await exists()) {
-      await create(recursive: true);
-      return;
-    }
-    final targetFile = File(newPath);
-    if (!await targetFile.exists()) {
-      await targetFile.create(recursive: true);
-    }
-    await copy(newPath);
-  }
-
-  Future<File> safeWriteAsString(String str) async {
-    if (!await exists()) {
-      await create(recursive: true);
-    }
-    return await writeAsString(str);
-  }
-
-  Future<File> safeWriteAsBytes(List<int> bytes) async {
-    if (!await exists()) {
-      await create(recursive: true);
-    }
-    return await writeAsBytes(bytes);
-  }
-}
-
-extension FileSystemEntityExt on FileSystemEntity {
-  Future<void> safeDelete({bool recursive = false}) async {
-    if (!await exists()) {
-      return;
-    }
-    await delete(recursive: recursive);
-  }
-}

lib/common/function.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 
 class Debouncer {
@@ -37,25 +36,16 @@ class Throttler {
     Function func, {
     List<dynamic>? args,
     Duration duration = const Duration(milliseconds: 600),
-    bool fire = false,
   }) {
     final timer = _operations[tag];
     if (timer != null) {
       return true;
     }
-    if (fire) {
+    _operations[tag] = Timer(duration, () {
+      _operations[tag]?.cancel();
+      _operations.remove(tag);
       Function.apply(func, args);
-      _operations[tag] = Timer(duration, () {
-        _operations[tag]?.cancel();
-        _operations.remove(tag);
-      });
-    } else {
-      _operations[tag] = Timer(duration, () {
-        Function.apply(func, args);
-        _operations[tag]?.cancel();
-        _operations.remove(tag);
-      });
-    }
+    });
     return false;
   }
 
@@ -69,7 +59,7 @@ Future<T> retry<T>({
   required Future<T> Function() task,
   int maxAttempts = 3,
   required bool Function(T res) retryIf,
-  Duration delay = midDuration,
+  Duration delay = Duration.zero,
 }) async {
   int attempts = 0;
   while (attempts < maxAttempts) {
@@ -79,7 +69,7 @@ Future<T> retry<T>({
     }
     attempts++;
   }
-  throw 'retry error';
+  throw 'unknown error';
 }
 
 final debouncer = Debouncer();

lib/common/future.dart

@@ -10,14 +10,14 @@ extension FutureExt<T> on Future<T> {
     VoidCallback? onLast,
     FutureOr<T> Function()? onTimeout,
   }) {
-    final realTimeout = timeout ?? const Duration(minutes: 3);
-    Timer(realTimeout + commonDuration, () {
+    final realTimout = timeout ?? const Duration(minutes: 3);
+    Timer(realTimout + commonDuration, () {
       if (onLast != null) {
         onLast();
       }
     });
     return this.timeout(
-      realTimeout,
+      realTimout,
       onTimeout: () async {
         if (onTimeout != null) {
           return onTimeout();

lib/common/http.dart

@@ -1,15 +1,15 @@
 import 'dart:io';
 
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/controller.dart';
+import 'package:fl_clash/state.dart';
 
 class FlClashHttpOverrides extends HttpOverrides {
   static String handleFindProxy(Uri url) {
     if ([localhost].contains(url.host)) {
       return 'DIRECT';
     }
-    final port = appController.config.patchClashConfig.mixedPort;
-    final isStart = appController.isStart;
+    final port = globalState.config.patchClashConfig.mixedPort;
+    final isStart = globalState.appState.runTime != null;
     commonPrint.log('find $url proxy:$isStart');
     if (!isStart) return 'DIRECT';
     return 'PROXY localhost:$port';

lib/common/indexing.dart

@@ -1,260 +0,0 @@
-import 'dart:math';
-
-class Indexing {
-  static const String digits =
-      '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-
-  static const String integerZero = 'a0';
-  static const String smallestInteger = 'A00000000000000000000000000';
-
-  static Indexing? _instance;
-
-  Indexing._internal();
-
-  factory Indexing() {
-    _instance ??= Indexing._internal();
-    return _instance!;
-  }
-
-  int _getIntegerLength(String head) {
-    if (head.compareTo('a') >= 0 && head.compareTo('z') <= 0) {
-      return head.codeUnitAt(0) - 'a'.codeUnitAt(0) + 2;
-    } else if (head.compareTo('A') >= 0 && head.compareTo('Z') <= 0) {
-      return 'Z'.codeUnitAt(0) - head.codeUnitAt(0) + 2;
-    } else {
-      throw Exception('Invalid order key head: $head');
-    }
-  }
-
-  bool _validateInteger(String integer) {
-    if (integer.length != _getIntegerLength(integer[0])) {
-      throw Exception('Invalid integer part of order key: $integer');
-    }
-    return true;
-  }
-
-  String? _incrementInteger(String x) {
-    _validateInteger(x);
-    String head = x[0];
-    List<String> digs = x.substring(1).split('');
-
-    bool carry = true;
-
-    for (int i = digs.length - 1; carry && i >= 0; i--) {
-      int d = digits.indexOf(digs[i]) + 1;
-      if (d == digits.length) {
-        digs[i] = '0';
-      } else {
-        digs[i] = digits[d];
-        carry = false;
-      }
-    }
-
-    if (carry) {
-      if (head == 'Z') {
-        return 'a0';
-      }
-      if (head == 'z') {
-        return null;
-      }
-      String h = String.fromCharCode(head.codeUnitAt(0) + 1);
-      if (h.compareTo('a') > 0) {
-        digs.add('0');
-      } else {
-        digs.removeLast();
-      }
-      return h + digs.join('');
-    } else {
-      return head + digs.join('');
-    }
-  }
-
-  String? _decrementInteger(String x) {
-    _validateInteger(x);
-    String head = x[0];
-    List<String> digs = x.substring(1).split('');
-
-    bool borrow = true;
-
-    for (int i = digs.length - 1; borrow && i >= 0; i--) {
-      int d = digits.indexOf(digs[i]) - 1;
-      if (d == -1) {
-        digs[i] = digits[digits.length - 1];
-      } else {
-        digs[i] = digits[d];
-        borrow = false;
-      }
-    }
-
-    if (borrow) {
-      if (head == 'a') {
-        return 'Z${digits[digits.length - 1]}';
-      }
-      if (head == 'A') {
-        return null;
-      }
-      String h = String.fromCharCode(head.codeUnitAt(0) - 1);
-      if (h.compareTo('Z') < 0) {
-        digs.add(digits[digits.length - 1]);
-      } else {
-        digs.removeLast();
-      }
-      return h + digs.join('');
-    } else {
-      return head + digs.join('');
-    }
-  }
-
-  String _midpoint(String a, String? b) {
-    if (b != null && a.compareTo(b) >= 0) {
-      throw Exception(
-        'Second order key must be greater than the first: $a, $b',
-      );
-    }
-
-    if (a.isNotEmpty && a[a.length - 1] == '0' ||
-        (b != null && b.isNotEmpty && b[b.length - 1] == '0')) {
-      throw Exception('Trailing zeros are not allowed: $a, $b');
-    }
-
-    if (b != null) {
-      int n = 0;
-      while ((n < a.length ? a[n] : '0') == b[n]) {
-        n++;
-      }
-
-      if (n > 0) {
-        return b.substring(0, n) +
-            _midpoint(
-              a.substring(min(n, a.length)),
-              b.substring(min(n, b.length)),
-            );
-      }
-    }
-
-    int digitA = (a.isNotEmpty) ? digits.indexOf(a[0]) : 0;
-    int digitB = (b != null && b.isNotEmpty)
-        ? digits.indexOf(b[0])
-        : digits.length;
-
-    if (digitB - digitA > 1) {
-      int midDigit = (digitA + digitB + 1) ~/ 2;
-      return digits[midDigit];
-    } else {
-      if (b != null && b.length > 1) {
-        return b.substring(0, 1);
-      } else {
-        return digits[digitA] +
-            _midpoint(a.isNotEmpty ? a.substring(1) : '', null);
-      }
-    }
-  }
-
-  String _getIntegerPart(String key) {
-    int integerPartLength = _getIntegerLength(key[0]);
-    if (integerPartLength > key.length) {
-      throw Exception('Invalid order key: $key');
-    }
-    return key.substring(0, integerPartLength);
-  }
-
-  bool _validateOrderKey(String key) {
-    if (key == smallestInteger) {
-      throw Exception('Invalid order key: $key');
-    }
-
-    String i = _getIntegerPart(key);
-    String f = key.substring(i.length);
-    if (f.isNotEmpty && f[f.length - 1] == '0') {
-      throw Exception('Invalid order key: $key');
-    }
-    return true;
-  }
-
-  String? generateKeyBetween(String? a, String? b) {
-    if (a != null) {
-      _validateOrderKey(a);
-    }
-
-    if (b != null) {
-      _validateOrderKey(b);
-    }
-
-    if (a != null && b != null && a.compareTo(b) >= 0) {
-      throw Exception(
-        'Second order key must be greater than the first: $a, $b',
-      );
-    }
-
-    if (a == null && b == null) {
-      return integerZero;
-    }
-
-    if (a == null) {
-      b = b!;
-      String ib = _getIntegerPart(b);
-      String fb = b.substring(ib.length);
-      if (ib == smallestInteger) {
-        return ib + _midpoint('', fb);
-      }
-      return ib.compareTo(b) < 0 ? ib : _decrementInteger(ib);
-    }
-
-    if (b == null) {
-      String ia = _getIntegerPart(a);
-      String fa = a.substring(ia.length);
-      String? i = _incrementInteger(ia);
-      return i ?? ia + _midpoint(fa, null);
-    }
-
-    String ia = _getIntegerPart(a);
-    String fa = a.substring(ia.length);
-    String ib = _getIntegerPart(b);
-    String fb = b.substring(ib.length);
-
-    if (ia == ib) {
-      return ia + _midpoint(fa, fb);
-    }
-
-    String? i = _incrementInteger(ia);
-    return (i == null || i.compareTo(b) < 0) ? i : ia + _midpoint(fa, null);
-  }
-
-  List<String?> generateNKeysBetween(String? a, String? b, int n) {
-    if (n <= 0) {
-      return [];
-    }
-    if (n == 1) {
-      return [generateKeyBetween(a, b)];
-    }
-
-    if (b == null) {
-      String? c = generateKeyBetween(a, b);
-      List<String?> result = [c];
-      for (int i = 1; i < n; i++) {
-        c = generateKeyBetween(c, b);
-        result.add(c);
-      }
-      return result;
-    }
-
-    if (a == null) {
-      String? c = generateKeyBetween(a, b);
-      List<String?> result = [c];
-      for (int i = 1; i < n; i++) {
-        c = generateKeyBetween(a, c);
-        result.add(c);
-      }
-      return result.reversed.toList();
-    }
-
-    int mid = n ~/ 2;
-    String? c = generateKeyBetween(a, b);
-    return generateNKeysBetween(a, c, mid)
-        .followedBy([c])
-        .followedBy(generateNKeysBetween(c, b, n - mid - 1))
-        .toList();
-  }
-}
-
-final indexing = Indexing();

lib/common/iterable.dart

@@ -1,5 +1,5 @@
-extension IterableExt<E> on Iterable<E> {
-  Iterable<E> separated(E separator) sync* {
+extension IterableExt<T> on Iterable<T> {
+  Iterable<T> separated(T separator) sync* {
     final iterator = this.iterator;
     if (!iterator.moveNext()) return;
 
@@ -11,7 +11,7 @@ extension IterableExt<E> on Iterable<E> {
     }
   }
 
-  Iterable<List<E>> chunks(int size) sync* {
+  Iterable<List<T>> chunks(int size) sync* {
     if (length == 0) return;
     var iterator = this.iterator;
     while (iterator.moveNext()) {
@@ -23,7 +23,10 @@ extension IterableExt<E> on Iterable<E> {
     }
   }
 
-  Iterable<E> fill(int length, {required E Function(int count) filler}) sync* {
+  Iterable<T> fill(
+    int length, {
+    required T Function(int count) filler,
+  }) sync* {
     int count = 0;
     for (var item in this) {
       yield item;
@@ -36,7 +39,7 @@ extension IterableExt<E> on Iterable<E> {
     }
   }
 
-  Iterable<E> takeLast({int count = 50}) {
+  Iterable<T> takeLast({int count = 50}) {
     if (count <= 0) return Iterable.empty();
     return count >= length ? this : toList().skip(length - count);
   }
@@ -78,36 +81,9 @@ extension ListExt<T> on List<T> {
     return sublist(start);
   }
 
-  T? safeGet(int index, {T? defaultValue}) {
-    if (index < 0 || index >= length) {
-      return defaultValue;
-    }
-    return this[index];
-  }
-
-  T safeLast(T defaultValue) {
-    if (isNotEmpty) {
-      return last;
-    }
-    return defaultValue;
-  }
-
-  void addOrRemove(T value) {
-    if (contains(value)) {
-      remove(value);
-    } else {
-      add(value);
-    }
-  }
-}
-
-extension SetExt<T> on Set<T> {
-  void addOrRemove(T value) {
-    if (contains(value)) {
-      remove(value);
-    } else {
-      add(value);
-    }
+  T safeGet(int index) {
+    if (length > index) return this[index];
+    return last;
   }
 }
 
@@ -144,14 +120,4 @@ extension MapExt<K, V> on Map<K, V> {
     }
     return this[key]!;
   }
-
-  Map<K, V> copyWitUpdate(K key, V? value) {
-    final newMap = Map<K, V>.from(this);
-    if (value == null) {
-      newMap.remove(key);
-    } else {
-      newMap[key] = value;
-    }
-    return newMap;
-  }
 }

lib/common/measure.dart

@@ -8,16 +8,26 @@ class Measure {
   final Map<String, dynamic> _measureMap;
 
   Measure.of(this.context, double textScaleFactor)
-    : _measureMap = {},
-      _textScaler = TextScaler.linear(textScaleFactor);
+      : _measureMap = {},
+        _textScaler = TextScaler.linear(
+          textScaleFactor,
+        );
 
-  Size computeTextSize(Text text, {double maxWidth = double.infinity}) {
+  Size computeTextSize(
+    Text text, {
+    double maxWidth = double.infinity,
+  }) {
     final textPainter = TextPainter(
-      text: TextSpan(text: text.data, style: text.style),
+      text: TextSpan(
+        text: text.data,
+        style: text.style,
+      ),
       maxLines: text.maxLines,
       textScaler: _textScaler,
       textDirection: text.textDirection ?? TextDirection.ltr,
-    )..layout(maxWidth: maxWidth);
+    )..layout(
+        maxWidth: maxWidth,
+      );
     return textPainter.size;
   }
 
@@ -25,7 +35,10 @@ class Measure {
     return _measureMap.updateCacheValue(
       'bodyMediumHeight',
       () => computeTextSize(
-        Text('X', style: context.textTheme.bodyMedium),
+        Text(
+          'X',
+          style: context.textTheme.bodyMedium,
+        ),
       ).height,
     );
   }
@@ -33,16 +46,24 @@ class Measure {
   double get bodyLargeHeight {
     return _measureMap.updateCacheValue(
       'bodyLargeHeight',
-      () =>
-          computeTextSize(Text('X', style: context.textTheme.bodyLarge)).height,
+      () => computeTextSize(
+        Text(
+          'X',
+          style: context.textTheme.bodyLarge,
+        ),
+      ).height,
     );
   }
 
   double get bodySmallHeight {
     return _measureMap.updateCacheValue(
       'bodySmallHeight',
-      () =>
-          computeTextSize(Text('X', style: context.textTheme.bodySmall)).height,
+      () => computeTextSize(
+        Text(
+          'X',
+          style: context.textTheme.bodySmall,
+        ),
+      ).height,
     );
   }
 
@@ -50,16 +71,10 @@ class Measure {
     return _measureMap.updateCacheValue(
       'labelSmallHeight',
       () => computeTextSize(
-        Text('X', style: context.textTheme.labelSmall),
-      ).height,
-    );
-  }
-
-  double get titleSmallHeight {
-    return _measureMap.updateCacheValue(
-      'titleSmallHeight',
-      () => computeTextSize(
-        Text('X', style: context.textTheme.titleSmall),
+        Text(
+          'X',
+          style: context.textTheme.labelSmall,
+        ),
       ).height,
     );
   }
@@ -68,7 +83,10 @@ class Measure {
     return _measureMap.updateCacheValue(
       'labelMediumHeight',
       () => computeTextSize(
-        Text('X', style: context.textTheme.labelMedium),
+        Text(
+          'X',
+          style: context.textTheme.labelMedium,
+        ),
       ).height,
     );
   }
@@ -77,7 +95,10 @@ class Measure {
     return _measureMap.updateCacheValue(
       'titleLargeHeight',
       () => computeTextSize(
-        Text('X', style: context.textTheme.titleLarge),
+        Text(
+          'X',
+          style: context.textTheme.titleLarge,
+        ),
       ).height,
     );
   }
@@ -86,7 +107,10 @@ class Measure {
     return _measureMap.updateCacheValue(
       'titleMediumHeight',
       () => computeTextSize(
-        Text('X', style: context.textTheme.titleMedium),
+        Text(
+          'X',
+          style: context.textTheme.titleMedium,
+        ),
       ).height,
     );
   }

lib/common/migration.dart

@@ -1,53 +0,0 @@
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/models.dart';
-
-class Migration {
-  static Migration? _instance;
-  late int _oldVersion;
-
-  Migration._internal();
-
-  final currentVersion = 1;
-
-  factory Migration() {
-    _instance ??= Migration._internal();
-    return _instance!;
-  }
-
-  Future<Config> migrationIfNeeded(
-    Map<String, Object?>? configMap, {
-    required Future<Config> Function(MigrationData data) sync,
-  }) async {
-    _oldVersion = await preferences.getVersion();
-    if (_oldVersion == currentVersion) {
-      try {
-        return Config.realFromJson(configMap);
-      } catch (_) {
-        final isV0 = configMap?['proxiesStyle'] != null;
-        if (isV0) {
-          _oldVersion = 0;
-        } else {
-          throw 'Local data is damaged. A reset is required to fix this issue.';
-        }
-      }
-    }
-    MigrationData data = MigrationData(configMap: configMap);
-    if (_oldVersion == 0 && configMap != null) {
-      final clashConfigMap = await preferences.getClashConfigMap();
-      if (clashConfigMap != null) {
-        configMap['patchClashConfig'] = clashConfigMap;
-        await preferences.clearClashConfig();
-      }
-      data = await _oldToNow(configMap);
-    }
-    final res = await sync(data);
-    await preferences.setVersion(currentVersion);
-    return res;
-  }
-
-  Future<MigrationData> _oldToNow(Map<String, Object?> configMap) async {
-    return await oldToNowTask(configMap);
-  }
-}
-
-final migration = Migration();

lib/common/mixin.dart

@@ -2,21 +2,17 @@ import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 mixin AutoDisposeNotifierMixin<T> on AnyNotifier<T, T> {
-  T get value => state;
-
   set value(T value) {
-    state = value;
-  }
-
-  bool equals(T previous, T next) {
-    return false;
+    if (ref.mounted) {
+      state = value;
+    } else {
+      onUpdate(value);
+    }
   }
 
   @override
   bool updateShouldNotify(previous, next) {
-    final res = !equals(previous, next)
-        ? super.updateShouldNotify(previous, next)
-        : true;
+    final res = super.updateShouldNotify(previous, next);
     if (res) {
       onUpdate(next);
     }
@@ -24,20 +20,27 @@ mixin AutoDisposeNotifierMixin<T> on AnyNotifier<T, T> {
   }
 
   void onUpdate(T value) {}
-
-  void update(T? Function(T) builder) {
-    final res = builder(value);
-    if (res == null) {
-      return;
-    }
-    value = res;
-  }
 }
 
-mixin AsyncNotifierMixin<T> on AnyNotifier<AsyncValue<T>, T> {
+mixin AnyNotifierMixin<T> on AnyNotifier<T, T> {
   T get value;
 
   set value(T value) {
-    state = AsyncData(value);
+    if (ref.mounted) {
+      state = value;
+    } else {
+      onUpdate(value);
+    }
   }
+
+  @override
+  bool updateShouldNotify(previous, next) {
+    final res = super.updateShouldNotify(previous, next);
+    if (res) {
+      onUpdate(next);
+    }
+    return res;
+  }
+
+  void onUpdate(T value) {}
 }

lib/common/navigator.dart

@@ -1,11 +1,12 @@
-import 'package:animations/animations.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/controller.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 
 class BaseNavigator {
   static Future<T?> push<T>(BuildContext context, Widget child) async {
-    if (!appController.isMobile) {
+    if (globalState.appState.viewMode != ViewMode.mobile) {
       return await Navigator.of(
         context,
       ).push<T>(CommonDesktopRoute(builder: (context) => child));
@@ -31,11 +32,6 @@ class BaseNavigator {
   // }
 }
 
-const commonSharedXPageTransitions = SharedAxisPageTransitionsBuilder(
-  transitionType: SharedAxisTransitionType.horizontal,
-  fillColor: Colors.transparent,
-);
-
 class CommonDesktopRoute<T> extends PageRoute<T> {
   final Widget Function(BuildContext context) builder;
 
@@ -71,45 +67,14 @@ class CommonDesktopRoute<T> extends PageRoute<T> {
   Duration get reverseTransitionDuration => Duration(milliseconds: 200);
 }
 
-class CommonRoute<T> extends PageRoute<T> {
-  final Widget Function(BuildContext context) builder;
-
-  CommonRoute({required this.builder});
+class CommonRoute<T> extends MaterialPageRoute<T> {
+  CommonRoute({required super.builder});
 
   @override
-  Color? get barrierColor => null;
+  Duration get transitionDuration => const Duration(milliseconds: 500);
 
   @override
-  String? get barrierLabel => null;
-
-  @override
-  bool get maintainState => true;
-
-  @override
-  Widget buildPage(
-    BuildContext context,
-    Animation<double> animation,
-    Animation<double> secondaryAnimation,
-  ) {
-    final Widget result = builder(context);
-    return Semantics(
-      scopesRoute: true,
-      explicitChildNodes: true,
-      child: SharedAxisTransition(
-        animation: animation,
-        secondaryAnimation: secondaryAnimation,
-        transitionType: SharedAxisTransitionType.horizontal,
-        fillColor: context.colorScheme.surface,
-        child: result,
-      ),
-    );
-  }
-
-  @override
-  Duration get transitionDuration => Duration(milliseconds: 300);
-
-  @override
-  Duration get reverseTransitionDuration => Duration(milliseconds: 300);
+  Duration get reverseTransitionDuration => const Duration(milliseconds: 500);
 }
 
 final Animatable<Offset> _kRightMiddleTween = Tween<Offset>(
@@ -169,15 +134,11 @@ class CommonPageTransition extends StatefulWidget {
     bool allowSnapshotting,
     Widget? child,
   ) {
-    final CurvedAnimation animation = CurvedAnimation(
+    final Animation<Offset> delegatedPositionAnimation = CurvedAnimation(
       parent: secondaryAnimation,
       curve: Curves.linearToEaseOut,
       reverseCurve: Curves.easeInToLinear,
-    );
-    final Animation<Offset> delegatedPositionAnimation = animation.drive(
-      _kMiddleLeftTween,
-    );
-    animation.dispose();
+    ).drive(_kMiddleLeftTween);
 
     assert(debugCheckHasDirectionality(context));
     final TextDirection textDirection = Directionality.of(context);
@@ -263,7 +224,7 @@ class _CommonPageTransitionState extends State<CommonPageTransition> {
           DecorationTween(
             begin: const _CommonEdgeShadowDecoration(),
             end: _CommonEdgeShadowDecoration(<Color>[
-              Color(0x04000000),
+              widget.context.colorScheme.inverseSurface.withValues(alpha: 0.02),
               Colors.transparent,
             ]),
           ),
@@ -314,7 +275,7 @@ class _CommonEdgeShadowPainter extends BoxPainter {
       return;
     }
 
-    final double shadowWidth = 0.05 * configuration.size!.width;
+    final double shadowWidth = 1 * configuration.size!.width;
     final double shadowHeight = configuration.size!.height;
     final double bandWidth = shadowWidth / (colors.length - 1);
 

lib/common/num.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/common.dart';
 import 'package:fl_clash/state.dart';
@@ -22,10 +20,6 @@ extension NumExt on num {
     return this * (1 + (globalState.theme.textScaleFactor - 1) * 0.5);
   }
 
-  double get mAp {
-    return this * min((1 + (globalState.theme.textScaleFactor - 1) * 0.5), 1);
-  }
-
   TrafficShow get traffic {
     final units = TrafficUnit.values;
     var size = toDouble();
@@ -39,20 +33,6 @@ extension NumExt on num {
       unit: units[unitIndex].name,
     );
   }
-
-  TrafficShow get shortTraffic {
-    final units = TrafficUnit.values;
-    var size = toDouble();
-    var unitIndex = 0;
-    while (size >= 1024 && unitIndex < units.length - 1) {
-      size /= 1024;
-      unitIndex++;
-    }
-    return TrafficShow(
-      value: size.toStringAsFixed(0),
-      unit: ' ${units[unitIndex].name}',
-    );
-  }
 }
 
 extension DoubleExt on double {

lib/common/path.dart

@@ -61,39 +61,14 @@ class AppPath {
     return directory.path;
   }
 
-  Future<String> get databasePath async {
-    final mHomeDirPath = await homeDirPath;
-    return join(mHomeDirPath, 'database.sqlite');
-  }
-
-  Future<String> get backupFilePath async {
-    final mHomeDirPath = await homeDirPath;
-    return join(mHomeDirPath, 'backup.zip');
-  }
-
-  Future<String> get restoreDirPath async {
-    final mHomeDirPath = await homeDirPath;
-    return join(mHomeDirPath, 'restore');
-  }
-
-  Future<String> get tempFilePath async {
-    final mTempDir = await tempDir.future;
-    return join(mTempDir.path, 'temp${utils.id}');
-  }
-
   Future<String> get lockFilePath async {
     final homeDirPath = await appPath.homeDirPath;
     return join(homeDirPath, 'FlClash.lock');
   }
 
   Future<String> get configFilePath async {
-    final mHomeDirPath = await homeDirPath;
-    return join(mHomeDirPath, 'config.yaml');
-  }
-
-  Future<String> get sharedFilePath async {
-    final mHomeDirPath = await homeDirPath;
-    return join(mHomeDirPath, 'shared.json');
+    final homeDirPath = await appPath.homeDirPath;
+    return join(homeDirPath, 'config.json');
   }
 
   Future<String> get sharedPreferencesPath async {
@@ -106,18 +81,9 @@ class AppPath {
     return join(directory.path, profilesDirectoryName);
   }
 
-  Future<String> getProfilePath(String fileName) async {
-    return join(await profilesPath, '$fileName.yaml');
-  }
-
-  Future<String> get scriptsDirPath async {
-    final path = await homeDirPath;
-    return join(path, 'scripts');
-  }
-
-  Future<String> getScriptPath(String fileName) async {
-    final path = await scriptsDirPath;
-    return join(path, '$fileName.js');
+  Future<String> getProfilePath(String id) async {
+    final directory = await profilesPath;
+    return join(directory, '$id.yaml');
   }
 
   Future<String> getIconsCacheDir() async {

lib/common/picker.dart

@@ -7,9 +7,9 @@ import 'package:image_picker/image_picker.dart';
 import 'package:mobile_scanner/mobile_scanner.dart';
 
 class Picker {
-  Future<PlatformFile?> pickerFile({bool withData = true}) async {
+  Future<PlatformFile?> pickerFile() async {
     final filePickerResult = await FilePicker.platform.pickFiles(
-      withData: withData,
+      withData: true,
       allowMultiple: false,
       initialDirectory: await appPath.downloadDirPath,
     );
@@ -20,33 +20,15 @@ class Picker {
     final path = await FilePicker.platform.saveFile(
       fileName: fileName,
       initialDirectory: await appPath.downloadDirPath,
-      bytes: bytes,
+      bytes: system.isAndroid ? bytes : null,
     );
     if (!system.isAndroid && path != null) {
-      final file = File(path);
-      await file.safeWriteAsBytes(bytes);
+      final file = await File(path).create(recursive: true);
+      await file.writeAsBytes(bytes);
     }
     return path;
   }
 
-  Future<String?> saveFileWithPath(String fileName, String localPath) async {
-    final localFile = File(localPath);
-    if (!await localFile.exists()) {
-      await localFile.create(recursive: true);
-    }
-    final bytes = Platform.isAndroid ? await localFile.readAsBytes() : null;
-    final path = await FilePicker.platform.saveFile(
-      fileName: fileName,
-      initialDirectory: await appPath.downloadDirPath,
-      bytes: bytes,
-    );
-    if (path != null && bytes == null) {
-      await localFile.copy(path);
-    }
-    await localFile.safeDelete();
-    return path;
-  }
-
   Future<String?> pickerConfigQRCode() async {
     final xFile = await ImagePicker().pickImage(source: ImageSource.gallery);
     if (xFile == null) {

lib/common/preferences.dart

@@ -24,70 +24,36 @@ class Preferences {
     return _instance!;
   }
 
-  Future<int> getVersion() async {
+  Future<ClashConfig?> getClashConfig() async {
     final preferences = await sharedPreferencesCompleter.future;
-    return preferences?.getInt('version') ?? 0;
-  }
-
-  Future<void> setVersion(int version) async {
-    final preferences = await sharedPreferencesCompleter.future;
-    await preferences?.setInt('version', version);
-  }
-
-  Future<void> saveShareState(SharedState shareState) async {
-    final preferences = await sharedPreferencesCompleter.future;
-    await preferences?.setString('sharedState', json.encode(shareState));
-  }
-
-  Future<Map<String, Object?>?> getConfigMap() async {
-    try {
-      final preferences = await sharedPreferencesCompleter.future;
-      final configString = preferences?.getString(configKey);
-      if (configString == null) return null;
-      final Map<String, Object?>? configMap = json.decode(configString);
-      return configMap;
-    } catch (_) {
-      return null;
-    }
-  }
-
-  Future<Map<String, Object?>?> getClashConfigMap() async {
-    try {
-      final preferences = await sharedPreferencesCompleter.future;
-      final clashConfigString = preferences?.getString(clashConfigKey);
-      if (clashConfigString == null) return null;
-      return json.decode(clashConfigString);
-    } catch (_) {
-      return null;
-    }
-  }
-
-  Future<void> clearClashConfig() async {
-    try {
-      final preferences = await sharedPreferencesCompleter.future;
-      await preferences?.remove(clashConfigKey);
-      return;
-    } catch (_) {
-      return;
-    }
+    final clashConfigString = preferences?.getString(clashConfigKey);
+    if (clashConfigString == null) return null;
+    final clashConfigMap = json.decode(clashConfigString);
+    return ClashConfig.fromJson(clashConfigMap);
   }
 
   Future<Config?> getConfig() async {
-    final configMap = await getConfigMap();
-    if (configMap == null) {
-      return null;
-    }
-    return Config.fromJson(configMap);
+    final preferences = await sharedPreferencesCompleter.future;
+    final configString = preferences?.getString(configKey);
+    if (configString == null) return null;
+    final configMap = json.decode(configString);
+    return Config.compatibleFromJson(configMap);
   }
 
   Future<bool> saveConfig(Config config) async {
     final preferences = await sharedPreferencesCompleter.future;
-    return preferences?.setString(configKey, json.encode(config)) ?? false;
+    return await preferences?.setString(configKey, json.encode(config)) ??
+        false;
+  }
+
+  Future<void> clearClashConfig() async {
+    final preferences = await sharedPreferencesCompleter.future;
+    preferences?.remove(clashConfigKey);
   }
 
   Future<void> clearPreferences() async {
     final sharedPreferencesIns = await sharedPreferencesCompleter.future;
-    await sharedPreferencesIns?.clear();
+    sharedPreferencesIns?.clear();
   }
 }
 

lib/common/print.dart

@@ -1,7 +1,6 @@
-import 'package:fl_clash/controller.dart';
-import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
-import 'package:flutter/material.dart';
+import 'package:fl_clash/state.dart';
+import 'package:flutter/cupertino.dart';
 
 class CommonPrint {
   static CommonPrint? _instance;
@@ -13,13 +12,15 @@ class CommonPrint {
     return _instance!;
   }
 
-  void log(String? text, {LogLevel logLevel = LogLevel.info}) {
+  void log(String? text) {
     final payload = '[APP] $text';
     debugPrint(payload);
-    if (!appController.isAttach) {
+    if (!globalState.isInit) {
       return;
     }
-    appController.addLog(Log.app(payload).copyWith(logLevel: logLevel));
+    globalState.appController.addLog(
+      Log.app(payload),
+    );
   }
 }
 

lib/common/request.dart

@@ -6,8 +6,6 @@ import 'dart:typed_data';
 import 'package:dio/dio.dart';
 import 'package:dio/io.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/controller.dart';
-import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/cupertino.dart';
@@ -24,7 +22,7 @@ class Request {
       createHttpClient: () {
         final client = HttpClient();
         client.findProxy = (Uri uri) {
-          client.userAgent = appController.ua;
+          client.userAgent = globalState.ua;
           return FlClashHttpOverrides.handleFindProxy(uri);
         };
         return client;
@@ -32,28 +30,16 @@ class Request {
     );
   }
 
-  Future<Response<Uint8List>> getFileResponseForUrl(String url) async {
-    try {
-      return await _clashDio.get<Uint8List>(
-        url,
-        options: Options(responseType: ResponseType.bytes),
-      );
-    } catch (e) {
-      commonPrint.log('getFileResponseForUrl error ${e.toString()}');
-      if (e is DioException) {
-        if (e.type == DioExceptionType.unknown) {
-          throw appLocalizations.unknownNetworkError;
-        } else if (e.type == DioExceptionType.badResponse) {
-          throw appLocalizations.networkException;
-        }
-        rethrow;
-      }
-      throw appLocalizations.unknownNetworkError;
-    }
+  Future<Response> getFileResponseForUrl(String url) async {
+    final response = await _clashDio.get(
+      url,
+      options: Options(responseType: ResponseType.bytes),
+    );
+    return response;
   }
 
-  Future<Response<String>> getTextResponseForUrl(String url) async {
-    final response = await _clashDio.get<String>(
+  Future<Response> getTextResponseForUrl(String url) async {
+    final response = await _clashDio.get(
       url,
       options: Options(responseType: ResponseType.plain),
     );
@@ -72,38 +58,32 @@ class Request {
   }
 
   Future<Map<String, dynamic>?> checkForUpdate() async {
-    try {
-      final response = await dio.get(
-        'https://api.github.com/repos/$repository/releases/latest',
-        options: Options(responseType: ResponseType.json),
-      );
-      if (response.statusCode != 200) return null;
-      final data = response.data as Map<String, dynamic>;
-      final remoteVersion = data['tag_name'];
-      final version = globalState.packageInfo.version;
-      final hasUpdate =
-          utils.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
-      if (!hasUpdate) return null;
-      return data;
-    } catch (e) {
-      commonPrint.log('checkForUpdate failed', logLevel: LogLevel.warning);
-      return null;
-    }
+    final response = await dio.get(
+      'https://api.github.com/repos/$repository/releases/latest',
+      options: Options(responseType: ResponseType.json),
+    );
+    if (response.statusCode != 200) return null;
+    final data = response.data as Map<String, dynamic>;
+    final remoteVersion = data['tag_name'];
+    final version = globalState.packageInfo.version;
+    final hasUpdate =
+        utils.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
+    if (!hasUpdate) return null;
+    return data;
   }
 
   final Map<String, IpInfo Function(Map<String, dynamic>)> _ipInfoSources = {
-    'https://ipwho.is': IpInfo.fromIpWhoIsJson,
-    'https://api.myip.com': IpInfo.fromMyIpJson,
-    'https://ipapi.co/json': IpInfo.fromIpApiCoJson,
-    'https://ident.me/json': IpInfo.fromIdentMeJson,
-    'http://ip-api.com/json': IpInfo.fromIpAPIJson,
-    'https://api.ip.sb/geoip': IpInfo.fromIpSbJson,
-    'https://ipinfo.io/json': IpInfo.fromIpInfoIoJson,
+    'https://ipwho.is/': IpInfo.fromIpWhoIsJson,
+    'https://api.myip.com/': IpInfo.fromMyIpJson,
+    'https://ipapi.co/json/': IpInfo.fromIpApiCoJson,
+    'https://ident.me/json/': IpInfo.fromIdentMeJson,
+    'http://ip-api.com/json/': IpInfo.fromIpAPIJson,
+    'https://api.ip.sb/geoip/': IpInfo.fromIpSbJson,
+    'https://ipinfo.io/json/': IpInfo.fromIpInfoIoJson,
   };
 
   Future<Result<IpInfo?>> checkIp({CancelToken? cancelToken}) async {
     var failureCount = 0;
-    final token = cancelToken ?? CancelToken();
     final futures = _ipInfoSources.entries.map((source) async {
       final Completer<Result<IpInfo?>> completer = Completer();
       handleFailRes() {
@@ -112,13 +92,11 @@ class Request {
         }
       }
 
-      final future = dio
-          .get<Map<String, dynamic>>(
-            source.key,
-            cancelToken: token,
-            options: Options(responseType: ResponseType.json),
-          )
-          .timeout(const Duration(seconds: 10));
+      final future = dio.get<Map<String, dynamic>>(
+        source.key,
+        cancelToken: cancelToken,
+        options: Options(responseType: ResponseType.json),
+      );
       future
           .then((res) {
             if (res.statusCode == HttpStatus.ok && res.data != null) {
@@ -138,7 +116,7 @@ class Request {
       return completer.future;
     });
     final res = await Future.any(futures);
-    token.cancel();
+    cancelToken?.cancel();
     return res;
   }
 

lib/common/snowflake.dart

@@ -1,58 +0,0 @@
-class Snowflake {
-  static Snowflake? _instance;
-
-  Snowflake._internal();
-
-  factory Snowflake() {
-    _instance ??= Snowflake._internal();
-    return _instance!;
-  }
-
-  static const int twepoch = 1704067200000;
-
-  static const int workerIdBits = 10;
-  static const int sequenceBits = 12;
-
-  static const int maxWorkerId = -1 ^ (-1 << workerIdBits);
-  static const int sequenceMask = -1 ^ (-1 << sequenceBits);
-
-  static const int workerIdShift = sequenceBits;
-  static const int timestampLeftShift = sequenceBits + workerIdBits;
-
-  final int workerId = 1;
-  int _lastTimestamp = -1;
-  int _sequence = 0;
-
-  int get id {
-    int timestamp = DateTime.now().millisecondsSinceEpoch;
-    if (timestamp < _lastTimestamp) {
-      throw ArgumentError(
-        'Clock moved backwards. Refusing to generate id for ${_lastTimestamp - timestamp} milliseconds',
-      );
-    }
-    if (timestamp == _lastTimestamp) {
-      _sequence = (_sequence + 1) & sequenceMask;
-      if (_sequence == 0) {
-        timestamp = _getNextMillis(_lastTimestamp);
-      }
-    } else {
-      _sequence = 0;
-    }
-
-    _lastTimestamp = timestamp;
-
-    return ((timestamp - twepoch) << timestampLeftShift) |
-        (workerId << workerIdShift) |
-        _sequence;
-  }
-
-  int _getNextMillis(int lastTimestamp) {
-    int timestamp = DateTime.now().millisecondsSinceEpoch;
-    while (timestamp <= lastTimestamp) {
-      timestamp = DateTime.now().millisecondsSinceEpoch;
-    }
-    return timestamp;
-  }
-}
-
-final snowflake = Snowflake();