Remake desktop

Optimize change proxy

Optimize network check

Fix fallback issues

Optimize lots of details

.github/workflows/build.yaml

@@ -27,25 +27,6 @@ jobs:
             arch: arm64
 
     steps:
-      - name: Setup Mingw64
-        if: startsWith(matrix.platform,'windows')
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: mingw64
-          install: mingw-w64-x86_64-gcc
-          update: true
-
-      - name: Set Mingw64 Env
-        if: startsWith(matrix.platform,'windows')
-        run: |
-          echo "${{ runner.temp }}\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
-      - name: Check Matrix
-        run: |
-          echo "Running on ${{ matrix.os }}"
-          echo "Arch: ${{ runner.arch }}"
-          gcc --version
-
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -79,7 +60,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: 'core/go.mod'
+          go-version: 'stable'
           cache-dependency-path: |
             core/go.sum
 
@@ -103,7 +84,6 @@ jobs:
           path: ./dist
           overwrite: true
 
-
   upload:
     permissions: write-all
     needs: [ build ]

.github/workflows/change.yaml

@@ -1,12 +1,13 @@
-name: change
+name: changelog
 
 on:
   push:
-    branches:
-      - 'main'
+    tags:
+      - 'v*'
 
 jobs:
   changelog:
+    if: ${{ !contains(github.ref, '+') }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -16,30 +17,50 @@ jobs:
 
       - name: Generate
         run: |
-          tags=$(git tag --sort=creatordate)
-          previous=""
-          if [ ! -f CHANGELOG.md ]; then
-            echo "" > CHANGELOG.md
-          else
-            previous=$(grep -oP '^## \K.*' CHANGELOG.md | tail -n 1)
-          fi
-          for tag in $tags; do
-            if [ -n "$previous" ]; then
-              echo "## $tag" >> CHANGELOG.md
-              git log --pretty=format:"* %s (%h)" "$previous..$tag" >> CHANGELOG.md
-              echo -e "\n" >> CHANGELOG.md
+          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
-            previous=$tag
+            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
+          cat CHANGELOG.md >> NEW_CHANGELOG.md
+          cat NEW_CHANGELOG.md > CHANGELOG.md
 
       - name: Commit
         run: |
-          if ！git diff --cached --quiet; then
-            git config --local user.email "action@github.com"
-            git config --local user.name "GitHub Action"
-            git add CHANGELOG.md
-            git commit -m "Update Changelog"
+          git add CHANGELOG.md
+          if ! git diff --cached --quiet; then
+            echo "Commit pushing"
+            git config --local user.email "chen08209@gmail.com"
+            git config --local user.name "chen08209"
+            git commit -m "Update changelog"
             git push
+            if [ $? -eq 0 ]; then
+              echo "Push succeeded"
+            else
+              echo "Push failed"
+              exit 1
+            fi
           fi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,4 +1,46 @@
-## v0.8.63
+## v0.8.67
+
+- Add android shortcuts
+
+- Fix init params issues
+
+- Fix dynamic color issues
+
+- Optimize navigator animate
+
+- Optimize window init
+
+- Optimize fab
+
+- Optimize save
+
+## v0.8.66
+
+- Fix the collapse issues
+
+- Add fontFamily options
+
+## v0.8.65
+
+- Update core version
+
+- Update flutter version
+
+- Optimize ip check
+
+- Optimize url-test
+
+## v0.8.64
+
+- Update release message
+
+- Init auto gen changelog
+
+- Fix windows tray issues
+
+- Fix urltest issues
+
+- Add auto changelog
 
 - Fix windows admin auto launch issues
 
@@ -10,8 +52,6 @@
 
 - Fix some issues
 
-## v0.8.62
-
 - Optimize ip detection
 
 - Support android vpn ipv6 inbound switch
@@ -28,12 +68,6 @@
 
 - Update readme
 
-- Update README.md 2
-
-- Update README.md 2
-
-- Update README.md
-
 ## v0.8.60
 
 - Fix build error2
@@ -461,7 +495,8 @@
 
 ## v0.8.12
 
-- Fix the problem that the download of remote resources failed after GeodataMode was turned on, which caused the application to flash back.
+- Fix the problem that the download of remote resources failed after GeodataMode was turned on, which caused the
+  application to flash back.
 
 - Fix edit profile error
 
@@ -626,5 +661,4 @@
 
 - update mobile_scanner
 
-- Initial commit
-
+- Initial commit

android/app/src/main/AndroidManifest.xml

@@ -10,7 +10,8 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
         tools:ignore="SystemPermissionTypo" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -23,8 +24,8 @@
 
     <application
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher"
         android:hardwareAccelerated="true"
+        android:icon="@mipmap/ic_launcher"
         android:label="FlClash">
         <activity
             android:name="com.follow.clash.MainActivity"
@@ -73,11 +74,11 @@
             android:theme="@style/TransparentTheme">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
-                <action android:name="com.follow.clash.action.START" />
+                <action android:name="${applicationId}.action.STOP" />
             </intent-filter>
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
-                <action android:name="com.follow.clash.action.STOP" />
+                <action android:name="${applicationId}.action.CHANGE" />
             </intent-filter>
         </activity>
 

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

@@ -4,8 +4,8 @@ import android.content.Context
 import androidx.lifecycle.MutableLiveData
 import com.follow.clash.plugins.AppPlugin
 import com.follow.clash.plugins.ServicePlugin
-import com.follow.clash.plugins.VpnPlugin
 import com.follow.clash.plugins.TilePlugin
+import com.follow.clash.plugins.VpnPlugin
 import io.flutter.FlutterInjector
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.embedding.engine.dart.DartExecutor
@@ -33,6 +33,10 @@ object GlobalState {
         return currentEngine?.plugins?.get(AppPlugin::class.java) as AppPlugin?
     }
 
+    fun getText(text: String): String {
+        return getCurrentAppPlugin()?.getText(text) ?: ""
+    }
+
     fun getCurrentTilePlugin(): TilePlugin? {
         val currentEngine = if (flutterEngine != null) flutterEngine else serviceEngine
         return currentEngine?.plugins?.get(TilePlugin::class.java) as TilePlugin?
@@ -42,6 +46,27 @@ object GlobalState {
         return serviceEngine?.plugins?.get(VpnPlugin::class.java) as VpnPlugin?
     }
 
+    fun handleToggle(context: Context) {
+        if (runState.value == RunState.STOP) {
+            runState.value = RunState.PENDING
+            val tilePlugin = getCurrentTilePlugin()
+            if (tilePlugin != null) {
+                tilePlugin.handleStart()
+            } else {
+                initServiceEngine(context)
+            }
+        } else {
+            handleStop()
+        }
+    }
+
+    fun handleStop() {
+        if (runState.value == RunState.START) {
+            runState.value = RunState.PENDING
+            getCurrentTilePlugin()?.handleStop()
+        }
+    }
+
     fun destroyServiceEngine() {
         serviceEngine?.destroy()
         serviceEngine = null

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

@@ -3,8 +3,8 @@ package com.follow.clash
 
 import com.follow.clash.plugins.AppPlugin
 import com.follow.clash.plugins.ServicePlugin
-import com.follow.clash.plugins.VpnPlugin
 import com.follow.clash.plugins.TilePlugin
+import com.follow.clash.plugins.VpnPlugin
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 

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

@@ -2,17 +2,18 @@ package com.follow.clash
 
 import android.app.Activity
 import android.os.Bundle
+import com.follow.clash.extensions.wrapAction
 
 class TempActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         when (intent.action) {
-            "com.follow.clash.action.START" -> {
-                GlobalState.getCurrentTilePlugin()?.handleStart()
+            wrapAction("STOP") -> {
+                GlobalState.handleStop()
             }
 
-            "com.follow.clash.action.STOP" -> {
-                GlobalState.getCurrentTilePlugin()?.handleStop()
+            wrapAction("CHANGE") -> {
+                GlobalState.handleToggle(applicationContext)
             }
         }
         finishAndRemoveTask()

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

@@ -1,21 +1,30 @@
 package com.follow.clash.extensions
 
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.net.ConnectivityManager
 import android.net.Network
+import android.os.Build
 import android.system.OsConstants.IPPROTO_TCP
 import android.system.OsConstants.IPPROTO_UDP
 import android.util.Base64
 import androidx.core.graphics.drawable.toBitmap
+import com.follow.clash.TempActivity
 import com.follow.clash.models.CIDR
 import com.follow.clash.models.Metadata
+import com.follow.clash.models.VpnOptions
+import io.flutter.plugin.common.MethodChannel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.ByteArrayOutputStream
 import java.net.Inet4Address
 import java.net.Inet6Address
 import java.net.InetAddress
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
 
 
 suspend fun Drawable.getBase64(): String {
@@ -34,6 +43,40 @@ fun Metadata.getProtocol(): Int? {
     return null
 }
 
+fun VpnOptions.getIpv4RouteAddress(): List<CIDR> {
+    return routeAddress.filter {
+        it.isIpv4()
+    }.map {
+        it.toCIDR()
+    }
+}
+
+fun VpnOptions.getIpv6RouteAddress(): List<CIDR> {
+    return routeAddress.filter {
+        it.isIpv6()
+    }.map {
+        it.toCIDR()
+    }
+}
+
+fun String.isIpv4(): Boolean {
+    val parts = split("/")
+    if (parts.size != 2) {
+        throw IllegalArgumentException("Invalid CIDR format")
+    }
+    val address = InetAddress.getByName(parts[0])
+    return address.address.size == 4
+}
+
+fun String.isIpv6(): Boolean {
+    val parts = split("/")
+    if (parts.size != 2) {
+        throw IllegalArgumentException("Invalid CIDR format")
+    }
+    val address = InetAddress.getByName(parts[0])
+    return address.address.size == 16
+}
+
 fun String.toCIDR(): CIDR {
     val parts = split("/")
     if (parts.size != 2) {
@@ -71,6 +114,34 @@ fun InetAddress.asSocketAddressText(port: Int): String {
     }
 }
 
+fun Context.wrapAction(action: String): String {
+    return "${this.packageName}.action.$action"
+}
+
+fun Context.getActionIntent(action: String): Intent {
+    val actionIntent = Intent(this, TempActivity::class.java)
+    actionIntent.action = wrapAction(action)
+    return actionIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
+}
+
+fun Context.getActionPendingIntent(action: String): PendingIntent {
+    return if (Build.VERSION.SDK_INT >= 31) {
+        PendingIntent.getActivity(
+            this,
+            0,
+            getActionIntent(action),
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        )
+    } else {
+        PendingIntent.getActivity(
+            this,
+            0,
+            getActionIntent(action),
+            PendingIntent.FLAG_UPDATE_CURRENT
+        )
+    }
+}
+
 
 private fun numericToTextFormat(src: ByteArray): String {
     val sb = StringBuilder(39)
@@ -87,3 +158,25 @@ private fun numericToTextFormat(src: ByteArray): String {
     }
     return sb.toString()
 }
+
+suspend fun <T> MethodChannel.awaitResult(
+    method: String,
+    arguments: Any? = null
+): T? = withContext(Dispatchers.Main) { // 切换到主线程
+    suspendCoroutine { continuation ->
+        invokeMethod(method, arguments, object : MethodChannel.Result {
+            override fun success(result: Any?) {
+                @Suppress("UNCHECKED_CAST")
+                continuation.resume(result as T)
+            }
+
+            override fun error(code: String, message: String?, details: Any?) {
+                continuation.resume(null)
+            }
+
+            override fun notImplemented() {
+                continuation.resume(null)
+            }
+        })
+    }
+}

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

@@ -3,8 +3,7 @@ package com.follow.clash.models
 import java.net.InetAddress
 
 enum class AccessControlMode {
-    acceptSelected,
-    rejectSelected,
+    acceptSelected, rejectSelected,
 }
 
 data class AccessControl(
@@ -22,6 +21,7 @@ data class VpnOptions(
     val allowBypass: Boolean,
     val systemProxy: Boolean,
     val bypassDomain: List<String>,
+    val routeAddress: List<String>,
     val ipv4Address: String,
     val ipv6Address: String,
     val dnsServerAddress: String,

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

@@ -14,9 +14,15 @@ import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.getSystemService
-import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile
 import androidx.core.content.FileProvider
+import androidx.core.content.pm.ShortcutInfoCompat
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.graphics.drawable.IconCompat
+import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile
 import com.follow.clash.GlobalState
+import com.follow.clash.R
+import com.follow.clash.extensions.awaitResult
+import com.follow.clash.extensions.getActionIntent
 import com.follow.clash.extensions.getBase64
 import com.follow.clash.models.Package
 import com.google.gson.Gson
@@ -31,6 +37,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import java.io.File
 import java.util.zip.ZipFile
@@ -116,11 +123,21 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
 
     override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
         scope = CoroutineScope(Dispatchers.Default)
-        context = flutterPluginBinding.applicationContext;
+        context = flutterPluginBinding.applicationContext
         channel = MethodChannel(flutterPluginBinding.binaryMessenger, "app")
         channel.setMethodCallHandler(this)
     }
 
+    private fun initShortcuts(label: String) {
+        val shortcut = ShortcutInfoCompat.Builder(context, "toggle")
+            .setShortLabel(label)
+            .setIcon(IconCompat.createWithResource(context, R.mipmap.ic_launcher_round))
+            .setIntent(context.getActionIntent("CHANGE"))
+            .build()
+        ShortcutManagerCompat.setDynamicShortcuts(context, listOf(shortcut))
+    }
+
+
     override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
         channel.setMethodCallHandler(null)
         scope.cancel()
@@ -128,11 +145,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
 
     private fun tip(message: String?) {
         if (GlobalState.flutterEngine == null) {
-            if (toast != null) {
-                toast!!.cancel()
-            }
-            toast = Toast.makeText(context, message, Toast.LENGTH_SHORT)
-            toast!!.show()
+            Toast.makeText(context, message, Toast.LENGTH_LONG).show()
         }
     }
 
@@ -140,13 +153,18 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         when (call.method) {
             "moveTaskToBack" -> {
                 activity?.moveTaskToBack(true)
-                result.success(true);
+                result.success(true)
             }
 
             "updateExcludeFromRecents" -> {
                 val value = call.argument<Boolean>("value")
                 updateExcludeFromRecents(value)
-                result.success(true);
+                result.success(true)
+            }
+
+            "initShortcuts" -> {
+                initShortcuts(call.arguments as String)
+                result.success(true)
             }
 
             "getPackages" -> {
@@ -197,7 +215,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
             }
 
             else -> {
-                result.notImplemented();
+                result.notImplemented()
             }
         }
     }
@@ -270,7 +288,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
 
     private fun getPackages(): List<Package> {
         val packageManager = context.packageManager
-        if (packages.isNotEmpty()) return packages;
+        if (packages.isNotEmpty()) return packages
         packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
             it.packageName != context.packageName
                     || it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
@@ -284,7 +302,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 firstInstallTime = it.firstInstallTime
             )
         }?.let { packages.addAll(it) }
-        return packages;
+        return packages
     }
 
     private suspend fun getPackagesToJson(): String {
@@ -306,7 +324,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         val intent = VpnService.prepare(context)
         if (intent != null) {
             activity?.startActivityForResult(intent, VPN_PERMISSION_REQUEST_CODE)
-            return;
+            return
         }
         vpnCallBack?.invoke()
     }
@@ -330,6 +348,12 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         }
     }
 
+    fun getText(text: String): String? {
+        return runBlocking {
+            channel.awaitResult<String>("getText", text)
+        }
+    }
+
     private fun isChinaPackage(packageName: String): Boolean {
         val packageManager = context.packageManager ?: return false
         skipPrefixList.forEach {
@@ -398,7 +422,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     }
 
     override fun onAttachedToActivity(binding: ActivityPluginBinding) {
-        activity = binding.activity;
+        activity = binding.activity
         binding.addActivityResultListener(::onActivityResult)
         binding.addRequestPermissionsResultListener(::onRequestPermissionsResultListener)
     }
@@ -408,7 +432,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     }
 
     override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
-        activity = binding.activity;
+        activity = binding.activity
     }
 
     override fun onDetachedFromActivity() {

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

@@ -1,8 +1,6 @@
 package com.follow.clash.plugins
 
 import android.content.Context
-import android.net.ConnectivityManager
-import androidx.core.content.getSystemService
 import com.follow.clash.GlobalState
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.MethodCall

android/app/src/main/kotlin/com/follow/clash/services/FlClashService.kt

@@ -13,8 +13,13 @@ import android.os.Build
 import android.os.IBinder
 import androidx.core.app.NotificationCompat
 import com.follow.clash.BaseServiceInterface
+import com.follow.clash.GlobalState
 import com.follow.clash.MainActivity
+import com.follow.clash.extensions.getActionPendingIntent
 import com.follow.clash.models.VpnOptions
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 
 class FlClashService : Service(), BaseServiceInterface {
@@ -64,6 +69,11 @@ class FlClashService : Service(), BaseServiceInterface {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                 foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
             }
+            addAction(
+                0,
+                GlobalState.getText("stop"),
+                getActionPendingIntent("STOP")
+            )
             setOngoing(true)
             setShowWhen(false)
             setOnlyAlertOnce(true)
@@ -82,21 +92,23 @@ class FlClashService : Service(), BaseServiceInterface {
 
     @SuppressLint("ForegroundServiceType", "WrongConstant")
     override fun startForeground(title: String, content: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val manager = getSystemService(NotificationManager::class.java)
-            var channel = manager?.getNotificationChannel(CHANNEL)
-            if (channel == null) {
-                channel =
-                    NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
-                manager?.createNotificationChannel(channel)
+        CoroutineScope(Dispatchers.Default).launch {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val manager = getSystemService(NotificationManager::class.java)
+                var channel = manager?.getNotificationChannel(CHANNEL)
+                if (channel == null) {
+                    channel =
+                        NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
+                    manager?.createNotificationChannel(channel)
+                }
+            }
+            val notification =
+                notificationBuilder.setContentTitle(title).setContentText(content).build()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+            } else {
+                startForeground(notificationId, notification)
             }
-        }
-        val notification =
-            notificationBuilder.setContentTitle(title).setContentText(content).build()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
-        } else {
-            startForeground(notificationId, notification)
         }
     }
 }

android/app/src/main/kotlin/com/follow/clash/services/FlClashTileService.kt

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Intent
 import android.os.Build
-import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import androidx.annotation.RequiresApi
@@ -67,19 +66,7 @@ class FlClashTileService : TileService() {
     override fun onClick() {
         super.onClick()
         activityTransfer()
-        if (GlobalState.runState.value == RunState.STOP) {
-            GlobalState.runState.value = RunState.PENDING
-            val tilePlugin = GlobalState.getCurrentTilePlugin()
-            if (tilePlugin != null) {
-                tilePlugin.handleStart()
-            } else {
-                GlobalState.initServiceEngine(applicationContext)
-            }
-        } else if (GlobalState.runState.value == RunState.START) {
-            GlobalState.runState.value = RunState.PENDING
-            GlobalState.getCurrentTilePlugin()?.handleStop()
-        }
-
+        GlobalState.handleToggle(applicationContext)
     }
 
     override fun onDestroy() {

android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt

@@ -15,12 +15,15 @@ import android.os.Build
 import android.os.IBinder
 import android.os.Parcel
 import android.os.RemoteException
+import android.util.Log
 import androidx.core.app.NotificationCompat
 import com.follow.clash.BaseServiceInterface
 import com.follow.clash.GlobalState
 import com.follow.clash.MainActivity
 import com.follow.clash.R
-import com.follow.clash.TempActivity
+import com.follow.clash.extensions.getActionPendingIntent
+import com.follow.clash.extensions.getIpv4RouteAddress
+import com.follow.clash.extensions.getIpv6RouteAddress
 import com.follow.clash.extensions.toCIDR
 import com.follow.clash.models.AccessControlMode
 import com.follow.clash.models.VpnOptions
@@ -40,12 +43,28 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
             if (options.ipv4Address.isNotEmpty()) {
                 val cidr = options.ipv4Address.toCIDR()
                 addAddress(cidr.address, cidr.prefixLength)
-                addRoute("0.0.0.0", 0)
+                val routeAddress = options.getIpv4RouteAddress()
+                if (routeAddress.isNotEmpty()) {
+                    routeAddress.forEach { i ->
+                        Log.d("addRoute4", "address: ${i.address} prefixLength:${i.prefixLength}")
+                        addRoute(i.address, i.prefixLength)
+                    }
+                } else {
+                    addRoute("0.0.0.0", 0)
+                }
             }
             if (options.ipv6Address.isNotEmpty()) {
                 val cidr = options.ipv6Address.toCIDR()
                 addAddress(cidr.address, cidr.prefixLength)
-                addRoute("::", 0)
+                val routeAddress = options.getIpv6RouteAddress()
+                if (routeAddress.isNotEmpty()) {
+                    routeAddress.forEach { i ->
+                        Log.d("addRoute6", "address: ${i.address} prefixLength:${i.prefixLength}")
+                        addRoute(i.address, i.prefixLength)
+                    }
+                } else {
+                    addRoute("::", 0)
+                }
             }
             addDnsServer(options.dnsServerAddress)
             setMtu(9000)
@@ -122,26 +141,6 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
             )
         }
 
-        val stopIntent = Intent(this, TempActivity::class.java)
-        stopIntent.action = "com.follow.clash.action.STOP"
-        stopIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
-
-
-        val stopPendingIntent = if (Build.VERSION.SDK_INT >= 31) {
-            PendingIntent.getActivity(
-                this,
-                0,
-                stopIntent,
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-            )
-        } else {
-            PendingIntent.getActivity(
-                this,
-                0,
-                stopIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT
-            )
-        }
         with(NotificationCompat.Builder(this, CHANNEL)) {
             setSmallIcon(R.drawable.ic_stat_name)
             setContentTitle("FlClash")
@@ -152,30 +151,39 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
                 foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
             }
             setOngoing(true)
+            addAction(
+                0,
+                GlobalState.getText("stop"),
+                getActionPendingIntent("STOP")
+            )
             setShowWhen(false)
             setOnlyAlertOnce(true)
             setAutoCancel(true)
-            addAction(0, "Stop", stopPendingIntent);
         }
     }
 
     @SuppressLint("ForegroundServiceType", "WrongConstant")
     override fun startForeground(title: String, content: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val manager = getSystemService(NotificationManager::class.java)
-            var channel = manager?.getNotificationChannel(CHANNEL)
-            if (channel == null) {
-                channel =
-                    NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
-                manager?.createNotificationChannel(channel)
+        CoroutineScope(Dispatchers.Default).launch {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                val manager = getSystemService(NotificationManager::class.java)
+                var channel = manager?.getNotificationChannel(CHANNEL)
+                if (channel == null) {
+                    channel =
+                        NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
+                    manager?.createNotificationChannel(channel)
+                }
+            }
+            val notification =
+                notificationBuilder
+                    .setContentTitle(title)
+                    .setContentText(content)
+                    .build()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+            } else {
+                startForeground(notificationId, notification)
             }
-        }
-        val notification =
-            notificationBuilder.setContentTitle(title).setContentText(content).build()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
-        } else {
-            startForeground(notificationId, notification)
         }
     }
 

core/action.go

@@ -0,0 +1,32 @@
+//go:build !cgo
+
+package main
+
+import (
+	"encoding/json"
+)
+
+func (action Action) Json() ([]byte, error) {
+	data, err := json.Marshal(action)
+	return data, err
+}
+
+func (action Action) callback(data interface{}) bool {
+	if conn == nil {
+		return false
+	}
+	sendAction := Action{
+		Id:     action.Id,
+		Method: action.Method,
+		Data:   data,
+	}
+	res, err := sendAction.Json()
+	if err != nil {
+		return false
+	}
+	_, err = conn.Write(append(res, []byte("\n")...))
+	if err != nil {
+		return false
+	}
+	return true
+}

core/common.go

@@ -1,23 +1,10 @@
 package main
 
-import "C"
 import (
 	"context"
-	"core/state"
+	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/metacubex/mihomo/constant/features"
-	"github.com/metacubex/mihomo/hub/route"
-	"github.com/samber/lo"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/inbound"
 	"github.com/metacubex/mihomo/adapter/outboundgroup"
@@ -27,52 +14,28 @@ import (
 	"github.com/metacubex/mihomo/component/resolver"
 	"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"
-	"github.com/metacubex/mihomo/hub/executor"
+	"github.com/metacubex/mihomo/hub/route"
 	"github.com/metacubex/mihomo/listener"
 	"github.com/metacubex/mihomo/log"
 	rp "github.com/metacubex/mihomo/rules/provider"
 	"github.com/metacubex/mihomo/tunnel"
+	"github.com/samber/lo"
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"sync"
 )
 
-type ConfigExtendedParams struct {
-	IsPatch      bool              `json:"is-patch"`
-	IsCompatible bool              `json:"is-compatible"`
-	SelectedMap  map[string]string `json:"selected-map"`
-	TestURL      *string           `json:"test-url"`
-	OverrideDns  bool              `json:"override-dns"`
-}
-
-type GenerateConfigParams struct {
-	ProfileId string               `json:"profile-id"`
-	Config    config.RawConfig     `json:"config" `
-	Params    ConfigExtendedParams `json:"params"`
-}
-
-type ChangeProxyParams struct {
-	GroupName *string `json:"group-name"`
-	ProxyName *string `json:"proxy-name"`
-}
-
-type TestDelayParams struct {
-	ProxyName string `json:"proxy-name"`
-	Timeout   int64  `json:"timeout"`
-}
-
-type ProcessMapItem struct {
-	Id    int64  `json:"id"`
-	Value string `json:"value"`
-}
-
-type ExternalProvider struct {
-	Name        string    `json:"name"`
-	Type        string    `json:"type"`
-	VehicleType string    `json:"vehicle-type"`
-	Count       int       `json:"count"`
-	Path        string    `json:"path"`
-	UpdateAt    time.Time `json:"update-at"`
-}
+var (
+	isRunning = false
+	runLock   sync.Mutex
+	ips       = []string{"ipinfo.io", "ipapi.co", "api.ip.sb", "ipwho.is"}
+	b, _      = batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](50))
+)
 
 type ExternalProviders []ExternalProvider
 
@@ -80,30 +43,9 @@ 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] }
 
-var b, _ = batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](50))
-
-func restartExecutable(execPath string) {
-	var err error
-	executor.Shutdown()
-	if runtime.GOOS == "windows" {
-		cmd := exec.Command(execPath, os.Args[1:]...)
-		log.Infoln("restarting: %q %q", execPath, os.Args[1:])
-		cmd.Stdin = os.Stdin
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		err = cmd.Start()
-		if err != nil {
-			log.Fatalln("restarting: %s", err)
-		}
-
-		os.Exit(0)
-	}
-
-	log.Infoln("restarting: %q %q", execPath, os.Args[1:])
-	err = syscall.Exec(execPath, os.Args, os.Environ())
-	if err != nil {
-		log.Fatalln("restarting: %s", err)
-	}
+func (message *Message) Json() (string, error) {
+	data, err := json.Marshal(message)
+	return string(data), err
 }
 
 func readFile(path string) ([]byte, error) {
@@ -118,19 +60,6 @@ func readFile(path string) ([]byte, error) {
 	return data, err
 }
 
-func removeFile(path string) error {
-	absPath, err := filepath.Abs(path)
-	if err != nil {
-		return err
-	}
-	err = os.Remove(absPath)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func getProfilePath(id string) string {
 	return filepath.Join(constant.Path.HomeDir(), "profiles", id+".yaml")
 }
@@ -158,10 +87,12 @@ func getRawConfigWithId(id string) *config.RawConfig {
 		}
 		mapping["path"] = filepath.Join(getProfileProvidersPath(id), value)
 		if configParams.TestURL != nil {
-			hc := mapping["health-check"].(map[string]any)
-			if hc != nil {
-				if hc["url"] != nil {
-					hc["url"] = *configParams.TestURL
+			if mapping["health-check"] != nil {
+				hc := mapping["health-check"].(map[string]any)
+				if hc != nil {
+					if hc["url"] != nil {
+						hc["url"] = *configParams.TestURL
+					}
 				}
 			}
 		}
@@ -196,12 +127,13 @@ func toExternalProvider(p cp.Provider) (*ExternalProvider, error) {
 	case *provider.ProxySetProvider:
 		psp := p.(*provider.ProxySetProvider)
 		return &ExternalProvider{
-			Name:        psp.Name(),
-			Type:        psp.Type().String(),
-			VehicleType: psp.VehicleType().String(),
-			Count:       psp.Count(),
-			Path:        psp.Vehicle().Path(),
-			UpdateAt:    psp.UpdatedAt(),
+			Name:             psp.Name(),
+			Type:             psp.Type().String(),
+			VehicleType:      psp.VehicleType().String(),
+			Count:            psp.Count(),
+			UpdateAt:         psp.UpdatedAt(),
+			Path:             psp.Vehicle().Path(),
+			SubscriptionInfo: psp.GetSubscriptionInfo(),
 		}, nil
 	case *rp.RuleSetProvider:
 		rsp := p.(*rp.RuleSetProvider)
@@ -210,8 +142,8 @@ func toExternalProvider(p cp.Provider) (*ExternalProvider, error) {
 			Type:        rsp.Type().String(),
 			VehicleType: rsp.VehicleType().String(),
 			Count:       rsp.Count(),
-			Path:        rsp.Vehicle().Path(),
 			UpdateAt:    rsp.UpdatedAt(),
+			Path:        rsp.Vehicle().Path(),
 		}, nil
 	default:
 		return nil, errors.New("not external provider")
@@ -245,152 +177,6 @@ func decorationConfig(profileId string, cfg config.RawConfig) *config.RawConfig
 	return prof
 }
 
-//func Reduce[T any, U any](s []T, initVal U, f func(U, T) U) U {
-//	for _, v := range s {
-//		initVal = f(initVal, v)
-//	}
-//	return initVal
-//}
-//
-//func Map[T, U any](slice []T, fn func(T) U) []U {
-//	result := make([]U, len(slice))
-//	for i, v := range slice {
-//		result[i] = fn(v)
-//	}
-//	return result
-//}
-//
-//func replaceFromMap(s string, m map[string]string) string {
-//	for k, v := range m {
-//		s = strings.ReplaceAll(s, k, v)
-//	}
-//	return s
-//}
-//
-//func removeDuplicateFromSlice[T any](slice []T) []T {
-//	result := make([]T, 0)
-//	seen := make(map[any]struct{})
-//	for _, value := range slice {
-//		if _, ok := seen[value]; !ok {
-//			result = append(result, value)
-//			seen[value] = struct{}{}
-//		}
-//	}
-//	return result
-//}
-
-//func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
-//	var replacements = map[string]string{}
-//	var selectArr []map[string]any
-//	var urlTestArr []map[string]any
-//	var fallbackArr []map[string]any
-//	for _, group := range *proxyGroup {
-//		switch group["type"] {
-//		case "select":
-//			selectArr = append(selectArr, group)
-//			replacements[group["name"].(string)] = "Proxy"
-//			break
-//		case "url-test":
-//			urlTestArr = append(urlTestArr, group)
-//			replacements[group["name"].(string)] = "Auto"
-//			break
-//		case "fallback":
-//			fallbackArr = append(fallbackArr, group)
-//			replacements[group["name"].(string)] = "Fallback"
-//			break
-//		default:
-//			break
-//		}
-//	}
-//
-//	ProxyProxies := Reduce(selectArr, []string{}, func(res []string, cur map[string]any) []string {
-//		if cur["proxies"] == nil {
-//			return res
-//		}
-//		for _, proxyName := range cur["proxies"].([]interface{}) {
-//			if str, ok := proxyName.(string); ok {
-//				str = replaceFromMap(str, replacements)
-//				if str != "Proxy" {
-//					res = append(res, str)
-//				}
-//			}
-//		}
-//		return res
-//	})
-//
-//	ProxyProxies = removeDuplicateFromSlice(ProxyProxies)
-//
-//	AutoProxies := Reduce(urlTestArr, []string{}, func(res []string, cur map[string]any) []string {
-//		if cur["proxies"] == nil {
-//			return res
-//		}
-//		for _, proxyName := range cur["proxies"].([]interface{}) {
-//			if str, ok := proxyName.(string); ok {
-//				str = replaceFromMap(str, replacements)
-//				if str != "Auto" {
-//					res = append(res, str)
-//				}
-//			}
-//		}
-//		return res
-//	})
-//
-//	AutoProxies = removeDuplicateFromSlice(AutoProxies)
-//
-//	FallbackProxies := Reduce(fallbackArr, []string{}, func(res []string, cur map[string]any) []string {
-//		if cur["proxies"] == nil {
-//			return res
-//		}
-//		for _, proxyName := range cur["proxies"].([]interface{}) {
-//			if str, ok := proxyName.(string); ok {
-//				str = replaceFromMap(str, replacements)
-//				if str != "Fallback" {
-//					res = append(res, str)
-//				}
-//			}
-//		}
-//		return res
-//	})
-//
-//	FallbackProxies = removeDuplicateFromSlice(FallbackProxies)
-//
-//	var computedProxyGroup []map[string]any
-//
-//	if len(ProxyProxies) > 0 {
-//		computedProxyGroup = append(computedProxyGroup,
-//			map[string]any{
-//				"name":    "Proxy",
-//				"type":    "select",
-//				"proxies": ProxyProxies,
-//			})
-//	}
-//
-//	if len(AutoProxies) > 0 {
-//		computedProxyGroup = append(computedProxyGroup,
-//			map[string]any{
-//				"name":    "Auto",
-//				"type":    "url-test",
-//				"proxies": AutoProxies,
-//			})
-//	}
-//
-//	if len(FallbackProxies) > 0 {
-//		computedProxyGroup = append(computedProxyGroup,
-//			map[string]any{
-//				"name":    "Fallback",
-//				"type":    "fallback",
-//				"proxies": FallbackProxies,
-//			})
-//	}
-//
-//	computedRule := Map(*rule, func(value string) string {
-//		return replaceFromMap(value, replacements)
-//	})
-//
-//	*proxyGroup = computedProxyGroup
-//	*rule = computedRule
-//}
-
 func genHosts(hosts, patchHosts map[string]any) {
 	for k, v := range patchHosts {
 		hosts[k] = v
@@ -404,8 +190,6 @@ func trimArr(arr []string) (r []string) {
 	return
 }
 
-var ips = []string{"ipinfo.io", "ipapi.co", "api.ip.sb", "ipwho.is"}
-
 func overrideRules(rules *[]string) {
 	var target = ""
 	for _, line := range *rules {
@@ -467,20 +251,13 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 		}
 	}
 	overrideRules(&targetConfig.Rule)
-	//if runtime.GOOS == "android" {
-	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
-	//} else if runtime.GOOS == "windows" {
-	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
-	//}
-	//if configParams.IsCompatible == false {
-	//	targetConfig.ProxyProvider = make(map[string]map[string]any)
-	//	targetConfig.RuleProvider = make(map[string]map[string]any)
-	//	generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
-	//}
 }
 
-func patchConfig(general *config.General, controller *config.Controller, tls *config.TLS) {
+func patchConfig() {
 	log.Infoln("[Apply] patch")
+	general := currentConfig.General
+	controller := currentConfig.Controller
+	tls := currentConfig.TLS
 	tunnel.SetSniffing(general.Sniffing)
 	tunnel.SetFindProcessMode(general.FindProcessMode)
 	dialer.SetTcpConcurrent(general.TCPConcurrent)
@@ -507,17 +284,15 @@ func patchConfig(general *config.General, controller *config.Controller, tls *co
 	})
 }
 
-var isRunning = false
-
-var runLock sync.Mutex
-
-func updateListeners(general *config.General, listeners map[string]constant.InboundListener) {
+func updateListeners(force bool) {
 	if !isRunning {
 		return
 	}
-	runLock.Lock()
-	defer runLock.Unlock()
-	stopListeners()
+	general := currentConfig.General
+	listeners := currentConfig.Listeners
+	if force == true {
+		stopListeners()
+	}
 	listener.PatchInboundListeners(listeners, tunnel.Tunnel, true)
 	listener.SetAllowLan(general.AllowLan)
 	inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
@@ -566,20 +341,22 @@ func patchSelectGroup() {
 	}
 }
 
-func applyConfig() error {
-	cfg, err := config.ParseRawConfig(state.CurrentRawConfig)
+func applyConfig(rawConfig *config.RawConfig) error {
+	runLock.Lock()
+	defer runLock.Unlock()
+	var err error
+	currentConfig, err = config.ParseRawConfig(rawConfig)
 	if err != nil {
-		cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
+		currentConfig, _ = config.ParseRawConfig(config.DefaultRawConfig())
 	}
 	if configParams.IsPatch {
-		patchConfig(cfg.General, cfg.Controller, cfg.TLS)
+		patchConfig()
 	} else {
-		closeConnections()
+		handleCloseConnectionsUnLock()
 		runtime.GC()
-		hub.ApplyConfig(cfg)
+		hub.ApplyConfig(currentConfig)
 		patchSelectGroup()
 	}
-	updateListeners(cfg.General, cfg.Listeners)
-	externalProviders = getExternalProvidersRaw()
+	updateListeners(false)
 	return err
 }

core/constant.go

@@ -0,0 +1,110 @@
+package main
+
+import (
+	"github.com/metacubex/mihomo/adapter/provider"
+	"github.com/metacubex/mihomo/config"
+	"github.com/metacubex/mihomo/constant"
+	"time"
+)
+
+type ConfigExtendedParams struct {
+	IsPatch      bool              `json:"is-patch"`
+	IsCompatible bool              `json:"is-compatible"`
+	SelectedMap  map[string]string `json:"selected-map"`
+	TestURL      *string           `json:"test-url"`
+	OverrideDns  bool              `json:"override-dns"`
+}
+
+type GenerateConfigParams struct {
+	ProfileId string               `json:"profile-id"`
+	Config    config.RawConfig     `json:"config" `
+	Params    ConfigExtendedParams `json:"params"`
+}
+
+type ChangeProxyParams struct {
+	GroupName *string `json:"group-name"`
+	ProxyName *string `json:"proxy-name"`
+}
+
+type TestDelayParams struct {
+	ProxyName string `json:"proxy-name"`
+	Timeout   int64  `json:"timeout"`
+}
+
+type ProcessMapItem struct {
+	Id    int64  `json:"id"`
+	Value string `json:"value"`
+}
+
+type ExternalProvider struct {
+	Name             string                     `json:"name"`
+	Type             string                     `json:"type"`
+	VehicleType      string                     `json:"vehicle-type"`
+	Count            int                        `json:"count"`
+	Path             string                     `json:"path"`
+	UpdateAt         time.Time                  `json:"update-at"`
+	SubscriptionInfo *provider.SubscriptionInfo `json:"subscription-info"`
+}
+
+const (
+	messageMethod                  Method = "message"
+	initClashMethod                Method = "initClash"
+	getIsInitMethod                Method = "getIsInit"
+	forceGcMethod                  Method = "forceGc"
+	shutdownMethod                 Method = "shutdown"
+	validateConfigMethod           Method = "validateConfig"
+	updateConfigMethod             Method = "updateConfig"
+	getProxiesMethod               Method = "getProxies"
+	changeProxyMethod              Method = "changeProxy"
+	getTrafficMethod               Method = "getTraffic"
+	getTotalTrafficMethod          Method = "getTotalTraffic"
+	resetTrafficMethod             Method = "resetTraffic"
+	asyncTestDelayMethod           Method = "asyncTestDelay"
+	getConnectionsMethod           Method = "getConnections"
+	closeConnectionsMethod         Method = "closeConnections"
+	closeConnectionMethod          Method = "closeConnection"
+	getExternalProvidersMethod     Method = "getExternalProviders"
+	getExternalProviderMethod      Method = "getExternalProvider"
+	updateGeoDataMethod            Method = "updateGeoData"
+	updateExternalProviderMethod   Method = "updateExternalProvider"
+	sideLoadExternalProviderMethod Method = "sideLoadExternalProvider"
+	startLogMethod                 Method = "startLog"
+	stopLogMethod                  Method = "stopLog"
+	startListenerMethod            Method = "startListener"
+	stopListenerMethod             Method = "stopListener"
+)
+
+type Method string
+
+type Action struct {
+	Id     string      `json:"id"`
+	Method Method      `json:"method"`
+	Data   interface{} `json:"data"`
+}
+
+type MessageType string
+
+type Delay struct {
+	Name  string `json:"name"`
+	Value int32  `json:"value"`
+}
+
+type Message struct {
+	Type MessageType `json:"type"`
+	Data interface{} `json:"data"`
+}
+
+type Process struct {
+	Id       int64              `json:"id"`
+	Metadata *constant.Metadata `json:"metadata"`
+}
+
+const (
+	LogMessage     MessageType = "log"
+	ProtectMessage MessageType = "protect"
+	DelayMessage   MessageType = "delay"
+	ProcessMessage MessageType = "process"
+	RequestMessage MessageType = "request"
+	StartedMessage MessageType = "started"
+	LoadedMessage  MessageType = "loaded"
+)

core/dart-bridge/lib.go

@@ -1,3 +1,5 @@
+//go:build cgo
+
 package dart_bridge
 
 /*

core/dart-bridge/lib_common.go

@@ -0,0 +1,7 @@
+//go:build !cgo
+
+package dart_bridge
+
+func SendToPort(port int64, msg string) bool {
+	return false
+}

core/dns.go

@@ -1,20 +0,0 @@
-//go:build android
-
-package main
-
-import "C"
-import (
-	"github.com/metacubex/mihomo/dns"
-	"github.com/metacubex/mihomo/log"
-	"strings"
-)
-
-//export updateDns
-func updateDns(s *C.char) {
-	dnsList := C.GoString(s)
-	go func() {
-		log.Infoln("[DNS] updateDns %s", dnsList)
-		dns.UpdateSystemDNS(strings.Split(dnsList, ","))
-		dns.FlushCacheWithDefaultResolver()
-	}()
-}

core/go.mod

@@ -1,6 +1,6 @@
 module core
 
-go 1.21.0
+go 1.21
 
 replace github.com/metacubex/mihomo => ./Clash.Meta
 

core/hub.go

@@ -1,82 +1,71 @@
 package main
 
-/*
-#include <stdlib.h>
-*/
-import "C"
 import (
 	"context"
-	bridge "core/dart-bridge"
-	"core/state"
 	"encoding/json"
 	"fmt"
-	"github.com/metacubex/mihomo/common/utils"
-	"os"
-	"runtime"
-	"sort"
-	"sync"
-	"time"
-	"unsafe"
-
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/outboundgroup"
-	"github.com/metacubex/mihomo/adapter/provider"
+	"github.com/metacubex/mihomo/common/observable"
+	"github.com/metacubex/mihomo/common/utils"
 	"github.com/metacubex/mihomo/component/updater"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
 	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"
+	"runtime"
+	"sort"
+	"time"
 )
 
-var configParams = ConfigExtendedParams{}
+var (
+	isInit            = false
+	configParams      = ConfigExtendedParams{}
+	externalProviders = map[string]cp.Provider{}
+	logSubscriber     observable.Subscription[log.Event]
+	currentConfig     *config.Config
+)
 
-var externalProviders = map[string]cp.Provider{}
-
-var isInit = false
-
-//export start
-func start() {
-	runLock.Lock()
-	defer runLock.Unlock()
-	isRunning = true
-}
-
-//export stop
-func stop() {
-	runLock.Lock()
-	go func() {
-		defer runLock.Unlock()
-		isRunning = false
-		stopListeners()
-	}()
-}
-
-//export initClash
-func initClash(homeDirStr *C.char) bool {
+func handleInitClash(homeDirStr string) bool {
 	if !isInit {
-		constant.SetHomeDir(C.GoString(homeDirStr))
+		constant.SetHomeDir(homeDirStr)
 		isInit = true
 	}
 	return isInit
 }
 
-//export getIsInit
-func getIsInit() bool {
-	return isInit
-}
-
-//export restartClash
-func restartClash() bool {
-	execPath, _ := os.Executable()
-	go restartExecutable(execPath)
+func handleStartListener() bool {
+	runLock.Lock()
+	defer runLock.Unlock()
+	isRunning = true
+	updateListeners(true)
 	return true
 }
 
-//export shutdownClash
-func shutdownClash() bool {
+func handleStopListener() bool {
+	runLock.Lock()
+	defer runLock.Unlock()
+	isRunning = false
+	listener.StopListener()
+	return true
+}
+
+func handleGetIsInit() bool {
+	return isInit
+}
+
+func handleForceGc() {
+	go func() {
+		log.Infoln("[APP] request force GC")
+		runtime.GC()
+	}()
+}
+
+func handleShutdown() bool {
 	stopListeners()
 	executor.Shutdown()
 	runtime.GC()
@@ -84,106 +73,81 @@ func shutdownClash() bool {
 	return true
 }
 
-//export forceGc
-func forceGc() {
-	go func() {
-		log.Infoln("[APP] request force GC")
-		runtime.GC()
-	}()
+func handleValidateConfig(bytes []byte) string {
+	_, err := config.UnmarshalRawConfig(bytes)
+	if err != nil {
+		return err.Error()
+	}
+	return ""
 }
 
-//export validateConfig
-func validateConfig(s *C.char, port C.longlong) {
-	i := int64(port)
-	bytes := []byte(C.GoString(s))
-	go func() {
-		_, err := config.UnmarshalRawConfig(bytes)
-		if err != nil {
-			bridge.SendToPort(i, err.Error())
-			return
-		}
-		bridge.SendToPort(i, "")
-	}()
+func handleUpdateConfig(bytes []byte) string {
+	var params = &GenerateConfigParams{}
+	err := json.Unmarshal(bytes, params)
+	if err != nil {
+		return err.Error()
+	}
+
+	configParams = params.Params
+	prof := decorationConfig(params.ProfileId, params.Config)
+	err = applyConfig(prof)
+	if err != nil {
+		return err.Error()
+	}
+	return ""
 }
 
-var updateLock sync.Mutex
-
-//export updateConfig
-func updateConfig(s *C.char, port C.longlong) {
-	i := int64(port)
-	paramsString := C.GoString(s)
-	go func() {
-		updateLock.Lock()
-		defer updateLock.Unlock()
-		var params = &GenerateConfigParams{}
-		err := json.Unmarshal([]byte(paramsString), params)
-		if err != nil {
-			bridge.SendToPort(i, err.Error())
-			return
-		}
-		configParams = params.Params
-		prof := decorationConfig(params.ProfileId, params.Config)
-		state.CurrentRawConfig = prof
-		err = applyConfig()
-		if err != nil {
-			bridge.SendToPort(i, err.Error())
-			return
-		}
-		bridge.SendToPort(i, "")
-	}()
-}
-
-//export clearEffect
-func clearEffect(s *C.char) {
-	id := C.GoString(s)
-	go func() {
-		_ = removeFile(getProfilePath(id))
-		_ = removeFile(getProfileProvidersPath(id))
-	}()
-}
-
-//export getProxies
-func getProxies() *C.char {
+func handleGetProxies() string {
+	runLock.Lock()
+	defer runLock.Unlock()
 	data, err := json.Marshal(tunnel.ProxiesWithProviders())
 	if err != nil {
-		return C.CString("")
+		return ""
 	}
-	return C.CString(string(data))
+	return string(data)
 }
 
-//export changeProxy
-func changeProxy(s *C.char) {
-	paramsString := C.GoString(s)
-	var params = &ChangeProxyParams{}
-	err := json.Unmarshal([]byte(paramsString), params)
-	if err != nil {
-		log.Infoln("Unmarshal ChangeProxyParams %v", err)
-	}
-	groupName := *params.GroupName
-	proxyName := *params.ProxyName
-	proxies := tunnel.ProxiesWithProviders()
-	group, ok := proxies[groupName]
-	if !ok {
+func handleChangeProxy(data string, fn func(string string)) {
+	runLock.Lock()
+	go func() {
+		defer runLock.Unlock()
+		var params = &ChangeProxyParams{}
+		err := json.Unmarshal([]byte(data), params)
+		if err != nil {
+			fn(err.Error())
+			return
+		}
+		groupName := *params.GroupName
+		proxyName := *params.ProxyName
+		proxies := tunnel.ProxiesWithProviders()
+		group, ok := proxies[groupName]
+		if !ok {
+			fn("Not found group")
+			return
+		}
+		adapterProxy := group.(*adapter.Proxy)
+		selector, ok := adapterProxy.ProxyAdapter.(outboundgroup.SelectAble)
+		if !ok {
+			fn("Group is not selectable")
+			return
+		}
+		if proxyName == "" {
+			selector.ForceSet(proxyName)
+		} else {
+			err = selector.Set(proxyName)
+		}
+		if err != nil {
+			fn(err.Error())
+			return
+		}
+
+		fn("")
 		return
-	}
-	adapterProxy := group.(*adapter.Proxy)
-	selector, ok := adapterProxy.ProxyAdapter.(outboundgroup.SelectAble)
-	if !ok {
-		return
-	}
-	if proxyName == "" {
-		selector.ForceSet(proxyName)
-	} else {
-		err = selector.Set(proxyName)
-	}
-	if err == nil {
-		log.Infoln("[SelectAble] %s selected %s", groupName, proxyName)
-	}
+	}()
 }
 
-//export getTraffic
-func getTraffic() *C.char {
-	up, down := statistic.DefaultManager.Current(state.CurrentState.OnlyProxy)
+func handleGetTraffic(onlyProxy bool) string {
+	up, down := statistic.DefaultManager.Current(onlyProxy)
 	traffic := map[string]int64{
 		"up":   up,
 		"down": down,
@@ -191,14 +155,13 @@ func getTraffic() *C.char {
 	data, err := json.Marshal(traffic)
 	if err != nil {
 		fmt.Println("Error:", err)
-		return C.CString("")
+		return ""
 	}
-	return C.CString(string(data))
+	return string(data)
 }
 
-//export getTotalTraffic
-func getTotalTraffic() *C.char {
-	up, down := statistic.DefaultManager.Total(state.CurrentState.OnlyProxy)
+func handleGetTotalTraffic(onlyProxy bool) string {
+	up, down := statistic.DefaultManager.Total(onlyProxy)
 	traffic := map[string]int64{
 		"up":   up,
 		"down": down,
@@ -206,31 +169,27 @@ func getTotalTraffic() *C.char {
 	data, err := json.Marshal(traffic)
 	if err != nil {
 		fmt.Println("Error:", err)
-		return C.CString("")
+		return ""
 	}
-	return C.CString(string(data))
+	return string(data)
 }
 
-//export resetTraffic
-func resetTraffic() {
+func handleResetTraffic() {
 	statistic.DefaultManager.ResetStatistic()
 }
 
-//export asyncTestDelay
-func asyncTestDelay(s *C.char, port C.longlong) {
-	i := int64(port)
-	paramsString := C.GoString(s)
+func handleAsyncTestDelay(paramsString string, fn func(string)) {
 	b.Go(paramsString, func() (bool, error) {
 		var params = &TestDelayParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
-			bridge.SendToPort(i, "")
+			fn("")
 			return false, nil
 		}
 
 		expectedStatus, err := utils.NewUnsignedRanges[uint16]("")
 		if err != nil {
-			bridge.SendToPort(i, "")
+			fn("")
 			return false, nil
 		}
 
@@ -247,7 +206,7 @@ func asyncTestDelay(s *C.char, port C.longlong) {
 		if proxy == nil {
 			delayData.Value = -1
 			data, _ := json.Marshal(delayData)
-			bridge.SendToPort(i, string(data))
+			fn(string(data))
 			return false, nil
 		}
 
@@ -255,44 +214,30 @@ func asyncTestDelay(s *C.char, port C.longlong) {
 		if err != nil || delay == 0 {
 			delayData.Value = -1
 			data, _ := json.Marshal(delayData)
-			bridge.SendToPort(i, string(data))
+			fn(string(data))
 			return false, nil
 		}
 
 		delayData.Value = int32(delay)
 		data, _ := json.Marshal(delayData)
-		bridge.SendToPort(i, string(data))
+		fn(string(data))
 		return false, nil
 	})
 }
 
-//export getVersionInfo
-func getVersionInfo() *C.char {
-	versionInfo := map[string]string{
-		"clashName": constant.Name,
-		"version":   "1.18.5",
-	}
-	data, err := json.Marshal(versionInfo)
-	if err != nil {
-		fmt.Println("Error:", err)
-		return C.CString("")
-	}
-	return C.CString(string(data))
-}
-
-//export getConnections
-func getConnections() *C.char {
+func handleGetConnections() string {
+	runLock.Lock()
+	defer runLock.Unlock()
 	snapshot := statistic.DefaultManager.Snapshot()
 	data, err := json.Marshal(snapshot)
 	if err != nil {
 		fmt.Println("Error:", err)
-		return C.CString("")
+		return ""
 	}
-	return C.CString(string(data))
+	return string(data)
 }
 
-//export closeConnections
-func closeConnections() {
+func handleCloseConnectionsUnLock() bool {
 	statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
 		err := c.Close()
 		if err != nil {
@@ -300,43 +245,37 @@ func closeConnections() {
 		}
 		return true
 	})
+	return true
 }
 
-//export closeConnection
-func closeConnection(id *C.char) {
-	connectionId := C.GoString(id)
+func handleCloseConnections() bool {
+	runLock.Lock()
+	defer runLock.Unlock()
+	statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
+		err := c.Close()
+		if err != nil {
+			return false
+		}
+		return true
+	})
+	return true
+}
+
+func handleCloseConnection(connectionId string) bool {
+	runLock.Lock()
+	defer runLock.Unlock()
 	c := statistic.DefaultManager.Get(connectionId)
 	if c == nil {
-		return
+		return false
 	}
 	_ = c.Close()
+	return true
 }
 
-//export getProviders
-func getProviders() *C.char {
-	data, err := json.Marshal(tunnel.Providers())
-	var msg *C.char
-	if err != nil {
-		msg = C.CString("")
-		return msg
-	}
-	msg = C.CString(string(data))
-	return msg
-}
-
-//export getProvider
-func getProvider(name *C.char) *C.char {
-	providerName := C.GoString(name)
-	providers := tunnel.Providers()
-	data, err := json.Marshal(providers[providerName])
-	if err != nil {
-		return C.CString("")
-	}
-	return C.CString(string(data))
-}
-
-//export getExternalProviders
-func getExternalProviders() *C.char {
+func handleGetExternalProviders() string {
+	runLock.Lock()
+	defer runLock.Unlock()
+	externalProviders = getExternalProvidersRaw()
 	eps := make([]ExternalProvider, 0)
 	for _, p := range externalProviders {
 		externalProvider, err := toExternalProvider(p)
@@ -348,123 +287,125 @@ func getExternalProviders() *C.char {
 	sort.Sort(ExternalProviders(eps))
 	data, err := json.Marshal(eps)
 	if err != nil {
-		return C.CString("")
+		return ""
 	}
-	return C.CString(string(data))
+	return string(data)
 }
 
-//export getExternalProvider
-func getExternalProvider(name *C.char) *C.char {
-	externalProviderName := C.GoString(name)
+func handleGetExternalProvider(externalProviderName string) string {
+	runLock.Lock()
+	defer runLock.Unlock()
 	externalProvider, exist := externalProviders[externalProviderName]
 	if !exist {
-		return C.CString("")
+		return ""
 	}
 	e, err := toExternalProvider(externalProvider)
 	if err != nil {
-		return C.CString("")
+		return ""
 	}
 	data, err := json.Marshal(e)
 	if err != nil {
-		return C.CString("")
+		return ""
 	}
-	return C.CString(string(data))
+	return string(data)
 }
 
-//export updateGeoData
-func updateGeoData(geoType *C.char, geoName *C.char, port C.longlong) {
-	i := int64(port)
-	geoTypeString := C.GoString(geoType)
-	geoNameString := C.GoString(geoName)
+func handleUpdateGeoData(geoType string, geoName string, fn func(value string)) {
 	go func() {
-		path := constant.Path.Resolve(geoNameString)
-		switch geoTypeString {
+		path := constant.Path.Resolve(geoName)
+		switch geoType {
 		case "MMDB":
 			err := updater.UpdateMMDBWithPath(path)
 			if err != nil {
-				bridge.SendToPort(i, err.Error())
+				fn(err.Error())
 				return
 			}
 		case "ASN":
 			err := updater.UpdateASNWithPath(path)
 			if err != nil {
-				bridge.SendToPort(i, err.Error())
+				fn(err.Error())
 				return
 			}
 		case "GeoIp":
 			err := updater.UpdateGeoIpWithPath(path)
 			if err != nil {
-				bridge.SendToPort(i, err.Error())
+				fn(err.Error())
 				return
 			}
 		case "GeoSite":
 			err := updater.UpdateGeoSiteWithPath(path)
 			if err != nil {
-				bridge.SendToPort(i, err.Error())
+				fn(err.Error())
 				return
 			}
 		}
-		bridge.SendToPort(i, "")
+		fn("")
 	}()
 }
 
-//export updateExternalProvider
-func updateExternalProvider(providerName *C.char, port C.longlong) {
-	i := int64(port)
-	providerNameString := C.GoString(providerName)
+func handleUpdateExternalProvider(providerName string, fn func(value string)) {
 	go func() {
-		externalProvider, exist := externalProviders[providerNameString]
+		externalProvider, exist := externalProviders[providerName]
 		if !exist {
-			bridge.SendToPort(i, "external provider is not exist")
+			fn("external provider is not exist")
 			return
 		}
 		err := externalProvider.Update()
 		if err != nil {
-			bridge.SendToPort(i, err.Error())
+			fn(err.Error())
 			return
 		}
-		bridge.SendToPort(i, "")
+		fn("")
 	}()
 }
 
-//export sideLoadExternalProvider
-func sideLoadExternalProvider(providerName *C.char, data *C.char, port C.longlong) {
-	i := int64(port)
-	bytes := []byte(C.GoString(data))
-	providerNameString := C.GoString(providerName)
+func handleSideLoadExternalProvider(providerName string, data []byte, fn func(value string)) {
 	go func() {
-		externalProvider, exist := externalProviders[providerNameString]
+		runLock.Lock()
+		defer runLock.Unlock()
+		externalProvider, exist := externalProviders[providerName]
 		if !exist {
-			bridge.SendToPort(i, "external provider is not exist")
+			fn("external provider is not exist")
 			return
 		}
-		err := sideUpdateExternalProvider(externalProvider, bytes)
+		err := sideUpdateExternalProvider(externalProvider, data)
 		if err != nil {
-			bridge.SendToPort(i, err.Error())
+			fn(err.Error())
 			return
 		}
-		bridge.SendToPort(i, "")
+		fn("")
 	}()
 }
 
-//export initNativeApiBridge
-func initNativeApiBridge(api unsafe.Pointer) {
-	bridge.InitDartApi(api)
+func handleStartLog() {
+	if logSubscriber != nil {
+		log.UnSubscribe(logSubscriber)
+		logSubscriber = nil
+	}
+	logSubscriber = log.Subscribe()
+	go func() {
+		for logData := range logSubscriber {
+			if logData.LogLevel < log.Level() {
+				continue
+			}
+			message := &Message{
+				Type: LogMessage,
+				Data: logData,
+			}
+			SendMessage(*message)
+		}
+	}()
 }
 
-//export initMessage
-func initMessage(port C.longlong) {
-	i := int64(port)
-	Port = i
-}
-
-//export freeCString
-func freeCString(s *C.char) {
-	C.free(unsafe.Pointer(s))
+func handleStopLog() {
+	if logSubscriber != nil {
+		log.UnSubscribe(logSubscriber)
+		logSubscriber = nil
+	}
 }
 
 func init() {
-	provider.HealthcheckHook = func(name string, delay uint16) {
+	adapter.UrlTestHook = func(name string, delay uint16) {
 		delayData := &Delay{
 			Name: name,
 		}

core/lib.go

@@ -0,0 +1,182 @@
+//go:build cgo
+
+package main
+
+/*
+#include <stdlib.h>
+*/
+import "C"
+import (
+	bridge "core/dart-bridge"
+	"unsafe"
+)
+
+//export initNativeApiBridge
+func initNativeApiBridge(api unsafe.Pointer) {
+	bridge.InitDartApi(api)
+}
+
+//export initMessage
+func initMessage(port C.longlong) {
+	i := int64(port)
+	Port = i
+}
+
+//export freeCString
+func freeCString(s *C.char) {
+	C.free(unsafe.Pointer(s))
+}
+
+//export initClash
+func initClash(homeDirStr *C.char) bool {
+	return handleInitClash(C.GoString(homeDirStr))
+}
+
+//export startListener
+func startListener() {
+	handleStartListener()
+}
+
+//export stopListener
+func stopListener() {
+	handleStopListener()
+}
+
+//export getIsInit
+func getIsInit() bool {
+	return handleGetIsInit()
+}
+
+//export shutdownClash
+func shutdownClash() bool {
+	return handleShutdown()
+}
+
+//export forceGc
+func forceGc() {
+	handleForceGc()
+}
+
+//export validateConfig
+func validateConfig(s *C.char, port C.longlong) {
+	i := int64(port)
+	bytes := []byte(C.GoString(s))
+	go func() {
+		bridge.SendToPort(i, handleValidateConfig(bytes))
+	}()
+}
+
+//export updateConfig
+func updateConfig(s *C.char, port C.longlong) {
+	i := int64(port)
+	bytes := []byte(C.GoString(s))
+	go func() {
+		bridge.SendToPort(i, handleUpdateConfig(bytes))
+	}()
+}
+
+//export getProxies
+func getProxies() *C.char {
+	return C.CString(handleGetProxies())
+}
+
+//export changeProxy
+func changeProxy(s *C.char, port C.longlong) {
+	i := int64(port)
+	paramsString := C.GoString(s)
+	handleChangeProxy(paramsString, func(value string) {
+		bridge.SendToPort(i, value)
+	})
+}
+
+//export getTraffic
+func getTraffic(port C.int) *C.char {
+	onlyProxy := int(port) == 1
+	return C.CString(handleGetTraffic(onlyProxy))
+}
+
+//export getTotalTraffic
+func getTotalTraffic(port C.int) *C.char {
+	onlyProxy := int(port) == 1
+	return C.CString(handleGetTotalTraffic(onlyProxy))
+}
+
+//export resetTraffic
+func resetTraffic() {
+	handleResetTraffic()
+}
+
+//export asyncTestDelay
+func asyncTestDelay(s *C.char, port C.longlong) {
+	i := int64(port)
+	paramsString := C.GoString(s)
+	handleAsyncTestDelay(paramsString, func(value string) {
+		bridge.SendToPort(i, value)
+	})
+}
+
+//export getConnections
+func getConnections() *C.char {
+	return C.CString(handleGetConnections())
+}
+
+//export closeConnections
+func closeConnections() {
+	handleCloseConnections()
+}
+
+//export closeConnection
+func closeConnection(id *C.char) {
+	connectionId := C.GoString(id)
+	handleCloseConnection(connectionId)
+}
+
+//export getExternalProviders
+func getExternalProviders() *C.char {
+	return C.CString(handleGetExternalProviders())
+}
+
+//export getExternalProvider
+func getExternalProvider(externalProviderNameChar *C.char) *C.char {
+	externalProviderName := C.GoString(externalProviderNameChar)
+	return C.CString(handleGetExternalProvider(externalProviderName))
+}
+
+//export updateGeoData
+func updateGeoData(geoTypeChar *C.char, geoNameChar *C.char, port C.longlong) {
+	i := int64(port)
+	geoType := C.GoString(geoTypeChar)
+	geoName := C.GoString(geoNameChar)
+	handleUpdateGeoData(geoType, geoName, func(value string) {
+		bridge.SendToPort(i, value)
+	})
+}
+
+//export updateExternalProvider
+func updateExternalProvider(providerNameChar *C.char, port C.longlong) {
+	i := int64(port)
+	providerName := C.GoString(providerNameChar)
+	handleUpdateExternalProvider(providerName, func(value string) {
+		bridge.SendToPort(i, value)
+	})
+}
+
+//export sideLoadExternalProvider
+func sideLoadExternalProvider(providerNameChar *C.char, dataChar *C.char, port C.longlong) {
+	i := int64(port)
+	providerName := C.GoString(providerNameChar)
+	data := []byte(C.GoString(dataChar))
+	handleSideLoadExternalProvider(providerName, data, func(value string) {
+		bridge.SendToPort(i, value)
+	})
+}
+
+//export startLog
+func startLog() {
+	handleStartLog()
+}
+
+//export stopLog
+func stopLog() {
+	handleStopLog()
+}

core/lib_android.go

@@ -0,0 +1,270 @@
+//go:build android && cgo
+
+package main
+
+import "C"
+import (
+	"core/platform"
+	"core/state"
+	t "core/tun"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/component/process"
+	"github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/dns"
+	"github.com/metacubex/mihomo/listener/sing_tun"
+	"github.com/metacubex/mihomo/log"
+	"strconv"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"syscall"
+	"time"
+)
+
+type ProcessMap struct {
+	m sync.Map
+}
+
+type FdMap struct {
+	m sync.Map
+}
+
+type Fd struct {
+	Id    int64 `json:"id"`
+	Value int64 `json:"value"`
+}
+
+var (
+	tunListener *sing_tun.Listener
+	fdMap       FdMap
+	fdCounter   int64 = 0
+	counter     int64 = 0
+	processMap  ProcessMap
+	tunLock     sync.Mutex
+	runTime     *time.Time
+	errBlocked  = errors.New("blocked")
+)
+
+func (cm *ProcessMap) Store(key int64, value string) {
+	cm.m.Store(key, value)
+}
+
+func (cm *ProcessMap) Load(key int64) (string, bool) {
+	value, ok := cm.m.Load(key)
+	if !ok || value == nil {
+		return "", false
+	}
+	return value.(string), true
+}
+
+func (cm *FdMap) Store(key int64) {
+	cm.m.Store(key, struct{}{})
+}
+
+func (cm *FdMap) Load(key int64) bool {
+	_, ok := cm.m.Load(key)
+	return ok
+}
+
+//export startTUN
+func startTUN(fd C.int, port C.longlong) {
+	i := int64(port)
+	ServicePort = i
+	if fd == 0 {
+		tunLock.Lock()
+		defer tunLock.Unlock()
+		now := time.Now()
+		runTime = &now
+		SendMessage(Message{
+			Type: StartedMessage,
+			Data: strconv.FormatInt(runTime.UnixMilli(), 10),
+		})
+		return
+	}
+	initSocketHook()
+	go func() {
+		tunLock.Lock()
+		defer tunLock.Unlock()
+		f := int(fd)
+		tunListener, _ = t.Start(f, currentConfig.General.Tun.Device, currentConfig.General.Tun.Stack)
+		if tunListener != nil {
+			log.Infoln("TUN address: %v", tunListener.Address())
+		}
+		now := time.Now()
+		runTime = &now
+	}()
+}
+
+//export getRunTime
+func getRunTime() *C.char {
+	if runTime == nil {
+		return C.CString("")
+	}
+	return C.CString(strconv.FormatInt(runTime.UnixMilli(), 10))
+}
+
+//export stopTun
+func stopTun() {
+	removeSocketHook()
+	go func() {
+		tunLock.Lock()
+		defer tunLock.Unlock()
+
+		runTime = nil
+
+		if tunListener != nil {
+			_ = tunListener.Close()
+		}
+	}()
+}
+
+//export setFdMap
+func setFdMap(fd C.long) {
+	fdInt := int64(fd)
+	go func() {
+		fdMap.Store(fdInt)
+	}()
+}
+
+func markSocket(fd Fd) {
+	SendMessage(Message{
+		Type: ProtectMessage,
+		Data: fd,
+	})
+}
+
+func initSocketHook() {
+	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
+		if platform.ShouldBlockConnection() {
+			return errBlocked
+		}
+		return conn.Control(func(fd uintptr) {
+			fdInt := int64(fd)
+			timeout := time.After(500 * time.Millisecond)
+			id := atomic.AddInt64(&fdCounter, 1)
+
+			markSocket(Fd{
+				Id:    id,
+				Value: fdInt,
+			})
+
+			for {
+				select {
+				case <-timeout:
+					return
+				default:
+					exists := fdMap.Load(id)
+					if exists {
+						return
+					}
+					time.Sleep(20 * time.Millisecond)
+				}
+			}
+		})
+	}
+}
+
+func removeSocketHook() {
+	dialer.DefaultSocketHook = nil
+}
+
+func init() {
+	process.DefaultPackageNameResolver = func(metadata *constant.Metadata) (string, error) {
+		if metadata == nil {
+			return "", process.ErrInvalidNetwork
+		}
+		id := atomic.AddInt64(&counter, 1)
+
+		timeout := time.After(200 * time.Millisecond)
+
+		SendMessage(Message{
+			Type: ProcessMessage,
+			Data: Process{
+				Id:       id,
+				Metadata: metadata,
+			},
+		})
+
+		for {
+			select {
+			case <-timeout:
+				return "", errors.New("package resolver timeout")
+			default:
+				value, exists := processMap.Load(id)
+				if exists {
+					return value, nil
+				}
+				time.Sleep(20 * time.Millisecond)
+			}
+		}
+	}
+}
+
+//export setProcessMap
+func setProcessMap(s *C.char) {
+	if s == nil {
+		return
+	}
+	paramsString := C.GoString(s)
+	go func() {
+		var processMapItem = &ProcessMapItem{}
+		err := json.Unmarshal([]byte(paramsString), processMapItem)
+		if err == nil {
+			processMap.Store(processMapItem.Id, processMapItem.Value)
+		}
+	}()
+}
+
+//export getCurrentProfileName
+func getCurrentProfileName() *C.char {
+	if state.CurrentState == nil {
+		return C.CString("")
+	}
+	return C.CString(state.CurrentState.CurrentProfileName)
+}
+
+//export getAndroidVpnOptions
+func getAndroidVpnOptions() *C.char {
+	tunLock.Lock()
+	defer tunLock.Unlock()
+	options := state.AndroidVpnOptions{
+		Enable:           state.CurrentState.Enable,
+		Port:             currentConfig.General.MixedPort,
+		Ipv4Address:      state.DefaultIpv4Address,
+		Ipv6Address:      state.GetIpv6Address(),
+		AccessControl:    state.CurrentState.AccessControl,
+		SystemProxy:      state.CurrentState.SystemProxy,
+		AllowBypass:      state.CurrentState.AllowBypass,
+		RouteAddress:     state.CurrentState.RouteAddress,
+		BypassDomain:     state.CurrentState.BypassDomain,
+		DnsServerAddress: state.GetDnsServerAddress(),
+	}
+	data, err := json.Marshal(options)
+	if err != nil {
+		fmt.Println("Error:", err)
+		return C.CString("")
+	}
+	return C.CString(string(data))
+}
+
+//export setState
+func setState(s *C.char) {
+	paramsString := C.GoString(s)
+	err := json.Unmarshal([]byte(paramsString), state.CurrentState)
+	if err != nil {
+		return
+	}
+}
+
+//export updateDns
+func updateDns(s *C.char) {
+	dnsList := C.GoString(s)
+	go func() {
+		log.Infoln("[DNS] updateDns %s", dnsList)
+		dns.UpdateSystemDNS(strings.Split(dnsList, ","))
+		dns.FlushCacheWithDefaultResolver()
+	}()
+}

core/log.go

@@ -1,38 +0,0 @@
-package main
-
-import "C"
-import (
-	"github.com/metacubex/mihomo/common/observable"
-	"github.com/metacubex/mihomo/log"
-)
-
-var logSubscriber observable.Subscription[log.Event]
-
-//export startLog
-func startLog() {
-	if logSubscriber != nil {
-		log.UnSubscribe(logSubscriber)
-		logSubscriber = nil
-	}
-	logSubscriber = log.Subscribe()
-	go func() {
-		for logData := range logSubscriber {
-			if logData.LogLevel < log.Level() {
-				continue
-			}
-			message := &Message{
-				Type: LogMessage,
-				Data: logData,
-			}
-			SendMessage(*message)
-		}
-	}()
-}
-
-//export stopLog
-func stopLog() {
-	if logSubscriber != nil {
-		log.UnSubscribe(logSubscriber)
-		logSubscriber = nil
-	}
-}

core/main.go

@@ -1,10 +1,17 @@
+//go:build !cgo
+
 package main
 
-import "C"
 import (
 	"fmt"
+	"os"
 )
 
 func main() {
-	fmt.Println("init clash")
+	args := os.Args
+	if len(args) <= 1 {
+		fmt.Println("Arguments error")
+		os.Exit(1)
+	}
+	startServer(args[1])
 }

core/main_cgo.go

@@ -0,0 +1,8 @@
+//go:build cgo
+
+package main
+
+import "C"
+
+func main() {
+}

core/message.go

@@ -1,77 +1,13 @@
+//go:build !cgo
+
 package main
 
-import (
-	bridge "core/dart-bridge"
-	"encoding/json"
-	"github.com/metacubex/mihomo/constant"
-)
-
-var Port int64
-var ServicePort int64
-
-type MessageType string
-
-const (
-	LogMessage     MessageType = "log"
-	ProtectMessage MessageType = "protect"
-	DelayMessage   MessageType = "delay"
-	ProcessMessage MessageType = "process"
-	RequestMessage MessageType = "request"
-	StartedMessage MessageType = "started"
-	LoadedMessage  MessageType = "loaded"
-)
-
-type Delay struct {
-	Name  string `json:"name"`
-	Value int32  `json:"value"`
-}
-
-type Process struct {
-	Id       int64              `json:"id"`
-	Metadata *constant.Metadata `json:"metadata"`
-}
-
-type Message struct {
-	Type MessageType `json:"type"`
-	Data interface{} `json:"data"`
-}
-
-func (message *Message) Json() (string, error) {
-	data, err := json.Marshal(message)
-	return string(data), err
-}
-
 func SendMessage(message Message) {
 	s, err := message.Json()
 	if err != nil {
 		return
 	}
-	if handler, ok := messageHandlers[message.Type]; ok {
-		handler(s)
-	} else {
-		sendToPort(s)
-	}
-}
-
-var messageHandlers = map[MessageType]func(string) bool{
-	ProtectMessage: sendToServicePort,
-	ProcessMessage: sendToServicePort,
-	StartedMessage: conditionalSend,
-	LoadedMessage:  conditionalSend,
-}
-
-func sendToPort(s string) bool {
-	return bridge.SendToPort(Port, s)
-}
-
-func sendToServicePort(s string) bool {
-	return bridge.SendToPort(ServicePort, s)
-}
-
-func conditionalSend(s string) bool {
-	isSuccess := sendToPort(s)
-	if !isSuccess {
-		return sendToServicePort(s)
-	}
-	return isSuccess
+	Action{
+		Method: messageMethod,
+	}.callback(s)
 }

core/message_cgo.go

@@ -0,0 +1,47 @@
+//go:build cgo
+
+package main
+
+import (
+	bridge "core/dart-bridge"
+)
+
+var (
+	Port        int64 = -1
+	ServicePort int64 = -1
+)
+
+func SendMessage(message Message) {
+	s, err := message.Json()
+	if err != nil {
+		return
+	}
+	if handler, ok := messageHandlers[message.Type]; ok {
+		handler(s)
+	} else {
+		sendToPort(s)
+	}
+}
+
+var messageHandlers = map[MessageType]func(string) bool{
+	ProtectMessage: sendToServicePort,
+	ProcessMessage: sendToServicePort,
+	StartedMessage: conditionalSend,
+	LoadedMessage:  conditionalSend,
+}
+
+func sendToPort(s string) bool {
+	return bridge.SendToPort(Port, s)
+}
+
+func sendToServicePort(s string) bool {
+	return bridge.SendToPort(ServicePort, s)
+}
+
+func conditionalSend(s string) bool {
+	isSuccess := sendToPort(s)
+	if !isSuccess {
+		return sendToServicePort(s)
+	}
+	return isSuccess
+}

core/platform/limit.go

@@ -1,4 +1,4 @@
-//go:build android
+//go:build android && cgo
 
 package platform
 

core/process.go

@@ -1,81 +0,0 @@
-//go:build android
-
-package main
-
-import "C"
-import (
-	"encoding/json"
-	"errors"
-	"github.com/metacubex/mihomo/component/process"
-	"github.com/metacubex/mihomo/constant"
-	"sync"
-	"sync/atomic"
-	"time"
-)
-
-type ProcessMap struct {
-	m sync.Map
-}
-
-func (cm *ProcessMap) Store(key int64, value string) {
-	cm.m.Store(key, value)
-}
-
-func (cm *ProcessMap) Load(key int64) (string, bool) {
-	value, ok := cm.m.Load(key)
-	if !ok || value == nil {
-		return "", false
-	}
-	return value.(string), true
-}
-
-var counter int64 = 0
-
-var processMap ProcessMap
-
-func init() {
-	process.DefaultPackageNameResolver = func(metadata *constant.Metadata) (string, error) {
-		if metadata == nil {
-			return "", process.ErrInvalidNetwork
-		}
-		id := atomic.AddInt64(&counter, 1)
-
-		timeout := time.After(200 * time.Millisecond)
-
-		SendMessage(Message{
-			Type: ProcessMessage,
-			Data: Process{
-				Id:       id,
-				Metadata: metadata,
-			},
-		})
-
-		for {
-			select {
-			case <-timeout:
-				return "", errors.New("package resolver timeout")
-			default:
-				value, exists := processMap.Load(id)
-				if exists {
-					return value, nil
-				}
-				time.Sleep(20 * time.Millisecond)
-			}
-		}
-	}
-}
-
-//export setProcessMap
-func setProcessMap(s *C.char) {
-	if s == nil {
-		return
-	}
-	paramsString := C.GoString(s)
-	go func() {
-		var processMapItem = &ProcessMapItem{}
-		err := json.Unmarshal([]byte(paramsString), processMapItem)
-		if err == nil {
-			processMap.Store(processMapItem.Id, processMapItem.Value)
-		}
-	}()
-}

core/server.go

@@ -0,0 +1,162 @@
+//go:build !cgo
+
+package main
+
+import (
+	"bufio"
+	"encoding/json"
+	"fmt"
+	"net"
+	"strconv"
+)
+
+var conn net.Conn = nil
+
+func startServer(arg string) {
+	_, err := strconv.Atoi(arg)
+	if err != nil {
+		conn, err = net.Dial("unix", arg)
+	} else {
+		conn, err = net.Dial("tcp", fmt.Sprintf("127.0.0.1:%s", arg))
+	}
+	if err != nil {
+		panic(err.Error())
+	}
+
+	defer func(conn net.Conn) {
+		_ = conn.Close()
+	}(conn)
+
+	reader := bufio.NewReader(conn)
+
+	for {
+		data, err := reader.ReadString('\n')
+		if err != nil {
+			return
+		}
+		var action = &Action{}
+
+		err = json.Unmarshal([]byte(data), action)
+
+		if err != nil {
+			return
+		}
+
+		go handleAction(action)
+	}
+}
+
+func handleAction(action *Action) {
+	switch action.Method {
+	case initClashMethod:
+		data := action.Data.(string)
+		action.callback(handleInitClash(data))
+		return
+	case getIsInitMethod:
+		action.callback(handleGetIsInit())
+		return
+	case forceGcMethod:
+		handleForceGc()
+		return
+	case shutdownMethod:
+		action.callback(handleShutdown())
+		return
+	case validateConfigMethod:
+		data := []byte(action.Data.(string))
+		action.callback(handleValidateConfig(data))
+		return
+	case updateConfigMethod:
+		data := []byte(action.Data.(string))
+		action.callback(handleUpdateConfig(data))
+		return
+	case getProxiesMethod:
+		action.callback(handleGetProxies())
+		return
+	case changeProxyMethod:
+		data := action.Data.(string)
+		handleChangeProxy(data, func(value string) {
+			action.callback(value)
+		})
+		return
+	case getTrafficMethod:
+		data := action.Data.(bool)
+		action.callback(handleGetTraffic(data))
+		return
+	case getTotalTrafficMethod:
+		data := action.Data.(bool)
+		action.callback(handleGetTotalTraffic(data))
+		return
+	case resetTrafficMethod:
+		handleResetTraffic()
+		return
+	case asyncTestDelayMethod:
+		data := action.Data.(string)
+		handleAsyncTestDelay(data, func(value string) {
+			action.callback(value)
+		})
+		return
+	case getConnectionsMethod:
+		action.callback(handleGetConnections())
+		return
+	case closeConnectionsMethod:
+		action.callback(handleCloseConnections())
+		return
+	case closeConnectionMethod:
+		id := action.Data.(string)
+		action.callback(handleCloseConnection(id))
+		return
+	case getExternalProvidersMethod:
+		action.callback(handleGetExternalProviders())
+		return
+	case getExternalProviderMethod:
+		externalProviderName := action.Data.(string)
+		action.callback(handleGetExternalProvider(externalProviderName))
+	case updateGeoDataMethod:
+		paramsString := action.Data.(string)
+		var params = map[string]string{}
+		err := json.Unmarshal([]byte(paramsString), &params)
+		if err != nil {
+			action.callback(err.Error())
+			return
+		}
+		geoType := params["geoType"]
+		geoName := params["geoName"]
+		handleUpdateGeoData(geoType, geoName, func(value string) {
+			action.callback(value)
+		})
+		return
+	case updateExternalProviderMethod:
+		providerName := action.Data.(string)
+		handleUpdateExternalProvider(providerName, func(value string) {
+			action.callback(value)
+		})
+		return
+	case sideLoadExternalProviderMethod:
+		paramsString := action.Data.(string)
+		var params = map[string]string{}
+		err := json.Unmarshal([]byte(paramsString), &params)
+		if err != nil {
+			action.callback(err.Error())
+			return
+		}
+		providerName := params["providerName"]
+		data := params["data"]
+		handleSideLoadExternalProvider(providerName, []byte(data), func(value string) {
+			action.callback(value)
+		})
+		return
+	case startLogMethod:
+		handleStartLog()
+		return
+	case stopLogMethod:
+		handleStopLog()
+		return
+	case startListenerMethod:
+		action.callback(handleStartListener())
+		return
+	case stopListenerMethod:
+		action.callback(handleStopListener())
+		return
+	}
+
+}

core/state.go

@@ -1,46 +0,0 @@
-package main
-
-import "C"
-import (
-	"core/state"
-	"encoding/json"
-	"fmt"
-)
-
-//export getCurrentProfileName
-func getCurrentProfileName() *C.char {
-	if state.CurrentState == nil {
-		return C.CString("")
-	}
-	return C.CString(state.CurrentState.CurrentProfileName)
-}
-
-//export getAndroidVpnOptions
-func getAndroidVpnOptions() *C.char {
-	options := state.AndroidVpnOptions{
-		Enable:           state.CurrentState.Enable,
-		Port:             state.CurrentRawConfig.MixedPort,
-		Ipv4Address:      state.DefaultIpv4Address,
-		Ipv6Address:      state.GetIpv6Address(),
-		AccessControl:    state.CurrentState.AccessControl,
-		SystemProxy:      state.CurrentState.SystemProxy,
-		AllowBypass:      state.CurrentState.AllowBypass,
-		BypassDomain:     state.CurrentState.BypassDomain,
-		DnsServerAddress: state.GetDnsServerAddress(),
-	}
-	data, err := json.Marshal(options)
-	if err != nil {
-		fmt.Println("Error:", err)
-		return C.CString("")
-	}
-	return C.CString(string(data))
-}
-
-//export setState
-func setState(s *C.char) {
-	paramsString := C.GoString(s)
-	err := json.Unmarshal([]byte(paramsString), state.CurrentState)
-	if err != nil {
-		return
-	}
-}

core/state/state.go

@@ -1,13 +1,11 @@
-package state
+//go:build android && cgo
 
-import "github.com/metacubex/mihomo/config"
+package state
 
 var DefaultIpv4Address = "172.19.0.1/30"
 var DefaultDnsAddress = "172.19.0.2"
 var DefaultIpv6Address = "fdfe:dcba:9876::1/126"
 
-var CurrentRawConfig = config.DefaultRawConfig()
-
 type AndroidVpnOptions struct {
 	Enable           bool           `json:"enable"`
 	Port             int            `json:"port"`
@@ -15,6 +13,7 @@ type AndroidVpnOptions struct {
 	AllowBypass      bool           `json:"allowBypass"`
 	SystemProxy      bool           `json:"systemProxy"`
 	BypassDomain     []string       `json:"bypassDomain"`
+	RouteAddress     []string       `json:"routeAddress"`
 	Ipv4Address      string         `json:"ipv4Address"`
 	Ipv6Address      string         `json:"ipv6Address"`
 	DnsServerAddress string         `json:"dnsServerAddress"`
@@ -32,6 +31,7 @@ type AndroidVpnRawOptions struct {
 	AccessControl *AccessControl `json:"accessControl"`
 	AllowBypass   bool           `json:"allowBypass"`
 	SystemProxy   bool           `json:"systemProxy"`
+	RouteAddress  []string       `json:"routeAddress"`
 	Ipv6          bool           `json:"ipv6"`
 	BypassDomain  []string       `json:"bypassDomain"`
 }
@@ -39,7 +39,6 @@ type AndroidVpnRawOptions struct {
 type State struct {
 	AndroidVpnRawOptions
 	CurrentProfileName string `json:"currentProfileName"`
-	OnlyProxy          bool   `json:"onlyProxy"`
 }
 
 var CurrentState = &State{}
@@ -53,7 +52,5 @@ func GetIpv6Address() string {
 }
 
 func GetDnsServerAddress() string {
-	//prefix, _ := netip.ParsePrefix(DefaultIpv4Address)
-	//return prefix.Addr().String()
 	return DefaultDnsAddress
 }

core/tun.go

@@ -1,157 +0,0 @@
-//go:build android
-
-package main
-
-import "C"
-import (
-	"core/platform"
-	t "core/tun"
-	"errors"
-	"github.com/metacubex/mihomo/listener/sing_tun"
-	"strconv"
-	"sync"
-	"sync/atomic"
-	"syscall"
-	"time"
-
-	"github.com/metacubex/mihomo/component/dialer"
-	"github.com/metacubex/mihomo/log"
-)
-
-var tunLock sync.Mutex
-var runTime *time.Time
-
-type FdMap struct {
-	m sync.Map
-}
-
-func (cm *FdMap) Store(key int64) {
-	cm.m.Store(key, struct{}{})
-}
-
-func (cm *FdMap) Load(key int64) bool {
-	_, ok := cm.m.Load(key)
-	return ok
-}
-
-var (
-	tunListener *sing_tun.Listener
-	fdMap       FdMap
-	fdCounter   int64 = 0
-)
-
-//export startTUN
-func startTUN(fd C.int, port C.longlong) {
-	i := int64(port)
-	ServicePort = i
-	if fd == 0 {
-		tunLock.Lock()
-		defer tunLock.Unlock()
-		now := time.Now()
-		runTime = &now
-		SendMessage(Message{
-			Type: StartedMessage,
-			Data: strconv.FormatInt(runTime.UnixMilli(), 10),
-		})
-		return
-	}
-	initSocketHook()
-	go func() {
-		tunLock.Lock()
-		defer tunLock.Unlock()
-		f := int(fd)
-		tunListener, _ = t.Start(f)
-		if tunListener != nil {
-			log.Infoln("TUN address: %v", tunListener.Address())
-		}
-
-		now := time.Now()
-
-		runTime = &now
-
-		SendMessage(Message{
-			Type: StartedMessage,
-			Data: strconv.FormatInt(runTime.UnixMilli(), 10),
-		})
-	}()
-}
-
-//export getRunTime
-func getRunTime() *C.char {
-	if runTime == nil {
-		return C.CString("")
-	}
-	return C.CString(strconv.FormatInt(runTime.UnixMilli(), 10))
-}
-
-//export stopTun
-func stopTun() {
-	removeSocketHook()
-	go func() {
-		tunLock.Lock()
-		defer tunLock.Unlock()
-
-		runTime = nil
-
-		if tunListener != nil {
-			_ = tunListener.Close()
-		}
-	}()
-}
-
-var errBlocked = errors.New("blocked")
-
-//export setFdMap
-func setFdMap(fd C.long) {
-	fdInt := int64(fd)
-	go func() {
-		fdMap.Store(fdInt)
-	}()
-}
-
-type Fd struct {
-	Id    int64 `json:"id"`
-	Value int64 `json:"value"`
-}
-
-func markSocket(fd Fd) {
-	SendMessage(Message{
-		Type: ProtectMessage,
-		Data: fd,
-	})
-}
-
-func initSocketHook() {
-	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
-		if platform.ShouldBlockConnection() {
-			return errBlocked
-		}
-		return conn.Control(func(fd uintptr) {
-			fdInt := int64(fd)
-			timeout := time.After(100 * time.Millisecond)
-			id := atomic.AddInt64(&fdCounter, 1)
-
-			markSocket(Fd{
-				Id:    id,
-				Value: fdInt,
-			})
-
-			for {
-				select {
-				case <-timeout:
-					return
-				default:
-					exists := fdMap.Load(id)
-					if exists {
-						return
-					}
-					time.Sleep(10 * time.Millisecond)
-				}
-			}
-		})
-	}
-}
-
-func removeSocketHook() {
-	dialer.DefaultSocketHook = nil
-}

core/tun/tun.go

@@ -1,10 +1,11 @@
-//go:build android
+//go:build android && cgo
 
 package tun
 
 import "C"
 import (
 	"core/state"
+	"github.com/metacubex/mihomo/constant"
 	LC "github.com/metacubex/mihomo/listener/config"
 	"github.com/metacubex/mihomo/listener/sing_tun"
 	"github.com/metacubex/mihomo/log"
@@ -23,7 +24,7 @@ type Props struct {
 	Dns6     string `json:"dns6"`
 }
 
-func Start(fd int) (*sing_tun.Listener, error) {
+func Start(fd int, device string, stack constant.TUNStack) (*sing_tun.Listener, error) {
 	var prefix4 []netip.Prefix
 	tempPrefix4, err := netip.ParsePrefix(state.DefaultIpv4Address)
 	if err != nil {
@@ -46,8 +47,8 @@ func Start(fd int) (*sing_tun.Listener, error) {
 
 	options := LC.Tun{
 		Enable:              true,
-		Device:              state.CurrentRawConfig.Tun.Device,
-		Stack:               state.CurrentRawConfig.Tun.Stack,
+		Device:              device,
+		Stack:               stack,
 		DNSHijack:           dnsHijack,
 		AutoRoute:           false,
 		AutoDetectInterface: false,

lib/application.dart

@@ -1,9 +1,13 @@
 import 'dart:async';
+
+import 'package:animations/animations.dart';
 import 'package:dynamic_color/dynamic_color.dart';
-import 'package:fl_clash/l10n/l10n.dart';
+import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/l10n/l10n.dart';
 import 'package:fl_clash/manager/hotkey_manager.dart';
 import 'package:fl_clash/manager/manager.dart';
+import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
@@ -17,6 +21,7 @@ runAppWithPreferences(
   Widget child, {
   required AppState appState,
   required Config config,
+  required AppFlowingState appFlowingState,
   required ClashConfig clashConfig,
 }) {
   runApp(MultiProvider(
@@ -28,7 +33,7 @@ runAppWithPreferences(
         create: (_) => config,
       ),
       ChangeNotifierProvider<AppFlowingState>(
-        create: (_) => AppFlowingState(),
+        create: (_) => appFlowingState,
       ),
       ChangeNotifierProxyProvider2<Config, ClashConfig, AppState>(
         create: (_) => appState,
@@ -58,10 +63,18 @@ class ApplicationState extends State<Application> {
 
   final _pageTransitionsTheme = const PageTransitionsTheme(
     builders: <TargetPlatform, PageTransitionsBuilder>{
-      TargetPlatform.android: CupertinoPageTransitionsBuilder(),
-      TargetPlatform.windows: CupertinoPageTransitionsBuilder(),
-      TargetPlatform.linux: CupertinoPageTransitionsBuilder(),
-      TargetPlatform.macOS: CupertinoPageTransitionsBuilder(),
+      TargetPlatform.android: SharedAxisPageTransitionsBuilder(
+        transitionType: SharedAxisTransitionType.horizontal,
+      ),
+      TargetPlatform.windows: SharedAxisPageTransitionsBuilder(
+        transitionType: SharedAxisTransitionType.horizontal,
+      ),
+      TargetPlatform.linux: SharedAxisPageTransitionsBuilder(
+        transitionType: SharedAxisTransitionType.horizontal,
+      ),
+      TargetPlatform.macOS: SharedAxisPageTransitionsBuilder(
+        transitionType: SharedAxisTransitionType.horizontal,
+      ),
     },
   );
 
@@ -93,6 +106,7 @@ class ApplicationState extends State<Application> {
       }
       await globalState.appController.init();
       globalState.appController.initLink();
+      app?.initShortcuts();
     });
   }
 
@@ -163,9 +177,10 @@ class ApplicationState extends State<Application> {
           child: Selector2<AppState, Config, ApplicationSelectorState>(
             selector: (_, appState, config) => ApplicationSelectorState(
               locale: config.appSetting.locale,
-              themeMode: config.themeMode,
-              primaryColor: config.primaryColor,
-              prueBlack: config.prueBlack,
+              themeMode: config.themeProps.themeMode,
+              primaryColor: config.themeProps.primaryColor,
+              prueBlack: config.themeProps.prueBlack,
+              fontFamily: config.themeProps.fontFamily,
             ),
             builder: (_, state, child) {
               return DynamicColorBuilder(
@@ -199,6 +214,7 @@ class ApplicationState extends State<Application> {
                     themeMode: state.themeMode,
                     theme: ThemeData(
                       useMaterial3: true,
+                      fontFamily: state.fontFamily.value,
                       pageTransitionsTheme: _pageTransitionsTheme,
                       colorScheme: _getAppColorScheme(
                         brightness: Brightness.light,
@@ -208,6 +224,7 @@ class ApplicationState extends State<Application> {
                     ),
                     darkTheme: ThemeData(
                       useMaterial3: true,
+                      fontFamily: state.fontFamily.value,
                       pageTransitionsTheme: _pageTransitionsTheme,
                       colorScheme: _getAppColorScheme(
                         brightness: Brightness.dark,
@@ -230,8 +247,10 @@ class ApplicationState extends State<Application> {
   @override
   Future<void> dispose() async {
     linkManager.destroy();
-    await globalState.appController.savePreferences();
-    super.dispose();
     _cancelTimer();
+    await clashService?.destroy();
+    await globalState.appController.savePreferences();
+    await globalState.appController.handleExit();
+    super.dispose();
   }
 }

lib/clash/clash.dart

@@ -1,3 +1,4 @@
 export 'core.dart';
+export 'lib.dart';
+export 'message.dart';
 export 'service.dart';
-export 'message.dart';

lib/clash/core.dart

@@ -1,41 +1,26 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:ffi';
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:ffi/ffi.dart';
+import 'package:fl_clash/clash/clash.dart';
+import 'package:fl_clash/clash/interface.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
-import 'generated/clash_ffi.dart';
+import 'package:flutter/services.dart';
+import 'package:path/path.dart';
 
 class ClashCore {
   static ClashCore? _instance;
-  static final receiver = ReceivePort();
-
-  late final ClashFFI clashFFI;
-  late final DynamicLibrary lib;
-
-  DynamicLibrary _getClashLib() {
-    if (Platform.isWindows) {
-      return DynamicLibrary.open("libclash.dll");
-    }
-    if (Platform.isMacOS) {
-      return DynamicLibrary.open("libclash.dylib");
-    }
-    if (Platform.isAndroid || Platform.isLinux) {
-      return DynamicLibrary.open("libclash.so");
-    }
-    throw "Platform is not supported";
-  }
+  late ClashInterface clashInterface;
 
   ClashCore._internal() {
-    lib = _getClashLib();
-    clashFFI = ClashFFI(lib);
-    clashFFI.initNativeApiBridge(
-      NativeApi.initializeApiDLData,
-    );
+    if (Platform.isAndroid) {
+      clashInterface = clashLib!;
+    } else {
+      clashInterface = clashService!;
+    }
   }
 
   factory ClashCore() {
@@ -43,67 +28,62 @@ class ClashCore {
     return _instance!;
   }
 
-  bool init(String homeDir) {
-    final homeDirChar = homeDir.toNativeUtf8().cast<Char>();
-    final isInit = clashFFI.initClash(homeDirChar) == 1;
-    malloc.free(homeDirChar);
-    return isInit;
-  }
-
-  shutdown() {
-    clashFFI.shutdownClash();
-    lib.close();
-  }
-
-  bool get isInit => clashFFI.getIsInit() == 1;
-
-  Future<String> validateConfig(String data) {
-    final completer = Completer<String>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(message);
-        receiver.close();
+  Future<void> _initGeo() async {
+    final homePath = await appPath.getHomeDirPath();
+    final homeDir = Directory(homePath);
+    final isExists = await homeDir.exists();
+    if (!isExists) {
+      await homeDir.create(recursive: true);
+    }
+    const geoFileNameList = [
+      mmdbFileName,
+      geoIpFileName,
+      geoSiteFileName,
+      asnFileName,
+    ];
+    try {
+      for (final geoFileName in geoFileNameList) {
+        final geoFile = File(
+          join(homePath, geoFileName),
+        );
+        final isExists = await geoFile.exists();
+        if (isExists) {
+          continue;
+        }
+        final data = await rootBundle.load('assets/data/$geoFileName');
+        List<int> bytes = data.buffer.asUint8List();
+        await geoFile.writeAsBytes(bytes, flush: true);
       }
-    });
-    final dataChar = data.toNativeUtf8().cast<Char>();
-    clashFFI.validateConfig(
-      dataChar,
-      receiver.sendPort.nativePort,
-    );
-    malloc.free(dataChar);
-    return completer.future;
+    } catch (e) {
+      exit(0);
+    }
   }
 
-  Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
-    final completer = Completer<String>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(message);
-        receiver.close();
-      }
-    });
-    final params = json.encode(updateConfigParams);
-    final paramsChar = params.toNativeUtf8().cast<Char>();
-    clashFFI.updateConfig(
-      paramsChar,
-      receiver.sendPort.nativePort,
-    );
-    malloc.free(paramsChar);
-    return completer.future;
+  Future<bool> init({
+    required ClashConfig clashConfig,
+    required Config config,
+  }) async {
+    await _initGeo();
+    final homeDirPath = await appPath.getHomeDirPath();
+    return await clashInterface.init(homeDirPath);
   }
 
-  initMessage() {
-    clashFFI.initMessage(
-      receiver.sendPort.nativePort,
-    );
+  shutdown() async {
+    await clashInterface.shutdown();
   }
 
-  Future<List<Group>> getProxiesGroups() {
-    final proxiesRaw = clashFFI.getProxies();
-    final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(proxiesRaw);
+  FutureOr<bool> get isInit => clashInterface.isInit;
+
+  FutureOr<String> validateConfig(String data) {
+    return clashInterface.validateConfig(data);
+  }
+
+  Future<String> updateConfig(UpdateConfigParams updateConfigParams) async {
+    return await clashInterface.updateConfig(updateConfigParams);
+  }
+
+  Future<List<Group>> getProxiesGroups() async {
+    final proxiesRawString = await clashInterface.getProxies();
     return Isolate.run<List<Group>>(() {
       if (proxiesRawString.isEmpty) return [];
       final proxies = (json.decode(proxiesRawString) ?? {}) as Map;
@@ -133,256 +113,112 @@ class ClashCore {
     });
   }
 
-  Future<List<ExternalProvider>> getExternalProviders() {
-    final externalProvidersRaw = clashFFI.getExternalProviders();
-    final externalProvidersRawString =
-        externalProvidersRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(externalProvidersRaw);
-    return Isolate.run<List<ExternalProvider>>(() {
-      final externalProviders =
-          (json.decode(externalProvidersRawString) as List<dynamic>)
-              .map(
-                (item) => ExternalProvider.fromJson(item),
-              )
-              .toList();
-      return externalProviders;
-    });
+  FutureOr<String> changeProxy(ChangeProxyParams changeProxyParams) async {
+    return await clashInterface.changeProxy(changeProxyParams);
   }
 
-  ExternalProvider? getExternalProvider(String externalProviderName) {
-    final externalProviderNameChar =
-        externalProviderName.toNativeUtf8().cast<Char>();
-    final externalProviderRaw =
-        clashFFI.getExternalProvider(externalProviderNameChar);
-    malloc.free(externalProviderNameChar);
-    final externalProviderRawString =
-        externalProviderRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(externalProviderRaw);
-    if (externalProviderRawString.isEmpty) return null;
-    return ExternalProvider.fromJson(json.decode(externalProviderRawString));
+  Future<List<Connection>> getConnections() async {
+    final res = await clashInterface.getConnections();
+    final connectionsData = json.decode(res) as Map;
+    final connectionsRaw = connectionsData['connections'] as List? ?? [];
+    return connectionsRaw.map((e) => Connection.fromJson(e)).toList();
+  }
+
+  closeConnection(String id) {
+    clashInterface.closeConnection(id);
+  }
+
+  closeConnections() {
+    clashInterface.closeConnections();
+  }
+
+  Future<List<ExternalProvider>> getExternalProviders() async {
+    final externalProvidersRawString =
+        await clashInterface.getExternalProviders();
+    return Isolate.run<List<ExternalProvider>>(
+      () {
+        final externalProviders =
+            (json.decode(externalProvidersRawString) as List<dynamic>)
+                .map(
+                  (item) => ExternalProvider.fromJson(item),
+                )
+                .toList();
+        return externalProviders;
+      },
+    );
+  }
+
+  Future<ExternalProvider?> getExternalProvider(
+      String externalProviderName) async {
+    final externalProvidersRawString =
+        await clashInterface.getExternalProvider(externalProviderName);
+    if (externalProvidersRawString == null) {
+      return null;
+    }
+    if (externalProvidersRawString.isEmpty) {
+      return null;
+    }
+    return ExternalProvider.fromJson(json.decode(externalProvidersRawString));
   }
 
   Future<String> updateGeoData({
     required String geoType,
     required String geoName,
   }) {
-    final completer = Completer<String>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(message);
-        receiver.close();
-      }
-    });
-    final geoTypeChar = geoType.toNativeUtf8().cast<Char>();
-    final geoNameChar = geoName.toNativeUtf8().cast<Char>();
-    clashFFI.updateGeoData(
-      geoTypeChar,
-      geoNameChar,
-      receiver.sendPort.nativePort,
-    );
-    malloc.free(geoTypeChar);
-    malloc.free(geoNameChar);
-    return completer.future;
+    return clashInterface.updateGeoData(geoType: geoType, geoName: geoName);
   }
 
   Future<String> sideLoadExternalProvider({
     required String providerName,
     required String data,
   }) {
-    final completer = Completer<String>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(message);
-        receiver.close();
-      }
-    });
-    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
-    final dataChar = data.toNativeUtf8().cast<Char>();
-    clashFFI.sideLoadExternalProvider(
-      providerNameChar,
-      dataChar,
-      receiver.sendPort.nativePort,
-    );
-    malloc.free(providerNameChar);
-    malloc.free(dataChar);
-    return completer.future;
+    return clashInterface.sideLoadExternalProvider(
+        providerName: providerName, data: data);
   }
 
   Future<String> updateExternalProvider({
     required String providerName,
-  }) {
-    final completer = Completer<String>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(message);
-        receiver.close();
-      }
-    });
-    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
-    clashFFI.updateExternalProvider(
-      providerNameChar,
-      receiver.sendPort.nativePort,
-    );
-    malloc.free(providerNameChar);
-    return completer.future;
+  }) async {
+    return clashInterface.updateExternalProvider(providerName);
   }
 
-  changeProxy(ChangeProxyParams changeProxyParams) {
-    final params = json.encode(changeProxyParams);
-    final paramsChar = params.toNativeUtf8().cast<Char>();
-    clashFFI.changeProxy(paramsChar);
-    malloc.free(paramsChar);
+  startListener() async {
+    await clashInterface.startListener();
   }
 
-  start() {
-    clashFFI.start();
+  stopListener() async {
+    await clashInterface.stopListener();
   }
 
-  stop() {
-    clashFFI.stop();
+  Future<Delay> getDelay(String proxyName) async {
+    final data = await clashInterface.asyncTestDelay(proxyName);
+    return Delay.fromJson(json.decode(data));
   }
 
-  Future<Delay> getDelay(String proxyName) {
-    final delayParams = {
-      "proxy-name": proxyName,
-      "timeout": httpTimeoutDuration.inMilliseconds,
-    };
-    final completer = Completer<Delay>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(Delay.fromJson(json.decode(message)));
-        receiver.close();
-      }
-    });
-    final delayParamsChar =
-        json.encode(delayParams).toNativeUtf8().cast<Char>();
-    clashFFI.asyncTestDelay(
-      delayParamsChar,
-      receiver.sendPort.nativePort,
-    );
-    malloc.free(delayParamsChar);
-    return completer.future;
+  Future<Traffic> getTraffic(bool value) async {
+    final trafficString = await clashInterface.getTraffic(value);
+    return Traffic.fromMap(json.decode(trafficString));
   }
 
-  clearEffect(String profileId) {
-    final profileIdChar = profileId.toNativeUtf8().cast<Char>();
-    clashFFI.clearEffect(profileIdChar);
-    malloc.free(profileIdChar);
+  Future<Traffic> getTotalTraffic(bool value) async {
+    final totalTrafficString = await clashInterface.getTotalTraffic(value);
+    return Traffic.fromMap(json.decode(totalTrafficString));
   }
 
-  VersionInfo getVersionInfo() {
-    final versionInfoRaw = clashFFI.getVersionInfo();
-    final versionInfo = json.decode(versionInfoRaw.cast<Utf8>().toDartString());
-    clashFFI.freeCString(versionInfoRaw);
-    return VersionInfo.fromJson(versionInfo);
+  resetTraffic() {
+    clashInterface.resetTraffic();
   }
 
-  setState(CoreState state) {
-    final stateChar = json.encode(state).toNativeUtf8().cast<Char>();
-    clashFFI.setState(stateChar);
-    malloc.free(stateChar);
-  }
-
-  String getCurrentProfileName() {
-    final currentProfileRaw = clashFFI.getCurrentProfileName();
-    final currentProfile = currentProfileRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(currentProfileRaw);
-    return currentProfile;
-  }
-
-  AndroidVpnOptions getAndroidVpnOptions() {
-    final vpnOptionsRaw = clashFFI.getAndroidVpnOptions();
-    final vpnOptions = json.decode(vpnOptionsRaw.cast<Utf8>().toDartString());
-    clashFFI.freeCString(vpnOptionsRaw);
-    return AndroidVpnOptions.fromJson(vpnOptions);
-  }
-
-  Traffic getTraffic() {
-    final trafficRaw = clashFFI.getTraffic();
-    final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
-    clashFFI.freeCString(trafficRaw);
-    return Traffic.fromMap(trafficMap);
-  }
-
-  Traffic getTotalTraffic() {
-    final trafficRaw = clashFFI.getTotalTraffic();
-    final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
-    clashFFI.freeCString(trafficRaw);
-    return Traffic.fromMap(trafficMap);
-  }
-
-  void resetTraffic() {
-    clashFFI.resetTraffic();
-  }
-
-  void startLog() {
-    clashFFI.startLog();
+  startLog() {
+    clashInterface.startLog();
   }
 
   stopLog() {
-    clashFFI.stopLog();
-  }
-
-  startTun(int fd, int port) {
-    if (!Platform.isAndroid) return;
-    clashFFI.startTUN(fd, port);
-  }
-
-  updateDns(String dns) {
-    if (!Platform.isAndroid) return;
-    final dnsChar = dns.toNativeUtf8().cast<Char>();
-    clashFFI.updateDns(dnsChar);
-    malloc.free(dnsChar);
+    clashInterface.stopLog();
   }
 
   requestGc() {
-    clashFFI.forceGc();
-  }
-
-  void stopTun() {
-    clashFFI.stopTun();
-  }
-
-  void setProcessMap(ProcessMapItem processMapItem) {
-    final processMapItemChar =
-        json.encode(processMapItem).toNativeUtf8().cast<Char>();
-    clashFFI.setProcessMap(processMapItemChar);
-    malloc.free(processMapItemChar);
-  }
-
-  void setFdMap(int fd) {
-    clashFFI.setFdMap(fd);
-  }
-
-  DateTime? getRunTime() {
-    final runTimeRaw = clashFFI.getRunTime();
-    final runTimeString = runTimeRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(runTimeRaw);
-    if (runTimeString.isEmpty) return null;
-    return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
-  }
-
-  List<Connection> getConnections() {
-    final connectionsDataRaw = clashFFI.getConnections();
-    final connectionsData =
-        json.decode(connectionsDataRaw.cast<Utf8>().toDartString()) as Map;
-    clashFFI.freeCString(connectionsDataRaw);
-    final connectionsRaw = connectionsData['connections'] as List? ?? [];
-    return connectionsRaw.map((e) => Connection.fromJson(e)).toList();
-  }
-
-  closeConnection(String id) {
-    final idChar = id.toNativeUtf8().cast<Char>();
-    clashFFI.closeConnection(idChar);
-    malloc.free(idChar);
-  }
-
-  closeConnections() {
-    clashFFI.closeConnections();
+    clashInterface.forceGc();
   }
 }
 

lib/clash/interface.dart

@@ -0,0 +1,59 @@
+import 'dart:async';
+
+import 'package:fl_clash/models/models.dart';
+
+mixin ClashInterface {
+  FutureOr<bool> init(String homeDir);
+
+  FutureOr<void> shutdown();
+
+  FutureOr<bool> get isInit;
+
+  forceGc();
+
+  FutureOr<String> validateConfig(String data);
+
+  Future<String> asyncTestDelay(String proxyName);
+
+  FutureOr<String> updateConfig(UpdateConfigParams updateConfigParams);
+
+  FutureOr<String> getProxies();
+
+  FutureOr<String> changeProxy(ChangeProxyParams changeProxyParams);
+
+  Future<bool> startListener();
+
+  Future<bool> stopListener();
+
+  FutureOr<String> getExternalProviders();
+
+  FutureOr<String>? getExternalProvider(String externalProviderName);
+
+  Future<String> updateGeoData({
+    required String geoType,
+    required String geoName,
+  });
+
+  Future<String> sideLoadExternalProvider({
+    required String providerName,
+    required String data,
+  });
+
+  Future<String> updateExternalProvider(String providerName);
+
+  FutureOr<String> getTraffic(bool value);
+
+  FutureOr<String> getTotalTraffic(bool value);
+
+  resetTraffic();
+
+  startLog();
+
+  stopLog();
+
+  FutureOr<String> getConnections();
+
+  FutureOr<bool> closeConnection(String id);
+
+  FutureOr<bool> closeConnections();
+}

lib/clash/lib.dart

@@ -0,0 +1,367 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:ffi';
+import 'dart:io';
+import 'dart:isolate';
+
+import 'package:ffi/ffi.dart';
+import 'package:fl_clash/common/constant.dart';
+import 'package:fl_clash/models/models.dart';
+
+import 'generated/clash_ffi.dart';
+import 'interface.dart';
+
+class ClashLib with ClashInterface {
+  static ClashLib? _instance;
+  final receiver = ReceivePort();
+
+  late final ClashFFI clashFFI;
+
+  late final DynamicLibrary lib;
+
+  ClashLib._internal() {
+    lib = DynamicLibrary.open("libclash.so");
+    clashFFI = ClashFFI(lib);
+    clashFFI.initNativeApiBridge(
+      NativeApi.initializeApiDLData,
+    );
+  }
+
+  factory ClashLib() {
+    _instance ??= ClashLib._internal();
+    return _instance!;
+  }
+
+  initMessage() {
+    clashFFI.initMessage(
+      receiver.sendPort.nativePort,
+    );
+  }
+
+  @override
+  bool init(String homeDir) {
+    final homeDirChar = homeDir.toNativeUtf8().cast<Char>();
+    final isInit = clashFFI.initClash(homeDirChar) == 1;
+    malloc.free(homeDirChar);
+    return isInit;
+  }
+
+  @override
+  shutdown() async {
+    clashFFI.shutdownClash();
+    lib.close();
+  }
+
+  @override
+  bool get isInit => clashFFI.getIsInit() == 1;
+
+  @override
+  Future<String> validateConfig(String data) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final dataChar = data.toNativeUtf8().cast<Char>();
+    clashFFI.validateConfig(
+      dataChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(dataChar);
+    return completer.future;
+  }
+
+  @override
+  Future<String> updateConfig(UpdateConfigParams updateConfigParams) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final params = json.encode(updateConfigParams);
+    final paramsChar = params.toNativeUtf8().cast<Char>();
+    clashFFI.updateConfig(
+      paramsChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(paramsChar);
+    return completer.future;
+  }
+
+  @override
+  String getProxies() {
+    final proxiesRaw = clashFFI.getProxies();
+    final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(proxiesRaw);
+    return proxiesRawString;
+  }
+
+  @override
+  String getExternalProviders() {
+    final externalProvidersRaw = clashFFI.getExternalProviders();
+    final externalProvidersRawString =
+        externalProvidersRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(externalProvidersRaw);
+    return externalProvidersRawString;
+  }
+
+  @override
+  String getExternalProvider(String externalProviderName) {
+    final externalProviderNameChar =
+        externalProviderName.toNativeUtf8().cast<Char>();
+    final externalProviderRaw =
+        clashFFI.getExternalProvider(externalProviderNameChar);
+    malloc.free(externalProviderNameChar);
+    final externalProviderRawString =
+        externalProviderRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(externalProviderRaw);
+    return externalProviderRawString;
+  }
+
+  @override
+  Future<String> updateGeoData({
+    required String geoType,
+    required String geoName,
+  }) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final geoTypeChar = geoType.toNativeUtf8().cast<Char>();
+    final geoNameChar = geoName.toNativeUtf8().cast<Char>();
+    clashFFI.updateGeoData(
+      geoTypeChar,
+      geoNameChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(geoTypeChar);
+    malloc.free(geoNameChar);
+    return completer.future;
+  }
+
+  @override
+  Future<String> sideLoadExternalProvider({
+    required String providerName,
+    required String data,
+  }) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
+    final dataChar = data.toNativeUtf8().cast<Char>();
+    clashFFI.sideLoadExternalProvider(
+      providerNameChar,
+      dataChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(providerNameChar);
+    malloc.free(dataChar);
+    return completer.future;
+  }
+
+  @override
+  Future<String> updateExternalProvider(String providerName) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
+    clashFFI.updateExternalProvider(
+      providerNameChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(providerNameChar);
+    return completer.future;
+  }
+
+  @override
+  Future<String> changeProxy(ChangeProxyParams changeProxyParams) {
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final params = json.encode(changeProxyParams);
+    final paramsChar = params.toNativeUtf8().cast<Char>();
+    clashFFI.changeProxy(
+      paramsChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(paramsChar);
+    return completer.future;
+  }
+
+  @override
+  String getConnections() {
+    final connectionsDataRaw = clashFFI.getConnections();
+    final connectionsString = connectionsDataRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(connectionsDataRaw);
+    return connectionsString;
+  }
+
+  @override
+  closeConnection(String id) {
+    final idChar = id.toNativeUtf8().cast<Char>();
+    clashFFI.closeConnection(idChar);
+    malloc.free(idChar);
+    return true;
+  }
+
+  @override
+  closeConnections() {
+    clashFFI.closeConnections();
+    return true;
+  }
+
+  @override
+  startListener() async {
+    clashFFI.startListener();
+    return true;
+  }
+
+  @override
+  stopListener() async {
+    clashFFI.stopListener();
+    return true;
+  }
+
+  @override
+  Future<String> asyncTestDelay(String proxyName) {
+    final delayParams = {
+      "proxy-name": proxyName,
+      "timeout": httpTimeoutDuration.inMilliseconds,
+    };
+    final completer = Completer<String>();
+    final receiver = ReceivePort();
+    receiver.listen((message) {
+      if (!completer.isCompleted) {
+        completer.complete(message);
+        receiver.close();
+      }
+    });
+    final delayParamsChar =
+        json.encode(delayParams).toNativeUtf8().cast<Char>();
+    clashFFI.asyncTestDelay(
+      delayParamsChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(delayParamsChar);
+    return completer.future;
+  }
+
+  @override
+  String getTraffic(bool value) {
+    final trafficRaw = clashFFI.getTraffic(value ? 1 : 0);
+    final trafficString = trafficRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(trafficRaw);
+    return trafficString;
+  }
+
+  @override
+  String getTotalTraffic(bool value) {
+    final trafficRaw = clashFFI.getTotalTraffic(value ? 1 : 0);
+    clashFFI.freeCString(trafficRaw);
+    return trafficRaw.cast<Utf8>().toDartString();
+  }
+
+  @override
+  void resetTraffic() {
+    clashFFI.resetTraffic();
+  }
+
+  @override
+  void startLog() {
+    clashFFI.startLog();
+  }
+
+  @override
+  stopLog() {
+    clashFFI.stopLog();
+  }
+
+  @override
+  forceGc() {
+    clashFFI.forceGc();
+  }
+
+  /// Android
+
+  startTun(int fd, int port) {
+    if (!Platform.isAndroid) return;
+    clashFFI.startTUN(fd, port);
+  }
+
+  stopTun() {
+    clashFFI.stopTun();
+  }
+
+  updateDns(String dns) {
+    if (!Platform.isAndroid) return;
+    final dnsChar = dns.toNativeUtf8().cast<Char>();
+    clashFFI.updateDns(dnsChar);
+    malloc.free(dnsChar);
+  }
+
+  setProcessMap(ProcessMapItem processMapItem) {
+    final processMapItemChar =
+        json.encode(processMapItem).toNativeUtf8().cast<Char>();
+    clashFFI.setProcessMap(processMapItemChar);
+    malloc.free(processMapItemChar);
+  }
+
+  setState(CoreState state) {
+    final stateChar = json.encode(state).toNativeUtf8().cast<Char>();
+    clashFFI.setState(stateChar);
+    malloc.free(stateChar);
+  }
+
+  String getCurrentProfileName() {
+    final currentProfileRaw = clashFFI.getCurrentProfileName();
+    final currentProfile = currentProfileRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(currentProfileRaw);
+    return currentProfile;
+  }
+
+  AndroidVpnOptions getAndroidVpnOptions() {
+    final vpnOptionsRaw = clashFFI.getAndroidVpnOptions();
+    final vpnOptions = json.decode(vpnOptionsRaw.cast<Utf8>().toDartString());
+    clashFFI.freeCString(vpnOptionsRaw);
+    return AndroidVpnOptions.fromJson(vpnOptions);
+  }
+
+  setFdMap(int fd) {
+    clashFFI.setFdMap(fd);
+  }
+
+  DateTime? getRunTime() {
+    final runTimeRaw = clashFFI.getRunTime();
+    final runTimeString = runTimeRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(runTimeRaw);
+    if (runTimeString.isEmpty) return null;
+    return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
+  }
+}
+
+final clashLib = Platform.isAndroid ? ClashLib() : null;

lib/clash/message.dart

@@ -1,42 +1,40 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:flutter/foundation.dart';
 
-import 'core.dart';
-
 class ClashMessage {
-  StreamSubscription? subscription;
+  final controller = StreamController();
 
   ClashMessage._() {
-    if (subscription != null) {
-      subscription!.cancel();
-      subscription = null;
-    }
-    subscription = ClashCore.receiver.listen((message) {
-      final m = AppMessage.fromJson(json.decode(message));
-      for (final AppMessageListener listener in _listeners) {
-        switch (m.type) {
-          case AppMessageType.log:
-            listener.onLog(Log.fromJson(m.data));
-            break;
-          case AppMessageType.delay:
-            listener.onDelay(Delay.fromJson(m.data));
-            break;
-          case AppMessageType.request:
-            listener.onRequest(Connection.fromJson(m.data));
-            break;
-          case AppMessageType.started:
-            listener.onStarted(m.data);
-            break;
-          case AppMessageType.loaded:
-            listener.onLoaded(m.data);
-            break;
+    clashLib?.receiver.listen(controller.add);
+    controller.stream.listen(
+      (message) {
+        final m = AppMessage.fromJson(json.decode(message));
+        for (final AppMessageListener listener in _listeners) {
+          switch (m.type) {
+            case AppMessageType.log:
+              listener.onLog(Log.fromJson(m.data));
+              break;
+            case AppMessageType.delay:
+              listener.onDelay(Delay.fromJson(m.data));
+              break;
+            case AppMessageType.request:
+              listener.onRequest(Connection.fromJson(m.data));
+              break;
+            case AppMessageType.started:
+              listener.onStarted(m.data);
+              break;
+            case AppMessageType.loaded:
+              listener.onLoaded(m.data);
+              break;
+          }
         }
-      }
-    });
+      },
+    );
   }
 
   static final ClashMessage instance = ClashMessage._();

lib/clash/service.dart

@@ -1,54 +1,414 @@
+import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:fl_clash/clash/clash.dart';
+import 'package:fl_clash/clash/interface.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/services.dart';
-import 'package:path/path.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/core.dart';
 
-import 'core.dart';
+class ClashService with ClashInterface {
+  static ClashService? _instance;
 
-class ClashService {
-  Future<void> initGeo() async {
-    final homePath = await appPath.getHomeDirPath();
-    final homeDir = Directory(homePath);
-    final isExists = await homeDir.exists();
-    if (!isExists) {
-      await homeDir.create(recursive: true);
-    }
-    const geoFileNameList = [
-      mmdbFileName,
-      geoIpFileName,
-      geoSiteFileName,
-      asnFileName,
-    ];
-    try {
-      for (final geoFileName in geoFileNameList) {
-        final geoFile = File(
-          join(homePath, geoFileName),
-        );
-        final isExists = await geoFile.exists();
-        if (isExists) {
-          continue;
-        }
-        final data = await rootBundle.load('assets/data/$geoFileName');
-        List<int> bytes = data.buffer.asUint8List();
-        await geoFile.writeAsBytes(bytes, flush: true);
-      }
-    } catch (e) {
-      debugPrint("$e");
-      exit(0);
+  Completer<ServerSocket> serverCompleter = Completer();
+
+  Completer<Socket> socketCompleter = Completer();
+
+  Map<String, Completer> callbackCompleterMap = {};
+
+  Process? process;
+
+  factory ClashService() {
+    _instance ??= ClashService._internal();
+    return _instance!;
+  }
+
+  ClashService._internal() {
+    _createServer();
+    startCore();
+  }
+
+  _createServer() async {
+    final address = !Platform.isWindows
+        ? InternetAddress(
+            unixSocketPath,
+            type: InternetAddressType.unix,
+          )
+        : InternetAddress(
+            localhost,
+            type: InternetAddressType.IPv4,
+          );
+    await _deleteSocketFile();
+    final server = await ServerSocket.bind(
+      address,
+      0,
+      shared: true,
+    );
+    serverCompleter.complete(server);
+    await for (final socket in server) {
+      await _destroySocket();
+      socketCompleter.complete(socket);
+      socket
+          .transform(
+            StreamTransformer<Uint8List, String>.fromHandlers(
+              handleData: (Uint8List data, EventSink<String> sink) {
+                sink.add(utf8.decode(data, allowMalformed: true));
+              },
+            ),
+          )
+          .transform(LineSplitter())
+          .listen(
+            (data) {
+              _handleAction(
+                Action.fromJson(
+                  json.decode(data.trim()),
+                ),
+              );
+            },
+          );
     }
   }
 
-  Future<bool> init({
-    required ClashConfig clashConfig,
-    required Config config,
+  startCore() async {
+    if (process != null) {
+      await shutdown();
+    }
+    final serverSocket = await serverCompleter.future;
+    final arg = Platform.isWindows
+        ? "${serverSocket.port}"
+        : serverSocket.address.address;
+    bool isSuccess = false;
+    if (Platform.isWindows && await system.checkIsAdmin()) {
+      isSuccess = await request.startCoreByHelper(arg);
+    }
+    if (isSuccess) {
+      return;
+    }
+    process = await Process.start(
+      appPath.corePath,
+      [
+        arg,
+      ],
+    );
+    process!.stdout.listen((_) {});
+  }
+
+  _deleteSocketFile() async {
+    if (!Platform.isWindows) {
+      final file = File(unixSocketPath);
+      if (await file.exists()) {
+        await file.delete();
+      }
+    }
+  }
+
+  _destroySocket() async {
+    if (socketCompleter.isCompleted) {
+      final lastSocket = await socketCompleter.future;
+      await lastSocket.close();
+      socketCompleter = Completer();
+    }
+  }
+
+  _handleAction(Action action) {
+    final completer = callbackCompleterMap[action.id];
+    switch (action.method) {
+      case ActionMethod.initClash:
+      case ActionMethod.shutdown:
+      case ActionMethod.getIsInit:
+      case ActionMethod.startListener:
+      case ActionMethod.resetTraffic:
+      case ActionMethod.closeConnections:
+      case ActionMethod.closeConnection:
+      case ActionMethod.stopListener:
+        completer?.complete(action.data as bool);
+        return;
+      case ActionMethod.changeProxy:
+      case ActionMethod.getProxies:
+      case ActionMethod.getTraffic:
+      case ActionMethod.getTotalTraffic:
+      case ActionMethod.asyncTestDelay:
+      case ActionMethod.getConnections:
+      case ActionMethod.getExternalProviders:
+      case ActionMethod.getExternalProvider:
+      case ActionMethod.validateConfig:
+      case ActionMethod.updateConfig:
+      case ActionMethod.updateGeoData:
+      case ActionMethod.updateExternalProvider:
+      case ActionMethod.sideLoadExternalProvider:
+        completer?.complete(action.data as String);
+        return;
+      case ActionMethod.message:
+        clashMessage.controller.add(action.data as String);
+        return;
+      case ActionMethod.forceGc:
+      case ActionMethod.startLog:
+      case ActionMethod.stopLog:
+      default:
+        return;
+    }
+  }
+
+  Future<T> _invoke<T>({
+    required ActionMethod method,
+    dynamic data,
+    Duration? timeout,
+    FutureOr<T> Function()? onTimeout,
   }) async {
-    await initGeo();
-    final homeDirPath = await appPath.getHomeDirPath();
-    final isInit = clashCore.init(homeDirPath);
-    return isInit;
+    final id = "${method.name}#${other.id}";
+    final socket = await socketCompleter.future;
+    callbackCompleterMap[id] = Completer<T>();
+    socket.writeln(
+      json.encode(
+        Action(
+          id: id,
+          method: method,
+          data: data,
+        ),
+      ),
+    );
+    return (callbackCompleterMap[id] as Completer<T>).safeFuture(
+      timeout: timeout,
+      onLast: () {
+        callbackCompleterMap.remove(id);
+      },
+      onTimeout: onTimeout,
+      functionName: id,
+    );
+  }
+
+  _prueInvoke({
+    required ActionMethod method,
+    dynamic data,
+  }) async {
+    final id = "${method.name}#${other.id}";
+    final socket = await socketCompleter.future;
+    socket.writeln(
+      json.encode(
+        Action(
+          id: id,
+          method: method,
+          data: data,
+        ),
+      ),
+    );
+  }
+
+  @override
+  Future<bool> init(String homeDir) {
+    return _invoke<bool>(
+      method: ActionMethod.initClash,
+      data: homeDir,
+    );
+  }
+
+  @override
+  shutdown() async {
+    await _invoke<bool>(
+      method: ActionMethod.shutdown,
+    );
+    if (Platform.isWindows) {
+      await request.stopCoreByHelper();
+    }
+    await _destroySocket();
+    process?.kill();
+    process = null;
+  }
+
+  @override
+  Future<bool> get isInit {
+    return _invoke<bool>(
+      method: ActionMethod.getIsInit,
+    );
+  }
+
+  @override
+  forceGc() {
+    _prueInvoke(method: ActionMethod.forceGc);
+  }
+
+  @override
+  FutureOr<String> validateConfig(String data) {
+    return _invoke<String>(
+      method: ActionMethod.validateConfig,
+      data: data,
+    );
+  }
+
+  @override
+  Future<String> updateConfig(UpdateConfigParams updateConfigParams) async {
+    return await _invoke<String>(
+      method: ActionMethod.updateConfig,
+      data: json.encode(updateConfigParams),
+      timeout: const Duration(seconds: 20),
+    );
+  }
+
+  @override
+  Future<String> getProxies() {
+    return _invoke<String>(
+      method: ActionMethod.getProxies,
+    );
+  }
+
+  @override
+  FutureOr<String> changeProxy(ChangeProxyParams changeProxyParams) {
+    return _invoke<String>(
+      method: ActionMethod.changeProxy,
+      data: json.encode(changeProxyParams),
+    );
+  }
+
+  @override
+  FutureOr<String> getExternalProviders() {
+    return _invoke<String>(
+      method: ActionMethod.getExternalProviders,
+    );
+  }
+
+  @override
+  FutureOr<String> getExternalProvider(String externalProviderName) {
+    return _invoke<String>(
+      method: ActionMethod.getExternalProvider,
+      data: externalProviderName,
+    );
+  }
+
+  @override
+  Future<String> updateGeoData({
+    required String geoType,
+    required String geoName,
+  }) {
+    return _invoke<String>(
+      method: ActionMethod.updateGeoData,
+      data: json.encode(
+        {
+          "geoType": geoType,
+          "geoName": geoName,
+        },
+      ),
+    );
+  }
+
+  @override
+  Future<String> sideLoadExternalProvider({
+    required String providerName,
+    required String data,
+  }) {
+    return _invoke<String>(
+      method: ActionMethod.sideLoadExternalProvider,
+      data: json.encode({
+        "providerName": providerName,
+        "data": data,
+      }),
+    );
+  }
+
+  @override
+  Future<String> updateExternalProvider(String providerName) {
+    return _invoke<String>(
+      method: ActionMethod.updateExternalProvider,
+      data: providerName,
+    );
+  }
+
+  @override
+  FutureOr<String> getConnections() {
+    return _invoke<String>(
+      method: ActionMethod.getConnections,
+    );
+  }
+
+  @override
+  Future<bool> closeConnections() {
+    return _invoke<bool>(
+      method: ActionMethod.closeConnections,
+    );
+  }
+
+  @override
+  Future<bool> closeConnection(String id) {
+    return _invoke<bool>(
+      method: ActionMethod.closeConnection,
+      data: id,
+    );
+  }
+
+  @override
+  FutureOr<String> getTotalTraffic(bool value) {
+    return _invoke<String>(
+      method: ActionMethod.getTotalTraffic,
+      data: value,
+    );
+  }
+
+  @override
+  FutureOr<String> getTraffic(bool value) {
+    return _invoke<String>(
+      method: ActionMethod.getTraffic,
+      data: value,
+    );
+  }
+
+  @override
+  resetTraffic() {
+    _prueInvoke(method: ActionMethod.resetTraffic);
+  }
+
+  @override
+  startLog() {
+    _prueInvoke(method: ActionMethod.startLog);
+  }
+
+  @override
+  stopLog() {
+    _prueInvoke(method: ActionMethod.stopLog);
+  }
+
+  @override
+  Future<bool> startListener() {
+    return _invoke<bool>(
+      method: ActionMethod.startListener,
+    );
+  }
+
+  @override
+  stopListener() {
+    return _invoke<bool>(
+      method: ActionMethod.stopListener,
+    );
+  }
+
+  @override
+  Future<String> asyncTestDelay(String proxyName) {
+    final delayParams = {
+      "proxy-name": proxyName,
+      "timeout": httpTimeoutDuration.inMilliseconds,
+    };
+    return _invoke<String>(
+      method: ActionMethod.asyncTestDelay,
+      data: json.encode(delayParams),
+      timeout: Duration(
+        milliseconds: 6000,
+      ),
+      onTimeout: () {
+        return json.encode(
+          Delay(
+            name: proxyName,
+            value: -1,
+          ),
+        );
+      },
+    );
+  }
+
+  destroy() async {
+    final server = await serverCompleter.future;
+    await server.close();
+    await _deleteSocketFile();
   }
 }
 
-final clashService = ClashService();
+final clashService = system.isDesktop ? ClashService() : null;

lib/common/color.dart

@@ -29,7 +29,6 @@ extension ColorSchemeExtension on ColorScheme {
   ColorScheme toPrueBlack(bool isPrueBlack) => isPrueBlack
       ? copyWith(
           surface: Colors.black,
-          background: Colors.black,
           surfaceContainer: surfaceContainer.darken(0.05),
         )
       : this;

lib/common/common.dart

@@ -1,33 +1,36 @@
-export 'path.dart';
-export 'request.dart';
-export 'preferences.dart';
-export 'constant.dart';
-export 'proxy.dart';
-export 'other.dart';
-export 'num.dart';
-export 'navigation.dart';
-export 'window.dart';
-export 'system.dart';
-export 'picker.dart';
 export 'android.dart';
-export 'launch.dart';
-export 'protocol.dart';
-export 'datetime.dart';
-export 'context.dart';
-export 'link.dart';
-export 'text.dart';
-export 'color.dart';
-export 'list.dart';
-export 'string.dart';
 export 'app_localizations.dart';
+export 'color.dart';
+export 'constant.dart';
+export 'context.dart';
+export 'datetime.dart';
 export 'function.dart';
-export 'package.dart';
-export 'measure.dart';
-export 'windows.dart';
-export 'iterable.dart';
-export 'scroll.dart';
-export 'icons.dart';
+export 'future.dart';
 export 'http.dart';
+export 'icons.dart';
+export 'iterable.dart';
 export 'keyboard.dart';
+export 'launch.dart';
+export 'link.dart';
+export 'list.dart';
+export 'lock.dart';
+export 'measure.dart';
+export 'navigation.dart';
+export 'navigator.dart';
 export 'network.dart';
-export 'font.dart';
+export 'num.dart';
+export 'other.dart';
+export 'package.dart';
+export 'path.dart';
+export 'picker.dart';
+export 'preferences.dart';
+export 'protocol.dart';
+export 'proxy.dart';
+export 'request.dart';
+export 'scroll.dart';
+export 'string.dart';
+export 'system.dart';
+export 'text.dart';
+export 'tray.dart';
+export 'window.dart';
+export 'windows.dart';

lib/common/constant.dart

@@ -1,15 +1,20 @@
 import 'dart:io';
+import 'dart:math';
 import 'dart:ui';
 
 import 'package:collection/collection.dart';
+import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
-import 'system.dart';
 
 const appName = "FlClash";
+const appHelperService = "FlClashHelperService";
 const coreName = "clash.meta";
 const packageName = "com.follow.clash";
+final unixSocketPath = "/tmp/FlClashSocket_${Random().nextInt(10000)}.sock";
+const helperPort = 47890;
+const helperTag = "2024125";
 const httpTimeoutDuration = Duration(milliseconds: 5000);
 const moreDuration = Duration(milliseconds: 100);
 const animateDuration = Duration(milliseconds: 100);
@@ -21,7 +26,7 @@ const geoSiteFileName = "GeoSite.dat";
 final double kHeaderHeight = system.isDesktop
     ? !Platform.isMacOS
         ? 40
-        : 26
+        : 28
     : 0;
 const GeoXMap defaultGeoXMap = {
   "mmdb":

lib/common/dav_client.dart

@@ -24,8 +24,8 @@ class DAVClient {
       },
     );
     client.setConnectTimeout(8000);
-    client.setSendTimeout(8000);
-    client.setReceiveTimeout(8000);
+    client.setSendTimeout(60000);
+    client.setReceiveTimeout(60000);
     pingCompleter.complete(_ping());
   }
 

lib/common/font.dart

@@ -1,3 +0,0 @@
-class Fonts{
-  static String get twEmoji => "Twemoji";
-}

lib/common/future.dart

@@ -0,0 +1,42 @@
+import 'dart:async';
+import 'dart:ui';
+
+extension CompleterExt<T> on Completer<T> {
+  safeFuture({
+    Duration? timeout,
+    VoidCallback? onLast,
+    FutureOr<T> Function()? onTimeout,
+    required String functionName,
+  }) {
+    final realTimeout = timeout ?? const Duration(seconds: 6);
+    Timer(realTimeout + Duration(milliseconds: 1000), () {
+      if (onLast != null) {
+        onLast();
+      }
+    });
+    return future.withTimeout(
+      timeout: realTimeout,
+      functionName: functionName,
+      onTimeout: onTimeout,
+    );
+  }
+}
+
+extension FutureExt<T> on Future<T> {
+  Future<T> withTimeout({
+    required Duration timeout,
+    required String functionName,
+    FutureOr<T> Function()? onTimeout,
+  }) {
+    return this.timeout(
+      timeout,
+      onTimeout: () async {
+        if (onTimeout != null) {
+          return onTimeout();
+        } else {
+          throw TimeoutException('$functionName timeout');
+        }
+      },
+    );
+  }
+}

lib/common/http.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:flutter/cupertino.dart';
 
 import '../state.dart';
+import 'constant.dart';
 
 class FlClashHttpOverrides extends HttpOverrides {
   @override
@@ -10,6 +11,9 @@ class FlClashHttpOverrides extends HttpOverrides {
     final client = super.createHttpClient(context);
     client.badCertificateCallback = (_, __, ___) => true;
     client.findProxy = (url) {
+      if ([localhost].contains(url.host)) {
+        return "DIRECT";
+      }
       debugPrint("find $url");
       final appController = globalState.appController;
       final port = appController.clashConfig.mixedPort;

lib/common/launch.dart

@@ -1,11 +1,11 @@
 import 'dart:async';
 import 'dart:io';
-import 'package:fl_clash/models/models.dart' hide Process;
+
+import 'package:fl_clash/models/models.dart';
 import 'package:launch_at_startup/launch_at_startup.dart';
 
 import 'constant.dart';
 import 'system.dart';
-import 'windows.dart';
 
 class AutoLaunch {
   static AutoLaunch? _instance;
@@ -26,60 +26,16 @@ class AutoLaunch {
     return await launchAtStartup.isEnabled();
   }
 
-  Future<bool> get windowsIsEnable async {
-    final res = await Process.run(
-      'schtasks',
-      ['/Query', '/TN', appName, '/V', "/FO", "LIST"],
-      runInShell: true,
-    );
-    return res.stdout.toString().contains(Platform.resolvedExecutable);
-  }
-
   Future<bool> enable() async {
-    if (Platform.isWindows) {
-      await windowsDisable();
-    }
     return await launchAtStartup.enable();
   }
 
-  windowsDisable() async {
-    final res = await Process.run(
-      'schtasks',
-      [
-        '/Delete',
-        '/TN',
-        appName,
-        '/F',
-      ],
-      runInShell: true,
-    );
-    return res.exitCode == 0;
-  }
-
-  Future<bool> windowsEnable() async {
-    await disable();
-    return await windows?.registerTask(appName) ?? false;
-  }
-
   Future<bool> disable() async {
     return await launchAtStartup.disable();
   }
 
   updateStatus(AutoLaunchState state) async {
-    final isAdminAutoLaunch = state.isAdminAutoLaunch;
     final isAutoLaunch = state.isAutoLaunch;
-    if (Platform.isWindows && isAdminAutoLaunch) {
-      if (await windowsIsEnable == isAutoLaunch) return;
-      if (isAutoLaunch) {
-        final isEnable = await windowsEnable();
-        if (!isEnable) {
-          enable();
-        }
-      } else {
-        windowsDisable();
-      }
-      return;
-    }
     if (await isEnable == isAutoLaunch) return;
     if (isAutoLaunch == true) {
       enable();

lib/common/link.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:app_links/app_links.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
 
 typedef InstallConfigCallBack = void Function(String url);
 
@@ -17,7 +17,7 @@ class LinkManager {
   initAppLinksListen(installConfigCallBack) async {
     debugPrint("initAppLinksListen");
     destroy();
-    subscription = _appLinks.allUriLinkStream.listen(
+    subscription = _appLinks.uriLinkStream.listen(
       (uri) {
         debugPrint('onAppLink: $uri');
         if (uri.host == 'install-config') {
@@ -31,8 +31,7 @@ class LinkManager {
     );
   }
 
-
-  destroy(){
+  destroy() {
     if (subscription != null) {
       subscription?.cancel();
       subscription = null;

lib/common/lock.dart

@@ -0,0 +1,30 @@
+import 'dart:io';
+
+import 'package:fl_clash/common/common.dart';
+
+class SingleInstanceLock {
+  static SingleInstanceLock? _instance;
+  RandomAccessFile? _accessFile;
+
+  SingleInstanceLock._internal();
+
+  factory SingleInstanceLock() {
+    _instance ??= SingleInstanceLock._internal();
+    return _instance!;
+  }
+
+  Future<bool> acquire() async {
+    try {
+      final lockFilePath = await appPath.getLockFilePath();
+      final lockFile = File(lockFilePath);
+      await lockFile.create();
+      _accessFile = await lockFile.open(mode: FileMode.write);
+      await _accessFile?.lock();
+      return true;
+    } catch (_) {
+      return false;
+    }
+  }
+}
+
+final singleInstanceLock = SingleInstanceLock();

lib/common/navigator.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+
+class BaseNavigator {
+  static Future<T?> push<T>(BuildContext context, Widget child) async {
+    return await Navigator.of(context).push<T>(
+      MaterialPageRoute(
+        builder: (context) => child,
+      ),
+    );
+  }
+}

lib/common/other.dart

@@ -2,13 +2,14 @@ import 'dart:io';
 import 'dart:isolate';
 import 'dart:math';
 import 'dart:typed_data';
+import 'dart:ui';
 
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
+import 'package:image/image.dart' as img;
 import 'package:lpinyin/lpinyin.dart';
 import 'package:zxing2/qrcode.dart';
-import 'package:image/image.dart' as img;
 
 class Other {
   Color? getDelayColor(int? delay) {
@@ -18,6 +19,14 @@ class Other {
     return const Color(0xFFC57F0A);
   }
 
+  String get id {
+    final timestamp = DateTime.now().microsecondsSinceEpoch;
+    final random = Random();
+    final randomStr =
+        String.fromCharCodes(List.generate(8, (_) => random.nextInt(26) + 97));
+    return "$timestamp$randomStr";
+  }
+
   String getDateStringLast2(int value) {
     var valueRaw = "0$value";
     return valueRaw.substring(
@@ -101,14 +110,13 @@ class Other {
   }
 
   String getTrayIconPath({
-    required bool isStart,
     required Brightness brightness,
   }) {
-    if(Platform.isMacOS){
+    if (Platform.isMacOS) {
       return "assets/images/icon_white.png";
     }
     final suffix = Platform.isWindows ? "ico" : "png";
-    if (isStart && Platform.isWindows) {
+    if (Platform.isWindows) {
       return "assets/images/icon.$suffix";
     }
     return switch (brightness) {
@@ -188,10 +196,8 @@ class Other {
     return parameters[fileNameKey];
   }
 
-  double getViewWidth() {
-    final view = WidgetsBinding.instance.platformDispatcher.views.first;
-    final size = view.physicalSize / view.devicePixelRatio;
-    return size.width;
+  FlutterView getScreen() {
+    return WidgetsBinding.instance.platformDispatcher.views.first;
   }
 
   List<String> parseReleaseBody(String? body) {

lib/common/path.dart

@@ -13,34 +13,17 @@ class AppPath {
   Completer<Directory> tempDir = Completer();
   late String appDirPath;
 
-  // Future<Directory> _createDesktopCacheDir() async {
-  //   final dir = Directory(path);
-  //   if (await dir.exists()) {
-  //     await dir.create(recursive: true);
-  //   }
-  //   return dir;
-  // }
-
   AppPath._internal() {
     appDirPath = join(dirname(Platform.resolvedExecutable));
     getApplicationSupportDirectory().then((value) {
       dataDir.complete(value);
     });
-    getTemporaryDirectory().then((value){
-     tempDir.complete(value);
+    getTemporaryDirectory().then((value) {
+      tempDir.complete(value);
     });
     getDownloadsDirectory().then((value) {
       downloadDir.complete(value);
     });
-    // if (Platform.isAndroid) {
-    //   getApplicationSupportDirectory().then((value) {
-    //     cacheDir.complete(value);
-    //   });
-    // } else {
-    //   _createDesktopCacheDir().then((value) {
-    //     cacheDir.complete(value);
-    //   });
-    // }
   }
 
   factory AppPath() {
@@ -48,6 +31,23 @@ class AppPath {
     return _instance!;
   }
 
+  String get executableExtension {
+    return Platform.isWindows ? ".exe" : "";
+  }
+
+  String get executableDirPath {
+    final currentExecutablePath = Platform.resolvedExecutable;
+    return dirname(currentExecutablePath);
+  }
+
+  String get corePath {
+    return join(executableDirPath, "FlClashCore$executableExtension");
+  }
+
+  String get helperPath {
+    return join(executableDirPath, "$appHelperService$executableExtension");
+  }
+
   Future<String> getDownloadDirPath() async {
     final directory = await downloadDir.future;
     return directory.path;
@@ -58,6 +58,11 @@ class AppPath {
     return directory.path;
   }
 
+  Future<String> getLockFilePath() async {
+    final directory = await dataDir.future;
+    return join(directory.path, "FlClash.lock");
+  }
+
   Future<String> getProfilesPath() async {
     final directory = await dataDir.future;
     return join(directory.path, profilesDirectoryName);
@@ -69,6 +74,12 @@ class AppPath {
     return join(directory, "$id.yaml");
   }
 
+  Future<String?> getProvidersPath(String? id) async {
+    if (id == null) return null;
+    final directory = await getProfilesPath();
+    return join(directory, "providers", id);
+  }
+
   Future<String> get tempPath async {
     final directory = await tempDir.future;
     return directory.path;

lib/common/request.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:dio/dio.dart';
@@ -79,25 +81,96 @@ class Request {
     for (final source in _ipInfoSources.entries) {
       try {
         final response = await _dio
-            .get<Map<String, dynamic>>(
-              source.key,
-              cancelToken: cancelToken,
-            )
-            .timeout(
-              httpTimeoutDuration,
-            );
-        if (response.statusCode == 200 && response.data != null) {
-          return source.value(response.data!);
+            .get<Map<String, dynamic>>(source.key, cancelToken: cancelToken)
+            .timeout(httpTimeoutDuration);
+        if (response.statusCode != 200 || response.data == null) {
+          continue;
         }
+        return source.value(response.data!);
       } catch (e) {
-        if (cancelToken?.isCancelled == true) {
+        if (e is DioException && e.type == DioExceptionType.cancel) {
           throw "cancelled";
         }
-        continue;
+        debugPrint("checkIp error ===> $e");
       }
     }
     return null;
   }
+
+  Future<bool> pingHelper() async {
+    try {
+      final response = await _dio
+          .get(
+            "http://$localhost:$helperPort/ping",
+            options: Options(
+              responseType: ResponseType.plain,
+            ),
+          )
+          .timeout(
+            const Duration(
+              milliseconds: 2000,
+            ),
+          );
+      if (response.statusCode != HttpStatus.ok) {
+        return false;
+      }
+      return (response.data as String) == helperTag;
+    } catch (_) {
+      return false;
+    }
+  }
+
+  Future<bool> startCoreByHelper(String arg) async {
+    try {
+      final response = await _dio
+          .post(
+            "http://$localhost:$helperPort/start",
+            data: json.encode({
+              "path": appPath.corePath,
+              "arg": arg,
+            }),
+            options: Options(
+              responseType: ResponseType.plain,
+            ),
+          )
+          .timeout(
+            const Duration(
+              milliseconds: 2000,
+            ),
+          );
+      if (response.statusCode != HttpStatus.ok) {
+        return false;
+      }
+      final data = response.data as String;
+      return data.isEmpty;
+    } catch (_) {
+      return false;
+    }
+  }
+
+  Future<bool> stopCoreByHelper() async {
+    try {
+      final response = await _dio
+          .post(
+            "http://$localhost:$helperPort/stop",
+            options: Options(
+              responseType: ResponseType.plain,
+            ),
+          )
+          .timeout(
+            const Duration(
+              milliseconds: 2000,
+            ),
+          );
+      if (response.statusCode != HttpStatus.ok) {
+        return false;
+      }
+      final data = response.data as String;
+      return data.isEmpty;
+    } catch (_) {
+      return false;
+    }
+  }
 }
 
 final request = Request();

lib/common/system.dart

@@ -1,11 +1,13 @@
 import 'dart:io';
 
 import 'package:device_info_plus/device_info_plus.dart';
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/plugins/app.dart';
+import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/input.dart';
 import 'package:flutter/services.dart';
 
-import 'window.dart';
-
 class System {
   static System? _instance;
 
@@ -19,12 +21,6 @@ class System {
   bool get isDesktop =>
       Platform.isWindows || Platform.isMacOS || Platform.isLinux;
 
-  get isAdmin async {
-    if (!Platform.isWindows) return false;
-    final result = await Process.run('net', ['session'], runInShell: true);
-    return result.exitCode == 0;
-  }
-
   Future<int> get version async {
     final deviceInfo = await DeviceInfoPlugin().deviceInfo;
     return switch (Platform.operatingSystem) {
@@ -35,6 +31,73 @@ class System {
     };
   }
 
+  Future<bool> checkIsAdmin() async {
+    final corePath = appPath.corePath.replaceAll(' ', '\\\\ ');
+    if (Platform.isWindows) {
+      final result = await windows?.checkService();
+      return result == WindowsHelperServiceStatus.running;
+    } else if (Platform.isMacOS) {
+      final result = await Process.run('stat', ['-f', '%Su:%Sg %Sp', corePath]);
+      final output = result.stdout.trim();
+      if (output.startsWith('root:admin') && output.contains('rws')) {
+        return true;
+      }
+      return false;
+    } else if (Platform.isLinux) {
+      final result = await Process.run('stat', ['-c', '%U:%G %A', corePath]);
+      final output = result.stdout.trim();
+      if (output.startsWith('root:') && output.contains('rwx')) {
+        return true;
+      }
+      return false;
+    }
+    return true;
+  }
+
+  Future<AuthorizeCode> authorizeCore() async {
+    final corePath = appPath.corePath.replaceAll(' ', '\\\\ ');
+    final isAdmin = await checkIsAdmin();
+    if (isAdmin) {
+      return AuthorizeCode.none;
+    }
+    if (Platform.isWindows) {
+      final result = await windows?.registerService();
+      if (result == true) {
+        return AuthorizeCode.success;
+      }
+      return AuthorizeCode.error;
+    } else if (Platform.isMacOS) {
+      final shell = 'chown root:admin $corePath; chmod +sx $corePath';
+      final arguments = [
+        "-e",
+        'do shell script "$shell" with administrator privileges',
+      ];
+      final result = await Process.run("osascript", arguments);
+      if (result.exitCode != 0) {
+        return AuthorizeCode.error;
+      }
+      return AuthorizeCode.success;
+    } else if (Platform.isLinux) {
+      final shell = Platform.environment['SHELL'] ?? 'bash';
+      final password = await globalState.showCommonDialog<String>(
+        child: InputDialog(
+          title: appLocalizations.pleaseInputAdminPassword,
+          value: '',
+        ),
+      );
+      final arguments = [
+        "-c",
+        'echo "$password" | sudo -S chown root:root "$corePath" && echo "$password" | sudo -S chmod +sx "$corePath"'
+      ];
+      final result = await Process.run(shell, arguments);
+      if (result.exitCode != 0) {
+        return AuthorizeCode.error;
+      }
+      return AuthorizeCode.success;
+    }
+    return AuthorizeCode.error;
+  }
+
   back() async {
     await app?.moveTaskToBack();
     await window?.hide();

lib/common/tray.dart

@@ -0,0 +1,193 @@
+import 'dart:io';
+
+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';
+import 'package:flutter/services.dart';
+import 'package:intl/intl.dart';
+import 'package:tray_manager/tray_manager.dart';
+
+import 'app_localizations.dart';
+import 'constant.dart';
+import 'other.dart';
+import 'window.dart';
+
+class Tray {
+  Future _updateSystemTray({
+    required Brightness? brightness,
+    bool force = false,
+  }) async {
+    if (Platform.isAndroid) {
+      return;
+    }
+    if (Platform.isLinux || force) {
+      await trayManager.destroy();
+    }
+    await trayManager.setIcon(
+      other.getTrayIconPath(
+        brightness: brightness ??
+            WidgetsBinding.instance.platformDispatcher.platformBrightness,
+      ),
+      isTemplate: true,
+    );
+    if (!Platform.isLinux) {
+      await trayManager.setToolTip(
+        appName,
+      );
+    }
+  }
+
+  update({
+    required AppState appState,
+    required AppFlowingState appFlowingState,
+    required Config config,
+    required ClashConfig clashConfig,
+    bool focus = false,
+  }) async {
+    if (Platform.isAndroid) {
+      return;
+    }
+    if (!Platform.isLinux) {
+      await _updateSystemTray(
+        brightness: appState.brightness,
+        force: focus,
+      );
+    }
+    List<MenuItem> menuItems = [];
+    final showMenuItem = MenuItem(
+      label: appLocalizations.show,
+      onClick: (_) {
+        window?.show();
+      },
+    );
+    menuItems.add(showMenuItem);
+    final startMenuItem = MenuItem.checkbox(
+      label: appFlowingState.isStart
+          ? appLocalizations.stop
+          : appLocalizations.start,
+      onClick: (_) async {
+        globalState.appController.updateStart();
+      },
+      checked: false,
+    );
+    menuItems.add(startMenuItem);
+    menuItems.add(MenuItem.separator());
+    for (final mode in Mode.values) {
+      menuItems.add(
+        MenuItem.checkbox(
+          label: Intl.message(mode.name),
+          onClick: (_) {
+            globalState.appController.clashConfig.mode = mode;
+          },
+          checked: mode == clashConfig.mode,
+        ),
+      );
+    }
+    menuItems.add(MenuItem.separator());
+    if (!Platform.isWindows) {
+      final groups = appState.currentGroups;
+      for (final group in groups) {
+        List<MenuItem> subMenuItems = [];
+        for (final proxy in group.all) {
+          subMenuItems.add(
+            MenuItem.checkbox(
+              label: proxy.name,
+              checked: appState.selectedMap[group.name] == proxy.name,
+              onClick: (_) {
+                final appController = globalState.appController;
+                appController.config.updateCurrentSelectedMap(
+                  group.name,
+                  proxy.name,
+                );
+                appController.changeProxy(
+                  groupName: group.name,
+                  proxyName: proxy.name,
+                );
+              },
+            ),
+          );
+        }
+        menuItems.add(
+          MenuItem.submenu(
+            label: group.name,
+            submenu: Menu(
+              items: subMenuItems,
+            ),
+          ),
+        );
+      }
+      if (groups.isNotEmpty) {
+        menuItems.add(MenuItem.separator());
+      }
+    }
+    if (appFlowingState.isStart) {
+      menuItems.add(
+        MenuItem.checkbox(
+          label: appLocalizations.tun,
+          onClick: (_) {
+            globalState.appController.updateTun();
+          },
+          checked: clashConfig.tun.enable,
+        ),
+      );
+      menuItems.add(
+        MenuItem.checkbox(
+          label: appLocalizations.systemProxy,
+          onClick: (_) {
+            globalState.appController.updateSystemProxy();
+          },
+          checked: config.networkProps.systemProxy,
+        ),
+      );
+      menuItems.add(MenuItem.separator());
+    }
+    final autoStartMenuItem = MenuItem.checkbox(
+      label: appLocalizations.autoLaunch,
+      onClick: (_) async {
+        globalState.appController.updateAutoLaunch();
+      },
+      checked: config.appSetting.autoLaunch,
+    );
+    final copyEnvVarMenuItem = MenuItem(
+      label: appLocalizations.copyEnvVar,
+      onClick: (_) async {
+        await _copyEnv(clashConfig.mixedPort);
+      },
+    );
+    menuItems.add(autoStartMenuItem);
+    menuItems.add(copyEnvVarMenuItem);
+    menuItems.add(MenuItem.separator());
+    final exitMenuItem = MenuItem(
+      label: appLocalizations.exit,
+      onClick: (_) async {
+        await globalState.appController.handleExit();
+      },
+    );
+    menuItems.add(exitMenuItem);
+    final menu = Menu(items: menuItems);
+    await trayManager.setContextMenu(menu);
+    if (Platform.isLinux) {
+      await _updateSystemTray(
+        brightness: appState.brightness,
+        force: focus,
+      );
+    }
+  }
+
+  Future<void> _copyEnv(int port) async {
+    final url = "http://127.0.0.1:$port";
+
+    final cmdline = Platform.isWindows
+        ? "set \$env:all_proxy=$url"
+        : "export all_proxy=$url";
+
+    await Clipboard.setData(
+      ClipboardData(
+        text: cmdline,
+      ),
+    );
+  }
+}
+
+final tray = Tray();

lib/common/window.dart

@@ -1,17 +1,17 @@
 import 'dart:io';
 
+import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/config.dart';
 import 'package:flutter/material.dart';
 import 'package:window_manager/window_manager.dart';
-import 'package:windows_single_instance/windows_single_instance.dart';
-
-import 'protocol.dart';
-import 'system.dart';
 
 class Window {
   init(WindowProps props, int version) async {
+    final acquire = await singleInstanceLock.acquire();
+    if (!acquire) {
+      exit(0);
+    }
     if (Platform.isWindows) {
-      await WindowsSingleInstance.ensureSingleInstance([], "FlClash");
       protocol.register("clash");
       protocol.register("clashmeta");
       protocol.register("flclash");
@@ -21,14 +21,7 @@ class Window {
       size: Size(props.width, props.height),
       minimumSize: const Size(380, 500),
     );
-    if (props.left != null || props.top != null) {
-      await windowManager.setPosition(
-        Offset(props.left ?? 0, props.top ?? 0),
-      );
-    } else {
-      await windowManager.setAlignment(Alignment.center);
-    }
-    if(!Platform.isMacOS || version > 10){
+    if (!Platform.isMacOS || version > 10) {
       await windowManager.setTitleBarStyle(TitleBarStyle.hidden);
     }
     await windowManager.waitUntilReadyToShow(windowOptions, () async {

lib/common/windows.dart

@@ -1,7 +1,10 @@
 import 'dart:ffi';
 import 'dart:io';
+
 import 'package:ffi/ffi.dart';
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:path/path.dart';
 
 class Windows {
@@ -51,12 +54,84 @@ class Windows {
     calloc.free(argumentsPtr);
     calloc.free(operationPtr);
 
-    if (result <= 32) {
+    debugPrint("[Windows] runas: $command $arguments resultCode:$result");
+
+    if (result < 42) {
       return false;
     }
     return true;
   }
 
+  _killProcess(int port) async {
+    final result = await Process.run('netstat', ['-ano']);
+    final lines = result.stdout.toString().trim().split('\n');
+    for (final line in lines) {
+      if (!line.contains(":$port") || !line.contains("LISTENING")) {
+        continue;
+      }
+      final parts = line.trim().split(RegExp(r'\s+'));
+      final pid = int.tryParse(parts.last);
+      if (pid != null) {
+        await Process.run('taskkill', ['/PID', pid.toString(), '/F']);
+      }
+    }
+  }
+
+  Future<WindowsHelperServiceStatus> checkService() async {
+    // final qcResult = await Process.run('sc', ['qc', appHelperService]);
+    // final qcOutput = qcResult.stdout.toString();
+    // if (qcResult.exitCode != 0 || !qcOutput.contains(appPath.helperPath)) {
+    //   return WindowsHelperServiceStatus.none;
+    // }
+    final result = await Process.run('sc', ['query', appHelperService]);
+    if(result.exitCode != 0){
+      return WindowsHelperServiceStatus.none;
+    }
+    final output = result.stdout.toString();
+    if (output.contains("RUNNING") && await request.pingHelper()) {
+      return WindowsHelperServiceStatus.running;
+    }
+    return WindowsHelperServiceStatus.presence;
+  }
+
+  Future<bool> registerService() async {
+    final status = await checkService();
+
+    if (status == WindowsHelperServiceStatus.running) {
+      return true;
+    }
+
+    await _killProcess(helperPort);
+
+    final command = [
+      "/c",
+      if (status == WindowsHelperServiceStatus.presence) ...[
+        "sc",
+        "delete",
+        appHelperService,
+        "/force",
+        "&&",
+      ],
+      "sc",
+      "create",
+      appHelperService,
+      'binPath= "${appPath.helperPath}"',
+      'start= auto',
+      "&&",
+      "sc",
+      "start",
+      appHelperService,
+    ].join(" ");
+
+    final res = runas("cmd.exe", command);
+
+    await Future.delayed(
+      Duration(milliseconds: 300),
+    );
+
+    return res;
+  }
+
   Future<bool> registerTask(String appName) async {
     final taskXml = '''
 <?xml version="1.0" encoding="UTF-16"?>

lib/controller.dart

@@ -5,19 +5,17 @@ import 'dart:isolate';
 import 'dart:typed_data';
 
 import 'package:archive/archive.dart';
+import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/archive.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
 import 'package:path/path.dart';
 import 'package:provider/provider.dart';
-import 'package:tray_manager/tray_manager.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import 'clash/core.dart';
-import 'models/models.dart';
 import 'common/common.dart';
+import 'models/models.dart';
 
 class AppController {
   final BuildContext context;
@@ -29,6 +27,8 @@ class AppController {
   late Function updateGroupDebounce;
   late Function addCheckIpNumDebounce;
   late Function applyProfileDebounce;
+  late Function savePreferencesDebounce;
+  late Function changeProxyDebounce;
 
   AppController(this.context) {
     appState = context.read<AppState>();
@@ -38,9 +38,19 @@ class AppController {
     updateClashConfigDebounce = debounce<Function()>(() async {
       await updateClashConfig();
     });
+    savePreferencesDebounce = debounce<Function()>(() async {
+      await savePreferences();
+    });
     applyProfileDebounce = debounce<Function()>(() async {
       await applyProfile(isPrue: true);
     });
+    changeProxyDebounce = debounce((String groupName, String proxyName) async {
+      await changeProxy(
+        groupName: groupName,
+        proxyName: proxyName,
+      );
+      await updateGroups();
+    });
     addCheckIpNumDebounce = debounce(() {
       appState.checkIpNum++;
     });
@@ -49,35 +59,48 @@ class AppController {
     });
   }
 
+  restartCore() async {
+    await globalState.restartCore(
+      appState: appState,
+      clashConfig: clashConfig,
+      config: config,
+    );
+  }
+
   updateStatus(bool isStart) async {
     if (isStart) {
-      await globalState.handleStart(
-        config: config,
-        clashConfig: clashConfig,
-      );
+      await globalState.handleStart();
       updateRunTime();
       updateTraffic();
       globalState.updateFunctionLists = [
         updateRunTime,
         updateTraffic,
       ];
-      if (!Platform.isAndroid) {
-        applyProfileDebounce();
+      final currentLastModified =
+          await config.getCurrentProfile()?.profileLastModified;
+      if (currentLastModified == null ||
+          globalState.lastProfileModified == null) {
+        addCheckIpNumDebounce();
+        return;
       }
+      if (currentLastModified <= (globalState.lastProfileModified ?? 0)) {
+        addCheckIpNumDebounce();
+        return;
+      }
+      applyProfileDebounce();
     } else {
       await globalState.handleStop();
-      clashCore.resetTraffic();
+      await clashCore.resetTraffic();
       appFlowingState.traffics = [];
       appFlowingState.totalTraffic = Traffic();
       appFlowingState.runTime = null;
+      await Future.delayed(
+        Duration(milliseconds: 300),
+      );
       addCheckIpNumDebounce();
     }
   }
 
-  updateCoreVersionInfo() {
-    globalState.updateCoreVersionInfo(appState);
-  }
-
   updateRunTime() {
     final startTime = globalState.startTime;
     if (startTime != null) {
@@ -91,6 +114,7 @@ class AppController {
 
   updateTraffic() {
     globalState.updateTraffic(
+      config: config,
       appFlowingState: appFlowingState,
     );
   }
@@ -103,7 +127,7 @@ class AppController {
 
   deleteProfile(String id) async {
     config.deleteProfileById(id);
-    clashCore.clearEffect(id);
+    clearEffect(id);
     if (config.currentProfileId == id) {
       if (config.profiles.isNotEmpty) {
         final updateId = config.profiles.first.id;
@@ -115,6 +139,10 @@ class AppController {
     }
   }
 
+  updateProviders() {
+    globalState.updateProviders(appState);
+  }
+
   Future<void> updateProfile(Profile profile) async {
     final newProfile = await profile.update();
     config.setProfile(
@@ -127,6 +155,7 @@ class AppController {
     if (commonScaffoldState?.mounted != true) return;
     await commonScaffoldState?.loadingRun(() async {
       await globalState.updateClashConfig(
+        appState: appState,
         clashConfig: clashConfig,
         config: config,
         isPatch: isPatch,
@@ -202,25 +231,16 @@ class AppController {
   }
 
   savePreferences() async {
-    await saveConfigPreferences();
-    await saveClashConfigPreferences();
-  }
-
-  saveConfigPreferences() async {
-    debugPrint("saveConfigPreferences");
+    debugPrint("[APP] savePreferences");
     await preferences.saveConfig(config);
-  }
-
-  saveClashConfigPreferences() async {
-    debugPrint("saveClashConfigPreferences");
     await preferences.saveClashConfig(clashConfig);
   }
 
   changeProxy({
     required String groupName,
     required String proxyName,
-  }) {
-    globalState.changeProxy(
+  }) async {
+    await globalState.changeProxy(
       config: config,
       groupName: groupName,
       proxyName: proxyName,
@@ -231,7 +251,7 @@ class AppController {
   handleBackOrExit() async {
     if (config.appSetting.minimizeOnExit) {
       if (system.isDesktop) {
-        await savePreferences();
+        await savePreferencesDebounce();
       }
       await system.back();
     } else {
@@ -240,22 +260,16 @@ class AppController {
   }
 
   handleExit() async {
-    await updateStatus(false);
-    await proxy?.stopProxy();
-    await savePreferences();
-    clashCore.shutdown();
+    try {
+      await updateStatus(false);
+      await clashCore.shutdown();
+      await clashService?.destroy();
+      await proxy?.stopProxy();
+      await savePreferences();
+    } catch (_) {}
     system.exit();
   }
 
-  updateLogStatus() {
-    if (config.appSetting.openLogs) {
-      clashCore.startLog();
-    } else {
-      clashCore.stopLog();
-      appFlowingState.logs = [];
-    }
-  }
-
   autoCheckUpdate() async {
     if (!config.appSetting.autoCheckUpdate) return;
     final res = await request.checkForUpdate();
@@ -310,10 +324,20 @@ class AppController {
     if (!isDisclaimerAccepted) {
       handleExit();
     }
-    updateLogStatus();
     if (!config.appSetting.silentLaunch) {
       window?.show();
     }
+    await globalState.initCore(
+      appState: appState,
+      clashConfig: clashConfig,
+      config: config,
+    );
+    await _initStatus();
+    autoUpdateProfiles();
+    autoCheckUpdate();
+  }
+
+  _initStatus() async {
     if (Platform.isAndroid) {
       globalState.updateStartTime();
     }
@@ -322,8 +346,6 @@ class AppController {
     } else {
       await updateStatus(config.appSetting.autoRun);
     }
-    autoUpdateProfiles();
-    autoCheckUpdate();
   }
 
   setDelay(Delay delay) {
@@ -531,6 +553,19 @@ class AppController {
         '';
   }
 
+  clearEffect(String profileId) async {
+    final profilePath = await appPath.getProfilePath(profileId);
+    final providersPath = await appPath.getProvidersPath(profileId);
+    return await Isolate.run(() async {
+      if (profilePath != null) {
+        await File(profilePath).delete(recursive: true);
+      }
+      if (providersPath != null) {
+        await File(providersPath).delete(recursive: true);
+      }
+    });
+  }
+
   updateTun() {
     clashConfig.tun = clashConfig.tun.copyWith(
       enable: !clashConfig.tun.enable,
@@ -538,8 +573,8 @@ class AppController {
   }
 
   updateSystemProxy() {
-    config.desktopProps = config.desktopProps.copyWith(
-      systemProxy: !config.desktopProps.systemProxy,
+    config.networkProps = config.networkProps.copyWith(
+      systemProxy: !config.networkProps.systemProxy,
     );
   }
 
@@ -553,12 +588,6 @@ class AppController {
     );
   }
 
-  updateAdminAutoLaunch() {
-    config.appSetting = config.appSetting.copyWith(
-      adminAutoLaunch: !config.appSetting.adminAutoLaunch,
-    );
-  }
-
   updateVisible() async {
     final visible = await window?.isVisible();
     if (visible != null && !visible) {
@@ -607,122 +636,14 @@ class AppController {
     });
   }
 
-  Future _updateSystemTray({
-    required bool isStart,
-    required Brightness? brightness,
-    bool force = false,
-  }) async {
-    if (Platform.isLinux || force) {
-      await trayManager.destroy();
-    }
-    await trayManager.setIcon(
-      other.getTrayIconPath(
-        isStart: isStart,
-        brightness: brightness ??
-            WidgetsBinding.instance.platformDispatcher.platformBrightness,
-      ),
-      isTemplate: true,
-    );
-    if (!Platform.isLinux) {
-      await trayManager.setToolTip(
-        appName,
-      );
-    }
-  }
-
   updateTray([bool focus = false]) async {
-    if (!Platform.isLinux) {
-      await _updateSystemTray(
-        isStart: appFlowingState.isStart,
-        brightness: appState.brightness,
-        force: focus,
-      );
-    }
-    List<MenuItem> menuItems = [];
-    final showMenuItem = MenuItem(
-      label: appLocalizations.show,
-      onClick: (_) {
-        window?.show();
-      },
+    tray.update(
+      appState: appState,
+      appFlowingState: appFlowingState,
+      config: config,
+      clashConfig: clashConfig,
+      focus: focus,
     );
-    menuItems.add(showMenuItem);
-    final startMenuItem = MenuItem.checkbox(
-      label: appFlowingState.isStart
-          ? appLocalizations.stop
-          : appLocalizations.start,
-      onClick: (_) async {
-        globalState.appController.updateStart();
-      },
-      checked: false,
-    );
-    menuItems.add(startMenuItem);
-    menuItems.add(MenuItem.separator());
-    for (final mode in Mode.values) {
-      menuItems.add(
-        MenuItem.checkbox(
-          label: Intl.message(mode.name),
-          onClick: (_) {
-            globalState.appController.clashConfig.mode = mode;
-          },
-          checked: mode == clashConfig.mode,
-        ),
-      );
-    }
-    menuItems.add(MenuItem.separator());
-    if (appFlowingState.isStart) {
-      menuItems.add(
-        MenuItem.checkbox(
-          label: appLocalizations.tun,
-          onClick: (_) {
-            globalState.appController.updateTun();
-          },
-          checked: clashConfig.tun.enable,
-        ),
-      );
-      menuItems.add(
-        MenuItem.checkbox(
-          label: appLocalizations.systemProxy,
-          onClick: (_) {
-            globalState.appController.updateSystemProxy();
-          },
-          checked: config.desktopProps.systemProxy,
-        ),
-      );
-      menuItems.add(MenuItem.separator());
-    }
-    final autoStartMenuItem = MenuItem.checkbox(
-      label: appLocalizations.autoLaunch,
-      onClick: (_) async {
-        globalState.appController.updateAutoLaunch();
-      },
-      checked: config.appSetting.autoLaunch,
-    );
-    final adminAutoStartMenuItem = MenuItem.checkbox(
-      label: appLocalizations.adminAutoLaunch,
-      onClick: (_) async {
-        globalState.appController.updateAdminAutoLaunch();
-      },
-      checked: config.appSetting.adminAutoLaunch,
-    );
-    menuItems.add(autoStartMenuItem);
-    menuItems.add(adminAutoStartMenuItem);
-    menuItems.add(MenuItem.separator());
-    final exitMenuItem = MenuItem(
-      label: appLocalizations.exit,
-      onClick: (_) async {
-        await globalState.appController.handleExit();
-      },
-    );
-    menuItems.add(exitMenuItem);
-    final menu = Menu(items: menuItems);
-    await trayManager.setContextMenu(menu);
-    if (Platform.isLinux) {
-      await _updateSystemTray(
-        isStart: appFlowingState.isStart,
-        brightness: appState.brightness,
-        force: focus,
-      );
-    }
   }
 
   recoveryData(

lib/enum/enum.dart

@@ -162,3 +162,55 @@ enum ProxiesIconStyle {
   none,
   icon,
 }
+
+enum FontFamily {
+  system(),
+  miSans("MiSans"),
+  twEmoji("Twemoji"),
+  icon("Icons");
+
+  final String? value;
+
+  const FontFamily([this.value]);
+}
+
+enum RouteMode {
+  bypassPrivate,
+  config,
+}
+
+enum ActionMethod {
+  message,
+  initClash,
+  getIsInit,
+  forceGc,
+  shutdown,
+  validateConfig,
+  updateConfig,
+  getProxies,
+  changeProxy,
+  getTraffic,
+  getTotalTraffic,
+  resetTraffic,
+  asyncTestDelay,
+  getConnections,
+  closeConnections,
+  closeConnection,
+  getExternalProviders,
+  getExternalProvider,
+  updateGeoData,
+  updateExternalProvider,
+  sideLoadExternalProvider,
+  startLog,
+  stopLog,
+  startListener,
+  stopListener,
+}
+
+enum AuthorizeCode { none, success, error }
+
+enum WindowsHelperServiceStatus {
+  none,
+  presence,
+  running,
+}

lib/fragments/application_setting.dart

@@ -60,32 +60,6 @@ class UsageSwitch extends StatelessWidget {
   }
 }
 
-class AdminAutoLaunchItem extends StatelessWidget {
-  const AdminAutoLaunchItem({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<Config, bool>(
-      selector: (_, config) => config.appSetting.adminAutoLaunch,
-      builder: (_, adminAutoLaunch, __) {
-        return ListItem.switchItem(
-          title: Text(appLocalizations.adminAutoLaunch),
-          subtitle: Text(appLocalizations.adminAutoLaunchDesc),
-          delegate: SwitchDelegate(
-            value: adminAutoLaunch,
-            onChanged: (bool value) async {
-              final config = globalState.appController.config;
-              config.appSetting = config.appSetting.copyWith(
-                adminAutoLaunch: value,
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-}
-
 class ApplicationSettingFragment extends StatelessWidget {
   const ApplicationSettingFragment({super.key});
 
@@ -134,8 +108,6 @@ class ApplicationSettingFragment extends StatelessWidget {
             );
           },
         ),
-      if(Platform.isWindows)
-        const AdminAutoLaunchItem(),
       if (system.isDesktop)
         Selector<Config, bool>(
           selector: (_, config) => config.appSetting.silentLaunch,

lib/fragments/config/config.dart

@@ -24,6 +24,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
           title: appLocalizations.network,
           isScaffold: true,
           isBlur: false,
+          extendPageWidth: 360,
           widget: const NetworkListView(),
         ),
       ),

lib/fragments/config/network.dart

@@ -6,10 +6,11 @@ import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 
-class VPNSwitch extends StatelessWidget {
-  const VPNSwitch({super.key});
+class VPNItem extends StatelessWidget {
+  const VPNItem({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -39,8 +40,8 @@ class TUNItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Selector<Config, bool>(
-      selector: (_, config) => config.vpnProps.enable,
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.tun.enable,
       builder: (_, enable, __) {
         return ListItem.switchItem(
           title: Text(appLocalizations.tun),
@@ -60,8 +61,8 @@ class TUNItem extends StatelessWidget {
   }
 }
 
-class AllowBypassSwitch extends StatelessWidget {
-  const AllowBypassSwitch({super.key});
+class AllowBypassItem extends StatelessWidget {
+  const AllowBypassItem({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -87,8 +88,8 @@ class AllowBypassSwitch extends StatelessWidget {
   }
 }
 
-class SystemProxySwitch extends StatelessWidget {
-  const SystemProxySwitch({super.key});
+class VpnSystemProxyItem extends StatelessWidget {
+  const VpnSystemProxyItem({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -114,8 +115,35 @@ class SystemProxySwitch extends StatelessWidget {
   }
 }
 
-class Ipv6Switch extends StatelessWidget {
-  const Ipv6Switch({super.key});
+class SystemProxyItem extends StatelessWidget {
+  const SystemProxyItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.networkProps.systemProxy,
+      builder: (_, systemProxy, __) {
+        return ListItem.switchItem(
+          title: Text(appLocalizations.systemProxy),
+          subtitle: Text(appLocalizations.systemProxyDesc),
+          delegate: SwitchDelegate(
+            value: systemProxy,
+            onChanged: (bool value) async {
+              final config = globalState.appController.config;
+              final networkProps = config.networkProps;
+              config.networkProps = networkProps.copyWith(
+                systemProxy: value,
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
+
+class Ipv6Item extends StatelessWidget {
+  const Ipv6Item({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -176,6 +204,36 @@ class TunStackItem extends StatelessWidget {
 class BypassDomainItem extends StatelessWidget {
   const BypassDomainItem({super.key});
 
+  _initActions(BuildContext context) {
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      final commonScaffoldState =
+          context.findAncestorStateOfType<CommonScaffoldState>();
+      commonScaffoldState?.actions = [
+        IconButton(
+          onPressed: () {
+            globalState.showMessage(
+              title: appLocalizations.reset,
+              message: TextSpan(
+                text: appLocalizations.resetTip,
+              ),
+              onTab: () {
+                final config = globalState.appController.config;
+                config.networkProps = config.networkProps.copyWith(
+                  bypassDomain: defaultBypassDomain,
+                );
+                Navigator.of(context).pop();
+              },
+            );
+          },
+          tooltip: appLocalizations.reset,
+          icon: const Icon(
+            Icons.replay,
+          ),
+        )
+      ];
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return ListItem.open(
@@ -183,19 +241,20 @@ class BypassDomainItem extends StatelessWidget {
       subtitle: Text(appLocalizations.bypassDomainDesc),
       delegate: OpenDelegate(
         isBlur: false,
+        isScaffold: true,
         title: appLocalizations.bypassDomain,
         widget: Selector<Config, List<String>>(
-          selector: (_, config) => config.vpnProps.bypassDomain,
-          shouldRebuild: (prev, next) =>
-              !stringListEquality.equals(prev, next),
-          builder: (_, bypassDomain, __) {
+          selector: (_, config) => config.networkProps.bypassDomain,
+          shouldRebuild: (prev, next) => !stringListEquality.equals(prev, next),
+          builder: (context, bypassDomain, __) {
+            _initActions(context);
             return ListPage(
               title: appLocalizations.bypassDomain,
               items: bypassDomain,
               titleBuilder: (item) => Text(item),
-              onChange: (items){
+              onChange: (items) {
                 final config = globalState.appController.config;
-                config.vpnProps = config.vpnProps.copyWith(
+                config.networkProps = config.networkProps.copyWith(
                   bypassDomain: List.from(items),
                 );
               },
@@ -208,22 +267,108 @@ class BypassDomainItem extends StatelessWidget {
   }
 }
 
+class RouteModeItem extends StatelessWidget {
+  const RouteModeItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, RouteMode>(
+      selector: (_, clashConfig) => clashConfig.routeMode,
+      builder: (_, value, __) {
+        return ListItem<RouteMode>.options(
+          title: Text(appLocalizations.routeMode),
+          subtitle: Text(Intl.message("routeMode_${value.name}")),
+          delegate: OptionsDelegate<RouteMode>(
+            title: appLocalizations.routeMode,
+            options: RouteMode.values,
+            onChanged: (RouteMode? value) {
+              if (value == null) {
+                return;
+              }
+              final appController = globalState.appController;
+              appController.clashConfig.routeMode = value;
+            },
+            textBuilder: (routeMode) => Intl.message(
+              "routeMode_${routeMode.name}",
+            ),
+            value: value,
+          ),
+        );
+      },
+    );
+  }
+}
+
+class RouteAddressItem extends StatelessWidget {
+  const RouteAddressItem({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, bool>(
+      selector: (_, clashConfig) => clashConfig.routeMode == RouteMode.config,
+      builder: (_, value, child) {
+        if (value) {
+          return child!;
+        }
+        return Container();
+      },
+      child: ListItem.open(
+        title: Text(appLocalizations.routeAddress),
+        subtitle: Text(appLocalizations.routeAddressDesc),
+        delegate: OpenDelegate(
+          isBlur: false,
+          isScaffold: true,
+          title: appLocalizations.routeAddress,
+          widget: Selector<ClashConfig, List<String>>(
+            selector: (_, clashConfig) => clashConfig.includeRouteAddress,
+            shouldRebuild: (prev, next) =>
+                !stringListEquality.equals(prev, next),
+            builder: (context, routeAddress, __) {
+              return ListPage(
+                title: appLocalizations.routeAddress,
+                items: routeAddress,
+                titleBuilder: (item) => Text(item),
+                onChange: (items) {
+                  final clashConfig = globalState.appController.clashConfig;
+                  clashConfig.includeRouteAddress =
+                      Set<String>.from(items).toList();
+                },
+              );
+            },
+          ),
+          extendPageWidth: 360,
+        ),
+      ),
+    );
+  }
+}
+
 final networkItems = [
-  Platform.isAndroid ? const VPNSwitch() : const TUNItem(),
+  if (Platform.isAndroid) const VPNItem(),
   if (Platform.isAndroid)
     ...generateSection(
       title: "VPN",
       items: [
-        const SystemProxySwitch(),
-        const AllowBypassSwitch(),
-        const Ipv6Switch(),
-        const BypassDomainItem(),
+        const SystemProxyItem(),
+        const AllowBypassItem(),
+        const Ipv6Item(),
+      ],
+    ),
+  if (system.isDesktop)
+    ...generateSection(
+      title: appLocalizations.system,
+      items: [
+        SystemProxyItem(),
+        BypassDomainItem(),
       ],
     ),
   ...generateSection(
     title: appLocalizations.options,
     items: [
+      if (system.isDesktop) const TUNItem(),
       const TunStackItem(),
+      const RouteModeItem(),
+      const RouteAddressItem(),
     ],
   ),
 ];

lib/fragments/connections.dart

@@ -27,18 +27,19 @@ class _ConnectionsFragmentState extends State<ConnectionsFragment> {
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      connectionsNotifier.value = connectionsNotifier.value
-          .copyWith(connections: clashCore.getConnections());
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      connectionsNotifier.value = connectionsNotifier.value.copyWith(
+        connections: await clashCore.getConnections(),
+      );
       if (timer != null) {
         timer?.cancel();
         timer = null;
       }
       timer = Timer.periodic(
         const Duration(seconds: 1),
-        (timer) {
+        (timer) async {
           connectionsNotifier.value = connectionsNotifier.value.copyWith(
-            connections: clashCore.getConnections(),
+            connections: await clashCore.getConnections(),
           );
         },
       );
@@ -66,10 +67,10 @@ class _ConnectionsFragmentState extends State<ConnectionsFragment> {
             width: 8,
           ),
           IconButton(
-            onPressed: () {
+            onPressed: () async {
               clashCore.closeConnections();
               connectionsNotifier.value = connectionsNotifier.value.copyWith(
-                connections: clashCore.getConnections(),
+                connections: await clashCore.getConnections(),
               );
             },
             icon: const Icon(Icons.delete_sweep_outlined),
@@ -99,10 +100,11 @@ class _ConnectionsFragmentState extends State<ConnectionsFragment> {
     );
   }
 
-  _handleBlockConnection(String id) {
+  _handleBlockConnection(String id) async {
     clashCore.closeConnection(id);
-    connectionsNotifier.value = connectionsNotifier.value
-        .copyWith(connections: clashCore.getConnections());
+    connectionsNotifier.value = connectionsNotifier.value.copyWith(
+      connections: await clashCore.getConnections(),
+    );
   }
 
   @override
@@ -239,10 +241,10 @@ class ConnectionsSearchDelegate extends SearchDelegate {
     );
   }
 
-  _handleBlockConnection(String id) {
+  _handleBlockConnection(String id) async {
     clashCore.closeConnection(id);
     connectionsNotifier.value = connectionsNotifier.value.copyWith(
-      connections: clashCore.getConnections(),
+      connections: await clashCore.getConnections(),
     );
   }
 

lib/fragments/dashboard/dashboard.dart

@@ -2,15 +2,16 @@ import 'dart:math';
 
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/fragments/dashboard/intranet_ip.dart';
-import 'package:fl_clash/fragments/dashboard/status_switch.dart';
+import 'package:fl_clash/fragments/dashboard/status_button.dart';
 import 'package:fl_clash/models/models.dart';
-import 'package:flutter/material.dart';
 import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+
 import 'network_detection.dart';
+import 'network_speed.dart';
 import 'outbound_mode.dart';
 import 'start_button.dart';
-import 'network_speed.dart';
 import 'traffic_usage.dart';
 
 class DashboardFragment extends StatefulWidget {
@@ -21,12 +22,25 @@ class DashboardFragment extends StatefulWidget {
 }
 
 class _DashboardFragmentState extends State<DashboardFragment> {
+  _initFab(bool isCurrent) {
+    if (!isCurrent) {
+      return;
+    }
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final commonScaffoldState =
+          context.findAncestorStateOfType<CommonScaffoldState>();
+      commonScaffoldState?.floatingActionButton = const StartButton();
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
-    return FloatLayout(
-      floatingWidget: const FloatWrapper(
-        child: StartButton(),
-      ),
+    return ActiveBuilder(
+      label: "dashboard",
+      builder: (isCurrent, child) {
+        _initFab(isCurrent);
+        return child!;
+      },
       child: Align(
         alignment: Alignment.topCenter,
         child: SingleChildScrollView(
@@ -55,11 +69,11 @@ class _DashboardFragmentState extends State<DashboardFragment> {
                   if (system.isDesktop) ...[
                     GridItem(
                       crossAxisCellCount: switchCount,
-                      child: const TUNSwitch(),
+                      child: const TUNButton(),
                     ),
                     GridItem(
                       crossAxisCellCount: switchCount,
-                      child: const ProxySwitch(),
+                      child: const SystemProxyButton(),
                     ),
                   ],
                   const GridItem(

lib/fragments/dashboard/intranet_ip.dart

@@ -1,5 +1,7 @@
+import 'dart:async';
 import 'dart:io';
 
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
@@ -14,14 +16,14 @@ class IntranetIP extends StatefulWidget {
 
 class _IntranetIPState extends State<IntranetIP> {
   final ipNotifier = ValueNotifier<String?>("");
+  late StreamSubscription subscription;
 
   Future<String> getNetworkType() async {
     try {
-      List<NetworkInterface> interfaces = await NetworkInterface.list(
+      final interfaces = await NetworkInterface.list(
         includeLoopback: false,
         type: InternetAddressType.any,
       );
-
       for (var interface in interfaces) {
         if (interface.name.toLowerCase().contains('wlan') ||
             interface.name.toLowerCase().contains('wi-fi')) {
@@ -33,7 +35,6 @@ class _IntranetIPState extends State<IntranetIP> {
           return 'Mobile Data';
         }
       }
-
       return 'Unknown';
     } catch (e) {
       return 'Error';
@@ -41,6 +42,7 @@ class _IntranetIPState extends State<IntranetIP> {
   }
 
   Future<String?> getLocalIpAddress() async {
+    await Future.delayed(animateDuration);
     List<NetworkInterface> interfaces = await NetworkInterface.list(
       includeLoopback: false,
     )
@@ -66,15 +68,14 @@ class _IntranetIPState extends State<IntranetIP> {
     return null;
   }
 
-  @override
-  void dispose() {
-    super.dispose();
-    ipNotifier.dispose();
-  }
-
   @override
   void initState() {
     super.initState();
+    subscription = Connectivity().onConnectivityChanged.listen((_) async {
+      ipNotifier.value = null;
+      debugPrint("[App] Connection change");
+      ipNotifier.value = await getLocalIpAddress() ?? "";
+    });
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       ipNotifier.value = await getLocalIpAddress() ?? "";
     });
@@ -104,7 +105,9 @@ class _IntranetIPState extends State<IntranetIP> {
                           flex: 1,
                           child: TooltipText(
                             text: Text(
-                              value.isNotEmpty ? value : appLocalizations.noNetwork,
+                              value.isNotEmpty
+                                  ? value
+                                  : appLocalizations.noNetwork,
                               style: context
                                   .textTheme.titleLarge?.toSoftBold.toMinus,
                               maxLines: 1,
@@ -127,4 +130,11 @@ class _IntranetIPState extends State<IntranetIP> {
       ),
     );
   }
+
+  @override
+  void dispose() {
+    super.dispose();
+    subscription.cancel();
+    ipNotifier.dispose();
+  }
 }

lib/fragments/dashboard/network_detection.dart

@@ -2,12 +2,20 @@ import 'dart:async';
 
 import 'package:dio/dio.dart';
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+final networkDetectionState = ValueNotifier<NetworkDetectionState>(
+  const NetworkDetectionState(
+    isTesting: true,
+    ipInfo: null,
+  ),
+);
+
 class NetworkDetection extends StatefulWidget {
   const NetworkDetection({super.key});
 
@@ -16,12 +24,6 @@ class NetworkDetection extends StatefulWidget {
 }
 
 class _NetworkDetectionState extends State<NetworkDetection> {
-  final networkDetectionState = ValueNotifier<NetworkDetectionState>(
-    const NetworkDetectionState(
-      isTesting: true,
-      ipInfo: null,
-    ),
-  );
   bool? _preIsStart;
   Function? _checkIpDebounce;
   Timer? _setTimeoutTimer;
@@ -54,22 +56,25 @@ class _NetworkDetectionState extends State<NetworkDetection> {
         );
         return;
       }
-      _setTimeoutTimer = Timer(const Duration(milliseconds: 2000), () {
+      _clearSetTimeoutTimer();
+      _setTimeoutTimer = Timer(const Duration(milliseconds: 300), () {
         networkDetectionState.value = networkDetectionState.value.copyWith(
           isTesting: false,
           ipInfo: null,
         );
       });
-    } catch (_) {
-      networkDetectionState.value = networkDetectionState.value.copyWith(
-        isTesting: true,
-        ipInfo: null,
-      );
+    } catch (e) {
+      if (e.toString() == "cancelled") {
+        networkDetectionState.value = networkDetectionState.value.copyWith(
+          isTesting: true,
+          ipInfo: null,
+        );
+      }
     }
   }
 
   _clearSetTimeoutTimer() {
-    if(_setTimeoutTimer != null){
+    if (_setTimeoutTimer != null) {
       _setTimeoutTimer?.cancel();
       _setTimeoutTimer = null;
     }
@@ -91,9 +96,8 @@ class _NetworkDetectionState extends State<NetworkDetection> {
   }
 
   @override
-  void dispose() {
+  dispose() {
     super.dispose();
-    networkDetectionState.dispose();
   }
 
   String countryCodeToEmoji(String countryCode) {
@@ -155,7 +159,8 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                                               .textTheme
                                               .titleLarge
                                               ?.copyWith(
-                                                fontFamily: Fonts.twEmoji,
+                                                fontFamily:
+                                                    FontFamily.twEmoji.value,
                                               ),
                                         ),
                                       )

lib/fragments/dashboard/start_button.dart

@@ -19,9 +19,10 @@ class _StartButtonState extends State<StartButton>
   @override
   void initState() {
     super.initState();
+    isStart = globalState.appController.appFlowingState.isStart;
     _controller = AnimationController(
       vsync: this,
-      value: 0,
+      value: isStart ? 1 : 0,
       duration: const Duration(milliseconds: 200),
     );
   }
@@ -85,58 +86,58 @@ class _StartButtonState extends State<StartButton>
                 )
                 .width +
             16;
-        return AnimatedBuilder(
-          animation: _controller.view,
-          builder: (_, child) {
-            return SizedBox(
-              width: 56 + textWidth * _controller.value,
-              height: 56,
-              child: FloatingActionButton(
-                heroTag: null,
-                onPressed: () {
-                  handleSwitchStart();
-                },
-                child: Row(
-                  children: [
-                    Container(
-                      width: 56,
-                      height: 56,
-                      alignment: Alignment.center,
-                      child: AnimatedIcon(
-                        icon: AnimatedIcons.play_pause,
-                        progress: _controller,
+        return _updateControllerContainer(
+          AnimatedBuilder(
+            animation: _controller.view,
+            builder: (_, child) {
+              return SizedBox(
+                width: 56 + textWidth * _controller.value,
+                height: 56,
+                child: FloatingActionButton(
+                  heroTag: null,
+                  onPressed: () {
+                    handleSwitchStart();
+                  },
+                  child: Row(
+                    children: [
+                      Container(
+                        width: 56,
+                        height: 56,
+                        alignment: Alignment.center,
+                        child: AnimatedIcon(
+                          icon: AnimatedIcons.play_pause,
+                          progress: _controller,
+                        ),
                       ),
-                    ),
-                    Expanded(
-                      child: ClipRect(
-                        child: OverflowBox(
-                          maxWidth: textWidth,
-                          child: Container(
-                            alignment: Alignment.centerLeft,
-                            child: child!,
+                      Expanded(
+                        child: ClipRect(
+                          child: OverflowBox(
+                            maxWidth: textWidth,
+                            child: Container(
+                              alignment: Alignment.centerLeft,
+                              child: child!,
+                            ),
                           ),
                         ),
                       ),
-                    ),
-                  ],
+                    ],
+                  ),
                 ),
-              ),
-            );
-          },
-          child: child,
+              );
+            },
+            child: child,
+          ),
         );
       },
-      child: _updateControllerContainer(
-        Selector<AppFlowingState, int?>(
-          selector: (_, appFlowingState) => appFlowingState.runTime,
-          builder: (_, int? value, __) {
-            final text = other.getTimeText(value);
-            return Text(
-              text,
-              style: Theme.of(context).textTheme.titleMedium?.toSoftBold,
-            );
-          },
-        ),
+      child: Selector<AppFlowingState, int?>(
+        selector: (_, appFlowingState) => appFlowingState.runTime,
+        builder: (_, int? value, __) {
+          final text = other.getTimeText(value);
+          return Text(
+            text,
+            style: Theme.of(context).textTheme.titleMedium?.toSoftBold,
+          );
+        },
       ),
     );
   }

lib/fragments/dashboard/status_button.dart

@@ -1,45 +1,33 @@
 import 'package:fl_clash/common/app_localizations.dart';
+import 'package:fl_clash/common/system.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-// class VPNSwitch extends StatelessWidget {
-//   const VPNSwitch({super.key});
-//
-//   @override
-//   Widget build(BuildContext context) {
-//     return SwitchContainer(
-//       info: const Info(
-//         label: "VPN",
-//         iconData: Icons.stacked_line_chart,
-//       ),
-//       child: Selector<Config, bool>(
-//         selector: (_, config) => config.vpnProps.enable,
-//         builder: (_, enable, __) {
-//           return Switch(
-//             materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-//             value: enable,
-//             onChanged: (value) {
-//               final config = globalState.appController.config;
-//               config.vpnProps = config.vpnProps.copyWith(
-//                 enable: value,
-//               );
-//             },
-//           );
-//         },
-//       ),
-//     );
-//   }
-// }
+import '../config/network.dart';
 
-class TUNSwitch extends StatelessWidget {
-  const TUNSwitch({super.key});
+class TUNButton extends StatelessWidget {
+  const TUNButton({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return SwitchContainer(
+    return ButtonContainer(
+      onPressed: () {
+        showSheet(
+          context: context,
+          builder: (_) {
+            return generateListView(generateSection(
+              items: [
+                if (system.isDesktop) const TUNItem(),
+                const TunStackItem(),
+              ],
+            ));
+          },
+          title: appLocalizations.tun,
+        );
+      },
       info: Info(
         label: appLocalizations.tun,
         iconData: Icons.stacked_line_chart,
@@ -64,18 +52,34 @@ class TUNSwitch extends StatelessWidget {
   }
 }
 
-class ProxySwitch extends StatelessWidget {
-  const ProxySwitch({super.key});
+class SystemProxyButton extends StatelessWidget {
+  const SystemProxyButton({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return SwitchContainer(
+    return ButtonContainer(
+      onPressed: () {
+        showSheet(
+          context: context,
+          builder: (_) {
+            return generateListView(
+              generateSection(
+                items: [
+                  SystemProxyItem(),
+                  BypassDomainItem(),
+                ],
+              ),
+            );
+          },
+          title: appLocalizations.systemProxy,
+        );
+      },
       info: Info(
         label: appLocalizations.systemProxy,
         iconData: Icons.shuffle,
       ),
       child: Selector<Config, bool>(
-        selector: (_, config) => config.desktopProps.systemProxy,
+        selector: (_, config) => config.networkProps.systemProxy,
         builder: (_, systemProxy, __) {
           return LocaleBuilder(
             builder: (_) => Switch(
@@ -83,8 +87,8 @@ class ProxySwitch extends StatelessWidget {
               value: systemProxy,
               onChanged: (value) {
                 final config = globalState.appController.config;
-                config.desktopProps =
-                    config.desktopProps.copyWith(systemProxy: value);
+                config.networkProps =
+                    config.networkProps.copyWith(systemProxy: value);
               },
             ),
           );
@@ -94,20 +98,22 @@ class ProxySwitch extends StatelessWidget {
   }
 }
 
-class SwitchContainer extends StatelessWidget {
+class ButtonContainer extends StatelessWidget {
   final Info info;
   final Widget child;
+  final VoidCallback onPressed;
 
-  const SwitchContainer({
+  const ButtonContainer({
     super.key,
     required this.info,
     required this.child,
+    required this.onPressed,
   });
 
   @override
   Widget build(BuildContext context) {
     return CommonCard(
-      onPressed: () {},
+      onPressed: onPressed,
       child: Column(
         mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,

lib/fragments/profiles/add_profile.dart

@@ -7,7 +7,10 @@ import 'package:flutter/material.dart';
 class AddProfile extends StatelessWidget {
   final BuildContext context;
 
-  const AddProfile({super.key, required this.context,});
+  const AddProfile({
+    super.key,
+    required this.context,
+  });
 
   _handleAddProfileFormFile() async {
     globalState.appController.addProfileFormFile();
@@ -18,14 +21,16 @@ class AddProfile extends StatelessWidget {
   }
 
   _toScan() async {
-    if(system.isDesktop){
+    if (system.isDesktop) {
       globalState.appController.addProfileFormQrCode();
       return;
     }
-    final url = await Navigator.of(context)
-        .push<String>(MaterialPageRoute(builder: (_) => const ScanPage()));
+    final url = await BaseNavigator.push(
+      context,
+      const ScanPage(),
+    );
     if (url != null) {
-      WidgetsBinding.instance.addPostFrameCallback((_){
+      WidgetsBinding.instance.addPostFrameCallback((_) {
         _handleAddProfileFormURL(url);
       });
     }
@@ -44,12 +49,12 @@ class AddProfile extends StatelessWidget {
   Widget build(context) {
     return ListView(
       children: [
-          ListItem(
-            leading: const Icon(Icons.qr_code),
-            title: Text(appLocalizations.qrcode),
-            subtitle: Text(appLocalizations.qrcodeDesc),
-            onTap: _toScan,
-          ),
+        ListItem(
+          leading: const Icon(Icons.qr_code),
+          title: Text(appLocalizations.qrcode),
+          subtitle: Text(appLocalizations.qrcodeDesc),
+          onTap: _toScan,
+        ),
         ListItem(
           leading: const Icon(Icons.upload_file),
           title: Text(appLocalizations.file),

lib/fragments/profiles/profiles.dart

@@ -1,9 +1,9 @@
 import 'dart:ui';
 
+import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/fragments/profiles/edit_profile.dart';
 import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
@@ -80,7 +80,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     }
   }
 
-  _initScaffoldState() {
+  _initScaffold() {
     WidgetsBinding.instance.addPostFrameCallback(
       (_) {
         if (!mounted) return;
@@ -112,71 +112,67 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
             iconSize: 26,
           ),
         ];
+        commonScaffoldState?.floatingActionButton = FloatingActionButton(
+          heroTag: null,
+          onPressed: _handleShowAddExtendPage,
+          child: const Icon(
+            Icons.add,
+          ),
+        );
       },
     );
   }
 
   @override
   Widget build(BuildContext context) {
-    return FloatLayout(
-      floatingWidget: FloatWrapper(
-        child: FloatingActionButton(
-          heroTag: null,
-          onPressed: _handleShowAddExtendPage,
-          child: const Icon(
-            Icons.add,
-          ),
+    return ActiveBuilder(
+      label: "profiles",
+      builder: (isCurrent, child) {
+        if (isCurrent) {
+          _initScaffold();
+        }
+        return child!;
+      },
+      child: Selector2<AppState, Config, ProfilesSelectorState>(
+        selector: (_, appState, config) => ProfilesSelectorState(
+          profiles: config.profiles,
+          currentProfileId: config.currentProfileId,
+          columns: other.getProfilesColumns(appState.viewWidth),
         ),
-      ),
-      child: Selector<AppState, bool>(
-        selector: (_, appState) => appState.currentLabel == 'profiles',
-        builder: (_, isCurrent, child) {
-          if (isCurrent) {
-            _initScaffoldState();
-          }
-          return child!;
-        },
-        child: Selector2<AppState, Config, ProfilesSelectorState>(
-          selector: (_, appState, config) => ProfilesSelectorState(
-            profiles: config.profiles,
-            currentProfileId: config.currentProfileId,
-            columns: other.getProfilesColumns(appState.viewWidth),
-          ),
-          builder: (context, state, child) {
-            if (state.profiles.isEmpty) {
-              return NullStatus(
-                label: appLocalizations.nullProfileDesc,
-              );
-            }
-            return Align(
-              alignment: Alignment.topCenter,
-              child: SingleChildScrollView(
-                padding: const EdgeInsets.only(
-                  left: 16,
-                  right: 16,
-                  top: 16,
-                  bottom: 88,
-                ),
-                child: Grid(
-                  mainAxisSpacing: 16,
-                  crossAxisSpacing: 16,
-                  crossAxisCount: state.columns,
-                  children: [
-                    for (int i = 0; i < state.profiles.length; i++)
-                      GridItem(
-                        child: ProfileItem(
-                          key: Key(state.profiles[i].id),
-                          profile: state.profiles[i],
-                          groupValue: state.currentProfileId,
-                          onChanged: globalState.appController.changeProfile,
-                        ),
-                      ),
-                  ],
-                ),
-              ),
+        builder: (context, state, child) {
+          if (state.profiles.isEmpty) {
+            return NullStatus(
+              label: appLocalizations.nullProfileDesc,
             );
-          },
-        ),
+          }
+          return Align(
+            alignment: Alignment.topCenter,
+            child: SingleChildScrollView(
+              padding: const EdgeInsets.only(
+                left: 16,
+                right: 16,
+                top: 16,
+                bottom: 88,
+              ),
+              child: Grid(
+                mainAxisSpacing: 16,
+                crossAxisSpacing: 16,
+                crossAxisCount: state.columns,
+                children: [
+                  for (int i = 0; i < state.profiles.length; i++)
+                    GridItem(
+                      child: ProfileItem(
+                        key: Key(state.profiles[i].id),
+                        profile: state.profiles[i],
+                        groupValue: state.currentProfileId,
+                        onChanged: globalState.appController.changeProfile,
+                      ),
+                    ),
+                ],
+              ),
+            ),
+          );
+        },
       ),
     );
   }
@@ -250,44 +246,16 @@ class ProfileItem extends StatelessWidget {
     );
   }
 
-  List<Widget> _buildUserInfo(BuildContext context, UserInfo userInfo) {
-    final use = userInfo.upload + userInfo.download;
-    final total = userInfo.total;
-    if (total == 0) {
-      return [];
-    }
-    final useShow = TrafficValue(value: use).show;
-    final totalShow = TrafficValue(value: total).show;
-    final progress = total == 0 ? 0.0 : use / total;
-    final expireShow = userInfo.expire == 0
-        ? appLocalizations.infiniteTime
-        : DateTime.fromMillisecondsSinceEpoch(userInfo.expire * 1000).show;
-    return [
-      LinearProgressIndicator(
-        minHeight: 6,
-        value: progress,
-        backgroundColor: context.colorScheme.primary.toSoft(),
-      ),
-      const SizedBox(
-        height: 8,
-      ),
-      Text(
-        "$useShow / $totalShow · $expireShow",
-        style: context.textTheme.labelMedium?.toLight,
-      ),
-      const SizedBox(
-        height: 4,
-      ),
-    ];
-  }
-
   List<Widget> _buildUrlProfileInfo(BuildContext context) {
-    final userInfo = profile.userInfo;
+    final subscriptionInfo = profile.subscriptionInfo;
     return [
       const SizedBox(
         height: 8,
       ),
-      if (userInfo != null) ..._buildUserInfo(context, userInfo),
+      if (subscriptionInfo != null)
+        SubscriptionInfoView(
+          subscriptionInfo: subscriptionInfo,
+        ),
       Text(
         profile.lastUpdateDate?.lastUpdateTimeDesc ?? "",
         style: context.textTheme.labelMedium?.toLight,

lib/fragments/proxies/card.dart

@@ -115,11 +115,10 @@ class ProxyCard extends StatelessWidget {
         groupName,
         nextProxyName,
       );
-      appController.changeProxy(
-        groupName: groupName,
-        proxyName: nextProxyName,
-      );
-      await appController.updateGroupDebounce();
+      await appController.changeProxyDebounce([
+        groupName,
+        nextProxyName,
+      ]);
       return;
     }
     globalState.showSnackBar(

lib/fragments/proxies/list.dart

@@ -51,7 +51,7 @@ class _ProxiesListFragmentState extends State<ProxiesListFragment> {
     }
     _headerStateNotifier.value = _headerStateNotifier.value.copyWith(
       currentIndex: currentIndex,
-      offset: headerOffset,
+      offset: max(headerOffset, 0),
     );
   }
 
@@ -299,6 +299,9 @@ class _ProxiesListFragmentState extends State<ProxiesListFragment> {
                         headerState.currentIndex > state.groupNames.length - 1
                             ? 0
                             : headerState.currentIndex;
+                    if (index < 0) {
+                      return Container();
+                    }
                     return Stack(
                       children: [
                         Positioned(
@@ -417,9 +420,9 @@ class _ListHeaderState extends State<ListHeader>
             final iconMapEntryList =
                 config.proxiesStyle.iconMap.entries.toList();
             final index = iconMapEntryList.indexWhere((item) {
-              try{
+              try {
                 return RegExp(item.key).hasMatch(groupName);
-              }catch(_){
+              } catch (_) {
                 return false;
               }
             });
@@ -468,7 +471,7 @@ class _ListHeaderState extends State<ListHeader>
   Widget build(BuildContext context) {
     return CommonCard(
       key: widget.key,
-      radius: 24,
+      radius: 18,
       type: CommonCardType.filled,
       child: Container(
         padding: const EdgeInsets.symmetric(

lib/fragments/proxies/providers.dart

@@ -4,7 +4,7 @@ import 'dart:io';
 import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/app.dart';
-import 'package:fl_clash/models/ffi.dart';
+import 'package:fl_clash/models/core.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
@@ -27,6 +27,7 @@ class _ProvidersState extends State<Providers> {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback(
       (_) {
+        globalState.appController.updateProviders();
         final commonScaffoldState =
             context.findAncestorStateOfType<CommonScaffoldState>();
         commonScaffoldState?.actions = [
@@ -55,7 +56,7 @@ class _ProvidersState extends State<Providers> {
           providerName: provider.name,
         );
         appState.setProvider(
-          clashCore.getExternalProvider(provider.name),
+          await clashCore.getExternalProvider(provider.name),
         );
       },
     );
@@ -121,7 +122,7 @@ class ProviderItem extends StatelessWidget {
         if (message.isNotEmpty) throw message;
       });
       appState.setProvider(
-        clashCore.getExternalProvider(provider.name),
+        await clashCore.getExternalProvider(provider.name),
       );
     });
     await globalState.appController.updateGroupDebounce();
@@ -132,8 +133,8 @@ class ProviderItem extends StatelessWidget {
       final platformFile = await picker.pickerFile();
       final appState = globalState.appController.appState;
       final bytes = platformFile?.bytes;
-      if (bytes == null) return;
-      final file = await File(provider.path).create(recursive: true);
+      if (bytes == null || provider.path == null) return;
+      final file = await File(provider.path!).create(recursive: true);
       await file.writeAsBytes(bytes);
       final providerName = provider.name;
       var message = await clashCore.sideLoadExternalProvider(
@@ -142,7 +143,7 @@ class ProviderItem extends StatelessWidget {
       );
       if (message.isNotEmpty) throw message;
       appState.setProvider(
-        clashCore.getExternalProvider(provider.name),
+        await clashCore.getExternalProvider(provider.name),
       );
       if (message.isNotEmpty) throw message;
     });
@@ -150,8 +151,7 @@ class ProviderItem extends StatelessWidget {
   }
 
   String _buildProviderDesc() {
-    final baseInfo =
-        "${provider.type}(${provider.vehicleType}) ·  ${provider.updateAt.lastUpdateTimeDesc}";
+    final baseInfo = provider.updateAt.lastUpdateTimeDesc;
     final count = provider.count;
     return switch (count == 0) {
       true => baseInfo,
@@ -176,10 +176,13 @@ class ProviderItem extends StatelessWidget {
           Text(
             _buildProviderDesc(),
           ),
-          Text(
-            provider.path,
-            style: context.textTheme.bodyMedium?.toLight,
+          const SizedBox(
+            height: 4,
           ),
+          if (provider.subscriptionInfo != null)
+            SubscriptionInfoView(
+              subscriptionInfo: provider.subscriptionInfo,
+            ),
           const SizedBox(
             height: 8,
           ),
@@ -200,6 +203,9 @@ class ProviderItem extends StatelessWidget {
                 ),
             ],
           ),
+          const SizedBox(
+            height: 4,
+          ),
         ],
       ),
       trailing: SizedBox(

lib/fragments/proxies/setting.dart

@@ -191,7 +191,7 @@ class ProxiesSetting extends StatelessWidget {
 
   _buildGroupStyleSetting() {
     return generateSection(
-      title: "图标样式",
+      title: appLocalizations.iconStyle,
       items: [
         SingleChildScrollView(
           padding: const EdgeInsets.symmetric(horizontal: 16),

lib/fragments/proxies/tab.dart

@@ -1,4 +1,5 @@
 import 'dart:math';
+
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
@@ -10,6 +11,8 @@ import 'package:provider/provider.dart';
 import 'card.dart';
 import 'common.dart';
 
+List<Proxy> currentProxies = [];
+
 typedef GroupNameKeyMap = Map<String, GlobalObjectKey<ProxyGroupViewState>>;
 
 class ProxiesTabFragment extends StatefulWidget {
@@ -28,7 +31,7 @@ class ProxiesTabFragmentState extends State<ProxiesTabFragment>
   @override
   void dispose() {
     super.dispose();
-    _tabController?.dispose();
+    _destroyTabController();
   }
 
   scrollToGroupSelected() {
@@ -106,6 +109,36 @@ class ProxiesTabFragmentState extends State<ProxiesTabFragment>
     );
   }
 
+  _tabControllerListener([int? index]) {
+    final appController = globalState.appController;
+    final currentGroups = appController.appState.currentGroups;
+    if (_tabController?.index == null) {
+      return;
+    }
+    final currentGroup = currentGroups[index ?? _tabController!.index];
+    currentProxies = currentGroup.all;
+    appController.config.updateCurrentGroupName(
+      currentGroup.name,
+    );
+  }
+
+  _destroyTabController() {
+    _tabController?.removeListener(_tabControllerListener);
+    _tabController?.dispose();
+    _tabController = null;
+  }
+
+  _updateTabController(int length, int index) {
+    final realIndex = index == -1 ? 0 : index;
+    _tabController ??= TabController(
+      length: length,
+      initialIndex: realIndex,
+      vsync: this,
+    );
+    _tabControllerListener(realIndex);
+    _tabController?.addListener(_tabControllerListener);
+  }
+
   @override
   Widget build(BuildContext context) {
     return Selector2<AppState, Config, ProxiesSelectorState>(
@@ -119,8 +152,7 @@ class ProxiesTabFragmentState extends State<ProxiesTabFragment>
       },
       shouldRebuild: (prev, next) {
         if (!stringListEquality.equals(prev.groupNames, next.groupNames)) {
-          _tabController?.dispose();
-          _tabController = null;
+          _destroyTabController();
           return true;
         }
         return false;
@@ -129,12 +161,8 @@ class ProxiesTabFragmentState extends State<ProxiesTabFragment>
         final index = state.groupNames.indexWhere(
           (item) => item == state.currentGroupName,
         );
-        _tabController ??= TabController(
-          length: state.groupNames.length,
-          initialIndex: index == -1 ? 0 : index,
-          vsync: this,
-        );
-        GroupNameKeyMap keyMap = {};
+        _updateTabController(state.groupNames.length, index);
+        final GroupNameKeyMap keyMap = {};
         final children = state.groupNames.map((groupName) {
           keyMap[groupName] = GlobalObjectKey(groupName);
           return KeepScope(
@@ -167,16 +195,6 @@ class ProxiesTabFragmentState extends State<ProxiesTabFragment>
                           left: 16,
                           right: 16 + (value ? 16 : 0),
                         ),
-                        onTap: (index) {
-                          final appController = globalState.appController;
-                          final currentGroups =
-                              appController.appState.currentGroups;
-                          if (currentGroups.length > index) {
-                            appController.config.updateCurrentGroupName(
-                              currentGroups[index].name,
-                            );
-                          }
-                        },
                         dividerColor: Colors.transparent,
                         isScrollable: true,
                         tabAlignment: TabAlignment.start,
@@ -243,14 +261,13 @@ class ProxyGroupView extends StatefulWidget {
 class ProxyGroupViewState extends State<ProxyGroupView> {
   var isLock = false;
   final _controller = ScrollController();
-  List<Proxy> _lastProxies = [];
 
   String get groupName => widget.groupName;
 
-  _delayTest(List<Proxy> proxies) async {
+  _delayTest() async {
     if (isLock) return;
     isLock = true;
-    await delayTest(proxies);
+    await delayTest(currentProxies);
     isLock = false;
   }
 
@@ -269,7 +286,7 @@ class ProxyGroupViewState extends State<ProxyGroupView> {
         16 +
             getScrollToSelectedOffset(
               groupName: groupName,
-              proxies: _lastProxies,
+              proxies: currentProxies,
             ),
         _controller.position.maxScrollExtent,
       ),
@@ -278,6 +295,21 @@ class ProxyGroupViewState extends State<ProxyGroupView> {
     );
   }
 
+  initFab(bool isCurrent) {
+    if (!isCurrent) {
+      return;
+    }
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final commonScaffoldState =
+          context.findAncestorStateOfType<CommonScaffoldState>();
+      commonScaffoldState?.floatingActionButton = DelayTestButton(
+        onClick: () async {
+          await _delayTest();
+        },
+      );
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return Selector2<AppState, Config, ProxyGroupSelectorState>(
@@ -302,12 +334,11 @@ class ProxyGroupViewState extends State<ProxyGroupView> {
         final sortedProxies = globalState.appController.getSortProxies(
           proxies,
         );
-        _lastProxies = sortedProxies;
-        return DelayTestButtonContainer(
-          onClick: () async {
-            await _delayTest(
-              proxies,
-            );
+        return ActiveBuilder(
+          label: "proxies",
+          builder: (isCurrent, child) {
+            initFab(isCurrent);
+            return child!;
           },
           child: Align(
             alignment: Alignment.topCenter,
@@ -344,22 +375,19 @@ class ProxyGroupViewState extends State<ProxyGroupView> {
   }
 }
 
-class DelayTestButtonContainer extends StatefulWidget {
-  final Widget child;
+class DelayTestButton extends StatefulWidget {
   final Future Function() onClick;
 
-  const DelayTestButtonContainer({
+  const DelayTestButton({
     super.key,
-    required this.child,
     required this.onClick,
   });
 
   @override
-  State<DelayTestButtonContainer> createState() =>
-      _DelayTestButtonContainerState();
+  State<DelayTestButton> createState() => _DelayTestButtonState();
 }
 
-class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
+class _DelayTestButtonState extends State<DelayTestButton>
     with SingleTickerProviderStateMixin {
   late AnimationController _controller;
   late Animation<double> _scale;
@@ -367,7 +395,9 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
   _healthcheck() async {
     _controller.forward();
     await widget.onClick();
-    _controller.reverse();
+    if (mounted) {
+      _controller.reverse();
+    }
   }
 
   @override
@@ -401,29 +431,23 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
 
   @override
   Widget build(BuildContext context) {
-    _controller.reverse();
-    return FloatLayout(
-      floatingWidget: FloatWrapper(
-        child: AnimatedBuilder(
-          animation: _controller.view,
-          builder: (_, child) {
-            return SizedBox(
-              width: 56,
-              height: 56,
-              child: Transform.scale(
-                scale: _scale.value,
-                child: child,
-              ),
-            );
-          },
-          child: FloatingActionButton(
-            heroTag: null,
-            onPressed: _healthcheck,
-            child: const Icon(Icons.network_ping),
+    return AnimatedBuilder(
+      animation: _controller.view,
+      builder: (_, child) {
+        return SizedBox(
+          width: 56,
+          height: 56,
+          child: Transform.scale(
+            scale: _scale.value,
+            child: child,
           ),
-        ),
+        );
+      },
+      child: FloatingActionButton(
+        heroTag: null,
+        onPressed: _healthcheck,
+        child: const Icon(Icons.network_ping),
       ),
-      child: widget.child,
     );
   }
 }

lib/fragments/theme.dart

@@ -1,4 +1,5 @@
 import 'package:fl_clash/common/common.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';
@@ -18,6 +19,16 @@ class ThemeModeItem {
   });
 }
 
+class FontFamilyItem {
+  final FontFamily fontFamily;
+  final String label;
+
+  const FontFamilyItem({
+    required this.fontFamily,
+    required this.label,
+  });
+}
+
 class ThemeFragment extends StatelessWidget {
   const ThemeFragment({super.key});
 
@@ -92,7 +103,11 @@ class _ThemeColorsBoxState extends State<ThemeColorsBox> {
     return CommonCard(
       isSelected: isSelected,
       onPressed: () {
-        globalState.appController.config.themeMode = themeModeItem.themeMode;
+        final appController = globalState.appController;
+        appController.config.themeProps =
+            appController.config.themeProps.copyWith(
+          themeMode: themeModeItem.themeMode,
+        );
       },
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -125,11 +140,45 @@ class _ThemeColorsBoxState extends State<ThemeColorsBox> {
       isSelected: isSelected,
       primaryColor: color,
       onPressed: () {
-        globalState.appController.config.primaryColor = color?.value;
+        final appController = globalState.appController;
+        appController.config.themeProps =
+            appController.config.themeProps.copyWith(
+          primaryColor: color?.value,
+        );
       },
     );
   }
 
+  Widget _fontFamilyCheckBox({
+    bool? isSelected,
+    required FontFamilyItem fontFamilyItem,
+  }) {
+    return CommonCard(
+      isSelected: isSelected,
+      onPressed: () {
+        final appController = globalState.appController;
+        appController.config.themeProps =
+            appController.config.themeProps.copyWith(
+          fontFamily: fontFamilyItem.fontFamily,
+        );
+      },
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          mainAxisAlignment: MainAxisAlignment.start,
+          children: [
+            Flexible(
+              child: Text(
+                fontFamilyItem.label,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     List<ThemeModeItem> themeModeItems = [
@@ -158,15 +207,59 @@ class _ThemeColorsBoxState extends State<ThemeColorsBox> {
       Colors.yellowAccent,
       Colors.purple,
     ];
+    List<FontFamilyItem> fontFamilyItems = [
+      FontFamilyItem(
+        label: appLocalizations.systemFont,
+        fontFamily: FontFamily.system,
+      ),
+      const FontFamilyItem(
+        label: "MiSans",
+        fontFamily: FontFamily.miSans,
+      ),
+    ];
     return Column(
       children: [
+        ItemCard(
+          info: Info(
+            label: appLocalizations.fontFamily,
+            iconData: Icons.text_fields,
+          ),
+          child: Container(
+            margin: const EdgeInsets.only(
+              left: 16,
+              right: 16,
+            ),
+            height: 48,
+            child: Selector<Config, FontFamily>(
+              selector: (_, config) => config.themeProps.fontFamily,
+              builder: (_, fontFamily, __) {
+                return ListView.separated(
+                  scrollDirection: Axis.horizontal,
+                  itemBuilder: (_, index) {
+                    final fontFamilyItem = fontFamilyItems[index];
+                    return _fontFamilyCheckBox(
+                      isSelected: fontFamily == fontFamilyItem.fontFamily,
+                      fontFamilyItem: fontFamilyItem,
+                    );
+                  },
+                  separatorBuilder: (_, __) {
+                    return const SizedBox(
+                      width: 16,
+                    );
+                  },
+                  itemCount: fontFamilyItems.length,
+                );
+              },
+            ),
+          ),
+        ),
         ItemCard(
           info: Info(
             label: appLocalizations.themeMode,
             iconData: Icons.brightness_high,
           ),
           child: Selector<Config, ThemeMode>(
-            selector: (_, config) => config.themeMode,
+            selector: (_, config) => config.themeProps.themeMode,
             builder: (_, themeMode, __) {
               return Container(
                 padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -204,7 +297,7 @@ class _ThemeColorsBoxState extends State<ThemeColorsBox> {
             ),
             height: 88,
             child: Selector<Config, int?>(
-              selector: (_, config) => config.primaryColor,
+              selector: (_, config) => config.themeProps.primaryColor,
               builder: (_, currentPrimaryColor, __) {
                 return ListView.separated(
                   scrollDirection: Axis.horizontal,
@@ -229,7 +322,7 @@ class _ThemeColorsBoxState extends State<ThemeColorsBox> {
         Padding(
           padding: const EdgeInsets.symmetric(vertical: 16),
           child: Selector<Config, bool>(
-            selector: (_, config) => config.prueBlack,
+            selector: (_, config) => config.themeProps.prueBlack,
             builder: (_, value, ___) {
               return ListItem.switchItem(
                 leading: Icon(
@@ -238,63 +331,19 @@ class _ThemeColorsBoxState extends State<ThemeColorsBox> {
                 ),
                 title: Text(appLocalizations.prueBlackMode),
                 delegate: SwitchDelegate(
-                    value: value,
-                    onChanged: (value) {
-                      globalState.appController.config.prueBlack = value;
-                    }),
+                  value: value,
+                  onChanged: (value) {
+                    final appController = globalState.appController;
+                    appController.config.themeProps =
+                        appController.config.themeProps.copyWith(
+                      prueBlack: value,
+                    );
+                  },
+                ),
               );
             },
           ),
         ),
-        // Padding(
-        //   padding: const EdgeInsets.symmetric(vertical: 16),
-        //   child: Selector<Config, bool>(
-        //     selector: (_, config) => config.scaleProps.custom,
-        //     builder: (_, value, ___) {
-        //       return ListItem.switchItem(
-        //         leading: Icon(
-        //           Icons.format_size_sharp,
-        //           color: context.colorScheme.primary,
-        //         ),
-        //         title: const Text("自定义字体大小"),
-        //         delegate: SwitchDelegate(
-        //           value: value,
-        //           onChanged: (value) {
-        //             globalState.appController.config.scaleProps =
-        //                 globalState.appController.config.scaleProps.copyWith(
-        //               custom: value,
-        //             );
-        //           },
-        //         ),
-        //       );
-        //     },
-        //   ),
-        // ),
-        // SizedBox(
-        //   height: 20,
-        //   child: Selector<Config, ScaleProps>(
-        //     selector: (_, config) => config.scaleProps,
-        //     builder: (_, props, ___) {
-        //       return AbsorbPointer(
-        //         absorbing: !props.custom,
-        //         child: DisabledMask(
-        //           status: !props.custom,
-        //           child: Slider(
-        //             value: props.scale,
-        //             min: 0.8,
-        //             max: 1.2,
-        //             onChanged: (value) {
-        //               globalState.appController.config.scaleProps =
-        //                   globalState.appController.config.scaleProps.copyWith(
-        //                 scale: value,
-        //               );
-        //             },
-        //           ),
-        //         ),
-        //       );
-        //     },
-        //   ),
-        // ),
         const SizedBox(
           height: 64,
         ),

lib/l10n/arb/intl_en.arb

@@ -168,6 +168,7 @@
   "ipv6Desc": "When turned on it will be able to receive IPv6 traffic",
   "app": "App",
   "general": "General",
+  "vpnSystemProxyDesc": "Attach HTTP proxy to VpnService",
   "systemProxyDesc": "Attach HTTP proxy to VpnService",
   "unifiedDelay": "Unified delay",
   "unifiedDelayDesc": "Remove extra delays such as handshaking",
@@ -320,5 +321,16 @@
   "iconConfiguration": "Icon configuration",
   "noData": "No data",
   "adminAutoLaunch": "Admin auto launch",
-  "adminAutoLaunchDesc": "Boot up by using admin mode"
+  "adminAutoLaunchDesc": "Boot up by using admin mode",
+  "fontFamily": "FontFamily",
+  "systemFont": "System font",
+  "toggle": "Toggle",
+  "system": "System",
+  "routeMode": "Route mode",
+  "routeMode_bypassPrivate": "Bypass private route address",
+  "routeMode_config": "Use config",
+  "routeAddress": "Route address",
+  "routeAddressDesc": "Config listen route address",
+  "pleaseInputAdminPassword": "Please enter the admin password",
+  "copyEnvVar": "Copying environment variables"
 }

lib/l10n/arb/intl_zh_CN.arb

@@ -168,7 +168,8 @@
   "ipv6Desc": "开启后将可以接收IPv6流量",
   "app": "应用",
   "general": "基础",
-  "systemProxyDesc": "为VpnService附加HTTP代理",
+  "vpnSystemProxyDesc": "为VpnService附加HTTP代理",
+  "systemProxyDesc": "设置系统代理",
   "unifiedDelay": "统一延迟",
   "unifiedDelayDesc": "去除握手等额外延迟",
   "tcpConcurrent": "TCP并发",
@@ -320,5 +321,16 @@
   "iconConfiguration": "图片配置",
   "noData": "暂无数据",
   "adminAutoLaunch": "管理员自启动",
-  "adminAutoLaunchDesc": "使用管理员模式开机自启动"
-}
+  "adminAutoLaunchDesc": "使用管理员模式开机自启动",
+  "fontFamily": "字体",
+  "systemFont": "系统字体",
+  "toggle": "切换",
+  "system": "系统",
+  "routeMode": "路由模式",
+  "routeMode_bypassPrivate": "绕过私有路由地址",
+  "routeMode_config": "使用配置",
+  "routeAddress": "路由地址",
+  "routeAddressDesc": "配置监听路由地址",
+  "pleaseInputAdminPassword": "请输入管理员密码",
+  "copyEnvVar": "复制环境变量"
+}

lib/l10n/intl/messages_en.dart

@@ -121,6 +121,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "View current connections data"),
         "connectivity": MessageLookupByLibrary.simpleMessage("Connectivity："),
         "copy": MessageLookupByLibrary.simpleMessage("Copy"),
+        "copyEnvVar": MessageLookupByLibrary.simpleMessage(
+            "Copying environment variables"),
         "core": MessageLookupByLibrary.simpleMessage("Core"),
         "coreInfo": MessageLookupByLibrary.simpleMessage("Core info"),
         "country": MessageLookupByLibrary.simpleMessage("Country"),
@@ -192,6 +194,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "findProcessMode": MessageLookupByLibrary.simpleMessage("Find process"),
         "findProcessModeDesc": MessageLookupByLibrary.simpleMessage(
             "There is a risk of flashback after opening"),
+        "fontFamily": MessageLookupByLibrary.simpleMessage("FontFamily"),
         "fourColumns": MessageLookupByLibrary.simpleMessage("Four columns"),
         "general": MessageLookupByLibrary.simpleMessage("General"),
         "generalDesc":
@@ -325,6 +328,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "paste": MessageLookupByLibrary.simpleMessage("Paste"),
         "pleaseBindWebDAV":
             MessageLookupByLibrary.simpleMessage("Please bind WebDAV"),
+        "pleaseInputAdminPassword": MessageLookupByLibrary.simpleMessage(
+            "Please enter the admin password"),
         "pleaseUploadFile":
             MessageLookupByLibrary.simpleMessage("Please upload file"),
         "pleaseUploadValidQrcode": MessageLookupByLibrary.simpleMessage(
@@ -397,6 +402,13 @@ class MessageLookup extends MessageLookupByLibrary {
         "respectRules": MessageLookupByLibrary.simpleMessage("Respect rules"),
         "respectRulesDesc": MessageLookupByLibrary.simpleMessage(
             "DNS connection following rules, need to configure proxy-server-nameserver"),
+        "routeAddress": MessageLookupByLibrary.simpleMessage("Route address"),
+        "routeAddressDesc":
+            MessageLookupByLibrary.simpleMessage("Config listen route address"),
+        "routeMode": MessageLookupByLibrary.simpleMessage("Route mode"),
+        "routeMode_bypassPrivate": MessageLookupByLibrary.simpleMessage(
+            "Bypass private route address"),
+        "routeMode_config": MessageLookupByLibrary.simpleMessage("Use config"),
         "rule": MessageLookupByLibrary.simpleMessage("Rule"),
         "ruleProviders": MessageLookupByLibrary.simpleMessage("Rule providers"),
         "save": MessageLookupByLibrary.simpleMessage("Save"),
@@ -425,6 +437,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "style": MessageLookupByLibrary.simpleMessage("Style"),
         "submit": MessageLookupByLibrary.simpleMessage("Submit"),
         "sync": MessageLookupByLibrary.simpleMessage("Sync"),
+        "system": MessageLookupByLibrary.simpleMessage("System"),
+        "systemFont": MessageLookupByLibrary.simpleMessage("System font"),
         "systemProxy": MessageLookupByLibrary.simpleMessage("System proxy"),
         "systemProxyDesc": MessageLookupByLibrary.simpleMessage(
             "Attach HTTP proxy to VpnService"),
@@ -445,6 +459,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "tight": MessageLookupByLibrary.simpleMessage("Tight"),
         "time": MessageLookupByLibrary.simpleMessage("Time"),
         "tip": MessageLookupByLibrary.simpleMessage("tip"),
+        "toggle": MessageLookupByLibrary.simpleMessage("Toggle"),
         "tools": MessageLookupByLibrary.simpleMessage("Tools"),
         "trafficUsage": MessageLookupByLibrary.simpleMessage("Traffic usage"),
         "tun": MessageLookupByLibrary.simpleMessage("TUN"),
@@ -472,6 +487,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Modify VPN related settings"),
         "vpnEnableDesc": MessageLookupByLibrary.simpleMessage(
             "Auto routes all system traffic through VpnService"),
+        "vpnSystemProxyDesc": MessageLookupByLibrary.simpleMessage(
+            "Attach HTTP proxy to VpnService"),
         "vpnTip": MessageLookupByLibrary.simpleMessage(
             "Changes take effect after restarting the VPN"),
         "webDAVConfiguration":

lib/l10n/intl/messages_zh_CN.dart

@@ -98,6 +98,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "connectionsDesc": MessageLookupByLibrary.simpleMessage("查看当前连接数据"),
         "connectivity": MessageLookupByLibrary.simpleMessage("连通性："),
         "copy": MessageLookupByLibrary.simpleMessage("复制"),
+        "copyEnvVar": MessageLookupByLibrary.simpleMessage("复制环境变量"),
         "core": MessageLookupByLibrary.simpleMessage("内核"),
         "coreInfo": MessageLookupByLibrary.simpleMessage("内核信息"),
         "country": MessageLookupByLibrary.simpleMessage("区域"),
@@ -155,6 +156,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "findProcessMode": MessageLookupByLibrary.simpleMessage("查找进程"),
         "findProcessModeDesc":
             MessageLookupByLibrary.simpleMessage("开启后存在闪退风险"),
+        "fontFamily": MessageLookupByLibrary.simpleMessage("字体"),
         "fourColumns": MessageLookupByLibrary.simpleMessage("四列"),
         "general": MessageLookupByLibrary.simpleMessage("基础"),
         "generalDesc": MessageLookupByLibrary.simpleMessage("覆写基础设置"),
@@ -258,6 +260,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "passwordTip": MessageLookupByLibrary.simpleMessage("密码不能为空"),
         "paste": MessageLookupByLibrary.simpleMessage("粘贴"),
         "pleaseBindWebDAV": MessageLookupByLibrary.simpleMessage("请绑定WebDAV"),
+        "pleaseInputAdminPassword":
+            MessageLookupByLibrary.simpleMessage("请输入管理员密码"),
         "pleaseUploadFile": MessageLookupByLibrary.simpleMessage("请上传文件"),
         "pleaseUploadValidQrcode":
             MessageLookupByLibrary.simpleMessage("请上传有效的二维码"),
@@ -313,6 +317,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "respectRules": MessageLookupByLibrary.simpleMessage("遵守规则"),
         "respectRulesDesc": MessageLookupByLibrary.simpleMessage(
             "DNS连接跟随rules,需配置proxy-server-nameserver"),
+        "routeAddress": MessageLookupByLibrary.simpleMessage("路由地址"),
+        "routeAddressDesc": MessageLookupByLibrary.simpleMessage("配置监听路由地址"),
+        "routeMode": MessageLookupByLibrary.simpleMessage("路由模式"),
+        "routeMode_bypassPrivate":
+            MessageLookupByLibrary.simpleMessage("绕过私有路由地址"),
+        "routeMode_config": MessageLookupByLibrary.simpleMessage("使用配置"),
         "rule": MessageLookupByLibrary.simpleMessage("规则"),
         "ruleProviders": MessageLookupByLibrary.simpleMessage("规则提供者"),
         "save": MessageLookupByLibrary.simpleMessage("保存"),
@@ -339,9 +349,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "style": MessageLookupByLibrary.simpleMessage("风格"),
         "submit": MessageLookupByLibrary.simpleMessage("提交"),
         "sync": MessageLookupByLibrary.simpleMessage("同步"),
+        "system": MessageLookupByLibrary.simpleMessage("系统"),
+        "systemFont": MessageLookupByLibrary.simpleMessage("系统字体"),
         "systemProxy": MessageLookupByLibrary.simpleMessage("系统代理"),
-        "systemProxyDesc":
-            MessageLookupByLibrary.simpleMessage("为VpnService附加HTTP代理"),
+        "systemProxyDesc": MessageLookupByLibrary.simpleMessage("设置系统代理"),
         "tab": MessageLookupByLibrary.simpleMessage("标签页"),
         "tabAnimation": MessageLookupByLibrary.simpleMessage("选项卡动画"),
         "tabAnimationDesc":
@@ -357,6 +368,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "tight": MessageLookupByLibrary.simpleMessage("紧凑"),
         "time": MessageLookupByLibrary.simpleMessage("时间"),
         "tip": MessageLookupByLibrary.simpleMessage("提示"),
+        "toggle": MessageLookupByLibrary.simpleMessage("切换"),
         "tools": MessageLookupByLibrary.simpleMessage("工具"),
         "trafficUsage": MessageLookupByLibrary.simpleMessage("流量统计"),
         "tun": MessageLookupByLibrary.simpleMessage("虚拟网卡"),
@@ -378,6 +390,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "vpnDesc": MessageLookupByLibrary.simpleMessage("修改VPN相关设置"),
         "vpnEnableDesc":
             MessageLookupByLibrary.simpleMessage("通过VpnService自动路由系统所有流量"),
+        "vpnSystemProxyDesc":
+            MessageLookupByLibrary.simpleMessage("为VpnService附加HTTP代理"),
         "vpnTip": MessageLookupByLibrary.simpleMessage("重启VPN后改变生效"),
         "webDAVConfiguration": MessageLookupByLibrary.simpleMessage("WebDAV配置"),
         "whitelistMode": MessageLookupByLibrary.simpleMessage("白名单模式"),

lib/l10n/l10n.dart

@@ -1740,6 +1740,16 @@ class AppLocalizations {
     );
   }
 
+  /// `Attach HTTP proxy to VpnService`
+  String get vpnSystemProxyDesc {
+    return Intl.message(
+      'Attach HTTP proxy to VpnService',
+      name: 'vpnSystemProxyDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `Attach HTTP proxy to VpnService`
   String get systemProxyDesc {
     return Intl.message(
@@ -3269,6 +3279,116 @@ class AppLocalizations {
       args: [],
     );
   }
+
+  /// `FontFamily`
+  String get fontFamily {
+    return Intl.message(
+      'FontFamily',
+      name: 'fontFamily',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `System font`
+  String get systemFont {
+    return Intl.message(
+      'System font',
+      name: 'systemFont',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Toggle`
+  String get toggle {
+    return Intl.message(
+      'Toggle',
+      name: 'toggle',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `System`
+  String get system {
+    return Intl.message(
+      'System',
+      name: 'system',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Route mode`
+  String get routeMode {
+    return Intl.message(
+      'Route mode',
+      name: 'routeMode',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Bypass private route address`
+  String get routeMode_bypassPrivate {
+    return Intl.message(
+      'Bypass private route address',
+      name: 'routeMode_bypassPrivate',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Use config`
+  String get routeMode_config {
+    return Intl.message(
+      'Use config',
+      name: 'routeMode_config',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Route address`
+  String get routeAddress {
+    return Intl.message(
+      'Route address',
+      name: 'routeAddress',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Config listen route address`
+  String get routeAddressDesc {
+    return Intl.message(
+      'Config listen route address',
+      name: 'routeAddressDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Please enter the admin password`
+  String get pleaseInputAdminPassword {
+    return Intl.message(
+      'Please enter the admin password',
+      name: 'pleaseInputAdminPassword',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Copying environment variables`
+  String get copyEnvVar {
+    return Intl.message(
+      'Copying environment variables',
+      name: 'copyEnvVar',
+      desc: '',
+      args: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

lib/main.dart

@@ -8,17 +8,22 @@ import 'package:fl_clash/plugins/vpn.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:package_info_plus/package_info_plus.dart';
+
 import 'application.dart';
+import 'common/common.dart';
 import 'l10n/l10n.dart';
 import 'models/models.dart';
-import 'common/common.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  clashCore.initMessage();
+  clashLib?.initMessage();
   globalState.packageInfo = await PackageInfo.fromPlatform();
   final version = await system.version;
   final config = await preferences.getConfig() ?? Config();
+  await AppLocalizations.load(
+    other.getLocaleForString(config.appSetting.locale) ??
+        WidgetsBinding.instance.platformDispatcher.locale,
+  );
   final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
   await android?.init();
   await window?.init(config.windowProps, version);
@@ -27,12 +32,14 @@ Future<void> main() async {
     version: version,
     selectedMap: config.currentSelectedMap,
   );
+  final appFlowingState = AppFlowingState();
   appState.navigationItems = navigation.getItems(
     openLogs: config.appSetting.openLogs,
     hasProxies: false,
   );
-  await globalState.init(
+  tray.update(
     appState: appState,
+    appFlowingState: appFlowingState,
     config: config,
     clashConfig: clashConfig,
   );
@@ -40,6 +47,7 @@ Future<void> main() async {
   runAppWithPreferences(
     const Application(),
     appState: appState,
+    appFlowingState: appFlowingState,
     config: config,
     clashConfig: clashConfig,
   );
@@ -53,39 +61,70 @@ Future<void> vpnService() async {
   final version = await system.version;
   final config = await preferences.getConfig() ?? Config();
   final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
+  await AppLocalizations.load(
+    other.getLocaleForString(config.appSetting.locale) ??
+        WidgetsBinding.instance.platformDispatcher.locale,
+  );
+
   final appState = AppState(
     mode: clashConfig.mode,
     selectedMap: config.currentSelectedMap,
     version: version,
   );
+
   await globalState.init(
     appState: appState,
     config: config,
     clashConfig: clashConfig,
   );
 
+  await app?.tip(appLocalizations.startVpn);
+
+  globalState
+      .updateClashConfig(
+    appState: appState,
+    clashConfig: clashConfig,
+    config: config,
+    isPatch: false,
+  )
+      .then(
+    (_) async {
+      await globalState.handleStart();
+
+      tile?.addListener(
+        TileListenerWithVpn(
+          onStop: () async {
+            await app?.tip(appLocalizations.stopVpn);
+            await globalState.handleStop();
+            clashCore.shutdown();
+            exit(0);
+          },
+        ),
+      );
+      globalState.updateTraffic(config: config);
+      globalState.updateFunctionLists = [
+        () {
+          globalState.updateTraffic(config: config);
+        }
+      ];
+    },
+  );
+
   vpn?.setServiceMessageHandler(
     ServiceMessageHandler(
       onProtect: (Fd fd) async {
         await vpn?.setProtect(fd.value);
-        clashCore.setFdMap(fd.id);
+        clashLib?.setFdMap(fd.id);
       },
-      onProcess: (Process process) async {
+      onProcess: (ProcessData process) async {
         final packageName = await vpn?.resolverProcess(process);
-        clashCore.setProcessMap(
+        clashLib?.setProcessMap(
           ProcessMapItem(
             id: process.id,
             value: packageName ?? "",
           ),
         );
       },
-      onStarted: (String runTime) async {
-        await globalState.applyProfile(
-          appState: appState,
-          config: config,
-          clashConfig: clashConfig,
-        );
-      },
       onLoaded: (String groupName) {
         final currentSelectedMap = config.currentSelectedMap;
         final proxyName = currentSelectedMap[groupName];
@@ -98,50 +137,20 @@ Future<void> vpnService() async {
       },
     ),
   );
-  final appLocalizations = await AppLocalizations.load(
-    other.getLocaleForString(config.appSetting.locale) ??
-        WidgetsBinding.instance.platformDispatcher.locale,
-  );
-  await app?.tip(appLocalizations.startVpn);
-  await globalState.handleStart(
-    config: config,
-    clashConfig: clashConfig,
-  );
-
-  tile?.addListener(
-    TileListenerWithVpn(
-      onStop: () async {
-        await app?.tip(appLocalizations.stopVpn);
-        await globalState.handleStop();
-        clashCore.shutdown();
-        exit(0);
-      },
-    ),
-  );
-
-  globalState.updateTraffic();
-  globalState.updateFunctionLists = [
-    () {
-      globalState.updateTraffic();
-    }
-  ];
 }
 
 @immutable
 class ServiceMessageHandler with ServiceMessageListener {
   final Function(Fd fd) _onProtect;
-  final Function(Process process) _onProcess;
-  final Function(String runTime) _onStarted;
+  final Function(ProcessData process) _onProcess;
   final Function(String providerName) _onLoaded;
 
   const ServiceMessageHandler({
     required Function(Fd fd) onProtect,
-    required Function(Process process) onProcess,
-    required Function(String runTime) onStarted,
+    required Function(ProcessData process) onProcess,
     required Function(String providerName) onLoaded,
   })  : _onProtect = onProtect,
         _onProcess = onProcess,
-        _onStarted = onStarted,
         _onLoaded = onLoaded;
 
   @override
@@ -150,15 +159,10 @@ class ServiceMessageHandler with ServiceMessageListener {
   }
 
   @override
-  onProcess(Process process) {
+  onProcess(ProcessData process) {
     _onProcess(process);
   }
 
-  @override
-  onStarted(String runTime) {
-    _onStarted(runTime);
-  }
-
   @override
   onLoaded(String providerName) {
     _onLoaded(providerName);

lib/manager/android_manager.dart

@@ -1,3 +1,4 @@
+import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/plugins/app.dart';
 import 'package:flutter/material.dart';
@@ -23,6 +24,28 @@ class _AndroidContainerState extends State<AndroidManager> {
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
   }
 
+  Widget _updateCoreState(Widget child) {
+    return Selector2<Config, ClashConfig, CoreState>(
+      selector: (_, config, clashConfig) => CoreState(
+        enable: config.vpnProps.enable,
+        accessControl: config.isAccessControl ? config.accessControl : null,
+        ipv6: config.vpnProps.ipv6,
+        allowBypass: config.vpnProps.allowBypass,
+        bypassDomain: config.networkProps.bypassDomain,
+        systemProxy: config.vpnProps.systemProxy,
+        onlyProxy: config.appSetting.onlyProxy,
+        currentProfileName:
+            config.currentProfile?.label ?? config.currentProfileId ?? "",
+        routeAddress: clashConfig.routeAddress,
+      ),
+      builder: (__, state, child) {
+        clashLib?.setState(state);
+        return child!;
+      },
+      child: child,
+    );
+  }
+
   Widget _excludeContainer(Widget child) {
     return Selector<Config, bool>(
       selector: (_, config) => config.appSetting.hidden,
@@ -36,6 +59,10 @@ class _AndroidContainerState extends State<AndroidManager> {
 
   @override
   Widget build(BuildContext context) {
-    return _excludeContainer(widget.child);
+    return _updateCoreState(
+      _excludeContainer(
+        widget.child,
+      ),
+    );
   }
 }

lib/manager/app_state_manager.dart

@@ -18,7 +18,6 @@ class AppStateManager extends StatefulWidget {
 
 class _AppStateManagerState extends State<AppStateManager>
     with WidgetsBindingObserver {
-
   _updateNavigationsContainer(Widget child) {
     return Selector2<AppState, Config, UpdateNavigationsSelector>(
       selector: (_, appState, config) {
@@ -45,6 +44,22 @@ class _AppStateManagerState extends State<AppStateManager>
     );
   }
 
+  _cacheStateChange(Widget child) {
+    return Selector2<Config, ClashConfig, String>(
+      selector: (_, config, clashConfig) => "$clashConfig $config",
+      shouldRebuild: (prev, next) {
+        if (prev != next) {
+          globalState.appController.savePreferencesDebounce();
+        }
+        return prev != next;
+      },
+      builder: (context, state, child) {
+        return child!;
+      },
+      child: child,
+    );
+  }
+
   @override
   void initState() {
     super.initState();
@@ -61,7 +76,7 @@ class _AppStateManagerState extends State<AppStateManager>
   Future<void> didChangeAppLifecycleState(AppLifecycleState state) async {
     final isPaused = state == AppLifecycleState.paused;
     if (isPaused) {
-      await globalState.appController.savePreferences();
+      globalState.appController.savePreferencesDebounce();
     }
   }
 
@@ -73,8 +88,10 @@ class _AppStateManagerState extends State<AppStateManager>
 
   @override
   Widget build(BuildContext context) {
-    return _updateNavigationsContainer(
-      widget.child,
+    return _cacheStateChange(
+      _updateNavigationsContainer(
+        widget.child,
+      ),
     );
   }
 }

lib/manager/clash_manager.dart

@@ -20,7 +20,6 @@ class ClashManager extends StatefulWidget {
 }
 
 class _ClashContainerState extends State<ClashManager> with AppMessageListener {
-  Function? updateClashConfigDebounce;
   Function? updateDelayDebounce;
 
   Widget _updateContainer(Widget child) {
@@ -47,10 +46,7 @@ class _ClashContainerState extends State<ClashManager> with AppMessageListener {
       ),
       shouldRebuild: (prev, next) {
         if (prev != next) {
-          updateClashConfigDebounce ??= debounce<Function()>(() async {
-            await globalState.appController.updateClashConfig();
-          });
-          updateClashConfigDebounce!();
+          globalState.appController.updateClashConfigDebounce();
         }
         return prev != next;
       },
@@ -61,40 +57,20 @@ class _ClashContainerState extends State<ClashManager> with AppMessageListener {
     );
   }
 
-  Widget _updateCoreState(Widget child) {
-    return Selector2<Config, ClashConfig, CoreState>(
-      selector: (_, config, clashConfig) => CoreState(
-        enable: config.vpnProps.enable,
-        accessControl: config.isAccessControl ? config.accessControl : null,
-        ipv6: config.vpnProps.ipv6,
-        allowBypass: config.vpnProps.allowBypass,
-        bypassDomain: config.vpnProps.bypassDomain,
-        systemProxy: config.vpnProps.systemProxy,
-        onlyProxy: config.appSetting.onlyProxy,
-        currentProfileName:
-            config.currentProfile?.label ?? config.currentProfileId ?? "",
-      ),
-      builder: (__, state, child) {
-        clashCore.setState(state);
-        return child!;
-      },
-      child: child,
-    );
-  }
-
-  _changeProfile() async {
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      final appController = globalState.appController;
-      appController.appState.delayMap = {};
-      await appController.applyProfile();
-    });
-  }
-
   Widget _changeProfileContainer(Widget child) {
     return Selector<Config, String?>(
       selector: (_, config) => config.currentProfileId,
+      shouldRebuild: (prev, next) {
+        if (prev != next) {
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            final appController = globalState.appController;
+            appController.appState.delayMap = {};
+            appController.applyProfile();
+          });
+        }
+        return prev != next;
+      },
       builder: (__, state, child) {
-        _changeProfile();
         return child!;
       },
       child: child,
@@ -104,10 +80,8 @@ class _ClashContainerState extends State<ClashManager> with AppMessageListener {
   @override
   Widget build(BuildContext context) {
     return _changeProfileContainer(
-      _updateCoreState(
-        _updateContainer(
-          widget.child,
-        ),
+      _updateContainer(
+        widget.child,
       ),
     );
   }
@@ -161,7 +135,7 @@ class _ClashContainerState extends State<ClashManager> with AppMessageListener {
   Future<void> onLoaded(String providerName) async {
     final appController = globalState.appController;
     appController.appState.setProvider(
-      clashCore.getExternalProvider(
+      await clashCore.getExternalProvider(
         providerName,
       ),
     );

lib/manager/proxy_manager.dart

@@ -8,13 +8,13 @@ class ProxyManager extends StatelessWidget {
 
   const ProxyManager({super.key, required this.child});
 
-  _updateProxy(ProxyState proxyState) {
+  _updateProxy(ProxyState proxyState) async {
     final isStart = proxyState.isStart;
     final systemProxy = proxyState.systemProxy;
     final port = proxyState.port;
     if (isStart && systemProxy) {
-      proxy?.startProxy(port);
-    }else{
+      proxy?.startProxy(port, proxyState.bassDomain);
+    } else {
       proxy?.stopProxy();
     }
   }
@@ -24,8 +24,9 @@ class ProxyManager extends StatelessWidget {
     return Selector3<AppFlowingState, Config, ClashConfig, ProxyState>(
       selector: (_, appFlowingState, config, clashConfig) => ProxyState(
         isStart: appFlowingState.isStart,
-        systemProxy: config.desktopProps.systemProxy,
+        systemProxy: config.networkProps.systemProxy,
         port: clashConfig.mixedPort,
+        bassDomain: config.networkProps.bypassDomain,
       ),
       builder: (_, state, child) {
         _updateProxy(state);

lib/manager/tile_manager.dart

@@ -15,8 +15,6 @@ class TileManager extends StatefulWidget {
 }
 
 class _TileContainerState extends State<TileManager> with TileListener {
-
-
   @override
   Widget build(BuildContext context) {
     return widget.child;
@@ -29,7 +27,7 @@ class _TileContainerState extends State<TileManager> with TileListener {
   }
 
   @override
-  void onStop() {
+  Future<void> onStop() async {
     globalState.appController.updateStatus(false);
     super.onStop();
   }

lib/manager/tray_manager.dart

@@ -1,14 +1,9 @@
-import 'dart:io';
-
 import 'package:fl_clash/common/common.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';
-import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:tray_manager/tray_manager.dart';
-import 'package:window_ext/window_ext.dart';
 
 class TrayManager extends StatefulWidget {
   final Widget child;
@@ -22,8 +17,7 @@ class TrayManager extends StatefulWidget {
   State<TrayManager> createState() => _TrayContainerState();
 }
 
-class _TrayContainerState extends State<TrayManager>
-    with TrayListener {
+class _TrayContainerState extends State<TrayManager> with TrayListener {
   @override
   void initState() {
     super.initState();
@@ -36,19 +30,23 @@ class _TrayContainerState extends State<TrayManager>
       selector: (_, appState, appFlowingState, config, clashConfig) =>
           TrayState(
         mode: clashConfig.mode,
-        adminAutoLaunch: config.appSetting.adminAutoLaunch,
         autoLaunch: config.appSetting.autoLaunch,
         isStart: appFlowingState.isStart,
         locale: config.appSetting.locale,
-        systemProxy: config.desktopProps.systemProxy,
+        systemProxy: config.networkProps.systemProxy,
         tunEnable: clashConfig.tun.enable,
         brightness: appState.brightness,
+        port: clashConfig.mixedPort,
+        groups: appState.groups,
+        map: appState.selectedMap,
       ),
       shouldRebuild: (prev, next) {
+        if (prev != next) {
+          globalState.appController.updateTray();
+        }
         return prev != next;
       },
       builder: (_, state, child) {
-        globalState.appController.updateTray();
         return child!;
       },
       child: widget.child,

lib/manager/window_manager.dart

@@ -20,14 +20,14 @@ class WindowManager extends StatefulWidget {
   State<WindowManager> createState() => _WindowContainerState();
 }
 
-class _WindowContainerState extends State<WindowManager> with WindowListener, WindowExtListener {
+class _WindowContainerState extends State<WindowManager>
+    with WindowListener, WindowExtListener {
   Function? updateLaunchDebounce;
 
   _autoLaunchContainer(Widget child) {
     return Selector<Config, AutoLaunchState>(
       selector: (_, config) => AutoLaunchState(
         isAutoLaunch: config.appSetting.autoLaunch,
-        isAdminAutoLaunch: config.appSetting.adminAutoLaunch,
       ),
       builder: (_, state, child) {
         updateLaunchDebounce ??= debounce((AutoLaunchState state) {
@@ -58,15 +58,15 @@ class _WindowContainerState extends State<WindowManager> with WindowListener, Wi
     super.onWindowClose();
   }
 
+  @override
+  Future<void> onShouldTerminate() async {
+    await globalState.appController.handleExit();
+    super.onShouldTerminate();
+  }
+
   @override
   Future<void> onWindowMoved() async {
     super.onWindowMoved();
-    final offset = await windowManager.getPosition();
-    final config = globalState.appController.config;
-    config.windowProps = config.windowProps.copyWith(
-      top: offset.dy,
-      left: offset.dx,
-    );
   }
 
   @override
@@ -82,13 +82,14 @@ class _WindowContainerState extends State<WindowManager> with WindowListener, Wi
 
   @override
   void onWindowMinimize() async {
-    await globalState.appController.savePreferences();
+    globalState.appController.savePreferencesDebounce();
     super.onWindowMinimize();
   }
 
   @override
-  void onTaskbarCreated() {
+  Future<void> onTaskbarCreated() async {
     globalState.appController.updateTray(true);
+    await globalState.appController.restartCore();
     super.onTaskbarCreated();
   }
 

lib/models/app.dart

@@ -1,8 +1,9 @@
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
+
 import 'common.dart';
-import 'ffi.dart';
+import 'core.dart';
 import 'profile.dart';
 
 typedef DelayMap = Map<String, int?>;

lib/models/clash_config.dart

@@ -7,9 +7,8 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 
 import '../enum/enum.dart';
 
-part 'generated/clash_config.g.dart';
-
 part 'generated/clash_config.freezed.dart';
+part 'generated/clash_config.g.dart';
 
 const defaultTun = Tun();
 
@@ -126,6 +125,91 @@ typedef HostsMap = Map<String, String>;
 const defaultMixedPort = 7890;
 const defaultKeepAliveInterval = 30;
 
+const defaultBypassPrivateRouteAddress = [
+  "1.0.0.0/8",
+  "2.0.0.0/7",
+  "4.0.0.0/6",
+  "8.0.0.0/7",
+  "11.0.0.0/8",
+  "12.0.0.0/6",
+  "16.0.0.0/4",
+  "32.0.0.0/3",
+  "64.0.0.0/3",
+  "96.0.0.0/4",
+  "112.0.0.0/5",
+  "120.0.0.0/6",
+  "124.0.0.0/7",
+  "126.0.0.0/8",
+  "128.0.0.0/3",
+  "160.0.0.0/5",
+  "168.0.0.0/8",
+  "169.0.0.0/9",
+  "169.128.0.0/10",
+  "169.192.0.0/11",
+  "169.224.0.0/12",
+  "169.240.0.0/13",
+  "169.248.0.0/14",
+  "169.252.0.0/15",
+  "169.255.0.0/16",
+  "170.0.0.0/7",
+  "172.0.0.0/12",
+  "172.32.0.0/11",
+  "172.64.0.0/10",
+  "172.128.0.0/9",
+  "173.0.0.0/8",
+  "174.0.0.0/7",
+  "176.0.0.0/4",
+  "192.0.0.0/9",
+  "192.128.0.0/11",
+  "192.160.0.0/13",
+  "192.169.0.0/16",
+  "192.170.0.0/15",
+  "192.172.0.0/14",
+  "192.176.0.0/12",
+  "192.192.0.0/10",
+  "193.0.0.0/8",
+  "194.0.0.0/7",
+  "196.0.0.0/6",
+  "200.0.0.0/5",
+  "208.0.0.0/4",
+  "240.0.0.0/5",
+  "248.0.0.0/6",
+  "252.0.0.0/7",
+  "254.0.0.0/8",
+  "255.0.0.0/9",
+  "255.128.0.0/10",
+  "255.192.0.0/11",
+  "255.224.0.0/12",
+  "255.240.0.0/13",
+  "255.248.0.0/14",
+  "255.252.0.0/15",
+  "255.254.0.0/16",
+  "255.255.0.0/17",
+  "255.255.128.0/18",
+  "255.255.192.0/19",
+  "255.255.224.0/20",
+  "255.255.240.0/21",
+  "255.255.248.0/22",
+  "255.255.252.0/23",
+  "255.255.254.0/24",
+  "255.255.255.0/25",
+  "255.255.255.128/26",
+  "255.255.255.192/27",
+  "255.255.255.224/28",
+  "255.255.255.240/29",
+  "255.255.255.248/30",
+  "255.255.255.252/31",
+  "255.255.255.254/32",
+  "::/1",
+  "8000::/2",
+  "c000::/3",
+  "e000::/4",
+  "f000::/5",
+  "f800::/6",
+  "fe00::/9",
+  "fec0::/10"
+];
+
 @JsonSerializable()
 class ClashConfig extends ChangeNotifier {
   int _mixedPort;
@@ -145,6 +229,8 @@ class ClashConfig extends ChangeNotifier {
   List<String> _rules;
   String? _globalRealUa;
   HostsMap _hosts;
+  List<String> _includeRouteAddress;
+  RouteMode _routeMode;
 
   ClashConfig()
       : _mixedPort = defaultMixedPort,
@@ -161,6 +247,8 @@ class ClashConfig extends ChangeNotifier {
         _keepAliveInterval = defaultKeepAliveInterval,
         _dns = defaultDns,
         _geoXUrl = defaultGeoXMap,
+        _routeMode = RouteMode.config,
+        _includeRouteAddress = [],
         _rules = [],
         _hosts = {};
 
@@ -343,6 +431,34 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
+  @JsonKey(name: "route-address", includeFromJson: false, includeToJson: true)
+  List<String> get routeAddress {
+    return switch (_routeMode == RouteMode.config) {
+      true => _includeRouteAddress,
+      false => defaultBypassPrivateRouteAddress,
+    };
+  }
+
+  @JsonKey(name: "include-route-address", defaultValue: [])
+  List<String> get includeRouteAddress => _includeRouteAddress;
+
+  set includeRouteAddress(List<String> value) {
+    if (!stringListEquality.equals(value, _includeRouteAddress)) {
+      _includeRouteAddress = value;
+      notifyListeners();
+    }
+  }
+
+  @JsonKey(name: "route-mode", defaultValue: RouteMode.config)
+  RouteMode get routeMode => _routeMode;
+
+  set routeMode(RouteMode value) {
+    if (value != _routeMode) {
+      _routeMode = value;
+      notifyListeners();
+    }
+  }
+
   update([ClashConfig? clashConfig]) {
     if (clashConfig != null) {
       _mixedPort = clashConfig._mixedPort;
@@ -360,10 +476,34 @@ class ClashConfig extends ChangeNotifier {
       _geodataLoader = clashConfig._geodataLoader;
       _dns = clashConfig._dns;
       _rules = clashConfig._rules;
+      _routeMode = clashConfig._routeMode;
+      _includeRouteAddress = clashConfig._includeRouteAddress;
     }
     notifyListeners();
   }
 
+  ClashConfig copyWith() {
+    return ClashConfig()
+      ..mixedPort = _mixedPort
+      ..mode = _mode
+      ..ipv6 = _ipv6
+      ..findProcessMode = _findProcessMode
+      ..allowLan = _allowLan
+      ..tcpConcurrent = _tcpConcurrent
+      ..logLevel = _logLevel
+      ..tun = tun
+      ..unifiedDelay = _unifiedDelay
+      ..geodataLoader = _geodataLoader
+      ..externalController = _externalController
+      ..keepAliveInterval = _keepAliveInterval
+      ..dns = _dns
+      ..geoXUrl = _geoXUrl
+      ..routeMode = _routeMode
+      ..includeRouteAddress = _includeRouteAddress
+      ..rules = _rules
+      ..hosts = _hosts;
+  }
+
   Map<String, dynamic> toJson() {
     return _$ClashConfigToJson(this);
   }
@@ -371,4 +511,9 @@ class ClashConfig extends ChangeNotifier {
   factory ClashConfig.fromJson(Map<String, dynamic> json) {
     return _$ClashConfigFromJson(json);
   }
+
+  @override
+  String toString() {
+    return 'ClashConfig{_mixedPort: $_mixedPort, _allowLan: $_allowLan, _ipv6: $_ipv6, _geodataLoader: $_geodataLoader, _logLevel: $_logLevel, _externalController: $_externalController, _mode: $_mode, _findProcessMode: $_findProcessMode, _keepAliveInterval: $_keepAliveInterval, _unifiedDelay: $_unifiedDelay, _tcpConcurrent: $_tcpConcurrent, _tun: $_tun, _dns: $_dns, _geoXUrl: $_geoXUrl, _rules: $_rules, _globalRealUa: $_globalRealUa, _hosts: $_hosts}';
+  }
 }

lib/models/common.dart

@@ -431,7 +431,6 @@ class HotKeyAction with _$HotKeyAction {
       _$HotKeyActionFromJson(json);
 }
 
-
 typedef Validator = String? Function(String? value);
 
 @freezed
@@ -441,4 +440,4 @@ class Field with _$Field {
     required String value,
     Validator? validator,
   }) = _Field;
-}
+}

lib/models/config.dart

@@ -1,4 +1,5 @@
 import 'dart:io';
+
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
@@ -6,11 +7,12 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 
 import 'models.dart';
 
+part 'generated/config.freezed.dart';
 part 'generated/config.g.dart';
 
-part 'generated/config.freezed.dart';
-
-const defaultAppSetting = AppSetting();
+final defaultAppSetting = const AppSetting().copyWith(
+  isAnimateToPage: system.isDesktop ? false : true,
+);
 
 @freezed
 class AppSetting with _$AppSetting {
@@ -18,7 +20,6 @@ class AppSetting with _$AppSetting {
     String? locale,
     @Default(false) bool onlyProxy,
     @Default(false) bool autoLaunch,
-    @Default(false) bool adminAutoLaunch,
     @Default(false) bool silentLaunch,
     @Default(false) bool autoRun,
     @Default(false) bool openLogs,
@@ -39,7 +40,7 @@ class AppSetting with _$AppSetting {
     final appSetting =
         json == null ? defaultAppSetting : AppSetting.fromJson(json);
     return appSetting.copyWith(
-      isAnimateToPage: system.isDesktop ? false : true,
+      isAnimateToPage: system.isDesktop ? false : appSetting.isAnimateToPage,
     );
   }
 }
@@ -68,7 +69,7 @@ extension AccessControlExt on AccessControl {
 @freezed
 class WindowProps with _$WindowProps {
   const factory WindowProps({
-    @Default(1000) double width,
+    @Default(900) double width,
     @Default(600) double height,
     double? top,
     double? left,
@@ -107,7 +108,6 @@ class VpnProps with _$VpnProps {
     @Default(true) bool systemProxy,
     @Default(false) bool ipv6,
     @Default(true) bool allowBypass,
-    @Default(defaultBypassDomain) List<String> bypassDomain,
   }) = _VpnProps;
 
   factory VpnProps.fromJson(Map<String, Object?>? json) =>
@@ -115,13 +115,14 @@ class VpnProps with _$VpnProps {
 }
 
 @freezed
-class DesktopProps with _$DesktopProps {
-  const factory DesktopProps({
+class NetworkProps with _$NetworkProps {
+  const factory NetworkProps({
     @Default(true) bool systemProxy,
-  }) = _DesktopProps;
+    @Default(defaultBypassDomain) List<String> bypassDomain,
+  }) = _NetworkProps;
 
-  factory DesktopProps.fromJson(Map<String, Object?>? json) =>
-      json == null ? const DesktopProps() : _$DesktopPropsFromJson(json);
+  factory NetworkProps.fromJson(Map<String, Object?>? json) =>
+      json == null ? const NetworkProps() : _$NetworkPropsFromJson(json);
 }
 
 const defaultProxiesStyle = ProxiesStyle();
@@ -141,40 +142,67 @@ class ProxiesStyle with _$ProxiesStyle {
       json == null ? defaultProxiesStyle : _$ProxiesStyleFromJson(json);
 }
 
-const defaultCustomFontSizeScale = 1.0;
+final defaultThemeProps = Platform.isWindows
+    ? const ThemeProps().copyWith(
+        fontFamily: FontFamily.miSans,
+        primaryColor: defaultPrimaryColor.value,
+      )
+    : const ThemeProps().copyWith(
+        primaryColor: defaultPrimaryColor.value,
+      );
+
+@freezed
+class ThemeProps with _$ThemeProps {
+  const factory ThemeProps({
+    int? primaryColor,
+    @Default(ThemeMode.system) ThemeMode themeMode,
+    @Default(false) bool prueBlack,
+    @Default(FontFamily.system) FontFamily fontFamily,
+  }) = _ThemeProps;
+
+  factory ThemeProps.fromJson(Map<String, Object?> json) =>
+      _$ThemePropsFromJson(json);
+
+  factory ThemeProps.realFromJson(Map<String, Object?>? json) {
+    if (json == null) {
+      return defaultThemeProps;
+    }
+    try {
+      return ThemeProps.fromJson(json);
+    } catch (_) {
+      return defaultThemeProps;
+    }
+  }
+}
 
 @JsonSerializable()
 class Config extends ChangeNotifier {
   AppSetting _appSetting;
   List<Profile> _profiles;
   String? _currentProfileId;
-  ThemeMode _themeMode;
-  int? _primaryColor;
   bool _isAccessControl;
   AccessControl _accessControl;
   DAV? _dav;
   WindowProps _windowProps;
-  bool _prueBlack;
+  ThemeProps _themeProps;
   VpnProps _vpnProps;
-  DesktopProps _desktopProps;
+  NetworkProps _networkProps;
   bool _overrideDns;
   List<HotKeyAction> _hotKeyActions;
   ProxiesStyle _proxiesStyle;
 
   Config()
       : _profiles = [],
-        _themeMode = ThemeMode.system,
-        _primaryColor = defaultPrimaryColor.value,
         _isAccessControl = false,
         _accessControl = const AccessControl(),
         _windowProps = const WindowProps(),
-        _prueBlack = false,
         _vpnProps = defaultVpnProps,
-        _desktopProps = const DesktopProps(),
+        _networkProps = const NetworkProps(),
         _overrideDns = false,
         _appSetting = defaultAppSetting,
         _hotKeyActions = [],
-        _proxiesStyle = defaultProxiesStyle;
+        _proxiesStyle = defaultProxiesStyle,
+        _themeProps = defaultThemeProps;
 
   @JsonKey(fromJson: AppSetting.realFromJson)
   AppSetting get appSetting => _appSetting;
@@ -305,25 +333,6 @@ class Config extends ChangeNotifier {
     }
   }
 
-  @JsonKey(defaultValue: ThemeMode.system)
-  ThemeMode get themeMode => _themeMode;
-
-  set themeMode(ThemeMode value) {
-    if (_themeMode != value) {
-      _themeMode = value;
-      notifyListeners();
-    }
-  }
-
-  int? get primaryColor => _primaryColor;
-
-  set primaryColor(int? value) {
-    if (_primaryColor != value) {
-      _primaryColor = value;
-      notifyListeners();
-    }
-  }
-
   @JsonKey(defaultValue: false)
   bool get isAccessControl {
     if (!Platform.isAndroid) return false;
@@ -355,18 +364,6 @@ class Config extends ChangeNotifier {
     }
   }
 
-  @JsonKey(defaultValue: false)
-  bool get prueBlack {
-    return _prueBlack;
-  }
-
-  set prueBlack(bool value) {
-    if (_prueBlack != value) {
-      _prueBlack = value;
-      notifyListeners();
-    }
-  }
-
   WindowProps get windowProps => _windowProps;
 
   set windowProps(WindowProps value) {
@@ -385,11 +382,11 @@ class Config extends ChangeNotifier {
     }
   }
 
-  DesktopProps get desktopProps => _desktopProps;
+  NetworkProps get networkProps => _networkProps;
 
-  set desktopProps(DesktopProps value) {
-    if (_desktopProps != value) {
-      _desktopProps = value;
+  set networkProps(NetworkProps value) {
+    if (_networkProps != value) {
+      _networkProps = value;
       notifyListeners();
     }
   }
@@ -427,6 +424,16 @@ class Config extends ChangeNotifier {
     }
   }
 
+  @JsonKey(fromJson: ThemeProps.realFromJson)
+  ThemeProps get themeProps => _themeProps;
+
+  set themeProps(ThemeProps value) {
+    if (_themeProps != value) {
+      _themeProps = value;
+      notifyListeners();
+    }
+  }
+
   updateOrAddHotKeyAction(HotKeyAction hotKeyAction) {
     final index =
         _hotKeyActions.indexWhere((item) => item.action == hotKeyAction.action);
@@ -455,16 +462,14 @@ class Config extends ChangeNotifier {
       _appSetting = config._appSetting;
       _currentProfileId = config._currentProfileId;
       _dav = config._dav;
-      _themeMode = config._themeMode;
-      _primaryColor = config._primaryColor;
       _isAccessControl = config._isAccessControl;
       _accessControl = config._accessControl;
-      _prueBlack = config._prueBlack;
+      _themeProps = config._themeProps;
       _windowProps = config._windowProps;
       _proxiesStyle = config._proxiesStyle;
       _vpnProps = config._vpnProps;
       _overrideDns = config._overrideDns;
-      _desktopProps = config._desktopProps;
+      _networkProps = config._networkProps;
       _hotKeyActions = config._hotKeyActions;
     }
     notifyListeners();
@@ -477,4 +482,9 @@ class Config extends ChangeNotifier {
   factory Config.fromJson(Map<String, dynamic> json) {
     return _$ConfigFromJson(json);
   }
+
+  @override
+  String toString() {
+    return 'Config{_appSetting: $_appSetting, _profiles: $_profiles, _currentProfileId: $_currentProfileId, _isAccessControl: $_isAccessControl, _accessControl: $_accessControl, _dav: $_dav, _windowProps: $_windowProps, _themeProps: $_themeProps, _vpnProps: $_vpnProps, _networkProps: $_networkProps, _overrideDns: $_overrideDns, _hotKeyActions: $_hotKeyActions, _proxiesStyle: $_proxiesStyle}';
+  }
 }