Add android shortcuts

Fix init params issues

Fix dynamic color issues

Optimize navigator animate

Optimize window init

Optimize fab

Optimize save

.github/release_template.md

@@ -31,10 +31,9 @@
             </td>
         </tr>
         <tr>
-            <td>macOS</td>
+            <td>macOS (v10.15+)</td>
             <td>
-                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-macos-arm64.dmg"><img src="https://img.shields.io/badge/DMG-Apple%20Silicon-%23000000.svg?logo=apple"></a><br>
-                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-macos-amd64.dmg"><img src="https://img.shields.io/badge/DMG-Intel%20X64-%2300A9E0.svg?logo=apple"></a><br>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-macos-amd64.dmg"><img src="https://img.shields.io/badge/DMG-Universal-ea005e.svg?logo=apple"></a><br>
             </td>
         </tr>
         <tr>

.github/workflows/build.yaml

@@ -27,6 +27,25 @@ 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:
@@ -84,69 +103,6 @@ jobs:
           path: ./dist
           overwrite: true
 
-  changelog:
-    runs-on: ubuntu-latest
-    needs: [ build ]
-    steps:
-      - name: Checkout
-        if: ${{ !contains(github.ref, '+') }}
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ref: refs/heads/main
-
-      - name: Generate
-        if: ${{ !contains(github.ref, '+') }}
-        run: |
-          tags=($(git tag --merged $(git rev-parse HEAD) --sort=-creatordate))
-          preTag=$(grep -oP '^## \K.*' CHANGELOG.md | head -n 1)
-          currentTag=""
-          for ((i = 0; i <= ${#tags[@]}; i++)); do
-            if (( i < ${#tags[@]} )); then
-              tag=${tags[$i]}
-            else
-              tag=""
-            fi
-            if [ -n "$currentTag" ]; then
-              if [ "$(echo -e "$currentTag\n$preTag" | sort -V | head -n 1)" == "$currentTag" ]; then
-                break
-              fi
-            fi
-            if [ -n "$currentTag" ]; then
-              echo "## $currentTag" >> NEW_CHANGELOG.md
-              echo "" >> NEW_CHANGELOG.md
-              if [ -n "$tag" ]; then
-                git log --pretty=format:"%B" "$tag..$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
-              else
-                git log --pretty=format:"%B" "$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
-              fi
-              echo "" >> NEW_CHANGELOG.md
-            fi
-            currentTag=$tag
-          done
-          cat CHANGELOG.md >> NEW_CHANGELOG.md
-          cat NEW_CHANGELOG.md > CHANGELOG.md
-
-      - name: Commit
-        if: ${{ !contains(github.ref, '+') }}
-        run: |
-          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 }}
 
   upload:
     permissions: write-all
@@ -241,5 +197,4 @@ jobs:
           user-email: 'github-actions[bot]@users.noreply.github.com'
           target-branch: action-pr
           commit-message: Update from ${{ github.ref_name }}
-          target-directory: /tmp/
-
+          target-directory: /tmp/

.github/workflows/change.yaml

@@ -0,0 +1,45 @@
+name: change
+
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  changelog:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - 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
+            fi
+            previous=$tag
+          done
+
+      - 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 push
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -5,11 +5,9 @@
 *.swp
 .DS_Store
 .atom/
-.build/
 .buildlog/
 .history
 .svn/
-.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related

CHANGELOG.md

@@ -1,88 +1,4 @@
-## v0.8.70
-
-- Support better window position memory
-
-- Add windows arm64 and linux arm64 build script
-
-- Optimize some details
-
-## v0.8.69
-
-- Remake desktop
-
-- Optimize change proxy
-
-- Optimize network check
-
-- Fix fallback issues
-
-- Optimize lots of details
-
-- Update change.yaml
-
-- Fix android tile issues
-
-- Fix windows tray issues
-
-- Support setting bypassDomain
-
-- Update flutter version
-
-- Fix android service issues
-
-- Fix macos dock exit button issues
-
-- Add route address setting
-
-- Optimize provider view
-
-- Update changelog
-
-- Update CHANGELOG.md
-
-## 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
+## v0.8.63
 
 - Fix windows admin auto launch issues
 
@@ -94,6 +10,8 @@
 
 - Fix some issues
 
+## v0.8.62
+
 - Optimize ip detection
 
 - Support android vpn ipv6 inbound switch
@@ -110,6 +28,12 @@
 
 - Update readme
 
+- Update README.md 2
+
+- Update README.md 2
+
+- Update README.md
+
 ## v0.8.60
 
 - Fix build error2
@@ -537,8 +461,7 @@
 
 ## 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
 
@@ -703,4 +626,5 @@
 
 - update mobile_scanner
 
-- Initial commit
+- Initial commit
+

README.md

@@ -34,29 +34,6 @@ on Mobile:
 
 ✨ Support subscription link, Dark mode
 
-## Use
-
-### Linux
-
-⚠️ Make sure to install the following dependencies before using them
-
-   ```bash
-    sudo apt-get install appindicator3-0.1 libappindicator3-dev
-    sudo apt-get install keybinder-3.0
-   ```
-
-### Android
-
-Support the following actions
-
-   ```bash
-    com.follow.clash.action.START
-    
-    com.follow.clash.action.STOP
-    
-    com.follow.clash.action.CHANGE
-   ```
-
 ## Download
 
 <a href="https://chen08209.github.io/FlClash-fdroid-repo/repo?fingerprint=789D6D32668712EF7672F9E58DEEB15FBD6DCEEC5AE7A4371EA72F2AAE8A12FD"><img alt="Get it on F-Droid" src="snapshots/get-it-on-fdroid.svg" width="200px"/></a> <a href="https://github.com/chen08209/FlClash/releases"><img alt="Get it on GitHub" src="snapshots/get-it-on-github.svg" width="200px"/></a>
@@ -93,7 +70,7 @@ Support the following actions
         3. Run build script
 
            ```bash
-           dart .\setup.dart windows --arch <arm64 | amd64>
+           dart .\setup.dart	
            ```
 
     - linux
@@ -103,7 +80,7 @@ Support the following actions
         2. Run build script
 
            ```bash
-           dart .\setup.dart linux --arch <arm64 | amd64>
+           dart .\setup.dart	
            ```
 
     - macOS
@@ -113,7 +90,7 @@ Support the following actions
         2. Run build script
 
            ```bash
-           dart .\setup.dart macos --arch <arm64 | amd64>
+           dart .\setup.dart	
            ```
 
 ## Star

README_zh_CN.md

@@ -10,6 +10,7 @@
 
 [![Channel](https://img.shields.io/badge/Telegram-Channel-blue?style=flat-square&logo=telegram)](https://t.me/FlClash)
 
+
 基于ClashMeta的多平台代理客户端，简单易用，开源无广告。
 
 on Desktop:
@@ -34,29 +35,6 @@ on Mobile:
 
 ✨ 支持一键导入订阅, 深色模式
 
-## Use
-
-### Linux
-
-⚠️ 使用前请确保安装以下依赖
-
-   ```bash
-    sudo apt-get install appindicator3-0.1 libappindicator3-dev
-    sudo apt-get install keybinder-3.0
-   ```
-
-### Android
-
-支持下列操作
-
-   ```bash
-    com.follow.clash.action.START
-    
-    com.follow.clash.action.STOP
-    
-    com.follow.clash.action.CHANGE
-   ```
-
 ## Download
 
 <a href="https://chen08209.github.io/FlClash-fdroid-repo/repo?fingerprint=789D6D32668712EF7672F9E58DEEB15FBD6DCEEC5AE7A4371EA72F2AAE8A12FD"><img alt="Get it on F-Droid" src="snapshots/get-it-on-fdroid.svg" width="200px"/></a> <a href="https://github.com/chen08209/FlClash/releases"><img alt="Get it on GitHub" src="snapshots/get-it-on-github.svg" width="200px"/></a>
@@ -93,7 +71,7 @@ on Mobile:
         3. 运行构建脚本
 
            ```bash
-           dart .\setup.dart windows --arch <arm64 | amd64>
+           dart .\setup.dart	
            ```
 
     - linux
@@ -103,7 +81,7 @@ on Mobile:
         2. 运行构建脚本
 
            ```bash
-           dart .\setup.dart linux --arch <arm64 | amd64>
+           dart .\setup.dart	
            ```
 
     - macOS
@@ -113,7 +91,7 @@ on Mobile:
         2. 运行构建脚本
 
            ```bash
-           dart .\setup.dart macos --arch <arm64 | amd64>
+             dart .\setup.dart	
            ```
 
 ## Star History

android/app/src/main/AndroidManifest.xml

@@ -72,10 +72,6 @@
             android:name=".TempActivity"
             android:exported="true"
             android:theme="@style/TransparentTheme">
-            <intent-filter>
-                <category android:name="android.intent.category.DEFAULT" />
-                <action android:name="${applicationId}.action.START" />
-            </intent-filter>
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
                 <action android:name="${applicationId}.action.STOP" />
@@ -92,8 +88,7 @@
             android:foregroundServiceType="specialUse"
             android:icon="@drawable/ic_stat_name"
             android:label="FlClash"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            tools:targetApi="n">
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>

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

@@ -20,6 +20,8 @@ enum class RunState {
 
 
 object GlobalState {
+
+    private val lock = ReentrantLock()
     val runLock = ReentrantLock()
 
     val runState: MutableLiveData<RunState> = MutableLiveData<RunState>(RunState.STOP)
@@ -45,46 +47,35 @@ object GlobalState {
     }
 
     fun handleToggle(context: Context) {
-        val starting = handleStart(context)
-        if (!starting) {
-            handleStop()
-        }
-    }
-
-    fun handleStart(context: Context): Boolean {
         if (runState.value == RunState.STOP) {
             runState.value = RunState.PENDING
-            runLock.lock()
             val tilePlugin = getCurrentTilePlugin()
             if (tilePlugin != null) {
                 tilePlugin.handleStart()
             } else {
                 initServiceEngine(context)
             }
-            return true
+        } else {
+            handleStop()
         }
-        return false
     }
 
     fun handleStop() {
         if (runState.value == RunState.START) {
             runState.value = RunState.PENDING
-            runLock.lock()
             getCurrentTilePlugin()?.handleStop()
         }
     }
 
     fun destroyServiceEngine() {
-        runLock.withLock {
-            serviceEngine?.destroy()
-            serviceEngine = null
-        }
+        serviceEngine?.destroy()
+        serviceEngine = null
     }
 
     fun initServiceEngine(context: Context) {
         if (serviceEngine != null) return
-        destroyServiceEngine()
-        runLock.withLock {
+        lock.withLock {
+            destroyServiceEngine()
             serviceEngine = FlutterEngine(context)
             serviceEngine?.plugins?.add(VpnPlugin())
             serviceEngine?.plugins?.add(AppPlugin())

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

@@ -8,10 +8,6 @@ class TempActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         when (intent.action) {
-            wrapAction("START") -> {
-                GlobalState.handleStart(applicationContext)
-            }
-
             wrapAction("STOP") -> {
                 GlobalState.handleStop()
             }

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

@@ -15,7 +15,6 @@ 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
@@ -23,7 +22,6 @@ import java.io.ByteArrayOutputStream
 import java.net.Inet4Address
 import java.net.Inet6Address
 import java.net.InetAddress
-import java.util.concurrent.locks.ReentrantLock
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
@@ -44,40 +42,6 @@ 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) {
@@ -115,7 +79,7 @@ fun InetAddress.asSocketAddressText(port: Int): String {
     }
 }
 
-fun Context.wrapAction(action: String): String {
+fun Context.wrapAction(action: String):String{
     return "${this.packageName}.action.$action"
 }
 
@@ -180,19 +144,4 @@ suspend fun <T> MethodChannel.awaitResult(
             }
         })
     }
-}
-
-fun ReentrantLock.safeLock() {
-    if (this.isLocked) {
-        return
-    }
-    this.lock()
-}
-
-fun ReentrantLock.safeUnlock() {
-    if (!this.isLocked) {
-        return
-    }
-
-    this.unlock()
 }

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

@@ -3,7 +3,8 @@ package com.follow.clash.models
 import java.net.InetAddress
 
 enum class AccessControlMode {
-    acceptSelected, rejectSelected,
+    acceptSelected,
+    rejectSelected,
 }
 
 data class AccessControl(
@@ -21,7 +22,6 @@ 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

@@ -46,6 +46,8 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
 
     private var activity: Activity? = null
 
+    private var toast: Toast? = null
+
     private lateinit var context: Context
 
     private lateinit var channel: MethodChannel

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

@@ -16,8 +16,6 @@ import com.follow.clash.GlobalState
 import com.follow.clash.RunState
 import com.follow.clash.extensions.getProtocol
 import com.follow.clash.extensions.resolveDns
-import com.follow.clash.models.Process
-import com.follow.clash.models.VpnOptions
 import com.follow.clash.services.FlClashService
 import com.follow.clash.services.FlClashVpnService
 import com.google.gson.Gson
@@ -30,6 +28,8 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.net.InetSocketAddress
 import kotlin.concurrent.withLock
+import com.follow.clash.models.Process
+import com.follow.clash.models.VpnOptions
 
 
 class VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
@@ -111,9 +111,11 @@ class VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
 
             "resolverProcess" -> {
                 val data = call.argument<String>("data")
-                val process = if (data != null) Gson().fromJson(
-                    data, Process::class.java
-                ) else null
+                val process =
+                    if (data != null) Gson().fromJson(
+                        data,
+                        Process::class.java
+                    ) else null
                 val metadata = process?.metadata
                 if (metadata == null) {
                     result.success(null)
@@ -171,7 +173,9 @@ class VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
     fun onUpdateNetwork() {
         val dns = networks.flatMap { network ->
             connectivity?.resolveDns(network) ?: emptyList()
-        }.toSet().joinToString(",")
+        }
+            .toSet()
+            .joinToString(",")
         scope.launch {
             withContext(Dispatchers.Main) {
                 flutterMethodChannel.invokeMethod("dnsChanged", dns)
@@ -235,7 +239,8 @@ class VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
             GlobalState.runState.value = RunState.START
             val fd = flClashService?.start(options)
             flutterMethodChannel.invokeMethod(
-                "started", fd
+                "started",
+                fd
             )
         }
     }

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

@@ -17,9 +17,6 @@ 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 {
@@ -72,7 +69,7 @@ class FlClashService : Service(), BaseServiceInterface {
             addAction(
                 0,
                 GlobalState.getText("stop"),
-                getActionPendingIntent("STOP")
+                getActionPendingIntent("CHANGE")
             )
             setOngoing(true)
             setShowWhen(false)
@@ -92,23 +89,21 @@ class FlClashService : Service(), BaseServiceInterface {
 
     @SuppressLint("ForegroundServiceType", "WrongConstant")
     override fun startForeground(title: String, content: String) {
-        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)
+        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)
+        }
     }
 }

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

@@ -15,21 +15,20 @@ 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
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 
 
 class FlClashVpnService : VpnService(), BaseServiceInterface {
@@ -43,28 +42,12 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
             if (options.ipv4Address.isNotEmpty()) {
                 val cidr = options.ipv4Address.toCIDR()
                 addAddress(cidr.address, cidr.prefixLength)
-                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)
-                }
+                addRoute("0.0.0.0", 0)
             }
             if (options.ipv6Address.isNotEmpty()) {
                 val cidr = options.ipv6Address.toCIDR()
                 addAddress(cidr.address, cidr.prefixLength)
-                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)
-                }
+                addRoute("::", 0)
             }
             addDnsServer(options.dnsServerAddress)
             setMtu(9000)

core/action.go

@@ -1,32 +0,0 @@
-//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,10 +1,23 @@
 package main
 
+import "C"
 import (
 	"context"
-	"encoding/json"
+	"core/state"
 	"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"
@@ -14,28 +27,52 @@ 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/route"
+	"github.com/metacubex/mihomo/hub/executor"
 	"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"
 )
 
-var (
-	isRunning = false
-	runLock   sync.Mutex
-	ips       = []string{"ipwho.is", "ifconfig.me", "icanhazip.com", "api.ip.sb", "ipinfo.io"}
-	b, _      = batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](50))
-)
+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"`
+}
 
 type ExternalProviders []ExternalProvider
 
@@ -43,9 +80,30 @@ func (a ExternalProviders) Len() int           { return len(a) }
 func (a ExternalProviders) Less(i, j int) bool { return a[i].Name < a[j].Name }
 func (a ExternalProviders) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
 
-func (message *Message) Json() (string, error) {
-	data, err := json.Marshal(message)
-	return string(data), err
+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 readFile(path string) ([]byte, error) {
@@ -60,6 +118,19 @@ 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")
 }
@@ -127,13 +198,12 @@ 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(),
-			UpdateAt:         psp.UpdatedAt(),
-			Path:             psp.Vehicle().Path(),
-			SubscriptionInfo: psp.GetSubscriptionInfo(),
+			Name:        psp.Name(),
+			Type:        psp.Type().String(),
+			VehicleType: psp.VehicleType().String(),
+			Count:       psp.Count(),
+			Path:        psp.Vehicle().Path(),
+			UpdateAt:    psp.UpdatedAt(),
 		}, nil
 	case *rp.RuleSetProvider:
 		rsp := p.(*rp.RuleSetProvider)
@@ -142,8 +212,8 @@ func toExternalProvider(p cp.Provider) (*ExternalProvider, error) {
 			Type:        rsp.Type().String(),
 			VehicleType: rsp.VehicleType().String(),
 			Count:       rsp.Count(),
-			UpdateAt:    rsp.UpdatedAt(),
 			Path:        rsp.Vehicle().Path(),
+			UpdateAt:    rsp.UpdatedAt(),
 		}, nil
 	default:
 		return nil, errors.New("not external provider")
@@ -177,6 +247,152 @@ 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
@@ -190,6 +406,8 @@ 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 {
@@ -251,13 +469,20 @@ 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() {
+func patchConfig(general *config.General, controller *config.Controller, tls *config.TLS) {
 	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)
@@ -284,15 +509,17 @@ func patchConfig() {
 	})
 }
 
-func updateListeners(force bool) {
+var isRunning = false
+
+var runLock sync.Mutex
+
+func updateListeners(general *config.General, listeners map[string]constant.InboundListener) {
 	if !isRunning {
 		return
 	}
-	general := currentConfig.General
-	listeners := currentConfig.Listeners
-	if force == true {
-		stopListeners()
-	}
+	runLock.Lock()
+	defer runLock.Unlock()
+	stopListeners()
 	listener.PatchInboundListeners(listeners, tunnel.Tunnel, true)
 	listener.SetAllowLan(general.AllowLan)
 	inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
@@ -341,22 +568,20 @@ func patchSelectGroup() {
 	}
 }
 
-func applyConfig(rawConfig *config.RawConfig) error {
-	runLock.Lock()
-	defer runLock.Unlock()
-	var err error
-	currentConfig, err = config.ParseRawConfig(rawConfig)
+func applyConfig() error {
+	cfg, err := config.ParseRawConfig(state.CurrentRawConfig)
 	if err != nil {
-		currentConfig, _ = config.ParseRawConfig(config.DefaultRawConfig())
+		cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
 	}
 	if configParams.IsPatch {
-		patchConfig()
+		patchConfig(cfg.General, cfg.Controller, cfg.TLS)
 	} else {
-		handleCloseConnectionsUnLock()
+		closeConnections()
 		runtime.GC()
-		hub.ApplyConfig(currentConfig)
+		hub.ApplyConfig(cfg)
 		patchSelectGroup()
 	}
-	updateListeners(false)
+	updateListeners(cfg.General, cfg.Listeners)
+	externalProviders = getExternalProvidersRaw()
 	return err
 }

core/constant.go

@@ -1,112 +0,0 @@
-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"
-	getCountryCodeMethod           Method = "getCountryCode"
-	getMemoryMethod                Method = "getMemory"
-	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,5 +1,3 @@
-//go:build cgo
-
 package dart_bridge
 
 /*

core/dart-bridge/lib_common.go

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

core/dns.go

@@ -0,0 +1,20 @@
+//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
+go 1.21.0
 
 replace github.com/metacubex/mihomo => ./Clash.Meta
 

core/hub.go

@@ -1,74 +1,82 @@
 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/common/observable"
-	"github.com/metacubex/mihomo/common/utils"
-	"github.com/metacubex/mihomo/component/mmdb"
+	"github.com/metacubex/mihomo/adapter/provider"
 	"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"
-	"net"
-	"runtime"
-	"sort"
-	"strconv"
-	"time"
 )
 
-var (
-	isInit            = false
-	configParams      = ConfigExtendedParams{}
-	externalProviders = map[string]cp.Provider{}
-	logSubscriber     observable.Subscription[log.Event]
-	currentConfig     *config.Config
-)
+var configParams = ConfigExtendedParams{}
 
-func handleInitClash(homeDirStr string) bool {
+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 {
 	if !isInit {
-		constant.SetHomeDir(homeDirStr)
+		constant.SetHomeDir(C.GoString(homeDirStr))
 		isInit = true
 	}
 	return isInit
 }
 
-func handleStartListener() bool {
-	runLock.Lock()
-	defer runLock.Unlock()
-	isRunning = true
-	updateListeners(true)
-	return true
-}
-
-func handleStopListener() bool {
-	runLock.Lock()
-	defer runLock.Unlock()
-	isRunning = false
-	listener.StopListener()
-	return true
-}
-
-func handleGetIsInit() bool {
+//export getIsInit
+func getIsInit() bool {
 	return isInit
 }
 
-func handleForceGc() {
-	go func() {
-		log.Infoln("[APP] request force GC")
-		runtime.GC()
-	}()
+//export restartClash
+func restartClash() bool {
+	execPath, _ := os.Executable()
+	go restartExecutable(execPath)
+	return true
 }
 
-func handleShutdown() bool {
+//export shutdownClash
+func shutdownClash() bool {
 	stopListeners()
 	executor.Shutdown()
 	runtime.GC()
@@ -76,81 +84,106 @@ func handleShutdown() bool {
 	return true
 }
 
-func handleValidateConfig(bytes []byte) string {
-	_, err := config.UnmarshalRawConfig(bytes)
-	if err != nil {
-		return err.Error()
-	}
-	return ""
-}
-
-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 ""
-}
-
-func handleGetProxies() string {
-	runLock.Lock()
-	defer runLock.Unlock()
-	data, err := json.Marshal(tunnel.ProxiesWithProviders())
-	if err != nil {
-		return ""
-	}
-	return string(data)
-}
-
-func handleChangeProxy(data string, fn func(string string)) {
-	runLock.Lock()
+//export forceGc
+func forceGc() {
 	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
+		log.Infoln("[APP] request force GC")
+		runtime.GC()
 	}()
 }
 
-func handleGetTraffic(onlyProxy bool) string {
-	up, down := statistic.DefaultManager.Current(onlyProxy)
+//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, "")
+	}()
+}
+
+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 {
+	data, err := json.Marshal(tunnel.ProxiesWithProviders())
+	if err != nil {
+		return C.CString("")
+	}
+	return C.CString(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 {
+		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)
 	traffic := map[string]int64{
 		"up":   up,
 		"down": down,
@@ -158,13 +191,14 @@ func handleGetTraffic(onlyProxy bool) string {
 	data, err := json.Marshal(traffic)
 	if err != nil {
 		fmt.Println("Error:", err)
-		return ""
+		return C.CString("")
 	}
-	return string(data)
+	return C.CString(string(data))
 }
 
-func handleGetTotalTraffic(onlyProxy bool) string {
-	up, down := statistic.DefaultManager.Total(onlyProxy)
+//export getTotalTraffic
+func getTotalTraffic() *C.char {
+	up, down := statistic.DefaultManager.Total(state.CurrentState.OnlyProxy)
 	traffic := map[string]int64{
 		"up":   up,
 		"down": down,
@@ -172,27 +206,31 @@ func handleGetTotalTraffic(onlyProxy bool) string {
 	data, err := json.Marshal(traffic)
 	if err != nil {
 		fmt.Println("Error:", err)
-		return ""
+		return C.CString("")
 	}
-	return string(data)
+	return C.CString(string(data))
 }
 
-func handleResetTraffic() {
+//export resetTraffic
+func resetTraffic() {
 	statistic.DefaultManager.ResetStatistic()
 }
 
-func handleAsyncTestDelay(paramsString string, fn func(string)) {
+//export asyncTestDelay
+func asyncTestDelay(s *C.char, port C.longlong) {
+	i := int64(port)
+	paramsString := C.GoString(s)
 	b.Go(paramsString, func() (bool, error) {
 		var params = &TestDelayParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
-			fn("")
+			bridge.SendToPort(i, "")
 			return false, nil
 		}
 
 		expectedStatus, err := utils.NewUnsignedRanges[uint16]("")
 		if err != nil {
-			fn("")
+			bridge.SendToPort(i, "")
 			return false, nil
 		}
 
@@ -209,7 +247,7 @@ func handleAsyncTestDelay(paramsString string, fn func(string)) {
 		if proxy == nil {
 			delayData.Value = -1
 			data, _ := json.Marshal(delayData)
-			fn(string(data))
+			bridge.SendToPort(i, string(data))
 			return false, nil
 		}
 
@@ -217,30 +255,44 @@ func handleAsyncTestDelay(paramsString string, fn func(string)) {
 		if err != nil || delay == 0 {
 			delayData.Value = -1
 			data, _ := json.Marshal(delayData)
-			fn(string(data))
+			bridge.SendToPort(i, string(data))
 			return false, nil
 		}
 
 		delayData.Value = int32(delay)
 		data, _ := json.Marshal(delayData)
-		fn(string(data))
+		bridge.SendToPort(i, string(data))
 		return false, nil
 	})
 }
 
-func handleGetConnections() string {
-	runLock.Lock()
-	defer runLock.Unlock()
+//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 {
 	snapshot := statistic.DefaultManager.Snapshot()
 	data, err := json.Marshal(snapshot)
 	if err != nil {
 		fmt.Println("Error:", err)
-		return ""
+		return C.CString("")
 	}
-	return string(data)
+	return C.CString(string(data))
 }
 
-func handleCloseConnectionsUnLock() bool {
+//export closeConnections
+func closeConnections() {
 	statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
 		err := c.Close()
 		if err != nil {
@@ -248,37 +300,43 @@ func handleCloseConnectionsUnLock() bool {
 		}
 		return true
 	})
-	return true
 }
 
-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()
+//export closeConnection
+func closeConnection(id *C.char) {
+	connectionId := C.GoString(id)
 	c := statistic.DefaultManager.Get(connectionId)
 	if c == nil {
-		return false
+		return
 	}
 	_ = c.Close()
-	return true
 }
 
-func handleGetExternalProviders() string {
-	runLock.Lock()
-	defer runLock.Unlock()
-	externalProviders = getExternalProvidersRaw()
+//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 {
 	eps := make([]ExternalProvider, 0)
 	for _, p := range externalProviders {
 		externalProvider, err := toExternalProvider(p)
@@ -290,144 +348,123 @@ func handleGetExternalProviders() string {
 	sort.Sort(ExternalProviders(eps))
 	data, err := json.Marshal(eps)
 	if err != nil {
-		return ""
+		return C.CString("")
 	}
-	return string(data)
+	return C.CString(string(data))
 }
 
-func handleGetExternalProvider(externalProviderName string) string {
-	runLock.Lock()
-	defer runLock.Unlock()
+//export getExternalProvider
+func getExternalProvider(name *C.char) *C.char {
+	externalProviderName := C.GoString(name)
 	externalProvider, exist := externalProviders[externalProviderName]
 	if !exist {
-		return ""
+		return C.CString("")
 	}
 	e, err := toExternalProvider(externalProvider)
 	if err != nil {
-		return ""
+		return C.CString("")
 	}
 	data, err := json.Marshal(e)
 	if err != nil {
-		return ""
+		return C.CString("")
 	}
-	return string(data)
+	return C.CString(string(data))
 }
 
-func handleUpdateGeoData(geoType string, geoName string, fn func(value string)) {
+//export updateGeoData
+func updateGeoData(geoType *C.char, geoName *C.char, port C.longlong) {
+	i := int64(port)
+	geoTypeString := C.GoString(geoType)
+	geoNameString := C.GoString(geoName)
 	go func() {
-		path := constant.Path.Resolve(geoName)
-		switch geoType {
+		path := constant.Path.Resolve(geoNameString)
+		switch geoTypeString {
 		case "MMDB":
 			err := updater.UpdateMMDBWithPath(path)
 			if err != nil {
-				fn(err.Error())
+				bridge.SendToPort(i, err.Error())
 				return
 			}
 		case "ASN":
 			err := updater.UpdateASNWithPath(path)
 			if err != nil {
-				fn(err.Error())
+				bridge.SendToPort(i, err.Error())
 				return
 			}
 		case "GeoIp":
 			err := updater.UpdateGeoIpWithPath(path)
 			if err != nil {
-				fn(err.Error())
+				bridge.SendToPort(i, err.Error())
 				return
 			}
 		case "GeoSite":
 			err := updater.UpdateGeoSiteWithPath(path)
 			if err != nil {
-				fn(err.Error())
+				bridge.SendToPort(i, err.Error())
 				return
 			}
 		}
-		fn("")
+		bridge.SendToPort(i, "")
 	}()
 }
 
-func handleUpdateExternalProvider(providerName string, fn func(value string)) {
+//export updateExternalProvider
+func updateExternalProvider(providerName *C.char, port C.longlong) {
+	i := int64(port)
+	providerNameString := C.GoString(providerName)
 	go func() {
-		externalProvider, exist := externalProviders[providerName]
+		externalProvider, exist := externalProviders[providerNameString]
 		if !exist {
-			fn("external provider is not exist")
+			bridge.SendToPort(i, "external provider is not exist")
 			return
 		}
 		err := externalProvider.Update()
 		if err != nil {
-			fn(err.Error())
+			bridge.SendToPort(i, err.Error())
 			return
 		}
-		fn("")
+		bridge.SendToPort(i, "")
 	}()
 }
 
-func handleSideLoadExternalProvider(providerName string, data []byte, fn func(value string)) {
+//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)
 	go func() {
-		runLock.Lock()
-		defer runLock.Unlock()
-		externalProvider, exist := externalProviders[providerName]
+		externalProvider, exist := externalProviders[providerNameString]
 		if !exist {
-			fn("external provider is not exist")
+			bridge.SendToPort(i, "external provider is not exist")
 			return
 		}
-		err := sideUpdateExternalProvider(externalProvider, data)
+		err := sideUpdateExternalProvider(externalProvider, bytes)
 		if err != nil {
-			fn(err.Error())
+			bridge.SendToPort(i, err.Error())
 			return
 		}
-		fn("")
+		bridge.SendToPort(i, "")
 	}()
 }
 
-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 initNativeApiBridge
+func initNativeApiBridge(api unsafe.Pointer) {
+	bridge.InitDartApi(api)
 }
 
-func handleStopLog() {
-	if logSubscriber != nil {
-		log.UnSubscribe(logSubscriber)
-		logSubscriber = nil
-	}
+//export initMessage
+func initMessage(port C.longlong) {
+	i := int64(port)
+	Port = i
 }
 
-func handleGetCountryCode(ip string, fn func(value string)) {
-	go func() {
-		runLock.Lock()
-		defer runLock.Unlock()
-		codes := mmdb.IPInstance().LookupCode(net.ParseIP(ip))
-		if len(codes) == 0 {
-			fn("")
-			return
-		}
-		fn(codes[0])
-	}()
-}
-
-func handleGetMemory(fn func(value string)) {
-	go func() {
-		fn(strconv.FormatUint(statistic.DefaultManager.Memory(), 10))
-	}()
+//export freeCString
+func freeCString(s *C.char) {
+	C.free(unsafe.Pointer(s))
 }
 
 func init() {
-	adapter.UrlTestHook = func(name string, delay uint16) {
+	provider.HealthcheckHook = func(name string, delay uint16) {
 		delayData := &Delay{
 			Name: name,
 		}

core/lib.go

@@ -1,199 +0,0 @@
-//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 getMemory
-func getMemory(port C.longlong) {
-	i := int64(port)
-	handleGetMemory(func(value string) {
-		bridge.SendToPort(i, value)
-	})
-}
-
-//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 getCountryCode
-func getCountryCode(ipChar *C.char, port C.longlong) {
-	ip := C.GoString(ipChar)
-	i := int64(port)
-	handleGetCountryCode(ip, 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

@@ -1,270 +0,0 @@
-//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

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

core/main_cgo.go

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

core/message.go

@@ -1,13 +1,77 @@
-//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
 	}
-	Action{
-		Method: messageMethod,
-	}.callback(s)
+	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/message_cgo.go

@@ -1,47 +0,0 @@
-//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 && cgo
+//go:build android
 
 package platform
 

core/process.go

@@ -0,0 +1,81 @@
+//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

@@ -1,173 +0,0 @@
-//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
-	case getCountryCodeMethod:
-		ip := action.Data.(string)
-		handleGetCountryCode(ip, func(value string) {
-			action.callback(value)
-		})
-		return
-	case getMemoryMethod:
-		handleGetMemory(func(value string) {
-			action.callback(value)
-		})
-		return
-	}
-
-}

core/state.go

@@ -0,0 +1,46 @@
+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,11 +1,13 @@
-//go:build android && cgo
-
 package state
 
+import "github.com/metacubex/mihomo/config"
+
 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"`
@@ -13,7 +15,6 @@ 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"`
@@ -31,7 +32,6 @@ 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,6 +39,7 @@ type AndroidVpnRawOptions struct {
 type State struct {
 	AndroidVpnRawOptions
 	CurrentProfileName string `json:"currentProfileName"`
+	OnlyProxy          bool   `json:"onlyProxy"`
 }
 
 var CurrentState = &State{}
@@ -52,5 +53,7 @@ func GetIpv6Address() string {
 }
 
 func GetDnsServerAddress() string {
+	//prefix, _ := netip.ParsePrefix(DefaultIpv4Address)
+	//return prefix.Addr().String()
 	return DefaultDnsAddress
 }

core/tun.go

@@ -0,0 +1,157 @@
+//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(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
+}

core/tun/tun.go

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

lib/application.dart

@@ -1,9 +1,8 @@
 import 'dart:async';
-
+import 'package:animations/animations.dart';
 import 'package:dynamic_color/dynamic_color.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/common/common.dart';
 import 'package:fl_clash/manager/hotkey_manager.dart';
 import 'package:fl_clash/manager/manager.dart';
 import 'package:fl_clash/plugins/app.dart';
@@ -20,7 +19,6 @@ runAppWithPreferences(
   Widget child, {
   required AppState appState,
   required Config config,
-  required AppFlowingState appFlowingState,
   required ClashConfig clashConfig,
 }) {
   runApp(MultiProvider(
@@ -32,7 +30,7 @@ runAppWithPreferences(
         create: (_) => config,
       ),
       ChangeNotifierProvider<AppFlowingState>(
-        create: (_) => appFlowingState,
+        create: (_) => AppFlowingState(),
       ),
       ChangeNotifierProxyProvider2<Config, ClashConfig, AppState>(
         create: (_) => appState,
@@ -58,15 +56,22 @@ class Application extends StatefulWidget {
 
 class ApplicationState extends State<Application> {
   late SystemColorSchemes systemColorSchemes;
-  Timer? _autoUpdateGroupTaskTimer;
-  Timer? _autoUpdateProfilesTaskTimer;
+  Timer? timer;
 
   final _pageTransitionsTheme = const PageTransitionsTheme(
     builders: <TargetPlatform, PageTransitionsBuilder>{
-      TargetPlatform.android: CommonPageTransitionsBuilder(),
-      TargetPlatform.windows: CommonPageTransitionsBuilder(),
-      TargetPlatform.linux: CommonPageTransitionsBuilder(),
-      TargetPlatform.macOS: CommonPageTransitionsBuilder(),
+      TargetPlatform.android: SharedAxisPageTransitionsBuilder(
+        transitionType: SharedAxisTransitionType.horizontal,
+      ),
+      TargetPlatform.windows: SharedAxisPageTransitionsBuilder(
+        transitionType: SharedAxisTransitionType.horizontal,
+      ),
+      TargetPlatform.linux: SharedAxisPageTransitionsBuilder(
+        transitionType: SharedAxisTransitionType.horizontal,
+      ),
+      TargetPlatform.macOS: SharedAxisPageTransitionsBuilder(
+        transitionType: SharedAxisTransitionType.horizontal,
+      ),
     },
   );
 
@@ -88,8 +93,7 @@ class ApplicationState extends State<Application> {
   @override
   void initState() {
     super.initState();
-    _autoUpdateGroupTask();
-    _autoUpdateProfilesTask();
+    _initTimer();
     globalState.appController = AppController(context);
     globalState.measure = Measure.of(context);
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
@@ -103,29 +107,29 @@ class ApplicationState extends State<Application> {
     });
   }
 
-  _autoUpdateGroupTask() {
-    _autoUpdateGroupTaskTimer = Timer(const Duration(milliseconds: 20000), () {
+  _initTimer() {
+    _cancelTimer();
+    timer = Timer.periodic(const Duration(milliseconds: 20000), (_) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        globalState.appController.updateGroupsDebounce();
-        _autoUpdateGroupTask();
+        globalState.appController.updateGroupDebounce();
       });
     });
   }
 
-  _autoUpdateProfilesTask() {
-    _autoUpdateProfilesTaskTimer = Timer(const Duration(seconds: 5), () async {
-      await globalState.appController.autoUpdateProfiles();
-      _autoUpdateProfilesTask();
-    });
+  _cancelTimer() {
+    if (timer != null) {
+      timer?.cancel();
+      timer = null;
+    }
   }
 
-  _buildPlatformWrap(Widget child) {
+  _buildApp(Widget app) {
     if (system.isDesktop) {
       return WindowManager(
         child: TrayManager(
           child: HotKeyManager(
             child: ProxyManager(
-              child: child,
+              child: app,
             ),
           ),
         ),
@@ -133,7 +137,7 @@ class ApplicationState extends State<Application> {
     }
     return AndroidManager(
       child: TileManager(
-        child: child,
+        child: app,
       ),
     );
   }
@@ -149,17 +153,6 @@ class ApplicationState extends State<Application> {
     );
   }
 
-  _buildWrap(Widget child) {
-    return AppStateManager(
-      child: ClashManager(
-        child: ConnectivityManager(
-          onConnectivityChanged: globalState.appController.updateLocalIp,
-          child: child,
-        ),
-      ),
-    );
-  }
-
   _updateSystemColorSchemes(
     ColorScheme? lightDynamic,
     ColorScheme? darkDynamic,
@@ -175,31 +168,31 @@ class ApplicationState extends State<Application> {
 
   @override
   Widget build(context) {
-    return _buildWrap(
-      _buildPlatformWrap(
-        Selector2<AppState, Config, ApplicationSelectorState>(
-          selector: (_, appState, config) => ApplicationSelectorState(
-            locale: config.appSetting.locale,
-            themeMode: config.themeProps.themeMode,
-            primaryColor: config.themeProps.primaryColor,
-            prueBlack: config.themeProps.prueBlack,
-            fontFamily: config.themeProps.fontFamily,
-          ),
-          builder: (_, state, child) {
-            return DynamicColorBuilder(
-              builder: (lightDynamic, darkDynamic) {
-                _updateSystemColorSchemes(lightDynamic, darkDynamic);
-                return MaterialApp(
-                  navigatorKey: globalState.navigatorKey,
-                  localizationsDelegates: const [
-                    AppLocalizations.delegate,
-                    GlobalMaterialLocalizations.delegate,
-                    GlobalCupertinoLocalizations.delegate,
-                    GlobalWidgetsLocalizations.delegate
-                  ],
-                  builder: (_, child) {
-                    return MessageManager(
-                      child: LayoutBuilder(
+    return _buildApp(
+      AppStateManager(
+        child: ClashManager(
+          child: Selector2<AppState, Config, ApplicationSelectorState>(
+            selector: (_, appState, config) => ApplicationSelectorState(
+              locale: config.appSetting.locale,
+              themeMode: config.themeProps.themeMode,
+              primaryColor: config.themeProps.primaryColor,
+              prueBlack: config.themeProps.prueBlack,
+              fontFamily: config.themeProps.fontFamily,
+            ),
+            builder: (_, state, child) {
+              return DynamicColorBuilder(
+                builder: (lightDynamic, darkDynamic) {
+                  _updateSystemColorSchemes(lightDynamic, darkDynamic);
+                  return MaterialApp(
+                    navigatorKey: globalState.navigatorKey,
+                    localizationsDelegates: const [
+                      AppLocalizations.delegate,
+                      GlobalMaterialLocalizations.delegate,
+                      GlobalCupertinoLocalizations.delegate,
+                      GlobalWidgetsLocalizations.delegate
+                    ],
+                    builder: (_, child) {
+                      return LayoutBuilder(
                         builder: (_, container) {
                           final appController = globalState.appController;
                           final maxWidth = container.maxWidth;
@@ -208,40 +201,41 @@ class ApplicationState extends State<Application> {
                           }
                           return _buildPage(child!);
                         },
+                      );
+                    },
+                    scrollBehavior: BaseScrollBehavior(),
+                    title: appName,
+                    locale: other.getLocaleForString(state.locale),
+                    supportedLocales:
+                        AppLocalizations.delegate.supportedLocales,
+                    themeMode: state.themeMode,
+                    theme: ThemeData(
+                      useMaterial3: true,
+                      fontFamily: state.fontFamily.value,
+                      pageTransitionsTheme: _pageTransitionsTheme,
+                      colorScheme: _getAppColorScheme(
+                        brightness: Brightness.light,
+                        systemColorSchemes: systemColorSchemes,
+                        primaryColor: state.primaryColor,
                       ),
-                    );
-                  },
-                  scrollBehavior: BaseScrollBehavior(),
-                  title: appName,
-                  locale: other.getLocaleForString(state.locale),
-                  supportedLocales: AppLocalizations.delegate.supportedLocales,
-                  themeMode: state.themeMode,
-                  theme: ThemeData(
-                    useMaterial3: true,
-                    fontFamily: state.fontFamily.value,
-                    pageTransitionsTheme: _pageTransitionsTheme,
-                    colorScheme: _getAppColorScheme(
-                      brightness: Brightness.light,
-                      systemColorSchemes: systemColorSchemes,
-                      primaryColor: state.primaryColor,
                     ),
-                  ),
-                  darkTheme: ThemeData(
-                    useMaterial3: true,
-                    fontFamily: state.fontFamily.value,
-                    pageTransitionsTheme: _pageTransitionsTheme,
-                    colorScheme: _getAppColorScheme(
-                      brightness: Brightness.dark,
-                      systemColorSchemes: systemColorSchemes,
-                      primaryColor: state.primaryColor,
-                    ).toPrueBlack(state.prueBlack),
-                  ),
-                  home: child,
-                );
-              },
-            );
-          },
-          child: const HomePage(),
+                    darkTheme: ThemeData(
+                      useMaterial3: true,
+                      fontFamily: state.fontFamily.value,
+                      pageTransitionsTheme: _pageTransitionsTheme,
+                      colorScheme: _getAppColorScheme(
+                        brightness: Brightness.dark,
+                        systemColorSchemes: systemColorSchemes,
+                        primaryColor: state.primaryColor,
+                      ).toPrueBlack(state.prueBlack),
+                    ),
+                    home: child,
+                  );
+                },
+              );
+            },
+            child: const HomePage(),
+          ),
         ),
       ),
     );
@@ -250,11 +244,8 @@ class ApplicationState extends State<Application> {
   @override
   Future<void> dispose() async {
     linkManager.destroy();
-    _autoUpdateGroupTaskTimer?.cancel();
-    _autoUpdateProfilesTaskTimer?.cancel();
-    await clashService?.destroy();
     await globalState.appController.savePreferences();
-    await globalState.appController.handleExit();
     super.dispose();
+    _cancelTimer();
   }
 }

lib/clash/clash.dart

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

lib/clash/core.dart

@@ -1,26 +1,41 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:ffi';
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:fl_clash/clash/clash.dart';
-import 'package:fl_clash/clash/interface.dart';
+import 'package:ffi/ffi.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/services.dart';
-import 'package:path/path.dart';
+import 'generated/clash_ffi.dart';
 
 class ClashCore {
   static ClashCore? _instance;
-  late ClashInterface clashInterface;
+  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";
+  }
 
   ClashCore._internal() {
-    if (Platform.isAndroid) {
-      clashInterface = clashLib!;
-    } else {
-      clashInterface = clashService!;
-    }
+    lib = _getClashLib();
+    clashFFI = ClashFFI(lib);
+    clashFFI.initNativeApiBridge(
+      NativeApi.initializeApiDLData,
+    );
   }
 
   factory ClashCore() {
@@ -28,62 +43,67 @@ class ClashCore {
     return _instance!;
   }
 
-  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);
+  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();
       }
-    } catch (e) {
-      exit(0);
-    }
+    });
+    final dataChar = data.toNativeUtf8().cast<Char>();
+    clashFFI.validateConfig(
+      dataChar,
+      receiver.sendPort.nativePort,
+    );
+    malloc.free(dataChar);
+    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);
+  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;
   }
 
-  shutdown() async {
-    await clashInterface.shutdown();
+  initMessage() {
+    clashFFI.initMessage(
+      receiver.sendPort.nativePort,
+    );
   }
 
-  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();
+  Future<List<Group>> getProxiesGroups() {
+    final proxiesRaw = clashFFI.getProxies();
+    final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(proxiesRaw);
     return Isolate.run<List<Group>>(() {
       if (proxiesRawString.isEmpty) return [];
       final proxies = (json.decode(proxiesRawString) ?? {}) as Map;
@@ -113,128 +133,256 @@ class ClashCore {
     });
   }
 
-  FutureOr<String> changeProxy(ChangeProxyParams changeProxyParams) async {
-    return await clashInterface.changeProxy(changeProxyParams);
-  }
-
-  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 {
+  Future<List<ExternalProvider>> getExternalProviders() {
+    final externalProvidersRaw = clashFFI.getExternalProviders();
     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;
-      },
-    );
+        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;
+    });
   }
 
-  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));
+  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<String> updateGeoData({
     required String geoType,
     required String geoName,
   }) {
-    return clashInterface.updateGeoData(geoType: geoType, geoName: 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;
   }
 
   Future<String> sideLoadExternalProvider({
     required String providerName,
     required String data,
   }) {
-    return clashInterface.sideLoadExternalProvider(
-        providerName: providerName, data: 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;
   }
 
   Future<String> updateExternalProvider({
     required String providerName,
-  }) async {
-    return clashInterface.updateExternalProvider(providerName);
-  }
-
-  startListener() async {
-    await clashInterface.startListener();
-  }
-
-  stopListener() async {
-    await clashInterface.stopListener();
-  }
-
-  Future<Delay> getDelay(String proxyName) async {
-    final data = await clashInterface.asyncTestDelay(proxyName);
-    return Delay.fromJson(json.decode(data));
-  }
-
-  Future<Traffic> getTraffic(bool value) async {
-    final trafficString = await clashInterface.getTraffic(value);
-    return Traffic.fromMap(json.decode(trafficString));
-  }
-
-  Future<IpInfo?> getCountryCode(String ip) async {
-    final countryCode = await clashInterface.getCountryCode(ip);
-    if (countryCode.isEmpty) {
-      return null;
-    }
-    return IpInfo(
-      ip: ip,
-      countryCode: countryCode,
+  }) {
+    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;
   }
 
-  Future<Traffic> getTotalTraffic(bool value) async {
-    final totalTrafficString = await clashInterface.getTotalTraffic(value);
-    return Traffic.fromMap(json.decode(totalTrafficString));
+  changeProxy(ChangeProxyParams changeProxyParams) {
+    final params = json.encode(changeProxyParams);
+    final paramsChar = params.toNativeUtf8().cast<Char>();
+    clashFFI.changeProxy(paramsChar);
+    malloc.free(paramsChar);
   }
 
-  Future<int> getMemory() async {
-    final value = await clashInterface.getMemory();
-    return int.parse(value);
+  start() {
+    clashFFI.start();
   }
 
-  resetTraffic() {
-    clashInterface.resetTraffic();
+  stop() {
+    clashFFI.stop();
   }
 
-  startLog() {
-    clashInterface.startLog();
+  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;
+  }
+
+  clearEffect(String profileId) {
+    final profileIdChar = profileId.toNativeUtf8().cast<Char>();
+    clashFFI.clearEffect(profileIdChar);
+    malloc.free(profileIdChar);
+  }
+
+  VersionInfo getVersionInfo() {
+    final versionInfoRaw = clashFFI.getVersionInfo();
+    final versionInfo = json.decode(versionInfoRaw.cast<Utf8>().toDartString());
+    clashFFI.freeCString(versionInfoRaw);
+    return VersionInfo.fromJson(versionInfo);
+  }
+
+  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();
   }
 
   stopLog() {
-    clashInterface.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);
   }
 
   requestGc() {
-    clashInterface.forceGc();
+    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();
   }
 }
 

lib/clash/interface.dart

@@ -1,63 +0,0 @@
-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);
-
-  FutureOr<String> getCountryCode(String ip);
-
-  FutureOr<String> getMemory();
-
-  resetTraffic();
-
-  startLog();
-
-  stopLog();
-
-  FutureOr<String> getConnections();
-
-  FutureOr<bool> closeConnection(String id);
-
-  FutureOr<bool> closeConnections();
-}

lib/clash/lib.dart

@@ -1,400 +0,0 @@
-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();
-  }
-
-  @override
-  FutureOr<String> getCountryCode(String ip) {
-    final completer = Completer<String>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(message);
-        receiver.close();
-      }
-    });
-    final ipChar = ip.toNativeUtf8().cast<Char>();
-    clashFFI.getCountryCode(
-      ipChar,
-      receiver.sendPort.nativePort,
-    );
-    malloc.free(ipChar);
-    return completer.future;
-  }
-
-  @override
-  FutureOr<String> getMemory() {
-    final completer = Completer<String>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(message);
-        receiver.close();
-      }
-    });
-    clashFFI.getMemory(receiver.sendPort.nativePort);
-    return completer.future;
-  }
-
-  /// 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,40 +1,42 @@
 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 {
-  final controller = StreamController();
+  StreamSubscription? subscription;
 
   ClashMessage._() {
-    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;
-          }
+    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;
         }
-      },
-    );
+      }
+    });
   }
 
   static final ClashMessage instance = ClashMessage._();

lib/clash/service.dart

@@ -1,439 +1,54 @@
-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/enum/enum.dart';
-import 'package:fl_clash/models/core.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/services.dart';
+import 'package:path/path.dart';
 
-class ClashService with ClashInterface {
-  static ClashService? _instance;
+import 'core.dart';
 
-  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()),
-                ),
-              );
-            },
-          );
+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);
     }
-  }
-
-  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:
-      case ActionMethod.getCountryCode:
-      case ActionMethod.getMemory:
-        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:
-        return;
-    }
-  }
-
-  Future<T> _invoke<T>({
-    required ActionMethod method,
-    dynamic data,
-    Duration? timeout,
-    FutureOr<T> Function()? onTimeout,
-  }) async {
-    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 ??
-          () {
-            if (T is String) {
-              return "" as T;
-            }
-            if (T is bool) {
-              return false as T;
-            }
-            return null as T;
-          },
-      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,
-          ),
+    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);
+    }
   }
 
-  destroy() async {
-    final server = await serverCompleter.future;
-    await server.close();
-    await _deleteSocketFile();
-  }
-
-  @override
-  FutureOr<String> getCountryCode(String ip) {
-    return _invoke<String>(
-      method: ActionMethod.getCountryCode,
-      data: ip,
-    );
-  }
-
-  @override
-  FutureOr<String> getMemory() {
-    return _invoke<String>(
-      method: ActionMethod.getMemory,
-    );
+  Future<bool> init({
+    required ClashConfig clashConfig,
+    required Config config,
+  }) async {
+    await initGeo();
+    final homeDirPath = await appPath.getHomeDirPath();
+    final isInit = clashCore.init(homeDirPath);
+    return isInit;
   }
 }
 
-final clashService = system.isDesktop ? ClashService() : null;
+final clashService = ClashService();

lib/common/color.dart

@@ -1,20 +1,19 @@
 import 'package:flutter/material.dart';
 
 extension ColorExtension on Color {
-
-  Color get toLight {
-    return withOpacity(0.8);
-  }
-
-  Color get toLighter {
+  toLight() {
     return withOpacity(0.6);
   }
 
-  Color get toSoft {
+  toLighter() {
+    return withOpacity(0.4);
+  }
+
+  toSoft() {
     return withOpacity(0.12);
   }
 
-  Color get toLittle {
+  toLittle() {
     return withOpacity(0.03);
   }
 
@@ -24,39 +23,14 @@ extension ColorExtension on Color {
     final hslDark = hsl.withLightness((hsl.lightness - amount).clamp(0.0, 1.0));
     return hslDark.toColor();
   }
-
-  Color blendDarken(
-    BuildContext context, {
-    double factor = 0.1,
-  }) {
-    final brightness = Theme.of(context).brightness;
-    return Color.lerp(
-      this,
-      brightness == Brightness.dark ? Colors.white : Colors.black,
-      factor,
-    )!;
-  }
-
-  Color blendLighten(
-    BuildContext context, {
-    double factor = 0.1,
-  }) {
-    final brightness = Theme.of(context).brightness;
-    return Color.lerp(
-      this,
-      brightness == Brightness.dark ? Colors.black : Colors.white,
-      factor,
-    )!;
-  }
 }
 
 extension ColorSchemeExtension on ColorScheme {
   ColorScheme toPrueBlack(bool isPrueBlack) => isPrueBlack
       ? copyWith(
           surface: Colors.black,
-          surfaceContainer: surfaceContainer.darken(
-            0.05,
-          ),
+          background: Colors.black,
+          surfaceContainer: surfaceContainer.darken(0.05),
         )
       : this;
 }

lib/common/common.dart

@@ -1,36 +1,33 @@
-export 'android.dart';
-export 'app_localizations.dart';
-export 'color.dart';
-export 'constant.dart';
-export 'context.dart';
-export 'datetime.dart';
-export 'function.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 '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 '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 'function.dart';
+export 'package.dart';
+export 'measure.dart';
 export 'windows.dart';
+export 'iterable.dart';
+export 'scroll.dart';
+export 'icons.dart';
+export 'http.dart';
+export 'keyboard.dart';
+export 'network.dart';
+export 'navigator.dart';

lib/common/constant.dart

@@ -1,28 +1,18 @@
 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 baseInfoEdgeInsets = EdgeInsets.symmetric(
-  vertical: 16,
-  horizontal: 16,
-);
 const httpTimeoutDuration = Duration(milliseconds: 5000);
 const moreDuration = Duration(milliseconds: 100);
 const animateDuration = Duration(milliseconds: 100);
-const commonDuration = Duration(milliseconds: 300);
 const defaultUpdateDuration = Duration(days: 1);
 const mmdbFileName = "geoip.metadb";
 const asnFileName = "ASN.mmdb";
@@ -31,7 +21,7 @@ const geoSiteFileName = "GeoSite.dat";
 final double kHeaderHeight = system.isDesktop
     ? !Platform.isMacOS
         ? 40
-        : 28
+        : 26
     : 0;
 const GeoXMap defaultGeoXMap = {
   "mmdb":
@@ -84,7 +74,3 @@ const viewModeColumnsMap = {
 };
 
 const defaultPrimaryColor = Colors.brown;
-
-double getWidgetHeight(num lines) {
-  return max(lines * 84 + (lines - 1) * 16, 0);
-}

lib/common/context.dart

@@ -1,17 +1,13 @@
-import 'package:fl_clash/manager/manager.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
 
 extension BuildContextExtension on BuildContext {
+
   CommonScaffoldState? get commonScaffoldState {
     return findAncestorStateOfType<CommonScaffoldState>();
   }
 
-  showNotifier(String text) {
-    return findAncestorStateOfType<MessageManagerState>()?.message(text);
-  }
-
-  Size get appSize {
+  Size get appSize{
     return MediaQuery.of(this).size;
   }
 

lib/common/dav_client.dart

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

lib/common/function.dart

@@ -1,33 +1,26 @@
 import 'dart:async';
 
 class Debouncer {
-  Map<dynamic, Timer> operators = {};
+  final Duration delay;
+  Timer? _timer;
 
-  call(
-    dynamic tag,
-    Function func, {
-    List<dynamic>? args,
-    Duration duration = const Duration(milliseconds: 600),
-  }) {
-    final timer = operators[tag];
-    if (timer != null) {
-      timer.cancel();
-    }
-    operators[tag] = Timer(
-      duration,
-      () {
-        operators.remove(tag);
-        Function.apply(
-          func,
-          args,
-        );
-      },
-    );
-  }
+  Debouncer({required this.delay});
 
-  cancel(dynamic tag) {
-    operators[tag]?.cancel();
+  void call(Function action, List<dynamic> positionalArguments, [Map<Symbol, dynamic>? namedArguments]) {
+    _timer?.cancel();
+    _timer = Timer(delay, () => Function.apply(action, positionalArguments, namedArguments));
   }
 }
 
-final debouncer = Debouncer();
+Function debounce<F extends Function>(F func,{int milliseconds = 600}) {
+  Timer? timer;
+
+  return ([List<dynamic>? args, Map<Symbol, dynamic>? namedArgs]) {
+    if (timer != null) {
+      timer!.cancel();
+    }
+    timer = Timer(Duration(milliseconds: milliseconds), () async {
+      await Function.apply(func, args ?? [], namedArgs);
+    });
+  };
+}

lib/common/future.dart

@@ -1,42 +0,0 @@
-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,7 +3,6 @@ import 'dart:io';
 import 'package:flutter/cupertino.dart';
 
 import '../state.dart';
-import 'constant.dart';
 
 class FlClashHttpOverrides extends HttpOverrides {
   @override
@@ -11,13 +10,10 @@ 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;
       final isStart = appController.appFlowingState.isStart;
-      debugPrint("find $url proxy:$isStart");
       if (!isStart) return "DIRECT";
       return "PROXY localhost:$port";
     };

lib/common/launch.dart

@@ -1,10 +1,11 @@
 import 'dart:async';
 import 'dart:io';
-
+import 'package:fl_clash/models/models.dart' hide Process;
 import 'package:launch_at_startup/launch_at_startup.dart';
 
 import 'constant.dart';
 import 'system.dart';
+import 'windows.dart';
 
 class AutoLaunch {
   static AutoLaunch? _instance;
@@ -25,15 +26,60 @@ 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(bool isAutoLaunch) async {
+  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/material.dart';
+import 'package:flutter/cupertino.dart';
 
 typedef InstallConfigCallBack = void Function(String url);
 
@@ -17,7 +17,7 @@ class LinkManager {
   initAppLinksListen(installConfigCallBack) async {
     debugPrint("initAppLinksListen");
     destroy();
-    subscription = _appLinks.uriLinkStream.listen(
+    subscription = _appLinks.allUriLinkStream.listen(
       (uri) {
         debugPrint('onAppLink: $uri');
         if (uri.host == 'install-config') {
@@ -31,7 +31,8 @@ class LinkManager {
     );
   }
 
-  destroy() {
+
+  destroy(){
     if (subscription != null) {
       subscription?.cancel();
       subscription = null;

lib/common/lock.dart

@@ -1,30 +0,0 @@
-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

@@ -1,251 +1,11 @@
-import 'package:fl_clash/common/common.dart';
 import 'package:flutter/material.dart';
 
 class BaseNavigator {
   static Future<T?> push<T>(BuildContext context, Widget child) async {
     return await Navigator.of(context).push<T>(
-      CommonRoute(
+      MaterialPageRoute(
         builder: (context) => child,
       ),
     );
   }
 }
-
-class CommonRoute<T> extends MaterialPageRoute<T> {
-  CommonRoute({
-    required super.builder,
-  });
-
-  @override
-  Duration get transitionDuration => const Duration(milliseconds: 500);
-
-  @override
-  Duration get reverseTransitionDuration => const Duration(milliseconds: 300);
-}
-
-final Animatable<Offset> _kRightMiddleTween = Tween<Offset>(
-  begin: const Offset(1.0, 0.0),
-  end: Offset.zero,
-);
-final Animatable<Offset> _kMiddleLeftTween = Tween<Offset>(
-  begin: Offset.zero,
-  end: const Offset(-1.0 / 3.0, 0.0),
-);
-
-class CommonPageTransitionsBuilder extends PageTransitionsBuilder {
-  const CommonPageTransitionsBuilder();
-
-  @override
-  Widget buildTransitions<T>(
-    PageRoute<T> route,
-    BuildContext context,
-    Animation<double> animation,
-    Animation<double> secondaryAnimation,
-    Widget child,
-  ) {
-    return CommonPageTransition(
-      context: context,
-      primaryRouteAnimation: animation,
-      secondaryRouteAnimation: secondaryAnimation,
-      linearTransition: false,
-      child: child,
-    );
-  }
-}
-
-class CommonPageTransition extends StatefulWidget {
-  const CommonPageTransition({
-    super.key,
-    required this.context,
-    required this.primaryRouteAnimation,
-    required this.secondaryRouteAnimation,
-    required this.child,
-    required this.linearTransition,
-  });
-
-  final Widget child;
-
-  final Animation<double> primaryRouteAnimation;
-
-  final Animation<double> secondaryRouteAnimation;
-
-  final BuildContext context;
-
-  final bool linearTransition;
-
-  static Widget? delegatedTransition(
-      BuildContext context,
-      Animation<double> animation,
-      Animation<double> secondaryAnimation,
-      bool allowSnapshotting,
-      Widget? child) {
-    final Animation<Offset> delegatedPositionAnimation = CurvedAnimation(
-      parent: secondaryAnimation,
-      curve: Curves.linearToEaseOut,
-      reverseCurve: Curves.easeInToLinear,
-    ).drive(_kMiddleLeftTween);
-
-    assert(debugCheckHasDirectionality(context));
-    final TextDirection textDirection = Directionality.of(context);
-    return SlideTransition(
-      position: delegatedPositionAnimation,
-      textDirection: textDirection,
-      transformHitTests: false,
-      child: child,
-    );
-  }
-
-  @override
-  State<CommonPageTransition> createState() => _CommonPageTransitionState();
-}
-
-class _CommonPageTransitionState extends State<CommonPageTransition> {
-  late Animation<Offset> _primaryPositionAnimation;
-  late Animation<Offset> _secondaryPositionAnimation;
-  late Animation<Decoration> _primaryShadowAnimation;
-  CurvedAnimation? _primaryPositionCurve;
-  CurvedAnimation? _secondaryPositionCurve;
-  CurvedAnimation? _primaryShadowCurve;
-
-  @override
-  void initState() {
-    super.initState();
-    _setupAnimation();
-  }
-
-  @override
-  void didUpdateWidget(covariant CommonPageTransition oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.primaryRouteAnimation != widget.primaryRouteAnimation ||
-        oldWidget.secondaryRouteAnimation != widget.secondaryRouteAnimation ||
-        oldWidget.linearTransition != widget.linearTransition) {
-      _disposeCurve();
-      _setupAnimation();
-    }
-  }
-
-  @override
-  void dispose() {
-    _disposeCurve();
-    super.dispose();
-  }
-
-  void _disposeCurve() {
-    _primaryPositionCurve?.dispose();
-    _secondaryPositionCurve?.dispose();
-    _primaryShadowCurve?.dispose();
-    _primaryPositionCurve = null;
-    _secondaryPositionCurve = null;
-    _primaryShadowCurve = null;
-  }
-
-  void _setupAnimation() {
-    if (!widget.linearTransition) {
-      _primaryPositionCurve = CurvedAnimation(
-        parent: widget.primaryRouteAnimation,
-        curve: Curves.fastEaseInToSlowEaseOut,
-        reverseCurve: Curves.easeInOut,
-      );
-      _secondaryPositionCurve = CurvedAnimation(
-        parent: widget.secondaryRouteAnimation,
-        curve: Curves.linearToEaseOut,
-        reverseCurve: Curves.easeInToLinear,
-      );
-      _primaryShadowCurve = CurvedAnimation(
-        parent: widget.primaryRouteAnimation,
-        curve: Curves.linearToEaseOut,
-      );
-    }
-    _primaryPositionAnimation =
-        (_primaryPositionCurve ?? widget.primaryRouteAnimation)
-            .drive(_kRightMiddleTween);
-    _secondaryPositionAnimation =
-        (_secondaryPositionCurve ?? widget.secondaryRouteAnimation)
-            .drive(_kMiddleLeftTween);
-    _primaryShadowAnimation =
-        (_primaryShadowCurve ?? widget.primaryRouteAnimation).drive(
-      DecorationTween(
-        begin: const _CommonEdgeShadowDecoration(),
-        end: _CommonEdgeShadowDecoration(
-          <Color>[
-            widget.context.colorScheme.inverseSurface.withOpacity(
-              0.06,
-            ),
-            Colors.transparent,
-          ],
-        ),
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    assert(debugCheckHasDirectionality(context));
-    final TextDirection textDirection = Directionality.of(context);
-    return SlideTransition(
-      position: _secondaryPositionAnimation,
-      textDirection: textDirection,
-      transformHitTests: false,
-      child: SlideTransition(
-        position: _primaryPositionAnimation,
-        textDirection: textDirection,
-        child: DecoratedBoxTransition(
-          decoration: _primaryShadowAnimation,
-          child: widget.child,
-        ),
-      ),
-    );
-  }
-}
-
-class _CommonEdgeShadowDecoration extends Decoration {
-  final List<Color>? _colors;
-
-  const _CommonEdgeShadowDecoration([this._colors]);
-
-  @override
-  BoxPainter createBoxPainter([VoidCallback? onChanged]) {
-    return _CommonEdgeShadowPainter(this, onChanged);
-  }
-}
-
-class _CommonEdgeShadowPainter extends BoxPainter {
-  _CommonEdgeShadowPainter(
-    this._decoration,
-    super.onChanged,
-  ) : assert(_decoration._colors == null || _decoration._colors!.length > 1);
-
-  final _CommonEdgeShadowDecoration _decoration;
-
-  @override
-  void paint(Canvas canvas, Offset offset, ImageConfiguration configuration) {
-    final List<Color>? colors = _decoration._colors;
-    if (colors == null) {
-      return;
-    }
-
-    final double shadowWidth = 0.05 * configuration.size!.width;
-    final double shadowHeight = configuration.size!.height;
-    final double bandWidth = shadowWidth / (colors.length - 1);
-
-    final TextDirection? textDirection = configuration.textDirection;
-    assert(textDirection != null);
-    final (double shadowDirection, double start) = switch (textDirection!) {
-      TextDirection.rtl => (1, offset.dx + configuration.size!.width),
-      TextDirection.ltr => (-1, offset.dx),
-    };
-
-    int bandColorIndex = 0;
-    for (int dx = 0; dx < shadowWidth; dx += 1) {
-      if (dx ~/ bandWidth != bandColorIndex) {
-        bandColorIndex += 1;
-      }
-      final Paint paint = Paint()
-        ..color = Color.lerp(colors[bandColorIndex], colors[bandColorIndex + 1],
-            (dx % bandWidth) / bandWidth)!;
-      final double x = start + shadowDirection * dx;
-      canvas.drawRect(
-          Rect.fromLTWH(x - 1.0, offset.dy, 1.0, shadowHeight), paint);
-    }
-  }
-}

lib/common/num.dart

@@ -1,43 +1,5 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-
-extension NumExt on num {
+extension NumExtension on num {
   String fixed({digit = 2}) {
     return toStringAsFixed(truncateToDouble() == this ? 0 : digit);
   }
 }
-
-extension DoubleExt on double {
-  moreOrEqual(double value) {
-    return this > value || (value - this).abs() < precisionErrorTolerance + 1;
-  }
-}
-
-extension OffsetExt on Offset {
-  double getCrossAxisOffset(Axis direction) {
-    return direction == Axis.vertical ? dx : dy;
-  }
-
-  double getMainAxisOffset(Axis direction) {
-    return direction == Axis.vertical ? dy : dx;
-  }
-
-  bool less(Offset offset) {
-    if (dy < offset.dy) {
-      return true;
-    }
-    if (dy == offset.dy && dx < offset.dx) {
-      return true;
-    }
-    return false;
-  }
-}
-
-extension RectExt on Rect {
-  doRectIntersect(Rect rect) {
-    return left < rect.right &&
-        right > rect.left &&
-        top < rect.bottom &&
-        bottom > rect.top;
-  }
-}

lib/common/other.dart

@@ -7,9 +7,9 @@ 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) {
@@ -19,14 +19,6 @@ 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(
@@ -34,19 +26,6 @@ class Other {
     );
   }
 
-  String get uuidV4 {
-    final Random random = Random();
-    final bytes = List.generate(16, (_) => random.nextInt(256));
-
-    bytes[6] = (bytes[6] & 0x0F) | 0x40;
-    bytes[8] = (bytes[8] & 0x3F) | 0x80;
-
-    final hex =
-        bytes.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join();
-
-    return '${hex.substring(0, 8)}-${hex.substring(8, 12)}-${hex.substring(12, 16)}-${hex.substring(16, 20)}-${hex.substring(20, 32)}';
-  }
-
   String getTimeDifference(DateTime dateTime) {
     var currentDateTime = DateTime.now();
     var difference = currentDateTime.difference(dateTime);
@@ -125,15 +104,17 @@ class Other {
   String getTrayIconPath({
     required Brightness brightness,
   }) {
-    if (Platform.isMacOS) {
+    if(Platform.isMacOS){
       return "assets/images/icon_white.png";
     }
     final suffix = Platform.isWindows ? "ico" : "png";
-    return "assets/images/icon.$suffix";
-    // return switch (brightness) {
-    //   Brightness.dark => "assets/images/icon_white.$suffix",
-    //   Brightness.light => "assets/images/icon_black.$suffix",
-    // };
+    if (Platform.isWindows) {
+      return "assets/images/icon.$suffix";
+    }
+    return switch (brightness) {
+      Brightness.dark => "assets/images/icon_white.$suffix",
+      Brightness.light => "assets/images/icon_black.$suffix",
+    };
   }
 
   int compareVersions(String version1, String version2) {
@@ -238,7 +219,7 @@ class Other {
   }
 
   int getProfilesColumns(double viewWidth) {
-    return max((viewWidth / 350).floor(), 1);
+    return max((viewWidth / 400).floor(), 1);
   }
 
   String getBackupFileName() {
@@ -253,32 +234,6 @@ class Other {
     final view = WidgetsBinding.instance.platformDispatcher.views.first;
     return view.physicalSize / view.devicePixelRatio;
   }
-
-  Future<String?> getLocalIpAddress() async {
-    List<NetworkInterface> interfaces = await NetworkInterface.list(
-      includeLoopback: false,
-    )
-      ..sort((a, b) {
-        if (a.isWifi && !b.isWifi) return -1;
-        if (!a.isWifi && b.isWifi) return 1;
-        if (a.includesIPv4 && !b.includesIPv4) return -1;
-        if (!a.includesIPv4 && b.includesIPv4) return 1;
-        return 0;
-      });
-    for (final interface in interfaces) {
-      final addresses = interface.addresses;
-      if (addresses.isEmpty) {
-        continue;
-      }
-      addresses.sort((a, b) {
-        if (a.isIPv4 && !b.isIPv4) return -1;
-        if (!a.isIPv4 && b.isIPv4) return 1;
-        return 0;
-      });
-      return addresses.first.address;
-    }
-    return "";
-  }
 }
 
 final other = Other();

lib/common/path.dart

@@ -13,17 +13,34 @@ 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() {
@@ -31,23 +48,6 @@ 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,11 +58,6 @@ 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);
@@ -74,12 +69,6 @@ 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,9 +1,6 @@
-import 'dart:convert';
-import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:dio/dio.dart';
-import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
@@ -71,113 +68,36 @@ class Request {
     return data;
   }
 
-  final List<String> _ipInfoSources = [
-    "https://ipwho.is/?fields=ip&output=csv",
-    "https://ipinfo.io/ip",
-    "https://ifconfig.me/ip/",
-  ];
+  final Map<String, IpInfo Function(Map<String, dynamic>)> _ipInfoSources = {
+    "https://ipwho.is/": IpInfo.fromIpwhoIsJson,
+    "https://api.ip.sb/geoip/": IpInfo.fromIpSbJson,
+    "https://ipapi.co/json/": IpInfo.fromIpApiCoJson,
+    "https://ipinfo.io/json/": IpInfo.fromIpInfoIoJson,
+  };
 
   Future<IpInfo?> checkIp({CancelToken? cancelToken}) async {
-    for (final source in _ipInfoSources) {
+    for (final source in _ipInfoSources.entries) {
       try {
         final response = await _dio
-            .get<String>(
-              source,
+            .get<Map<String, dynamic>>(
+              source.key,
               cancelToken: cancelToken,
             )
-            .timeout(httpTimeoutDuration);
-        if (response.statusCode != 200 || response.data == null) {
-          continue;
+            .timeout(
+              httpTimeoutDuration,
+            );
+        if (response.statusCode == 200 && response.data != null) {
+          return source.value(response.data!);
         }
-        final ipInfo = await clashCore.getCountryCode(response.data!);
-        if (ipInfo == null && source != _ipInfoSources.last) {
-          continue;
-        }
-        return ipInfo;
       } catch (e) {
-        debugPrint("checkIp error ===> $e");
-        if (e is DioException && e.type == DioExceptionType.cancel) {
+        if (cancelToken?.isCancelled == true) {
           throw "cancelled";
         }
+        continue;
       }
     }
     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,13 +1,11 @@
 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;
 
@@ -21,6 +19,12 @@ 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) {
@@ -31,73 +35,6 @@ 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/text.dart

@@ -2,15 +2,13 @@ import 'package:flutter/material.dart';
 import 'color.dart';
 
 extension TextStyleExtension on TextStyle {
-  TextStyle get toLight => copyWith(color: color?.toLight);
+  TextStyle get toLight => copyWith(color: color?.toLight());
 
-  TextStyle get toLighter => copyWith(color: color?.toLighter);
+  TextStyle get toLighter => copyWith(color: color?.toLighter());
 
   TextStyle get toSoftBold => copyWith(fontWeight: FontWeight.w500);
 
   TextStyle get toBold => copyWith(fontWeight: FontWeight.bold);
 
-  TextStyle adjustSize(int size) => copyWith(
-        fontSize: fontSize! + size,
-      );
+  TextStyle get toMinus => copyWith(fontSize: fontSize! - 2);
 }

lib/common/tray.dart

@@ -1,193 +0,0 @@
-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.changeMode(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,18 +1,19 @@
 import 'dart:io';
+import 'dart:math';
 
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/config.dart';
 import 'package:flutter/material.dart';
-import 'package:screen_retriever/screen_retriever.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");
@@ -24,35 +25,6 @@ class Window {
     );
     if (!Platform.isMacOS || version > 10) {
       await windowManager.setTitleBarStyle(TitleBarStyle.hidden);
-      final left = props.left ?? 0;
-      final top = props.top ?? 0;
-      final right = left + props.width;
-      final bottom = top + props.height;
-      if (left == 0 && top == 0) {
-        await windowManager.setAlignment(Alignment.center);
-      } else {
-        final displays = await screenRetriever.getAllDisplays();
-        final isPositionValid = displays.any(
-          (display) {
-            final displayBounds = Rect.fromLTWH(
-              display.visiblePosition!.dx,
-              display.visiblePosition!.dy,
-              display.size.width,
-              display.size.height,
-            );
-            return displayBounds.contains(Offset(left, top)) ||
-                displayBounds.contains(Offset(right, bottom));
-          },
-        );
-        if (isPositionValid) {
-          await windowManager.setPosition(
-            Offset(
-              left,
-              top,
-            ),
-          );
-        }
-      }
     }
     await windowManager.waitUntilReadyToShow(windowOptions, () async {
       await windowManager.setPreventClose(true);

lib/common/windows.dart

@@ -1,10 +1,7 @@
 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 {
@@ -54,84 +51,12 @@ class Windows {
     calloc.free(argumentsPtr);
     calloc.free(operationPtr);
 
-    debugPrint("[Windows] runas: $command $arguments resultCode:$result");
-
-    if (result < 42) {
+    if (result <= 32) {
       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,17 +5,19 @@ 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 'common/common.dart';
+import 'clash/core.dart';
 import 'models/models.dart';
+import 'common/common.dart';
 
 class AppController {
   final BuildContext context;
@@ -23,55 +25,32 @@ class AppController {
   late AppFlowingState appFlowingState;
   late Config config;
   late ClashConfig clashConfig;
+  late Function updateClashConfigDebounce;
+  late Function updateGroupDebounce;
+  late Function addCheckIpNumDebounce;
+  late Function applyProfileDebounce;
+  late Function savePreferencesDebounce;
 
   AppController(this.context) {
     appState = context.read<AppState>();
     config = context.read<Config>();
     clashConfig = context.read<ClashConfig>();
     appFlowingState = context.read<AppFlowingState>();
-  }
-
-  updateClashConfigDebounce() {
-    debouncer.call(DebounceTag.updateClashConfig, updateClashConfig);
-  }
-
-  updateGroupsDebounce() {
-    debouncer.call(DebounceTag.updateGroups, updateGroups);
-  }
-
-  addCheckIpNumDebounce() {
-    debouncer.call(DebounceTag.addCheckIpNum, () {
+    updateClashConfigDebounce = debounce<Function()>(() async {
+      await updateClashConfig();
+    });
+    savePreferencesDebounce = debounce<Function()>(() async {
+      await savePreferences();
+    });
+    applyProfileDebounce = debounce<Function()>(() async {
+      await applyProfile(isPrue: true);
+    });
+    addCheckIpNumDebounce = debounce(() {
       appState.checkIpNum++;
     });
-  }
-
-  applyProfileDebounce() {
-    debouncer.call(DebounceTag.addCheckIpNum, () {
-      applyProfile(isPrue: true);
-    });
-  }
-
-  savePreferencesDebounce() {
-    debouncer.call(DebounceTag.savePreferences, savePreferences);
-  }
-
-  changeProxyDebounce(String groupName, String proxyName) {
-    debouncer.call(DebounceTag.changeProxy,
-        (String groupName, String proxyName) async {
-      await changeProxy(
-        groupName: groupName,
-        proxyName: proxyName,
-      );
+    updateGroupDebounce = debounce(() async {
       await updateGroups();
-    }, args: [groupName, proxyName]);
-  }
-
-  restartCore() async {
-    await globalState.restartCore(
-      appState: appState,
-      clashConfig: clashConfig,
-      config: config,
-    );
+    });
   }
 
   updateStatus(bool isStart) async {
@@ -83,21 +62,12 @@ class AppController {
         updateRunTime,
         updateTraffic,
       ];
-      final currentLastModified =
-          await config.getCurrentProfile()?.profileLastModified;
-      if (currentLastModified == null ||
-          globalState.lastProfileModified == null) {
-        addCheckIpNumDebounce();
-        return;
+      if (!Platform.isAndroid) {
+        applyProfileDebounce();
       }
-      if (currentLastModified <= (globalState.lastProfileModified ?? 0)) {
-        addCheckIpNumDebounce();
-        return;
-      }
-      applyProfileDebounce();
     } else {
       await globalState.handleStop();
-      await clashCore.resetTraffic();
+      clashCore.resetTraffic();
       appFlowingState.traffics = [];
       appFlowingState.totalTraffic = Traffic();
       appFlowingState.runTime = null;
@@ -105,6 +75,10 @@ class AppController {
     }
   }
 
+  updateCoreVersionInfo() {
+    globalState.updateCoreVersionInfo(appState);
+  }
+
   updateRunTime() {
     final startTime = globalState.startTime;
     if (startTime != null) {
@@ -118,7 +92,6 @@ class AppController {
 
   updateTraffic() {
     globalState.updateTraffic(
-      config: config,
       appFlowingState: appFlowingState,
     );
   }
@@ -131,7 +104,7 @@ class AppController {
 
   deleteProfile(String id) async {
     config.deleteProfileById(id);
-    clearEffect(id);
+    clashCore.clearEffect(id);
     if (config.currentProfileId == id) {
       if (config.profiles.isNotEmpty) {
         final updateId = config.profiles.first.id;
@@ -143,24 +116,11 @@ class AppController {
     }
   }
 
-  updateProviders() async {
-    await globalState.updateProviders(appState);
-  }
-
-  updateLocalIp() async {
-    appFlowingState.localIp = null;
-    await Future.delayed(commonDuration);
-    appFlowingState.localIp = await other.getLocalIpAddress();
-  }
-
   Future<void> updateProfile(Profile profile) async {
     final newProfile = await profile.update();
     config.setProfile(
       newProfile.copyWith(isUpdating: false),
     );
-    if (profile.id == config.currentProfile?.id) {
-      applyProfileDebounce();
-    }
   }
 
   Future<void> updateClashConfig({bool isPatch = true}) async {
@@ -168,7 +128,6 @@ class AppController {
     if (commonScaffoldState?.mounted != true) return;
     await commonScaffoldState?.loadingRun(() async {
       await globalState.updateClashConfig(
-        appState: appState,
         clashConfig: clashConfig,
         config: config,
         isPatch: isPatch,
@@ -252,8 +211,8 @@ class AppController {
   changeProxy({
     required String groupName,
     required String proxyName,
-  }) async {
-    await globalState.changeProxy(
+  }) {
+    globalState.changeProxy(
       config: config,
       groupName: groupName,
       proxyName: proxyName,
@@ -273,16 +232,22 @@ class AppController {
   }
 
   handleExit() async {
-    try {
-      await updateStatus(false);
-      await clashCore.shutdown();
-      await clashService?.destroy();
-      await proxy?.stopProxy();
-      await savePreferences();
-    } catch (_) {}
+    await updateStatus(false);
+    await proxy?.stopProxy();
+    await savePreferences();
+    clashCore.shutdown();
     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();
@@ -337,33 +302,20 @@ class AppController {
     if (!isDisclaimerAccepted) {
       handleExit();
     }
+    updateLogStatus();
     if (!config.appSetting.silentLaunch) {
       window?.show();
     }
-    await globalState.initCore(
-      appState: appState,
-      clashConfig: clashConfig,
-      config: config,
-    );
-    await _initStatus();
-    autoLaunch?.updateStatus(
-      config.appSetting.autoLaunch,
-    );
-    autoUpdateProfiles();
-    autoCheckUpdate();
-  }
-
-  _initStatus() async {
     if (Platform.isAndroid) {
       globalState.updateStartTime();
     }
-    final status =
-        globalState.isStart == true ? true : config.appSetting.autoRun;
-
-    await updateStatus(status);
-    if (!status) {
-      addCheckIpNumDebounce();
+    if (globalState.isStart) {
+      await updateStatus(true);
+    } else {
+      await updateStatus(config.appSetting.autoRun);
     }
+    autoUpdateProfiles();
+    autoCheckUpdate();
   }
 
   setDelay(Delay delay) {
@@ -424,6 +376,10 @@ class AppController {
     );
   }
 
+  showSnackBar(String message) {
+    globalState.showSnackBar(context, message: message);
+  }
+
   Future<bool> showDisclaimer() async {
     return await globalState.showCommonDialog<bool>(
           dismissible: false,
@@ -567,19 +523,6 @@ 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,
@@ -587,8 +530,8 @@ class AppController {
   }
 
   updateSystemProxy() {
-    config.networkProps = config.networkProps.copyWith(
-      systemProxy: !config.networkProps.systemProxy,
+    config.desktopProps = config.desktopProps.copyWith(
+      systemProxy: !config.desktopProps.systemProxy,
     );
   }
 
@@ -596,20 +539,18 @@ class AppController {
     updateStatus(!appFlowingState.isStart);
   }
 
-  changeMode(Mode mode) {
-    clashConfig.mode = mode;
-    if (mode == Mode.global) {
-      config.updateCurrentGroupName(GroupName.GLOBAL.name);
-    }
-    addCheckIpNumDebounce();
-  }
-
   updateAutoLaunch() {
     config.appSetting = config.appSetting.copyWith(
       autoLaunch: !config.appSetting.autoLaunch,
     );
   }
 
+  updateAdminAutoLaunch() {
+    config.appSetting = config.appSetting.copyWith(
+      adminAutoLaunch: !config.appSetting.adminAutoLaunch,
+    );
+  }
+
   updateVisible() async {
     final visible = await window?.isVisible();
     if (visible != null && !visible) {
@@ -658,14 +599,121 @@ class AppController {
     });
   }
 
-  updateTray([bool focus = false]) async {
-    tray.update(
-      appState: appState,
-      appFlowingState: appFlowingState,
-      config: config,
-      clashConfig: clashConfig,
-      focus: focus,
+  Future _updateSystemTray({
+    required Brightness? brightness,
+    bool force = false,
+  }) async {
+    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,
+      );
+    }
+  }
+
+  updateTray([bool focus = false]) async {
+    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 (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,
+    );
+    menuItems.add(autoStartMenuItem);
+
+    if(Platform.isWindows){
+      final adminAutoStartMenuItem = MenuItem.checkbox(
+        label: appLocalizations.adminAutoLaunch,
+        onClick: (_) async {
+          globalState.appController.updateAdminAutoLaunch();
+        },
+        checked: config.appSetting.adminAutoLaunch,
+      );
+      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(
+        brightness: appState.brightness,
+        force: focus,
+      );
+    }
   }
 
   recoveryData(

lib/enum/enum.dart

@@ -1,39 +1,9 @@
 // ignore_for_file: constant_identifier_names
 
-import 'dart:io';
-
-import 'package:fl_clash/fragments/dashboard/widgets/widgets.dart';
-import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/services.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:hotkey_manager/hotkey_manager.dart';
 
-enum SupportPlatform {
-  Windows,
-  MacOS,
-  Linux,
-  Android;
-
-  static SupportPlatform get currentPlatform {
-    if (Platform.isWindows) {
-      return SupportPlatform.Windows;
-    } else if (Platform.isMacOS) {
-      return SupportPlatform.MacOS;
-    } else if (Platform.isLinux) {
-      return SupportPlatform.Linux;
-    } else if (Platform.isAndroid) {
-      return SupportPlatform.Android;
-    }
-    throw "invalid platform";
-  }
-}
-
-const desktopPlatforms = [
-  SupportPlatform.Linux,
-  SupportPlatform.MacOS,
-  SupportPlatform.Windows,
-];
-
 enum GroupType { Selector, URLTest, Fallback, LoadBalance, Relay }
 
 enum GroupName { GLOBAL, Proxy, Auto, Fallback }
@@ -121,10 +91,6 @@ enum RecoveryOption {
 enum ChipType { action, delete }
 
 enum CommonCardType { plain, filled }
-//
-// extension CommonCardTypeExt on CommonCardType {
-//   CommonCardType get variant => CommonCardType.plain;
-// }
 
 enum ProxiesType { tab, list }
 
@@ -207,129 +173,3 @@ enum FontFamily {
 
   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,
-  getCountryCode,
-  getMemory,
-}
-
-enum AuthorizeCode { none, success, error }
-
-enum WindowsHelperServiceStatus {
-  none,
-  presence,
-  running,
-}
-
-enum DebounceTag {
-  updateClashConfig,
-  updateGroups,
-  addCheckIpNum,
-  applyProfile,
-  savePreferences,
-  changeProxy,
-  checkIp,
-  handleWill,
-  updateDelay,
-  vpnTip,
-  autoLaunch
-}
-
-enum DashboardWidget {
-  networkSpeed(
-    GridItem(
-      crossAxisCellCount: 8,
-      child: NetworkSpeed(),
-    ),
-  ),
-  outboundMode(
-    GridItem(
-      crossAxisCellCount: 4,
-      child: OutboundMode(),
-    ),
-  ),
-  trafficUsage(
-    GridItem(
-      crossAxisCellCount: 4,
-      child: TrafficUsage(),
-    ),
-  ),
-  networkDetection(
-    GridItem(
-      crossAxisCellCount: 4,
-      child: NetworkDetection(),
-    ),
-  ),
-  tunButton(
-    GridItem(
-      crossAxisCellCount: 4,
-      child: TUNButton(),
-    ),
-    platforms: desktopPlatforms,
-  ),
-  systemProxyButton(
-    GridItem(
-      crossAxisCellCount: 4,
-      child: SystemProxyButton(),
-    ),
-    platforms: desktopPlatforms,
-  ),
-  intranetIp(
-    GridItem(
-      crossAxisCellCount: 4,
-      child: IntranetIP(),
-    ),
-  ),
-  memoryInfo(
-    GridItem(
-      crossAxisCellCount: 4,
-      child: MemoryInfo(),
-    ),
-  );
-
-  final GridItem widget;
-  final List<SupportPlatform> platforms;
-
-  const DashboardWidget(
-    this.widget, {
-    this.platforms = SupportPlatform.values,
-  });
-
-  static DashboardWidget getDashboardWidget(GridItem gridItem) {
-    final dashboardWidgets = DashboardWidget.values;
-    final index = dashboardWidgets.indexWhere(
-      (item) => item.widget == gridItem,
-    );
-    return dashboardWidgets[index];
-  }
-}

lib/fragments/access.dart

@@ -104,9 +104,11 @@ class _AccessFragmentState extends State<AccessFragment> {
         showSheet(
           title: appLocalizations.proxiesSetting,
           context: context,
-          body: AccessControlWidget(
-            context: context,
-          ),
+          builder: (_) {
+            return AccessControlWidget(
+              context: context,
+            );
+          },
         );
       },
       icon: const Icon(Icons.tune),
@@ -176,8 +178,8 @@ class _AccessFragmentState extends State<AccessFragment> {
                 status: !isAccessControl,
                 child: Column(
                   children: [
-                    ActivateBox(
-                      active: isAccessControl,
+                    AbsorbPointer(
+                      absorbing: !isAccessControl,
                       child: Padding(
                         padding: const EdgeInsets.only(
                           top: 4,
@@ -330,8 +332,8 @@ class PackageListItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ActivateBox(
-      active: isActive,
+    return AbsorbPointer(
+      absorbing: !isActive,
       child: ListItem.checkbox(
         leading: SizedBox(
           width: 48,

lib/fragments/application_setting.dart

@@ -60,6 +60,32 @@ 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});
 
@@ -108,6 +134,8 @@ class ApplicationSettingFragment extends StatelessWidget {
             );
           },
         ),
+      if(Platform.isWindows)
+        const AdminAutoLaunchItem(),
       if (system.isDesktop)
         Selector<Config, bool>(
           selector: (_, config) => config.appSetting.silentLaunch,

lib/fragments/backup_and_recovery.dart

@@ -343,8 +343,8 @@ class _WebDAVFormDialogState extends State<WebDAVFormDialog> {
 
   @override
   void dispose() {
-    _obscureController.dispose();
     super.dispose();
+    _obscureController.dispose();
   }
 
   @override

lib/fragments/config/config.dart

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

lib/fragments/config/network.dart

@@ -6,11 +6,10 @@ 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 VPNItem extends StatelessWidget {
-  const VPNItem({super.key});
+class VPNSwitch extends StatelessWidget {
+  const VPNSwitch({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -40,8 +39,8 @@ class TUNItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Selector<ClashConfig, bool>(
-      selector: (_, clashConfig) => clashConfig.tun.enable,
+    return Selector<Config, bool>(
+      selector: (_, config) => config.vpnProps.enable,
       builder: (_, enable, __) {
         return ListItem.switchItem(
           title: Text(appLocalizations.tun),
@@ -61,8 +60,8 @@ class TUNItem extends StatelessWidget {
   }
 }
 
-class AllowBypassItem extends StatelessWidget {
-  const AllowBypassItem({super.key});
+class AllowBypassSwitch extends StatelessWidget {
+  const AllowBypassSwitch({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -88,8 +87,8 @@ class AllowBypassItem extends StatelessWidget {
   }
 }
 
-class VpnSystemProxyItem extends StatelessWidget {
-  const VpnSystemProxyItem({super.key});
+class SystemProxySwitch extends StatelessWidget {
+  const SystemProxySwitch({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -115,35 +114,8 @@ class VpnSystemProxyItem extends StatelessWidget {
   }
 }
 
-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});
+class Ipv6Switch extends StatelessWidget {
+  const Ipv6Switch({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -204,36 +176,6 @@ 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(
@@ -241,20 +183,19 @@ 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.networkProps.bypassDomain,
-          shouldRebuild: (prev, next) => !stringListEquality.equals(prev, next),
-          builder: (context, bypassDomain, __) {
-            _initActions(context);
+          selector: (_, config) => config.vpnProps.bypassDomain,
+          shouldRebuild: (prev, next) =>
+              !stringListEquality.equals(prev, next),
+          builder: (_, bypassDomain, __) {
             return ListPage(
               title: appLocalizations.bypassDomain,
               items: bypassDomain,
               titleBuilder: (item) => Text(item),
-              onChange: (items) {
+              onChange: (items){
                 final config = globalState.appController.config;
-                config.networkProps = config.networkProps.copyWith(
+                config.vpnProps = config.vpnProps.copyWith(
                   bypassDomain: List.from(items),
                 );
               },
@@ -267,108 +208,22 @@ 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 = [
-  if (Platform.isAndroid) const VPNItem(),
+  Platform.isAndroid ? const VPNSwitch() : const TUNItem(),
   if (Platform.isAndroid)
     ...generateSection(
       title: "VPN",
       items: [
-        const SystemProxyItem(),
-        const AllowBypassItem(),
-        const Ipv6Item(),
-      ],
-    ),
-  if (system.isDesktop)
-    ...generateSection(
-      title: appLocalizations.system,
-      items: [
-        SystemProxyItem(),
-        BypassDomainItem(),
+        const SystemProxySwitch(),
+        const AllowBypassSwitch(),
+        const Ipv6Switch(),
+        const BypassDomainItem(),
       ],
     ),
   ...generateSection(
     title: appLocalizations.options,
     items: [
-      if (system.isDesktop) const TUNItem(),
       const TunStackItem(),
-      const RouteModeItem(),
-      const RouteAddressItem(),
     ],
   ),
 ];

lib/fragments/connections.dart

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

lib/fragments/dashboard/dashboard.dart

@@ -1,12 +1,17 @@
 import 'dart:math';
 
-import 'package:fl_clash/enum/enum.dart';
+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/models/models.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
+import 'package:fl_clash/widgets/widgets.dart';
 import 'package:provider/provider.dart';
-import 'widgets/start_button.dart';
+import 'network_detection.dart';
+import 'outbound_mode.dart';
+import 'start_button.dart';
+import 'network_speed.dart';
+import 'traffic_usage.dart';
 
 class DashboardFragment extends StatefulWidget {
   const DashboardFragment({super.key});
@@ -16,57 +21,14 @@ class DashboardFragment extends StatefulWidget {
 }
 
 class _DashboardFragmentState extends State<DashboardFragment> {
-  final key = GlobalKey<SuperGridState>();
-
-  _initScaffold(bool isCurrent) {
-    if (!isCurrent) {
+  _initFab(bool isCurrent) {
+    if(!isCurrent){
       return;
     }
     WidgetsBinding.instance.addPostFrameCallback((_) {
       final commonScaffoldState =
           context.findAncestorStateOfType<CommonScaffoldState>();
       commonScaffoldState?.floatingActionButton = const StartButton();
-      commonScaffoldState?.actions = [
-        ValueListenableBuilder(
-          valueListenable: key.currentState!.addedChildrenNotifier,
-          builder: (_, addedChildren, child) {
-            return ValueListenableBuilder(
-              valueListenable: key.currentState!.isEditNotifier,
-              builder: (_, isEdit, child) {
-                if (!isEdit || addedChildren.isEmpty) {
-                  return Container();
-                }
-                return child!;
-              },
-              child: child,
-            );
-          },
-          child: IconButton(
-            onPressed: () {
-              key.currentState!.showAddModal();
-            },
-            icon: Icon(
-              Icons.add_circle,
-            ),
-          ),
-        ),
-        IconButton(
-          icon: ValueListenableBuilder(
-            valueListenable: key.currentState!.isEditNotifier,
-            builder: (_, isEdit, ___) {
-              return isEdit
-                  ? Icon(Icons.save)
-                  : Icon(
-                      Icons.edit,
-                    );
-            },
-          ),
-          onPressed: () {
-            key.currentState!.isEditNotifier.value =
-                !key.currentState!.isEditNotifier.value;
-          },
-        ),
-      ];
     });
   }
 
@@ -75,7 +37,7 @@ class _DashboardFragmentState extends State<DashboardFragment> {
     return ActiveBuilder(
       label: "dashboard",
       builder: (isCurrent, child) {
-        _initScaffold(isCurrent);
+        _initFab(isCurrent);
         return child!;
       },
       child: Align(
@@ -84,52 +46,52 @@ class _DashboardFragmentState extends State<DashboardFragment> {
           padding: const EdgeInsets.all(16).copyWith(
             bottom: 88,
           ),
-          child: Selector2<AppState, Config, DashboardState>(
-            selector: (_, appState, config) => DashboardState(
-              dashboardWidgets: config.appSetting.dashboardWidgets,
-              viewWidth: appState.viewWidth,
-            ),
-            builder: (_, state, ___) {
-              final columns = max(4 * ((state.viewWidth / 350).ceil()), 8);
-              return SuperGrid(
-                key: key,
+          child: Selector<AppState, double>(
+            selector: (_, appState) => appState.viewWidth,
+            builder: (_, viewWidth, ___) {
+              final columns = max(4 * ((viewWidth / 350).ceil()), 8);
+              final int switchCount = (4 / columns) * viewWidth < 200 ? 8 : 4;
+              return Grid(
                 crossAxisCount: columns,
                 crossAxisSpacing: 16,
                 mainAxisSpacing: 16,
                 children: [
-                  ...state.dashboardWidgets
-                      .where(
-                        (item) => item.platforms.contains(
-                          SupportPlatform.currentPlatform,
-                        ),
-                      )
-                      .map(
-                        (item) => item.widget,
-                      ),
+                  const GridItem(
+                    crossAxisCellCount: 8,
+                    child: NetworkSpeed(),
+                  ),
+                  // if (Platform.isAndroid)
+                  //   GridItem(
+                  //     crossAxisCellCount: switchCount,
+                  //     child: const VPNSwitch(),
+                  //   ),
+                  if (system.isDesktop) ...[
+                    GridItem(
+                      crossAxisCellCount: switchCount,
+                      child: const TUNSwitch(),
+                    ),
+                    GridItem(
+                      crossAxisCellCount: switchCount,
+                      child: const ProxySwitch(),
+                    ),
+                  ],
+                  const GridItem(
+                    crossAxisCellCount: 4,
+                    child: OutboundMode(),
+                  ),
+                  const GridItem(
+                    crossAxisCellCount: 4,
+                    child: NetworkDetection(),
+                  ),
+                  const GridItem(
+                    crossAxisCellCount: 4,
+                    child: TrafficUsage(),
+                  ),
+                  const GridItem(
+                    crossAxisCellCount: 4,
+                    child: IntranetIP(),
+                  ),
                 ],
-                onSave: (girdItems) {
-                  final dashboardWidgets = girdItems
-                      .map(
-                        (item) => DashboardWidget.getDashboardWidget(item),
-                      )
-                      .toList();
-                  final config = globalState.appController.config;
-                  config.appSetting = config.appSetting.copyWith(
-                    dashboardWidgets: dashboardWidgets,
-                  );
-                },
-                addedItemsBuilder: (girdItems) {
-                  return DashboardWidget.values
-                      .where(
-                        (item) =>
-                            !girdItems.contains(item.widget) &&
-                            item.platforms.contains(
-                              SupportPlatform.currentPlatform,
-                            ),
-                      )
-                      .map((item) => item.widget)
-                      .toList();
-                },
               );
             },
           ),

lib/fragments/dashboard/intranet_ip.dart

@@ -0,0 +1,130 @@
+import 'dart:io';
+
+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';
+
+class IntranetIP extends StatefulWidget {
+  const IntranetIP({super.key});
+
+  @override
+  State<IntranetIP> createState() => _IntranetIPState();
+}
+
+class _IntranetIPState extends State<IntranetIP> {
+  final ipNotifier = ValueNotifier<String?>("");
+
+  Future<String> getNetworkType() async {
+    try {
+      List<NetworkInterface> 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')) {
+          return 'WiFi';
+        }
+        if (interface.name.toLowerCase().contains('rmnet') ||
+            interface.name.toLowerCase().contains('ccmni') ||
+            interface.name.toLowerCase().contains('cellular')) {
+          return 'Mobile Data';
+        }
+      }
+
+      return 'Unknown';
+    } catch (e) {
+      return 'Error';
+    }
+  }
+
+  Future<String?> getLocalIpAddress() async {
+    List<NetworkInterface> interfaces = await NetworkInterface.list(
+      includeLoopback: false,
+    )
+      ..sort((a, b) {
+        if (a.isWifi && !b.isWifi) return -1;
+        if (!a.isWifi && b.isWifi) return 1;
+        if (a.includesIPv4 && !b.includesIPv4) return -1;
+        if (!a.includesIPv4 && b.includesIPv4) return 1;
+        return 0;
+      });
+    for (final interface in interfaces) {
+      final addresses = interface.addresses;
+      if (addresses.isEmpty) {
+        continue;
+      }
+      addresses.sort((a, b) {
+        if (a.isIPv4 && !b.isIPv4) return -1;
+        if (!a.isIPv4 && b.isIPv4) return 1;
+        return 0;
+      });
+      return addresses.first.address;
+    }
+    return null;
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    ipNotifier.dispose();
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      ipNotifier.value = await getLocalIpAddress() ?? "";
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return CommonCard(
+      info: Info(
+        label: appLocalizations.intranetIP,
+        iconData: Icons.devices,
+      ),
+      onPressed: () {},
+      child: Container(
+        padding: const EdgeInsets.all(16).copyWith(top: 0),
+        height: globalState.measure.titleMediumHeight + 24 - 2,
+        child: ValueListenableBuilder(
+          valueListenable: ipNotifier,
+          builder: (_, value, __) {
+            return FadeBox(
+              child: value != null
+                  ? Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Flexible(
+                          flex: 1,
+                          child: TooltipText(
+                            text: Text(
+                              value.isNotEmpty ? value : appLocalizations.noNetwork,
+                              style: context
+                                  .textTheme.titleLarge?.toSoftBold.toMinus,
+                              maxLines: 1,
+                              overflow: TextOverflow.ellipsis,
+                            ),
+                          ),
+                        ),
+                      ],
+                    )
+                  : const Padding(
+                      padding: EdgeInsets.all(2),
+                      child: AspectRatio(
+                        aspectRatio: 1,
+                        child: CircularProgressIndicator(),
+                      ),
+                    ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+}

lib/fragments/dashboard/network_detection.dart

@@ -0,0 +1,229 @@
+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';
+
+class NetworkDetection extends StatefulWidget {
+  const NetworkDetection({super.key});
+
+  @override
+  State<NetworkDetection> createState() => _NetworkDetectionState();
+}
+
+class _NetworkDetectionState extends State<NetworkDetection> {
+  final networkDetectionState = ValueNotifier<NetworkDetectionState>(
+    const NetworkDetectionState(
+      isTesting: true,
+      ipInfo: null,
+    ),
+  );
+  bool? _preIsStart;
+  Function? _checkIpDebounce;
+  Timer? _setTimeoutTimer;
+  CancelToken? cancelToken;
+
+  _checkIp() async {
+    final appState = globalState.appController.appState;
+    final appFlowingState = globalState.appController.appFlowingState;
+    final isInit = appState.isInit;
+    if (!isInit) return;
+    final isStart = appFlowingState.isStart;
+    if (_preIsStart == false && _preIsStart == isStart) return;
+    _clearSetTimeoutTimer();
+    networkDetectionState.value = networkDetectionState.value.copyWith(
+      isTesting: true,
+      ipInfo: null,
+    );
+    _preIsStart = isStart;
+    if (cancelToken != null) {
+      cancelToken!.cancel();
+      cancelToken = null;
+    }
+    cancelToken = CancelToken();
+    try {
+      final ipInfo = await request.checkIp(cancelToken: cancelToken);
+      if (ipInfo != null) {
+        networkDetectionState.value = networkDetectionState.value.copyWith(
+          isTesting: false,
+          ipInfo: ipInfo,
+        );
+        return;
+      }
+      _setTimeoutTimer = Timer(const Duration(milliseconds: 2000), () {
+        networkDetectionState.value = networkDetectionState.value.copyWith(
+          isTesting: false,
+          ipInfo: null,
+        );
+      });
+    } catch (_) {
+      networkDetectionState.value = networkDetectionState.value.copyWith(
+        isTesting: true,
+        ipInfo: null,
+      );
+    }
+  }
+
+  _clearSetTimeoutTimer() {
+    if (_setTimeoutTimer != null) {
+      _setTimeoutTimer?.cancel();
+      _setTimeoutTimer = null;
+    }
+  }
+
+  _checkIpContainer(Widget child) {
+    return Selector<AppState, num>(
+      selector: (_, appState) {
+        return appState.checkIpNum;
+      },
+      builder: (_, checkIpNum, child) {
+        if (_checkIpDebounce != null) {
+          _checkIpDebounce!();
+        }
+        return child!;
+      },
+      child: child,
+    );
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    networkDetectionState.dispose();
+  }
+
+  String countryCodeToEmoji(String countryCode) {
+    final String code = countryCode.toUpperCase();
+    if (code.length != 2) {
+      return countryCode;
+    }
+    final int firstLetter = code.codeUnitAt(0) - 0x41 + 0x1F1E6;
+    final int secondLetter = code.codeUnitAt(1) - 0x41 + 0x1F1E6;
+    return String.fromCharCode(firstLetter) + String.fromCharCode(secondLetter);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    _checkIpDebounce ??= debounce(_checkIp);
+    return _checkIpContainer(
+      ValueListenableBuilder<NetworkDetectionState>(
+        valueListenable: networkDetectionState,
+        builder: (_, state, __) {
+          final ipInfo = state.ipInfo;
+          final isTesting = state.isTesting;
+          return CommonCard(
+            onPressed: () {},
+            child: Column(
+              children: [
+                Flexible(
+                  flex: 0,
+                  child: Container(
+                    padding: const EdgeInsets.all(16),
+                    child: Row(
+                      children: [
+                        Icon(
+                          Icons.network_check,
+                          color: Theme.of(context).colorScheme.primary,
+                        ),
+                        const SizedBox(
+                          width: 8,
+                        ),
+                        Flexible(
+                          flex: 1,
+                          child: FadeBox(
+                            child: isTesting
+                                ? Text(
+                                    appLocalizations.checking,
+                                    maxLines: 1,
+                                    overflow: TextOverflow.ellipsis,
+                                    style:
+                                        Theme.of(context).textTheme.titleMedium,
+                                  )
+                                : ipInfo != null
+                                    ? Container(
+                                        alignment: Alignment.centerLeft,
+                                        height: globalState
+                                            .measure.titleMediumHeight,
+                                        child: Text(
+                                          countryCodeToEmoji(
+                                              ipInfo.countryCode),
+                                          style: Theme.of(context)
+                                              .textTheme
+                                              .titleLarge
+                                              ?.copyWith(
+                                                fontFamily: FontFamily.twEmoji.value,
+                                              ),
+                                        ),
+                                      )
+                                    : Text(
+                                        appLocalizations.checkError,
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .titleMedium,
+                                        maxLines: 1,
+                                        overflow: TextOverflow.ellipsis,
+                                      ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+                Container(
+                  height: globalState.measure.titleLargeHeight + 24 - 2,
+                  alignment: Alignment.centerLeft,
+                  padding: const EdgeInsets.all(16).copyWith(top: 0),
+                  child: FadeBox(
+                    child: ipInfo != null
+                        ? Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              Flexible(
+                                flex: 1,
+                                child: TooltipText(
+                                  text: Text(
+                                    ipInfo.ip,
+                                    style: context.textTheme.titleLarge
+                                        ?.toSoftBold.toMinus,
+                                    maxLines: 1,
+                                    overflow: TextOverflow.ellipsis,
+                                  ),
+                                ),
+                              ),
+                            ],
+                          )
+                        : FadeBox(
+                            child: isTesting == false && ipInfo == null
+                                ? Text(
+                                    "timeout",
+                                    style: context.textTheme.titleLarge
+                                        ?.copyWith(color: Colors.red)
+                                        .toSoftBold
+                                        .toMinus,
+                                    maxLines: 1,
+                                    overflow: TextOverflow.ellipsis,
+                                  )
+                                : Container(
+                                    padding: const EdgeInsets.all(2),
+                                    child: const AspectRatio(
+                                      aspectRatio: 1,
+                                      child: CircularProgressIndicator(),
+                                    ),
+                                  ),
+                          ),
+                  ),
+                )
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+}

lib/fragments/dashboard/network_speed.dart

@@ -0,0 +1,166 @@
+import 'package:fl_clash/common/common.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 NetworkSpeed extends StatefulWidget {
+  const NetworkSpeed({super.key});
+
+  @override
+  State<NetworkSpeed> createState() => _NetworkSpeedState();
+}
+
+class _NetworkSpeedState extends State<NetworkSpeed> {
+  List<Point> initPoints = const [Point(0, 0), Point(1, 0)];
+
+  List<Point> _getPoints(List<Traffic> traffics) {
+    List<Point> trafficPoints = traffics
+        .toList()
+        .asMap()
+        .map(
+          (index, e) => MapEntry(
+            index,
+            Point(
+              (index + initPoints.length).toDouble(),
+              e.speed.toDouble(),
+            ),
+          ),
+        )
+        .values
+        .toList();
+
+    return [...initPoints, ...trafficPoints];
+  }
+
+  Traffic _getLastTraffic(List<Traffic> traffics) {
+    if (traffics.isEmpty) return Traffic();
+    return traffics.last;
+  }
+
+  Widget _getLabel({
+    required String label,
+    required IconData iconData,
+    required TrafficValue value,
+  }) {
+    final showValue = value.showValue;
+    final showUnit = "${value.showUnit}/s";
+    final titleLargeSoftBold =
+        Theme.of(context).textTheme.titleLarge?.toSoftBold;
+    final bodyMedium = Theme.of(context).textTheme.bodySmall?.toLight;
+    final valueText = Text(
+      showValue,
+      style: titleLargeSoftBold,
+      maxLines: 1,
+    );
+    final unitText = Text(
+      showUnit,
+      style: bodyMedium,
+      maxLines: 1,
+    );
+    final size = globalState.measure.computeTextSize(valueText);
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      mainAxisSize: MainAxisSize.max,
+      children: [
+        Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          mainAxisSize: MainAxisSize.max,
+          children: [
+            Flexible(
+              child: Icon(iconData),
+            ),
+            Flexible(
+              child: Text(
+                label,
+                style: Theme.of(context).textTheme.titleSmall?.toSoftBold,
+              ),
+            ),
+          ],
+        ),
+        SizedBox(
+            width: size.width,
+            height: size.height,
+            child: OverflowBox(
+              maxWidth: 156,
+              alignment: Alignment.centerLeft,
+              child: Row(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  Flexible(
+                    child: valueText,
+                  ),
+                  const Flexible(
+                    flex: 0,
+                    child: SizedBox(
+                      width: 4,
+                    ),
+                  ),
+                  Flexible(
+                    child: unitText,
+                  ),
+                ],
+              ),
+            ))
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return CommonCard(
+      onPressed: () {},
+      info: Info(
+        label: appLocalizations.networkSpeed,
+        iconData: Icons.speed_sharp,
+      ),
+      child: Selector<AppFlowingState, List<Traffic>>(
+        selector: (_, appFlowingState) => appFlowingState.traffics,
+        builder: (_, traffics, __) {
+          return Container(
+            padding: const EdgeInsets.all(16),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                Expanded(
+                  flex: 0,
+                  child: LineChart(
+                    color: Theme.of(context).colorScheme.primary,
+                    points: _getPoints(traffics),
+                    height: 100,
+                  ),
+                ),
+                const Flexible(child: SizedBox(height: 16)),
+                Flexible(
+                  flex: 0,
+                  child: Row(
+                    mainAxisSize: MainAxisSize.max,
+                    children: [
+                      Expanded(
+                        child: _getLabel(
+                          iconData: Icons.upload,
+                          label: appLocalizations.upload,
+                          value: _getLastTraffic(traffics).up,
+                        ),
+                      ),
+                      Expanded(
+                        child: _getLabel(
+                          iconData: Icons.download,
+                          label: appLocalizations.download,
+                          value: _getLastTraffic(traffics).down,
+                        ),
+                      ),
+                    ],
+                  ),
+                )
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+}

lib/fragments/dashboard/outbound_mode.dart

@@ -0,0 +1,69 @@
+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:intl/intl.dart';
+import 'package:provider/provider.dart';
+
+class OutboundMode extends StatelessWidget {
+  const OutboundMode({super.key});
+
+  _changeMode(BuildContext context, Mode? value) async {
+    final appController = globalState.appController;
+    final clashConfig = appController.clashConfig;
+    if (value == null || clashConfig.mode == value) return;
+    clashConfig.mode = value;
+    appController.addCheckIpNumDebounce();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<ClashConfig, Mode>(
+      selector: (_, clashConfig) => clashConfig.mode,
+      builder: (_, mode, __) {
+        return CommonCard(
+          onPressed: () {},
+          info: Info(
+            label: appLocalizations.outboundMode,
+            iconData: Icons.call_split_sharp,
+          ),
+          child: Padding(
+            padding: const EdgeInsets.only(bottom: 16),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.start,
+              children: [
+                for (final item in Mode.values)
+                  ListItem.radio(
+                    horizontalTitleGap: 4,
+                    prue: true,
+                    padding: const EdgeInsets.only(
+                      left: 12,
+                      right: 16,
+                      top: 8,
+                      bottom: 8,
+                    ),
+                    delegate: RadioDelegate(
+                      value: item,
+                      groupValue: mode,
+                      onChanged: (value) async {
+                        _changeMode(context, value);
+                      },
+                    ),
+                    title: Text(
+                      Intl.message(item.name),
+                      style:
+                          Theme.of(context).textTheme.titleMedium?.toSoftBold,
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+}

lib/fragments/dashboard/status_switch.dart

@@ -0,0 +1,125 @@
+import 'package:fl_clash/common/app_localizations.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,
+//               );
+//             },
+//           );
+//         },
+//       ),
+//     );
+//   }
+// }
+
+class TUNSwitch extends StatelessWidget {
+  const TUNSwitch({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SwitchContainer(
+      info: Info(
+        label: appLocalizations.tun,
+        iconData: Icons.stacked_line_chart,
+      ),
+      child: Selector<ClashConfig, bool>(
+        selector: (_, clashConfig) => clashConfig.tun.enable,
+        builder: (_, enable, __) {
+          return LocaleBuilder(
+            builder: (_) => Switch(
+              value: enable,
+              onChanged: (value) {
+                final clashConfig = globalState.appController.clashConfig;
+                clashConfig.tun = clashConfig.tun.copyWith(
+                  enable: value,
+                );
+              },
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
+
+class ProxySwitch extends StatelessWidget {
+  const ProxySwitch({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SwitchContainer(
+      info: Info(
+        label: appLocalizations.systemProxy,
+        iconData: Icons.shuffle,
+      ),
+      child: Selector<Config, bool>(
+        selector: (_, config) => config.desktopProps.systemProxy,
+        builder: (_, systemProxy, __) {
+          return LocaleBuilder(
+            builder: (_) => Switch(
+              materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+              value: systemProxy,
+              onChanged: (value) {
+                final config = globalState.appController.config;
+                config.desktopProps =
+                    config.desktopProps.copyWith(systemProxy: value);
+              },
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
+
+class SwitchContainer extends StatelessWidget {
+  final Info info;
+  final Widget child;
+
+  const SwitchContainer({
+    super.key,
+    required this.info,
+    required this.child,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return CommonCard(
+      onPressed: () {},
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          InfoHeader(
+            info: info,
+            actions: [
+              child,
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/fragments/dashboard/traffic_usage.dart

@@ -0,0 +1,95 @@
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class TrafficUsage extends StatelessWidget {
+  const TrafficUsage({super.key});
+
+  Widget getTrafficDataItem(
+    BuildContext context,
+    IconData iconData,
+    TrafficValue trafficValue,
+  ) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      mainAxisSize: MainAxisSize.max,
+      children: [
+        Flexible(
+          flex: 1,
+          child: Row(
+            mainAxisSize: MainAxisSize.max,
+            mainAxisAlignment: MainAxisAlignment.start,
+            children: [
+              Icon(
+                iconData,
+                size: 18,
+              ),
+              const SizedBox(
+                width: 8,
+              ),
+              Flexible(
+                flex: 1,
+                child: Text(
+                  trafficValue.showValue,
+                  style: context.textTheme.labelLarge?.copyWith(fontSize: 18),
+                  maxLines: 1,
+                ),
+              ),
+            ],
+          ),
+        ),
+        Text(
+          trafficValue.showUnit,
+          style: context.textTheme.labelMedium?.toLight,
+        ),
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return CommonCard(
+      onPressed: () {},
+      info: Info(
+        label: appLocalizations.trafficUsage,
+        iconData: Icons.data_saver_off,
+      ),
+      child: Selector<AppFlowingState, Traffic>(
+        selector: (_, appFlowingState) => appFlowingState.totalTraffic,
+        builder: (_, totalTraffic, __) {
+          final upTotalTrafficValue = totalTraffic.up;
+          final downTotalTrafficValue = totalTraffic.down;
+          return Padding(
+            padding: const EdgeInsets.all(16).copyWith(top: 0),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Flexible(
+                  flex: 1,
+                  child: getTrafficDataItem(
+                    context,
+                    Icons.arrow_upward,
+                    upTotalTrafficValue,
+                  ),
+                ),
+                const SizedBox(
+                  height: 4,
+                ),
+                Flexible(
+                  flex: 1,
+                  child: getTrafficDataItem(
+                    context,
+                    Icons.arrow_downward,
+                    downTotalTrafficValue,
+                  ),
+                ),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+}

lib/fragments/dashboard/widgets/intranet_ip.dart

@@ -1,64 +0,0 @@
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/app.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 IntranetIP extends StatelessWidget {
-  const IntranetIP({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      height: getWidgetHeight(1),
-      child: CommonCard(
-        info: Info(
-          label: appLocalizations.intranetIP,
-          iconData: Icons.devices,
-        ),
-        onPressed: () {},
-        child: Container(
-          padding: baseInfoEdgeInsets.copyWith(
-            top: 0,
-          ),
-          child: Column(
-            mainAxisSize: MainAxisSize.max,
-            mainAxisAlignment: MainAxisAlignment.end,
-            children: [
-              SizedBox(
-                height: globalState.measure.bodyMediumHeight + 2,
-                child: Selector<AppFlowingState, String?>(
-                  selector: (_, appFlowingState) => appFlowingState.localIp,
-                  builder: (_, value, __) {
-                    return FadeBox(
-                      child: value != null
-                          ? TooltipText(
-                              text: Text(
-                                value.isNotEmpty
-                                    ? value
-                                    : appLocalizations.noNetwork,
-                                style: context.textTheme.bodyMedium?.toLight
-                                    .adjustSize(1),
-                                maxLines: 1,
-                                overflow: TextOverflow.ellipsis,
-                              ),
-                            )
-                          : Container(
-                              padding: EdgeInsets.all(2),
-                              child: AspectRatio(
-                                aspectRatio: 1,
-                                child: CircularProgressIndicator(),
-                              ),
-                            ),
-                    );
-                  },
-                ),
-              )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/fragments/dashboard/widgets/memory_info.dart

@@ -1,111 +0,0 @@
-import 'dart:async';
-
-import 'package:fl_clash/clash/clash.dart';
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/common.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-
-final _memoryInfoStateNotifier =
-    ValueNotifier<TrafficValue>(TrafficValue(value: 0));
-
-class MemoryInfo extends StatefulWidget {
-  const MemoryInfo({super.key});
-
-  @override
-  State<MemoryInfo> createState() => _MemoryInfoState();
-}
-
-class _MemoryInfoState extends State<MemoryInfo> {
-  Timer? timer;
-
-  @override
-  void initState() {
-    super.initState();
-    clashCore.getMemory().then((memory) {
-      _memoryInfoStateNotifier.value = TrafficValue(value: memory);
-    });
-    _updateMemoryData();
-  }
-
-  @override
-  void dispose() {
-    timer?.cancel();
-    super.dispose();
-  }
-
-  _updateMemoryData() {
-    timer = Timer(Duration(seconds: 2), () async {
-      final memory = await clashCore.getMemory();
-      _memoryInfoStateNotifier.value = TrafficValue(value: memory);
-      _updateMemoryData();
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      height: getWidgetHeight(2),
-      child: CommonCard(
-        info: Info(
-          iconData: Icons.memory,
-          label: appLocalizations.memoryInfo,
-        ),
-        onPressed: () {},
-        child: ValueListenableBuilder(
-          valueListenable: _memoryInfoStateNotifier,
-          builder: (_, trafficValue, __) {
-            return Column(
-              children: [
-                Padding(
-                  padding: baseInfoEdgeInsets.copyWith(
-                    bottom: 0,
-                    top: 12,
-                  ),
-                  child: Row(
-                    children: [
-                      Text(
-                        trafficValue.showValue,
-                        style: context.textTheme.titleLarge?.toLight,
-                      ),
-                      SizedBox(
-                        width: 8,
-                      ),
-                      Text(
-                        trafficValue.showUnit,
-                        style: context.textTheme.titleLarge?.toLight,
-                      )
-                    ],
-                  ),
-                ),
-                Flexible(
-                  child: Stack(
-                    children: [
-                      Positioned.fill(
-                        child: WaveView(
-                          waveAmplitude: 12.0,
-                          waveFrequency: 0.35,
-                          waveColor: context.colorScheme.secondaryContainer
-                              .blendDarken(context, factor: 0.1)
-                              .toLighter,
-                        ),
-                      ),
-                      Positioned.fill(
-                        child: WaveView(
-                          waveAmplitude: 12.0,
-                          waveFrequency: 0.9,
-                          waveColor: context.colorScheme.secondaryContainer
-                              .blendDarken(context, factor: 0.1),
-                        ),
-                      ),
-                    ],
-                  ),
-                )
-              ],
-            );
-          },
-        ),
-      ),
-    );
-  }
-}

lib/fragments/dashboard/widgets/network_detection.dart

@@ -1,250 +0,0 @@
-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});
-
-  @override
-  State<NetworkDetection> createState() => _NetworkDetectionState();
-}
-
-class _NetworkDetectionState extends State<NetworkDetection> {
-  bool? _preIsStart;
-  Timer? _setTimeoutTimer;
-  CancelToken? cancelToken;
-  Completer? checkedCompleter;
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  _startCheck() async {
-    await checkedCompleter?.future;
-    if (cancelToken != null) {
-      cancelToken!.cancel();
-      cancelToken = null;
-    }
-    debouncer.call(
-      DebounceTag.checkIp,
-      _checkIp,
-    );
-  }
-
-  _checkIp() async {
-    final appState = globalState.appController.appState;
-    final appFlowingState = globalState.appController.appFlowingState;
-    final isInit = appState.isInit;
-    if (!isInit) return;
-    final isStart = appFlowingState.isStart;
-    if (_preIsStart == false && _preIsStart == isStart) return;
-    _clearSetTimeoutTimer();
-    _networkDetectionState.value = _networkDetectionState.value.copyWith(
-      isTesting: true,
-      ipInfo: null,
-    );
-    _preIsStart = isStart;
-    if (cancelToken != null) {
-      cancelToken!.cancel();
-      cancelToken = null;
-    }
-    cancelToken = CancelToken();
-    try {
-      final ipInfo = await request.checkIp(cancelToken: cancelToken);
-      if (ipInfo != null) {
-        checkedCompleter = Completer();
-        checkedCompleter?.complete(
-          Future.delayed(
-            Duration(milliseconds: 3000),
-          ),
-        );
-        _networkDetectionState.value = _networkDetectionState.value.copyWith(
-          isTesting: false,
-          ipInfo: ipInfo,
-        );
-        return;
-      }
-      _clearSetTimeoutTimer();
-      _setTimeoutTimer = Timer(const Duration(milliseconds: 300), () {
-        _networkDetectionState.value = _networkDetectionState.value.copyWith(
-          isTesting: false,
-          ipInfo: null,
-        );
-      });
-    } catch (e) {
-      if (e.toString() == "cancelled") {
-        _networkDetectionState.value = _networkDetectionState.value.copyWith(
-          isTesting: true,
-          ipInfo: null,
-        );
-      }
-    }
-  }
-
-  @override
-  void dispose() {
-    _clearSetTimeoutTimer();
-    super.dispose();
-  }
-
-  _clearSetTimeoutTimer() {
-    if (_setTimeoutTimer != null) {
-      _setTimeoutTimer?.cancel();
-      _setTimeoutTimer = null;
-    }
-  }
-
-  _checkIpContainer(Widget child) {
-    return Selector<AppState, num>(
-      selector: (_, appState) {
-        return appState.checkIpNum;
-      },
-      shouldRebuild: (prev, next) {
-        if (prev != next) {
-          _startCheck();
-        }
-        return prev != next;
-      },
-      builder: (_, checkIpNum, child) {
-        return child!;
-      },
-      child: child,
-    );
-  }
-
-  _countryCodeToEmoji(String countryCode) {
-    final String code = countryCode.toUpperCase();
-    if (code.length != 2) {
-      return countryCode;
-    }
-    final int firstLetter = code.codeUnitAt(0) - 0x41 + 0x1F1E6;
-    final int secondLetter = code.codeUnitAt(1) - 0x41 + 0x1F1E6;
-    return String.fromCharCode(firstLetter) + String.fromCharCode(secondLetter);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      height: getWidgetHeight(1),
-      child: _checkIpContainer(
-        ValueListenableBuilder<NetworkDetectionState>(
-          valueListenable: _networkDetectionState,
-          builder: (_, state, __) {
-            final ipInfo = state.ipInfo;
-            final isTesting = state.isTesting;
-            return CommonCard(
-              onPressed: () {},
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Container(
-                    height: globalState.measure.titleMediumHeight + 16,
-                    padding: baseInfoEdgeInsets.copyWith(
-                      bottom: 0,
-                    ),
-                    child: Row(
-                      mainAxisSize: MainAxisSize.max,
-                      children: [
-                        ipInfo != null
-                            ? Text(
-                                _countryCodeToEmoji(
-                                  ipInfo.countryCode,
-                                ),
-                                style: Theme.of(context)
-                                    .textTheme
-                                    .titleMedium
-                                    ?.toLight
-                                    .copyWith(
-                                      fontFamily: FontFamily.twEmoji.value,
-                                    ),
-                              )
-                            : Icon(
-                                Icons.network_check,
-                                color: Theme.of(context)
-                                    .colorScheme
-                                    .onSurfaceVariant,
-                              ),
-                        const SizedBox(
-                          width: 8,
-                        ),
-                        Flexible(
-                          flex: 1,
-                          child: TooltipText(
-                            text: Text(
-                              appLocalizations.networkDetection,
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                              style: Theme.of(context)
-                                  .textTheme
-                                  .titleSmall
-                                  ?.copyWith(
-                                    color: context.colorScheme.onSurfaceVariant,
-                                  ),
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                  Container(
-                    padding: baseInfoEdgeInsets.copyWith(
-                      top: 0,
-                    ),
-                    child: SizedBox(
-                      height: globalState.measure.bodyMediumHeight + 2,
-                      child: FadeBox(
-                        child: ipInfo != null
-                            ? TooltipText(
-                                text: Text(
-                                  ipInfo.ip,
-                                  style: context.textTheme.bodyMedium?.toLight
-                                      .adjustSize(1),
-                                  maxLines: 1,
-                                  overflow: TextOverflow.ellipsis,
-                                ),
-                              )
-                            : FadeBox(
-                                child: isTesting == false && ipInfo == null
-                                    ? Text(
-                                        "timeout",
-                                        style: context.textTheme.bodyMedium
-                                            ?.copyWith(color: Colors.red)
-                                            .adjustSize(1),
-                                        maxLines: 1,
-                                        overflow: TextOverflow.ellipsis,
-                                      )
-                                    : Container(
-                                        padding: const EdgeInsets.all(2),
-                                        child: const AspectRatio(
-                                          aspectRatio: 1,
-                                          child: CircularProgressIndicator(),
-                                        ),
-                                      ),
-                              ),
-                      ),
-                    ),
-                  )
-                ],
-              ),
-            );
-          },
-        ),
-      ),
-    );
-  }
-}

lib/fragments/dashboard/widgets/network_speed.dart

@@ -1,124 +0,0 @@
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class NetworkSpeed extends StatefulWidget {
-  const NetworkSpeed({super.key});
-
-  @override
-  State<NetworkSpeed> createState() => _NetworkSpeedState();
-}
-
-class _NetworkSpeedState extends State<NetworkSpeed> {
-  List<Point> initPoints = const [Point(0, 0), Point(1, 0)];
-
-  List<Point> _getPoints(List<Traffic> traffics) {
-    List<Point> trafficPoints = traffics
-        .toList()
-        .asMap()
-        .map(
-          (index, e) => MapEntry(
-            index,
-            Point(
-              (index + initPoints.length).toDouble(),
-              e.speed.toDouble(),
-            ),
-          ),
-        )
-        .values
-        .toList();
-
-    return [...initPoints, ...trafficPoints];
-  }
-
-  Traffic _getLastTraffic(List<Traffic> traffics) {
-    if (traffics.isEmpty) return Traffic();
-    return traffics.last;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final color = context.colorScheme.onSurfaceVariant.toLight;
-    return SizedBox(
-      height: getWidgetHeight(2),
-      child: CommonCard(
-        onPressed: () {},
-        info: Info(
-          label: appLocalizations.networkSpeed,
-          iconData: Icons.speed_sharp,
-        ),
-        child: Selector<AppFlowingState, List<Traffic>>(
-          selector: (_, appFlowingState) => appFlowingState.traffics,
-          builder: (_, traffics, __) {
-            return Stack(
-              children: [
-                Positioned.fill(
-                  child: Padding(
-                    padding: EdgeInsets.all(16).copyWith(
-                      bottom: 0,
-                      left: 0,
-                      right: 0,
-                    ),
-                    child: LineChart(
-                      gradient: true,
-                      color: Theme.of(context).colorScheme.primary,
-                      points: _getPoints(traffics),
-                    ),
-                  ),
-                ),
-                Positioned(
-                  top: 0,
-                  right: 0,
-                  child: Transform.translate(
-                    offset: Offset(
-                      -16,
-                      -20,
-                    ),
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      children: [
-                        Icon(
-                          Icons.arrow_upward,
-                          color: color,
-                          size: 16,
-                        ),
-                        SizedBox(
-                          width: 2,
-                        ),
-                        Text(
-                          "${_getLastTraffic(traffics).up}/s",
-                          style: context.textTheme.bodySmall?.copyWith(
-                            color: color,
-                          ),
-                        ),
-                        SizedBox(
-                          width: 16,
-                        ),
-                        Icon(
-                          Icons.arrow_downward,
-                          color: color,
-                          size: 16,
-                        ),
-                        SizedBox(
-                          width: 2,
-                        ),
-                        Text(
-                          "${_getLastTraffic(traffics).down}/s",
-                          style: context.textTheme.bodySmall?.copyWith(
-                            color: color,
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-              ],
-            );
-          },
-        ),
-      ),
-    );
-  }
-}

lib/fragments/dashboard/widgets/outbound_mode.dart

@@ -1,73 +0,0 @@
-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:intl/intl.dart';
-import 'package:provider/provider.dart';
-
-class OutboundMode extends StatelessWidget {
-  const OutboundMode({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final height = getWidgetHeight(2);
-    return SizedBox(
-      height: height,
-      child: Selector<ClashConfig, Mode>(
-        selector: (_, clashConfig) => clashConfig.mode,
-        builder: (_, mode, __) {
-          return CommonCard(
-            onPressed: () {},
-            info: Info(
-              label: appLocalizations.outboundMode,
-              iconData: Icons.call_split_sharp,
-            ),
-            child: Padding(
-              padding: const EdgeInsets.only(
-                top: 12,
-                bottom: 16,
-              ),
-              child: Column(
-                mainAxisSize: MainAxisSize.max,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                mainAxisAlignment: MainAxisAlignment.start,
-                children: [
-                  for (final item in Mode.values)
-                    Flexible(
-                      child: ListItem.radio(
-                        prue: true,
-                        horizontalTitleGap: 4,
-                        padding: const EdgeInsets.only(
-                          left: 12,
-                          right: 16,
-                        ),
-                        delegate: RadioDelegate(
-                          value: item,
-                          groupValue: mode,
-                          onChanged: (value) async {
-                            if (value == null) {
-                              return;
-                            }
-                            globalState.appController.changeMode(value);
-                          },
-                        ),
-                        title: Text(
-                          Intl.message(item.name),
-                          style: Theme.of(context)
-                              .textTheme
-                              .bodyMedium
-                              ?.toSoftBold,
-                        ),
-                      ),
-                    ),
-                ],
-              ),
-            ),
-          );
-        },
-      ),
-    );
-  }
-}

lib/fragments/dashboard/widgets/quick_options.dart

@@ -1,156 +0,0 @@
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/fragments/config/network.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 TUNButton extends StatelessWidget {
-  const TUNButton({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return LocaleBuilder(
-      builder: (_) => SizedBox(
-        height: getWidgetHeight(1),
-        child: CommonCard(
-          onPressed: () {
-            showSheet(
-              context: context,
-              body: generateListView(generateSection(
-                items: [
-                  if (system.isDesktop) const TUNItem(),
-                  const TunStackItem(),
-                ],
-              )),
-              title: appLocalizations.tun,
-            );
-          },
-          info: Info(
-            label: appLocalizations.tun,
-            iconData: Icons.stacked_line_chart,
-          ),
-          child: Container(
-            padding: baseInfoEdgeInsets.copyWith(
-              top: 4,
-              bottom: 8,
-              right: 8,
-            ),
-            child: Row(
-              mainAxisSize: MainAxisSize.max,
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Flexible(
-                  flex: 1,
-                  child: TooltipText(
-                    text: Text(
-                      appLocalizations.options,
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                      style: Theme.of(context)
-                          .textTheme
-                          .titleSmall
-                          ?.adjustSize(-2)
-                          .toLight,
-                    ),
-                  ),
-                ),
-                Selector<ClashConfig, bool>(
-                  selector: (_, clashConfig) => clashConfig.tun.enable,
-                  builder: (_, enable, __) {
-                    return Switch(
-                      value: enable,
-                      onChanged: (value) {
-                        final clashConfig =
-                            globalState.appController.clashConfig;
-                        clashConfig.tun = clashConfig.tun.copyWith(
-                          enable: value,
-                        );
-                      },
-                    );
-                  },
-                )
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class SystemProxyButton extends StatelessWidget {
-  const SystemProxyButton({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      height: getWidgetHeight(1),
-      child: LocaleBuilder(
-        builder: (_) => CommonCard(
-          onPressed: () {
-            showSheet(
-              context: context,
-              body: generateListView(
-                generateSection(
-                  items: [
-                    SystemProxyItem(),
-                    BypassDomainItem(),
-                  ],
-                ),
-              ),
-              title: appLocalizations.systemProxy,
-            );
-          },
-          info: Info(
-            label: appLocalizations.systemProxy,
-            iconData: Icons.shuffle,
-          ),
-          child: Container(
-            padding: baseInfoEdgeInsets.copyWith(
-              top: 4,
-              bottom: 8,
-              right: 8,
-            ),
-            child: Row(
-              mainAxisSize: MainAxisSize.max,
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Flexible(
-                  flex: 1,
-                  child: TooltipText(
-                    text: Text(
-                      appLocalizations.options,
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                      style: Theme.of(context)
-                          .textTheme
-                          .titleSmall
-                          ?.adjustSize(-2)
-                          .toLight,
-                    ),
-                  ),
-                ),
-                Selector<Config, bool>(
-                  selector: (_, config) => config.networkProps.systemProxy,
-                  builder: (_, systemProxy, __) {
-                    return Switch(
-                      materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                      value: systemProxy,
-                      onChanged: (value) {
-                        final config = globalState.appController.config;
-                        config.networkProps =
-                            config.networkProps.copyWith(systemProxy: value);
-                      },
-                    );
-                  },
-                )
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/fragments/dashboard/widgets/traffic_usage.dart

@@ -1,220 +0,0 @@
-import 'dart:math';
-
-import 'package:fl_clash/common/common.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 TrafficUsage extends StatelessWidget {
-  const TrafficUsage({super.key});
-
-  Widget getTrafficDataItem(
-    BuildContext context,
-    Icon icon,
-    TrafficValue trafficValue,
-  ) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-      mainAxisSize: MainAxisSize.max,
-      children: [
-        Flexible(
-          flex: 1,
-          child: Row(
-            mainAxisSize: MainAxisSize.max,
-            mainAxisAlignment: MainAxisAlignment.start,
-            children: [
-              icon,
-              const SizedBox(
-                width: 8,
-              ),
-              Flexible(
-                flex: 1,
-                child: Text(
-                  trafficValue.showValue,
-                  style: context.textTheme.bodySmall,
-                  maxLines: 1,
-                ),
-              ),
-            ],
-          ),
-        ),
-        Text(
-          trafficValue.showUnit,
-          style: context.textTheme.bodySmall?.toLighter,
-        ),
-      ],
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final primaryColor =
-        context.colorScheme.surfaceContainer.blendDarken(context, factor: 0.2);
-    final secondaryColor =
-        context.colorScheme.primaryContainer.blendDarken(context, factor: 0.3);
-    return SizedBox(
-      height: getWidgetHeight(2),
-      child: CommonCard(
-        info: Info(
-          label: appLocalizations.trafficUsage,
-          iconData: Icons.data_saver_off,
-        ),
-        onPressed: () {},
-        child: Selector<AppFlowingState, Traffic>(
-          selector: (_, appFlowingState) => appFlowingState.totalTraffic,
-          builder: (_, totalTraffic, __) {
-            final upTotalTrafficValue = totalTraffic.up;
-            final downTotalTrafficValue = totalTraffic.down;
-            return Padding(
-              padding: baseInfoEdgeInsets.copyWith(
-                top: 0,
-              ),
-              child: Column(
-                mainAxisSize: MainAxisSize.max,
-                mainAxisAlignment: MainAxisAlignment.end,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Flexible(
-                    child: Container(
-                      padding: EdgeInsets.symmetric(
-                        vertical: 12,
-                      ),
-                      child: Row(
-                        mainAxisSize: MainAxisSize.max,
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          AspectRatio(
-                            aspectRatio: 1,
-                            child: DonutChart(
-                              data: [
-                                DonutChartData(
-                                  value: upTotalTrafficValue.value.toDouble(),
-                                  color: primaryColor,
-                                ),
-                                DonutChartData(
-                                  value: downTotalTrafficValue.value.toDouble(),
-                                  color: secondaryColor,
-                                ),
-                              ],
-                            ),
-                          ),
-                          SizedBox(
-                            width: 8,
-                          ),
-                          Flexible(
-                            child: LayoutBuilder(
-                              builder: (_, container) {
-                                final uploadText = Text(
-                                  maxLines: 1,
-                                  appLocalizations.upload,
-                                  overflow: TextOverflow.ellipsis,
-                                  style: context.textTheme.bodySmall,
-                                );
-                                final downloadText = Text(
-                                  maxLines: 1,
-                                  appLocalizations.download,
-                                  overflow: TextOverflow.ellipsis,
-                                  style: context.textTheme.bodySmall,
-                                );
-                                final uploadTextSize = globalState.measure
-                                    .computeTextSize(uploadText);
-                                final downloadTextSize = globalState.measure
-                                    .computeTextSize(downloadText);
-                                final maxTextWidth = max(uploadTextSize.width,
-                                    downloadTextSize.width);
-                                if (maxTextWidth + 24 > container.maxWidth) {
-                                  return Container();
-                                }
-                                return Column(
-                                  crossAxisAlignment: CrossAxisAlignment.start,
-                                  children: [
-                                    Row(
-                                      mainAxisSize: MainAxisSize.min,
-                                      children: [
-                                        Container(
-                                          width: 20,
-                                          height: 8,
-                                          decoration: BoxDecoration(
-                                            color: primaryColor,
-                                            borderRadius:
-                                                BorderRadius.circular(2),
-                                          ),
-                                        ),
-                                        SizedBox(
-                                          width: 4,
-                                        ),
-                                        Text(
-                                          maxLines: 1,
-                                          appLocalizations.upload,
-                                          overflow: TextOverflow.ellipsis,
-                                          style: context.textTheme.bodySmall,
-                                        ),
-                                      ],
-                                    ),
-                                    SizedBox(
-                                      height: 4,
-                                    ),
-                                    Row(
-                                      mainAxisSize: MainAxisSize.min,
-                                      children: [
-                                        Container(
-                                          width: 20,
-                                          height: 8,
-                                          decoration: BoxDecoration(
-                                            color: secondaryColor,
-                                            borderRadius:
-                                                BorderRadius.circular(2),
-                                          ),
-                                        ),
-                                        SizedBox(
-                                          width: 4,
-                                        ),
-                                        Text(
-                                          maxLines: 1,
-                                          appLocalizations.download,
-                                          overflow: TextOverflow.ellipsis,
-                                          style: context.textTheme.bodySmall,
-                                        ),
-                                      ],
-                                    ),
-                                  ],
-                                );
-                              },
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                  getTrafficDataItem(
-                    context,
-                    Icon(
-                      Icons.arrow_upward,
-                      color: primaryColor,
-                      size: 14,
-                    ),
-                    upTotalTrafficValue,
-                  ),
-                  const SizedBox(
-                    height: 8,
-                  ),
-                  getTrafficDataItem(
-                    context,
-                    Icon(
-                      Icons.arrow_downward,
-                      color: secondaryColor,
-                      size: 14,
-                    ),
-                    downTotalTrafficValue,
-                  )
-                ],
-              ),
-            );
-          },
-        ),
-      ),
-    );
-  }
-}

lib/fragments/dashboard/widgets/widgets.dart

@@ -1,7 +0,0 @@
-export 'intranet_ip.dart';
-export 'network_detection.dart';
-export 'network_speed.dart';
-export 'outbound_mode.dart';
-export 'quick_options.dart';
-export 'traffic_usage.dart';
-export 'memory_info.dart';

lib/fragments/logs.dart

@@ -49,11 +49,11 @@ class _LogsFragmentState extends State<LogsFragment> {
 
   @override
   void dispose() {
+    super.dispose();
     timer?.cancel();
     logsNotifier.dispose();
     scrollController.dispose();
     timer = null;
-    super.dispose();
   }
 
   _handleExport() async {
@@ -87,6 +87,9 @@ class _LogsFragmentState extends State<LogsFragment> {
           },
           icon: const Icon(Icons.search),
         ),
+        const SizedBox(
+          width: 8,
+        ),
         IconButton(
           onPressed: () {
             _handleExport();
@@ -232,8 +235,8 @@ class LogsSearchDelegate extends SearchDelegate {
 
   @override
   void dispose() {
-    logsNotifier.dispose();
     super.dispose();
+    logsNotifier.dispose();
   }
 
   get state => logsNotifier.value;

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';
@@ -52,6 +52,9 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
         );
         try {
           await appController.updateProfile(profile);
+          if (profile.id == appController.config.currentProfile?.id) {
+            appController.applyProfileDebounce();
+          }
         } catch (e) {
           messages.add("${profile.label ?? profile.id}: $e \n");
           config.setProfile(
@@ -90,13 +93,16 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
             },
             icon: const Icon(Icons.sync),
           ),
+          const SizedBox(
+            width: 8,
+          ),
           IconButton(
             onPressed: () {
               final profiles = globalState.appController.config.profiles;
               showSheet(
                 title: appLocalizations.profilesSort,
                 context: context,
-                body: SizedBox(
+                builder: (_) => SizedBox(
                   height: 400,
                   child: ReorderableProfiles(profiles: profiles),
                 ),
@@ -121,8 +127,8 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
   Widget build(BuildContext context) {
     return ActiveBuilder(
       label: "profiles",
-      builder: (isCurrent, child) {
-        if (isCurrent) {
+      builder: (isCurrent,child){
+        if(isCurrent){
           _initScaffold();
         }
         return child!;
@@ -215,6 +221,9 @@ class ProfileItem extends StatelessWidget {
           ),
         );
         await appController.updateProfile(profile);
+        if (profile.id == appController.config.currentProfile?.id) {
+          appController.applyProfileDebounce();
+        }
       } catch (e) {
         config.setProfile(
           profile.copyWith(
@@ -237,16 +246,44 @@ 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 subscriptionInfo = profile.subscriptionInfo;
+    final userInfo = profile.userInfo;
     return [
       const SizedBox(
         height: 8,
       ),
-      if (subscriptionInfo != null)
-        SubscriptionInfoView(
-          subscriptionInfo: subscriptionInfo,
-        ),
+      if (userInfo != null) ..._buildUserInfo(context, userInfo),
       Text(
         profile.lastUpdateDate?.lastUpdateTimeDesc ?? "",
         style: context.textTheme.labelMedium?.toLight,
@@ -287,7 +324,6 @@ class ProfileItem extends StatelessWidget {
                     child: CircularProgressIndicator(),
                   )
                 : CommonPopupMenu<ProfileActions>(
-                    icon: Icon(Icons.more_vert),
                     items: [
                       CommonPopupMenuItem(
                         action: ProfileActions.edit,

lib/fragments/profiles/view_profile.dart

@@ -41,9 +41,9 @@ class _ViewProfileState extends State<ViewProfile> {
 
   @override
   void dispose() {
+    super.dispose();
     _controller.dispose();
     _focusNode.dispose();
-    super.dispose();
   }
 
   Profile get profile => widget.profile;

lib/fragments/proxies/card.dart

@@ -11,6 +11,7 @@ class ProxyCard extends StatelessWidget {
   final String groupName;
   final Proxy proxy;
   final GroupType groupType;
+  final CommonCardType style;
   final ProxyCardType type;
 
   const ProxyCard({
@@ -18,6 +19,7 @@ class ProxyCard extends StatelessWidget {
     required this.groupName,
     required this.proxy,
     required this.groupType,
+    this.style = CommonCardType.plain,
     required this.type,
   });
 
@@ -113,11 +115,16 @@ class ProxyCard extends StatelessWidget {
         groupName,
         nextProxyName,
       );
-      await appController.changeProxyDebounce(groupName, nextProxyName);
+      appController.changeProxy(
+        groupName: groupName,
+        proxyName: nextProxyName,
+      );
+      await appController.updateGroupDebounce();
       return;
     }
-    globalState.showNotifier(
-      appLocalizations.notSelectedTip,
+    globalState.showSnackBar(
+      context,
+      message: appLocalizations.notSelectedTip,
     );
   }
 
@@ -132,6 +139,7 @@ class ProxyCard extends StatelessWidget {
         return Stack(
           children: [
             CommonCard(
+              type: style,
               key: key,
               onPressed: () {
                 _changeProxy(context);
@@ -160,8 +168,8 @@ class ProxyCard extends StatelessWidget {
                               desc,
                               overflow: TextOverflow.ellipsis,
                               style: context.textTheme.bodySmall?.copyWith(
-                                color:
-                                    context.textTheme.bodySmall?.color?.toLight,
+                                color: context.textTheme.bodySmall?.color
+                                    ?.toLight(),
                               ),
                             );
                           },
@@ -185,8 +193,8 @@ class ProxyCard extends StatelessWidget {
                                   proxy.type,
                                   style: context.textTheme.bodySmall?.copyWith(
                                     overflow: TextOverflow.ellipsis,
-                                    color: context
-                                        .textTheme.bodySmall?.color?.toLight,
+                                    color: context.textTheme.bodySmall?.color
+                                        ?.toLight(),
                                   ),
                                 ),
                               ),

lib/fragments/proxies/list.dart

@@ -51,7 +51,7 @@ class _ProxiesListFragmentState extends State<ProxiesListFragment> {
     }
     _headerStateNotifier.value = _headerStateNotifier.value.copyWith(
       currentIndex: currentIndex,
-      offset: max(headerOffset, 0),
+      offset: headerOffset,
     );
   }
 
@@ -65,10 +65,10 @@ class _ProxiesListFragmentState extends State<ProxiesListFragment> {
 
   @override
   void dispose() {
+    super.dispose();
     _headerStateNotifier.dispose();
     _controller.removeListener(_adjustHeader);
     _controller.dispose();
-    super.dispose();
   }
 
   _handleChange(Set<String> currentUnfoldSet, String groupName) {
@@ -299,9 +299,6 @@ class _ProxiesListFragmentState extends State<ProxiesListFragment> {
                         headerState.currentIndex > state.groupNames.length - 1
                             ? 0
                             : headerState.currentIndex;
-                    if (index < 0 || state.groupNames.isEmpty) {
-                      return Container();
-                    }
                     return Stack(
                       children: [
                         Positioned(
@@ -420,9 +417,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;
               }
             });
@@ -442,10 +439,10 @@ class _ListHeaderState extends State<ListHeader>
                   padding: const EdgeInsets.all(8),
                   decoration: BoxDecoration(
                     color: context.colorScheme.secondaryContainer,
-                    borderRadius: BorderRadius.circular(12),
+                    borderRadius: BorderRadius.circular(16),
                   ),
                   clipBehavior: Clip.antiAlias,
-                  child: CommonTargetIcon(
+                  child: CommonIcon(
                     src: icon,
                     size: 32,
                   ),
@@ -454,7 +451,7 @@ class _ListHeaderState extends State<ListHeader>
                   margin: const EdgeInsets.only(
                     right: 16,
                   ),
-                  child: CommonTargetIcon(
+                  child: CommonIcon(
                     src: icon,
                     size: 42,
                   ),
@@ -471,10 +468,7 @@ class _ListHeaderState extends State<ListHeader>
   Widget build(BuildContext context) {
     return CommonCard(
       key: widget.key,
-      backgroundColor: WidgetStatePropertyAll(
-        context.colorScheme.surfaceContainer,
-      ),
-      radius: 14,
+      radius: 24,
       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/core.dart';
+import 'package:fl_clash/models/ffi.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
@@ -27,7 +27,6 @@ class _ProvidersState extends State<Providers> {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback(
       (_) {
-        globalState.appController.updateProviders();
         final commonScaffoldState =
             context.findAncestorStateOfType<CommonScaffoldState>();
         commonScaffoldState?.actions = [
@@ -56,12 +55,12 @@ class _ProvidersState extends State<Providers> {
           providerName: provider.name,
         );
         appState.setProvider(
-          await clashCore.getExternalProvider(provider.name),
+          clashCore.getExternalProvider(provider.name),
         );
       },
     );
     await Future.wait(updateProviders);
-    await globalState.appController.updateGroupsDebounce();
+    await globalState.appController.updateGroupDebounce();
   }
 
   @override
@@ -122,10 +121,10 @@ class ProviderItem extends StatelessWidget {
         if (message.isNotEmpty) throw message;
       });
       appState.setProvider(
-        await clashCore.getExternalProvider(provider.name),
+        clashCore.getExternalProvider(provider.name),
       );
     });
-    await globalState.appController.updateGroupsDebounce();
+    await globalState.appController.updateGroupDebounce();
   }
 
   _handleSideLoadProvider() async {
@@ -133,8 +132,8 @@ class ProviderItem extends StatelessWidget {
       final platformFile = await picker.pickerFile();
       final appState = globalState.appController.appState;
       final bytes = platformFile?.bytes;
-      if (bytes == null || provider.path == null) return;
-      final file = await File(provider.path!).create(recursive: true);
+      if (bytes == null) return;
+      final file = await File(provider.path).create(recursive: true);
       await file.writeAsBytes(bytes);
       final providerName = provider.name;
       var message = await clashCore.sideLoadExternalProvider(
@@ -143,15 +142,16 @@ class ProviderItem extends StatelessWidget {
       );
       if (message.isNotEmpty) throw message;
       appState.setProvider(
-        await clashCore.getExternalProvider(provider.name),
+        clashCore.getExternalProvider(provider.name),
       );
       if (message.isNotEmpty) throw message;
     });
-    await globalState.appController.updateGroupsDebounce();
+    await globalState.appController.updateGroupDebounce();
   }
 
   String _buildProviderDesc() {
-    final baseInfo = provider.updateAt.lastUpdateTimeDesc;
+    final baseInfo =
+        "${provider.type}(${provider.vehicleType}) ·  ${provider.updateAt.lastUpdateTimeDesc}";
     final count = provider.count;
     return switch (count == 0) {
       true => baseInfo,
@@ -176,13 +176,10 @@ class ProviderItem extends StatelessWidget {
           Text(
             _buildProviderDesc(),
           ),
-          const SizedBox(
-            height: 4,
+          Text(
+            provider.path,
+            style: context.textTheme.bodyMedium?.toLight,
           ),
-          if (provider.subscriptionInfo != null)
-            SubscriptionInfoView(
-              subscriptionInfo: provider.subscriptionInfo,
-            ),
           const SizedBox(
             height: 8,
           ),
@@ -203,9 +200,6 @@ class ProviderItem extends StatelessWidget {
                 ),
             ],
           ),
-          const SizedBox(
-            height: 4,
-          ),
         ],
       ),
       trailing: SizedBox(

lib/fragments/proxies/proxies.dart

@@ -40,6 +40,9 @@ class _ProxiesFragmentState extends State<ProxiesFragment> {
               Icons.poll_outlined,
             ),
           ),
+          const SizedBox(
+            width: 8,
+          ),
         ],
         if (proxiesType == ProxiesType.tab) ...[
           IconButton(
@@ -50,6 +53,9 @@ class _ProxiesFragmentState extends State<ProxiesFragment> {
               Icons.adjust_outlined,
             ),
           ),
+          const SizedBox(
+            width: 8,
+          )
         ] else ...[
           IconButton(
             onPressed: () {
@@ -79,7 +85,7 @@ class _ProxiesFragmentState extends State<ProxiesFragment> {
                           borderRadius: BorderRadius.circular(16),
                         ),
                         clipBehavior: Clip.antiAlias,
-                        child: CommonTargetIcon(
+                        child: CommonIcon(
                           src: item.value,
                           size: 42,
                         ),
@@ -104,13 +110,18 @@ class _ProxiesFragmentState extends State<ProxiesFragment> {
               Icons.style_outlined,
             ),
           ),
+          const SizedBox(
+            width: 8,
+          )
         ],
         IconButton(
           onPressed: () {
             showSheet(
               title: appLocalizations.proxiesSetting,
               context: context,
-              body: const ProxiesSetting(),
+              builder: (context) {
+                return const ProxiesSetting();
+              },
             );
           },
           icon: const Icon(