Fix flashback caused by process

Optimize quick start

Update system default option

(cherry picked from commit 05abf2d56d)

.github/workflows/build.yml

@@ -15,37 +15,17 @@ jobs:
             os: ubuntu-latest
           - platform: windows
             os: windows-latest
-            arch: amd64
           - platform: linux
             os: ubuntu-latest
-            arch: amd64
           - platform: macos
             os: macos-13
-            arch: amd64
-          - platform: macos
-            os: macos-latest
-            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
+            echo "Running on ${{ matrix.os }}"
+            echo "Arch: ${{ runner.arch }}"
+            gcc --version
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -72,10 +52,10 @@ jobs:
         if: startsWith(matrix.platform,'android')
         run: |
           echo "${{ secrets.KEYSTORE }}" | base64 --decode > android/app/keystore.jks
-          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties
+          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties    
           echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> android/local.properties
           echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/local.properties
-
+          
 
       - name: Setup Go
         uses: actions/setup-go@v5
@@ -95,12 +75,13 @@ jobs:
         run: flutter pub get
 
       - name: Setup
-        run: dart setup.dart ${{ matrix.platform }} ${{ matrix.arch && format('--arch {0}', matrix.arch) }}
+        run: |
+          dart setup.dart ${{ matrix.platform }}
 
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          name: artifact-${{ matrix.platform }}${{ matrix.arch && format('-{0}', matrix.arch) }}
+          name: artifact-${{ matrix.platform }}
           path: ./dist
           retention-days: 1
           overwrite: true
@@ -140,18 +121,4 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           files: ./dist/*
-          body_path: './release.md'
-
-      - name: Push to fdroid repo
-        uses: cpina/github-action-push-to-another-repository@v1.7.2
-        env:
-          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
-        with:
-          source-directory: ./dist/
-          destination-github-username: chen08209
-          destination-repository-name: FlClash-fdroid-repo
-          user-name: 'github-actions[bot]'
-          user-email: 'github-actions[bot]@users.noreply.github.com'
-          target-branch: action-pr
-          commit-message: Update from ${{ github.ref_name }}
-          target-directory: /tmp/
+          body_path: './release.md'

README.md

@@ -38,10 +38,6 @@ on Mobile:
 
 ✨ Support subscription link, Dark mode
 
-## 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>
-
 ## Contact
 
 [Telegram](https://t.me/+G-veVtwBOl4wODc1)

README_zh_CN.md

@@ -38,11 +38,6 @@ on Mobile:
 
 ✨ 支持一键导入订阅, 深色模式
 
-## 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>
-
-
 ## Contact
 
 [Telegram](https://t.me/+G-veVtwBOl4wODc1)

android/app/build.gradle

@@ -62,7 +62,7 @@ android {
 
     defaultConfig {
         applicationId "com.follow.clash"
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

android/app/src/main/AndroidManifest.xml

@@ -22,11 +22,9 @@
     <application
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:extractNativeLibs="true"
-        android:enableOnBackInvokedCallback="true"
-        android:label="FlClash"
-        tools:targetApi="tiramisu">
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:label="FlClash">
         <activity
             android:name="com.follow.clash.MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -75,11 +73,10 @@
         <service
             android:name=".services.FlClashTileService"
             android:exported="true"
-            android:icon="@drawable/ic_stat_name"
+            android:icon="@drawable/icon"
             android:foregroundServiceType="specialUse"
             android:label="FlClash"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            >
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
@@ -87,35 +84,11 @@
                 android:name="android.service.quicksettings.TOGGLEABLE_TILE"
                 android:value="true" />
         </service>
-
-        <provider
-            android:name=".FilesProvider"
-            android:authorities="${applicationId}.files"
-            android:exported="true"
-            android:grantUriPermissions="true"
-            android:permission="android.permission.MANAGE_DOCUMENTS"
-            android:process=":background">
-            <intent-filter>
-                <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
-            </intent-filter>
-        </provider>
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
-
         <service
             android:name=".services.FlClashVpnService"
             android:exported="false"
             android:foregroundServiceType="specialUse"
-            android:permission="android.permission.BIND_VPN_SERVICE"
-            >
+            android:permission="android.permission.BIND_VPN_SERVICE">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>

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

@@ -1,112 +0,0 @@
-package com.follow.clash
-
-import android.database.Cursor
-import android.database.MatrixCursor
-import android.os.CancellationSignal
-import android.os.ParcelFileDescriptor
-import android.provider.DocumentsContract.Document
-import android.provider.DocumentsContract.Root
-import android.provider.DocumentsProvider
-import java.io.File
-import java.io.FileNotFoundException
-
-
-class FilesProvider : DocumentsProvider() {
-
-    companion object {
-        private const val DEFAULT_ROOT_ID = "0"
-
-        private val DEFAULT_DOCUMENT_COLUMNS = arrayOf(
-            Document.COLUMN_DOCUMENT_ID,
-            Document.COLUMN_DISPLAY_NAME,
-            Document.COLUMN_MIME_TYPE,
-            Document.COLUMN_FLAGS,
-            Document.COLUMN_SIZE,
-        )
-        private val DEFAULT_ROOT_COLUMNS = arrayOf(
-            Root.COLUMN_ROOT_ID,
-            Root.COLUMN_FLAGS,
-            Root.COLUMN_ICON,
-            Root.COLUMN_TITLE,
-            Root.COLUMN_SUMMARY,
-            Root.COLUMN_DOCUMENT_ID
-        )
-    }
-
-    override fun onCreate(): Boolean {
-        return true
-    }
-
-    override fun queryRoots(projection: Array<String>?): Cursor {
-        return MatrixCursor(projection ?: DEFAULT_ROOT_COLUMNS).apply {
-            newRow().apply {
-                add(Root.COLUMN_ROOT_ID, DEFAULT_ROOT_ID)
-                add(Root.COLUMN_FLAGS, Root.FLAG_LOCAL_ONLY)
-                add(Root.COLUMN_ICON, R.mipmap.ic_launcher)
-                add(Root.COLUMN_TITLE, context!!.getString(R.string.fl_clash))
-                add(Root.COLUMN_SUMMARY, "Data")
-                add(Root.COLUMN_DOCUMENT_ID, "/")
-            }
-        }
-    }
-
-
-    override fun queryChildDocuments(
-        parentDocumentId: String,
-        projection: Array<String>?,
-        sortOrder: String?
-    ): Cursor {
-        val result = MatrixCursor(resolveDocumentProjection(projection))
-        val parentFile = if (parentDocumentId == "/") {
-            context?.filesDir
-        } else {
-            File(parentDocumentId)
-        } ?: throw FileNotFoundException("Parent directory not found")
-        parentFile.listFiles()?.forEach { file ->
-            includeFile(result, file)
-        }
-        return result
-    }
-
-    override fun queryDocument(documentId: String, projection: Array<String>?): Cursor {
-        val result = MatrixCursor(resolveDocumentProjection(projection))
-        val file = File(documentId)
-        includeFile(result, file)
-        return result
-    }
-
-    override fun openDocument(
-        documentId: String,
-        mode: String,
-        signal: CancellationSignal?
-    ): ParcelFileDescriptor {
-        val file = File(documentId)
-        val accessMode = ParcelFileDescriptor.parseMode(mode)
-        return ParcelFileDescriptor.open(file, accessMode)
-    }
-
-    private fun includeFile(result: MatrixCursor, file: File) {
-        result.newRow().apply {
-            add(Document.COLUMN_DOCUMENT_ID, file.absolutePath)
-            add(Document.COLUMN_DISPLAY_NAME, file.name)
-            add(Document.COLUMN_SIZE, file.length())
-            add(
-                Document.COLUMN_FLAGS,
-                Document.FLAG_SUPPORTS_WRITE or Document.FLAG_SUPPORTS_DELETE
-            )
-            add(Document.COLUMN_MIME_TYPE, getDocumentType(file))
-        }
-    }
-
-    private fun getDocumentType(file: File): String {
-        return if (file.isDirectory) {
-            Document.MIME_TYPE_DIR
-        } else {
-            "application/octet-stream"
-        }
-    }
-
-    private fun resolveDocumentProjection(projection: Array<String>?): Array<String> {
-        return projection ?: DEFAULT_DOCUMENT_COLUMNS
-    }
-}

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

@@ -1,16 +1,10 @@
 package com.follow.clash
 
-import android.content.Context
-import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import com.follow.clash.plugins.AppPlugin
-import com.follow.clash.plugins.ProxyPlugin
 import com.follow.clash.plugins.TilePlugin
-import io.flutter.FlutterInjector
 import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.embedding.engine.dart.DartExecutor
-import java.util.concurrent.locks.ReentrantLock
-import kotlin.concurrent.withLock
+import java.util.Date
 
 enum class RunState {
     START,
@@ -18,46 +12,16 @@ enum class RunState {
     STOP
 }
 
+class GlobalState {
+    companion object {
+        val runState: MutableLiveData<RunState> = MutableLiveData<RunState>(RunState.STOP)
+        var runTime: Date? = null
+        var flutterEngine: FlutterEngine? = null
+        fun getCurrentTilePlugin(): TilePlugin? =
+            flutterEngine?.plugins?.get(TilePlugin::class.java) as TilePlugin?
 
-object GlobalState {
-
-    private val lock = ReentrantLock()
-
-    val runState: MutableLiveData<RunState> = MutableLiveData<RunState>(RunState.STOP)
-    var flutterEngine: FlutterEngine? = null
-    private var serviceEngine: FlutterEngine? = null
-
-    fun getCurrentAppPlugin(): AppPlugin? {
-        val currentEngine = if (flutterEngine != null) flutterEngine else serviceEngine
-        return currentEngine?.plugins?.get(AppPlugin::class.java) as AppPlugin?
-    }
-
-    fun getCurrentTitlePlugin(): TilePlugin? {
-        val currentEngine = if (flutterEngine != null) flutterEngine else serviceEngine
-        return currentEngine?.plugins?.get(TilePlugin::class.java) as TilePlugin?
-    }
-
-    fun destroyServiceEngine() {
-        serviceEngine?.destroy()
-        serviceEngine = null
-    }
-
-    fun initServiceEngine(context: Context) {
-        if (serviceEngine != null) return
-        lock.withLock {
-            destroyServiceEngine()
-            serviceEngine = FlutterEngine(context)
-            serviceEngine?.plugins?.add(ProxyPlugin())
-            serviceEngine?.plugins?.add(AppPlugin())
-            serviceEngine?.plugins?.add(TilePlugin())
-            val vpnService = DartExecutor.DartEntrypoint(
-                FlutterInjector.instance().flutterLoader().findAppBundlePath(),
-                "vpnService"
-            )
-            serviceEngine?.dartExecutor?.executeDartEntrypoint(
-                vpnService,
-            )
-        }
+        fun getCurrentAppPlugin(): AppPlugin? =
+            flutterEngine?.plugins?.get(AppPlugin::class.java) as AppPlugin?
     }
 }
 

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

@@ -10,6 +10,7 @@ import io.flutter.embedding.engine.FlutterEngine
 class MainActivity : FlutterActivity() {
 
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        GlobalState.flutterEngine?.destroy()
         super.configureFlutterEngine(flutterEngine)
         flutterEngine.plugins.add(AppPlugin())
         flutterEngine.plugins.add(ProxyPlugin())

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

@@ -2,38 +2,34 @@ package com.follow.clash.plugins
 
 import android.Manifest
 import android.app.Activity
-import android.app.ActivityManager
 import android.content.Context
-import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.net.ConnectivityManager
+import android.net.Uri
 import android.os.Build
 import android.widget.Toast
-import androidx.core.content.ContextCompat.getSystemService
-import androidx.core.content.FileProvider
+import androidx.annotation.RequiresApi
 import androidx.core.content.getSystemService
-import com.follow.clash.GlobalState
+import androidx.core.graphics.drawable.toBitmap
 import com.follow.clash.extensions.getBase64
+import com.follow.clash.extensions.getInetSocketAddress
 import com.follow.clash.extensions.getProtocol
-import com.follow.clash.models.Package
 import com.follow.clash.models.Process
+import com.follow.clash.models.Package
 import com.google.gson.Gson
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.embedding.engine.plugins.activity.ActivityAware
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
-import io.flutter.plugin.common.MethodChannel.Result
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.io.File
 import java.net.InetSocketAddress
 
-
 class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {
 
     private var activity: Activity? = null
@@ -51,41 +47,31 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     private val iconMap = mutableMapOf<String, String?>()
 
     override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
-        scope = CoroutineScope(Dispatchers.Default)
         context = flutterPluginBinding.applicationContext;
         channel = MethodChannel(flutterPluginBinding.binaryMessenger, "app")
         channel.setMethodCallHandler(this)
-
     }
 
     override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
         channel.setMethodCallHandler(null)
-        scope.cancel()
     }
 
     private fun tip(message: String?) {
-        if (GlobalState.flutterEngine == null) {
-            if (toast != null) {
-                toast!!.cancel()
-            }
-            toast = Toast.makeText(context, message, Toast.LENGTH_SHORT)
-            toast!!.show()
+        if (toast != null) {
+            toast!!.cancel()
         }
+        toast = Toast.makeText(context, message, Toast.LENGTH_SHORT)
+        toast!!.show()
     }
 
-    override fun onMethodCall(call: MethodCall, result: Result) {
+    @RequiresApi(Build.VERSION_CODES.Q)
+    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
         when (call.method) {
             "moveTaskToBack" -> {
                 activity?.moveTaskToBack(true)
                 result.success(true);
             }
 
-            "updateExcludeFromRecents" -> {
-                val value = call.argument<Boolean>("value")
-                updateExcludeFromRecents(value)
-                result.success(true);
-            }
-
             "getPackages" -> {
                 scope.launch {
                     result.success(getPackages())
@@ -130,7 +116,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 }
                 scope.launch {
                     withContext(Dispatchers.Default) {
-                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q){
                             result.success(null)
                             return@withContext
                         }
@@ -165,12 +151,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 val message = call.argument<String>("message")
                 tip(message)
                 result.success(true)
-            }
 
-            "openFile" -> {
-                val path = call.argument<String>("path")!!
-                openFile(path)
-                result.success(true)
             }
 
             else -> {
@@ -179,62 +160,6 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         }
     }
 
-    private fun openFile(path: String) {
-        context?.let {
-            val file = File(path)
-            val uri = FileProvider.getUriForFile(
-                it,
-                "${it.packageName}.fileProvider",
-                file
-            )
-
-            val intent = Intent(Intent.ACTION_VIEW).setDataAndType(
-                uri,
-                "text/plain"
-            )
-
-            val flags =
-                Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION
-
-            val resInfoList = it.packageManager.queryIntentActivities(
-                intent, PackageManager.MATCH_DEFAULT_ONLY
-            )
-
-            for (resolveInfo in resInfoList) {
-                val packageName = resolveInfo.activityInfo.packageName
-                it.grantUriPermission(
-                    packageName,
-                    uri,
-                    flags
-                )
-            }
-
-            try {
-                activity?.startActivity(intent)
-            } catch (e: Exception) {
-                println(e)
-            }
-        }
-    }
-
-    private fun updateExcludeFromRecents(value: Boolean?) {
-        if (context == null) return
-        val am = getSystemService(context!!, ActivityManager::class.java)
-        val task = am?.appTasks?.firstOrNull {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                it.taskInfo.taskId == activity?.taskId
-            } else {
-                it.taskInfo.id == activity?.taskId
-            }
-        }
-
-        when (value) {
-            true -> task?.setExcludeFromRecents(value)
-            false -> task?.setExcludeFromRecents(value)
-            null -> task?.setExcludeFromRecents(false)
-        }
-    }
-
     private suspend fun getPackageIcon(packageName: String): String? {
         val packageManager = context?.packageManager
         if (iconMap[packageName] == null) {
@@ -274,10 +199,11 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
 
     override fun onAttachedToActivity(binding: ActivityPluginBinding) {
         activity = binding.activity;
+        scope = CoroutineScope(Dispatchers.Default)
     }
 
     override fun onDetachedFromActivityForConfigChanges() {
-        activity = null
+        activity = null;
     }
 
     override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
@@ -286,6 +212,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
 
     override fun onDetachedFromActivity() {
         channel.invokeMethod("exit", null)
-        activity = null
+        scope.cancel()
+        activity = null;
     }
-}
+}

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

@@ -1,6 +1,7 @@
 package com.follow.clash.plugins
 
 import android.Manifest
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.ComponentName
 import android.content.Context
@@ -8,9 +9,9 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.content.pm.PackageManager
 import android.net.VpnService
-import android.os.Build
+import android.os.Build.VERSION
+import android.os.Build.VERSION_CODES
 import android.os.IBinder
-import android.util.Log
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.follow.clash.GlobalState
@@ -24,36 +25,37 @@ import io.flutter.embedding.engine.plugins.activity.ActivityAware
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
+import java.util.Date
 
 
 class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {
 
-    private lateinit var flutterMethodChannel: MethodChannel
 
     val VPN_PERMISSION_REQUEST_CODE = 1001
     val NOTIFICATION_PERMISSION_REQUEST_CODE = 1002
 
+    private lateinit var flutterMethodChannel: MethodChannel
+
     private var activity: Activity? = null
     private var context: Context? = null
     private var flClashVpnService: FlClashVpnService? = null
-    private var port: Int = 7890
+    private var isBound = false
+    private var port: Int? = null
     private var props: Props? = null
-    private var isBlockNotification: Boolean = false
-    private var isStart: Boolean = false
+    private lateinit var title: String
+    private lateinit var content: String
 
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as FlClashVpnService.LocalBinder
             flClashVpnService = binder.getService()
-            if (isStart) {
-                startVpn()
-            } else {
-                flClashVpnService?.initServiceEngine()
-            }
+            port?.let { startVpn(it) }
+            isBound = true
         }
 
-        override fun onServiceDisconnected(arg: ComponentName) {
+        override fun onServiceDisconnected(arg0: ComponentName) {
             flClashVpnService = null
+            isBound = false
         }
     }
 
@@ -68,29 +70,21 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
     }
 
     override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) = when (call.method) {
-        "initService" -> {
-            isStart = false
-            initService()
-            requestNotificationsPermission()
-            result.success(true)
-        }
-
-        "startProxy" -> {
-            isStart = true
-            port = call.argument<Int>("port")!!
+        "StartProxy" -> {
+            port = call.argument<Int>("port")
             val args = call.argument<String>("args")
             props =
                 if (args != null) Gson().fromJson(args, Props::class.java) else null
-            startVpn()
+            handleStartVpn()
             result.success(true)
         }
 
-        "stopProxy" -> {
+        "StopProxy" -> {
             stopVpn()
             result.success(true)
         }
 
-        "setProtect" -> {
+        "SetProtect" -> {
             val fd = call.argument<Int>("fd")
             if (fd != null) {
                 flClashVpnService?.protect(fd)
@@ -100,10 +94,14 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
             }
         }
 
+        "GetRunTimeStamp" -> {
+            result.success(GlobalState.runTime?.time)
+        }
+
         "startForeground" -> {
-            val title = call.argument<String>("title") as String
-            val content = call.argument<String>("content") as String
-            startForeground(title, content)
+            title = call.argument<String>("title") as String
+            content = call.argument<String>("content") as String
+            requestNotificationsPermission()
             result.success(true)
         }
 
@@ -112,47 +110,65 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         }
     }
 
-    private fun initService() {
+    private fun handleStartVpn() {
         val intent = VpnService.prepare(context)
         if (intent != null) {
             activity?.startActivityForResult(intent, VPN_PERMISSION_REQUEST_CODE)
         } else {
-            if (flClashVpnService != null) {
-                flClashVpnService!!.initServiceEngine()
-            } else {
-                bindService()
-            }
+            bindService()
         }
     }
 
-    private fun startVpn() {
-        if (flClashVpnService == null) {
-            bindService()
-            return
-        }
-        if (GlobalState.runState.value == RunState.START) return
+    private fun startVpn(port: Int) {
+        if (GlobalState.runState.value == RunState.START) return;
+        flClashVpnService?.start(port, props)
         GlobalState.runState.value = RunState.START
-        val intent = VpnService.prepare(context)
-        if (intent != null) {
-            stopVpn()
-            return
-        }
-        val fd = flClashVpnService?.start(port, props)
-        flutterMethodChannel.invokeMethod("started", fd)
+        GlobalState.runTime = Date()
+        startAfter()
     }
 
     private fun stopVpn() {
         if (GlobalState.runState.value == RunState.STOP) return
-        GlobalState.runState.value = RunState.STOP
         flClashVpnService?.stop()
-        GlobalState.destroyServiceEngine()
+        unbindService()
+        GlobalState.runState.value = RunState.STOP;
+        GlobalState.runTime = null;
     }
 
-    private fun startForeground(title: String, content: String) {
+    @SuppressLint("ForegroundServiceType")
+    private fun startForeground() {
         if (GlobalState.runState.value != RunState.START) return
         flClashVpnService?.startForeground(title, content)
     }
 
+    private fun requestNotificationsPermission() {
+        if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
+            val permission = context?.let {
+                ContextCompat.checkSelfPermission(
+                    it,
+                    Manifest.permission.POST_NOTIFICATIONS
+                )
+            }
+            if (permission == PackageManager.PERMISSION_GRANTED) {
+                startForeground()
+            } else {
+                activity?.let {
+                    ActivityCompat.requestPermissions(
+                        it,
+                        arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                        NOTIFICATION_PERMISSION_REQUEST_CODE
+                    )
+                }
+            }
+        } else {
+            startForeground()
+        }
+    }
+
+    private fun startAfter() {
+        flutterMethodChannel.invokeMethod("startAfter", flClashVpnService?.fd)
+    }
+
     override fun onAttachedToActivity(binding: ActivityPluginBinding) {
         activity = binding.activity
         binding.addActivityResultListener(::onActivityResult)
@@ -167,7 +183,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
                 stopVpn()
             }
         }
-        return true
+        return true;
     }
 
     private fun onRequestPermissionsResultListener(
@@ -176,33 +192,16 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         grantResults: IntArray
     ): Boolean {
         if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {
-            isBlockNotification = true
+            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                startForeground()
+            }
         }
-        return false
+        return true;
     }
 
-    private fun requestNotificationsPermission() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            val permission = context?.let {
-                ContextCompat.checkSelfPermission(
-                    it,
-                    Manifest.permission.POST_NOTIFICATIONS
-                )
-            }
-            if (permission != PackageManager.PERMISSION_GRANTED) {
-                if (isBlockNotification) return
-                if (activity == null) return
-                ActivityCompat.requestPermissions(
-                    activity!!,
-                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-                    NOTIFICATION_PERMISSION_REQUEST_CODE
-                )
-            }
-        }
-    }
 
     override fun onDetachedFromActivityForConfigChanges() {
-        activity = null
+        activity = null;
     }
 
     override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
@@ -210,6 +209,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
     }
 
     override fun onDetachedFromActivity() {
+        stopVpn()
         activity = null
     }
 
@@ -217,4 +217,11 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         val intent = Intent(context, FlClashVpnService::class.java)
         context?.bindService(intent, connection, Context.BIND_AUTO_CREATE)
     }
+
+    private fun unbindService() {
+        if (isBound) {
+            context?.unbindService(connection)
+            isBound = false
+        }
+    }
 }

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

@@ -1,4 +1,3 @@
-
 package com.follow.clash.plugins
 
 import io.flutter.embedding.engine.plugins.FlutterPlugin

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

@@ -1,9 +1,9 @@
 package com.follow.clash.services
 
+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Intent
 import android.os.Build
-import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import androidx.annotation.RequiresApi
@@ -11,9 +11,14 @@ import androidx.lifecycle.Observer
 import com.follow.clash.GlobalState
 import com.follow.clash.RunState
 import com.follow.clash.TempActivity
+import com.follow.clash.plugins.AppPlugin
+import com.follow.clash.plugins.ProxyPlugin
+import com.follow.clash.plugins.TilePlugin
+import io.flutter.FlutterInjector
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.embedding.engine.dart.DartExecutor
 
 
-@RequiresApi(Build.VERSION_CODES.N)
 class FlClashTileService : TileService() {
 
     private val observer = Observer<RunState> { runState ->
@@ -57,25 +62,42 @@ class FlClashTileService : TileService() {
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             startActivityAndCollapse(pendingIntent)
-        } else {
+        }else{
             startActivityAndCollapse(intent)
         }
     }
 
+    private var flutterEngine: FlutterEngine? = null;
+
+    private fun initFlutterEngine() {
+        flutterEngine = FlutterEngine(this)
+        flutterEngine?.plugins?.add(ProxyPlugin())
+        flutterEngine?.plugins?.add(TilePlugin())
+        flutterEngine?.plugins?.add(AppPlugin())
+        GlobalState.flutterEngine = flutterEngine
+        if (flutterEngine?.dartExecutor?.isExecutingDart != true) {
+            val vpnService = DartExecutor.DartEntrypoint(
+                FlutterInjector.instance().flutterLoader().findAppBundlePath(),
+                "vpnService"
+            )
+            flutterEngine?.dartExecutor?.executeDartEntrypoint(vpnService)
+        }
+    }
+
     override fun onClick() {
         super.onClick()
         activityTransfer()
+        val currentTilePlugin = GlobalState.getCurrentTilePlugin()
         if (GlobalState.runState.value == RunState.STOP) {
             GlobalState.runState.value = RunState.PENDING
-            val titlePlugin = GlobalState.getCurrentTitlePlugin()
-            if (titlePlugin != null) {
-                titlePlugin.handleStart()
-            } else {
-                GlobalState.initServiceEngine(applicationContext)
+            if(currentTilePlugin == null){
+                initFlutterEngine()
+            }else{
+                currentTilePlugin.handleStart()
             }
-        } else if (GlobalState.runState.value == RunState.START) {
+        } else if(GlobalState.runState.value == RunState.START){
             GlobalState.runState.value = RunState.PENDING
-            GlobalState.getCurrentTitlePlugin()?.handleStop()
+            currentTilePlugin?.handleStop()
         }
 
     }

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

@@ -11,23 +11,20 @@ import android.net.VpnService
 import android.os.Binder
 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.GlobalState
 import com.follow.clash.MainActivity
 import com.follow.clash.R
 import com.follow.clash.models.AccessControlMode
 import com.follow.clash.models.Props
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 
 class FlClashVpnService : VpnService() {
+
+
     private val CHANNEL = "FlClash"
 
+    var fd: Int? = null
     private val notificationId: Int = 1
 
     private val passList = listOf(
@@ -50,13 +47,12 @@ class FlClashVpnService : VpnService() {
         "192.168.*"
     )
 
-    override fun onCreate() {
-        super.onCreate()
-        initServiceEngine()
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        return START_STICKY
     }
 
-    fun start(port: Int, props: Props?): Int? {
-        return with(Builder()) {
+    fun start(port: Int, props: Props?) {
+        fd = with(Builder()) {
             addAddress("172.16.0.1", 30)
             setMtu(9000)
             addRoute("0.0.0.0", 0)
@@ -102,6 +98,7 @@ class FlClashVpnService : VpnService() {
         stopForeground()
     }
 
+
     private val notificationBuilder: NotificationCompat.Builder by lazy {
         val intent = Intent(this, MainActivity::class.java)
 
@@ -120,6 +117,7 @@ class FlClashVpnService : VpnService() {
                 PendingIntent.FLAG_UPDATE_CURRENT
             )
         }
+
         with(NotificationCompat.Builder(this, CHANNEL)) {
             setSmallIcon(R.drawable.ic_stat_name)
             setContentTitle("FlClash")
@@ -132,14 +130,10 @@ class FlClashVpnService : VpnService() {
             setOngoing(true)
             setShowWhen(false)
             setOnlyAlertOnce(true)
-            setAutoCancel(true)
+            setAutoCancel(true);
         }
     }
 
-    fun initServiceEngine() {
-        GlobalState.initServiceEngine(applicationContext)
-    }
-
     override fun onTrimMemory(level: Int) {
         super.onTrimMemory(level)
         GlobalState.getCurrentAppPlugin()?.requestGc()
@@ -174,28 +168,14 @@ class FlClashVpnService : VpnService() {
 
     inner class LocalBinder : Binder() {
         fun getService(): FlClashVpnService = this@FlClashVpnService
-
-        override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean {
-            try {
-                val isSuccess = super.onTransact(code, data, reply, flags)
-                if (!isSuccess) {
-                    CoroutineScope(Dispatchers.Main).launch {
-                        GlobalState.getCurrentTitlePlugin()?.handleStop()
-                    }
-                }
-                return isSuccess
-            } catch (e: RemoteException) {
-                throw e
-            }
-        }
     }
 
-
     override fun onBind(intent: Intent): IBinder {
         return binder
     }
 
     override fun onUnbind(intent: Intent?): Boolean {
+        GlobalState.getCurrentTilePlugin()?.handleStop();
         return super.onUnbind(intent)
     }
 

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

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

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>

android/app/src/main/res/values-night-v27/styles.xml

@@ -6,7 +6,7 @@
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowSplashScreenBackground" tools:targetApi="s">#121212</item>
-        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@drawable/ic_launcher_foreground</item>
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@mipmap/ic_launcher_foreground</item>
         <item name="postSplashScreenTheme">@style/NormalTheme</item>
     </style>
 </resources>

android/app/src/main/res/values-v27/styles.xml

@@ -6,7 +6,7 @@
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="android:windowSplashScreenBackground" tools:targetApi="s">@color/ic_launcher_background</item>
-        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@drawable/ic_launcher_foreground</item>
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@mipmap/ic_launcher_foreground</item>
         <item name="postSplashScreenTheme">@style/NormalTheme</item>
     </style>
 </resources>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#FAFAFA</color>
+    <color name="ic_launcher_background">#EFEFEF</color>
 </resources>

android/app/src/main/res/xml/file_paths.xml

@@ -1,6 +0,0 @@
-<paths>
-    <files-path
-        name="files"
-        path="."/>
-</paths>
-

android/app/src/main/res/xml/network_security_config.xml

@@ -7,8 +7,4 @@
             <certificates src="user" />
         </trust-anchors>
     </base-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">localhost</domain>
-        <domain includeSubdomains="true">127.0.0.1</domain>
-    </domain-config>
 </network-security-config>

core/common.go

@@ -4,7 +4,6 @@ import "C"
 import (
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/inbound"
-	"github.com/metacubex/mihomo/adapter/outboundgroup"
 	ap "github.com/metacubex/mihomo/adapter/provider"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/resolver"
@@ -21,7 +20,6 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
-	"sync"
 	"syscall"
 	"time"
 )
@@ -61,17 +59,11 @@ type ruleProviderSchema struct {
 	Interval int    `provider:"interval,omitempty"`
 }
 
-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"`
-}
-
 type GenerateConfigParams struct {
-	ProfilePath *string              `json:"profile-path"`
-	Config      config.RawConfig     `json:"config" `
-	Params      ConfigExtendedParams `json:"params"`
+	ProfilePath  *string           `json:"profile-path"`
+	Config       *config.RawConfig `json:"config" `
+	IsPatch      *bool             `json:"is-patch"`
+	IsCompatible *bool             `json:"is-compatible"`
 }
 
 type ChangeProxyParams struct {
@@ -84,11 +76,26 @@ type TestDelayParams struct {
 	Timeout   int64  `json:"timeout"`
 }
 
+type Delay struct {
+	Name  string `json:"name"`
+	Value int32  `json:"value"`
+}
+
+type Process struct {
+	Id       int64              `json:"id"`
+	Metadata *constant.Metadata `json:"metadata"`
+}
+
 type ProcessMapItem struct {
 	Id    int64  `json:"id"`
 	Value string `json:"value"`
 }
 
+type Now struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
 type ExternalProvider struct {
 	Name        string    `json:"name"`
 	Type        string    `json:"type"`
@@ -163,9 +170,9 @@ func getRawConfigWithPath(path *string) *config.RawConfig {
 	}
 }
 
-func decorationConfig(profilePath *string, cfg config.RawConfig) *config.RawConfig {
+func decorationConfig(profilePath *string, cfg config.RawConfig, compatible bool) *config.RawConfig {
 	prof := getRawConfigWithPath(profilePath)
-	overwriteConfig(prof, cfg)
+	overwriteConfig(prof, cfg, compatible)
 	return prof
 }
 
@@ -315,14 +322,14 @@ func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
 	*rule = computedRule
 }
 
-func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) {
+func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig, compatible bool) {
 	targetConfig.ExternalController = patchConfig.ExternalController
 	targetConfig.ExternalUI = ""
 	targetConfig.Interface = ""
 	targetConfig.ExternalUIURL = ""
 	targetConfig.TCPConcurrent = patchConfig.TCPConcurrent
 	targetConfig.UnifiedDelay = patchConfig.UnifiedDelay
-	//targetConfig.GeodataMode = false
+	targetConfig.GeodataMode = false
 	targetConfig.IPv6 = patchConfig.IPv6
 	targetConfig.LogLevel = patchConfig.LogLevel
 	targetConfig.Port = 0
@@ -333,12 +340,10 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.Mode = patchConfig.Mode
 	targetConfig.Tun.Enable = patchConfig.Tun.Enable
 	targetConfig.Tun.Device = patchConfig.Tun.Device
-	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
-	targetConfig.Tun.Stack = patchConfig.Tun.Stack
+	//targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
+	//targetConfig.Tun.Stack = patchConfig.Tun.Stack
 	targetConfig.GeodataLoader = patchConfig.GeodataLoader
 	targetConfig.Profile.StoreSelected = false
-	targetConfig.GeoXUrl = patchConfig.GeoXUrl
-	targetConfig.GlobalUA = patchConfig.GlobalUA
 	if targetConfig.DNS.Enable == false {
 		targetConfig.DNS = patchConfig.DNS
 	}
@@ -347,7 +352,7 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	//} else if runtime.GOOS == "windows" {
 	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
 	//}
-	if configParams.IsCompatible == false {
+	if compatible == false {
 		targetConfig.ProxyProvider = make(map[string]map[string]any)
 		targetConfig.RuleProvider = make(map[string]map[string]any)
 		generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
@@ -383,50 +388,14 @@ func patchConfig(general *config.General) {
 	resolver.DisableIPv6 = !general.IPv6
 }
 
-func patchSelectGroup() {
-	mapping := configParams.SelectedMap
-	if mapping == nil {
-		return
-	}
-	for name, proxy := range tunnel.ProxiesWithProviders() {
-		outbound, ok := proxy.(*adapter.Proxy)
-		if !ok {
-			continue
-		}
-
-		selector, ok := outbound.ProxyAdapter.(outboundgroup.SelectAble)
-		if !ok {
-			continue
-		}
-
-		selected, exist := mapping[name]
-		if !exist {
-			continue
-		}
-
-		selector.ForceSet(selected)
-	}
-}
-
-var applyLock sync.Mutex
-
-func applyConfig() error {
-	applyLock.Lock()
-	defer applyLock.Unlock()
+func applyConfig(isPatch bool) {
 	cfg, err := config.ParseRawConfig(currentConfig)
 	if err != nil {
 		cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
 	}
-	if configParams.TestURL != nil {
-		constant.DefaultTestURL = *configParams.TestURL
-	}
-	if configParams.IsPatch {
+	if isPatch {
 		patchConfig(cfg.General)
 	} else {
-		closeConnections()
-		runtime.GC()
 		hub.UltraApplyConfig(cfg, true)
-		patchSelectGroup()
 	}
-	return err
 }

core/dart-bridge/lib.go

@@ -1,7 +1,6 @@
 package dart_bridge
 
 /*
-#include <stdlib.h>
 #include "stdint.h"
 #include "include/dart_api_dl.h"
 #include "include/dart_api_dl.c"
@@ -25,16 +24,14 @@ func InitDartApi(api unsafe.Pointer) {
 	}
 }
 
-func SendToPort(port int64, msg string) bool {
+func SendToPort(port int64, msg string) {
 	var obj C.Dart_CObject
 	obj._type = C.Dart_CObject_kString
 	msgString := C.CString(msg)
-	defer C.free(unsafe.Pointer(msgString))
 	ptr := unsafe.Pointer(&obj.value[0])
 	*(**C.char)(ptr) = msgString
 	isSuccess := C.GoDart_PostCObject(C.Dart_Port_DL(port), &obj)
 	if !isSuccess {
-		return false
+		fmt.Println("ERROR: post to port ", port, " failed", msg)
 	}
-	return true
 }

core/dart-bridge/message.go

@@ -0,0 +1,38 @@
+package dart_bridge
+
+import "encoding/json"
+
+var Port *int64
+
+type MessageType string
+
+const (
+	Log     MessageType = "log"
+	Tun     MessageType = "tun"
+	Delay   MessageType = "delay"
+	Now     MessageType = "now"
+	Process MessageType = "process"
+	Request MessageType = "request"
+	Run     MessageType = "run"
+)
+
+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) {
+	if Port == nil {
+		return
+	}
+	s, err := message.Json()
+	if err != nil {
+		return
+	}
+	SendToPort(*Port, s)
+}

core/go.mod

@@ -7,8 +7,8 @@ replace github.com/metacubex/mihomo => ./Clash.Meta
 require (
 	github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34
 	github.com/metacubex/mihomo v1.17.1
-	github.com/miekg/dns v1.1.61
-	golang.org/x/net v0.26.0
+	github.com/miekg/dns v1.1.59
+	golang.org/x/net v0.25.0
 	golang.org/x/sync v0.7.0
 )
 
@@ -16,6 +16,7 @@ require (
 	github.com/3andne/restls-client-go v0.1.6 // indirect
 	github.com/RyuaNerin/go-krypto v1.2.4 // indirect
 	github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
+	github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
 	github.com/ajg/form v1.5.1 // indirect
 	github.com/andybalholm/brotli v1.0.6 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
@@ -30,7 +31,7 @@ require (
 	github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
-	github.com/go-chi/chi/v5 v5.0.14 // indirect
+	github.com/go-chi/chi/v5 v5.0.12 // indirect
 	github.com/go-chi/cors v1.2.1 // indirect
 	github.com/go-chi/render v1.0.3 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
@@ -43,26 +44,24 @@ require (
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
-	github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49 // indirect
 	github.com/josharian/native v1.1.0 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mdlayher/netlink v1.7.2 // indirect
 	github.com/mdlayher/socket v0.4.1 // indirect
-	github.com/metacubex/chacha v0.1.0 // indirect
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
 	github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec // indirect
-	github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e // indirect
-	github.com/metacubex/randv2 v0.2.0 // indirect
+	github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e // indirect
 	github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 // indirect
-	github.com/metacubex/sing-shadowsocks v0.2.7 // indirect
-	github.com/metacubex/sing-shadowsocks2 v0.2.1 // indirect
-	github.com/metacubex/sing-tun v0.2.7-0.20240719141246-19c49ac9589d // indirect
-	github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 // indirect
-	github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a // indirect
+	github.com/metacubex/sing-shadowsocks v0.2.6 // indirect
+	github.com/metacubex/sing-shadowsocks2 v0.2.0 // indirect
+	github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec // indirect
+	github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 // indirect
 	github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 // indirect
 	github.com/metacubex/utls v1.6.6 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
@@ -72,20 +71,18 @@ require (
 	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
 	github.com/pierrec/lz4/v4 v4.1.14 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/puzpuzpuz/xsync/v3 v3.2.0 // indirect
+	github.com/puzpuzpuz/xsync/v3 v3.1.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
 	github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a // indirect
-	github.com/sagernet/fswatch v0.1.1 // indirect
-	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
-	github.com/sagernet/nftables v0.3.0-beta.4 // indirect
-	github.com/sagernet/sing v0.5.0-alpha.13 // indirect
+	github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 // indirect
+	github.com/sagernet/sing v0.3.8 // indirect
 	github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 // indirect
 	github.com/sagernet/sing-shadowtls v0.1.4 // indirect
 	github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect
 	github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e // indirect
 	github.com/samber/lo v1.39.0 // indirect
-	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
+	github.com/shirou/gopsutil/v3 v3.24.4 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
 	github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
@@ -94,21 +91,21 @@ require (
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
-	github.com/vishvananda/netns v0.0.4 // indirect
+	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 // indirect
+	github.com/zhangyunhao116/fastrand v0.4.0 // indirect
 	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.24.0 // indirect
-	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
-	golang.org/x/mod v0.18.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.22.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	golang.org/x/tools v0.21.0 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/blake3 v1.3.0 // indirect
 )

core/go.sum

@@ -7,6 +7,8 @@ github.com/RyuaNerin/go-krypto v1.2.4 h1:mXuNdK6M317aPV0llW6Xpjbo4moOlPF7Yxz4tb4
 github.com/RyuaNerin/go-krypto v1.2.4/go.mod h1:QqCYkoutU3yInyD9INt2PGolVRsc3W4oraQadVGXJ/8=
 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4q90ylaVAbnYyx0JYqK4YcGok=
 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344/go.mod h1:9pIqrY6SXNL8vjRQE5Hd/OL5GyK/9MrGUWs87z/eFfk=
+github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
+github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
 github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
@@ -46,8 +48,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
 github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
-github.com/go-chi/chi/v5 v5.0.14 h1:PyEwo2Vudraa0x/Wl6eDRRW2NXBvekgfxyydcM0WGE0=
-github.com/go-chi/chi/v5 v5.0.14/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s=
+github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
 github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
@@ -73,6 +75,7 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
@@ -82,16 +85,16 @@ github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7s
 github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
 github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 h1:dh8D8FksyMhD64mRMbUhZHWYJfNoNMCxfVq6eexleMw=
-github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
+github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49 h1:/OuvSMGT9+xnyZ+7MZQ1zdngaCCAdPoSw8B/uurZ7pg=
+github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
 github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
-github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
-github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
-github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
-github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
+github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
+github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -106,34 +109,30 @@ github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/
 github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
 github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
 github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
-github.com/metacubex/chacha v0.1.0 h1:tg9RSJ18NvL38cCWNyYH1eiG6qDCyyXIaTLQthon0sc=
-github.com/metacubex/chacha v0.1.0/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvOzK9ubNCCkQ+ldc4YSH/rILn53l/xGBFHHI=
 github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec h1:HxreOiFTUrJXJautEo8rnE1uKTVGY8wtZepY1Tii/Nc=
 github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec/go.mod h1:8BVmQ+3cxjqzWElafm24rb2Ae4jRI6vAXNXWqWjfrXw=
-github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e h1:bLYn3GuRvWDcBDAkIv5kUYIhzHwafDVq635BuybnKqI=
-github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e/go.mod h1:Yza2H7Ax1rxWPUcJx0vW+oAt9EsPuSiyQFhFabUPzwU=
-github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
-github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
+github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e h1:Nzwe08FNIJpExWpy9iXkG336dN/8nJqn69yijB7vJ8g=
+github.com/metacubex/quic-go v0.43.2-0.20240518033621-2c3d14c6b38e/go.mod h1:uXHODgJFUfUnkkCMWLd5Er6L5QY/LFRZb9LD5jyyhsk=
 github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 h1:Wr4g1HCb5Z/QIFwFiVNjO2qL+dRu25+Mdn9xtAZZ+ew=
 github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
-github.com/metacubex/sing-shadowsocks v0.2.7 h1:9f3Dt2+71TNp0e202llA2ug5h/rkWs2EZxQ5IMpf+9g=
-github.com/metacubex/sing-shadowsocks v0.2.7/go.mod h1:X3x88XtJpBxG0W0/ECOJL6Ib0SJ3xdniAkU/6/RMWU0=
-github.com/metacubex/sing-shadowsocks2 v0.2.1 h1:XIZBXlazp8EEoPp1S0DViAhLkJakjQ2f+AOwwdKKNYg=
-github.com/metacubex/sing-shadowsocks2 v0.2.1/go.mod h1:BhOug03a/RbI7y6hp6q+6ITM1dXjnLTmeWBHSTwvv2Q=
-github.com/metacubex/sing-tun v0.2.7-0.20240719141246-19c49ac9589d h1:iYlepjRCYlPXtELupDL+pQjGqkCnQz4KQOfKImP9sog=
-github.com/metacubex/sing-tun v0.2.7-0.20240719141246-19c49ac9589d/go.mod h1:olbEx9yVcaw5tHTNlRamRoxmMKcvDvcVS1YLnQGzvWE=
-github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 h1:OAXiCosqY8xKDp3pqTW3qbrCprZ1l6WkrXSFSCwyY4I=
-github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
-github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a h1:NpSGclHJUYndUwBmyIpFBSoBVg8PoVX7QQKhYg0DjM0=
-github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
+github.com/metacubex/sing-shadowsocks v0.2.6 h1:6oEB3QcsFYnNiFeoevcXrCwJ3sAablwVSgtE9R3QeFQ=
+github.com/metacubex/sing-shadowsocks v0.2.6/go.mod h1:zIkMeSnb8Mbf4hdqhw0pjzkn1d99YJ3JQm/VBg5WMTg=
+github.com/metacubex/sing-shadowsocks2 v0.2.0 h1:hqwT/AfI5d5UdPefIzR6onGHJfDXs5zgOM5QSgaM/9A=
+github.com/metacubex/sing-shadowsocks2 v0.2.0/go.mod h1:LCKF6j1P94zN8ZS+LXRK1gmYTVGB3squivBSXAFnOg8=
+github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec h1:K4Wq3GOdLZ/xcqwyzAt4kmYQrjokyKQ3u/Xh5Yft14U=
+github.com/metacubex/sing-tun v0.2.7-0.20240512075008-89e7c6208eec/go.mod h1:4VsMwZH1IlgPGFK1ZbBomZ/B2MYkTgs2+gnBAr5GOIo=
+github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f h1:QjXrHKbTMBip/C+R79bvbfr42xH1gZl3uFb0RELdZiQ=
+github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY=
+github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63 h1:AGyIB55UfQm/0ZH0HtQO9u3l//yjtHUpjeRjjPGfGRI=
+github.com/metacubex/sing-wireguard v0.0.0-20240321042214-224f96122a63/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
 github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 h1:as/aO/fM8nv4W4pOr9EETP6kV/Oaujk3fUNyQSJK61c=
 github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
 github.com/metacubex/utls v1.6.6 h1:3D12YKHTf2Z41UPhQU2dWerNWJ5TVQD9gKoQ+H+iLC8=
 github.com/metacubex/utls v1.6.6/go.mod h1:+WLFUnXjcpdxXCnyX25nggw8C6YonZ8zOK2Zm/oRvdo=
-github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
-github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
+github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
+github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
 github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
 github.com/mroth/weightedrand/v2 v2.1.0/go.mod h1:f2faGsfOGOwc1p94wzHKKZyTpcJUW7OJ/9U4yfiNAOU=
 github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4=
@@ -156,8 +155,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/puzpuzpuz/xsync/v3 v3.2.0 h1:9AzuUeF88YC5bK8u2vEG1Fpvu4wgpM1wfPIExfaaDxQ=
-github.com/puzpuzpuz/xsync/v3 v3.2.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/puzpuzpuz/xsync/v3 v3.1.0 h1:EewKT7/LNac5SLiEblJeUu8z5eERHrmRLnMQL2d7qX4=
+github.com/puzpuzpuz/xsync/v3 v3.1.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
 github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
@@ -166,15 +165,11 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a h1:+NkI2670SQpQWvkkD2QgdTuzQG263YZ+2emfpeyGqW0=
 github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
-github.com/sagernet/fswatch v0.1.1 h1:YqID+93B7VRfqIH3PArW/XpJv5H4OLEVWDfProGoRQs=
-github.com/sagernet/fswatch v0.1.1/go.mod h1:nz85laH0mkQqJfaOrqPpkwtU1znMFNVTpT/5oRsVz/o=
-github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
-github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
-github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I=
-github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8=
+github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 h1:iL5gZI3uFp0X6EslacyapiRz7LLSJyr4RajF/BhMVyE=
+github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
 github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
-github.com/sagernet/sing v0.5.0-alpha.13 h1:fpR4TFZfu/9V3LbHSAnnnwcaXGMF8ijmAAPoY2WHSKw=
-github.com/sagernet/sing v0.5.0-alpha.13/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
+github.com/sagernet/sing v0.3.8 h1:gm4JKalPhydMYX2zFOTnnd4TXtM/16WFRqSjMepYQQk=
+github.com/sagernet/sing v0.3.8/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 h1:5bCAkvDDzSMITiHFjolBwpdqYsvycdTu71FsMEFXQ14=
 github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6/go.mod h1:khzr9AOPocLa+g53dBplwNDz4gdsyx/YM3swtAhlkHQ=
 github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k=
@@ -185,8 +180,8 @@ github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2F
 github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
 github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
 github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
-github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
-github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
+github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
+github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -200,9 +195,15 @@ github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e/go.mod h1:+e
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
@@ -214,14 +215,14 @@ github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
-github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
-github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
+github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
+github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 h1:UNrDfkQqiEYzdMlNsVvBYOAJWZjdktqFE9tQh5BT2+4=
-gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7/go.mod h1:E+rxHvJG9H6PUdzq9NRG6csuLN3XUx98BfGOVWNYnXs=
+github.com/zhangyunhao116/fastrand v0.4.0 h1:86QB6Y+GGgLZRFRDCjMmAS28QULwspK9sgL5d1Bx3H4=
+github.com/zhangyunhao116/fastrand v0.4.0/go.mod h1:vIyo6EyBhjGKpZv6qVlkPl4JVAklpMM4DSKzbAkMguA=
 gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec h1:FpfFs4EhNehiVfzQttTuxanPIT43FtkkCFypIod8LHo=
 gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec/go.mod h1:BZ1RAoRPbCxum9Grlv5aeksu2H8BiKehBYooU2LFiOQ=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
@@ -230,18 +231,18 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBs
 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
-golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
-golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
-golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
+golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
+golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
-golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
-golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -261,24 +262,26 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
-golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
-golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
+golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
+golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
+google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

core/hub.go

@@ -1,8 +1,5 @@
 package main
 
-/*
-#include <stdlib.h>
-*/
 import "C"
 import (
 	bridge "core/dart-bridge"
@@ -13,7 +10,7 @@ import (
 	"github.com/metacubex/mihomo/adapter/provider"
 	"github.com/metacubex/mihomo/common/structure"
 	"github.com/metacubex/mihomo/common/utils"
-	"github.com/metacubex/mihomo/component/updater"
+	"github.com/metacubex/mihomo/component/mmdb"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
 	cp "github.com/metacubex/mihomo/constant/provider"
@@ -31,12 +28,8 @@ import (
 
 var currentConfig = config.DefaultRawConfig()
 
-var configParams = ConfigExtendedParams{}
-
 var isInit = false
 
-var currentProfileName = ""
-
 //export initClash
 func initClash(homeDirStr *C.char) bool {
 	if !isInit {
@@ -75,21 +68,11 @@ func forceGc() {
 	}()
 }
 
-//export setCurrentProfileName
-func setCurrentProfileName(s *C.char) {
-	currentProfileName = C.GoString(s)
-}
-
-//export getCurrentProfileName
-func getCurrentProfileName() *C.char {
-	return C.CString(currentProfileName)
-}
-
 //export validateConfig
 func validateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
-	bytes := []byte(C.GoString(s))
 	go func() {
+		bytes := []byte(C.GoString(s))
 		_, err := config.UnmarshalRawConfig(bytes)
 		if err != nil {
 			bridge.SendToPort(i, err.Error())
@@ -102,21 +85,20 @@ func validateConfig(s *C.char, port C.longlong) {
 //export updateConfig
 func updateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
-	paramsString := C.GoString(s)
 	go func() {
+		paramsString := C.GoString(s)
 		var params = &GenerateConfigParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
 			bridge.SendToPort(i, err.Error())
 			return
 		}
-		configParams = params.Params
-		prof := decorationConfig(params.ProfilePath, params.Config)
+		prof := decorationConfig(params.ProfilePath, *params.Config, *params.IsCompatible)
 		currentConfig = prof
-		err = applyConfig()
-		if err != nil {
-			bridge.SendToPort(i, err.Error())
-			return
+		if *params.IsPatch {
+			applyConfig(true)
+		} else {
+			applyConfig(false)
 		}
 		bridge.SendToPort(i, "")
 	}()
@@ -165,35 +147,35 @@ func getProxies() *C.char {
 }
 
 //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
-	}
-
-	err = selector.Set(proxyName)
-	if err == nil {
-		log.Infoln("[Selector] %s selected %s", groupName, proxyName)
-	}
+func changeProxy(s *C.char) bool {
+	go func() {
+		paramsString := C.GoString(s)
+		var params = &ChangeProxyParams{}
+		err := json.Unmarshal([]byte(paramsString), params)
+		if err != nil {
+			log.Infoln("Unmarshal ChangeProxyParams %v", err)
+		}
+		proxies := tunnel.ProxiesWithProviders()
+		proxy := proxies[*params.GroupName]
+		if proxy == nil {
+			return
+		}
+		log.Infoln("change proxy %s", proxy.Name())
+		adapterProxy := proxy.(*adapter.Proxy)
+		selector, ok := adapterProxy.ProxyAdapter.(*outboundgroup.Selector)
+		if !ok {
+			return
+		}
+		if err := selector.Set(*params.ProxyName); err != nil {
+			return
+		}
+	}()
+	return true
 }
 
 //export getTraffic
 func getTraffic() *C.char {
-	up, down := statistic.DefaultManager.Current(state.OnlyProxy)
+	up, down := statistic.DefaultManager.Now()
 	traffic := map[string]int64{
 		"up":   up,
 		"down": down,
@@ -206,31 +188,11 @@ func getTraffic() *C.char {
 	return C.CString(string(data))
 }
 
-//export getTotalTraffic
-func getTotalTraffic() *C.char {
-	up, down := statistic.DefaultManager.Total(state.OnlyProxy)
-	traffic := map[string]int64{
-		"up":   up,
-		"down": down,
-	}
-	data, err := json.Marshal(traffic)
-	if err != nil {
-		fmt.Println("Error:", err)
-		return C.CString("")
-	}
-	return C.CString(string(data))
-}
-
-//export resetTraffic
-func resetTraffic() {
-	statistic.DefaultManager.ResetStatistic()
-}
-
 //export asyncTestDelay
 func asyncTestDelay(s *C.char, port C.longlong) {
 	i := int64(port)
-	paramsString := C.GoString(s)
 	go func() {
+		paramsString := C.GoString(s)
 		var params = &TestDelayParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
@@ -300,7 +262,7 @@ func getConnections() *C.char {
 }
 
 //export closeConnections
-func closeConnections() {
+func closeConnections() bool {
 	statistic.DefaultManager.Range(func(c statistic.Tracker) bool {
 		err := c.Close()
 		if err != nil {
@@ -308,28 +270,27 @@ func closeConnections() {
 		}
 		return true
 	})
+	return true
 }
 
 //export closeConnection
-func closeConnection(id *C.char) {
+func closeConnection(id *C.char) bool {
 	connectionId := C.GoString(id)
-	c := statistic.DefaultManager.Get(connectionId)
-	if c == nil {
-		return
+
+	err := statistic.DefaultManager.Get(connectionId).Close()
+	if err != nil {
+		return false
 	}
-	_ = c.Close()
+	return true
 }
 
 //export getProviders
 func getProviders() *C.char {
 	data, err := json.Marshal(tunnel.Providers())
-	var msg *C.char
 	if err != nil {
-		msg = C.CString("")
-		return msg
+		return C.CString("")
 	}
-	msg = C.CString(string(data))
-	return msg
+	return C.CString(string(data))
 }
 
 //export getProvider
@@ -379,9 +340,10 @@ func getExternalProviders() *C.char {
 //export updateExternalProvider
 func updateExternalProvider(providerName *C.char, providerType *C.char, port C.longlong) {
 	i := int64(port)
-	providerNameString := C.GoString(providerName)
-	providerTypeString := C.GoString(providerType)
 	go func() {
+		providerNameString := C.GoString(providerName)
+		providerTypeString := C.GoString(providerType)
+
 		switch providerTypeString {
 		case "Proxy":
 			providers := tunnel.Providers()
@@ -397,26 +359,20 @@ func updateExternalProvider(providerName *C.char, providerType *C.char, port C.l
 				bridge.SendToPort(i, err.Error())
 				return
 			}
-		case "MMDB":
-			err := updater.UpdateMMDB(constant.Path.Resolve(providerNameString))
-			if err != nil {
-				bridge.SendToPort(i, err.Error())
-				return
-			}
-		case "ASN":
-			err := updater.UpdateASN(constant.Path.Resolve(providerNameString))
-			if err != nil {
-				bridge.SendToPort(i, err.Error())
-				return
-			}
 		case "GeoIp":
-			err := updater.UpdateGeoIp(constant.Path.Resolve(providerNameString))
+			err := mmdb.DownloadMMDB(constant.Path.Resolve(providerNameString))
 			if err != nil {
 				bridge.SendToPort(i, err.Error())
 				return
 			}
 		case "GeoSite":
-			err := updater.UpdateGeoSite(constant.Path.Resolve(providerNameString))
+			err := mmdb.DownloadGeoSite(constant.Path.Resolve(providerNameString))
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
+		case "ASN":
+			err := mmdb.DownloadASN(constant.Path.Resolve(providerNameString))
 			if err != nil {
 				bridge.SendToPort(i, err.Error())
 				return
@@ -427,19 +383,10 @@ func updateExternalProvider(providerName *C.char, providerType *C.char, port C.l
 }
 
 //export initNativeApiBridge
-func initNativeApiBridge(api unsafe.Pointer) {
+func initNativeApiBridge(api unsafe.Pointer, port C.longlong) {
 	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))
+	bridge.Port = &i
 }
 
 func init() {
@@ -452,21 +399,15 @@ func init() {
 		} else {
 			delayData.Value = int32(delay)
 		}
-		SendMessage(Message{
-			Type: DelayMessage,
+		bridge.SendMessage(bridge.Message{
+			Type: bridge.Delay,
 			Data: delayData,
 		})
 	}
 	statistic.DefaultRequestNotify = func(c statistic.Tracker) {
-		SendMessage(Message{
-			Type: RequestMessage,
+		bridge.SendMessage(bridge.Message{
+			Type: bridge.Request,
 			Data: c,
 		})
 	}
-	executor.DefaultProxyProviderLoadedHook = func(providerName string) {
-		SendMessage(Message{
-			Type: LoadedMessage,
-			Data: providerName,
-		})
-	}
 }

core/log.go

@@ -2,6 +2,7 @@ package main
 
 import "C"
 import (
+	bridge "core/dart-bridge"
 	"github.com/metacubex/mihomo/common/observable"
 	"github.com/metacubex/mihomo/log"
 )
@@ -20,11 +21,11 @@ func startLog() {
 			if logData.LogLevel < log.Level() {
 				continue
 			}
-			message := &Message{
-				Type: LogMessage,
+			message := &bridge.Message{
+				Type: bridge.Log,
 				Data: logData,
 			}
-			SendMessage(*message)
+			bridge.SendMessage(*message)
 		}
 	}()
 }

core/message.go

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

core/platform/limit.go

@@ -1,42 +0,0 @@
-//go:build android
-
-package platform
-
-import "syscall"
-
-var nullFd int
-var maxFdCount int
-
-func init() {
-	fd, err := syscall.Open("/dev/null", syscall.O_WRONLY, 0644)
-	if err != nil {
-		panic(err.Error())
-	}
-
-	nullFd = fd
-
-	var limit syscall.Rlimit
-
-	if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {
-		maxFdCount = 1024
-	} else {
-		maxFdCount = int(limit.Cur)
-	}
-
-	maxFdCount = maxFdCount / 4 * 3
-}
-
-func ShouldBlockConnection() bool {
-	fd, err := syscall.Dup(nullFd)
-	if err != nil {
-		return true
-	}
-
-	_ = syscall.Close(fd)
-
-	if fd > maxFdCount {
-		return true
-	}
-
-	return false
-}

core/process.go

@@ -4,6 +4,7 @@ package main
 
 import "C"
 import (
+	bridge "core/dart-bridge"
 	"encoding/json"
 	"errors"
 	"github.com/metacubex/mihomo/component/process"
@@ -42,8 +43,8 @@ func init() {
 
 		timeout := time.After(200 * time.Millisecond)
 
-		SendMessage(Message{
-			Type: ProcessMessage,
+		bridge.SendMessage(bridge.Message{
+			Type: bridge.Process,
 			Data: Process{
 				Id:       id,
 				Metadata: metadata,
@@ -70,8 +71,8 @@ func setProcessMap(s *C.char) {
 	if s == nil {
 		return
 	}
-	paramsString := C.GoString(s)
 	go func() {
+		paramsString := C.GoString(s)
 		var processMapItem = &ProcessMapItem{}
 		err := json.Unmarshal([]byte(paramsString), processMapItem)
 		if err == nil {

core/state.go

@@ -1,47 +0,0 @@
-package main
-
-import "C"
-import (
-	"encoding/json"
-	"fmt"
-)
-
-type AccessControl struct {
-	Mode              string   `json:"mode"`
-	AcceptList        []string `json:"acceptList"`
-	RejectList        []string `json:"rejectList"`
-	IsFilterSystemApp bool     `json:"isFilterSystemApp"`
-}
-
-type AndroidProps struct {
-	AccessControl *AccessControl `json:"accessControl"`
-	AllowBypass   bool           `json:"allowBypass"`
-	SystemProxy   bool           `json:"systemProxy"`
-}
-
-type State struct {
-	AndroidProps
-	MixedPort int  `json:"mixedPort"`
-	OnlyProxy bool `json:"onlyProxy"`
-}
-
-var state State
-
-//export getState
-func getState() *C.char {
-	data, err := json.Marshal(state)
-	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)
-	if err != nil {
-		return
-	}
-}

core/tun.go

@@ -4,42 +4,20 @@ package main
 
 import "C"
 import (
-	"core/platform"
 	t "core/tun"
-	"errors"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/log"
 	"golang.org/x/sync/semaphore"
-	"strconv"
 	"sync"
-	"sync/atomic"
 	"syscall"
 	"time"
 )
 
 var tunLock sync.Mutex
 var tun *t.Tun
-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 fdMap FdMap
 
 //export startTUN
-func startTUN(fd C.int, port C.longlong) {
-	i := int64(port)
-	ServicePort = i
+func startTUN(fd C.int) {
 	go func() {
 		tunLock.Lock()
 		defer tunLock.Unlock()
@@ -48,7 +26,6 @@ func startTUN(fd C.int, port C.longlong) {
 			tun.Close()
 			tun = nil
 		}
-
 		f := int(fd)
 		gateway := "172.16.0.1/30"
 		portal := "172.16.0.2"
@@ -58,6 +35,8 @@ func startTUN(fd C.int, port C.longlong) {
 
 		closer, err := t.Start(f, gateway, portal, dns)
 
+		applyConfig(true)
+
 		if err != nil {
 			log.Errorln("startTUN error: %v", err)
 			tempTun.Close()
@@ -66,95 +45,29 @@ func startTUN(fd C.int, port C.longlong) {
 		tempTun.Closer = closer
 
 		tun = tempTun
-
-		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() {
 	go func() {
 		tunLock.Lock()
 		defer tunLock.Unlock()
 
-		runTime = nil
-
 		if tun != nil {
 			tun.Close()
+			applyConfig(true)
 			tun = nil
 		}
 	}()
 }
 
-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,
-	})
-}
-
-var fdCounter int64 = 0
-
 func init() {
 	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
-		if platform.ShouldBlockConnection() {
-			return errBlocked
-		}
 		return conn.Control(func(fd uintptr) {
-			if tun == nil {
-				return
-			}
-
-			fdInt := int64(fd)
-			timeout := time.After(100 * time.Millisecond)
-			id := atomic.AddInt64(&fdCounter, 1)
-
-			markSocket(Fd{
-				Id:    id,
-				Value: fdInt,
-			})
-
-			for {
-				select {
-				case <-timeout:
-					return
-				default:
-					exists := fdMap.Load(id)
-					if exists {
-						return
-					}
-					time.Sleep(10 * time.Millisecond)
-				}
+			if tun != nil {
+				tun.MarkSocket(int(fd))
+				time.Sleep(time.Millisecond * 100)
 			}
 		})
 	}

core/tun/tun.go

@@ -5,6 +5,7 @@ package tun
 import "C"
 import (
 	"context"
+	bridge "core/dart-bridge"
 	"encoding/binary"
 	"github.com/Kr328/tun2socket"
 	"github.com/Kr328/tun2socket/nat"
@@ -18,6 +19,7 @@ import (
 	"io"
 	"net"
 	"os"
+	"strconv"
 	"time"
 )
 
@@ -184,3 +186,19 @@ func Start(fd int, gateway, portal, dns string) (io.Closer, error) {
 
 	return stack, nil
 }
+
+func (t *Tun) MarkSocket(fd int) {
+	_ = t.Limit.Acquire(context.Background(), 1)
+	defer t.Limit.Release(1)
+
+	if t.Closed {
+		return
+	}
+
+	message := &bridge.Message{
+		Type: bridge.Tun,
+		Data: strconv.Itoa(fd),
+	}
+
+	bridge.SendMessage(*message)
+}

lib/application.dart

@@ -115,6 +115,7 @@ class ApplicationState extends State<Application> {
       lightColorScheme: lightDynamic,
       darkColorScheme: darkDynamic,
     );
+
     WidgetsBinding.instance.addPostFrameCallback((_) {
       globalState.appController.updateSystemColorSchemes(systemColorSchemes);
     });
@@ -128,7 +129,8 @@ class ApplicationState extends State<Application> {
     globalState.groupsUpdateTimer ??= Timer.periodic(
       httpTimeoutDuration,
       (timer) async {
-        await globalState.appController.updateGroupDebounce();
+        await globalState.appController.updateGroups();
+        globalState.appController.appState.sortNum++;
       },
     );
   }
@@ -136,58 +138,58 @@ class ApplicationState extends State<Application> {
   @override
   Widget build(context) {
     return AppStateContainer(
-      child: ClashContainer(
-        child: Selector2<AppState, Config, ApplicationSelectorState>(
-          selector: (_, appState, config) => ApplicationSelectorState(
-            locale: config.locale,
-            themeMode: config.themeMode,
-            primaryColor: config.primaryColor,
+      child: ClashMessageContainer(
+        child: _buildApp(
+          Selector2<AppState, Config, ApplicationSelectorState>(
+            selector: (_, appState, config) => ApplicationSelectorState(
+              locale: config.locale,
+              themeMode: config.themeMode,
+              primaryColor: config.primaryColor,
+            ),
+            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
+                    ],
+                    title: appName,
+                    locale: other.getLocaleForString(state.locale),
+                    supportedLocales:
+                        AppLocalizations.delegate.supportedLocales,
+                    themeMode: state.themeMode,
+                    theme: ThemeData(
+                      useMaterial3: true,
+                      fontFamily: '',
+                      pageTransitionsTheme: _pageTransitionsTheme,
+                      colorScheme: _getAppColorScheme(
+                        brightness: Brightness.light,
+                        systemColorSchemes: systemColorSchemes,
+                        primaryColor: state.primaryColor,
+                      ),
+                    ),
+                    darkTheme: ThemeData(
+                      useMaterial3: true,
+                      fontFamily: '',
+                      pageTransitionsTheme: _pageTransitionsTheme,
+                      colorScheme: _getAppColorScheme(
+                        brightness: Brightness.dark,
+                        systemColorSchemes: systemColorSchemes,
+                        primaryColor: state.primaryColor,
+                      ),
+                    ),
+                    home: child,
+                  );
+                },
+              );
+            },
+            child: const HomePage(),
           ),
-          builder: (_, state, child) {
-            return DynamicColorBuilder(
-              builder: (lightDynamic, darkDynamic) {
-                _updateSystemColorSchemes(lightDynamic, darkDynamic);
-                return MaterialApp(
-                  debugShowCheckedModeBanner: false,
-                  navigatorKey: globalState.navigatorKey,
-                  localizationsDelegates: const [
-                    AppLocalizations.delegate,
-                    GlobalMaterialLocalizations.delegate,
-                    GlobalCupertinoLocalizations.delegate,
-                    GlobalWidgetsLocalizations.delegate
-                  ],
-                  builder: (_, child) {
-                    return _buildApp(child!);
-                  },
-                  scrollBehavior: BaseScrollBehavior(),
-                  title: appName,
-                  locale: other.getLocaleForString(state.locale),
-                  supportedLocales: AppLocalizations.delegate.supportedLocales,
-                  themeMode: state.themeMode,
-                  theme: ThemeData(
-                    useMaterial3: true,
-                    pageTransitionsTheme: _pageTransitionsTheme,
-                    colorScheme: _getAppColorScheme(
-                      brightness: Brightness.light,
-                      systemColorSchemes: systemColorSchemes,
-                      primaryColor: state.primaryColor,
-                    ),
-                  ),
-                  darkTheme: ThemeData(
-                    useMaterial3: true,
-                    pageTransitionsTheme: _pageTransitionsTheme,
-                    colorScheme: _getAppColorScheme(
-                      brightness: Brightness.dark,
-                      systemColorSchemes: systemColorSchemes,
-                      primaryColor: state.primaryColor,
-                    ),
-                  ),
-                  home: child,
-                );
-              },
-            );
-          },
-          child: const HomePage(),
         ),
       ),
     );

lib/clash/core.dart

@@ -35,6 +35,7 @@ class ClashCore {
     clashFFI = ClashFFI(lib);
     clashFFI.initNativeApiBridge(
       NativeApi.initializeApiDLData,
+      receiver.sendPort.nativePort,
     );
   }
 
@@ -44,10 +45,10 @@ class ClashCore {
   }
 
   bool init(String homeDir) {
-    final homeDirChar = homeDir.toNativeUtf8().cast<Char>();
-    final isInit = clashFFI.initClash(homeDirChar) == 1;
-    malloc.free(homeDirChar);
-    return isInit;
+    return clashFFI.initClash(
+          homeDir.toNativeUtf8().cast(),
+        ) ==
+        1;
   }
 
   shutdown() {
@@ -66,12 +67,10 @@ class ClashCore {
         receiver.close();
       }
     });
-    final dataChar = data.toNativeUtf8().cast<Char>();
     clashFFI.validateConfig(
-      dataChar,
+      data.toNativeUtf8().cast(),
       receiver.sendPort.nativePort,
     );
-    malloc.free(dataChar);
     return completer.future;
   }
 
@@ -85,50 +84,23 @@ class ClashCore {
       }
     });
     final params = json.encode(updateConfigParams);
-    final paramsChar = params.toNativeUtf8().cast<Char>();
     clashFFI.updateConfig(
-      paramsChar,
+      params.toNativeUtf8().cast(),
       receiver.sendPort.nativePort,
     );
-    malloc.free(paramsChar);
     return completer.future;
   }
 
-  initMessage() {
-    clashFFI.initMessage(
-      receiver.sendPort.nativePort,
-    );
-  }
-
-  setProfileName(String profileName) {
-    final profileNameChar = profileName.toNativeUtf8().cast<Char>();
-    clashFFI.setCurrentProfileName(
-      profileNameChar,
-    );
-    malloc.free(profileNameChar);
-  }
-
-  getProfileName() {
-    final currentProfileNameRaw = clashFFI.getCurrentProfileName();
-    final currentProfileName =
-        currentProfileNameRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(currentProfileNameRaw);
-    return currentProfileName;
-  }
-
   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;
-      if (proxies.isEmpty) return [];
+      final proxies = json.decode(proxiesRawString);
       final groupNames = [
         UsedProxy.GLOBAL.name,
         ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
           final proxy = proxies[e] ?? {};
-          return GroupTypeExtension.valueList.contains(proxy['type']);
+          return GroupTypeExtension.valueList.contains(proxy['type']) && proxy['hidden'] != true;
         })
       ];
       final groupsRaw = groupNames.map((groupName) {
@@ -137,15 +109,10 @@ class ClashCore {
             .map(
               (name) => proxies[name],
             )
-            .where((proxy) => proxy != null)
             .toList();
         return group;
       }).toList();
-      return groupsRaw
-          .map(
-            (e) => Group.fromJson(e),
-          )
-          .toList();
+      return groupsRaw.map((e) => Group.fromJson(e)).toList();
     });
   }
 
@@ -153,7 +120,6 @@ class ClashCore {
     final externalProvidersRaw = clashFFI.getExternalProviders();
     final externalProvidersRawString =
         externalProvidersRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(externalProvidersRaw);
     return Isolate.run<List<ExternalProvider>>(() {
       final externalProviders =
           (json.decode(externalProvidersRawString) as List<dynamic>)
@@ -177,23 +143,17 @@ class ClashCore {
         receiver.close();
       }
     });
-    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
-    final providerTypeChar = providerType.toNativeUtf8().cast<Char>();
     clashFFI.updateExternalProvider(
-      providerNameChar,
-      providerTypeChar,
+      providerName.toNativeUtf8().cast(),
+      providerType.toNativeUtf8().cast(),
       receiver.sendPort.nativePort,
     );
-    malloc.free(providerNameChar);
-    malloc.free(providerTypeChar);
     return completer.future;
   }
 
-  changeProxy(ChangeProxyParams changeProxyParams) {
+  bool changeProxy(ChangeProxyParams changeProxyParams) {
     final params = json.encode(changeProxyParams);
-    final paramsChar = params.toNativeUtf8().cast<Char>();
-    clashFFI.changeProxy(paramsChar);
-    malloc.free(paramsChar);
+    return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1;
   }
 
   Future<Delay> getDelay(String proxyName) {
@@ -209,70 +169,35 @@ class ClashCore {
         receiver.close();
       }
     });
-    final delayParamsChar =
-        json.encode(delayParams).toNativeUtf8().cast<Char>();
     clashFFI.asyncTestDelay(
-      delayParamsChar,
+      json.encode(delayParams).toNativeUtf8().cast(),
       receiver.sendPort.nativePort,
     );
-    malloc.free(delayParamsChar);
     Future.delayed(httpTimeoutDuration + moreDuration, () {
       receiver.close();
-      if (!completer.isCompleted) {
-        completer.complete(
-          Delay(name: proxyName, value: -1),
-        );
-      }
+      completer.complete(
+        Delay(name: proxyName, value: -1),
+      );
     });
     return completer.future;
   }
 
   clearEffect(String path) {
-    final pathChar = path.toNativeUtf8().cast<Char>();
-    clashFFI.clearEffect(pathChar);
-    malloc.free(pathChar);
+    clashFFI.clearEffect(path.toNativeUtf8().cast());
   }
 
   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);
-  }
-
-  CoreState getState() {
-    final stateRaw = clashFFI.getState();
-    final state = json.decode(
-      stateRaw.cast<Utf8>().toDartString(),
-    );
-    clashFFI.freeCString(stateRaw);
-    return CoreState.fromJson(state);
-  }
-
   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();
   }
@@ -281,9 +206,8 @@ class ClashCore {
     clashFFI.stopLog();
   }
 
-  startTun(int fd, int port) {
-    if (!Platform.isAndroid) return;
-    clashFFI.startTUN(fd, port);
+  startTun(int fd) {
+    clashFFI.startTUN(fd);
   }
 
   requestGc() {
@@ -295,20 +219,11 @@ class ClashCore {
   }
 
   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);
+    clashFFI.setProcessMap(json.encode(processMapItem).toNativeUtf8().cast());
   }
 
   DateTime? getRunTime() {
-    final runTimeRaw = clashFFI.getRunTime();
-    final runTimeString = runTimeRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(runTimeRaw);
+    final runTimeString = clashFFI.getRunTime().cast<Utf8>().toDartString();
     if (runTimeString.isEmpty) return null;
     return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
   }
@@ -317,20 +232,9 @@ class ClashCore {
     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();
-  }
 }
 
 final clashCore = ClashCore();

lib/clash/message.dart

@@ -7,6 +7,22 @@ import 'package:flutter/foundation.dart';
 
 import 'core.dart';
 
+abstract mixin class ClashMessageListener {
+  void onLog(Log log) {}
+
+  void onTun(String fd) {}
+
+  void onDelay(Delay delay) {}
+
+  void onProcess(Process process) {}
+
+  void onRequest(Connection connection) {}
+
+  void onNow(Now now) {}
+
+  void onRun(String runTime) {}
+}
+
 class ClashMessage {
   StreamSubscription? subscription;
 
@@ -16,23 +32,29 @@ class ClashMessage {
       subscription = null;
     }
     subscription = ClashCore.receiver.listen((message) {
-      final m = AppMessage.fromJson(json.decode(message));
-      for (final AppMessageListener listener in _listeners) {
+      final m = Message.fromJson(json.decode(message));
+      for (final ClashMessageListener listener in _listeners) {
         switch (m.type) {
-          case AppMessageType.log:
+          case MessageType.log:
             listener.onLog(Log.fromJson(m.data));
             break;
-          case AppMessageType.delay:
+          case MessageType.tun:
+            listener.onTun(m.data);
+            break;
+          case MessageType.delay:
             listener.onDelay(Delay.fromJson(m.data));
             break;
-          case AppMessageType.request:
+          case MessageType.process:
+            listener.onProcess(Process.fromJson(m.data));
+            break;
+          case MessageType.now:
+            listener.onNow(Now.fromJson(m.data));
+            break;
+          case MessageType.request:
             listener.onRequest(Connection.fromJson(m.data));
             break;
-          case AppMessageType.started:
-            listener.onStarted(m.data);
-            break;
-          case AppMessageType.loaded:
-            listener.onLoaded(m.data);
+          case MessageType.run:
+            listener.onRun(m.data);
             break;
         }
       }
@@ -41,18 +63,18 @@ class ClashMessage {
 
   static final ClashMessage instance = ClashMessage._();
 
-  final ObserverList<AppMessageListener> _listeners =
-      ObserverList<AppMessageListener>();
+  final ObserverList<ClashMessageListener> _listeners =
+      ObserverList<ClashMessageListener>();
 
   bool get hasListeners {
     return _listeners.isNotEmpty;
   }
 
-  void addListener(AppMessageListener listener) {
+  void addListener(ClashMessageListener listener) {
     _listeners.add(listener);
   }
 
-  void removeListener(AppMessageListener listener) {
+  void removeListener(ClashMessageListener listener) {
     _listeners.remove(listener);
   }
 }

lib/clash/service.dart

@@ -17,7 +17,6 @@ class ClashService {
     }
     const geoFileNameList = [
       mmdbFileName,
-      geoIpFileName,
       geoSiteFileName,
       asnFileName,
     ];

lib/common/android.dart

@@ -1,10 +1,15 @@
 import 'dart:io';
 
+import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/plugins/app.dart';
 
 class Android {
   init() async {
-    app?.onExit = () {};
+    app?.onExit = () {
+      clashCore.shutdown();
+      print("adsadda==>");
+      exit(0);
+    };
   }
 }
 

lib/common/common.dart

@@ -22,7 +22,4 @@ export 'string.dart';
 export 'app_localizations.dart';
 export 'function.dart';
 export 'package.dart';
-export 'measure.dart';
-export 'service.dart';
-export 'iterable.dart';
-export 'scroll.dart';
+export 'measure.dart';

lib/common/constant.dart

@@ -1,33 +1,16 @@
-import 'dart:io';
 import 'dart:ui';
 
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/clash_config.dart';
 import 'package:flutter/material.dart';
-import 'system.dart';
 
 const appName = "FlClash";
 const coreName = "clash.meta";
-const packageName = "com.follow.clash";
+const packageName = "FlClash";
 const httpTimeoutDuration = Duration(milliseconds: 5000);
 const moreDuration = Duration(milliseconds: 100);
-const animateDuration = Duration(milliseconds: 100);
 const defaultUpdateDuration = Duration(days: 1);
 const mmdbFileName = "geoip.metadb";
-const asnFileName = "ASN.mmdb";
-const geoIpFileName = "GeoIP.dat";
 const geoSiteFileName = "GeoSite.dat";
-final double kHeaderHeight = system.isDesktop ? (Platform.isMacOS ? 28 : 40) : 0;
-const GeoXMap defaultGeoXMap = {
-  "mmdb":
-      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb",
-  "asn":
-      "https://github.com/xishang0128/geoip/releases/download/latest/GeoLite2-ASN.mmdb",
-  "geoip":
-      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/GeoIP.dat",
-  "geosite":
-      "https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat"
-};
+const asnFileName = "ASN.mmdb";
 const profilesDirectoryName = "profiles";
 const localhost = "127.0.0.1";
 const clashConfigKey = "clash_config";
@@ -40,17 +23,10 @@ const maxMobileWidth = 600;
 const maxLaptopWidth = 840;
 const geodataLoaderMemconservative = "memconservative";
 const geodataLoaderStandard = "standard";
-const defaultTestUrl = "https://www.gstatic.com/generate_204";
 final filter = ImageFilter.blur(
   sigmaX: 5,
   sigmaY: 5,
   tileMode: TileMode.mirror,
 );
 
-const viewModeColumnsMap = {
-  ViewMode.mobile: [2, 1],
-  ViewMode.laptop: [3, 2],
-  ViewMode.desktop: [4, 3],
-};
-
 const defaultPrimaryColor = Colors.brown;

lib/common/context.dart

@@ -7,12 +7,8 @@ extension BuildContextExtension on BuildContext {
     return findAncestorStateOfType<CommonScaffoldState>();
   }
 
-  Size get appSize{
-    return MediaQuery.of(this).size;
-  }
-
   double get width {
-    return appSize.width;
+    return MediaQuery.of(this).size.width;
   }
 
   ColorScheme get colorScheme => Theme.of(this).colorScheme;

lib/common/iterable.dart

@@ -1,67 +0,0 @@
-extension IterableExt<T> on Iterable<T> {
-  Iterable<T> separated(T separator) sync* {
-    final iterator = this.iterator;
-    if (!iterator.moveNext()) return;
-
-    yield iterator.current;
-
-    while (iterator.moveNext()) {
-      yield separator;
-      yield iterator.current;
-    }
-  }
-
-  Iterable<List<T>> chunks(int size) sync* {
-    if (length == 0) return;
-    var iterator = this.iterator;
-    while (iterator.moveNext()) {
-      var chunk = [iterator.current];
-      for (var i = 1; i < size && iterator.moveNext(); i++) {
-        chunk.add(iterator.current);
-      }
-      yield chunk;
-    }
-  }
-
-  Iterable<T> fill(
-    int length, {
-    required T Function(int count) filler,
-  }) sync* {
-    int count = 0;
-    for (var item in this) {
-      yield item;
-      count++;
-      if (count >= length) return;
-    }
-    while (count < length) {
-      yield filler(count);
-      count++;
-    }
-  }
-}
-
-extension DoubleListExt on List<double> {
-  int findInterval(num target) {
-    if (isEmpty) return -1;
-    if (target < first) return -1;
-    if (target >= last) return length - 1;
-
-    int left = 0;
-    int right = length - 1;
-
-    while (left <= right) {
-      int mid = left + (right - left) ~/ 2;
-
-      if (mid == length - 1 ||
-          (this[mid] <= target && target < this[mid + 1])) {
-        return mid;
-      } else if (target < this[mid]) {
-        right = mid - 1;
-      } else {
-        left = mid + 1;
-      }
-    }
-
-    return -1; // 这行理论上不会执行到，但为了完整性保留
-  }
-}

lib/common/navigation.dart

@@ -29,18 +29,11 @@ class Navigation {
         label: "profiles",
         fragment: ProfilesFragment(),
       ),
-      const NavigationItem(
-        icon:  Icon(Icons.view_timeline),
-        label: "requests",
-        fragment:  RequestsFragment(),
-        description: "requestsDesc",
-        modes: [NavigationItemMode.desktop, NavigationItemMode.more],
-      ),
       const NavigationItem(
         icon:  Icon(Icons.ballot),
-        label: "connections",
-        fragment:  ConnectionsFragment(),
-        description: "connectionsDesc",
+        label: "requests",
+        fragment:  RequestFragment(),
+        description: "requestsDesc",
         modes: [NavigationItemMode.desktop, NavigationItemMode.more],
       ),
       const NavigationItem(

lib/common/other.dart

@@ -2,7 +2,6 @@ import 'dart:io';
 import 'dart:isolate';
 import 'dart:typed_data';
 
-import 'package:fl_clash/common/app_localizations.dart';
 import 'package:fl_clash/common/constant.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
@@ -40,9 +39,6 @@ class Other {
     }
     final diff = timeStamp / 1000;
     final inHours = (diff / 3600).floor();
-    if (inHours > 99) {
-      return "99:59:59";
-    }
     final inMinutes = (diff / 60 % 60).floor();
     final inSeconds = (diff % 60).floor();
 
@@ -101,9 +97,9 @@ class Other {
 
   String getTrayIconPath() {
     if (Platform.isWindows) {
-      return "assets/images/icon.ico";
+      return "assets/images/app_icon.ico";
     } else {
-      return "assets/images/icon_monochrome.png";
+      return "assets/images/launch_icon.png";
     }
   }
 
@@ -175,7 +171,7 @@ class Other {
   }
 
   List<String> parseReleaseBody(String? body) {
-    if (body == null) return [];
+    if(body == null) return [];
     const pattern = r'- (.+?)\. \[.+?\]';
     final regex = RegExp(pattern);
     return regex
@@ -185,29 +181,11 @@ class Other {
         .toList();
   }
 
-  ViewMode getViewMode(double viewWidth) {
+  ViewMode getViewMode(double viewWidth){
     if (viewWidth <= maxMobileWidth) return ViewMode.mobile;
     if (viewWidth <= maxLaptopWidth) return ViewMode.laptop;
     return ViewMode.desktop;
   }
-
-  int getColumns(ViewMode viewMode, int currentColumns) {
-    final targetColumnsArray = viewModeColumnsMap[viewMode]!;
-    if (targetColumnsArray.contains(currentColumns)) {
-      return currentColumns;
-    }
-    return targetColumnsArray.first;
-  }
-
-  String getColumnsTextForInt(int number){
-    return switch(number){
-      1 => appLocalizations.oneColumn,
-      2 => appLocalizations.twoColumns,
-      3 => appLocalizations.threeColumns,
-      4 => appLocalizations.fourColumns,
-      int() => throw UnimplementedError(),
-    };
-  }
 }
 
 final other = Other();

lib/common/package.dart

@@ -1,13 +1,22 @@
-import 'dart:io';
+import 'dart:async';
 
 import 'package:package_info_plus/package_info_plus.dart';
 
-import 'common.dart';
+class AppPackage{
 
-extension PackageInfoExtension on PackageInfo {
-  String get ua => [
-        "$appName/v$version",
-        "clash-verge",
-        "Platform/${Platform.operatingSystem}",
-      ].join(" ");
+  static AppPackage? _instance;
+  Completer<PackageInfo> packageInfoCompleter = Completer();
+
+  AppPackage._internal() {
+     PackageInfo.fromPlatform().then(
+          (value) => packageInfoCompleter.complete(value),
+    );
+  }
+
+  factory AppPackage() {
+    _instance ??= AppPackage._internal();
+    return _instance!;
+  }
 }
+
+final appPackage = AppPackage();

lib/common/path.dart

@@ -8,30 +8,12 @@ import 'constant.dart';
 
 class AppPath {
   static AppPath? _instance;
-  Completer<Directory> cacheDir = Completer();
-
-  // Future<Directory> _createDesktopCacheDir() async {
-  //   final path = join(dirname(Platform.resolvedExecutable), 'cache');
-  //   final dir = Directory(path);
-  //   if (await dir.exists()) {
-  //     await dir.create(recursive: true);
-  //   }
-  //   return dir;
-  // }
+  Completer<Directory> applicationSupportDirectoryCompleter = Completer();
 
   AppPath._internal() {
-    getApplicationSupportDirectory().then((value) {
-      cacheDir.complete(value);
-    });
-    // if (Platform.isAndroid) {
-    //   getApplicationSupportDirectory().then((value) {
-    //     cacheDir.complete(value);
-    //   });
-    // } else {
-    //   _createDesktopCacheDir().then((value) {
-    //     cacheDir.complete(value);
-    //   });
-    // }
+    getApplicationSupportDirectory().then(
+      (value) => applicationSupportDirectoryCompleter.complete(value),
+    );
   }
 
   factory AppPath() {
@@ -40,12 +22,12 @@ class AppPath {
   }
 
   Future<String> getHomeDirPath() async {
-    final directory = await cacheDir.future;
+    final directory = await applicationSupportDirectoryCompleter.future;
     return directory.path;
   }
 
   Future<String> getProfilesPath() async {
-    final directory = await cacheDir.future;
+    final directory = await applicationSupportDirectoryCompleter.future;
     return join(directory.path, profilesDirectoryName);
   }
 

lib/common/picker.dart

@@ -1,22 +1,29 @@
+import 'dart:io';
+
 import 'package:file_picker/file_picker.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:image_picker/image_picker.dart';
 
 class Picker {
   Future<PlatformFile?> pickerConfigFile() async {
-    final filePickerResult = await FilePicker.platform.pickFiles(
-      withData: true,
-      allowMultiple: false,
-    );
-    return filePickerResult?.files.first;
-  }
-
-  Future<PlatformFile?> pickerGeoDataFile() async {
-    final filePickerResult = await FilePicker.platform.pickFiles(
-      withData: true,
-      allowMultiple: false,
-    );
-    return filePickerResult?.files.first;
+    FilePickerResult? filePickerResult;
+    if (Platform.isAndroid) {
+      filePickerResult = await FilePicker.platform.pickFiles(
+        withData: true,
+        allowMultiple: false,
+      );
+    } else {
+      filePickerResult = await FilePicker.platform.pickFiles(
+        withData: true,
+        type: FileType.custom,
+        allowedExtensions: ['yaml', 'txt', 'conf'],
+      );
+    }
+    final file = filePickerResult?.files.first;
+    if (file == null) {
+      return null;
+    }
+    return file;
   }
 
   Future<String?> pickerConfigQRCode() async {

lib/common/proxy.dart

@@ -15,8 +15,8 @@ class ProxyManager {
 
   DateTime? get startTime => _proxy.startTime;
 
-  Future<bool?> startProxy({required int port}) async {
-    return await _proxy.startProxy(port);
+  Future<bool?> startProxy({required int port, String? args}) async {
+    return await _proxy.startProxy(port, args);
   }
 
   Future<bool?> stopProxy() async {
@@ -28,6 +28,20 @@ class ProxyManager {
     return await (_proxy as Proxy).updateStartTime();
   }
 
+  Future<bool?> setProtect(int fd) async {
+    if (_proxy is! Proxy) return null;
+    return await (_proxy as Proxy).setProtect(fd);
+  }
+
+  Future<bool?> startForeground({
+    required String title,
+    required String content,
+  }) async {
+    if (_proxy is! Proxy) return null;
+    return await (_proxy as Proxy)
+        .startForeground(title: title, content: content);
+  }
+
   factory ProxyManager() {
     _instance ??= ProxyManager._internal();
     return _instance!;

lib/common/request.dart

@@ -12,21 +12,20 @@ class Request {
   bool _isStart = false;
 
   Request() {
-    _dio = Dio();
-    _dio.options = BaseOptions(
-      headers: {"User-Agent": globalState.appController.clashConfig.globalUa},
-    );
-    _dio.interceptors.add(
-      InterceptorsWrapper(
-        onRequest: (options, handler) {
-          _updateAdapter();
-          return handler.next(options); // 继续请求
-        },
+    _dio = Dio(
+      BaseOptions(
+        headers: {"User-Agent": coreName},
       ),
     );
+    _dio.interceptors.add(InterceptorsWrapper(
+      onRequest: (options, handler) {
+        _syncProxy();
+        return handler.next(options); // 继续请求
+      },
+    ));
   }
 
-  _updateAdapter() {
+  _syncProxy() {
     final port = globalState.appController.clashConfig.mixedPort;
     final isStart = globalState.appController.appState.isStart;
     if (_port != port || isStart != _isStart) {
@@ -36,13 +35,11 @@ class Request {
         createHttpClient: () {
           final client = HttpClient();
           if (!_isStart) return client;
-          client.userAgent = globalState.appController.clashConfig.globalUa;
           client.findProxy = (url) {
             return "PROXY localhost:$_port;DIRECT";
           };
           return client;
         },
-        validateCertificate: (_, __, ___) => true,
       );
     }
   }
@@ -71,7 +68,8 @@ class Request {
     if (response.statusCode != 200) return null;
     final data = response.data as Map<String, dynamic>;
     final remoteVersion = data['tag_name'];
-    final version = globalState.packageInfo.version;
+    final packageInfo = await appPackage.packageInfoCompleter.future;
+    final version = packageInfo.version;
     final hasUpdate =
         other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
     if (!hasUpdate) return null;
@@ -85,7 +83,7 @@ class Request {
     "https://ipinfo.io/json/": IpInfo.fromIpInfoIoJson,
   };
 
-  Future<IpInfo?> checkIp({CancelToken? cancelToken}) async {
+  Future<IpInfo?> checkIp(CancelToken? cancelToken) async {
     for (final source in _ipInfoSources.entries) {
       try {
         final response = await _dio

lib/common/scroll.dart

@@ -1,27 +0,0 @@
-import 'dart:ui';
-
-import 'package:fl_clash/common/common.dart';
-import 'package:flutter/material.dart';
-
-class BaseScrollBehavior extends MaterialScrollBehavior {
-  @override
-  Set<PointerDeviceKind> get dragDevices => {
-        PointerDeviceKind.touch,
-        PointerDeviceKind.stylus,
-        PointerDeviceKind.invertedStylus,
-        PointerDeviceKind.trackpad,
-        if (system.isDesktop) PointerDeviceKind.mouse,
-        PointerDeviceKind.unknown,
-      };
-}
-
-class HiddenBarScrollBehavior extends BaseScrollBehavior {
-  @override
-  Widget buildScrollbar(
-    BuildContext context,
-    Widget child,
-    ScrollableDetails details,
-  ) {
-    return child;
-  }
-}

lib/common/service.dart

@@ -1,110 +0,0 @@
-import 'dart:ffi';
-import 'dart:io';
-import 'package:ffi/ffi.dart';
-import 'package:win32/win32.dart';
-
-typedef CreateServiceNative = IntPtr Function(
-  IntPtr hSCManager,
-  Pointer<Utf16> lpServiceName,
-  Pointer<Utf16> lpDisplayName,
-  Uint32 dwDesiredAccess,
-  Uint32 dwServiceType,
-  Uint32 dwStartType,
-  Uint32 dwErrorControl,
-  Pointer<Utf16> lpBinaryPathName,
-  Pointer<Utf16> lpLoadOrderGroup,
-  Pointer<Uint32> lpdwTagId,
-  Pointer<Utf16> lpDependencies,
-  Pointer<Utf16> lpServiceStartName,
-  Pointer<Utf16> lpPassword,
-);
-
-typedef CreateServiceDart = int Function(
-  int hSCManager,
-  Pointer<Utf16> lpServiceName,
-  Pointer<Utf16> lpDisplayName,
-  int dwDesiredAccess,
-  int dwServiceType,
-  int dwStartType,
-  int dwErrorControl,
-  Pointer<Utf16> lpBinaryPathName,
-  Pointer<Utf16> lpLoadOrderGroup,
-  Pointer<Uint32> lpdwTagId,
-  Pointer<Utf16> lpDependencies,
-  Pointer<Utf16> lpServiceStartName,
-  Pointer<Utf16> lpPassword,
-);
-
-const _SERVICE_ALL_ACCESS = 0xF003F;
-
-const _SERVICE_WIN32_OWN_PROCESS = 0x00000010;
-
-const _SERVICE_AUTO_START = 0x00000002;
-
-const _SERVICE_ERROR_NORMAL = 0x00000001;
-
-typedef GetLastErrorNative = Uint32 Function();
-typedef GetLastErrorDart = int Function();
-
-class Service {
-  static Service? _instance;
-  late DynamicLibrary _advapi32;
-
-  Service._internal() {
-    _advapi32 = DynamicLibrary.open('advapi32.dll');
-  }
-
-  factory Service() {
-    _instance ??= Service._internal();
-    return _instance!;
-  }
-
-  Future<void> createService() async {
-    final int scManager = OpenSCManager(nullptr, nullptr, _SERVICE_ALL_ACCESS);
-    if (scManager == 0) return;
-    final serviceName = 'FlClash Service'.toNativeUtf16();
-    final displayName = 'FlClash Service'.toNativeUtf16();
-    final binaryPathName = "C:\\Application\\Clash.Verge_1.6.6_x64_portable\\resources\\clash-verge-service.exe".toNativeUtf16();
-    final createService =
-        _advapi32.lookupFunction<CreateServiceNative, CreateServiceDart>(
-      'CreateServiceW',
-    );
-    final getLastError = DynamicLibrary.open('kernel32.dll')
-        .lookupFunction<GetLastErrorNative, GetLastErrorDart>('GetLastError');
-
-    final serviceHandle = createService(
-      scManager,
-      serviceName,
-      displayName,
-      _SERVICE_ALL_ACCESS,
-      _SERVICE_WIN32_OWN_PROCESS,
-      _SERVICE_AUTO_START,
-      _SERVICE_ERROR_NORMAL,
-      binaryPathName,
-      nullptr,
-      nullptr,
-      nullptr,
-      nullptr,
-      nullptr,
-    );
-
-    print("serviceHandle $serviceHandle");
-
-    final errorCode = GetLastError();
-    print('Error code: $errorCode');
-
-    final result = StartService(serviceHandle, 0, nullptr);
-
-    if (result == 0) {
-      print('Failed to start the service.');
-    } else {
-      print('Service started successfully.');
-    }
-
-    calloc.free(serviceName);
-    calloc.free(displayName);
-    calloc.free(binaryPathName);
-  }
-}
-
-final service = Platform.isWindows ? Service() : null;

lib/common/string.dart

@@ -1,5 +1,10 @@
 extension StringExtension on String {
   bool get isUrl {
-    return RegExp(r'^(http|https|ftp)://').hasMatch(this);
+    try {
+      Uri.parse(this);
+      return true;
+    } catch (e) {
+      return false;
+    }
   }
 }

lib/common/text.dart

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

lib/common/window.dart

@@ -1,6 +1,5 @@
 import 'dart:io';
 
-import 'package:fl_clash/models/config.dart';
 import 'package:flutter/material.dart';
 import 'package:window_manager/window_manager.dart';
 import 'package:windows_single_instance/windows_single_instance.dart';
@@ -9,7 +8,7 @@ import 'protocol.dart';
 import 'system.dart';
 
 class Window {
-  init(WindowProps props) async {
+  init() async {
     if (Platform.isWindows) {
       await WindowsSingleInstance.ensureSingleInstance([], "FlClash");
       protocol.register("clash");
@@ -17,21 +16,11 @@ class Window {
       protocol.register("flclash");
     }
     await windowManager.ensureInitialized();
-    WindowOptions windowOptions = WindowOptions(
-      size: Size(props.width, props.height),
-      minimumSize: const Size(380, 500),
-      titleBarStyle: TitleBarStyle.hidden,
+    WindowOptions windowOptions = const WindowOptions(
+      size: Size(1000, 600),
+      minimumSize: Size(400, 600),
+      center: true,
     );
-    if (props.left != null || props.top != null) {
-      await windowManager.setPosition(
-        Offset(props.left ?? 0, props.top ?? 0),
-      );
-    } else {
-      await windowManager.setAlignment(Alignment.center);
-    }
-    // if(Platform.isWindows){
-    //   await windowManager.setTitleBarStyle(TitleBarStyle.hidden);
-    // }
     await windowManager.waitUntilReadyToShow(windowOptions, () async {
       await windowManager.setPreventClose(true);
     });

lib/controller.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
@@ -18,8 +17,6 @@ class AppController {
   late ClashConfig clashConfig;
   late Measure measure;
   late Function updateClashConfigDebounce;
-  late Function updateGroupDebounce;
-  late Function addCheckIpNumDebounce;
 
   AppController(this.context) {
     appState = context.read<AppState>();
@@ -28,19 +25,12 @@ class AppController {
     updateClashConfigDebounce = debounce<Function()>(() async {
       await updateClashConfig();
     });
-    addCheckIpNumDebounce = debounce(() {
-      appState.checkIpNum++;
-    });
-    updateGroupDebounce = debounce(() async {
-      await updateGroups();
-    });
     measure = Measure.of(context);
   }
 
   Future<void> updateSystemProxy(bool isStart) async {
     if (isStart) {
       await globalState.startSystemProxy(
-        appState: appState,
         config: config,
         clashConfig: clashConfig,
       );
@@ -50,15 +40,10 @@ class AppController {
         updateRunTime,
         updateTraffic,
       ];
-      if (Platform.isAndroid) return;
-      await applyProfile(isPrue: true);
     } else {
       await globalState.stopSystemProxy();
-      clashCore.resetTraffic();
       appState.traffics = [];
-      appState.totalTraffic = Traffic();
       appState.runTime = null;
-      addCheckIpNumDebounce();
     }
   }
 
@@ -78,10 +63,19 @@ class AppController {
 
   updateTraffic() {
     globalState.updateTraffic(
+      config: config,
       appState: appState,
     );
   }
 
+  changeProxy() {
+    globalState.changeProxy(
+      appState: appState,
+      config: config,
+      clashConfig: clashConfig,
+    );
+  }
+
   addProfile(Profile profile) async {
     config.setProfile(profile);
     if (config.currentProfileId != null) return;
@@ -98,14 +92,18 @@ class AppController {
         final updateId = config.profiles.first.id;
         changeProfile(updateId);
       } else {
-        updateSystemProxy(false);
+        changeProfile(null);
       }
     }
   }
 
-  Future<void> updateProfile(Profile profile) async {
-    await profile.update();
-    config.setProfile(await profile.update());
+  Future<void> updateProfile(String id) async {
+    final profile = config.getCurrentProfileForId(id);
+    if (profile != null) {
+      final tempProfile = profile.copyWith();
+      await tempProfile.update();
+      config.setProfile(tempProfile);
+    }
   }
 
   Future<void> updateClashConfig({bool isPatch = true}) async {
@@ -116,25 +114,16 @@ class AppController {
     );
   }
 
-  Future applyProfile({bool isPrue = false}) async {
-    if (isPrue) {
+  Future applyProfile() async {
+    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
+    if (commonScaffoldState?.mounted != true) return;
+    commonScaffoldState?.loadingRun(() async {
       await globalState.applyProfile(
         appState: appState,
         config: config,
         clashConfig: clashConfig,
       );
-    } else {
-      final commonScaffoldState = globalState.homeScaffoldKey.currentState;
-      if (commonScaffoldState?.mounted != true) return;
-      await commonScaffoldState?.loadingRun(() async {
-        await globalState.applyProfile(
-          appState: appState,
-          config: config,
-          clashConfig: clashConfig,
-        );
-      });
-    }
-    addCheckIpNumDebounce();
+    });
   }
 
   changeProfile(String? value) async {
@@ -157,7 +146,7 @@ class AppController {
         continue;
       }
       try {
-        updateProfile(profile);
+        await updateProfile(profile.id);
       } catch (e) {
         appState.addLog(
           Log(
@@ -174,7 +163,7 @@ class AppController {
       if (profile.type == ProfileType.file) {
         continue;
       }
-      await updateProfile(profile);
+      await updateProfile(profile.id);
     }
   }
 
@@ -201,18 +190,6 @@ class AppController {
     await preferences.saveClashConfig(clashConfig);
   }
 
-  changeProxy({
-    required String groupName,
-    required String proxyName,
-  }) {
-    globalState.changeProxy(
-      config: config,
-      groupName: groupName,
-      proxyName: proxyName,
-    );
-    addCheckIpNumDebounce();
-  }
-
   handleBackOrExit() async {
     if (config.isMinimizeOnExit) {
       if (system.isDesktop) {
@@ -290,7 +267,6 @@ class AppController {
   }
 
   init() async {
-    updateLogStatus();
     if (!config.silentLaunch) {
       window?.show();
     }
@@ -302,7 +278,7 @@ class AppController {
           config: config,
           clashConfig: clashConfig,
         );
-      }, title: appLocalizations.init);
+      },title: appLocalizations.init);
     } else {
       await globalState.applyProfile(
         appState: appState,
@@ -314,13 +290,14 @@ class AppController {
   }
 
   afterInit() async {
-    await proxyManager.updateStartTime();
-    if (proxyManager.isStart) {
+    if (config.autoRun) {
       await updateSystemProxy(true);
     } else {
-      await updateSystemProxy(config.autoRun);
+      await proxyManager.updateStartTime();
+      await updateSystemProxy(proxyManager.isStart);
     }
     autoUpdateProfiles();
+    updateLogStatus();
     autoCheckUpdate();
   }
 
@@ -383,17 +360,17 @@ class AppController {
   }
 
   addProfileFormURL(String url) async {
-    if (globalState.navigatorKey.currentState?.canPop() ?? false) {
-      globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
-    }
+    globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
     toProfiles();
     final commonScaffoldState = globalState.homeScaffoldKey.currentState;
     if (commonScaffoldState?.mounted != true) return;
     final profile = await commonScaffoldState?.loadingRun<Profile>(
       () async {
-        return await Profile.normal(
+        final profile = Profile(
           url: url,
-        ).update();
+        );
+        await profile.update();
+        return profile;
       },
       title: "${appLocalizations.add}${appLocalizations.profile}",
     );
@@ -404,10 +381,6 @@ class AppController {
 
   addProfileFormFile() async {
     final platformFile = await globalState.safeRun(picker.pickerConfigFile);
-    final bytes = platformFile?.bytes;
-    if (bytes == null) {
-      return null;
-    }
     if (!context.mounted) return;
     globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
     toProfiles();
@@ -416,7 +389,13 @@ class AppController {
     final profile = await commonScaffoldState?.loadingRun<Profile?>(
       () async {
         await Future.delayed(const Duration(milliseconds: 300));
-        return await Profile.normal(label: platformFile?.name).saveFile(bytes);
+        final bytes = platformFile?.bytes;
+        if (bytes == null) {
+          return null;
+        }
+        final profile = Profile(label: platformFile?.name);
+        await profile.saveFile(bytes);
+        return profile;
       },
       title: "${appLocalizations.add}${appLocalizations.profile}",
     );
@@ -431,53 +410,9 @@ class AppController {
     addProfileFormURL(url);
   }
 
-  int get columns => other.getColumns(appState.viewMode, config.proxiesColumns);
-
   updateViewWidth(double width) {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       appState.viewWidth = width;
     });
   }
-
-  List<Proxy> _sortOfName(List<Proxy> proxies) {
-    return List.of(proxies)
-      ..sort(
-        (a, b) => other.sortByChar(a.name, b.name),
-      );
-  }
-
-  List<Proxy> _sortOfDelay(List<Proxy> proxies) {
-    return proxies = List.of(proxies)
-      ..sort(
-        (a, b) {
-          final aDelay = appState.getDelay(a.name);
-          final bDelay = appState.getDelay(b.name);
-          if (aDelay == null && bDelay == null) {
-            return 0;
-          }
-          if (aDelay == null || aDelay == -1) {
-            return 1;
-          }
-          if (bDelay == null || bDelay == -1) {
-            return -1;
-          }
-          return aDelay.compareTo(bDelay);
-        },
-      );
-  }
-
-  List<Proxy> getSortProxies(List<Proxy> proxies) {
-    return switch (config.proxiesSortType) {
-      ProxiesSortType.none => proxies,
-      ProxiesSortType.delay => _sortOfDelay(proxies),
-      ProxiesSortType.name => _sortOfName(proxies),
-    };
-  }
-
-  String getCurrentSelectedName(String groupName) {
-    final group = appState.getGroupWithName(groupName);
-    return group?.getCurrentSelectedName(
-            config.currentSelectedMap[groupName] ?? '') ??
-        '';
-  }
 }

lib/enum/enum.dart

@@ -56,20 +56,7 @@ enum ProfileType { file, url }
 
 enum ResultType { success, error }
 
-enum AppMessageType {
-  log,
-  delay,
-  request,
-  started,
-  loaded,
-}
-
-enum ServiceMessageType {
-  protect,
-  process,
-  started,
-  loaded,
-}
+enum MessageType { log, tun, delay, process, now, request, run }
 
 enum FindProcessMode { always, off }
 
@@ -77,11 +64,3 @@ enum RecoveryOption {
   all,
   onlyProfiles,
 }
-
-enum ChipType { action, delete }
-
-enum CommonCardType { plain, filled }
-
-enum ProxiesType { tab, list }
-
-enum ProxyCardType { expand, shrink, min }

lib/fragments/about.dart

@@ -1,20 +1,8 @@
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/list.dart';
 import 'package:flutter/material.dart';
-
-@immutable
-class Contributor {
-  final String avatar;
-  final String name;
-  final String link;
-
-  const Contributor({
-    required this.avatar,
-    required this.name,
-    required this.link,
-  });
-}
+import 'package:package_info_plus/package_info_plus.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 class AboutFragment extends StatelessWidget {
   const AboutFragment({super.key});
@@ -22,7 +10,8 @@ class AboutFragment extends StatelessWidget {
   _checkUpdate(BuildContext context) async {
     final commonScaffoldState = context.commonScaffoldState;
     if (commonScaffoldState?.mounted != true) return;
-    final data = await commonScaffoldState?.loadingRun<Map<String, dynamic>?>(
+    final data =
+        await commonScaffoldState?.loadingRun<Map<String, dynamic>?>(
       request.checkForUpdate,
       title: appLocalizations.checkUpdate,
     );
@@ -32,40 +21,91 @@ class AboutFragment extends StatelessWidget {
     );
   }
 
-  List<Widget> _buildMoreSection(BuildContext context) {
-    return generateSection(
-      separated: false,
-      title: appLocalizations.more,
-      items: [
-        ListItem(
+  @override
+  Widget build(BuildContext context) {
+    return ListView(
+      padding: kMaterialListPadding.copyWith(
+        top: 16,
+        bottom: 16,
+      ),
+      children: [
+        ListTile(
+          title: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Wrap(
+                spacing: 16,
+                crossAxisAlignment: WrapCrossAlignment.center,
+                children: [
+                  Image.asset(
+                    'assets/images/launch_icon.png',
+                    width: 100,
+                    height: 100,
+                  ),
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        appName,
+                        style: Theme.of(context).textTheme.headlineSmall,
+                      ),
+                      FutureBuilder<PackageInfo>(
+                        future: appPackage.packageInfoCompleter.future,
+                        builder: (_, package) {
+                          final version = package.data?.version;
+                          if (version == null) return Container();
+                          return Text(
+                            version,
+                            style: Theme.of(context).textTheme.labelLarge,
+                          );
+                        },
+                      )
+                    ],
+                  )
+                ],
+              ),
+              const SizedBox(
+                height: 24,
+              ),
+              Text(
+                appLocalizations.desc,
+                style: Theme.of(context).textTheme.bodySmall,
+              ),
+            ],
+          ),
+        ),
+        const SizedBox(
+          height: 12,
+        ),
+        ListTile(
           title: Text(appLocalizations.checkUpdate),
           onTap: () {
             _checkUpdate(context);
           },
         ),
-        ListItem(
+        ListTile(
           title: const Text("Telegram"),
           onTap: () {
-            globalState.openUrl(
-              "https://t.me/+G-veVtwBOl4wODc1",
+            launchUrl(
+              Uri.parse("https://t.me/+G-veVtwBOl4wODc1"),
             );
           },
           trailing: const Icon(Icons.launch),
         ),
-        ListItem(
+        ListTile(
           title: Text(appLocalizations.project),
           onTap: () {
-            globalState.openUrl(
-              "https://github.com/$repository",
+            launchUrl(
+              Uri.parse("https://github.com/$repository"),
             );
           },
           trailing: const Icon(Icons.launch),
         ),
-        ListItem(
+        ListTile(
           title: Text(appLocalizations.core),
           onTap: () {
-            globalState.openUrl(
-              "https://github.com/chen08209/Clash.Meta/tree/FlClash",
+            launchUrl(
+              Uri.parse("https://github.com/chen08209/Clash.Meta/tree/FlClash"),
             );
           },
           trailing: const Icon(Icons.launch),
@@ -73,139 +113,4 @@ class AboutFragment extends StatelessWidget {
       ],
     );
   }
-
-  List<Widget> _buildContributorsSection() {
-    const contributors = [
-      Contributor(
-        avatar: "assets/images/avatars/june2.jpg",
-        name: "June2",
-        link: "https://t.me/Jibadong",
-      ),
-      Contributor(
-        avatar: "assets/images/avatars/arue.jpg",
-        name: "Arue",
-        link: "https://t.me/xrcm6868",
-      ),
-    ];
-    return generateSection(
-      separated: false,
-      title: appLocalizations.otherContributors,
-      items: [
-        ListItem(
-          title: SingleChildScrollView(
-            scrollDirection: Axis.horizontal,
-            child: Wrap(
-              spacing: 24,
-              children: [
-                for (final contributor in contributors)
-                  Avatar(
-                    contributor: contributor,
-                  ),
-              ],
-            ),
-          ),
-        )
-      ],
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final items = [
-      ListTile(
-        title: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Wrap(
-              spacing: 16,
-              crossAxisAlignment: WrapCrossAlignment.center,
-              children: [
-                Padding(
-                  padding: const EdgeInsets.all(12),
-                  child: Image.asset(
-                    'assets/images/icon.png',
-                    width: 64,
-                    height: 64,
-                  ),
-                ),
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      appName,
-                      style: Theme.of(context).textTheme.headlineSmall,
-                    ),
-                    Text(
-                      globalState.packageInfo.version,
-                      style: Theme.of(context).textTheme.labelLarge,
-                    )
-                  ],
-                )
-              ],
-            ),
-            const SizedBox(
-              height: 24,
-            ),
-            Text(
-              appLocalizations.desc,
-              style: Theme.of(context).textTheme.bodySmall,
-            ),
-          ],
-        ),
-      ),
-      const SizedBox(
-        height: 12,
-      ),
-      ..._buildContributorsSection(),
-      ..._buildMoreSection(context),
-    ];
-    return Padding(
-      padding: kMaterialListPadding.copyWith(
-        top: 16,
-        bottom: 16,
-      ),
-      child: generateListView(items),
-    );
-  }
-}
-
-class Avatar extends StatelessWidget {
-  final Contributor contributor;
-
-  const Avatar({
-    super.key,
-    required this.contributor,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return InkWell(
-      splashColor: Colors.transparent,
-      highlightColor: Colors.transparent,
-      hoverColor: Colors.transparent,
-      child: Column(
-        children: [
-          SizedBox(
-            width: 36,
-            height: 36,
-            child: CircleAvatar(
-              foregroundImage: AssetImage(
-                contributor.avatar,
-              ),
-            ),
-          ),
-          const SizedBox(
-            height: 4,
-          ),
-          Text(
-            contributor.name,
-            style: context.textTheme.bodySmall,
-          )
-        ],
-      ),
-      onTap: () {
-        globalState.openUrl(contributor.link);
-      },
-    );
-  }
 }

lib/fragments/access.dart

@@ -35,12 +35,6 @@ class _AccessFragmentState extends State<AccessFragment> {
     });
   }
 
-  @override
-  void dispose() {
-    super.dispose();
-    packagesListenable.dispose();
-  }
-
   Widget _buildAppProxyModePopup() {
     final items = [
       CommonPopupMenuItem(
@@ -111,49 +105,56 @@ class _AccessFragmentState extends State<AccessFragment> {
     );
   }
 
-  // Widget _buildSelectedAllButton({
-  //   required bool isAccessControl,
-  //   required bool isSelectedAll,
-  //   required List<String> allValueList,
-  // }) {
-  //   final tooltip = isSelectedAll
-  //       ? appLocalizations.cancelSelectAll
-  //       : appLocalizations.selectAll;
-  //   return AbsorbPointer(
-  //     absorbing: !isAccessControl,
-  //     child: FloatingActionButton(
-  //       tooltip: tooltip,
-  //       onPressed: () {
-  //         final config = globalState.appController.config;
-  //         final isAccept =
-  //             config.accessControl.mode == AccessControlMode.acceptSelected;
-  //
-  //         if (isSelectedAll) {
-  //           config.accessControl = switch (isAccept) {
-  //             true => config.accessControl.copyWith(
-  //                 acceptList: [],
-  //               ),
-  //             false => config.accessControl.copyWith(
-  //                 rejectList: [],
-  //               ),
-  //           };
-  //         } else {
-  //           config.accessControl = switch (isAccept) {
-  //             true => config.accessControl.copyWith(
-  //                 acceptList: allValueList,
-  //               ),
-  //             false => config.accessControl.copyWith(
-  //                 rejectList: allValueList,
-  //               ),
-  //           };
-  //         }
-  //       },
-  //       child: isSelectedAll
-  //           ? const Icon(Icons.deselect)
-  //           : const Icon(Icons.select_all),
-  //     ),
-  //   );
-  // }
+  _buildSelectedAllButton({
+    required bool isAccessControl,
+    required bool isSelectedAll,
+    required List<String> allValueList,
+  }) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final tooltip = isSelectedAll
+          ? appLocalizations.cancelSelectAll
+          : appLocalizations.selectAll;
+      final commonScaffoldState =
+          context.findAncestorStateOfType<CommonScaffoldState>();
+      commonScaffoldState?.floatingActionButton = DisabledMask(
+        status: !isAccessControl,
+        child: AbsorbPointer(
+          absorbing: !isAccessControl,
+          child: FloatingActionButton (
+            tooltip: tooltip,
+            onPressed: () {
+              final config = globalState.appController.config;
+              final isAccept =
+                  config.accessControl.mode == AccessControlMode.acceptSelected;
+
+              if (isSelectedAll) {
+                config.accessControl = switch (isAccept) {
+                  true => config.accessControl.copyWith(
+                      acceptList: [],
+                    ),
+                  false => config.accessControl.copyWith(
+                      rejectList: [],
+                    ),
+                };
+              } else {
+                config.accessControl = switch (isAccept) {
+                  true => config.accessControl.copyWith(
+                      acceptList: allValueList,
+                    ),
+                  false => config.accessControl.copyWith(
+                      rejectList: allValueList,
+                    ),
+                };
+              }
+            },
+            child: isSelectedAll
+                ? const Icon(Icons.deselect)
+                : const Icon(Icons.select_all),
+          ),
+        ),
+      );
+    });
+  }
 
   Widget _buildPackageList() {
     return ValueListenableBuilder(
@@ -205,6 +206,11 @@ class _AccessFragmentState extends State<AccessFragment> {
                 accessControlMode == AccessControlMode.acceptSelected
                     ? appLocalizations.accessControlAllowDesc
                     : appLocalizations.accessControlNotAllowDesc;
+            _buildSelectedAllButton(
+              isAccessControl: isAccessControl,
+              isSelectedAll: valueList.length == packageNameList.length,
+              allValueList: packageNameList,
+            );
             return DisabledMask(
               status: !isAccessControl,
               child: Column(
@@ -238,10 +244,10 @@ class _AccessFragmentState extends State<AccessFragment> {
                                                 .textTheme
                                                 .labelLarge
                                                 ?.copyWith(
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .primary,
-                                            ),
+                                                  color: Theme.of(context)
+                                                      .colorScheme
+                                                      .primary,
+                                                ),
                                           ),
                                         ),
                                         const Flexible(
@@ -256,10 +262,10 @@ class _AccessFragmentState extends State<AccessFragment> {
                                                 .textTheme
                                                 .labelLarge
                                                 ?.copyWith(
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .primary,
-                                            ),
+                                                  color: Theme.of(context)
+                                                      .colorScheme
+                                                      .primary,
+                                                ),
                                           ),
                                         ),
                                       ],
@@ -292,42 +298,42 @@ class _AccessFragmentState extends State<AccessFragment> {
                       key: const Key("fade_box"),
                       child: currentPackages.isEmpty
                           ? const Center(
-                        child: CircularProgressIndicator(),
-                      )
+                              child: CircularProgressIndicator(),
+                            )
                           : ListView.builder(
-                        itemCount: currentPackages.length,
-                        itemBuilder: (_, index) {
-                          final package = currentPackages[index];
-                          return PackageListItem(
-                            key: Key(package.packageName),
-                            package: package,
-                            value:
-                            valueList.contains(package.packageName),
-                            isActive: isAccessControl,
-                            onChanged: (value) {
-                              if (value == true) {
-                                valueList.add(package.packageName);
-                              } else {
-                                valueList.remove(package.packageName);
-                              }
-                              final config =
-                                  globalState.appController.config;
-                              if (accessControlMode ==
-                                  AccessControlMode.acceptSelected) {
-                                config.accessControl =
-                                    config.accessControl.copyWith(
-                                      acceptList: valueList,
-                                    );
-                              } else {
-                                config.accessControl =
-                                    config.accessControl.copyWith(
-                                      rejectList: valueList,
-                                    );
-                              }
-                            },
-                          );
-                        },
-                      ),
+                              itemCount: currentPackages.length,
+                              itemBuilder: (_, index) {
+                                final package = currentPackages[index];
+                                return PackageListItem(
+                                  key: Key(package.packageName),
+                                  package: package,
+                                  value:
+                                      valueList.contains(package.packageName),
+                                  isActive: isAccessControl,
+                                  onChanged: (value) {
+                                    if (value == true) {
+                                      valueList.add(package.packageName);
+                                    } else {
+                                      valueList.remove(package.packageName);
+                                    }
+                                    final config =
+                                        globalState.appController.config;
+                                    if (accessControlMode ==
+                                        AccessControlMode.acceptSelected) {
+                                      config.accessControl =
+                                          config.accessControl.copyWith(
+                                        acceptList: valueList,
+                                      );
+                                    } else {
+                                      config.accessControl =
+                                          config.accessControl.copyWith(
+                                        rejectList: valueList,
+                                      );
+                                    }
+                                  },
+                                );
+                              },
+                            ),
                     ),
                   ),
                 ],

lib/fragments/application_setting.dart

@@ -89,24 +89,6 @@ class ApplicationSettingFragment extends StatelessWidget {
           );
         },
       ),
-      if (Platform.isAndroid)
-        Selector<Config, bool>(
-          selector: (_, config) => config.isExclude,
-          builder: (_, isExclude, child) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.visibility_off),
-              title: Text(appLocalizations.exclude),
-              subtitle: Text(appLocalizations.excludeDesc),
-              delegate: SwitchDelegate(
-                value: isExclude,
-                onChanged: (value) {
-                  final config = context.read<Config>();
-                  config.isExclude = value;
-                },
-              ),
-            );
-          },
-        ),
       if (Platform.isAndroid)
         Selector<Config, bool>(
           selector: (_, config) => config.isAnimateToPage,

lib/fragments/backup_and_recovery.dart

@@ -6,6 +6,7 @@ import 'package:fl_clash/models/dav.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/fade_box.dart';
 import 'package:fl_clash/widgets/list.dart';
+import 'package:fl_clash/widgets/section.dart';
 import 'package:fl_clash/widgets/text.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -33,9 +34,9 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
     final res = await commonScaffoldState?.loadingRun<bool>(() async {
       return await _client?.backup();
     });
-    if (res != true) return;
+    if(res != true) return;
     globalState.showMessage(
-      title: appLocalizations.backup,
+      title: appLocalizations.recovery,
       message: TextSpan(text: appLocalizations.backupSuccess),
     );
   }
@@ -45,7 +46,7 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
     final res = await commonScaffoldState?.loadingRun<bool>(() async {
       return await _client?.recovery(recoveryOption: recoveryOption);
     });
-    if (res != true) return;
+    if(res != true) return;
     globalState.showMessage(
       title: appLocalizations.recovery,
       message: TextSpan(text: appLocalizations.recoverySuccess),
@@ -68,22 +69,26 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
         if (dav == null) {
           return ListView(
             children: [
-              ListHeader(
+              Section(
                 title: appLocalizations.account,
-              ),
-              ListItem(
-                leading: const Icon(Icons.account_box),
-                title: Text(appLocalizations.noInfo),
-                subtitle: Text(appLocalizations.pleaseBindWebDAV),
-                trailing: FilledButton.tonal(
-                  onPressed: () {
-                    _showAddWebDAV(dav);
+                child: Builder(
+                  builder: (_) {
+                    return ListItem(
+                      leading: const Icon(Icons.account_box),
+                      title: Text(appLocalizations.noInfo),
+                      subtitle: Text(appLocalizations.pleaseBindWebDAV),
+                      trailing: FilledButton.tonal(
+                        onPressed: () {
+                          _showAddWebDAV(dav);
+                        },
+                        child: Text(
+                          appLocalizations.bind,
+                        ),
+                      ),
+                    );
                   },
-                  child: Text(
-                    appLocalizations.bind,
-                  ),
                 ),
-              ),
+              )
             ],
           );
         }
@@ -91,59 +96,62 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
         final pingFuture = _client!.pingCompleter.future;
         return ListView(
           children: [
-            ListHeader(title: appLocalizations.account),
-            ListItem(
-              leading: const Icon(Icons.account_box),
-              title: TooltipText(
-                text: Text(
-                  dav.user,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
+            Section(
+              title: appLocalizations.account,
+              child: ListItem(
+                leading: const Icon(Icons.account_box),
+                title: TooltipText(
+                  text: Text(
+                    dav.user,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                  ),
                 ),
-              ),
-              subtitle: Padding(
-                padding: const EdgeInsets.symmetric(vertical: 4),
-                child: Row(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
-                    Text(appLocalizations.connectivity),
-                    FutureBuilder<bool>(
-                      future: pingFuture,
-                      builder: (_, snapshot) {
-                        return Center(
-                          child: FadeBox(
-                            key: const Key("fade_box_1"),
-                            child: snapshot.connectionState == ConnectionState.waiting
-                                ? const SizedBox(
-                                    width: 12,
-                                    height: 12,
-                                    child: CircularProgressIndicator(
-                                      strokeWidth: 1,
+                subtitle: Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 4),
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      Text(appLocalizations.connectivity),
+                      FutureBuilder<bool>(
+                        future: pingFuture,
+                        builder: (_, snapshot) {
+                          return Center(
+                            child: FadeBox(
+                              key: const Key("fade_box_1"),
+                              child: snapshot.connectionState ==
+                                      ConnectionState.waiting
+                                  ? const SizedBox(
+                                      width: 12,
+                                      height: 12,
+                                      child: CircularProgressIndicator(
+                                        strokeWidth: 1,
+                                      ),
+                                    )
+                                  : Container(
+                                      decoration: BoxDecoration(
+                                        shape: BoxShape.circle,
+                                        color: snapshot.data == true
+                                            ? Colors.green
+                                            : Colors.red,
+                                      ),
+                                      width: 12,
+                                      height: 12,
                                     ),
-                                  )
-                                : Container(
-                                    decoration: BoxDecoration(
-                                      shape: BoxShape.circle,
-                                      color: snapshot.data == true
-                                          ? Colors.green
-                                          : Colors.red,
-                                    ),
-                                    width: 12,
-                                    height: 12,
-                                  ),
-                          ),
-                        );
-                      },
-                    ),
-                  ],
+                            ),
+                          );
+                        },
+                      ),
+                    ],
+                  ),
                 ),
-              ),
-              trailing: FilledButton.tonal(
-                onPressed: () {
-                  _showAddWebDAV(dav);
-                },
-                child: Text(
-                  appLocalizations.edit,
+                trailing: FilledButton.tonal(
+                  onPressed: () {
+                    _showAddWebDAV(dav);
+                  },
+                  child: Text(
+                    appLocalizations.edit,
+                  ),
                 ),
               ),
             ),
@@ -153,21 +161,22 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
                 return FadeBox(
                   key: const Key("fade_box_2"),
                   child: snapshot.data == true
-                      ? Column(
-                          children: [
-                            ListHeader(
-                                title: appLocalizations.backupAndRecovery),
-                            ListItem(
-                              onTap: _backup,
-                              title: Text(appLocalizations.backup),
-                              subtitle: Text(appLocalizations.backupDesc),
-                            ),
-                            ListItem(
-                              onTap: _handleRecovery,
-                              title: Text(appLocalizations.recovery),
-                              subtitle: Text(appLocalizations.recoveryDesc),
-                            ),
-                          ],
+                      ? Section(
+                          title: appLocalizations.backupAndRecovery,
+                          child: Column(
+                            children: [
+                              ListItem(
+                                onTab: _backup,
+                                title: Text(appLocalizations.backup),
+                                subtitle: Text(appLocalizations.backupDesc),
+                              ),
+                              ListItem(
+                                onTab: _handleRecovery,
+                                title: Text(appLocalizations.recovery),
+                                subtitle: Text(appLocalizations.recoveryDesc),
+                              ),
+                            ],
+                          ),
                         )
                       : Container(),
                 );
@@ -219,12 +228,6 @@ class _WebDAVFormDialogState extends State<WebDAVFormDialog> {
     Navigator.pop(context);
   }
 
-  @override
-  void dispose() {
-    super.dispose();
-    _obscureController.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return AlertDialog(
@@ -340,13 +343,13 @@ class _RecoveryOptionsDialogState extends State<RecoveryOptionsDialog> {
         child: Wrap(
           children: [
             ListItem(
-              onTap: () {
+              onTab: () {
                 _handleOnTab(RecoveryOption.onlyProfiles);
               },
               title: Text(appLocalizations.recoveryProfiles),
             ),
             ListItem(
-              onTap: () {
+              onTab: () {
                 _handleOnTab(RecoveryOption.all);
               },
               title: Text(appLocalizations.recoveryAll),

lib/fragments/config.dart

@@ -39,6 +39,81 @@ class _ConfigFragmentState extends State<ConfigFragment> {
     }
   }
 
+  Widget _buildAppSection() {
+    final items = [
+      if (Platform.isAndroid)
+        Selector<Config, bool>(
+          selector: (_, config) => config.allowBypass,
+          builder: (_, allowBypass, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.arrow_forward_outlined),
+              title: Text(appLocalizations.allowBypass),
+              subtitle: Text(appLocalizations.allowBypassDesc),
+              delegate: SwitchDelegate(
+                value: allowBypass,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.config.allowBypass = value;
+                },
+              ),
+            );
+          },
+        ),
+      if (Platform.isAndroid)
+        Selector<Config, bool>(
+          selector: (_, config) => config.systemProxy,
+          builder: (_, systemProxy, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.settings_ethernet),
+              title: Text(appLocalizations.systemProxy),
+              subtitle: Text(appLocalizations.systemProxyDesc),
+              delegate: SwitchDelegate(
+                value: systemProxy,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.config.systemProxy = value;
+                },
+              ),
+            );
+          },
+        ),
+      Selector<Config, bool>(
+        selector: (_, config) => config.isCompatible,
+        builder: (_, isCompatible, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.expand_outlined),
+            title: Text(appLocalizations.compatible),
+            subtitle: Text(appLocalizations.compatibleDesc),
+            delegate: SwitchDelegate(
+              value: isCompatible,
+              onChanged: (bool value) async {
+                final appController = globalState.appController;
+                appController.config.isCompatible = value;
+                await appController.updateClashConfig(isPatch: false);
+                await appController.updateGroups();
+                appController.changeProxy();
+              },
+            ),
+          );
+        },
+      ),
+    ];
+    return Section(
+      title: appLocalizations.app,
+      child: Column(
+        children: [
+          for (final item in items) ...[
+            item,
+            if (items.last != item)
+              const Divider(
+                height: 0,
+              )
+          ]
+        ],
+      ),
+    );
+  }
+
   _showLogLevelDialog(LogLevel value) {
     globalState.showCommonDialog(
       child: AlertDialog(
@@ -75,398 +150,238 @@ class _ConfigFragmentState extends State<ConfigFragment> {
     );
   }
 
-  _showUaDialog(String? value) {
-    const uas = [
-      null,
-      "clash-verge/v1.6.6",
-      "ClashforWindows/0.19.23",
-    ];
-    globalState.showCommonDialog(
-      child: AlertDialog(
-        title: const Text("UA"),
-        contentPadding: const EdgeInsets.symmetric(
-          horizontal: 8,
-          vertical: 16,
-        ),
-        content: SizedBox(
-          width: 250,
-          child: Wrap(
-            children: [
-              for (final ua in uas)
-                ListItem.radio(
-                  delegate: RadioDelegate<String?>(
-                    value: ua,
-                    groupValue: value,
-                    onChanged: (String? value) {
-                      final appController = globalState.appController;
-                      appController.clashConfig.globalRealUa = value;
-                      appController.updateClashConfigDebounce();
-                      Navigator.of(context).pop();
-                    },
-                  ),
-                  title: Text(ua ?? appLocalizations.defaultText),
-                )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  _modifyTestUrl(String testUrl) async {
-    final newTestUrl = await globalState.showCommonDialog<String>(
-      child: TestUrlFormDialog(
-        testUrl: testUrl,
-      ),
-    );
-    if (newTestUrl != null && newTestUrl != testUrl && mounted) {
-      try {
-        if (!newTestUrl.isUrl) {
-          throw "Invalid url";
-        }
-        globalState.appController.config.testUrl = newTestUrl;
-        globalState.appController.updateClashConfigDebounce();
-      } catch (e) {
-        globalState.showMessage(
-          title: appLocalizations.testUrl,
-          message: TextSpan(
-            text: e.toString(),
-          ),
-        );
-      }
-    }
-  }
-
-  List<Widget> _buildAppSection() {
-    return generateSection(
-      title: appLocalizations.app,
-      items: [
-        if (Platform.isAndroid)...[
-          Selector<Config, bool>(
-            selector: (_, config) => config.allowBypass,
-            builder: (_, allowBypass, __) {
-              return ListItem.switchItem(
-                leading: const Icon(Icons.arrow_forward_outlined),
-                title: Text(appLocalizations.allowBypass),
-                subtitle: Text(appLocalizations.allowBypassDesc),
-                delegate: SwitchDelegate(
-                  value: allowBypass,
-                  onChanged: (bool value) async {
-                    final appController = globalState.appController;
-                    appController.config.allowBypass = value;
-                  },
-                ),
-              );
+  Widget _buildGeneralSection() {
+    final items = [
+      Selector<ClashConfig, LogLevel>(
+        selector: (_, clashConfig) => clashConfig.logLevel,
+        builder: (_, value, __) {
+          return ListItem(
+            leading: const Icon(Icons.info_outline),
+            title: Text(appLocalizations.logLevel),
+            subtitle: Text(value.name),
+            onTab: () {
+              _showLogLevelDialog(value);
             },
-          ),
-          Selector<Config, bool>(
-            selector: (_, config) => config.systemProxy,
-            builder: (_, systemProxy, __) {
-              return ListItem.switchItem(
-                leading: const Icon(Icons.settings_ethernet),
-                title: Text(appLocalizations.systemProxy),
-                subtitle: Text(appLocalizations.systemProxyDesc),
-                delegate: SwitchDelegate(
-                  value: systemProxy,
-                  onChanged: (bool value) async {
-                    final appController = globalState.appController;
-                    appController.config.systemProxy = value;
-                  },
-                ),
-              );
+          );
+        },
+      ),
+      Selector<ClashConfig, int>(
+        selector: (_, clashConfig) => clashConfig.mixedPort,
+        builder: (_, mixedPort, __) {
+          return ListItem(
+            onTab: () {
+              _modifyMixedPort(mixedPort);
             },
-          ),
-        ],
-        Selector<Config, bool>(
-          selector: (_, config) => config.isCloseConnections,
-          builder: (_, isCloseConnections, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.auto_delete_outlined),
-              title: Text(appLocalizations.autoCloseConnections),
-              subtitle: Text(appLocalizations.autoCloseConnectionsDesc),
-              delegate: SwitchDelegate(
-                value: isCloseConnections,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.config.isCloseConnections = value;
-                },
-              ),
-            );
-          },
-        ),
-        Selector<Config, bool>(
-          selector: (_, config) => config.onlyProxy,
-          builder: (_, onlyProxy, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.data_usage_outlined),
-              title: Text(appLocalizations.onlyStatisticsProxy),
-              subtitle: Text(appLocalizations.onlyStatisticsProxyDesc),
-              delegate: SwitchDelegate(
-                value: onlyProxy,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.config.onlyProxy = value;
-                },
-              ),
-            );
-          },
-        ),
-        // Selector<Config, bool>(
-        //   selector: (_, config) => config.isCompatible,
-        //   builder: (_, isCompatible, __) {
-        //     return ListItem.switchItem(
-        //       leading: const Icon(Icons.expand_outlined),
-        //       title: Text(appLocalizations.compatible),
-        //       subtitle: Text(appLocalizations.compatibleDesc),
-        //       delegate: SwitchDelegate(
-        //         value: isCompatible,
-        //         onChanged: (bool value) async {
-        //           final appController = globalState.appController;
-        //           appController.config.isCompatible = value;
-        //           await appController.applyProfile();
-        //         },
-        //       ),
-        //     );
-        //   },
-        // ),
-      ],
-    );
-  }
-
-  List<Widget> _buildGeneralSection() {
-    return generateSection(
-      title: appLocalizations.general,
-      items: [
-        Selector<ClashConfig, LogLevel>(
-          selector: (_, clashConfig) => clashConfig.logLevel,
-          builder: (_, value, __) {
-            return ListItem(
-              leading: const Icon(Icons.info_outline),
-              title: Text(appLocalizations.logLevel),
-              subtitle: Text(value.name),
-              onTap: () {
-                _showLogLevelDialog(value);
-              },
-            );
-          },
-        ),
-        Selector<ClashConfig, String?>(
-          selector: (_, clashConfig) => clashConfig.globalRealUa,
-          builder: (_, value, __) {
-            return ListItem(
-              leading: const Icon(Icons.computer_outlined),
-              title: const Text("UA"),
-              subtitle: Text(value ?? appLocalizations.defaultText),
-              onTap: () {
-                _showUaDialog(value);
-              },
-            );
-          },
-        ),
-        Selector<Config, String>(
-          selector: (_, config) => config.testUrl,
-          builder: (_, value, __) {
-            return ListItem(
-              leading: const Icon(Icons.timeline),
-              title: Text(appLocalizations.testUrl),
-              subtitle: Text(value),
-              onTap: () {
-                _modifyTestUrl(value);
-              },
-            );
-          },
-        ),
-        Selector<ClashConfig, int>(
-          selector: (_, clashConfig) => clashConfig.mixedPort,
-          builder: (_, mixedPort, __) {
-            return ListItem(
-              onTap: () {
+            leading: const Icon(Icons.adjust_outlined),
+            title: Text(appLocalizations.proxyPort),
+            subtitle: Text(appLocalizations.proxyPortDesc),
+            trailing: FilledButton.tonal(
+              onPressed: () {
                 _modifyMixedPort(mixedPort);
               },
-              leading: const Icon(Icons.adjust_outlined),
-              title: Text(appLocalizations.proxyPort),
-              subtitle: Text(appLocalizations.proxyPortDesc),
-              trailing: FilledButton.tonal(
-                onPressed: () {
-                  _modifyMixedPort(mixedPort);
-                },
-                child: Text(
-                  "$mixedPort",
-                ),
+              child: Text(
+                "$mixedPort",
               ),
-            );
-          },
-        ),
+            ),
+          );
+        },
+      ),
+      Selector<ClashConfig, bool>(
+        selector: (_, clashConfig) => clashConfig.ipv6,
+        builder: (_, ipv6, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.water_outlined),
+            title: const Text("Ipv6"),
+            subtitle: Text(appLocalizations.ipv6Desc),
+            delegate: SwitchDelegate(
+              value: ipv6,
+              onChanged: (bool value) async {
+                final appController = globalState.appController;
+                appController.clashConfig.ipv6 = value;
+                appController.updateClashConfigDebounce();
+              },
+            ),
+          );
+        },
+      ),
+      Selector<ClashConfig, bool>(
+        selector: (_, clashConfig) => clashConfig.allowLan,
+        builder: (_, allowLan, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.device_hub),
+            title: Text(appLocalizations.allowLan),
+            subtitle: Text(appLocalizations.allowLanDesc),
+            delegate: SwitchDelegate(
+              value: allowLan,
+              onChanged: (bool value) async {
+                final clashConfig = context.read<ClashConfig>();
+                clashConfig.allowLan = value;
+                globalState.appController.updateClashConfigDebounce();
+              },
+            ),
+          );
+        },
+      ),
+      Selector<ClashConfig, bool>(
+        selector: (_, clashConfig) => clashConfig.unifiedDelay,
+        builder: (_, unifiedDelay, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.compress_outlined),
+            title: Text(appLocalizations.unifiedDelay),
+            subtitle: Text(appLocalizations.unifiedDelayDesc),
+            delegate: SwitchDelegate(
+              value: unifiedDelay,
+              onChanged: (bool value) async {
+                final appController = globalState.appController;
+                appController.clashConfig.unifiedDelay = value;
+                appController.updateClashConfigDebounce();
+              },
+            ),
+          );
+        },
+      ),
+      Selector<ClashConfig, bool>(
+        selector: (_, clashConfig) =>
+            clashConfig.findProcessMode == FindProcessMode.always,
+        builder: (_, findProcess, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.polymer_outlined),
+            title: Text(appLocalizations.findProcessMode),
+            subtitle: Text(appLocalizations.findProcessModeDesc),
+            delegate: SwitchDelegate(
+              value: findProcess,
+              onChanged: (bool value) async {
+                final appController = globalState.appController;
+                appController.clashConfig.findProcessMode =
+                    value ? FindProcessMode.always : FindProcessMode.off;
+                appController.updateClashConfigDebounce();
+              },
+            ),
+          );
+        },
+      ),
+      Selector<ClashConfig, bool>(
+        selector: (_, clashConfig) => clashConfig.tcpConcurrent,
+        builder: (_, tcpConcurrent, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.double_arrow_outlined),
+            title: Text(appLocalizations.tcpConcurrent),
+            subtitle: Text(appLocalizations.tcpConcurrentDesc),
+            delegate: SwitchDelegate(
+              value: tcpConcurrent,
+              onChanged: (bool value) async {
+                final appController = globalState.appController;
+                appController.clashConfig.tcpConcurrent = value;
+                appController.updateClashConfigDebounce();
+              },
+            ),
+          );
+        },
+      ),
+      Selector<ClashConfig, bool>(
+        selector: (_, clashConfig) =>
+            clashConfig.geodataLoader == geodataLoaderMemconservative,
+        builder: (_, memconservative, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.memory),
+            title: Text(appLocalizations.geodataLoader),
+            subtitle: Text(appLocalizations.geodataLoaderDesc),
+            delegate: SwitchDelegate(
+              value: memconservative,
+              onChanged: (bool value) async {
+                final appController = globalState.appController;
+                appController.clashConfig.geodataLoader = value
+                    ? geodataLoaderMemconservative
+                    : geodataLoaderStandard;
+                appController.updateClashConfigDebounce();
+              },
+            ),
+          );
+        },
+      ),
+      Selector<ClashConfig, bool>(
+        selector: (_, clashConfig) => clashConfig.externalController.isNotEmpty,
+        builder: (_, hasExternalController, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.api_outlined),
+            title: Text(appLocalizations.externalController),
+            subtitle: Text(appLocalizations.externalControllerDesc),
+            delegate: SwitchDelegate(
+              value: hasExternalController,
+              onChanged: (bool value) async {
+                final appController = globalState.appController;
+                appController.clashConfig.externalController =
+                    value ? defaultExternalController : '';
+                appController.updateClashConfigDebounce();
+              },
+            ),
+          );
+        },
+      ),
+    ];
+    return Section(
+      title: appLocalizations.general,
+      child: Column(
+        children: [
+          for (final item in items) ...[
+            item,
+            if (items.last != item)
+              const Divider(
+                height: 0,
+              )
+          ]
+        ],
+      ),
+    );
+  }
+
+  Widget _buildMoreSection() {
+    final items = [
+      if (false)
         Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.ipv6,
-          builder: (_, ipv6, __) {
+          selector: (_, clashConfig) => clashConfig.tun.enable,
+          builder: (_, tunEnable, __) {
             return ListItem.switchItem(
-              leading: const Icon(Icons.water_outlined),
-              title: const Text("IPv6"),
-              subtitle: Text(appLocalizations.ipv6Desc),
-              delegate: SwitchDelegate(
-                value: ipv6,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.ipv6 = value;
-                  appController.updateClashConfigDebounce();
-                },
+              leading: const Icon(
+                Icons.important_devices_outlined
               ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.allowLan,
-          builder: (_, allowLan, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.device_hub),
-              title: Text(appLocalizations.allowLan),
-              subtitle: Text(appLocalizations.allowLanDesc),
+              title: Text(appLocalizations.tun),
+              subtitle: Text(appLocalizations.tunDesc),
               delegate: SwitchDelegate(
-                value: allowLan,
+                value: tunEnable,
                 onChanged: (bool value) async {
                   final clashConfig = context.read<ClashConfig>();
-                  clashConfig.allowLan = value;
+                  clashConfig.tun = Tun(enable: value);
                   globalState.appController.updateClashConfigDebounce();
                 },
               ),
             );
           },
         ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.unifiedDelay,
-          builder: (_, unifiedDelay, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.compress_outlined),
-              title: Text(appLocalizations.unifiedDelay),
-              subtitle: Text(appLocalizations.unifiedDelayDesc),
-              delegate: SwitchDelegate(
-                value: unifiedDelay,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.unifiedDelay = value;
-                  appController.updateClashConfigDebounce();
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) =>
-              clashConfig.findProcessMode == FindProcessMode.always,
-          builder: (_, findProcess, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.polymer_outlined),
-              title: Text(appLocalizations.findProcessMode),
-              subtitle: Text(appLocalizations.findProcessModeDesc),
-              delegate: SwitchDelegate(
-                value: findProcess,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.findProcessMode =
-                      value ? FindProcessMode.always : FindProcessMode.off;
-                  appController.updateClashConfigDebounce();
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.tcpConcurrent,
-          builder: (_, tcpConcurrent, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.double_arrow_outlined),
-              title: Text(appLocalizations.tcpConcurrent),
-              subtitle: Text(appLocalizations.tcpConcurrentDesc),
-              delegate: SwitchDelegate(
-                value: tcpConcurrent,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.tcpConcurrent = value;
-                  appController.updateClashConfigDebounce();
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) =>
-              clashConfig.geodataLoader == geodataLoaderMemconservative,
-          builder: (_, memconservative, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.memory),
-              title: Text(appLocalizations.geodataLoader),
-              subtitle: Text(appLocalizations.geodataLoaderDesc),
-              delegate: SwitchDelegate(
-                value: memconservative,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.geodataLoader = value
-                      ? geodataLoaderMemconservative
-                      : geodataLoaderStandard;
-                  appController.updateClashConfigDebounce();
-                },
-              ),
-            );
-          },
-        ),
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) =>
-              clashConfig.externalController.isNotEmpty,
-          builder: (_, hasExternalController, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.api_outlined),
-              title: Text(appLocalizations.externalController),
-              subtitle: Text(appLocalizations.externalControllerDesc),
-              delegate: SwitchDelegate(
-                value: hasExternalController,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.clashConfig.externalController =
-                      value ? defaultExternalController : '';
-                  appController.updateClashConfigDebounce();
-                },
-              ),
-            );
-          },
-        ),
-      ],
-    );
-  }
-
-  List<Widget> _buildMoreSection() {
-    return generateSection(
-      title: appLocalizations.more,
-      items: [
-        if (system.isDesktop)
-          Selector<ClashConfig, bool>(
-            selector: (_, clashConfig) => clashConfig.tun.enable,
-            builder: (_, tunEnable, __) {
-              return ListItem.switchItem(
-                leading: const Icon(Icons.important_devices_outlined),
-                title: Text(appLocalizations.tun),
-                subtitle: Text(appLocalizations.tunDesc),
-                delegate: SwitchDelegate(
-                  value: tunEnable,
-                  onChanged: (bool value) async {
-                    final clashConfig = context.read<ClashConfig>();
-                    clashConfig.tun = Tun(enable: value);
-                    globalState.appController.updateClashConfigDebounce();
-                  },
-                ),
-              );
-            },
-          ),
-      ],
+    ];
+    if(items.isEmpty) return Container();
+    return Section(
+      title: appLocalizations.general,
+      child: Column(
+        children: [
+          for (final item in items) ...[
+            item,
+            if (items.last != item)
+              const Divider(
+                height: 0,
+              )
+          ]
+        ],
+      ),
     );
   }
 
   @override
   Widget build(BuildContext context) {
     List<Widget> items = [
-      ..._buildAppSection(),
-      ..._buildGeneralSection(),
-      ..._buildMoreSection(),
+      _buildAppSection(),
+      _buildGeneralSection(),
+      _buildMoreSection(),
     ];
     return ListView.builder(
       padding: const EdgeInsets.only(bottom: 32),
@@ -499,7 +414,7 @@ class _MixedPortFormDialogState extends State<MixedPortFormDialog> {
     portController = TextEditingController(text: "${widget.mixedPort}");
   }
 
-  _handleUpdate() async {
+  _handleAddProfileFormURL() async {
     final port = portController.value.text;
     if (port.isEmpty) return;
     Navigator.of(context).pop<String>(port);
@@ -525,64 +440,7 @@ class _MixedPortFormDialogState extends State<MixedPortFormDialog> {
       ),
       actions: [
         TextButton(
-          onPressed: _handleUpdate,
-          child: Text(appLocalizations.submit),
-        )
-      ],
-    );
-  }
-}
-
-class TestUrlFormDialog extends StatefulWidget {
-  final String testUrl;
-
-  const TestUrlFormDialog({
-    super.key,
-    required this.testUrl,
-  });
-
-  @override
-  State<TestUrlFormDialog> createState() => _TestUrlFormDialogState();
-}
-
-class _TestUrlFormDialogState extends State<TestUrlFormDialog> {
-  late TextEditingController testUrlController;
-
-  @override
-  void initState() {
-    super.initState();
-    testUrlController = TextEditingController(text: widget.testUrl);
-  }
-
-  _handleUpdate() async {
-    final testUrl = testUrlController.value.text;
-    if (testUrl.isEmpty) return;
-    Navigator.of(context).pop<String>(testUrl);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text(appLocalizations.testUrl),
-      content: SizedBox(
-        width: 300,
-        child: Wrap(
-          runSpacing: 16,
-          children: [
-            TextField(
-              maxLines: 5,
-              minLines: 1,
-              controller: testUrlController,
-              decoration: const InputDecoration(
-                border: OutlineInputBorder(),
-              ),
-            ),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          onPressed: _handleUpdate,
+          onPressed: _handleAddProfileFormURL,
           child: Text(appLocalizations.submit),
         )
       ],

lib/fragments/connections.dart

@@ -1,347 +1,140 @@
-import 'dart:async';
-
-import 'package:fl_clash/clash/clash.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/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class ConnectionsFragment extends StatefulWidget {
-  const ConnectionsFragment({super.key});
-
-  @override
-  State<ConnectionsFragment> createState() => _ConnectionsFragmentState();
-}
-
-class _ConnectionsFragmentState extends State<ConnectionsFragment> {
-  final connectionsNotifier =
-      ValueNotifier<ConnectionsAndKeywords>(const ConnectionsAndKeywords());
-  final ScrollController _scrollController = ScrollController(
-    keepScrollOffset: false,
-  );
-
-  Timer? timer;
-
-  @override
-  void initState() {
-    super.initState();
-    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) {
-          connectionsNotifier.value = connectionsNotifier.value.copyWith(
-            connections: clashCore.getConnections(),
-          );
-        },
-      );
-    });
-  }
-
-  _initActions() {
-    WidgetsBinding.instance.addPostFrameCallback(
-      (_) {
-        final commonScaffoldState =
-            context.findAncestorStateOfType<CommonScaffoldState>();
-        commonScaffoldState?.actions = [
-          IconButton(
-            onPressed: () {
-              showSearch(
-                context: context,
-                delegate: ConnectionsSearchDelegate(
-                  state: connectionsNotifier.value,
-                ),
-              );
-            },
-            icon: const Icon(Icons.search),
-          ),
-          const SizedBox(
-            width: 8,
-          ),
-          IconButton(
-            onPressed: () {
-              clashCore.closeConnections();
-              connectionsNotifier.value = connectionsNotifier.value.copyWith(
-                connections: clashCore.getConnections(),
-              );
-            },
-            icon: const Icon(Icons.delete_sweep_outlined),
-          ),
-        ];
-      },
-    );
-  }
-
-  _addKeyword(String keyword) {
-    final isContains = connectionsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(connectionsNotifier.value.keywords)
-      ..add(keyword);
-    connectionsNotifier.value = connectionsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = connectionsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(connectionsNotifier.value.keywords)
-      ..remove(keyword);
-    connectionsNotifier.value = connectionsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _handleBlockConnection(String id) {
-    clashCore.closeConnection(id);
-    connectionsNotifier.value = connectionsNotifier.value
-        .copyWith(connections: clashCore.getConnections());
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    timer?.cancel();
-    connectionsNotifier.dispose();
-    _scrollController.dispose();
-    timer = null;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<AppState, bool?>(
-      selector: (_, appState) =>
-          appState.currentLabel == 'connections' ||
-          appState.viewMode == ViewMode.mobile &&
-              appState.currentLabel == "tools",
-      builder: (_, isCurrent, child) {
-        if (isCurrent == null || isCurrent) {
-          _initActions();
-        }
-        return child!;
-      },
-      child: ValueListenableBuilder<ConnectionsAndKeywords>(
-        valueListenable: connectionsNotifier,
-        builder: (_, state, __) {
-          var connections = state.filteredConnections;
-          if (connections.isEmpty) {
-            return NullStatus(
-              label: appLocalizations.nullConnectionsDesc,
-            );
-          }
-          connections = connections.reversed.toList();
-          return Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              if (state.keywords.isNotEmpty)
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 16,
-                    vertical: 16,
-                  ),
-                  child: Wrap(
-                    runSpacing: 6,
-                    spacing: 6,
-                    children: [
-                      for (final keyword in state.keywords)
-                        CommonChip(
-                          label: keyword,
-                          type: ChipType.delete,
-                          onPressed: () {
-                            _deleteKeyword(keyword);
-                          },
-                        ),
-                    ],
-                  ),
-                ),
-              Expanded(
-                child: ListView.separated(
-                  controller: _scrollController,
-                  itemBuilder: (_, index) {
-                    final connection = connections[index];
-                    return ConnectionItem(
-                      key: Key(connection.id),
-                      connection: connection,
-                      onClick: _addKeyword,
-                      trailing: IconButton(
-                        icon: const Icon(Icons.block),
-                        onPressed: () {
-                          _handleBlockConnection(connection.id);
-                        },
-                      ),
-                    );
-                  },
-                  separatorBuilder: (BuildContext context, int index) {
-                    return const Divider(
-                      height: 0,
-                    );
-                  },
-                  itemCount: connections.length,
-                ),
-              )
-            ],
-          );
-        },
-      ),
-    );
-  }
-}
-
-class ConnectionsSearchDelegate extends SearchDelegate {
-  ValueNotifier<ConnectionsAndKeywords> connectionsNotifier;
-
-  ConnectionsSearchDelegate({
-    required ConnectionsAndKeywords state,
-  }) : connectionsNotifier = ValueNotifier<ConnectionsAndKeywords>(state);
-
-  get state => connectionsNotifier.value;
-
-  List<Connection> get _results {
-    final lowerQuery = query.toLowerCase().trim();
-    return connectionsNotifier.value.filteredConnections.where((request) {
-      final lowerNetwork = request.metadata.network.toLowerCase();
-      final lowerHost = request.metadata.host.toLowerCase();
-      final lowerDestinationIP = request.metadata.destinationIP.toLowerCase();
-      final lowerProcess = request.metadata.process.toLowerCase();
-      final lowerChains = request.chains.join("").toLowerCase();
-      return lowerNetwork.contains(lowerQuery) ||
-          lowerHost.contains(lowerQuery) ||
-          lowerDestinationIP.contains(lowerQuery) ||
-          lowerProcess.contains(lowerQuery) ||
-          lowerChains.contains(lowerQuery);
-    }).toList();
-  }
-
-  _addKeyword(String keyword) {
-    final isContains = connectionsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(connectionsNotifier.value.keywords)
-      ..add(keyword);
-    connectionsNotifier.value = connectionsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = connectionsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(connectionsNotifier.value.keywords)
-      ..remove(keyword);
-    connectionsNotifier.value = connectionsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _handleBlockConnection(String id) {
-    clashCore.closeConnection(id);
-    connectionsNotifier.value = connectionsNotifier.value.copyWith(
-      connections: clashCore.getConnections(),
-    );
-  }
-
-  @override
-  List<Widget>? buildActions(BuildContext context) {
-    return [
-      IconButton(
-        onPressed: () {
-          if (query.isEmpty) {
-            close(context, null);
-            return;
-          }
-          query = '';
-        },
-        icon: const Icon(Icons.clear),
-      ),
-      const SizedBox(
-        width: 8,
-      )
-    ];
-  }
-
-  @override
-  Widget? buildLeading(BuildContext context) {
-    return IconButton(
-      onPressed: () {
-        close(context, null);
-      },
-      icon: const Icon(Icons.arrow_back),
-    );
-  }
-
-  @override
-  Widget buildResults(BuildContext context) {
-    return buildSuggestions(context);
-  }
-
-  @override
-  void dispose() {
-    connectionsNotifier.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget buildSuggestions(BuildContext context) {
-    return ValueListenableBuilder(
-      valueListenable: connectionsNotifier,
-      builder: (_, __, ___) {
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (state.keywords.isNotEmpty)
-              Padding(
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 16,
-                  vertical: 16,
-                ),
-                child: Wrap(
-                  runSpacing: 6,
-                  spacing: 6,
-                  children: [
-                    for (final keyword in state.keywords)
-                      CommonChip(
-                        label: keyword,
-                        type: ChipType.delete,
-                        onPressed: () {
-                          _deleteKeyword(keyword);
-                        },
-                      ),
-                  ],
-                ),
-              ),
-            Expanded(
-              child: ListView.separated(
-                itemBuilder: (_, index) {
-                  final connection = _results[index];
-                  return ConnectionItem(
-                    key: Key(connection.id),
-                    connection: connection,
-                    onClick: _addKeyword,
-                    trailing: IconButton(
-                      icon: const Icon(Icons.block),
-                      onPressed: () {
-                        _handleBlockConnection(connection.id);
-                      },
-                    ),
-                  );
-                },
-                separatorBuilder: (BuildContext context, int index) {
-                  return const Divider(
-                    height: 0,
-                  );
-                },
-                itemCount: _results.length,
-              ),
-            )
-          ],
-        );
-      },
-    );
-  }
-}
+// import 'dart:async';
+//
+// import 'package:fl_clash/clash/core.dart';
+// import 'package:fl_clash/models/models.dart';
+// import 'package:fl_clash/plugins/app.dart';
+// import 'package:fl_clash/state.dart';
+// import 'package:fl_clash/widgets/widgets.dart';
+// import 'package:flutter/material.dart';
+//
+// class ConnectionsFragment extends StatefulWidget {
+//   const ConnectionsFragment({super.key});
+//
+//   @override
+//   State<ConnectionsFragment> createState() => _ConnectionsFragmentState();
+// }
+//
+// class _ConnectionsFragmentState extends State<ConnectionsFragment> {
+//   final connectionsNotifier = ValueNotifier<List<Connection>>([]);
+//   Map<String, String?> idPackageNameMap = {};
+//
+//   Timer? timer;
+//
+//   @override
+//   void initState() {
+//     super.initState();
+//     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+//       _getConnections();
+//       if (timer != null) {
+//         timer?.cancel();
+//         timer = null;
+//       }
+//       timer = Timer.periodic(const Duration(seconds: 3), (timer) {
+//         if (mounted) {
+//           _getConnections();
+//         }
+//       });
+//     });
+//   }
+//
+//   _getConnections() {
+//     connectionsNotifier.value = clashCore
+//         .getConnections();
+//   }
+//
+//   @override
+//   void dispose() {
+//     super.dispose();
+//     timer?.cancel();
+//     timer = null;
+//   }
+//
+//   Future<ImageProvider?> _getPackageIconWithConnection(
+//       Connection connection) async {
+//     final uid = connection.metadata.uid;
+//     // if(globalState.packageNameMap[uid] == null){
+//     //   globalState.packageNameMap[uid] = await app?.getPackageName(connection.metadata);
+//     // }
+//     final packageName = globalState.packageNameMap[uid];
+//     if(packageName == null) return null;
+//     return await app?.getPackageIcon(packageName);
+//   }
+//
+//   @override
+//   Widget build(BuildContext context) {
+//     return ValueListenableBuilder<List<Connection>>(
+//       valueListenable: connectionsNotifier,
+//       builder: (_, List<Connection> connections, __) {
+//         if (connections.isEmpty) {
+//           return const NullStatus(
+//             label: "未开启代理,或者没有连接数据",
+//           );
+//         }
+//         return ListView.separated(
+//           physics: const AlwaysScrollableScrollPhysics(),
+//           itemBuilder: (_, index) {
+//             final connection = connections[index];
+//             return ListTile(
+//               titleAlignment: ListTileTitleAlignment.top,
+//               leading: Container(
+//                 margin: const EdgeInsets.only(top: 4),
+//                 width: 48,
+//                 height: 48,
+//                 child: FutureBuilder<ImageProvider?>(
+//                   future: _getPackageIconWithConnection(connection),
+//                   builder: (_, snapshot) {
+//                     if (!snapshot.hasData && snapshot.data == null) {
+//                       return Container();
+//                     } else {
+//                       return Image(
+//                         image: snapshot.data!,
+//                         gaplessPlayback: true,
+//                         width: 48,
+//                         height: 48,
+//                       );
+//                     }
+//                   },
+//                 ),
+//               ),
+//               contentPadding:
+//                   const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
+//               title: Column(
+//                 crossAxisAlignment: CrossAxisAlignment.start,
+//                 children: [
+//                   Text(connection.metadata.host.isNotEmpty
+//                       ? connection.metadata.host
+//                       : connection.metadata.destinationIP),
+//                   Padding(
+//                     padding: const EdgeInsets.only(
+//                       top: 12,
+//                     ),
+//                     child: Wrap(
+//                       runSpacing: 8,
+//                       spacing: 8,
+//                       children: [
+//                         for (final chain in connection.chains)
+//                           CommonChip(
+//                             label: chain,
+//                           ),
+//                       ],
+//                     ),
+//                   ),
+//                 ],
+//               ),
+//               trailing: IconButton(
+//                 icon: const Icon(Icons.block),
+//                 onPressed: () {},
+//               ),
+//             );
+//           },
+//           separatorBuilder: (BuildContext context, int index) {
+//             return const Divider(
+//               height: 0,
+//             );
+//           },
+//           itemCount: connections.length,
+//         );
+//       },
+//     );
+//   }
+// }

lib/fragments/dashboard/core_info.dart

@@ -13,7 +13,6 @@ class CoreInfo extends StatelessWidget {
       selector: (_, appState) => appState.versionInfo,
       builder: (_, versionInfo, __) {
         return CommonCard(
-          onPressed: () {},
           info: Info(
             label: appLocalizations.coreInfo,
             iconData: Icons.memory,
@@ -32,7 +31,7 @@ class CoreInfo extends StatelessWidget {
                     style: context
                         .textTheme
                         .titleMedium
-                        ?.toSoftBold,
+                        ?.toSoftBold(),
                   ),
                 ),
                 const SizedBox(
@@ -45,7 +44,7 @@ class CoreInfo extends StatelessWidget {
                     style: context
                         .textTheme
                         .titleLarge
-                        ?.toSoftBold,
+                        ?.toSoftBold(),
                   ),
                 ),
               ],

lib/fragments/dashboard/dashboard.dart

@@ -1,11 +1,11 @@
-import 'dart:math';
-
-import 'package:fl_clash/fragments/dashboard/intranet_ip.dart';
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:provider/provider.dart';
+
 import 'network_detection.dart';
+import 'core_info.dart';
 import 'outbound_mode.dart';
 import 'start_button.dart';
 import 'network_speed.dart';
@@ -29,35 +29,34 @@ class _DashboardFragmentState extends State<DashboardFragment> {
         alignment: Alignment.topCenter,
         child: SingleChildScrollView(
           padding: const EdgeInsets.all(16),
-          child: Selector<AppState, double>(
-            selector: (_, appState) => appState.viewWidth,
-            builder: (_, viewWidth, ___) {
-              // final viewMode = other.getViewMode(viewWidth);
-              // final isDesktop = viewMode == ViewMode.desktop;
+          child: Selector<AppState, ViewMode>(
+            selector: (_, appState) => appState.viewMode,
+            builder: (_, viewMode, ___) {
+              final isDesktop = viewMode == ViewMode.desktop;
               return Grid(
-                crossAxisCount: max(4 * ((viewWidth / 350).ceil()), 8),
+                crossAxisCount: 12,
                 crossAxisSpacing: 16,
                 mainAxisSpacing: 16,
-                children: const [
+                children: [
                   GridItem(
-                    crossAxisCellCount: 8,
-                    child: NetworkSpeed(),
+                    crossAxisCellCount: isDesktop ? 8 : 12,
+                    child: const NetworkSpeed(),
                   ),
                   GridItem(
-                    crossAxisCellCount: 4,
-                    child: OutboundMode(),
+                    crossAxisCellCount: isDesktop ? 4 : 6,
+                    child: const OutboundMode(),
                   ),
                   GridItem(
-                    crossAxisCellCount: 4,
-                    child: NetworkDetection(),
+                    crossAxisCellCount: isDesktop ? 4 : 6,
+                    child: const NetworkDetection(),
                   ),
                   GridItem(
-                    crossAxisCellCount: 4,
-                    child: TrafficUsage(),
+                    crossAxisCellCount: isDesktop ? 4 : 6,
+                    child: const TrafficUsage(),
                   ),
                   GridItem(
-                    crossAxisCellCount: 4,
-                    child: IntranetIP(),
+                    crossAxisCellCount: isDesktop ? 4 : 6,
+                    child: const CoreInfo(),
                   ),
                 ],
               );

lib/fragments/dashboard/intranet_ip.dart

@@ -1,92 +0,0 @@
-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?> getLocalIpAddress() async {
-    List<NetworkInterface> interfaces = await NetworkInterface.list();
-    for (final interface in interfaces) {
-      for (final address in interface.addresses) {
-        if (!address.isLoopback) {
-          return address.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.appController.measure.titleLargeHeight + 24 - 2,
-        child: ValueListenableBuilder(
-          valueListenable: ipNotifier,
-          builder: (_, value, __) {
-            return FadeBox(
-              child: value.isNotEmpty
-                  ? Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Flexible(
-                          flex: 1,
-                          child: TooltipText(
-                            text: Text(
-                              value,
-                              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

@@ -18,58 +18,55 @@ class _NetworkDetectionState extends State<NetworkDetection> {
   final ipInfoNotifier = ValueNotifier<IpInfo?>(null);
   final timeoutNotifier = ValueNotifier<bool>(false);
   bool? _preIsStart;
-  Function? _checkIpDebounce;
+  CancelToken? cancelToken;
 
-  _checkIp() async {
-    final appState = globalState.appController.appState;
-    final isInit = appState.isInit;
-    final isStart = appState.isStart;
+  _checkIp(
+    bool isInit,
+    bool isStart,
+  ) async {
     if (!isInit) return;
     timeoutNotifier.value = false;
     if (_preIsStart == false && _preIsStart == isStart) return;
-    _preIsStart = isStart;
+    if (cancelToken != null) {
+      cancelToken!.cancel();
+      cancelToken = null;
+    }
     ipInfoNotifier.value = null;
-    final ipInfo = await request.checkIp();
+    final ipInfo = await request.checkIp(cancelToken);
     if (ipInfo == null) {
       timeoutNotifier.value = true;
       return;
     } else {
       timeoutNotifier.value = false;
     }
+    _preIsStart = isStart;
     ipInfoNotifier.value = ipInfo;
   }
 
   _checkIpContainer(Widget child) {
-    return Selector<AppState, num>(
-      selector: (_, appState) {
-        return appState.checkIpNum;
+    return Selector2<AppState, Config, CheckIpSelectorState>(
+      selector: (_, appState, config) {
+        return CheckIpSelectorState(
+          isInit: appState.isInit,
+          selectedMap: appState.selectedMap,
+          isStart: appState.isStart,
+        );
       },
-      builder: (_, checkIpNum, child) {
-        if (_checkIpDebounce != null) {
-          _checkIpDebounce!();
-        }
-        return child!;
+      builder: (_, state, __) {
+        _checkIp(state.isInit, state.isStart);
+        return child;
       },
       child: child,
     );
   }
 
-  @override
-  void dispose() {
-    super.dispose();
-    ipInfoNotifier.dispose();
-    timeoutNotifier.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
-    _checkIpDebounce = debounce(_checkIp);
     return _checkIpContainer(
       ValueListenableBuilder<IpInfo?>(
         valueListenable: ipInfoNotifier,
         builder: (_, ipInfo, __) {
           return CommonCard(
-            onPressed: () {},
             child: Column(
               children: [
                 Flexible(
@@ -126,9 +123,8 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                   ),
                 ),
                 Container(
-                  height: globalState.appController.measure.titleLargeHeight +
-                      24 -
-                      2,
+                  height:
+                      globalState.appController.measure.titleLargeHeight + 24,
                   alignment: Alignment.centerLeft,
                   padding: const EdgeInsets.all(16).copyWith(top: 0),
                   child: FadeBox(
@@ -143,7 +139,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                                   text: Text(
                                     ipInfo.ip,
                                     style: context.textTheme.titleLarge
-                                        ?.toSoftBold.toMinus,
+                                        ?.toSoftBold(),
                                     maxLines: 1,
                                     overflow: TextOverflow.ellipsis,
                                   ),
@@ -157,10 +153,9 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                               if (timeout) {
                                 return Text(
                                   "timeout",
-                                  style: context.textTheme.titleLarge
+                                  style: context.textTheme.titleMedium
                                       ?.copyWith(color: Colors.red)
-                                      .toSoftBold
-                                      .toMinus,
+                                      .toSoftBold(),
                                   maxLines: 1,
                                   overflow: TextOverflow.ellipsis,
                                 );

lib/fragments/dashboard/network_speed.dart

@@ -21,17 +21,26 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
         .asMap()
         .map(
           (index, e) => MapEntry(
-            index,
-            Point(
-              (index + initPoints.length).toDouble(),
-              e.speed.toDouble(),
-            ),
-          ),
-        )
+        index,
+        Point(
+          (index + initPoints.length).toDouble(),
+          e.speed.toDouble(),
+        ),
+      ),
+    )
         .values
         .toList();
+    var pointsRaw = [...initPoints, ...trafficPoints];
+    List<Point> points;
+    if (pointsRaw.length > 60) {
+      points = pointsRaw
+          .getRange(pointsRaw.length - 61, pointsRaw.length - 1)
+          .toList();
+    } else {
+      points = pointsRaw;
+    }
 
-    return [...initPoints, ...trafficPoints];
+    return points;
   }
 
   Traffic _getLastTraffic(List<Traffic> traffics) {
@@ -44,11 +53,12 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
     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;
+    Theme.of(context).textTheme.titleLarge?.toSoftBold();
+    final bodyMedium = Theme.of(context).textTheme.bodySmall?.toLight();
     final valueText = Text(
       showValue,
       style: titleLargeSoftBold,
@@ -75,7 +85,7 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
             Flexible(
               child: Text(
                 label,
-                style: Theme.of(context).textTheme.titleSmall?.toSoftBold,
+                style: Theme.of(context).textTheme.titleSmall?.toSoftBold(),
               ),
             ),
           ],
@@ -111,8 +121,7 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
   @override
   Widget build(BuildContext context) {
     return CommonCard(
-      onPressed: () {},
-      info: Info(
+      info:  Info(
         label: appLocalizations.networkSpeed,
         iconData: Icons.speed,
       ),
@@ -163,4 +172,4 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
       ),
     );
   }
-}
+}