Optimize request ua

Change android icon

Optimize dashboard

.github/workflows/build.yml

@@ -87,7 +87,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.22.x
+          flutter-version: '3.x'
           channel: 'stable'
           cache: true
 
@@ -136,29 +136,8 @@ jobs:
             gitchangelog "${pre}.." >> release.md 2>&1 || echo "Error in gitchangelog"
             echo -e "\n\n</details>" >> release.md
           fi
-
       - name: Release
         uses: softprops/action-gh-release@v2
         with:
           files: ./dist/*
-          body_path: './release.md'
-
-      - name: Create Fdroid Source Dir
-        run: |
-          mkdir -p ./tmp
-          cp ./dist/*android-arm64-v8a* ./tmp/ || true
-          echo "Files copied successfully"
-
-      - 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: ./tmp/
-          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'

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "core/Clash.Meta"]
 	path = core/Clash.Meta
 	url = git@github.com:chen08209/Clash.Meta.git
-	branch = FlClash-Alpha
+	branch = FlClash
 [submodule "plugins/flutter_distributor"]
 	path = plugins/flutter_distributor
 	url = git@github.com:chen08209/flutter_distributor.git

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

@@ -102,9 +102,6 @@ flutter {
 dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.1'
     implementation 'com.google.code.gson:gson:2.10'
-    implementation("com.android.tools.smali:smali-dexlib2:3.0.7") {
-        exclude group: "com.google.guava", module: "guava"
-    }
 }
 
 

android/app/src/main/AndroidManifest.xml

@@ -2,11 +2,11 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-feature
-        android:name="android.hardware.touchscreen"
-        android:required="false" />
+            android:name="android.hardware.touchscreen"
+            android:required="false" />
     <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
+            android:name="android.hardware.camera"
+            android:required="false" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -14,20 +14,18 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission
-        android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
         tools:ignore="SystemPermissionTypo" />
-    <uses-permission
-        android:name="android.permission.QUERY_ALL_PACKAGES"
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
 
     <application
         android:name="${applicationName}"
-        android:enableOnBackInvokedCallback="true"
-        android:extractNativeLibs="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="FlClash"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:extractNativeLibs="true"
+        android:enableOnBackInvokedCallback="true"
+        android:label="FlClash"
         tools:targetApi="tiramisu">
         <activity
             android:name="com.follow.clash.MainActivity"
@@ -58,17 +56,17 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="clash" />
-                <data android:scheme="clashmeta" />
-                <data android:scheme="flclash" />
+                <data android:scheme="clash"/>
+                <data android:scheme="clashmeta"/>
+                <data android:scheme="flclash"/>
 
-                <data android:host="install-config" />
+                <data android:host="install-config"/>
             </intent-filter>
         </activity>
 
-        <!--        <meta-data-->
-        <!--                android:name="io.flutter.embedding.android.EnableImpeller"-->
-        <!--                android:value="true" />-->
+<!--        <meta-data-->
+<!--                android:name="io.flutter.embedding.android.EnableImpeller"-->
+<!--                android:value="true" />-->
 
         <activity
             android:name=".TempActivity"
@@ -77,8 +75,8 @@
         <service
             android:name=".services.FlClashTileService"
             android:exported="true"
-            android:foregroundServiceType="specialUse"
             android:icon="@drawable/ic_stat_name"
+            android:foregroundServiceType="specialUse"
             android:label="FlClash"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
@@ -88,29 +86,6 @@
                 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"
@@ -121,11 +96,6 @@
             </intent-filter>
         </service>
 
-        <service
-            android:name=".services.FlClashService"
-            android:exported="false"
-            android:foregroundServiceType="specialUse" />
-
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />

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

@@ -1,10 +0,0 @@
-package com.follow.clash
-
-import com.follow.clash.models.Props
-import com.follow.clash.models.TunProps
-
-interface BaseServiceInterface {
-    fun start(port: Int, props: Props?): TunProps?
-    fun stop()
-    fun startForeground(title: String, content: String)
-}

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,10 +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.ServicePlugin
-import com.follow.clash.plugins.VpnPlugin
+import com.follow.clash.plugins.ProxyPlugin
 import com.follow.clash.plugins.TilePlugin
 import io.flutter.FlutterInjector
 import io.flutter.embedding.engine.FlutterEngine
@@ -22,7 +22,6 @@ enum class RunState {
 object GlobalState {
 
     private val lock = ReentrantLock()
-    val runLock = ReentrantLock()
 
     val runState: MutableLiveData<RunState> = MutableLiveData<RunState>(RunState.STOP)
     var flutterEngine: FlutterEngine? = null
@@ -38,10 +37,6 @@ object GlobalState {
         return currentEngine?.plugins?.get(TilePlugin::class.java) as TilePlugin?
     }
 
-    fun getCurrentVPNPlugin(): VpnPlugin? {
-        return serviceEngine?.plugins?.get(VpnPlugin::class.java) as VpnPlugin?
-    }
-
     fun destroyServiceEngine() {
         serviceEngine?.destroy()
         serviceEngine = null
@@ -52,10 +47,9 @@ object GlobalState {
         lock.withLock {
             destroyServiceEngine()
             serviceEngine = FlutterEngine(context)
-            serviceEngine?.plugins?.add(VpnPlugin())
+            serviceEngine?.plugins?.add(ProxyPlugin())
             serviceEngine?.plugins?.add(AppPlugin())
             serviceEngine?.plugins?.add(TilePlugin())
-            serviceEngine?.plugins?.add(ServicePlugin())
             val vpnService = DartExecutor.DartEntrypoint(
                 FlutterInjector.instance().flutterLoader().findAppBundlePath(),
                 "vpnService"
@@ -63,6 +57,8 @@ object GlobalState {
             serviceEngine?.dartExecutor?.executeDartEntrypoint(
                 vpnService,
             )
+
+            Log.e("FlClashVpnService", "initServiceEngine ===>")
         }
     }
 }

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

@@ -2,8 +2,7 @@ package com.follow.clash
 
 
 import com.follow.clash.plugins.AppPlugin
-import com.follow.clash.plugins.ServicePlugin
-import com.follow.clash.plugins.VpnPlugin
+import com.follow.clash.plugins.ProxyPlugin
 import com.follow.clash.plugins.TilePlugin
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
@@ -13,8 +12,7 @@ class MainActivity : FlutterActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
         flutterEngine.plugins.add(AppPlugin())
-        flutterEngine.plugins.add(VpnPlugin())
-        flutterEngine.plugins.add(ServicePlugin())
+        flutterEngine.plugins.add(ProxyPlugin())
         flutterEngine.plugins.add(TilePlugin())
         GlobalState.flutterEngine = flutterEngine
     }

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

@@ -0,0 +1,37 @@
+package com.follow.clash.extensions
+
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.system.OsConstants.IPPROTO_TCP
+import android.system.OsConstants.IPPROTO_UDP
+import android.util.Base64
+import java.net.URL
+import androidx.core.graphics.drawable.toBitmap
+import com.follow.clash.models.Metadata
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.ByteArrayOutputStream
+import java.net.InetAddress
+import java.net.InetSocketAddress
+
+
+suspend fun Drawable.getBase64(): String {
+    val drawable = this
+    return withContext(Dispatchers.IO) {
+        val bitmap = drawable.toBitmap()
+        val byteArrayOutputStream = ByteArrayOutputStream()
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream)
+        Base64.encodeToString(byteArrayOutputStream.toByteArray(), Base64.NO_WRAP)
+    }
+}
+
+fun Metadata.getProtocol(): Int? {
+    if (network.startsWith("tcp")) return IPPROTO_TCP
+    if (network.startsWith("udp")) return IPPROTO_UDP
+    return null
+}
+
+fun String.getInetSocketAddress(): InetSocketAddress {
+    val url = URL("https://$this")
+    return InetSocketAddress(InetAddress.getByName(url.host), url.port)
+}

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

@@ -1,69 +0,0 @@
-package com.follow.clash.extensions
-
-import android.graphics.Bitmap
-import android.graphics.drawable.Drawable
-import android.net.ConnectivityManager
-import android.net.Network
-import android.system.OsConstants.IPPROTO_TCP
-import android.system.OsConstants.IPPROTO_UDP
-import android.util.Base64
-import androidx.core.graphics.drawable.toBitmap
-import com.follow.clash.models.Metadata
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import java.io.ByteArrayOutputStream
-import java.net.Inet4Address
-import java.net.Inet6Address
-import java.net.InetAddress
-
-
-suspend fun Drawable.getBase64(): String {
-    val drawable = this
-    return withContext(Dispatchers.IO) {
-        val bitmap = drawable.toBitmap()
-        val byteArrayOutputStream = ByteArrayOutputStream()
-        bitmap.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream)
-        Base64.encodeToString(byteArrayOutputStream.toByteArray(), Base64.NO_WRAP)
-    }
-}
-
-fun Metadata.getProtocol(): Int? {
-    if (network.startsWith("tcp")) return IPPROTO_TCP
-    if (network.startsWith("udp")) return IPPROTO_UDP
-    return null
-}
-
-
-fun ConnectivityManager.resolvePrimaryDns(network: Network?): String? {
-    val properties = getLinkProperties(network) ?: return null
-    return properties.dnsServers.firstOrNull()?.asSocketAddressText(53)
-}
-
-fun InetAddress.asSocketAddressText(port: Int): String {
-    return when (this) {
-        is Inet6Address ->
-            "[${numericToTextFormat(this.address)}]:$port"
-
-        is Inet4Address ->
-            "${this.hostAddress}:$port"
-
-        else -> throw IllegalArgumentException("Unsupported Inet type ${this.javaClass}")
-    }
-}
-
-
-private fun numericToTextFormat(src: ByteArray): String {
-    val sb = StringBuilder(39)
-    for (i in 0 until 8) {
-        sb.append(
-            Integer.toHexString(
-                src[i shl 1].toInt() shl 8 and 0xff00
-                        or (src[(i shl 1) + 1].toInt() and 0xff)
-            )
-        )
-        if (i < 7) {
-            sb.append(":")
-        }
-    }
-    return sb.toString()
-}

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

@@ -1,26 +0,0 @@
-package com.follow.clash.models
-
-import android.net.NetworkCapabilities
-import android.os.Build
-
-val TRANSPORT_PRIORITY = sequence {
-    yield(NetworkCapabilities.TRANSPORT_CELLULAR)
-
-    if (Build.VERSION.SDK_INT >= 27) {
-        yield(NetworkCapabilities.TRANSPORT_LOWPAN)
-    }
-
-    yield(NetworkCapabilities.TRANSPORT_BLUETOOTH)
-
-    if (Build.VERSION.SDK_INT >= 26) {
-        yield(NetworkCapabilities.TRANSPORT_WIFI_AWARE)
-    }
-
-    yield(NetworkCapabilities.TRANSPORT_WIFI)
-
-    if (Build.VERSION.SDK_INT >= 31) {
-        yield(NetworkCapabilities.TRANSPORT_USB)
-    }
-
-    yield(NetworkCapabilities.TRANSPORT_ETHERNET)
-}.toList()

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

@@ -3,6 +3,5 @@ package com.follow.clash.models
 data class Package(
     val packageName: String,
     val label: String,
-    val isSystem: Boolean,
-    val firstInstallTime: Long,
+    val isSystem:Boolean
 )

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

@@ -12,18 +12,7 @@ data class AccessControl(
 )
 
 data class Props(
-    val enable: Boolean?,
     val accessControl: AccessControl?,
     val allowBypass: Boolean?,
     val systemProxy: Boolean?,
 )
-
-data class TunProps(
-    val fd: Int,
-    val gateway: String,
-    val gateway6: String,
-    val portal: String,
-    val portal6: String,
-    val dns: String,
-    val dns6: String
-)

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

@@ -4,23 +4,19 @@ 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.ComponentInfo
 import android.content.pm.PackageManager
-import android.net.VpnService
+import android.net.ConnectivityManager
 import android.os.Build
 import android.widget.Toast
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.getSystemService
-import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile
-import androidx.core.content.FileProvider
+import androidx.core.content.getSystemService
 import com.follow.clash.GlobalState
 import com.follow.clash.extensions.getBase64
+import com.follow.clash.extensions.getProtocol
 import com.follow.clash.models.Package
+import com.follow.clash.models.Process
 import com.google.gson.Gson
-import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.embedding.engine.plugins.activity.ActivityAware
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
@@ -32,8 +28,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.io.File
-import java.util.zip.ZipFile
+import java.net.InetSocketAddress
+
 
 class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {
 
@@ -41,84 +37,22 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
 
     private var toast: Toast? = null
 
-    private lateinit var context: Context
+    private var context: Context? = null
 
     private lateinit var channel: MethodChannel
 
     private lateinit var scope: CoroutineScope
 
-    private var vpnCallBack: (() -> Unit)? = null
+    private var connectivity: ConnectivityManager? = null
 
     private val iconMap = mutableMapOf<String, String?>()
 
-    private val packages = mutableListOf<Package>()
-
-    private val skipPrefixList = listOf(
-        "com.google",
-        "com.android.chrome",
-        "com.android.vending",
-        "com.microsoft",
-        "com.apple",
-        "com.zhiliaoapp.musically", // Banned by China
-    )
-
-    private val chinaAppPrefixList = listOf(
-        "com.tencent",
-        "com.alibaba",
-        "com.umeng",
-        "com.qihoo",
-        "com.ali",
-        "com.alipay",
-        "com.amap",
-        "com.sina",
-        "com.weibo",
-        "com.vivo",
-        "com.xiaomi",
-        "com.huawei",
-        "com.taobao",
-        "com.secneo",
-        "s.h.e.l.l",
-        "com.stub",
-        "com.kiwisec",
-        "com.secshell",
-        "com.wrapper",
-        "cn.securitystack",
-        "com.mogosec",
-        "com.secoen",
-        "com.netease",
-        "com.mx",
-        "com.qq.e",
-        "com.baidu",
-        "com.bytedance",
-        "com.bugly",
-        "com.miui",
-        "com.oppo",
-        "com.coloros",
-        "com.iqoo",
-        "com.meizu",
-        "com.gionee",
-        "cn.nubia",
-        "com.oplus",
-        "andes.oplus",
-        "com.unionpay",
-        "cn.wps"
-    )
-
-    private val chinaAppRegex by lazy {
-        ("(" + chinaAppPrefixList.joinToString("|").replace(".", "\\.") + ").*").toRegex()
-    }
-
-    val VPN_PERMISSION_REQUEST_CODE = 1001
-
-    val NOTIFICATION_PERMISSION_REQUEST_CODE = 1002
-
-    private var isBlockNotification: Boolean = false
-
     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) {
@@ -127,7 +61,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     }
 
     private fun tip(message: String?) {
-        if (GlobalState.flutterEngine == null) {
+        if(GlobalState.flutterEngine == null){
             if (toast != null) {
                 toast!!.cancel()
             }
@@ -151,13 +85,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
 
             "getPackages" -> {
                 scope.launch {
-                    result.success(getPackagesToJson())
-                }
-            }
-
-            "getChinaPackageNames" -> {
-                scope.launch {
-                    result.success(getChinaPackageNames())
+                    result.success(getPackages())
                 }
             }
 
@@ -176,7 +104,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                         }
                         if (iconMap["default"] == null) {
                             iconMap["default"] =
-                                context.packageManager?.defaultActivityIcon?.getBase64()
+                                context?.packageManager?.defaultActivityIcon?.getBase64()
                         }
                         result.success(iconMap["default"])
                         return@launch
@@ -184,62 +112,67 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 }
             }
 
+            "resolverProcess" -> {
+                val data = call.argument<String>("data")
+                val process =
+                    if (data != null) Gson().fromJson(
+                        data,
+                        Process::class.java
+                    ) else null
+                val metadata = process?.metadata
+                val protocol = metadata?.getProtocol()
+                if (protocol == null) {
+                    result.success(null)
+                    return
+                }
+                scope.launch {
+                    withContext(Dispatchers.Default) {
+                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                            result.success(null)
+                            return@withContext
+                        }
+                        if (context == null) {
+                            result.success(null)
+                            return@withContext
+                        }
+                        if (connectivity == null) {
+                            connectivity = context!!.getSystemService<ConnectivityManager>()
+                        }
+                        val src = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
+                        val dst = InetSocketAddress(
+                            metadata.destinationIP.ifEmpty { metadata.host },
+                            metadata.destinationPort
+                        )
+                        val uid = try {
+                            connectivity?.getConnectionOwnerUid(protocol, src, dst)
+                        } catch (_: Exception) {
+                            null
+                        }
+                        if (uid == null || uid == -1) {
+                            result.success(null)
+                            return@withContext
+                        }
+                        val packages = context?.packageManager?.getPackagesForUid(uid)
+                        result.success(packages?.first())
+                    }
+                }
+            }
+
             "tip" -> {
                 val message = call.argument<String>("message")
                 tip(message)
                 result.success(true)
             }
 
-            "openFile" -> {
-                val path = call.argument<String>("path")!!
-                openFile(path)
-                result.success(true)
-            }
-
             else -> {
                 result.notImplemented();
             }
         }
     }
 
-    private fun openFile(path: String) {
-        val file = File(path)
-        val uri = FileProvider.getUriForFile(
-            context,
-            "${context.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 = context.packageManager.queryIntentActivities(
-            intent, PackageManager.MATCH_DEFAULT_ONLY
-        )
-
-        for (resolveInfo in resInfoList) {
-            val packageName = resolveInfo.activityInfo.packageName
-            context.grantUriPermission(
-                packageName,
-                uri,
-                flags
-            )
-        }
-
-        try {
-            activity?.startActivity(intent)
-        } catch (e: Exception) {
-            println(e)
-        }
-    }
-
     private fun updateExcludeFromRecents(value: Boolean?) {
-        val am = getSystemService(context, ActivityManager::class.java)
+        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
@@ -256,7 +189,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     }
 
     private suspend fun getPackageIcon(packageName: String): String? {
-        val packageManager = context.packageManager
+        val packageManager = context?.packageManager
         if (iconMap[packageName] == null) {
             iconMap[packageName] = try {
                 packageManager?.getApplicationIcon(packageName)?.getBase64()
@@ -268,139 +201,32 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         return iconMap[packageName]
     }
 
-    private fun getPackages(): List<Package> {
-        val packageManager = context.packageManager
-        if (packages.isNotEmpty()) return packages;
-        packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
-            it.packageName != context.packageName
-                    || it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
-                    || it.packageName == "android"
-
-        }?.map {
-            Package(
-                packageName = it.packageName,
-                label = it.applicationInfo.loadLabel(packageManager).toString(),
-                isSystem = (it.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) == 1,
-                firstInstallTime = it.firstInstallTime
-            )
-        }?.let { packages.addAll(it) }
-        return packages;
-    }
-
-    private suspend fun getPackagesToJson(): String {
+    private suspend fun getPackages(): String {
         return withContext(Dispatchers.Default) {
-            Gson().toJson(getPackages())
-        }
-    }
+            val packageManager = context?.packageManager
+            val packages: List<Package>? =
+                packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
+                    it.packageName != context?.packageName
+                            || it.requestedPermissions?.contains(Manifest.permission.INTERNET) == true
+                            || it.packageName == "android"
 
-    private suspend fun getChinaPackageNames(): String {
-        return withContext(Dispatchers.Default) {
-            val packages: List<String> =
-                getPackages().map { it.packageName }.filter { isChinaPackage(it) }
+                }?.map {
+                    Package(
+                        packageName = it.packageName,
+                        label = it.applicationInfo.loadLabel(packageManager).toString(),
+                        isSystem = (it.applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) == 1
+                    )
+                }
             Gson().toJson(packages)
         }
     }
 
-    fun requestVpnPermission(context: Context, callBack: () -> Unit) {
-        vpnCallBack = callBack
-        val intent = VpnService.prepare(context)
-        if (intent != null) {
-            activity?.startActivityForResult(intent, VPN_PERMISSION_REQUEST_CODE)
-            return;
-        }
-        vpnCallBack?.invoke()
-    }
-
-    fun requestNotificationsPermission(context: Context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            val permission = ContextCompat.checkSelfPermission(
-                context,
-                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
-                )
-                return
-            }
-        }
-    }
-
-    private fun isChinaPackage(packageName: String): Boolean {
-        val packageManager = context.packageManager ?: return false
-        skipPrefixList.forEach {
-            if (packageName == it || packageName.startsWith("$it.")) return false
-        }
-        val packageManagerFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            PackageManager.MATCH_UNINSTALLED_PACKAGES or PackageManager.GET_ACTIVITIES or PackageManager.GET_SERVICES or PackageManager.GET_RECEIVERS or PackageManager.GET_PROVIDERS
-        } else {
-            @Suppress("DEPRECATION")
-            PackageManager.GET_UNINSTALLED_PACKAGES or PackageManager.GET_ACTIVITIES or PackageManager.GET_SERVICES or PackageManager.GET_RECEIVERS or PackageManager.GET_PROVIDERS
-        }
-        if (packageName.matches(chinaAppRegex)) {
-            return true
-        }
-        try {
-            val packageInfo = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                packageManager.getPackageInfo(
-                    packageName,
-                    PackageManager.PackageInfoFlags.of(packageManagerFlags.toLong())
-                )
-            } else {
-                @Suppress("DEPRECATION") packageManager.getPackageInfo(
-                    packageName, packageManagerFlags
-                )
-            }
-            mutableListOf<ComponentInfo>().apply {
-                packageInfo.services?.let { addAll(it) }
-                packageInfo.activities?.let { addAll(it) }
-                packageInfo.receivers?.let { addAll(it) }
-                packageInfo.providers?.let { addAll(it) }
-            }.forEach {
-                if (it.name.matches(chinaAppRegex)) return true
-            }
-            ZipFile(File(packageInfo.applicationInfo.publicSourceDir)).use {
-                for (packageEntry in it.entries()) {
-                    if (packageEntry.name.startsWith("firebase-")) return false
-                }
-                for (packageEntry in it.entries()) {
-                    if (!(packageEntry.name.startsWith("classes") && packageEntry.name.endsWith(
-                            ".dex"
-                        ))
-                    ) {
-                        continue
-                    }
-                    if (packageEntry.size > 15000000) {
-                        return true
-                    }
-                    val input = it.getInputStream(packageEntry).buffered()
-                    val dexFile = try {
-                        DexBackedDexFile.fromInputStream(null, input)
-                    } catch (e: Exception) {
-                        return false
-                    }
-                    for (clazz in dexFile.classes) {
-                        val clazzName =
-                            clazz.type.substring(1, clazz.type.length - 1).replace("/", ".")
-                                .replace("$", ".")
-                        if (clazzName.matches(chinaAppRegex)) return true
-                    }
-                }
-            }
-        } catch (_: Exception) {
-            return false
-        }
-        return false
+    fun requestGc() {
+        channel.invokeMethod("gc", null)
     }
 
     override fun onAttachedToActivity(binding: ActivityPluginBinding) {
         activity = binding.activity;
-        binding.addActivityResultListener(::onActivityResult)
-        binding.addRequestPermissionsResultListener(::onRequestPermissionsResultListener)
     }
 
     override fun onDetachedFromActivityForConfigChanges() {
@@ -415,25 +241,4 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         channel.invokeMethod("exit", null)
         activity = null
     }
-
-    private fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
-        if (requestCode == VPN_PERMISSION_REQUEST_CODE) {
-            if (resultCode == FlutterActivity.RESULT_OK) {
-                GlobalState.initServiceEngine(context)
-                vpnCallBack?.invoke()
-            }
-        }
-        return true
-    }
-
-    private fun onRequestPermissionsResultListener(
-        requestCode: Int,
-        permissions: Array<String>,
-        grantResults: IntArray
-    ): Boolean {
-        if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {
-            isBlockNotification = true
-        }
-        return true
-    }
 }

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

@@ -0,0 +1,220 @@
+package com.follow.clash.plugins
+
+import android.Manifest
+import android.app.Activity
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.content.pm.PackageManager
+import android.net.VpnService
+import android.os.Build
+import android.os.IBinder
+import android.util.Log
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import com.follow.clash.GlobalState
+import com.follow.clash.RunState
+import com.follow.clash.models.Props
+import com.follow.clash.services.FlClashVpnService
+import com.google.gson.Gson
+import io.flutter.embedding.android.FlutterActivity
+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
+
+
+class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {
+
+    private lateinit var flutterMethodChannel: MethodChannel
+
+    val VPN_PERMISSION_REQUEST_CODE = 1001
+    val NOTIFICATION_PERMISSION_REQUEST_CODE = 1002
+
+    private var activity: Activity? = null
+    private var context: Context? = null
+    private var flClashVpnService: FlClashVpnService? = null
+    private var port: Int = 7890
+    private var props: Props? = null
+    private var isBlockNotification: Boolean = false
+    private var isStart: Boolean = false
+
+    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()
+            }
+        }
+
+        override fun onServiceDisconnected(arg: ComponentName) {
+            flClashVpnService = null
+        }
+    }
+
+    override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+        context = flutterPluginBinding.applicationContext
+        flutterMethodChannel = MethodChannel(flutterPluginBinding.binaryMessenger, "proxy")
+        flutterMethodChannel.setMethodCallHandler(this)
+    }
+
+    override fun onDetachedFromEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+        flutterMethodChannel.setMethodCallHandler(null)
+    }
+
+    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")!!
+            val args = call.argument<String>("args")
+            props =
+                if (args != null) Gson().fromJson(args, Props::class.java) else null
+            startVpn()
+            result.success(true)
+        }
+
+        "stopProxy" -> {
+            stopVpn()
+            result.success(true)
+        }
+
+        "setProtect" -> {
+            val fd = call.argument<Int>("fd")
+            if (fd != null) {
+                flClashVpnService?.protect(fd)
+                result.success(true)
+            } else {
+                result.success(false)
+            }
+        }
+
+        "startForeground" -> {
+            val title = call.argument<String>("title") as String
+            val content = call.argument<String>("content") as String
+            startForeground(title, content)
+            result.success(true)
+        }
+
+        else -> {
+            result.notImplemented()
+        }
+    }
+
+    private fun initService() {
+        val intent = VpnService.prepare(context)
+        if (intent != null) {
+            activity?.startActivityForResult(intent, VPN_PERMISSION_REQUEST_CODE)
+        } else {
+            if (flClashVpnService != null) {
+                flClashVpnService!!.initServiceEngine()
+            } else {
+                bindService()
+            }
+        }
+    }
+
+    private fun startVpn() {
+        if (flClashVpnService == null) {
+            bindService()
+            return
+        }
+        if (GlobalState.runState.value == RunState.START) return
+        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)
+    }
+
+    private fun stopVpn() {
+        if (GlobalState.runState.value == RunState.STOP) return
+        GlobalState.runState.value = RunState.STOP
+        flClashVpnService?.stop()
+        GlobalState.destroyServiceEngine()
+    }
+
+    private fun startForeground(title: String, content: String) {
+        if (GlobalState.runState.value != RunState.START) return
+        flClashVpnService?.startForeground(title, content)
+    }
+
+    override fun onAttachedToActivity(binding: ActivityPluginBinding) {
+        activity = binding.activity
+        binding.addActivityResultListener(::onActivityResult)
+        binding.addRequestPermissionsResultListener(::onRequestPermissionsResultListener)
+    }
+
+    private fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
+        if (requestCode == VPN_PERMISSION_REQUEST_CODE) {
+            if (resultCode == FlutterActivity.RESULT_OK) {
+                bindService()
+            } else {
+                stopVpn()
+            }
+        }
+        return true
+    }
+
+    private fun onRequestPermissionsResultListener(
+        requestCode: Int,
+        permissions: Array<String>,
+        grantResults: IntArray
+    ): Boolean {
+        if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {
+            isBlockNotification = true
+        }
+        return false
+    }
+
+    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
+    }
+
+    override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
+        activity = binding.activity
+    }
+
+    override fun onDetachedFromActivity() {
+        activity = null
+    }
+
+    private fun bindService() {
+        val intent = Intent(context, FlClashVpnService::class.java)
+        context?.bindService(intent, connection, Context.BIND_AUTO_CREATE)
+    }
+}

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

@@ -1,49 +0,0 @@
-package com.follow.clash.plugins
-
-import android.content.Context
-import android.net.ConnectivityManager
-import androidx.core.content.getSystemService
-import com.follow.clash.GlobalState
-import io.flutter.embedding.engine.plugins.FlutterPlugin
-import io.flutter.plugin.common.MethodCall
-import io.flutter.plugin.common.MethodChannel
-
-
-class ServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
-
-    private lateinit var flutterMethodChannel: MethodChannel
-
-    private lateinit var context: Context
-
-    override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
-        context = flutterPluginBinding.applicationContext
-        flutterMethodChannel = MethodChannel(flutterPluginBinding.binaryMessenger, "service")
-        flutterMethodChannel.setMethodCallHandler(this)
-    }
-
-    override fun onDetachedFromEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
-        flutterMethodChannel.setMethodCallHandler(null)
-    }
-
-    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) = when (call.method) {
-        "init" -> {
-            GlobalState.getCurrentAppPlugin()?.requestNotificationsPermission(context)
-            GlobalState.initServiceEngine(context)
-            result.success(true)
-        }
-
-        "destroy" -> {
-            handleDestroy()
-            result.success(true)
-        }
-
-        else -> {
-            result.notImplemented()
-        }
-    }
-
-    private fun handleDestroy() {
-        GlobalState.getCurrentVPNPlugin()?.stop()
-        GlobalState.destroyServiceEngine()
-    }
-}

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

@@ -1,270 +0,0 @@
-package com.follow.clash.plugins
-
-import android.annotation.SuppressLint
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.ServiceConnection
-import android.net.ConnectivityManager
-import android.net.Network
-import android.net.NetworkCapabilities
-import android.net.NetworkRequest
-import android.os.Build
-import android.os.IBinder
-import androidx.core.content.getSystemService
-import com.follow.clash.BaseServiceInterface
-import com.follow.clash.GlobalState
-import com.follow.clash.RunState
-import com.follow.clash.extensions.getProtocol
-import com.follow.clash.extensions.resolvePrimaryDns
-import com.follow.clash.models.Props
-import com.follow.clash.models.TunProps
-import com.follow.clash.services.FlClashService
-import com.follow.clash.services.FlClashVpnService
-import com.google.gson.Gson
-import io.flutter.embedding.engine.plugins.FlutterPlugin
-import io.flutter.plugin.common.MethodCall
-import io.flutter.plugin.common.MethodChannel
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.net.InetSocketAddress
-import kotlin.concurrent.withLock
-import com.follow.clash.models.Process
-
-
-class VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
-    private lateinit var flutterMethodChannel: MethodChannel
-    private lateinit var context: Context
-    private var flClashService: BaseServiceInterface? = null
-    private var port: Int = 7890
-    private var props: Props? = null
-    private lateinit var scope: CoroutineScope
-
-    private val connectivity by lazy {
-        context.getSystemService<ConnectivityManager>()
-    }
-
-    private val connection = object : ServiceConnection {
-        override fun onServiceConnected(className: ComponentName, service: IBinder) {
-            flClashService = when (service) {
-                is FlClashVpnService.LocalBinder -> service.getService()
-                is FlClashService.LocalBinder -> service.getService()
-                else -> throw Exception("invalid binder")
-            }
-            start()
-        }
-
-        override fun onServiceDisconnected(arg: ComponentName) {
-            flClashService = null
-        }
-    }
-
-    override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
-        scope = CoroutineScope(Dispatchers.Default)
-        context = flutterPluginBinding.applicationContext
-        scope.launch {
-            registerNetworkCallback()
-        }
-        flutterMethodChannel = MethodChannel(flutterPluginBinding.binaryMessenger, "vpn")
-        flutterMethodChannel.setMethodCallHandler(this)
-    }
-
-    override fun onDetachedFromEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
-        unRegisterNetworkCallback()
-        flutterMethodChannel.setMethodCallHandler(null)
-    }
-
-    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
-        when (call.method) {
-            "start" -> {
-                port = call.argument<Int>("port")!!
-                val args = call.argument<String>("args")
-                props =
-                    if (args != null) Gson().fromJson(args, Props::class.java) else null
-                when (props?.enable == true) {
-                    true -> handleStartVpn()
-                    false -> start()
-                }
-                result.success(true)
-            }
-
-            "stop" -> {
-                stop()
-                result.success(true)
-            }
-
-            "setProtect" -> {
-                val fd = call.argument<Int>("fd")
-                if (fd != null) {
-                    if (flClashService is FlClashVpnService) {
-                        (flClashService as FlClashVpnService).protect(fd)
-                    }
-                    result.success(true)
-                } else {
-                    result.success(false)
-                }
-            }
-
-            "startForeground" -> {
-                val title = call.argument<String>("title") as String
-                val content = call.argument<String>("content") as String
-                startForeground(title, content)
-                result.success(true)
-            }
-
-            "resolverProcess" -> {
-                val data = call.argument<String>("data")
-                val process =
-                    if (data != null) Gson().fromJson(
-                        data,
-                        Process::class.java
-                    ) else null
-                val metadata = process?.metadata
-                if (metadata == null) {
-                    result.success(null)
-                    return
-                }
-                val protocol = metadata.getProtocol()
-                if (protocol == null) {
-                    result.success(null)
-                    return
-                }
-                scope.launch {
-                    withContext(Dispatchers.Default) {
-                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-                            result.success(null)
-                            return@withContext
-                        }
-                        val src = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
-                        val dst = InetSocketAddress(
-                            metadata.destinationIP.ifEmpty { metadata.host },
-                            metadata.destinationPort
-                        )
-                        val uid = try {
-                            connectivity?.getConnectionOwnerUid(protocol, src, dst)
-                        } catch (_: Exception) {
-                            null
-                        }
-                        if (uid == null || uid == -1) {
-                            result.success(null)
-                            return@withContext
-                        }
-                        val packages = context.packageManager?.getPackagesForUid(uid)
-                        result.success(packages?.first())
-                    }
-                }
-            }
-
-            else -> {
-                result.notImplemented()
-            }
-        }
-    }
-
-    @SuppressLint("ForegroundServiceType")
-    fun handleStartVpn() {
-        GlobalState.getCurrentAppPlugin()?.requestVpnPermission(context) {
-            start()
-        }
-    }
-
-    fun requestGc() {
-        flutterMethodChannel.invokeMethod("gc", null)
-    }
-
-    val networks = mutableSetOf<Network>()
-
-    fun onUpdateNetwork() {
-        val dns = networks.mapNotNull {
-            connectivity?.resolvePrimaryDns(it)
-        }.joinToString(separator = ",")
-        scope.launch {
-            withContext(Dispatchers.Main) {
-                flutterMethodChannel.invokeMethod("dnsChanged", dns)
-            }
-        }
-//        if (flClashService is FlClashVpnService) {
-//            val network = networks.maxByOrNull { net ->
-//                connectivity?.getNetworkCapabilities(net)?.let { cap ->
-//                    TRANSPORT_PRIORITY.indexOfFirst { cap.hasTransport(it) }
-//                } ?: -1
-//            }
-//            network?.let {
-//                (flClashService as FlClashVpnService).updateUnderlyingNetworks(arrayOf(network))
-//            }
-//        }
-    }
-
-    private val callback = object : ConnectivityManager.NetworkCallback() {
-        override fun onAvailable(network: Network) {
-            networks.add(network)
-            onUpdateNetwork()
-        }
-
-        override fun onLost(network: Network) {
-            networks.remove(network)
-            onUpdateNetwork()
-        }
-    }
-
-    private val request = NetworkRequest.Builder().apply {
-        addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
-        addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-        addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
-    }.build()
-
-    private fun registerNetworkCallback() {
-        networks.clear()
-        connectivity?.registerNetworkCallback(request, callback)
-    }
-
-    private fun unRegisterNetworkCallback() {
-        connectivity?.unregisterNetworkCallback(callback)
-        networks.clear()
-        onUpdateNetwork()
-    }
-
-    @SuppressLint("ForegroundServiceType")
-    private fun startForeground(title: String, content: String) {
-        GlobalState.runLock.withLock {
-            if (GlobalState.runState.value != RunState.START) return
-            flClashService?.startForeground(title, content)
-        }
-    }
-
-    private fun start() {
-        if (flClashService == null) {
-            bindService()
-            return
-        }
-        GlobalState.runLock.withLock {
-            if (GlobalState.runState.value == RunState.START) return
-            GlobalState.runState.value = RunState.START
-            val tunProps = flClashService?.start(port, props)
-            flutterMethodChannel.invokeMethod(
-                "started",
-                Gson().toJson(tunProps, TunProps::class.java)
-            )
-        }
-    }
-
-    fun stop() {
-        GlobalState.runLock.withLock {
-            if (GlobalState.runState.value == RunState.STOP) return
-            GlobalState.runState.value = RunState.STOP
-            flClashService?.stop()
-        }
-        GlobalState.destroyServiceEngine()
-    }
-
-    private fun bindService() {
-        val intent = when (props?.enable == true) {
-            true -> Intent(context, FlClashVpnService::class.java)
-            false -> Intent(context, FlClashService::class.java)
-        }
-        context.bindService(intent, connection, Context.BIND_AUTO_CREATE)
-    }
-
-}

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

@@ -1,104 +0,0 @@
-package com.follow.clash.services
-
-import android.annotation.SuppressLint
-import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.app.Service
-import android.content.Intent
-import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
-import android.os.Binder
-import android.os.Build
-import android.os.IBinder
-import android.util.Log
-import androidx.core.app.NotificationCompat
-import com.follow.clash.BaseServiceInterface
-import com.follow.clash.MainActivity
-import com.follow.clash.models.Props
-
-
-@SuppressLint("WrongConstant")
-class FlClashService : Service(), BaseServiceInterface {
-
-    private val binder = LocalBinder()
-
-    inner class LocalBinder : Binder() {
-        fun getService(): FlClashService = this@FlClashService
-    }
-
-    override fun onBind(intent: Intent): IBinder {
-        return binder
-    }
-
-    override fun onUnbind(intent: Intent?): Boolean {
-        return super.onUnbind(intent)
-    }
-
-    private val CHANNEL = "FlClash"
-
-    private val notificationId: Int = 1
-
-    private val notificationBuilder: NotificationCompat.Builder by lazy {
-        val intent = Intent(this, MainActivity::class.java)
-
-        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
-            PendingIntent.getActivity(
-                this,
-                0,
-                intent,
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-            )
-        } else {
-            PendingIntent.getActivity(
-                this,
-                0,
-                intent,
-                PendingIntent.FLAG_UPDATE_CURRENT
-            )
-        }
-        with(NotificationCompat.Builder(this, CHANNEL)) {
-            setSmallIcon(com.follow.clash.R.drawable.ic_stat_name)
-            setContentTitle("FlClash")
-            setContentIntent(pendingIntent)
-            setCategory(NotificationCompat.CATEGORY_SERVICE)
-            priority = NotificationCompat.PRIORITY_MIN
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
-            }
-            setOngoing(true)
-            setShowWhen(false)
-            setOnlyAlertOnce(true)
-            setAutoCancel(true)
-        }
-    }
-
-    override fun start(port: Int, props: Props?) = null
-
-    override fun stop() {
-        stopSelf()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            stopForeground(STOP_FOREGROUND_REMOVE)
-        }
-    }
-
-    @SuppressLint("ForegroundServiceType", "WrongConstant")
-    override fun startForeground(title: String, content: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val manager = getSystemService(NotificationManager::class.java)
-            var channel = manager?.getNotificationChannel(CHANNEL)
-            if (channel == null) {
-                channel =
-                    NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
-                manager?.createNotificationChannel(channel)
-            }
-        }
-        val notification =
-            notificationBuilder.setContentTitle(title).setContentText(content).build()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
-        } else {
-            startForeground(notificationId, notification)
-        }
-    }
-}

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

@@ -1,13 +1,11 @@
 package com.follow.clash.services
 
-import android.annotation.SuppressLint
 import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Intent
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
-import android.net.Network
 import android.net.ProxyInfo
 import android.net.VpnService
 import android.os.Binder
@@ -17,68 +15,51 @@ import android.os.Parcel
 import android.os.RemoteException
 import android.util.Log
 import androidx.core.app.NotificationCompat
-import com.follow.clash.BaseServiceInterface
 import com.follow.clash.GlobalState
 import com.follow.clash.MainActivity
 import com.follow.clash.R
 import com.follow.clash.models.AccessControlMode
 import com.follow.clash.models.Props
-import com.follow.clash.models.TunProps
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 
-@SuppressLint("WrongConstant")
-class FlClashVpnService : VpnService(), BaseServiceInterface {
+class FlClashVpnService : VpnService() {
+    private val CHANNEL = "FlClash"
 
-    companion object {
-        private val passList = listOf(
-            "*zhihu.com",
-            "*zhimg.com",
-            "*jd.com",
-            "100ime-iat-api.xfyun.cn",
-            "*360buyimg.com",
-            "localhost",
-            "*.local",
-            "127.*",
-            "10.*",
-            "172.16.*",
-            "172.17.*",
-            "172.18.*",
-            "172.19.*",
-            "172.2*",
-            "172.30.*",
-            "172.31.*",
-            "192.168.*"
-        )
-        private const val TUN_MTU = 9000
-        private const val TUN_SUBNET_PREFIX = 30
-        private const val TUN_GATEWAY = "172.19.0.1"
-        private const val TUN_SUBNET_PREFIX6 = 126
-        private const val TUN_GATEWAY6 = "fdfe:dcba:9876::1"
-        private const val TUN_PORTAL = "172.19.0.2"
-        private const val TUN_PORTAL6 = "fdfe:dcba:9876::2"
-        private const val TUN_DNS = TUN_PORTAL
-        private const val TUN_DNS6 = TUN_PORTAL6
-        private const val NET_ANY = "0.0.0.0"
-        private const val NET_ANY6 = "::"
-    }
+    private val notificationId: Int = 1
+
+    private val passList = listOf(
+        "*zhihu.com",
+        "*zhimg.com",
+        "*jd.com",
+        "100ime-iat-api.xfyun.cn",
+        "*360buyimg.com",
+        "localhost",
+        "*.local",
+        "127.*",
+        "10.*",
+        "172.16.*",
+        "172.17.*",
+        "172.18.*",
+        "172.19.*",
+        "172.2*",
+        "172.30.*",
+        "172.31.*",
+        "192.168.*"
+    )
 
     override fun onCreate() {
         super.onCreate()
-        GlobalState.initServiceEngine(applicationContext)
+        initServiceEngine()
     }
 
-    override fun start(port: Int, props: Props?): TunProps {
+    fun start(port: Int, props: Props?): Int? {
         return with(Builder()) {
-            addAddress(TUN_GATEWAY, TUN_SUBNET_PREFIX)
-            addAddress(TUN_GATEWAY6, TUN_SUBNET_PREFIX6)
-            addRoute(NET_ANY, 0)
-            addRoute(NET_ANY6, 0)
-            addDnsServer(TUN_DNS)
-            addDnsServer(TUN_DNS6)
-            setMtu(TUN_MTU)
+            addAddress("172.16.0.1", 30)
+            setMtu(9000)
+            addRoute("0.0.0.0", 0)
             props?.accessControl?.let { accessControl ->
                 when (accessControl.mode) {
                     AccessControlMode.acceptSelected -> {
@@ -94,6 +75,7 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
                     }
                 }
             }
+            addDnsServer("172.16.0.2")
             setSession("FlClash")
             setBlocking(false)
             if (Build.VERSION.SDK_INT >= 29) {
@@ -111,36 +93,15 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
                     )
                 )
             }
-            TunProps(
-                fd = establish()?.detachFd()
-                    ?: throw NullPointerException("Establish VPN rejected by system"),
-                gateway = "$TUN_GATEWAY/$TUN_SUBNET_PREFIX",
-                gateway6 = "$TUN_GATEWAY6/$TUN_SUBNET_PREFIX6",
-                portal = TUN_PORTAL,
-                portal6 = TUN_PORTAL6,
-                dns = TUN_DNS,
-                dns6 = TUN_DNS6
-            )
+            establish()?.detachFd()
         }
     }
 
-    fun updateUnderlyingNetworks( networks: Array<Network>){
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            this.setUnderlyingNetworks(networks)
-        }
-    }
-
-    override fun stop() {
+    fun stop() {
         stopSelf()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            stopForeground(STOP_FOREGROUND_REMOVE)
-        }
+        stopForeground()
     }
 
-    private val CHANNEL = "FlClash"
-
-    private val notificationId: Int = 1
-
     private val notificationBuilder: NotificationCompat.Builder by lazy {
         val intent = Intent(this, MainActivity::class.java)
 
@@ -175,8 +136,16 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
         }
     }
 
-    @SuppressLint("ForegroundServiceType", "WrongConstant")
-    override fun startForeground(title: String, content: String) {
+    fun initServiceEngine() {
+        GlobalState.initServiceEngine(applicationContext)
+    }
+
+    override fun onTrimMemory(level: Int) {
+        super.onTrimMemory(level)
+        GlobalState.getCurrentAppPlugin()?.requestGc()
+    }
+
+    fun startForeground(title: String, content: String) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val manager = getSystemService(NotificationManager::class.java)
             var channel = manager?.getNotificationChannel(CHANNEL)
@@ -188,16 +157,17 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
         }
         val notification =
             notificationBuilder.setContentTitle(title).setContentText(content).build()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
         } else {
             startForeground(notificationId, notification)
         }
     }
 
-    override fun onTrimMemory(level: Int) {
-        super.onTrimMemory(level)
-        GlobalState.getCurrentVPNPlugin()?.requestGc()
+    private fun stopForeground() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            stopForeground(STOP_FOREGROUND_REMOVE)
+        }
     }
 
     private val binder = LocalBinder()
@@ -220,6 +190,7 @@ class FlClashVpnService : VpnService(), BaseServiceInterface {
         }
     }
 
+
     override fun onBind(intent: Intent): IBinder {
         return binder
     }

android/app/src/main/res/drawable-anydpi-v24/ic_stat_name.xml

@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="240"
+    android:viewportHeight="240"
+    android:tint="#FFFFFF">
+  <group android:scaleX="2.0264318"
+      android:scaleY="2.0264318"
+      android:translateX="-123.17181"
+      android:translateY="-123.17181">
+    <group android:scaleX="0.61"
+        android:scaleY="0.61"
+        android:translateX="46.8"
+        android:translateY="46.8">
+      <path
+          android:pathData="M67.67,115.76L144.04,39.39A18,18 0,0 1,169.5 39.39L169.5,39.39A18,18 0,0 1,169.5 64.85L93.13,141.21A18,18 0,0 1,67.67 141.21L67.67,141.21A18,18 0,0 1,67.67 115.76z"
+          android:fillColor="#6666FF"/>
+      <path
+          android:pathData="M98.79,146.87L136.97,108.69A18,18 72.93,0 1,162.43 108.69L162.43,108.69A18,18 72.93,0 1,162.43 134.14L124.24,172.33A18,18 76.87,0 1,98.79 172.33L98.79,172.33A18,18 76.87,0 1,98.79 146.87z"
+          android:fillColor="#326CBF"/>
+      <path
+          android:pathData="M129.9,177.98L129.9,177.98A18,18 107.07,0 1,155.36 177.98L155.36,177.98A18,18 107.07,0 1,155.36 203.44L155.36,203.44A18,18 107.07,0 1,129.9 203.44L129.9,203.44A18,18 107.07,0 1,129.9 177.98z"
+          android:fillColor="#56afee"/>
+    </group>
+  </group>
+</vector>

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

@@ -3,23 +3,23 @@
     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">
+  <group android:scaleX="0.90244895"
+      android:scaleY="0.90244895"
+      android:translateX="12.708843"
+      android:translateY="10.703402">
+    <group android:scaleX="0.61"
+        android:scaleY="0.61"
+        android:translateX="46.8"
+        android:translateY="46.8">
       <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"/>
+          android:pathData="M67.67,115.76L144.04,39.39A18,18 0,0 1,169.5 39.39L169.5,39.39A18,18 0,0 1,169.5 64.85L93.13,141.21A18,18 0,0 1,67.67 141.21L67.67,141.21A18,18 0,0 1,67.67 115.76z"
+          android:fillColor="#6666FF"/>
       <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"/>
+          android:pathData="M98.79,146.87L136.97,108.69A18,18 72.93,0 1,162.43 108.69L162.43,108.69A18,18 72.93,0 1,162.43 134.14L124.24,172.33A18,18 76.87,0 1,98.79 172.33L98.79,172.33A18,18 76.87,0 1,98.79 146.87z"
+          android:fillColor="#326CBF"/>
       <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"/>
+          android:pathData="M129.9,177.98L129.9,177.98A18,18 107.07,0 1,155.36 177.98L155.36,177.98A18,18 107.07,0 1,155.36 203.44L155.36,203.44A18,18 107.07,0 1,129.9 203.44L129.9,203.44A18,18 107.07,0 1,129.9 177.98z"
+          android:fillColor="#56afee"/>
     </group>
   </group>
 </vector>

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

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

core/common.go

@@ -2,10 +2,20 @@ package main
 
 import "C"
 import (
-	"context"
-	"errors"
-	route "github.com/metacubex/mihomo/hub/route"
-	"math"
+	"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"
+	"github.com/metacubex/mihomo/config"
+	"github.com/metacubex/mihomo/constant"
+	"github.com/metacubex/mihomo/hub"
+	"github.com/metacubex/mihomo/hub/executor"
+	"github.com/metacubex/mihomo/hub/route"
+	"github.com/metacubex/mihomo/listener"
+	"github.com/metacubex/mihomo/log"
+	"github.com/metacubex/mihomo/tunnel"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -14,37 +24,54 @@ import (
 	"sync"
 	"syscall"
 	"time"
-
-	"github.com/metacubex/mihomo/adapter"
-	"github.com/metacubex/mihomo/adapter/inbound"
-	"github.com/metacubex/mihomo/adapter/outboundgroup"
-	"github.com/metacubex/mihomo/adapter/provider"
-	"github.com/metacubex/mihomo/common/batch"
-	"github.com/metacubex/mihomo/component/dialer"
-	"github.com/metacubex/mihomo/component/resolver"
-	"github.com/metacubex/mihomo/config"
-	"github.com/metacubex/mihomo/constant"
-	cp "github.com/metacubex/mihomo/constant/provider"
-	"github.com/metacubex/mihomo/hub"
-	"github.com/metacubex/mihomo/hub/executor"
-	"github.com/metacubex/mihomo/listener"
-	"github.com/metacubex/mihomo/log"
-	rp "github.com/metacubex/mihomo/rules/provider"
-	"github.com/metacubex/mihomo/tunnel"
 )
 
+type healthCheckSchema struct {
+	Enable         bool   `provider:"enable"`
+	URL            string `provider:"url"`
+	Interval       int    `provider:"interval"`
+	TestTimeout    int    `provider:"timeout,omitempty"`
+	Lazy           bool   `provider:"lazy,omitempty"`
+	ExpectedStatus string `provider:"expected-status,omitempty"`
+}
+
+type proxyProviderSchema struct {
+	Type          string `provider:"type"`
+	Path          string `provider:"path,omitempty"`
+	URL           string `provider:"url,omitempty"`
+	Proxy         string `provider:"proxy,omitempty"`
+	Interval      int    `provider:"interval,omitempty"`
+	Filter        string `provider:"filter,omitempty"`
+	ExcludeFilter string `provider:"exclude-filter,omitempty"`
+	ExcludeType   string `provider:"exclude-type,omitempty"`
+	DialerProxy   string `provider:"dialer-proxy,omitempty"`
+
+	HealthCheck healthCheckSchema   `provider:"health-check,omitempty"`
+	Override    ap.OverrideSchema   `provider:"override,omitempty"`
+	Header      map[string][]string `provider:"header,omitempty"`
+}
+
+type ruleProviderSchema struct {
+	Type     string `provider:"type"`
+	Behavior string `provider:"behavior"`
+	Path     string `provider:"path,omitempty"`
+	URL      string `provider:"url,omitempty"`
+	Proxy    string `provider:"proxy,omitempty"`
+	Format   string `provider:"format,omitempty"`
+	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"`
-	OverrideDns  bool              `json:"override-dns"`
 }
 
 type GenerateConfigParams struct {
-	ProfileId string               `json:"profile-id"`
-	Config    config.RawConfig     `json:"config" `
-	Params    ConfigExtendedParams `json:"params"`
+	ProfilePath *string              `json:"profile-path"`
+	Config      config.RawConfig     `json:"config" `
+	Params      ConfigExtendedParams `json:"params"`
 }
 
 type ChangeProxyParams struct {
@@ -66,19 +93,9 @@ type ExternalProvider struct {
 	Name        string    `json:"name"`
 	Type        string    `json:"type"`
 	VehicleType string    `json:"vehicle-type"`
-	Count       int       `json:"count"`
-	Path        string    `json:"path"`
 	UpdateAt    time.Time `json:"update-at"`
 }
 
-type ExternalProviders []ExternalProvider
-
-func (a ExternalProviders) Len() int           { return len(a) }
-func (a ExternalProviders) Less(i, j int) bool { return a[i].Name < a[j].Name }
-func (a ExternalProviders) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-var b, _ = batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](50))
-
 func restartExecutable(execPath string) {
 	var err error
 	executor.Shutdown()
@@ -128,108 +145,26 @@ func removeFile(path string) error {
 	return nil
 }
 
-func getProfilePath(id string) string {
-	return filepath.Join(constant.Path.HomeDir(), "profiles", id+".yaml")
-}
-
-func getProfileProvidersPath(id string) string {
-	return filepath.Join(constant.Path.HomeDir(), "providers", id)
-}
-
-func getRawConfigWithId(id string) *config.RawConfig {
-	path := getProfilePath(id)
-	bytes, err := readFile(path)
-	if err != nil {
-		log.Errorln("profile is not exist")
+func getRawConfigWithPath(path *string) *config.RawConfig {
+	if path == nil {
 		return config.DefaultRawConfig()
-	}
-	prof, err := config.UnmarshalRawConfig(bytes)
-	if err != nil {
-		log.Errorln("unmarshalRawConfig error %v", err)
-		return config.DefaultRawConfig()
-	}
-	for _, mapping := range prof.ProxyProvider {
-		value, exist := mapping["path"].(string)
-		if !exist {
-			continue
+	} else {
+		bytes, err := readFile(*path)
+		if err != nil {
+			log.Errorln("getProfile readFile error %v", err)
+			return config.DefaultRawConfig()
 		}
-		mapping["path"] = filepath.Join(getProfileProvidersPath(id), value)
-	}
-	for _, mapping := range prof.RuleProvider {
-		value, exist := mapping["path"].(string)
-		if !exist {
-			continue
+		prof, err := config.UnmarshalRawConfig(bytes)
+		if err != nil {
+			log.Errorln("getProfile UnmarshalRawConfig error %v", err)
+			return config.DefaultRawConfig()
 		}
-		mapping["path"] = filepath.Join(getProfileProvidersPath(id), value)
-	}
-	return prof
-}
-
-func getExternalProvidersRaw() map[string]cp.Provider {
-	eps := make(map[string]cp.Provider)
-	for n, p := range tunnel.Providers() {
-		if p.VehicleType() != cp.Compatible {
-			eps[n] = p
-		}
-	}
-	for n, p := range tunnel.RuleProviders() {
-		if p.VehicleType() != cp.Compatible {
-			eps[n] = p
-		}
-	}
-	return eps
-}
-
-func toExternalProvider(p cp.Provider) (*ExternalProvider, error) {
-	switch p.(type) {
-	case *provider.ProxySetProvider:
-		psp := p.(*provider.ProxySetProvider)
-		return &ExternalProvider{
-			Name:        psp.Name(),
-			Type:        psp.Type().String(),
-			VehicleType: psp.VehicleType().String(),
-			Count:       psp.Count(),
-			Path:        psp.Vehicle().Path(),
-			UpdateAt:    psp.UpdatedAt(),
-		}, nil
-	case *rp.RuleSetProvider:
-		rsp := p.(*rp.RuleSetProvider)
-		return &ExternalProvider{
-			Name:        rsp.Name(),
-			Type:        rsp.Type().String(),
-			VehicleType: rsp.VehicleType().String(),
-			Count:       rsp.Count(),
-			Path:        rsp.Vehicle().Path(),
-			UpdateAt:    rsp.UpdatedAt(),
-		}, nil
-	default:
-		return nil, errors.New("not external provider")
+		return prof
 	}
 }
 
-func sideUpdateExternalProvider(p cp.Provider, bytes []byte) error {
-	switch p.(type) {
-	case *provider.ProxySetProvider:
-		psp := p.(*provider.ProxySetProvider)
-		elm, same, err := psp.SideUpdate(bytes)
-		if err == nil && !same {
-			psp.OnUpdate(elm)
-		}
-		return nil
-	case rp.RuleSetProvider:
-		rsp := p.(*rp.RuleSetProvider)
-		elm, same, err := rsp.SideUpdate(bytes)
-		if err == nil && !same {
-			rsp.OnUpdate(elm)
-		}
-		return nil
-	default:
-		return errors.New("not external provider")
-	}
-}
-
-func decorationConfig(profileId string, cfg config.RawConfig) *config.RawConfig {
-	prof := getRawConfigWithId(profileId)
+func decorationConfig(profilePath *string, cfg config.RawConfig) *config.RawConfig {
+	prof := getRawConfigWithPath(profilePath)
 	overwriteConfig(prof, cfg)
 	return prof
 }
@@ -380,12 +315,6 @@ func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
 	*rule = computedRule
 }
 
-func genHosts(hosts, patchHosts map[string]any) {
-	for k, v := range patchHosts {
-		hosts[k] = v
-	}
-}
-
 func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) {
 	targetConfig.ExternalController = patchConfig.ExternalController
 	targetConfig.ExternalUI = ""
@@ -393,11 +322,11 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.ExternalUIURL = ""
 	targetConfig.TCPConcurrent = patchConfig.TCPConcurrent
 	targetConfig.UnifiedDelay = patchConfig.UnifiedDelay
+	//targetConfig.GeodataMode = false
 	targetConfig.IPv6 = patchConfig.IPv6
 	targetConfig.LogLevel = patchConfig.LogLevel
 	targetConfig.Port = 0
 	targetConfig.SocksPort = 0
-	targetConfig.KeepAliveInterval = patchConfig.KeepAliveInterval
 	targetConfig.MixedPort = patchConfig.MixedPort
 	targetConfig.FindProcessMode = patchConfig.FindProcessMode
 	targetConfig.AllowLan = patchConfig.AllowLan
@@ -410,90 +339,48 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.Profile.StoreSelected = false
 	targetConfig.GeoXUrl = patchConfig.GeoXUrl
 	targetConfig.GlobalUA = patchConfig.GlobalUA
-	genHosts(targetConfig.Hosts, patchConfig.Hosts)
-	if configParams.OverrideDns {
+	if targetConfig.DNS.Enable == false {
 		targetConfig.DNS = patchConfig.DNS
-	} else {
-		if targetConfig.DNS.Enable == false {
-			targetConfig.DNS.Enable = true
-		}
 	}
 	//if runtime.GOOS == "android" {
 	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
 	//} else if runtime.GOOS == "windows" {
 	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
 	//}
-	//if configParams.IsCompatible == false {
-	//	targetConfig.ProxyProvider = make(map[string]map[string]any)
-	//	targetConfig.RuleProvider = make(map[string]map[string]any)
-	//	generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
-	//}
-}
-
-func patchConfig(general *config.General, controller *config.Controller) {
-	log.Infoln("[Apply] patch")
-	route.ReStartServer(controller.ExternalController)
-	tunnel.SetSniffing(general.Sniffing)
-	tunnel.SetFindProcessMode(general.FindProcessMode)
-	dialer.SetTcpConcurrent(general.TCPConcurrent)
-	dialer.DefaultInterface.Store(general.Interface)
-	adapter.UnifiedDelay.Store(general.UnifiedDelay)
-	tunnel.SetMode(general.Mode)
-	log.SetLevel(general.LogLevel)
-	resolver.DisableIPv6 = !general.IPv6
-}
-
-var isRunning = false
-
-var runLock sync.Mutex
-
-func updateListeners(general *config.General, listeners map[string]constant.InboundListener) {
-	if !isRunning {
-		return
+	if configParams.IsCompatible == false {
+		targetConfig.ProxyProvider = make(map[string]map[string]any)
+		targetConfig.RuleProvider = make(map[string]map[string]any)
+		generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
 	}
-	runLock.Lock()
-	defer runLock.Unlock()
+}
 
-	listener.PatchInboundListeners(listeners, tunnel.Tunnel, true)
+func patchConfig(general *config.General) {
+	log.Infoln("[Apply] patch")
+	route.ReStartServer(general.ExternalController)
 	listener.SetAllowLan(general.AllowLan)
 	inbound.SetSkipAuthPrefixes(general.SkipAuthPrefixes)
 	inbound.SetAllowedIPs(general.LanAllowedIPs)
 	inbound.SetDisAllowedIPs(general.LanDisAllowedIPs)
 	listener.SetBindAddress(general.BindAddress)
+	tunnel.SetSniffing(general.Sniffing)
+	tunnel.SetFindProcessMode(general.FindProcessMode)
+	dialer.SetTcpConcurrent(general.TCPConcurrent)
+	dialer.DefaultInterface.Store(general.Interface)
+	adapter.UnifiedDelay.Store(general.UnifiedDelay)
 	listener.ReCreateHTTP(general.Port, tunnel.Tunnel)
 	listener.ReCreateSocks(general.SocksPort, tunnel.Tunnel)
 	listener.ReCreateRedir(general.RedirPort, tunnel.Tunnel)
+	listener.ReCreateAutoRedir(general.EBpf.AutoRedir, tunnel.Tunnel)
 	listener.ReCreateTProxy(general.TProxyPort, tunnel.Tunnel)
+	listener.ReCreateTun(general.Tun, tunnel.Tunnel)
 	listener.ReCreateMixed(general.MixedPort, tunnel.Tunnel)
 	listener.ReCreateShadowSocks(general.ShadowSocksConfig, tunnel.Tunnel)
 	listener.ReCreateVmess(general.VmessConfig, tunnel.Tunnel)
 	listener.ReCreateTuic(general.TuicServer, tunnel.Tunnel)
-	listener.ReCreateTun(general.Tun, tunnel.Tunnel)
-}
-
-func stopListeners() {
-	listener.StopListener()
-}
-
-func hcCompatibleProvider(proxyProviders map[string]cp.ProxyProvider) {
-	wg := sync.WaitGroup{}
-	ch := make(chan struct{}, math.MaxInt)
-	for _, proxyProvider := range proxyProviders {
-		proxyProvider := proxyProvider
-		if proxyProvider.VehicleType() == cp.Compatible {
-			log.Infoln("Start initial Compatible provider %s", proxyProvider.Name())
-			wg.Add(1)
-			ch <- struct{}{}
-			go func() {
-				defer func() { <-ch; wg.Done() }()
-				if err := proxyProvider.Initial(); err != nil {
-					log.Errorln("initial Compatible provider %s error: %v", proxyProvider.Name(), err)
-				}
-			}()
-		}
-
-	}
+	tunnel.SetMode(general.Mode)
+	log.SetLevel(general.LogLevel)
 
+	resolver.DisableIPv6 = !general.IPv6
 }
 
 func patchSelectGroup() {
@@ -521,8 +408,12 @@ func patchSelectGroup() {
 	}
 }
 
-func applyConfig() error {
-	cfg, err := config.ParseRawConfig(currentRawConfig)
+var applyLock sync.Mutex
+
+func applyConfig() {
+	applyLock.Lock()
+	defer applyLock.Unlock()
+	cfg, err := config.ParseRawConfig(currentConfig)
 	if err != nil {
 		cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
 	}
@@ -530,17 +421,10 @@ func applyConfig() error {
 		constant.DefaultTestURL = *configParams.TestURL
 	}
 	if configParams.IsPatch {
-		patchConfig(cfg.General, cfg.Controller)
+		patchConfig(cfg.General)
 	} else {
-		closeConnections()
 		runtime.GC()
-		hub.UltraApplyConfig(cfg)
+		hub.UltraApplyConfig(cfg, true)
 		patchSelectGroup()
 	}
-	updateListeners(cfg.General, cfg.Listeners)
-	if isRunning {
-		hcCompatibleProvider(cfg.Providers)
-	}
-	externalProviders = getExternalProvidersRaw()
-	return err
 }

core/dns.go

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

core/go.mod

@@ -4,28 +4,34 @@ go 1.21.0
 
 replace github.com/metacubex/mihomo => ./Clash.Meta
 
-require github.com/metacubex/mihomo v1.17.1
-
-replace github.com/sagernet/sing => github.com/metacubex/sing v0.0.0-20240724044459-6f3cf5896297
+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
+	golang.org/x/sync v0.7.0
+)
 
 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
 	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/cilium/ebpf v0.12.3 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/coreos/go-iptables v0.7.0 // indirect
-	github.com/dlclark/regexp2 v1.11.4 // indirect
+	github.com/dlclark/regexp2 v1.11.0 // indirect
 	github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
 	github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
 	github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect
 	github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
-	github.com/go-chi/chi/v5 v5.1.0 // indirect
+	github.com/go-chi/chi/v5 v5.0.14 // 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
@@ -33,35 +39,32 @@ require (
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.4.0 // indirect
-	github.com/gofrs/uuid/v5 v5.3.0 // indirect
+	github.com/gofrs/uuid/v5 v5.2.0 // indirect
 	github.com/google/btree v1.1.2 // indirect
 	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-20240812123929-b105c29bd1b5 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20240529192340-51bc6136a0a6 // indirect
 	github.com/josharian/native v1.1.0 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.8 // 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/bbolt v0.0.0-20240822011022-aed6d4850399 // 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.47.1-0.20240909010619-6b38f24bfcc4 // indirect
+	github.com/metacubex/quic-go v0.45.1-0.20240610004319-163fee60637e // indirect
 	github.com/metacubex/randv2 v0.2.0 // indirect
-	github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4 // indirect
-	github.com/metacubex/sing-shadowsocks v0.2.8 // indirect
-	github.com/metacubex/sing-shadowsocks2 v0.2.2 // indirect
-	github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1 // indirect
-	github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 // indirect
-	github.com/metacubex/sing-wireguard v0.0.0-20240826061955-1e4e67afe5cd // indirect
-	github.com/metacubex/tfo-go v0.0.0-20240830120620-c5e019b67785 // indirect
+	github.com/metacubex/sing-quic v0.0.0-20240518034124-7696d3f7da72 // 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.20240627012306-9d1f5fc0b45e // indirect
+	github.com/metacubex/sing-vmess v0.1.9-0.20231207122118-72303677451f // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a // indirect
+	github.com/metacubex/tfo-go v0.0.0-20240228025757-be1269474a66 // indirect
 	github.com/metacubex/utls v1.6.6 // indirect
-	github.com/miekg/dns v1.1.62 // indirect
 	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
 	github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
 	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
@@ -69,18 +72,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.4.0 // indirect
+	github.com/puzpuzpuz/xsync/v3 v3.2.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/fswatch v0.1.1 // indirect
+	github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a // 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/sing v0.5.0-alpha.10 // 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.47.0 // indirect
+	github.com/samber/lo v1.39.0 // indirect
 	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
@@ -93,20 +96,17 @@ require (
 	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 // indirect
 	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.26.0 // indirect
-	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
-	golang.org/x/mod v0.20.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/text v0.17.0 // 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.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.24.0 // indirect
+	golang.org/x/tools v0.22.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect; indirect`
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/blake3 v1.3.0 // indirect
 )

core/go.sum

@@ -1,10 +1,14 @@
 github.com/3andne/restls-client-go v0.1.6 h1:tRx/YilqW7iHpgmEL4E1D8dAsuB0tFF3uvncS+B6I08=
 github.com/3andne/restls-client-go v0.1.6/go.mod h1:iEdTZNt9kzPIxjIGSMScUFSBrUH6bFRNg0BWlP4orEY=
+github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34 h1:USCTqih5d1bUXUxWNS9ZD5Tx/lb0jXHEtRIIx/F9dMc=
+github.com/Kr328/tun2socket v0.0.0-20220414050025-d07c78d06d34/go.mod h1:YR9wK13TgI5ww8iKWm91MHiSoHC7Oz0U4beCCmtXqLw=
 github.com/RyuaNerin/elliptic2 v1.0.0/go.mod h1:wWB8fWrJI/6EPJkyV/r1Rj0hxUgrusmqSj8JN6yNf/A=
 github.com/RyuaNerin/go-krypto v1.2.4 h1:mXuNdK6M317aPV0llW6Xpjbo4moOlPF7Yxz4tb4b4Go=
 github.com/RyuaNerin/go-krypto v1.2.4/go.mod h1:QqCYkoutU3yInyD9INt2PGolVRsc3W4oraQadVGXJ/8=
 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4q90ylaVAbnYyx0JYqK4YcGok=
 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344/go.mod h1:9pIqrY6SXNL8vjRQE5Hd/OL5GyK/9MrGUWs87z/eFfk=
+github.com/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=
@@ -17,6 +21,8 @@ github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx2
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/cilium/ebpf v0.12.3 h1:8ht6F9MquybnY97at+VDZb3eQQr8ev79RueWeVaEcG4=
+github.com/cilium/ebpf v0.12.3/go.mod h1:TctK1ivibvI3znr66ljgi4hqOT8EYQjz1KWBfb1UVgM=
 github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
 github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/coreos/go-iptables v0.7.0 h1:XWM3V+MPRr5/q51NuWSgU0fqMad64Zyxs8ZUoMsamr8=
@@ -24,8 +30,8 @@ github.com/coreos/go-iptables v0.7.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFE
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
-github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
+github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 h1:/5RkVc9Rc81XmMyVqawCiDyrBHZbLAZgTTCqou4mwj8=
 github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I=
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
@@ -36,12 +42,14 @@ github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 h1:tlDMEdcPRQKBE
 github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1/go.mod h1:4RfsapbGx2j/vU5xC/5/9qB3kn9Awp1YDiEnN43QrJ4=
 github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 h1:fuGucgPk5dN6wzfnxl3D0D3rVLw4v2SbBT9jb4VnxzA=
 github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010/go.mod h1:JtBcj7sBuTTRupn7c2bFspMDIObMJsVK8TeUvpShPok=
+github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
+github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
 github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
-github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
-github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+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/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=
@@ -59,8 +67,8 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
 github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
 github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
-github.com/gofrs/uuid/v5 v5.3.0 h1:m0mUMr+oVYUdxpMLgSYCZiXe7PuVPnI94+OMeVBNedk=
-github.com/gofrs/uuid/v5 v5.3.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
+github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@@ -76,16 +84,20 @@ 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-20240812123929-b105c29bd1b5 h1:GkMacU5ftc+IEg1449N3UEy2XLDz58W4fkrRu2fibb8=
-github.com/insomniacslk/dhcp v0.0.0-20240812123929-b105c29bd1b5/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
+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/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/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.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
 github.com/klauspost/cpuid/v2 v2.2.8/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=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
@@ -96,38 +108,32 @@ 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/bbolt v0.0.0-20240822011022-aed6d4850399 h1:oBowHVKZycNtAFbZ6avaCSZJYeme2Nrj+4RpV2cNJig=
-github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399/go.mod h1:4xcieuIK+M4bGQmQYZVqEaIYqjS1ahO4kXG7EmDgEro=
-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.47.1-0.20240909010619-6b38f24bfcc4 h1:CgdUBRxmNlxEGkp35HwvgQ10jwOOUJKWdOxpi8yWi8o=
-github.com/metacubex/quic-go v0.47.1-0.20240909010619-6b38f24bfcc4/go.mod h1:Y7yRGqFE6UQL/3aKPYmiYdjfVkeujJaStP4+jiZMcN8=
+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/sing v0.0.0-20240724044459-6f3cf5896297 h1:YG/JkwGPbca5rUtEMHIu8ZuqzR7BSVm1iqY8hNoMeMA=
-github.com/metacubex/sing v0.0.0-20240724044459-6f3cf5896297/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
-github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4 h1:HobpULaPK6OoxrHMmgcwLkwwIduXVmwdcznwUfH1GQM=
-github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8=
-github.com/metacubex/sing-shadowsocks v0.2.8 h1:wIhlaigswzjPw4hej75sEvWte3QR0+AJRafgwBHO5B4=
-github.com/metacubex/sing-shadowsocks v0.2.8/go.mod h1:X3x88XtJpBxG0W0/ECOJL6Ib0SJ3xdniAkU/6/RMWU0=
-github.com/metacubex/sing-shadowsocks2 v0.2.2 h1:eaf42uVx4Lr21S6MDYs0ZdTvGA0GEhDpb9no4+gdXPo=
-github.com/metacubex/sing-shadowsocks2 v0.2.2/go.mod h1:BhOug03a/RbI7y6hp6q+6ITM1dXjnLTmeWBHSTwvv2Q=
-github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1 h1:ypfofGDZbP8p3Y4P/m74JYu7sQViesi3c8nbmT6cS0Y=
-github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1/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-20240826061955-1e4e67afe5cd h1:r7alry8u4qlUFLNMwGvG1A8ZcfPM6AMSmrm6E2yKdB4=
-github.com/metacubex/sing-wireguard v0.0.0-20240826061955-1e4e67afe5cd/go.mod h1:uY+BYb0UEknLrqvbGcwi9i++KgrKxsurysgI6G1Pveo=
-github.com/metacubex/tfo-go v0.0.0-20240830120620-c5e019b67785 h1:NNmI+ZV0DzNuqaAInRQuZFLHlWVuyHeow8jYpdKjHjo=
-github.com/metacubex/tfo-go v0.0.0-20240830120620-c5e019b67785/go.mod h1:c7bVFM9f5+VzeZ/6Kg77T/jrg1Xp8QpqlSHvG/aXVts=
+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.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.20240627012306-9d1f5fc0b45e h1:o+zohxPRo45P35fS9u1zfdBgr+L/7S0ObGU6YjbVBIc=
+github.com/metacubex/sing-tun v0.2.7-0.20240627012306-9d1f5fc0b45e/go.mod h1:WwJGbCx7bQcBzuQXiDOJvZH27R0kIjKNNlISIWsL6kM=
+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-20240618022557-a6efaa37127a h1:NpSGclHJUYndUwBmyIpFBSoBVg8PoVX7QQKhYg0DjM0=
+github.com/metacubex/sing-wireguard v0.0.0-20240618022557-a6efaa37127a/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.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
-github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
+github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
+github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
 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=
@@ -150,18 +156,23 @@ 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.4.0 h1:DuVBAdXuGFHv8adVXjWWZ63pJq+NRXOWVXlKDBZ+mJ4=
-github.com/puzpuzpuz/xsync/v3 v3.4.0/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/puzpuzpuz/xsync/v3 v3.2.0 h1:9AzuUeF88YC5bK8u2vEG1Fpvu4wgpM1wfPIExfaaDxQ=
+github.com/puzpuzpuz/xsync/v3 v3.2.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=
 github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
-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/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+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/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/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
+github.com/sagernet/sing v0.5.0-alpha.10 h1:kuHl10gpjbKQAdQfyogQU3u0CVnpqC3wrAHe/+BFaXc=
+github.com/sagernet/sing v0.5.0-alpha.10/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
 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=
@@ -170,8 +181,8 @@ github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxe
 github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7/go.mod h1:FP9X2xjT/Az1EsG/orYYoC+5MojWnuI7hrffz8fGwwo=
 github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e h1:iGH0RMv2FzELOFNFQtvsxH7NPmlo7X5JizEK51UCojo=
 github.com/sagernet/wireguard-go v0.0.0-20231209092712-9a439356a62e/go.mod h1:YbL4TKHRR6APYQv3U2RGfwLDpPYSyWz6oUlpISBEzBE=
-github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
-github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
+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/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
@@ -187,15 +198,9 @@ github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e/go.mod h1:+e
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0 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=
@@ -213,8 +218,6 @@ github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/
 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=
 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=
@@ -223,21 +226,21 @@ 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.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
-golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
-golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI=
-golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
+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/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.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
-golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+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/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.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+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/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -253,19 +256,19 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
-golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
+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/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+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/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.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
-golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
+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/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=

core/hub.go

@@ -5,55 +5,38 @@ package main
 */
 import "C"
 import (
-	"context"
 	bridge "core/dart-bridge"
 	"encoding/json"
 	"fmt"
-	"github.com/metacubex/mihomo/common/utils"
-	"os"
-	"runtime"
-	"sort"
-	"sync"
-	"time"
-	"unsafe"
-
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/outboundgroup"
 	"github.com/metacubex/mihomo/adapter/provider"
-	"github.com/metacubex/mihomo/component/updater"
+	"github.com/metacubex/mihomo/common/structure"
+	"github.com/metacubex/mihomo/common/utils"
+	"github.com/metacubex/mihomo/component/geodata"
+	"github.com/metacubex/mihomo/component/mmdb"
 	"github.com/metacubex/mihomo/config"
 	"github.com/metacubex/mihomo/constant"
 	cp "github.com/metacubex/mihomo/constant/provider"
 	"github.com/metacubex/mihomo/hub/executor"
 	"github.com/metacubex/mihomo/log"
+	rp "github.com/metacubex/mihomo/rules/provider"
 	"github.com/metacubex/mihomo/tunnel"
 	"github.com/metacubex/mihomo/tunnel/statistic"
+	"golang.org/x/net/context"
+	"os"
+	"runtime"
+	"time"
+	"unsafe"
 )
 
-var currentRawConfig = config.DefaultRawConfig()
+var currentConfig = config.DefaultRawConfig()
 
 var configParams = ConfigExtendedParams{}
 
-var externalProviders = map[string]cp.Provider{}
-
 var isInit = false
 
-//export start
-func start() {
-	runLock.Lock()
-	defer runLock.Unlock()
-	isRunning = true
-}
-
-//export stop
-func stop() {
-	runLock.Lock()
-	go func() {
-		defer runLock.Unlock()
-		isRunning = false
-		stopListeners()
-	}()
-}
+var currentProfileName = ""
 
 //export initClash
 func initClash(homeDirStr *C.char) bool {
@@ -78,10 +61,10 @@ func restartClash() bool {
 
 //export shutdownClash
 func shutdownClash() bool {
-	stopListeners()
 	executor.Shutdown()
 	runtime.GC()
 	isInit = false
+	currentConfig = nil
 	return true
 }
 
@@ -93,6 +76,16 @@ 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)
@@ -107,15 +100,11 @@ func validateConfig(s *C.char, port C.longlong) {
 	}()
 }
 
-var updateLock sync.Mutex
-
 //export updateConfig
 func updateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
 	paramsString := C.GoString(s)
 	go func() {
-		updateLock.Lock()
-		defer updateLock.Unlock()
 		var params = &GenerateConfigParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
@@ -123,23 +112,43 @@ func updateConfig(s *C.char, port C.longlong) {
 			return
 		}
 		configParams = params.Params
-		prof := decorationConfig(params.ProfileId, params.Config)
-		currentRawConfig = prof
-		err = applyConfig()
-		if err != nil {
-			bridge.SendToPort(i, err.Error())
-			return
-		}
+		prof := decorationConfig(params.ProfilePath, params.Config)
+		currentConfig = prof
+		applyConfig()
 		bridge.SendToPort(i, "")
 	}()
 }
 
 //export clearEffect
 func clearEffect(s *C.char) {
-	id := C.GoString(s)
+	path := C.GoString(s)
 	go func() {
-		_ = removeFile(getProfilePath(id))
-		_ = removeFile(getProfileProvidersPath(id))
+		rawCfg := getRawConfigWithPath(&path)
+		for _, mapping := range rawCfg.RuleProvider {
+			schema := &ruleProviderSchema{}
+			decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
+			if err := decoder.Decode(mapping, schema); err != nil {
+				return
+			}
+			if schema.Type == "http" {
+				_ = removeFile(constant.Path.Resolve(schema.Path))
+			}
+		}
+		for _, mapping := range rawCfg.ProxyProvider {
+			schema := &proxyProviderSchema{
+				HealthCheck: healthCheckSchema{
+					Lazy: true,
+				},
+			}
+			decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
+			if err := decoder.Decode(mapping, schema); err != nil {
+				return
+			}
+			if schema.Type == "http" {
+				_ = removeFile(constant.Path.Resolve(schema.Path))
+			}
+		}
+		_ = removeFile(path)
 	}()
 }
 
@@ -155,36 +164,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
-	}
-	if proxyName == "" {
-		selector.ForceSet(proxyName)
-	} else {
+	go func() {
+		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.Selector)
+		if !ok {
+			return
+		}
+
 		err = selector.Set(proxyName)
-	}
-	if err == nil {
-		log.Infoln("[SelectAble] %s selected %s", groupName, proxyName)
-	}
+		if err == nil {
+			log.Infoln("[Selector] %s selected %s", groupName, proxyName)
+		}
+	}()
 }
 
 //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,
@@ -199,7 +207,7 @@ func getTraffic() *C.char {
 
 //export getTotalTraffic
 func getTotalTraffic() *C.char {
-	up, down := statistic.DefaultManager.Total(state.OnlyProxy)
+	up, down := statistic.DefaultManager.Total()
 	traffic := map[string]int64{
 		"up":   up,
 		"down": down,
@@ -221,18 +229,16 @@ func resetTraffic() {
 func asyncTestDelay(s *C.char, port C.longlong) {
 	i := int64(port)
 	paramsString := C.GoString(s)
-	b.Go(paramsString, func() (bool, error) {
+	go func() {
 		var params = &TestDelayParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
-			bridge.SendToPort(i, "")
-			return false, nil
+			return
 		}
 
 		expectedStatus, err := utils.NewUnsignedRanges[uint16]("")
 		if err != nil {
-			bridge.SendToPort(i, "")
-			return false, nil
+			return
 		}
 
 		ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(params.Timeout))
@@ -249,7 +255,7 @@ func asyncTestDelay(s *C.char, port C.longlong) {
 			delayData.Value = -1
 			data, _ := json.Marshal(delayData)
 			bridge.SendToPort(i, string(data))
-			return false, nil
+			return
 		}
 
 		delay, err := proxy.URLTest(ctx, constant.DefaultTestURL, expectedStatus)
@@ -257,14 +263,14 @@ func asyncTestDelay(s *C.char, port C.longlong) {
 			delayData.Value = -1
 			data, _ := json.Marshal(delayData)
 			bridge.SendToPort(i, string(data))
-			return false, nil
+			return
 		}
 
 		delayData.Value = int32(delay)
 		data, _ := json.Marshal(delayData)
 		bridge.SendToPort(i, string(data))
-		return false, nil
-	})
+		return
+	}()
 }
 
 //export getVersionInfo
@@ -293,7 +299,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 {
@@ -301,16 +307,17 @@ 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
@@ -338,68 +345,78 @@ func getProvider(name *C.char) *C.char {
 
 //export getExternalProviders
 func getExternalProviders() *C.char {
-	eps := make([]ExternalProvider, 0)
-	for _, p := range externalProviders {
-		externalProvider, err := toExternalProvider(p)
-		if err != nil {
-			continue
+	externalProviders := make([]ExternalProvider, 0)
+	providers := tunnel.Providers()
+	for n, p := range providers {
+		if p.VehicleType() != cp.Compatible {
+			p := p.(*provider.ProxySetProvider)
+			externalProviders = append(externalProviders, ExternalProvider{
+				Name:        n,
+				Type:        p.Type().String(),
+				VehicleType: p.VehicleType().String(),
+				UpdateAt:    p.UpdatedAt,
+			})
 		}
-		eps = append(eps, *externalProvider)
 	}
-	sort.Sort(ExternalProviders(eps))
-	data, err := json.Marshal(eps)
+	for n, p := range tunnel.RuleProviders() {
+		if p.VehicleType() != cp.Compatible {
+			p := p.(*rp.RuleSetProvider)
+			externalProviders = append(externalProviders, ExternalProvider{
+				Name:        n,
+				Type:        p.Type().String(),
+				VehicleType: p.VehicleType().String(),
+				UpdateAt:    p.UpdatedAt,
+			})
+		}
+	}
+	data, err := json.Marshal(externalProviders)
 	if err != nil {
 		return C.CString("")
 	}
 	return C.CString(string(data))
 }
 
-//export getExternalProvider
-func getExternalProvider(name *C.char) *C.char {
-	externalProviderName := C.GoString(name)
-	externalProvider, exist := externalProviders[externalProviderName]
-	if !exist {
-		return C.CString("")
-	}
-	e, err := toExternalProvider(externalProvider)
-	if err != nil {
-		return C.CString("")
-	}
-	data, err := json.Marshal(e)
-	if err != nil {
-		return C.CString("")
-	}
-	return C.CString(string(data))
-}
-
-//export updateGeoData
-func updateGeoData(geoType *C.char, geoName *C.char, port C.longlong) {
+//export updateExternalProvider
+func updateExternalProvider(providerName *C.char, providerType *C.char, port C.longlong) {
 	i := int64(port)
-	geoTypeString := C.GoString(geoType)
-	geoNameString := C.GoString(geoName)
+	providerNameString := C.GoString(providerName)
+	providerTypeString := C.GoString(providerType)
 	go func() {
-		path := constant.Path.Resolve(geoNameString)
-		switch geoTypeString {
+		switch providerTypeString {
+		case "Proxy":
+			providers := tunnel.Providers()
+			err := providers[providerNameString].Update()
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
+		case "Rule":
+			providers := tunnel.RuleProviders()
+			err := providers[providerNameString].Update()
+			if err != nil {
+				bridge.SendToPort(i, err.Error())
+				return
+			}
 		case "MMDB":
-			err := updater.UpdateMMDBWithPath(path)
+			err := mmdb.DownloadMMDB(constant.Path.Resolve(providerNameString))
 			if err != nil {
 				bridge.SendToPort(i, err.Error())
 				return
 			}
 		case "ASN":
-			err := updater.UpdateASNWithPath(path)
+			err := mmdb.DownloadASN(constant.Path.Resolve(providerNameString))
 			if err != nil {
 				bridge.SendToPort(i, err.Error())
 				return
 			}
 		case "GeoIp":
-			err := updater.UpdateGeoIpWithPath(path)
+			err := geodata.DownloadGeoIP(constant.Path.Resolve(providerNameString))
 			if err != nil {
 				bridge.SendToPort(i, err.Error())
 				return
 			}
 		case "GeoSite":
-			err := updater.UpdateGeoSiteWithPath(path)
+			err := geodata.DownloadGeoSite(constant.Path.Resolve(providerNameString))
 			if err != nil {
 				bridge.SendToPort(i, err.Error())
 				return
@@ -409,45 +426,6 @@ func updateGeoData(geoType *C.char, geoName *C.char, port C.longlong) {
 	}()
 }
 
-//export updateExternalProvider
-func updateExternalProvider(providerName *C.char, port C.longlong) {
-	i := int64(port)
-	providerNameString := C.GoString(providerName)
-	go func() {
-		externalProvider, exist := externalProviders[providerNameString]
-		if !exist {
-			bridge.SendToPort(i, "external provider is not exist")
-			return
-		}
-		err := externalProvider.Update()
-		if err != nil {
-			bridge.SendToPort(i, err.Error())
-			return
-		}
-		bridge.SendToPort(i, "")
-	}()
-}
-
-//export sideLoadExternalProvider
-func sideLoadExternalProvider(providerName *C.char, data *C.char, port C.longlong) {
-	i := int64(port)
-	bytes := []byte(C.GoString(data))
-	providerNameString := C.GoString(providerName)
-	go func() {
-		externalProvider, exist := externalProviders[providerNameString]
-		if !exist {
-			bridge.SendToPort(i, "external provider is not exist")
-			return
-		}
-		err := sideUpdateExternalProvider(externalProvider, bytes)
-		if err != nil {
-			bridge.SendToPort(i, err.Error())
-			return
-		}
-		bridge.SendToPort(i, "")
-	}()
-}
-
 //export initNativeApiBridge
 func initNativeApiBridge(api unsafe.Pointer) {
 	bridge.InitDartApi(api)
@@ -485,7 +463,7 @@ func init() {
 			Data: c,
 		})
 	}
-	executor.DefaultProviderLoadedHook = func(providerName string) {
+	executor.DefaultProxyProviderLoadedHook = func(providerName string) {
 		SendMessage(Message{
 			Type: LoadedMessage,
 			Data: providerName,

core/status.go

@@ -1,3 +1,5 @@
+//go:build android
+
 package main
 
 import "C"
@@ -14,24 +16,16 @@ type AccessControl struct {
 }
 
 type AndroidProps struct {
-	Enable        bool           `json:"enable"`
 	AccessControl *AccessControl `json:"accessControl"`
 	AllowBypass   bool           `json:"allowBypass"`
 	SystemProxy   bool           `json:"systemProxy"`
 }
 
-type State struct {
-	AndroidProps
-	CurrentProfileName string `json:"currentProfileName"`
-	MixedPort          int    `json:"mixedPort"`
-	OnlyProxy          bool   `json:"onlyProxy"`
-}
+var androidProps AndroidProps
 
-var state State
-
-//export getState
-func getState() *C.char {
-	data, err := json.Marshal(state)
+//export getAndroidProps
+func getAndroidProps() *C.char {
+	data, err := json.Marshal(androidProps)
 	if err != nil {
 		fmt.Println("Error:", err)
 		return C.CString("")
@@ -39,10 +33,10 @@ func getState() *C.char {
 	return C.CString(string(data))
 }
 
-//export setState
-func setState(s *C.char) {
+//export setAndroidProps
+func setAndroidProps(s *C.char) {
 	paramsString := C.GoString(s)
-	err := json.Unmarshal([]byte(paramsString), &state)
+	err := json.Unmarshal([]byte(paramsString), &androidProps)
 	if err != nil {
 		return
 	}

core/tun.go

@@ -6,20 +6,19 @@ import "C"
 import (
 	"core/platform"
 	t "core/tun"
-	"encoding/json"
 	"errors"
-	"github.com/metacubex/mihomo/listener/sing_tun"
+	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/log"
+	"golang.org/x/sync/semaphore"
 	"strconv"
 	"sync"
 	"sync/atomic"
 	"syscall"
 	"time"
-
-	"github.com/metacubex/mihomo/component/dialer"
-	"github.com/metacubex/mihomo/log"
 )
 
 var tunLock sync.Mutex
+var tun *t.Tun
 var runTime *time.Time
 
 type FdMap struct {
@@ -35,49 +34,38 @@ func (cm *FdMap) Load(key int64) bool {
 	return ok
 }
 
-var (
-	tunListener *sing_tun.Listener
-	fdMap       FdMap
-	fdCounter   int64 = 0
-)
+var fdMap FdMap
 
 //export startTUN
-func startTUN(s *C.char, port C.longlong) {
+func startTUN(fd C.int, port C.longlong) {
 	i := int64(port)
 	ServicePort = i
-	paramsString := C.GoString(s)
-	if paramsString == "" {
-		tunLock.Lock()
-		defer tunLock.Unlock()
-		now := time.Now()
-		runTime = &now
-		SendMessage(Message{
-			Type: StartedMessage,
-			Data: strconv.FormatInt(runTime.UnixMilli(), 10),
-		})
-		return
-	}
-	initSocketHook()
 	go func() {
 		tunLock.Lock()
 		defer tunLock.Unlock()
 
-		var tunProps = &t.Props{}
-		err := json.Unmarshal([]byte(paramsString), tunProps)
+		if tun != nil {
+			tun.Close()
+			tun = nil
+		}
+
+		f := int(fd)
+		gateway := "172.16.0.1/30"
+		portal := "172.16.0.2"
+		dns := "0.0.0.0"
+
+		tempTun := &t.Tun{Closed: false, Limit: semaphore.NewWeighted(4)}
+
+		closer, err := t.Start(f, gateway, portal, dns)
+
 		if err != nil {
 			log.Errorln("startTUN error: %v", err)
-			return
+			tempTun.Close()
 		}
 
-		tunListener, err = t.Start(*tunProps)
+		tempTun.Closer = closer
 
-		if err != nil {
-			return
-		}
-
-		if tunListener != nil {
-			log.Infoln("TUN address: %v", tunListener.Address())
-		}
+		tun = tempTun
 
 		now := time.Now()
 
@@ -100,15 +88,15 @@ func getRunTime() *C.char {
 
 //export stopTun
 func stopTun() {
-	removeSocketHook()
 	go func() {
 		tunLock.Lock()
 		defer tunLock.Unlock()
 
 		runTime = nil
 
-		if tunListener != nil {
-			_ = tunListener.Close()
+		if tun != nil {
+			tun.Close()
+			tun = nil
 		}
 	}()
 }
@@ -135,12 +123,18 @@ func markSocket(fd Fd) {
 	})
 }
 
-func initSocketHook() {
+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)
@@ -165,7 +159,3 @@ func initSocketHook() {
 		})
 	}
 }
-
-func removeSocketHook() {
-	dialer.DefaultSocketHook = nil
-}

core/tun/dns.go

@@ -0,0 +1,33 @@
+//go:build android
+
+package tun
+
+import (
+	"github.com/metacubex/mihomo/dns"
+	D "github.com/miekg/dns"
+	"net"
+)
+
+func shouldHijackDns(dns net.IP, target net.IP, targetPort int) bool {
+	if targetPort != 53 {
+		return false
+	}
+
+	return net.IPv4zero.Equal(dns) || target.Equal(dns)
+}
+
+func relayDns(payload []byte) ([]byte, error) {
+	msg := &D.Msg{}
+	if err := msg.Unpack(payload); err != nil {
+		return nil, err
+	}
+
+	r, err := dns.ServeDNSWithDefaultServer(msg)
+	if err != nil {
+		return nil, err
+	}
+
+	r.SetRcode(msg, r.Rcode)
+
+	return r.Pack()
+}

core/tun/tcp.go

@@ -0,0 +1,20 @@
+//go:build android
+
+package tun
+
+import (
+	"github.com/metacubex/mihomo/constant"
+	"net"
+)
+
+func createMetadata(lAddr, rAddr *net.TCPAddr) *constant.Metadata {
+	return &constant.Metadata{
+		NetWork: constant.TCP,
+		Type:    constant.SOCKS5,
+		SrcIP:   lAddr.AddrPort().Addr(),
+		DstIP:   rAddr.AddrPort().Addr(),
+		SrcPort: uint16(lAddr.Port),
+		DstPort: uint16(rAddr.Port),
+		Host:    "",
+	}
+}

core/tun/tun.go

@@ -4,65 +4,183 @@ package tun
 
 import "C"
 import (
+	"context"
+	"encoding/binary"
+	"github.com/Kr328/tun2socket"
+	"github.com/Kr328/tun2socket/nat"
+	"github.com/metacubex/mihomo/adapter/inbound"
+	"github.com/metacubex/mihomo/common/pool"
 	"github.com/metacubex/mihomo/constant"
-	LC "github.com/metacubex/mihomo/listener/config"
-	"github.com/metacubex/mihomo/listener/sing_tun"
 	"github.com/metacubex/mihomo/log"
+	"github.com/metacubex/mihomo/transport/socks5"
 	"github.com/metacubex/mihomo/tunnel"
+	"golang.org/x/sync/semaphore"
+	"io"
 	"net"
-	"net/netip"
+	"os"
+	"time"
 )
 
-type Props struct {
-	Fd       int    `json:"fd"`
-	Gateway  string `json:"gateway"`
-	Gateway6 string `json:"gateway6"`
-	Portal   string `json:"portal"`
-	Portal6  string `json:"portal6"`
-	Dns      string `json:"dns"`
-	Dns6     string `json:"dns6"`
+type Tun struct {
+	Closer io.Closer
+
+	Closed bool
+	Limit  *semaphore.Weighted
 }
 
-func Start(tunProps Props) (*sing_tun.Listener, error) {
-	var prefix4 []netip.Prefix
-	tempPrefix4, err := netip.ParsePrefix(tunProps.Gateway)
-	if err != nil {
-		log.Errorln("startTUN error:", err)
-		return nil, err
+func (t *Tun) Close() {
+	_ = t.Limit.Acquire(context.TODO(), 4)
+	defer t.Limit.Release(4)
+
+	t.Closed = true
+
+	if t.Closer != nil {
+		_ = t.Closer.Close()
 	}
-	prefix4 = append(prefix4, tempPrefix4)
-
-	var prefix6 []netip.Prefix
-	tempPrefix6, err := netip.ParsePrefix(tunProps.Gateway6)
-	if err != nil {
-		log.Errorln("startTUN error:", err)
-		return nil, err
-	}
-	prefix6 = append(prefix6, tempPrefix6)
-
-	var dnsHijack []string
-	dnsHijack = append(dnsHijack, net.JoinHostPort(tunProps.Dns, "53"))
-	dnsHijack = append(dnsHijack, net.JoinHostPort(tunProps.Dns6, "53"))
-
-	options := LC.Tun{
-		Enable:              true,
-		Device:              sing_tun.InterfaceName,
-		Stack:               constant.TunSystem,
-		DNSHijack:           dnsHijack,
-		AutoRoute:           false,
-		AutoDetectInterface: false,
-		Inet4Address:        prefix4,
-		Inet6Address:        prefix6,
-		MTU:                 9000,
-		FileDescriptor:      tunProps.Fd,
-	}
-
-	listener, err := sing_tun.New(options, tunnel.Tunnel)
-
-	if err != nil {
-		log.Errorln("startTUN error:", err)
-		return nil, err
-	}
-
-	return listener, nil
+}
+
+var _, ipv4LoopBack, _ = net.ParseCIDR("127.0.0.0/8")
+
+func Start(fd int, gateway, portal, dns string) (io.Closer, error) {
+	device := os.NewFile(uintptr(fd), "/dev/tun")
+	ip, network, err := net.ParseCIDR(gateway)
+	if err != nil {
+		panic(err.Error())
+	} else {
+		network.IP = ip
+	}
+	stack, err := tun2socket.StartTun2Socket(device, network, net.ParseIP(portal))
+
+	if err != nil {
+		_ = device.Close()
+		return nil, err
+	}
+
+	dnsAddr := net.ParseIP(dns)
+
+	tcp := func() {
+		defer func(tcp *nat.TCP) {
+			_ = tcp.Close()
+		}(stack.TCP())
+		defer log.Debugln("TCP: closed")
+
+		for stack.TCP().SetDeadline(time.Time{}) == nil {
+			conn, err := stack.TCP().Accept()
+			if err != nil {
+				log.Errorln("Accept connection: %v", err)
+				continue
+			}
+			lAddr := conn.LocalAddr().(*net.TCPAddr)
+			rAddr := conn.RemoteAddr().(*net.TCPAddr)
+
+			if ipv4LoopBack.Contains(rAddr.IP) {
+				_ = conn.Close()
+
+				continue
+			}
+
+			if shouldHijackDns(dnsAddr, rAddr.IP, rAddr.Port) {
+				go func() {
+					defer func(conn net.Conn) {
+						_ = conn.Close()
+					}(conn)
+
+					buf := pool.Get(pool.UDPBufferSize)
+					defer func(buf []byte) {
+						_ = pool.Put(buf)
+					}(buf)
+
+					for {
+						_ = conn.SetReadDeadline(time.Now().Add(constant.DefaultTCPTimeout))
+
+						length := uint16(0)
+						if err := binary.Read(conn, binary.BigEndian, &length); err != nil {
+							return
+						}
+
+						if int(length) > len(buf) {
+							return
+						}
+
+						n, err := conn.Read(buf[:length])
+						if err != nil {
+							return
+						}
+
+						msg, err := relayDns(buf[:n])
+						if err != nil {
+							return
+						}
+
+						_, _ = conn.Write(msg)
+					}
+				}()
+
+				continue
+			}
+
+			go tunnel.Tunnel.HandleTCPConn(conn, createMetadata(lAddr, rAddr))
+		}
+	}
+
+	udp := func() {
+		defer func(udp *nat.UDP) {
+			_ = udp.Close()
+		}(stack.UDP())
+		defer log.Debugln("UDP: closed")
+
+		for {
+			buf := pool.Get(pool.UDPBufferSize)
+
+			n, lRAddr, rRAddr, err := stack.UDP().ReadFrom(buf)
+			if err != nil {
+				return
+			}
+
+			raw := buf[:n]
+			lAddr := lRAddr.(*net.UDPAddr)
+			rAddr := rRAddr.(*net.UDPAddr)
+
+			if ipv4LoopBack.Contains(rAddr.IP) {
+				_ = pool.Put(buf)
+
+				continue
+			}
+
+			if shouldHijackDns(dnsAddr, rAddr.IP, rAddr.Port) {
+				go func() {
+					defer func(buf []byte) {
+						_ = pool.Put(buf)
+					}(buf)
+
+					msg, err := relayDns(raw)
+					if err != nil {
+						return
+					}
+
+					_, _ = stack.UDP().WriteTo(msg, rAddr, lAddr)
+				}()
+
+				continue
+			}
+
+			pkt := &packet{
+				local: lAddr,
+				data:  raw,
+				writeBack: func(b []byte, addr net.Addr) (int, error) {
+					return stack.UDP().WriteTo(b, addr, lAddr)
+				},
+				drop: func() {
+					_ = pool.Put(buf)
+				},
+			}
+
+			tunnel.Tunnel.HandleUDPPacket(inbound.NewPacket(socks5.ParseAddrToSocksAddr(rAddr), pkt, constant.SOCKS5))
+		}
+	}
+
+	go tcp()
+	go udp()
+
+	return stack, nil
 }

core/tun/udp.go

@@ -0,0 +1,28 @@
+//go:build android
+
+package tun
+
+import "net"
+
+type packet struct {
+	local     *net.UDPAddr
+	data      []byte
+	writeBack func(b []byte, addr net.Addr) (int, error)
+	drop      func()
+}
+
+func (pkt *packet) Data() []byte {
+	return pkt.data
+}
+
+func (pkt *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) {
+	return pkt.writeBack(b, addr)
+}
+
+func (pkt *packet) Drop() {
+	pkt.drop()
+}
+
+func (pkt *packet) LocalAddr() net.Addr {
+	return pkt.local
+}

lib/application.dart

@@ -1,12 +1,10 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:fl_clash/l10n/l10n.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/manager/hotkey_manager.dart';
-import 'package:fl_clash/manager/manager.dart';
 import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:provider/provider.dart';
@@ -54,7 +52,6 @@ class Application extends StatefulWidget {
 
 class ApplicationState extends State<Application> {
   late SystemColorSchemes systemColorSchemes;
-  Timer? timer;
 
   final _pageTransitionsTheme = const PageTransitionsTheme(
     builders: <TargetPlatform, PageTransitionsBuilder>{
@@ -83,7 +80,6 @@ class ApplicationState extends State<Application> {
   @override
   void initState() {
     super.initState();
-    _initTimer();
     globalState.appController = AppController(context);
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
       final currentContext = globalState.navigatorKey.currentContext;
@@ -92,55 +88,25 @@ class ApplicationState extends State<Application> {
       }
       await globalState.appController.init();
       globalState.appController.initLink();
+      _updateGroups();
     });
   }
 
-  _initTimer() {
-    _cancelTimer();
-    timer = Timer.periodic(const Duration(milliseconds: 20000), (_) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        globalState.appController.updateGroupDebounce();
-      });
-    });
-  }
-
-  _cancelTimer() {
-    if (timer != null) {
-      timer?.cancel();
-      timer = null;
-    }
-  }
-
   _buildApp(Widget app) {
     if (system.isDesktop) {
-      return WindowManager(
-        child: TrayManager(
-          child: HotKeyManager(
-            child: ProxyManager(
-              child: app,
-            ),
-          ),
+      return WindowContainer(
+        child: TrayContainer(
+          child: app,
         ),
       );
     }
-    return AndroidManager(
-      child: TileManager(
+    return AndroidContainer(
+      child: TileContainer(
         child: app,
       ),
     );
   }
 
-  _buildPage(Widget page) {
-    if (system.isDesktop) {
-      return WindowHeaderContainer(
-        child: page,
-      );
-    }
-    return VpnManager(
-      child: page,
-    );
-  }
-
   _updateSystemColorSchemes(
     ColorScheme? lightDynamic,
     ColorScheme? darkDynamic,
@@ -154,66 +120,76 @@ class ApplicationState extends State<Application> {
     });
   }
 
+  _updateGroups() {
+    if (globalState.groupsUpdateTimer != null) {
+      globalState.groupsUpdateTimer?.cancel();
+      globalState.groupsUpdateTimer = null;
+    }
+    globalState.groupsUpdateTimer ??= Timer.periodic(
+      httpTimeoutDuration,
+      (timer) async {
+        await globalState.appController.updateGroups();
+      },
+    );
+  }
+
   @override
   Widget build(context) {
-    return _buildApp(
-      AppStateManager(
-        child: ClashManager(
-          child: Selector2<AppState, Config, ApplicationSelectorState>(
-            selector: (_, appState, config) => ApplicationSelectorState(
-              locale: config.locale,
-              themeMode: config.themeMode,
-              primaryColor: config.primaryColor,
-              prueBlack: config.prueBlack,
-            ),
-            builder: (_, state, child) {
-              return DynamicColorBuilder(
-                builder: (lightDynamic, darkDynamic) {
-                  _updateSystemColorSchemes(lightDynamic, darkDynamic);
-                  return MaterialApp(
-                    navigatorKey: globalState.navigatorKey,
-                    localizationsDelegates: const [
-                      AppLocalizations.delegate,
-                      GlobalMaterialLocalizations.delegate,
-                      GlobalCupertinoLocalizations.delegate,
-                      GlobalWidgetsLocalizations.delegate
-                    ],
-                    builder: (_, child) {
-                      return MediaManager(
-                        child: _buildPage(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,
-                      ).toPrueBlack(state.prueBlack),
-                    ),
-                    home: child,
-                  );
-                },
-              );
-            },
-            child: const HomePage(),
+    return AppStateContainer(
+      child: ClashMessageContainer(
+        child: 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(
+                  debugShowCheckedModeBanner: false,
+                  navigatorKey: globalState.navigatorKey,
+                  localizationsDelegates: const [
+                    AppLocalizations.delegate,
+                    GlobalMaterialLocalizations.delegate,
+                    GlobalCupertinoLocalizations.delegate,
+                    GlobalWidgetsLocalizations.delegate
+                  ],
+                  builder: (_, child) {
+                    return PopContainer(
+                      child: _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(),
         ),
       ),
     );
@@ -224,6 +200,5 @@ class ApplicationState extends State<Application> {
     linkManager.destroy();
     await globalState.appController.savePreferences();
     super.dispose();
-    _cancelTimer();
   }
 }

lib/clash/core.dart

@@ -100,6 +100,22 @@ class ClashCore {
     );
   }
 
+  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();
@@ -112,7 +128,8 @@ class ClashCore {
         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) {
@@ -125,11 +142,7 @@ class ClashCore {
             .toList();
         return group;
       }).toList();
-      return groupsRaw
-          .map(
-            (e) => Group.fromJson(e),
-          )
-          .toList();
+      return groupsRaw.map((e) => Group.fromJson(e)).toList();
     });
   }
 
@@ -149,69 +162,9 @@ class ClashCore {
     });
   }
 
-  ExternalProvider? getExternalProvider(String externalProviderName) {
-    final externalProviderNameChar =
-        externalProviderName.toNativeUtf8().cast<Char>();
-    final externalProviderRaw =
-        clashFFI.getExternalProvider(externalProviderNameChar);
-    malloc.free(externalProviderNameChar);
-    final externalProviderRawString =
-        externalProviderRaw.cast<Utf8>().toDartString();
-    clashFFI.freeCString(externalProviderRaw);
-    if (externalProviderRawString.isEmpty) return null;
-    return ExternalProvider.fromJson(json.decode(externalProviderRawString));
-  }
-
-  Future<String> updateGeoData({
-    required String geoType,
-    required String geoName,
-  }) {
-    final completer = Completer<String>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(message);
-        receiver.close();
-      }
-    });
-    final geoTypeChar = geoType.toNativeUtf8().cast<Char>();
-    final geoNameChar = geoName.toNativeUtf8().cast<Char>();
-    clashFFI.updateGeoData(
-      geoTypeChar,
-      geoNameChar,
-      receiver.sendPort.nativePort,
-    );
-    malloc.free(geoTypeChar);
-    malloc.free(geoNameChar);
-    return completer.future;
-  }
-
-  Future<String> sideLoadExternalProvider({
-    required String providerName,
-    required String data,
-  }) {
-    final completer = Completer<String>();
-    final receiver = ReceivePort();
-    receiver.listen((message) {
-      if (!completer.isCompleted) {
-        completer.complete(message);
-        receiver.close();
-      }
-    });
-    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
-    final dataChar = data.toNativeUtf8().cast<Char>();
-    clashFFI.sideLoadExternalProvider(
-      providerNameChar,
-      dataChar,
-      receiver.sendPort.nativePort,
-    );
-    malloc.free(providerNameChar);
-    malloc.free(dataChar);
-    return completer.future;
-  }
-
   Future<String> updateExternalProvider({
     required String providerName,
+    required String providerType,
   }) {
     final completer = Completer<String>();
     final receiver = ReceivePort();
@@ -222,11 +175,14 @@ class ClashCore {
       }
     });
     final providerNameChar = providerName.toNativeUtf8().cast<Char>();
+    final providerTypeChar = providerType.toNativeUtf8().cast<Char>();
     clashFFI.updateExternalProvider(
       providerNameChar,
+      providerTypeChar,
       receiver.sendPort.nativePort,
     );
     malloc.free(providerNameChar);
+    malloc.free(providerTypeChar);
     return completer.future;
   }
 
@@ -237,14 +193,6 @@ class ClashCore {
     malloc.free(paramsChar);
   }
 
-  start() {
-    clashFFI.start();
-  }
-
-  stop() {
-    clashFFI.stop();
-  }
-
   Future<Delay> getDelay(String proxyName) {
     final delayParams = {
       "proxy-name": proxyName,
@@ -265,13 +213,21 @@ class ClashCore {
       receiver.sendPort.nativePort,
     );
     malloc.free(delayParamsChar);
+    Future.delayed(httpTimeoutDuration + moreDuration, () {
+      receiver.close();
+      if (!completer.isCompleted) {
+        completer.complete(
+          Delay(name: proxyName, value: -1),
+        );
+      }
+    });
     return completer.future;
   }
 
-  clearEffect(String profileId) {
-    final profileIdChar = profileId.toNativeUtf8().cast<Char>();
-    clashFFI.clearEffect(profileIdChar);
-    malloc.free(profileIdChar);
+  clearEffect(String path) {
+    final pathChar = path.toNativeUtf8().cast<Char>();
+    clashFFI.clearEffect(pathChar);
+    malloc.free(pathChar);
   }
 
   VersionInfo getVersionInfo() {
@@ -281,19 +237,19 @@ class ClashCore {
     return VersionInfo.fromJson(versionInfo);
   }
 
-  setState(CoreState state) {
-    final stateChar = json.encode(state).toNativeUtf8().cast<Char>();
-    clashFFI.setState(stateChar);
-    malloc.free(stateChar);
+  setProps(Props props) {
+    final propsChar = json.encode(props).toNativeUtf8().cast<Char>();
+    clashFFI.setAndroidProps(propsChar);
+    malloc.free(propsChar);
   }
 
-  CoreState getState() {
-    final stateRaw = clashFFI.getState();
-    final state = json.decode(
-      stateRaw.cast<Utf8>().toDartString(),
+  Props getProps() {
+    final androidPropsRaw = clashFFI.getAndroidProps();
+    final androidProps = json.decode(
+      androidPropsRaw.cast<Utf8>().toDartString(),
     );
-    clashFFI.freeCString(stateRaw);
-    return CoreState.fromJson(state);
+    clashFFI.freeCString(androidPropsRaw);
+    return Props.fromJson(androidProps);
   }
 
   Traffic getTraffic() {
@@ -322,18 +278,9 @@ class ClashCore {
     clashFFI.stopLog();
   }
 
-  startTun(TunProps? tunProps, int port) {
+  startTun(int fd, int port) {
     if (!Platform.isAndroid) return;
-    final tunPropsChar = json.encode(tunProps).toNativeUtf8().cast<Char>();
-    clashFFI.startTUN(tunPropsChar, port);
-    malloc.free(tunPropsChar);
-  }
-
-  updateDns(String dns) {
-    if (!Platform.isAndroid) return;
-    final dnsChar = dns.toNativeUtf8().cast<Char>();
-    clashFFI.updateDns(dnsChar);
-    malloc.free(dnsChar);
+    clashFFI.startTUN(fd, port);
   }
 
   requestGc() {
@@ -372,15 +319,11 @@ class ClashCore {
     return connectionsRaw.map((e) => Connection.fromJson(e)).toList();
   }
 
-  closeConnection(String id) {
+  closeConnections(String id) {
     final idChar = id.toNativeUtf8().cast<Char>();
     clashFFI.closeConnection(idChar);
     malloc.free(idChar);
   }
-
-  closeConnections() {
-    clashFFI.closeConnections();
-  }
 }
 
 final clashCore = ClashCore();

lib/clash/generated/clash_ffi.dart

@@ -5144,22 +5144,6 @@ class ClashFFI {
   late final __FCmulcr =
       __FCmulcrPtr.asFunction<_Fcomplex Function(_Fcomplex, double)>();
 
-  void start() {
-    return _start();
-  }
-
-  late final _startPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function()>>('start');
-  late final _start = _startPtr.asFunction<void Function()>();
-
-  void stop() {
-    return _stop();
-  }
-
-  late final _stopPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function()>>('stop');
-  late final _stop = _stopPtr.asFunction<void Function()>();
-
   int initClash(
     ffi.Pointer<ffi.Char> homeDirStr,
   ) {
@@ -5206,6 +5190,30 @@ class ClashFFI {
       _lookup<ffi.NativeFunction<ffi.Void Function()>>('forceGc');
   late final _forceGc = _forceGcPtr.asFunction<void Function()>();
 
+  void setCurrentProfileName(
+    ffi.Pointer<ffi.Char> s,
+  ) {
+    return _setCurrentProfileName(
+      s,
+    );
+  }
+
+  late final _setCurrentProfileNamePtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
+          'setCurrentProfileName');
+  late final _setCurrentProfileName = _setCurrentProfileNamePtr
+      .asFunction<void Function(ffi.Pointer<ffi.Char>)>();
+
+  ffi.Pointer<ffi.Char> getCurrentProfileName() {
+    return _getCurrentProfileName();
+  }
+
+  late final _getCurrentProfileNamePtr =
+      _lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>(
+          'getCurrentProfileName');
+  late final _getCurrentProfileName =
+      _getCurrentProfileNamePtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
+
   void validateConfig(
     ffi.Pointer<ffi.Char> s,
     int port,
@@ -5264,20 +5272,6 @@ class ClashFFI {
   late final _getProxies =
       _getProxiesPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
 
-  void updateDns(
-    ffi.Pointer<ffi.Char> s,
-  ) {
-    return _updateDns(
-      s,
-    );
-  }
-
-  late final _updateDnsPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
-          'updateDns');
-  late final _updateDns =
-      _updateDnsPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
-
   void changeProxy(
     ffi.Pointer<ffi.Char> s,
   ) {
@@ -5357,16 +5351,16 @@ class ClashFFI {
   late final _getConnections =
       _getConnectionsPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
 
-  void closeConnections() {
+  int closeConnections() {
     return _closeConnections();
   }
 
   late final _closeConnectionsPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function()>>('closeConnections');
+      _lookup<ffi.NativeFunction<GoUint8 Function()>>('closeConnections');
   late final _closeConnections =
-      _closeConnectionsPtr.asFunction<void Function()>();
+      _closeConnectionsPtr.asFunction<int Function()>();
 
-  void closeConnection(
+  int closeConnection(
     ffi.Pointer<ffi.Char> id,
   ) {
     return _closeConnection(
@@ -5375,10 +5369,10 @@ class ClashFFI {
   }
 
   late final _closeConnectionPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
+      _lookup<ffi.NativeFunction<GoUint8 Function(ffi.Pointer<ffi.Char>)>>(
           'closeConnection');
   late final _closeConnection =
-      _closeConnectionPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
+      _closeConnectionPtr.asFunction<int Function(ffi.Pointer<ffi.Char>)>();
 
   ffi.Pointer<ffi.Char> getProviders() {
     return _getProviders();
@@ -5415,76 +5409,24 @@ class ClashFFI {
   late final _getExternalProviders =
       _getExternalProvidersPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
 
-  ffi.Pointer<ffi.Char> getExternalProvider(
-    ffi.Pointer<ffi.Char> name,
-  ) {
-    return _getExternalProvider(
-      name,
-    );
-  }
-
-  late final _getExternalProviderPtr = _lookup<
-      ffi.NativeFunction<
-          ffi.Pointer<ffi.Char> Function(
-              ffi.Pointer<ffi.Char>)>>('getExternalProvider');
-  late final _getExternalProvider = _getExternalProviderPtr
-      .asFunction<ffi.Pointer<ffi.Char> Function(ffi.Pointer<ffi.Char>)>();
-
-  void updateGeoData(
-    ffi.Pointer<ffi.Char> geoType,
-    ffi.Pointer<ffi.Char> geoName,
-    int port,
-  ) {
-    return _updateGeoData(
-      geoType,
-      geoName,
-      port,
-    );
-  }
-
-  late final _updateGeoDataPtr = _lookup<
-      ffi.NativeFunction<
-          ffi.Void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>,
-              ffi.LongLong)>>('updateGeoData');
-  late final _updateGeoData = _updateGeoDataPtr.asFunction<
-      void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>, int)>();
-
   void updateExternalProvider(
     ffi.Pointer<ffi.Char> providerName,
+    ffi.Pointer<ffi.Char> providerType,
     int port,
   ) {
     return _updateExternalProvider(
       providerName,
+      providerType,
       port,
     );
   }
 
   late final _updateExternalProviderPtr = _lookup<
-      ffi.NativeFunction<
-          ffi.Void Function(
-              ffi.Pointer<ffi.Char>, ffi.LongLong)>>('updateExternalProvider');
-  late final _updateExternalProvider = _updateExternalProviderPtr
-      .asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
-
-  void sideLoadExternalProvider(
-    ffi.Pointer<ffi.Char> providerName,
-    ffi.Pointer<ffi.Char> data,
-    int port,
-  ) {
-    return _sideLoadExternalProvider(
-      providerName,
-      data,
-      port,
-    );
-  }
-
-  late final _sideLoadExternalProviderPtr = _lookup<
       ffi.NativeFunction<
           ffi.Void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>,
-              ffi.LongLong)>>('sideLoadExternalProvider');
-  late final _sideLoadExternalProvider =
-      _sideLoadExternalProviderPtr.asFunction<
-          void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>, int)>();
+              ffi.LongLong)>>('updateExternalProvider');
+  late final _updateExternalProvider = _updateExternalProviderPtr.asFunction<
+      void Function(ffi.Pointer<ffi.Char>, ffi.Pointer<ffi.Char>, int)>();
 
   void initNativeApiBridge(
     ffi.Pointer<ffi.Void> api,
@@ -5557,44 +5499,44 @@ class ClashFFI {
   late final _setProcessMap =
       _setProcessMapPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
 
-  ffi.Pointer<ffi.Char> getState() {
-    return _getState();
+  ffi.Pointer<ffi.Char> getAndroidProps() {
+    return _getAndroidProps();
   }
 
-  late final _getStatePtr =
-      _lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>('getState');
-  late final _getState =
-      _getStatePtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
+  late final _getAndroidPropsPtr =
+      _lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>(
+          'getAndroidProps');
+  late final _getAndroidProps =
+      _getAndroidPropsPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
 
-  void setState(
+  void setAndroidProps(
     ffi.Pointer<ffi.Char> s,
   ) {
-    return _setState(
+    return _setAndroidProps(
       s,
     );
   }
 
-  late final _setStatePtr =
+  late final _setAndroidPropsPtr =
       _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
-          'setState');
-  late final _setState =
-      _setStatePtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
+          'setAndroidProps');
+  late final _setAndroidProps =
+      _setAndroidPropsPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
 
   void startTUN(
-    ffi.Pointer<ffi.Char> s,
+    int fd,
     int port,
   ) {
     return _startTUN(
-      s,
+      fd,
       port,
     );
   }
 
-  late final _startTUNPtr = _lookup<
-      ffi.NativeFunction<
-          ffi.Void Function(ffi.Pointer<ffi.Char>, ffi.LongLong)>>('startTUN');
-  late final _startTUN =
-      _startTUNPtr.asFunction<void Function(ffi.Pointer<ffi.Char>, int)>();
+  late final _startTUNPtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Int, ffi.LongLong)>>(
+          'startTUN');
+  late final _startTUN = _startTUNPtr.asFunction<void Function(int, int)>();
 
   ffi.Pointer<ffi.Char> getRunTime() {
     return _getRunTime();

lib/common/archive.dart

@@ -1,28 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-import 'package:archive/archive_io.dart';
-import 'package:path/path.dart';
-
-extension ArchiveExt on Archive {
-  addDirectoryToArchive(String dirPath, String parentPath) {
-    final dir = Directory(dirPath);
-    final entities = dir.listSync(recursive: false);
-    for (final entity in entities) {
-      final relativePath = relative(entity.path, from: parentPath);
-      if (entity is File) {
-        final data = entity.readAsBytesSync();
-        final archiveFile = ArchiveFile(relativePath, data.length, data);
-        addFile(archiveFile);
-      } else if (entity is Directory) {
-        addDirectoryToArchive(entity.path, parentPath);
-      }
-    }
-  }
-
-  add<T>(String name, T raw) {
-    final data = json.encode(raw);
-    addFile(
-      ArchiveFile(name, data.length, data),
-    );
-  }
-}

lib/common/color.dart

@@ -16,21 +16,4 @@ extension ColorExtension on Color {
   toLittle() {
     return withOpacity(0.03);
   }
-
-  Color darken([double amount = .1]) {
-    assert(amount >= 0 && amount <= 1);
-    final hsl = HSLColor.fromColor(this);
-    final hslDark = hsl.withLightness((hsl.lightness - amount).clamp(0.0, 1.0));
-    return hslDark.toColor();
-  }
-}
-
-extension ColorSchemeExtension on ColorScheme {
-  ColorScheme toPrueBlack(bool isPrueBlack) => isPrueBlack
-      ? copyWith(
-          surface: Colors.black,
-          background: Colors.black,
-          surfaceContainer: surfaceContainer.darken(0.05),
-        )
-      : this;
-}
+}

lib/common/common.dart

@@ -23,9 +23,6 @@ export 'app_localizations.dart';
 export 'function.dart';
 export 'package.dart';
 export 'measure.dart';
-export 'windows.dart';
+export 'service.dart';
 export 'iterable.dart';
-export 'scroll.dart';
-export 'icons.dart';
-export 'http.dart';
-export 'keyboard.dart';
+export 'scroll.dart';

lib/common/constant.dart

@@ -8,7 +8,7 @@ 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);
@@ -17,11 +17,7 @@ const mmdbFileName = "geoip.metadb";
 const asnFileName = "ASN.mmdb";
 const geoIpFileName = "GeoIP.dat";
 const geoSiteFileName = "GeoSite.dat";
-final double kHeaderHeight = system.isDesktop
-    ? !Platform.isMacOS
-        ? 40
-        : 26
-    : 0;
+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",

lib/common/dav_client.dart

@@ -1,14 +1,16 @@
 import 'dart:async';
-import 'dart:typed_data';
+import 'dart:convert';
 
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
+import 'package:path/path.dart';
 import 'package:webdav_client/webdav_client.dart';
 
 class DAVClient {
   late Client client;
   Completer<bool> pingCompleter = Completer();
-  late String fileName;
 
   DAVClient(DAV dav) {
     client = newClient(
@@ -16,7 +18,6 @@ class DAVClient {
       user: dav.user,
       password: dav.password,
     );
-    fileName = dav.fileName;
     client.setHeaders(
       {
         'accept-charset': 'utf-8',
@@ -32,6 +33,8 @@ class DAVClient {
   Future<bool> _ping() async {
     try {
       await client.ping();
+      await client.mkdir("/$appName");
+      await client.mkdir("/$appName/$profilesDirectoryName");
       return true;
     } catch (_) {
       return false;
@@ -40,17 +43,65 @@ class DAVClient {
 
   get root => "/$appName";
 
-  get backupFile => "$root/$fileName";
+  get remoteConfig => "$root/$configKey.json";
 
-  backup(Uint8List data) async {
+  get remoteClashConfig => "$root/$clashConfigKey.json";
+
+  get remoteProfiles => "$root/$profilesDirectoryName";
+
+  backup() async {
+    final appController = globalState.appController;
+    final config = appController.config;
+    final clashConfig = appController.clashConfig;
     await client.mkdir("$root");
-    await client.write("$backupFile", data);
+    client.write(
+      remoteConfig,
+      utf8.encode(
+        json.encode(config.toJson()),
+      ),
+    );
+    client.write(
+      remoteClashConfig,
+      utf8.encode(
+        json.encode(clashConfig.toJson()),
+      ),
+    );
+    await client.remove(remoteProfiles);
+    for (final profile in config.profiles) {
+      final path = await appPath.getProfilePath(profile.id);
+      if (path == null) continue;
+      await client.writeFromFile(
+        path,
+        "$remoteProfiles/${basename(path)}",
+      );
+    }
     return true;
   }
 
-  Future<List<int>> recovery() async {
-    await client.mkdir("$root");
-    final data = await client.read(backupFile);
-    return data;
+  recovery({required RecoveryOption recoveryOption}) async {
+    final profiles = await client.readDir(remoteProfiles);
+    final profilesPath = await appPath.getProfilesPath();
+    for (final file in profiles) {
+      await client.read2File(
+        "$remoteProfiles/${file.name}",
+        join(
+          profilesPath,
+          file.name,
+        ),
+      );
+    }
+    final configRaw = utf8.decode((await client.read(remoteConfig)));
+    final clashConfigRaw = utf8.decode(await client.read(remoteClashConfig));
+    final config = Config.fromJson(json.decode(configRaw));
+    final clashConfig = ClashConfig.fromJson(json.decode(clashConfigRaw));
+    if(recoveryOption == RecoveryOption.onlyProfiles){
+      globalState.appController.config.update(config, RecoveryOption.onlyProfiles);
+    }else{
+      globalState.appController.config.update(config, RecoveryOption.all);
+      globalState.appController.clashConfig.update(clashConfig);
+    }
+    await globalState.appController.applyProfile();
+    globalState.appController.savePreferences();
+    return true;
   }
 }

lib/common/http.dart

@@ -1,21 +0,0 @@
-import 'dart:io';
-
-import 'package:flutter/cupertino.dart';
-
-import '../state.dart';
-
-class FlClashHttpOverrides extends HttpOverrides {
-  @override
-  HttpClient createHttpClient(SecurityContext? context) {
-    final client = super.createHttpClient(context);
-    client.badCertificateCallback = (_, __, ___) => true;
-    client.findProxy = (url) {
-      debugPrint("find $url");
-      final port = globalState.appController.clashConfig.mixedPort;
-      final isStart = globalState.appController.appState.isStart;
-      if (!isStart) return "DIRECT";
-      return "PROXY localhost:$port";
-    };
-    return client;
-  }
-}

lib/common/icons.dart

@@ -1,6 +0,0 @@
-import 'package:flutter/material.dart';
-
-class IconsExt{
-  static const IconData target =
-      IconData(0xe900, fontFamily: "Icons");
-}

lib/common/iterable.dart

@@ -10,58 +10,4 @@ extension IterableExt<T> on Iterable<T> {
       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/keyboard.dart

@@ -1,106 +0,0 @@
-import 'dart:io';
-
-import 'package:flutter/services.dart';
-import 'package:uni_platform/uni_platform.dart';
-
-final Map<PhysicalKeyboardKey, String> _knownKeyLabels =
-    <PhysicalKeyboardKey, String>{
-  PhysicalKeyboardKey.keyA: 'A',
-  PhysicalKeyboardKey.keyB: 'B',
-  PhysicalKeyboardKey.keyC: 'C',
-  PhysicalKeyboardKey.keyD: 'D',
-  PhysicalKeyboardKey.keyE: 'E',
-  PhysicalKeyboardKey.keyF: 'F',
-  PhysicalKeyboardKey.keyG: 'G',
-  PhysicalKeyboardKey.keyH: 'H',
-  PhysicalKeyboardKey.keyI: 'I',
-  PhysicalKeyboardKey.keyJ: 'J',
-  PhysicalKeyboardKey.keyK: 'K',
-  PhysicalKeyboardKey.keyL: 'L',
-  PhysicalKeyboardKey.keyM: 'M',
-  PhysicalKeyboardKey.keyN: 'N',
-  PhysicalKeyboardKey.keyO: 'O',
-  PhysicalKeyboardKey.keyP: 'P',
-  PhysicalKeyboardKey.keyQ: 'Q',
-  PhysicalKeyboardKey.keyR: 'R',
-  PhysicalKeyboardKey.keyS: 'S',
-  PhysicalKeyboardKey.keyT: 'T',
-  PhysicalKeyboardKey.keyU: 'U',
-  PhysicalKeyboardKey.keyV: 'V',
-  PhysicalKeyboardKey.keyW: 'W',
-  PhysicalKeyboardKey.keyX: 'X',
-  PhysicalKeyboardKey.keyY: 'Y',
-  PhysicalKeyboardKey.keyZ: 'Z',
-  PhysicalKeyboardKey.digit1: '1',
-  PhysicalKeyboardKey.digit2: '2',
-  PhysicalKeyboardKey.digit3: '3',
-  PhysicalKeyboardKey.digit4: '4',
-  PhysicalKeyboardKey.digit5: '5',
-  PhysicalKeyboardKey.digit6: '6',
-  PhysicalKeyboardKey.digit7: '7',
-  PhysicalKeyboardKey.digit8: '8',
-  PhysicalKeyboardKey.digit9: '9',
-  PhysicalKeyboardKey.digit0: '0',
-  PhysicalKeyboardKey.enter: 'ENTER',
-  PhysicalKeyboardKey.escape: 'ESCAPE',
-  PhysicalKeyboardKey.backspace: 'BACKSPACE',
-  PhysicalKeyboardKey.tab: 'TAB',
-  PhysicalKeyboardKey.space: 'SPACE',
-  PhysicalKeyboardKey.minus: '-',
-  PhysicalKeyboardKey.equal: '=',
-  PhysicalKeyboardKey.bracketLeft: '[',
-  PhysicalKeyboardKey.bracketRight: ']',
-  PhysicalKeyboardKey.backslash: '\\',
-  PhysicalKeyboardKey.semicolon: ';',
-  PhysicalKeyboardKey.quote: '"',
-  PhysicalKeyboardKey.backquote: '`',
-  PhysicalKeyboardKey.comma: ',',
-  PhysicalKeyboardKey.period: '.',
-  PhysicalKeyboardKey.slash: '/',
-  PhysicalKeyboardKey.capsLock: 'CAPSLOCK',
-  PhysicalKeyboardKey.f1: 'F1',
-  PhysicalKeyboardKey.f2: 'F2',
-  PhysicalKeyboardKey.f3: 'F3',
-  PhysicalKeyboardKey.f4: 'F4',
-  PhysicalKeyboardKey.f5: 'F5',
-  PhysicalKeyboardKey.f6: 'F6',
-  PhysicalKeyboardKey.f7: 'F7',
-  PhysicalKeyboardKey.f8: 'F8',
-  PhysicalKeyboardKey.f9: 'F9',
-  PhysicalKeyboardKey.f10: 'F10',
-  PhysicalKeyboardKey.f11: 'F11',
-  PhysicalKeyboardKey.f12: 'F12',
-  PhysicalKeyboardKey.home: 'HOME',
-  PhysicalKeyboardKey.pageUp: 'PAGEUP',
-  PhysicalKeyboardKey.delete: 'DELETE',
-  PhysicalKeyboardKey.end: 'END',
-  PhysicalKeyboardKey.pageDown: 'PAGEDOWN',
-  PhysicalKeyboardKey.arrowRight: '→',
-  PhysicalKeyboardKey.arrowLeft: '←',
-  PhysicalKeyboardKey.arrowDown: '↓',
-  PhysicalKeyboardKey.arrowUp: '↑',
-  PhysicalKeyboardKey.controlLeft: "CTRL",
-  PhysicalKeyboardKey.shiftLeft: 'SHIFT',
-  PhysicalKeyboardKey.altLeft: "ALT",
-  PhysicalKeyboardKey.metaLeft: Platform.isMacOS ? '⌘' : 'WIN',
-  PhysicalKeyboardKey.controlRight: "CTRL",
-  PhysicalKeyboardKey.shiftRight: 'SHIFT',
-  PhysicalKeyboardKey.altRight: "ALT",
-  PhysicalKeyboardKey.metaRight: Platform.isMacOS ? '⌘' : 'WIN',
-  PhysicalKeyboardKey.fn: 'FN',
-};
-
-extension KeyboardKeyExt on KeyboardKey {
-  String get label {
-    PhysicalKeyboardKey? physicalKey;
-    if (this is LogicalKeyboardKey) {
-      physicalKey = (this as LogicalKeyboardKey).physicalKey;
-    } else if (this is PhysicalKeyboardKey) {
-      physicalKey = this as PhysicalKeyboardKey;
-    }
-    return _knownKeyLabels[physicalKey] ?? physicalKey?.debugName ?? 'Unknown';
-  }
-}
-
-
-

lib/common/launch.dart

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

lib/common/list.dart

@@ -2,17 +2,4 @@ extension ListExtension<T> on List<T> {
   List<T> intersection(List<T> list) {
     return where((item) => list.contains(item)).toList();
   }
-
-  List<List<T>> batch(int maxConcurrent) {
-    final batches = (length / maxConcurrent).ceil();
-    final List<List<T>> res = [];
-    for (int i = 0; i < batches; i++) {
-      if (i != batches - 1) {
-        res.add(sublist(i * maxConcurrent, maxConcurrent * (i + 1)));
-      } else {
-        res.add(sublist(i * maxConcurrent, length));
-      }
-    }
-    return res;
-  }
-}
+}

lib/common/measure.dart

@@ -3,21 +3,23 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class Measure {
-  final TextScaler _textScale;
-  late BuildContext context;
+  Measure.of(this.context);
 
-  Measure.of(this.context) : _textScale = MediaQuery.of(context).textScaler;
+  final _textScaleFactor =
+      WidgetsBinding.instance.platformDispatcher.textScaleFactor;
 
   Size computeTextSize(Text text) {
     final textPainter = TextPainter(
       text: TextSpan(text: text.data, style: text.style),
       maxLines: text.maxLines,
-      textScaler: _textScale,
+      textScaler: TextScaler.linear(_textScaleFactor),
       textDirection: text.textDirection ?? TextDirection.ltr,
     )..layout();
     return textPainter.size;
   }
 
+  late BuildContext context;
+
   double? _bodyMediumHeight;
   double? _bodySmallHeight;
   double? _labelSmallHeight;

lib/common/navigation.dart

@@ -44,7 +44,7 @@ class Navigation {
         modes: [NavigationItemMode.desktop, NavigationItemMode.more],
       ),
       const NavigationItem(
-        icon: Icon(Icons.storage),
+        icon: Icon(Icons.swap_vert_circle),
         label: "resources",
         description: "resourcesDesc",
         keep: false,

lib/common/other.dart

@@ -1,12 +1,11 @@
 import 'dart:io';
 import 'dart:isolate';
-import 'dart:math';
 import 'dart:typed_data';
 
-import 'package:fl_clash/common/common.dart';
+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';
-import 'package:lpinyin/lpinyin.dart';
 import 'package:zxing2/qrcode.dart';
 import 'package:image/image.dart' as img;
 
@@ -84,7 +83,7 @@ class Other {
     if (charA == charB) {
       return sortByChar(a.substring(1), b.substring(1));
     } else {
-      return charA.compareToLower(charB);
+      return charA.compareTo(charB);
     }
   }
 
@@ -100,18 +99,12 @@ class Other {
     }
   }
 
-  String getTrayIconPath({
-    required bool isStart,
-    required Brightness brightness,
-  }) {
-    final suffix = Platform.isWindows ? "ico" : "png";
-    if (!isStart && Platform.isWindows) {
-      return switch (brightness) {
-        Brightness.dark => "assets/images/icon_white.$suffix",
-        Brightness.light => "assets/images/icon_black.$suffix",
-      };
+  String getTrayIconPath() {
+    if (Platform.isWindows) {
+      return "assets/images/app_icon.ico";
+    } else {
+      return "assets/images/launch_icon.png";
     }
-    return "assets/images/icon.$suffix";
   }
 
   int compareVersions(String version1, String version2) {
@@ -137,12 +130,6 @@ class Other {
     return build1.compareTo(build2);
   }
 
-  String getPinyin(String value) {
-    return value.isNotEmpty
-        ? PinyinHelper.getFirstWordPinyin(value.substring(0, 1))
-        : "";
-  }
-
   Future<String?> parseQRCode(Uint8List? bytes) {
     return Isolate.run<String?>(() {
       if (bytes == null) return null;
@@ -204,22 +191,23 @@ class Other {
     return ViewMode.desktop;
   }
 
-  int getProxiesColumns(double viewWidth, ProxiesLayout proxiesLayout) {
-    final columns = max((viewWidth / 300).ceil(), 2);
-    return switch (proxiesLayout) {
-      ProxiesLayout.tight => columns + 1,
-      ProxiesLayout.standard => columns,
-      ProxiesLayout.loose => columns - 1,
+  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(),
     };
   }
-
-  int getProfilesColumns(double viewWidth) {
-    return max((viewWidth / 400).floor(), 1);
-  }
-
-  String getBackupFileName() {
-    return "${appName}_backup_${DateTime.now().show}.zip";
-  }
 }
 
 final other = Other();

lib/common/path.dart

@@ -9,7 +9,6 @@ import 'constant.dart';
 class AppPath {
   static AppPath? _instance;
   Completer<Directory> cacheDir = Completer();
-  Completer<Directory> downloadDir = Completer();
 
   // Future<Directory> _createDesktopCacheDir() async {
   //   final path = join(dirname(Platform.resolvedExecutable), 'cache');
@@ -24,9 +23,6 @@ class AppPath {
     getApplicationSupportDirectory().then((value) {
       cacheDir.complete(value);
     });
-    getDownloadsDirectory().then((value) {
-      downloadDir.complete(value);
-    });
     // if (Platform.isAndroid) {
     //   getApplicationSupportDirectory().then((value) {
     //     cacheDir.complete(value);
@@ -43,11 +39,6 @@ class AppPath {
     return _instance!;
   }
 
-  Future<String> getDownloadDirPath() async {
-    final directory = await downloadDir.future;
-    return directory.path;
-  }
-
   Future<String> getHomeDirPath() async {
     final directory = await cacheDir.future;
     return directory.path;

lib/common/picker.dart

@@ -1,31 +1,22 @@
-import 'dart:io';
-import 'dart:typed_data';
-
 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?> pickerFile() async {
+  Future<PlatformFile?> pickerConfigFile() async {
     final filePickerResult = await FilePicker.platform.pickFiles(
       withData: true,
       allowMultiple: false,
-      initialDirectory: await appPath.getDownloadDirPath(),
     );
     return filePickerResult?.files.first;
   }
 
-  Future<String?> saveFile(String fileName, Uint8List bytes) async {
-    final path = await FilePicker.platform.saveFile(
-      fileName: fileName,
-      initialDirectory: await appPath.getDownloadDirPath(),
-      bytes: Platform.isAndroid ? bytes : null,
+  Future<PlatformFile?> pickerGeoDataFile() async {
+    final filePickerResult = await FilePicker.platform.pickFiles(
+      withData: true,
+      allowMultiple: false,
     );
-    if (!Platform.isAndroid && path != null) {
-      final file = await File(path).create(recursive: true);
-      await file.writeAsBytes(bytes);
-    }
-    return path;
+    return filePickerResult?.files.first;
   }
 
   Future<String?> pickerConfigQRCode() async {

lib/common/proxy.dart

@@ -1,4 +1,37 @@
-import 'package:fl_clash/common/system.dart';
-import 'package:proxy/proxy.dart';
+import 'package:fl_clash/common/datetime.dart';
+import 'package:fl_clash/plugins/proxy.dart';
+import 'package:proxy/proxy.dart' as proxy_plugin;
+import 'package:proxy/proxy_platform_interface.dart';
 
-final proxy = system.isDesktop ? Proxy() : null;
+class ProxyManager {
+  static ProxyManager? _instance;
+  late ProxyPlatform _proxy;
+
+  ProxyManager._internal() {
+    _proxy = proxy ?? proxy_plugin.Proxy();
+  }
+
+  bool get isStart => startTime != null && startTime!.isBeforeNow;
+
+  DateTime? get startTime => _proxy.startTime;
+
+  Future<bool?> startProxy({required int port}) async {
+    return await _proxy.startProxy(port);
+  }
+
+  Future<bool?> stopProxy() async {
+    return await _proxy.stopProxy();
+  }
+
+  Future<DateTime?> updateStartTime() async {
+    if (_proxy is! Proxy) return null;
+    return await (_proxy as Proxy).updateStartTime();
+  }
+
+  factory ProxyManager() {
+    _instance ??= ProxyManager._internal();
+    return _instance!;
+  }
+}
+
+final proxyManager = ProxyManager();

lib/common/request.dart

@@ -1,57 +1,66 @@
-import 'dart:math';
-import 'dart:typed_data';
+import 'dart:io';
 
 import 'package:dio/dio.dart';
+import 'package:dio/io.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/models/ip.dart';
 import 'package:fl_clash/state.dart';
-import 'package:flutter/cupertino.dart';
 
 class Request {
   late final Dio _dio;
-  String? userAgent;
+  int? _port;
+  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); // 继续请求
         },
       ),
     );
   }
 
+  _updateAdapter() {
+    final port = globalState.appController.clashConfig.mixedPort;
+    final isStart = globalState.appController.appState.isStart;
+    if (_port != port || isStart != _isStart) {
+      _port = port;
+      _isStart = isStart;
+      _dio.httpClientAdapter = IOHttpClientAdapter(
+        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,
+      );
+    }
+  }
+
   Future<Response> getFileResponseForUrl(String url) async {
     final response = await _dio
         .get(
           url,
           options: Options(
-            headers: {
-              "User-Agent": globalState.appController.clashConfig.globalUa
-            },
             responseType: ResponseType.bytes,
           ),
         )
         .timeout(
-          httpTimeoutDuration * 6,
+          httpTimeoutDuration * 2,
         );
     return response;
   }
 
-  Future<MemoryImage?> getImage(String url) async {
-    if (url.isEmpty) return null;
-    final response = await _dio.get<Uint8List>(
-      url,
-      options: Options(
-        responseType: ResponseType.bytes,
-      ),
-    );
-    final data = response.data;
-    if (data == null) return null;
-    return MemoryImage(data);
-  }
-
   Future<Map<String, dynamic>?> checkForUpdate() async {
     final response = await _dio.get(
       "https://api.github.com/repos/$repository/releases/latest",
@@ -76,14 +85,11 @@ class Request {
     "https://ipinfo.io/json/": IpInfo.fromIpInfoIoJson,
   };
 
-  Future<IpInfo?> checkIp({CancelToken? cancelToken}) async {
-    for (final source in _ipInfoSources.entries.toList()..shuffle(Random())) {
+  Future<IpInfo?> checkIp(CancelToken? cancelToken) async {
+    for (final source in _ipInfoSources.entries) {
       try {
         final response = await _dio
-            .get<Map<String, dynamic>>(
-              source.key,
-              cancelToken: cancelToken,
-            )
+            .get<Map<String, dynamic>>(source.key, cancelToken: cancelToken)
             .timeout(
               httpTimeoutDuration,
             );
@@ -91,9 +97,6 @@ class Request {
           return source.value(response.data!);
         }
       } catch (e) {
-        if (cancelToken?.isCancelled == true) {
-          throw "cancelled";
-        }
         continue;
       }
     }

lib/common/scroll.dart

@@ -14,14 +14,3 @@ class BaseScrollBehavior extends MaterialScrollBehavior {
         PointerDeviceKind.unknown,
       };
 }
-
-class HiddenBarScrollBehavior extends BaseScrollBehavior {
-  @override
-  Widget buildScrollbar(
-    BuildContext context,
-    Widget child,
-    ScrollableDetails details,
-  ) {
-    return child;
-  }
-}

lib/common/service.dart

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

@@ -2,10 +2,4 @@ extension StringExtension on String {
   bool get isUrl {
     return RegExp(r'^(http|https|ftp)://').hasMatch(this);
   }
-
-  int compareToLower(String other) {
-    return toLowerCase().compareTo(
-      other.toLowerCase(),
-    );
-  }
 }

lib/common/system.dart

@@ -1,9 +1,7 @@
 import 'dart:io';
 
-import 'package:device_info_plus/device_info_plus.dart';
 import 'package:fl_clash/plugins/app.dart';
 import 'package:flutter/services.dart';
-import 'package:window_manager/window_manager.dart';
 
 import 'window.dart';
 
@@ -20,22 +18,6 @@ class System {
   bool get isDesktop =>
       Platform.isWindows || Platform.isMacOS || Platform.isLinux;
 
-  get isAdmin async {
-    if (!Platform.isWindows) return false;
-    final result = await Process.run('net', ['session'], runInShell: true);
-    return result.exitCode == 0;
-  }
-
-  Future<int> get version async {
-    final deviceInfo = await DeviceInfoPlugin().deviceInfo;
-    return switch (Platform.operatingSystem) {
-      "macos" => (deviceInfo as MacOsDeviceInfo).majorVersion,
-      "android" => (deviceInfo as AndroidDeviceInfo).version.sdkInt,
-      "windows" => (deviceInfo as WindowsDeviceInfo).majorVersion,
-      String() => 0
-    };
-  }
-
   back() async {
     await app?.moveTaskToBack();
     await window?.hide();

lib/common/window.dart

@@ -9,7 +9,7 @@ import 'protocol.dart';
 import 'system.dart';
 
 class Window {
-  init(WindowProps props, int version) async {
+  init(WindowProps props) async {
     if (Platform.isWindows) {
       await WindowsSingleInstance.ensureSingleInstance([], "FlClash");
       protocol.register("clash");
@@ -19,7 +19,8 @@ class Window {
     await windowManager.ensureInitialized();
     WindowOptions windowOptions = WindowOptions(
       size: Size(props.width, props.height),
-      minimumSize: const Size(380, 500),
+      minimumSize: const Size(380, 600),
+      titleBarStyle: TitleBarStyle.hidden,
     );
     if (props.left != null || props.top != null) {
       await windowManager.setPosition(
@@ -28,9 +29,9 @@ class Window {
     } else {
       await windowManager.setAlignment(Alignment.center);
     }
-    if(!Platform.isMacOS || version > 10){
-      await windowManager.setTitleBarStyle(TitleBarStyle.hidden);
-    }
+    // if(Platform.isWindows){
+    //   await windowManager.setTitleBarStyle(TitleBarStyle.hidden);
+    // }
     await windowManager.waitUntilReadyToShow(windowOptions, () async {
       await windowManager.setPreventClose(true);
     });
@@ -39,11 +40,6 @@ class Window {
   show() async {
     await windowManager.show();
     await windowManager.focus();
-    await windowManager.setSkipTaskbar(false);
-  }
-
-  Future<bool> isVisible() async {
-    return await windowManager.isVisible();
   }
 
   close() async {
@@ -52,7 +48,6 @@ class Window {
 
   hide() async {
     await windowManager.hide();
-    await windowManager.setSkipTaskbar(true);
   }
 }
 

lib/common/windows.dart

@@ -1,59 +0,0 @@
-import 'dart:ffi';
-import 'dart:io';
-import 'package:ffi/ffi.dart';
-
-class Windows {
-  static Windows? _instance;
-  late DynamicLibrary _shell32;
-
-  Windows._internal() {
-    _shell32 = DynamicLibrary.open('shell32.dll');
-  }
-
-  factory Windows() {
-    _instance ??= Windows._internal();
-    return _instance!;
-  }
-
-  bool runas(String command, String arguments) {
-    final commandPtr = command.toNativeUtf16();
-    final argumentsPtr = arguments.toNativeUtf16();
-    final operationPtr = 'runas'.toNativeUtf16();
-
-    final shellExecute = _shell32.lookupFunction<
-        Int32 Function(
-            Pointer<Utf16> hwnd,
-            Pointer<Utf16> lpOperation,
-            Pointer<Utf16> lpFile,
-            Pointer<Utf16> lpParameters,
-            Pointer<Utf16> lpDirectory,
-            Int32 nShowCmd),
-        int Function(
-            Pointer<Utf16> hwnd,
-            Pointer<Utf16> lpOperation,
-            Pointer<Utf16> lpFile,
-            Pointer<Utf16> lpParameters,
-            Pointer<Utf16> lpDirectory,
-            int nShowCmd)>('ShellExecuteW');
-
-    final result = shellExecute(
-      nullptr,
-      operationPtr,
-      commandPtr,
-      argumentsPtr,
-      nullptr,
-      1,
-    );
-
-    calloc.free(commandPtr);
-    calloc.free(argumentsPtr);
-    calloc.free(operationPtr);
-
-    if (result <= 32) {
-      return false;
-    }
-    return true;
-  }
-}
-
-final windows = Platform.isWindows ? Windows() : null;

lib/controller.dart

@@ -1,14 +1,8 @@
 import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-import 'dart:isolate';
 
-import 'package:archive/archive.dart';
-import 'package:fl_clash/common/archive.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
-import 'package:path/path.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -21,10 +15,9 @@ class AppController {
   late AppState appState;
   late Config config;
   late ClashConfig clashConfig;
+  late Measure measure;
   late Function updateClashConfigDebounce;
-  late Function updateGroupDebounce;
   late Function addCheckIpNumDebounce;
-  late Function applyProfileDebounce;
 
   AppController(this.context) {
     appState = context.read<AppState>();
@@ -33,20 +26,16 @@ class AppController {
     updateClashConfigDebounce = debounce<Function()>(() async {
       await updateClashConfig();
     });
-    applyProfileDebounce = debounce<Function()>(() async {
-      await applyProfile(isPrue: true);
-    });
     addCheckIpNumDebounce = debounce(() {
       appState.checkIpNum++;
     });
-    updateGroupDebounce = debounce(() async {
-      await updateGroups();
-    });
+    measure = Measure.of(context);
   }
 
-  updateStatus(bool isStart) async {
+  Future<void> updateSystemProxy(bool isStart) async {
     if (isStart) {
-      await globalState.handleStart(
+      await globalState.startSystemProxy(
+        appState: appState,
         config: config,
         clashConfig: clashConfig,
       );
@@ -56,14 +45,12 @@ class AppController {
         updateRunTime,
         updateTraffic,
       ];
-      applyProfileDebounce();
     } else {
-      await globalState.handleStop();
+      await globalState.stopSystemProxy();
       clashCore.resetTraffic();
       appState.traffics = [];
       appState.totalTraffic = Traffic();
       appState.runTime = null;
-      addCheckIpNumDebounce();
     }
   }
 
@@ -72,9 +59,8 @@ class AppController {
   }
 
   updateRunTime() {
-    final startTime = globalState.startTime;
-    if (startTime != null) {
-      final startTimeStamp = startTime.millisecondsSinceEpoch;
+    if (proxyManager.startTime != null) {
+      final startTimeStamp = proxyManager.startTime!.millisecondsSinceEpoch;
       final nowTimeStamp = DateTime.now().millisecondsSinceEpoch;
       appState.runTime = nowTimeStamp - startTimeStamp;
     } else {
@@ -96,23 +82,22 @@ class AppController {
 
   deleteProfile(String id) async {
     config.deleteProfileById(id);
-    clashCore.clearEffect(id);
+    final profilePath = await appPath.getProfilePath(id);
+    if (profilePath == null) return;
+    clashCore.clearEffect(profilePath);
     if (config.currentProfileId == id) {
       if (config.profiles.isNotEmpty) {
         final updateId = config.profiles.first.id;
         changeProfile(updateId);
       } else {
         changeProfile(null);
-        updateStatus(false);
       }
     }
   }
 
   Future<void> updateProfile(Profile profile) async {
-    final newProfile = await profile.update();
-    config.setProfile(
-      newProfile.copyWith(isUpdating: false),
-    );
+    await profile.update();
+    config.setProfile(await profile.update());
   }
 
   Future<void> updateClashConfig({bool isPatch = true}) async {
@@ -123,30 +108,32 @@ 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();
+    });
+  }
+
+  Future rawApplyProfile() async {
+    await globalState.applyProfile(
+      appState: appState,
+      config: config,
+      clashConfig: clashConfig,
+    );
   }
 
   changeProfile(String? value) async {
     if (value == config.currentProfileId) return;
     config.currentProfileId = value;
+    await applyProfile();
+    appState.delayMap = {};
+    saveConfigPreferences();
   }
 
   autoUpdateProfiles() async {
@@ -205,18 +192,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) {
@@ -229,8 +204,7 @@ class AppController {
   }
 
   handleExit() async {
-    await updateStatus(false);
-    await proxy?.stopProxy();
+    await updateSystemProxy(false);
     await savePreferences();
     clashCore.shutdown();
     system.exit();
@@ -295,21 +269,35 @@ class AppController {
   }
 
   init() async {
-    final isDisclaimerAccepted = await handlerDisclaimer();
-    if (!isDisclaimerAccepted) {
-      system.exit();
-    }
     updateLogStatus();
     if (!config.silentLaunch) {
       window?.show();
     }
-    if (Platform.isAndroid) {
-      globalState.updateStartTime();
-    }
-    if (globalState.isStart) {
-      await updateStatus(true);
+    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
+    if (commonScaffoldState?.mounted == true) {
+      await commonScaffoldState?.loadingRun(() async {
+        await globalState.applyProfile(
+          appState: appState,
+          config: config,
+          clashConfig: clashConfig,
+        );
+      }, title: appLocalizations.init);
     } else {
-      await updateStatus(config.autoRun);
+      await globalState.applyProfile(
+        appState: appState,
+        config: config,
+        clashConfig: clashConfig,
+      );
+    }
+    await afterInit();
+  }
+
+  afterInit() async {
+    await proxyManager.updateStartTime();
+    if (proxyManager.isStart) {
+      await updateSystemProxy(true);
+    } else {
+      await updateSystemProxy(config.autoRun);
     }
     autoUpdateProfiles();
     autoCheckUpdate();
@@ -373,51 +361,6 @@ class AppController {
     );
   }
 
-  showSnackBar(String message) {
-    globalState.showSnackBar(context, message: message);
-  }
-
-  Future<bool> showDisclaimer() async {
-    return await globalState.showCommonDialog<bool>(
-          dismissible: false,
-          child: AlertDialog(
-            title: Text(appLocalizations.disclaimer),
-            content: Container(
-              width: dialogCommonWidth,
-              constraints: const BoxConstraints(maxHeight: 200),
-              child: SingleChildScrollView(
-                child: SelectableText(
-                  appLocalizations.disclaimerDesc,
-                ),
-              ),
-            ),
-            actions: [
-              TextButton(
-                onPressed: () {
-                  Navigator.of(context).pop<bool>(false);
-                },
-                child: Text(appLocalizations.exit),
-              ),
-              TextButton(
-                onPressed: () {
-                  config.isDisclaimerAccepted = true;
-                  Navigator.of(context).pop<bool>(true);
-                },
-                child: Text(appLocalizations.agree),
-              )
-            ],
-          ),
-        ) ??
-        false;
-  }
-
-  Future<bool> handlerDisclaimer() async {
-    if (config.isDisclaimerAccepted) {
-      return true;
-    }
-    return showDisclaimer();
-  }
-
   addProfileFormURL(String url) async {
     if (globalState.navigatorKey.currentState?.canPop() ?? false) {
       globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
@@ -439,11 +382,7 @@ class AppController {
   }
 
   addProfileFormFile() async {
-    final platformFile = await globalState.safeRun(picker.pickerFile);
-    final bytes = platformFile?.bytes;
-    if (bytes == null) {
-      return null;
-    }
+    final platformFile = await globalState.safeRun(picker.pickerConfigFile);
     if (!context.mounted) return;
     globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
     toProfiles();
@@ -452,6 +391,10 @@ class AppController {
     final profile = await commonScaffoldState?.loadingRun<Profile?>(
       () async {
         await Future.delayed(const Duration(milliseconds: 300));
+        final bytes = platformFile?.bytes;
+        if (bytes == null) {
+          return null;
+        }
         return await Profile.normal(label: platformFile?.name).saveFile(bytes);
       },
       title: "${appLocalizations.add}${appLocalizations.profile}",
@@ -467,6 +410,9 @@ class AppController {
     addProfileFormURL(url);
   }
 
+  int get columns =>
+      other.getColumns(appState.viewMode, config.proxiesColumns);
+
   updateViewWidth(double width) {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       appState.viewWidth = width;
@@ -476,10 +422,7 @@ class AppController {
   List<Proxy> _sortOfName(List<Proxy> proxies) {
     return List.of(proxies)
       ..sort(
-        (a, b) => other.sortByChar(
-          other.getPinyin(a.name),
-          other.getPinyin(b.name),
-        ),
+        (a, b) => other.sortByChar(a.name, b.name),
       );
   }
 
@@ -510,108 +453,4 @@ class AppController {
       ProxiesSortType.name => _sortOfName(proxies),
     };
   }
-
-  String getCurrentSelectedName(String groupName) {
-    final group = appState.getGroupWithName(groupName);
-    return group?.getCurrentSelectedName(
-            config.currentSelectedMap[groupName] ?? '') ??
-        '';
-  }
-
-  Future<List<int>> backupData() async {
-    final homeDirPath = await appPath.getHomeDirPath();
-    final profilesPath = await appPath.getProfilesPath();
-    final configJson = config.toJson();
-    final clashConfigJson = clashConfig.toJson();
-    return Isolate.run<List<int>>(() async {
-      final archive = Archive();
-      archive.add("config.json", configJson);
-      archive.add("clashConfig.json", clashConfigJson);
-      await archive.addDirectoryToArchive(profilesPath, homeDirPath);
-      final zipEncoder = ZipEncoder();
-      return zipEncoder.encode(archive) ?? [];
-    });
-  }
-
-  updateTun() {
-    clashConfig.tun = clashConfig.tun.copyWith(
-      enable: !clashConfig.tun.enable,
-    );
-  }
-
-  updateSystemProxy() {
-    config.desktopProps = config.desktopProps.copyWith(
-      systemProxy: !config.desktopProps.systemProxy,
-    );
-  }
-
-  updateStart() {
-    updateStatus(!appState.isStart);
-  }
-
-  updateAutoLaunch() {
-    config.autoLaunch = !config.autoLaunch;
-  }
-
-  updateVisible() async {
-    final visible = await window?.isVisible();
-    if (visible != null && !visible) {
-      window?.show();
-    } else {
-      window?.hide();
-    }
-  }
-
-  updateMode() {
-    final index = Mode.values.indexWhere((item) => item == clashConfig.mode);
-    if (index == -1) {
-      return;
-    }
-    final nextIndex = index + 1 > Mode.values.length - 1 ? 0 : index + 1;
-    clashConfig.mode = Mode.values[nextIndex];
-  }
-
-  recoveryData(
-    List<int> data,
-    RecoveryOption recoveryOption,
-  ) async {
-    final archive = await Isolate.run<Archive>(() {
-      final zipDecoder = ZipDecoder();
-      return zipDecoder.decodeBytes(data);
-    });
-    final homeDirPath = await appPath.getHomeDirPath();
-    final configs =
-        archive.files.where((item) => item.name.endsWith(".json")).toList();
-    final profiles =
-        archive.files.where((item) => !item.name.endsWith(".json"));
-    final configIndex =
-        configs.indexWhere((config) => config.name == "config.json");
-    final clashConfigIndex =
-        configs.indexWhere((config) => config.name == "clashConfig.json");
-    if (configIndex == -1 || clashConfigIndex == -1) throw "invalid backup.zip";
-    final configFile = configs[configIndex];
-    final clashConfigFile = configs[clashConfigIndex];
-    final tempConfig = Config.fromJson(
-      json.decode(
-        utf8.decode(configFile.content),
-      ),
-    );
-    final tempClashConfig = ClashConfig.fromJson(
-      json.decode(
-        utf8.decode(clashConfigFile.content),
-      ),
-    );
-    for (final profile in profiles) {
-      final filePath = join(homeDirPath, profile.name);
-      final file = File(filePath);
-      await file.create(recursive: true);
-      await file.writeAsBytes(profile.content);
-    }
-    if (recoveryOption == RecoveryOption.onlyProfiles) {
-      config.update(tempConfig, RecoveryOption.onlyProfiles);
-    } else {
-      config.update(tempConfig, RecoveryOption.all);
-      clashConfig.update(tempClashConfig);
-    }
-  }
 }

lib/enum/enum.dart

@@ -1,9 +1,5 @@
 // ignore_for_file: constant_identifier_names
 
-import 'package:flutter/services.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:hotkey_manager/hotkey_manager.dart';
-
 enum GroupType { Selector, URLTest, Fallback, LoadBalance, Relay }
 
 enum GroupName { GLOBAL, Proxy, Auto, Fallback }
@@ -56,8 +52,6 @@ enum TunStack { gvisor, system, mixed }
 
 enum AccessControlMode { acceptSelected, rejectSelected }
 
-enum AccessSortType { none, name, time }
-
 enum ProfileType { file, url }
 
 enum ResultType { success, error }
@@ -90,65 +84,4 @@ enum CommonCardType { plain, filled }
 
 enum ProxiesType { tab, list }
 
-enum ProxiesLayout { loose, standard, tight }
-
 enum ProxyCardType { expand, shrink, min }
-
-enum DnsMode {
-  normal,
-  @JsonValue("fake-ip")
-  fakeIp,
-  @JsonValue("redir-host")
-  redirHost,
-  hosts
-}
-
-enum KeyboardModifier {
-  alt([
-    PhysicalKeyboardKey.altLeft,
-    PhysicalKeyboardKey.altRight,
-  ]),
-  capsLock([
-    PhysicalKeyboardKey.capsLock,
-  ]),
-  control([
-    PhysicalKeyboardKey.controlLeft,
-    PhysicalKeyboardKey.controlRight,
-  ]),
-  fn([
-    PhysicalKeyboardKey.fn,
-  ]),
-  meta([
-    PhysicalKeyboardKey.metaLeft,
-    PhysicalKeyboardKey.metaRight,
-  ]),
-  shift([
-    PhysicalKeyboardKey.shiftLeft,
-    PhysicalKeyboardKey.shiftRight,
-  ]);
-
-  final List<PhysicalKeyboardKey> physicalKeys;
-
-  const KeyboardModifier(this.physicalKeys);
-}
-
-extension KeyboardModifierExt on KeyboardModifier {
-  HotKeyModifier toHotKeyModifier() {
-    return switch (this) {
-      KeyboardModifier.alt => HotKeyModifier.alt,
-      KeyboardModifier.capsLock => HotKeyModifier.capsLock,
-      KeyboardModifier.control => HotKeyModifier.control,
-      KeyboardModifier.fn => HotKeyModifier.fn,
-      KeyboardModifier.meta => HotKeyModifier.meta,
-      KeyboardModifier.shift => HotKeyModifier.shift,
-    };
-  }
-}
-
-enum HotAction {
-  start,
-  view,
-  mode,
-  proxy,
-  tun,
-}

lib/fragments/about.dart

@@ -1,20 +1,7 @@
 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:url_launcher/url_launcher.dart';
 
 class AboutFragment extends StatelessWidget {
   const AboutFragment({super.key});
@@ -22,7 +9,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 +20,84 @@ 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,
+                      ),
+                      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,
+        ),
+        ListTile(
           title: Text(appLocalizations.checkUpdate),
           onTap: () {
             _checkUpdate(context);
           },
         ),
-        ListItem(
+        ListTile(
           title: const Text("Telegram"),
           onTap: () {
-            globalState.openUrl(
-              "https://t.me/FlClash",
+            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 +105,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

@@ -1,5 +1,4 @@
-import 'dart:convert';
-
+import 'package:collection/collection.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/plugins/app.dart';
@@ -7,9 +6,15 @@ 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';
-import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
+extension AccessControlExtension on AccessControl {
+  List<String> get currentList => switch (mode) {
+        AccessControlMode.acceptSelected => acceptList,
+        AccessControlMode.rejectSelected => rejectList,
+      };
+}
+
 class AccessFragment extends StatefulWidget {
   const AccessFragment({super.key});
 
@@ -18,164 +23,198 @@ class AccessFragment extends StatefulWidget {
 }
 
 class _AccessFragmentState extends State<AccessFragment> {
-  List<String> acceptList = [];
-  List<String> rejectList = [];
+  final packagesListenable = ValueNotifier<List<Package>>([]);
 
   @override
   void initState() {
     super.initState();
-    _updateInitList();
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      final appState = globalState.appController.appState;
-      if (appState.packages.isEmpty) {
-        Future.delayed(const Duration(milliseconds: 300), () async {
-          appState.packages = await app?.getPackages() ?? [];
-        });
-      }
+      Future.delayed(const Duration(milliseconds: 300), () async {
+        packagesListenable.value = await app?.getPackages() ?? [];
+      });
     });
   }
 
-  _updateInitList() {
-    final accessControl = globalState.appController.config.accessControl;
-    acceptList = accessControl.acceptList;
-    rejectList = accessControl.rejectList;
+  @override
+  void dispose() {
+    super.dispose();
+    packagesListenable.dispose();
   }
 
-  Widget _buildSearchButton() {
+  Widget _buildAppProxyModePopup() {
+    final items = [
+      CommonPopupMenuItem(
+        action: AccessControlMode.rejectSelected,
+        label: appLocalizations.blacklistMode,
+      ),
+      CommonPopupMenuItem(
+        action: AccessControlMode.acceptSelected,
+        label: appLocalizations.whitelistMode,
+      ),
+    ];
+    return Selector<Config, AccessControlMode>(
+      selector: (_, config) => config.accessControl.mode,
+      builder: (context, mode, __) {
+        return CommonPopupMenu<AccessControlMode>.radio(
+          icon: Icon(
+            Icons.mode_standby,
+            color: Theme.of(context).colorScheme.onSurfaceVariant,
+          ),
+          items: items,
+          onSelected: (value) {
+            final config = context.read<Config>();
+            config.accessControl = config.accessControl.copyWith(
+              mode: value,
+            );
+          },
+          selectedValue: mode,
+        );
+      },
+    );
+  }
+
+  Widget _buildFilterSystemAppButton() {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.accessControl.isFilterSystemApp,
+      builder: (context, isFilterSystemApp, __) {
+        final tooltip = isFilterSystemApp
+            ? appLocalizations.cancelFilterSystemApp
+            : appLocalizations.filterSystemApp;
+        return IconButton(
+          tooltip: tooltip,
+          onPressed: () {
+            final config = context.read<Config>();
+            config.accessControl = config.accessControl.copyWith(
+              isFilterSystemApp: !isFilterSystemApp,
+            );
+          },
+          icon: isFilterSystemApp
+              ? const Icon(Icons.filter_list_off)
+              : const Icon(Icons.filter_list),
+        );
+      },
+    );
+  }
+
+  Widget _buildSearchButton(List<Package> packages) {
     return IconButton(
       tooltip: appLocalizations.search,
       onPressed: () {
         showSearch(
           context: context,
           delegate: AccessControlSearchDelegate(
-            acceptList: acceptList,
-            rejectList: rejectList,
+            packages: packages,
           ),
-        ).then((_) => setState(() {
-          _updateInitList();
-        }));
+        ).then((_) => {setState(() {})});
       },
       icon: const Icon(Icons.search),
     );
   }
 
   Widget _buildSelectedAllButton({
+    required bool isAccessControl,
     required bool isSelectedAll,
     required List<String> allValueList,
   }) {
     final tooltip = isSelectedAll
         ? appLocalizations.cancelSelectAll
         : appLocalizations.selectAll;
-    return IconButton(
-      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,
-              ),
-          };
-        }
-      },
-      icon: isSelectedAll
-          ? const Icon(Icons.deselect)
-          : const Icon(Icons.select_all),
-    );
-  }
+    return AbsorbPointer(
+      absorbing: !isAccessControl,
+      child: FloatingActionButton(
+        tooltip: tooltip,
+        onPressed: () {
+          final config = globalState.appController.config;
+          final isAccept =
+              config.accessControl.mode == AccessControlMode.acceptSelected;
 
-  Widget _buildSettingButton() {
-    return IconButton(
-      onPressed: () {
-        showSheet(
-          title: appLocalizations.proxiesSetting,
-          context: context,
-          builder: (_) {
-            return AccessControlWidget(
-              context: context,
-            );
-          },
-        );
-      },
-      icon: const Icon(Icons.tune),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<Config, bool>(
-      selector: (_, config) => config.isAccessControl,
-      builder: (_, isAccessControl, child) {
-        return Column(
-          mainAxisSize: MainAxisSize.max,
-          children: [
-            Flexible(
-              flex: 0,
-              child: ListItem.switchItem(
-                title: Text(appLocalizations.appAccessControl),
-                delegate: SwitchDelegate(
-                  value: isAccessControl,
-                  onChanged: (isAccessControl) {
-                    final config = context.read<Config>();
-                    config.isAccessControl = isAccessControl;
-                  },
+          if (isSelectedAll) {
+            config.accessControl = switch (isAccept) {
+              true => config.accessControl.copyWith(
+                  acceptList: [],
                 ),
-              ),
-            ),
-            const Padding(
-              padding: EdgeInsets.symmetric(horizontal: 16),
-              child: Divider(
-                height: 12,
-              ),
-            ),
-            Flexible(
-              child: child!,
-            ),
-          ],
-        );
-      },
-      child: Selector<AppState, List<Package>>(
-        selector: (_, appState) => appState.packages,
-        builder: (_, packages, ___) {
-          return Selector2<AppState, Config, PackageListSelectorState>(
-            selector: (_, appState, config) => PackageListSelectorState(
-              accessControl: config.accessControl,
-              isAccessControl: config.isAccessControl,
-              packages: appState.packages,
-            ),
-            builder: (context, state, __) {
-              final accessControl = state.accessControl;
-              final isAccessControl = state.isAccessControl;
-              final accessControlMode = accessControl.mode;
-              final packages = state.getList(
+              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(
+      valueListenable: packagesListenable,
+      builder: (_, packages, ___) {
+        final accessControl = globalState.appController.config.accessControl;
+        final acceptList = accessControl.acceptList;
+        final rejectList = accessControl.rejectList;
+        final acceptPackages = packages.sorted((a, b) {
+          final isSelectA = acceptList.contains(a.packageName);
+          final isSelectB = acceptList.contains(b.packageName);
+          if (isSelectA && isSelectB) return 0;
+          if (isSelectA) return -1;
+          if (isSelectB) return 1;
+          return 0;
+        });
+        final rejectPackages = packages.sorted((a, b) {
+          final isSelectA = rejectList.contains(a.packageName);
+          final isSelectB = rejectList.contains(b.packageName);
+          if (isSelectA && isSelectB) return 0;
+          if (isSelectA) return -1;
+          if (isSelectB) return 1;
+          return 0;
+        });
+        return Selector<Config, PackageListSelectorState>(
+          selector: (_, config) => PackageListSelectorState(
+            accessControl: config.accessControl,
+            isAccessControl: config.isAccessControl,
+          ),
+          builder: (context, state, __) {
+            final accessControl = state.accessControl;
+            final isAccessControl = state.isAccessControl;
+            final isFilterSystemApp = accessControl.isFilterSystemApp;
+            final accessControlMode = accessControl.mode;
+            final packages =
                 accessControlMode == AccessControlMode.acceptSelected
-                    ? acceptList
-                    : rejectList,
-              );
-              final currentList = accessControl.currentList;
-              final packageNameList =
-                  packages.map((e) => e.packageName).toList();
-              final valueList = currentList.intersection(packageNameList);
-              final describe =
-                  accessControlMode == AccessControlMode.acceptSelected
-                      ? appLocalizations.accessControlAllowDesc
-                      : appLocalizations.accessControlNotAllowDesc;
-              return DisabledMask(
-                status: !isAccessControl,
+                    ? acceptPackages
+                    : rejectPackages;
+            final currentList = accessControl.currentList;
+            final currentPackages = isFilterSystemApp
+                ? packages
+                    .where((element) => element.isSystem == false)
+                    .toList()
+                : packages;
+            final packageNameList =
+                currentPackages.map((e) => e.packageName).toList();
+            final valueList = currentList.intersection(packageNameList);
+            final describe =
+                accessControlMode == AccessControlMode.acceptSelected
+                    ? appLocalizations.accessControlAllowDesc
+                    : appLocalizations.accessControlNotAllowDesc;
+            return DisabledMask(
+              status: !isAccessControl,
+              child: FloatLayout(
+                floatingWidget: FloatWrapper(
+                  child: _buildSelectedAllButton(
+                    isAccessControl: isAccessControl,
+                    isSelectedAll: valueList.length == packageNameList.length,
+                    allValueList: packageNameList,
+                  ),
+                ),
                 child: Column(
                   children: [
                     AbsorbPointer(
@@ -246,18 +285,9 @@ class _AccessFragmentState extends State<AccessFragment> {
                               mainAxisAlignment: MainAxisAlignment.end,
                               children: [
                                 Flexible(
-                                  child: _buildSearchButton(),
-                                ),
-                                Flexible(
-                                  child: _buildSelectedAllButton(
-                                    isSelectedAll: valueList.length ==
-                                        packageNameList.length,
-                                    allValueList: packageNameList,
-                                  ),
-                                ),
-                                Flexible(
-                                  child: _buildSettingButton(),
-                                ),
+                                    child: _buildSearchButton(currentPackages)),
+                                Flexible(child: _buildFilterSystemAppButton()),
+                                Flexible(child: _buildAppProxyModePopup()),
                               ],
                             ),
                           ],
@@ -266,52 +296,92 @@ class _AccessFragmentState extends State<AccessFragment> {
                     ),
                     Expanded(
                       flex: 1,
-                      child: packages.isEmpty
-                          ? const Center(
-                              child: CircularProgressIndicator(),
-                            )
-                          : ListView.builder(
-                              itemCount: packages.length,
-                              itemBuilder: (_, index) {
-                                final package = packages[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,
-                                      );
-                                    }
-                                  },
-                                );
-                              },
-                            ),
+                      child: FadeBox(
+                        key: const Key("fade_box"),
+                        child: currentPackages.isEmpty
+                            ? const Center(
+                                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,
+                                        );
+                                      }
+                                    },
+                                  );
+                                },
+                              ),
+                      ),
                     ),
                   ],
                 ),
-              );
-            },
-          );
-        },
-      ),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<Config, bool>(
+      selector: (_, config) => config.isAccessControl,
+      builder: (_, isAccessControl, child) {
+        return Column(
+          mainAxisSize: MainAxisSize.max,
+          children: [
+            Flexible(
+              flex: 0,
+              child: ListItem.switchItem(
+                title: Text(appLocalizations.appAccessControl),
+                delegate: SwitchDelegate(
+                  value: isAccessControl,
+                  onChanged: (isAccessControl) {
+                    final config = context.read<Config>();
+                    config.isAccessControl = isAccessControl;
+                  },
+                ),
+              ),
+            ),
+            const Padding(
+              padding: EdgeInsets.symmetric(horizontal: 16),
+              child: Divider(
+                height: 12,
+              ),
+            ),
+            Flexible(
+              child: child!,
+            ),
+          ],
+        );
+      },
+      child: _buildPackageList(),
     );
   }
 }
@@ -378,14 +448,23 @@ class PackageListItem extends StatelessWidget {
 }
 
 class AccessControlSearchDelegate extends SearchDelegate {
-  List<String> acceptList = [];
-  List<String> rejectList = [];
+  final List<Package> packages;
 
   AccessControlSearchDelegate({
-    required this.acceptList,
-    required this.rejectList,
+    required this.packages,
   });
 
+  List<Package> get _results {
+    final lowQuery = query.toLowerCase();
+    return packages
+        .where(
+          (package) =>
+              package.label.toLowerCase().contains(lowQuery) ||
+              package.packageName.contains(lowQuery),
+        )
+        .toList();
+  }
+
   @override
   List<Widget>? buildActions(BuildContext context) {
     return [
@@ -415,39 +494,26 @@ class AccessControlSearchDelegate extends SearchDelegate {
     );
   }
 
-  Widget _packageList() {
-    final lowQuery = query.toLowerCase();
-    return Selector2<AppState, Config, PackageListSelectorState>(
-      selector: (_, appState, config) => PackageListSelectorState(
-        packages: appState.packages,
+  Widget _packageList(List<Package> packages) {
+    return Selector<Config, PackageListSelectorState>(
+      selector: (_, config) => PackageListSelectorState(
         accessControl: config.accessControl,
         isAccessControl: config.isAccessControl,
       ),
       builder: (context, state, __) {
         final accessControl = state.accessControl;
-        final accessControlMode = accessControl.mode;
-        final packages = state.getList(
-          accessControlMode == AccessControlMode.acceptSelected
-              ? acceptList
-              : rejectList,
-        );
-        final queryPackages = packages
-            .where(
-              (package) =>
-                  package.label.toLowerCase().contains(lowQuery) ||
-                  package.packageName.contains(lowQuery),
-            )
-            .toList();
         final isAccessControl = state.isAccessControl;
+        final accessControlMode = accessControl.mode;
         final currentList = accessControl.currentList;
-        final packageNameList = packages.map((e) => e.packageName).toList();
+        final packageNameList =
+            this.packages.map((e) => e.packageName).toList();
         final valueList = currentList.intersection(packageNameList);
         return DisabledMask(
           status: !isAccessControl,
           child: ListView.builder(
-            itemCount: queryPackages.length,
+            itemCount: packages.length,
             itemBuilder: (_, index) {
-              final package = queryPackages[index];
+              final package = packages[index];
               return PackageListItem(
                 key: Key(package.packageName),
                 package: package,
@@ -485,268 +551,6 @@ class AccessControlSearchDelegate extends SearchDelegate {
 
   @override
   Widget buildSuggestions(BuildContext context) {
-    return _packageList();
-  }
-}
-
-class AccessControlWidget extends StatelessWidget {
-  final BuildContext context;
-
-  const AccessControlWidget({
-    super.key,
-    required this.context,
-  });
-
-  IconData _getIconWithAccessControlMode(AccessControlMode mode) {
-    return switch (mode) {
-      AccessControlMode.acceptSelected => Icons.adjust_outlined,
-      AccessControlMode.rejectSelected => Icons.block_outlined,
-    };
-  }
-
-  String _getTextWithAccessControlMode(AccessControlMode mode) {
-    return switch (mode) {
-      AccessControlMode.acceptSelected => appLocalizations.whitelistMode,
-      AccessControlMode.rejectSelected => appLocalizations.blacklistMode,
-    };
-  }
-
-  String _getTextWithAccessSortType(AccessSortType type) {
-    return switch (type) {
-      AccessSortType.none => appLocalizations.defaultText,
-      AccessSortType.name => appLocalizations.name,
-      AccessSortType.time => appLocalizations.time,
-    };
-  }
-
-  IconData _getIconWithProxiesSortType(AccessSortType type) {
-    return switch (type) {
-      AccessSortType.none => Icons.sort,
-      AccessSortType.name => Icons.sort_by_alpha,
-      AccessSortType.time => Icons.timeline,
-    };
-  }
-
-  String _getTextWithIsFilterSystemApp(bool isFilterSystemApp) {
-    return switch (isFilterSystemApp) {
-      true => appLocalizations.onlyOtherApps,
-      false => appLocalizations.allApps,
-    };
-  }
-
-  List<Widget> _buildModeSetting() {
-    return generateSection(
-      title: appLocalizations.mode,
-      items: [
-        SingleChildScrollView(
-          padding: const EdgeInsets.symmetric(horizontal: 16),
-          scrollDirection: Axis.horizontal,
-          child: Selector<Config, AccessControlMode>(
-            selector: (_, config) => config.accessControl.mode,
-            builder: (_, accessControlMode, __) {
-              return Wrap(
-                spacing: 16,
-                children: [
-                  for (final item in AccessControlMode.values)
-                    SettingInfoCard(
-                      Info(
-                        label: _getTextWithAccessControlMode(item),
-                        iconData: _getIconWithAccessControlMode(item),
-                      ),
-                      isSelected: accessControlMode == item,
-                      onPressed: () {
-                        final config = globalState.appController.config;
-                        config.accessControl = config.accessControl.copyWith(
-                          mode: item,
-                        );
-                      },
-                    )
-                ],
-              );
-            },
-          ),
-        )
-      ],
-    );
-  }
-
-  List<Widget> _buildSortSetting() {
-    return generateSection(
-      title: appLocalizations.sort,
-      items: [
-        SingleChildScrollView(
-          padding: const EdgeInsets.symmetric(horizontal: 16),
-          scrollDirection: Axis.horizontal,
-          child: Selector<Config, AccessSortType>(
-            selector: (_, config) => config.accessControl.sort,
-            builder: (_, accessSortType, __) {
-              return Wrap(
-                spacing: 16,
-                children: [
-                  for (final item in AccessSortType.values)
-                    SettingInfoCard(
-                      Info(
-                        label: _getTextWithAccessSortType(item),
-                        iconData: _getIconWithProxiesSortType(item),
-                      ),
-                      isSelected: accessSortType == item,
-                      onPressed: () {
-                        final config = globalState.appController.config;
-                        config.accessControl = config.accessControl.copyWith(
-                          sort: item,
-                        );
-                      },
-                    ),
-                ],
-              );
-            },
-          ),
-        ),
-      ],
-    );
-  }
-
-  List<Widget> _buildSourceSetting() {
-    return generateSection(
-      title: appLocalizations.source,
-      items: [
-        SingleChildScrollView(
-          padding: const EdgeInsets.symmetric(horizontal: 16),
-          scrollDirection: Axis.horizontal,
-          child: Selector<Config, bool>(
-            selector: (_, config) => config.accessControl.isFilterSystemApp,
-            builder: (_, isFilterSystemApp, __) {
-              return Wrap(
-                spacing: 16,
-                children: [
-                  for (final item in [false, true])
-                    SettingTextCard(
-                      _getTextWithIsFilterSystemApp(item),
-                      isSelected: isFilterSystemApp == item,
-                      onPressed: () {
-                        final config = globalState.appController.config;
-                        config.accessControl = config.accessControl.copyWith(
-                          isFilterSystemApp: item,
-                        );
-                      },
-                    )
-                ],
-              );
-            },
-          ),
-        )
-      ],
-    );
-  }
-
-  _intelligentSelected() async {
-    final appState = globalState.appController.appState;
-    final config = globalState.appController.config;
-    final accessControl = config.accessControl;
-    final packageNames = appState.packages
-        .where(
-          (item) =>
-              accessControl.isFilterSystemApp ? item.isSystem == false : true,
-        )
-        .map((item) => item.packageName);
-    Navigator.of(context).pop();
-    final commonScaffoldState = context.commonScaffoldState;
-    if (commonScaffoldState?.mounted != true) return;
-    final selectedPackageNames =
-        (await commonScaffoldState?.loadingRun<List<String>>(
-              () async {
-                return await app?.getChinaPackageNames() ?? [];
-              },
-            ))
-                ?.toSet() ??
-            {};
-    final acceptList = packageNames
-        .where((item) => !selectedPackageNames.contains(item))
-        .toList();
-    final rejectList = packageNames
-        .where((item) => selectedPackageNames.contains(item))
-        .toList();
-    config.accessControl = accessControl.copyWith(
-      acceptList: acceptList,
-      rejectList: rejectList,
-    );
-  }
-
-  _copyToClipboard() async {
-    await globalState.safeRun(() {
-      final data = globalState.appController.config.accessControl.toJson();
-      Clipboard.setData(
-        ClipboardData(
-          text: json.encode(data),
-        ),
-      );
-    });
-    if (!context.mounted) return;
-    Navigator.of(context).pop();
-  }
-
-  _pasteToClipboard() async {
-    await globalState.safeRun(() async {
-      final config = globalState.appController.config;
-      final data = await Clipboard.getData('text/plain');
-      final text = data?.text;
-      if (text == null) return;
-      config.accessControl = AccessControl.fromJson(
-        json.decode(text),
-      );
-    });
-    if (!context.mounted) return;
-    Navigator.of(context).pop();
-  }
-
-  List<Widget> _buildActionSetting() {
-    return generateSection(
-      title: appLocalizations.action,
-      items: [
-        Padding(
-          padding: const EdgeInsets.symmetric(
-            horizontal: 16,
-          ),
-          child: Wrap(
-            runSpacing: 16,
-            spacing: 16,
-            children: [
-              CommonChip(
-                avatar: const Icon(Icons.auto_awesome),
-                label: appLocalizations.intelligentSelected,
-                onPressed: _intelligentSelected,
-              ),
-              CommonChip(
-                avatar: const Icon(Icons.paste),
-                label: appLocalizations.clipboardImport,
-                onPressed: _pasteToClipboard,
-              ),
-              CommonChip(
-                avatar: const Icon(Icons.content_copy),
-                label: appLocalizations.clipboardExport,
-                onPressed: _copyToClipboard,
-              )
-            ],
-          ),
-        )
-      ],
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 32),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          ..._buildModeSetting(),
-          ..._buildSortSetting(),
-          ..._buildSourceSetting(),
-          ..._buildActionSetting(),
-        ],
-      ),
-    );
+    return _packageList(_results);
   }
 }

lib/fragments/application_setting.dart

@@ -76,7 +76,7 @@ class ApplicationSettingFragment extends StatelessWidget {
         selector: (_, config) => config.autoRun,
         builder: (_, autoRun, child) {
           return ListItem.switchItem(
-            leading: const Icon(Icons.not_started),
+            leading: const Icon(Icons.start),
             title: Text(appLocalizations.autoRun),
             subtitle: Text(appLocalizations.autoRunDesc),
             delegate: SwitchDelegate(

lib/fragments/backup_and_recovery.dart

@@ -1,9 +1,8 @@
-import 'dart:typed_data';
-
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/common/dav_client.dart';
 import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/models/config.dart';
+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';
@@ -11,9 +10,16 @@ import 'package:fl_clash/widgets/text.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-class BackupAndRecovery extends StatelessWidget {
+class BackupAndRecovery extends StatefulWidget {
   const BackupAndRecovery({super.key});
 
+  @override
+  State<BackupAndRecovery> createState() => _BackupAndRecoveryState();
+}
+
+class _BackupAndRecoveryState extends State<BackupAndRecovery> {
+  DAVClient? _client;
+
   _showAddWebDAV(DAV? dav) async {
     await globalState.showCommonDialog<String>(
       child: WebDAVFormDialog(
@@ -22,15 +28,11 @@ class BackupAndRecovery extends StatelessWidget {
     );
   }
 
-  _backupOnWebDAV(BuildContext context, DAVClient client) async {
+  _backup() async {
     final commonScaffoldState = context.commonScaffoldState;
-    final res = await commonScaffoldState?.loadingRun<bool>(
-      () async {
-        final backupData = await globalState.appController.backupData();
-        return await client.backup(Uint8List.fromList(backupData));
-      },
-      title: appLocalizations.backup,
-    );
+    final res = await commonScaffoldState?.loadingRun<bool>(() async {
+      return await _client?.backup();
+    });
     if (res != true) return;
     globalState.showMessage(
       title: appLocalizations.backup,
@@ -38,20 +40,11 @@ class BackupAndRecovery extends StatelessWidget {
     );
   }
 
-  _recoveryOnWebDAV(
-    BuildContext context,
-    DAVClient client,
-    RecoveryOption recoveryOption,
-  ) async {
+  _recovery(RecoveryOption recoveryOption) async {
     final commonScaffoldState = context.commonScaffoldState;
-    final res = await commonScaffoldState?.loadingRun<bool>(
-      () async {
-        final data = await client.recovery();
-        await globalState.appController.recoveryData(data, recoveryOption);
-        return true;
-      },
-      title: appLocalizations.recovery,
-    );
+    final res = await commonScaffoldState?.loadingRun<bool>(() async {
+      return await _client?.recovery(recoveryOption: recoveryOption);
+    });
     if (res != true) return;
     globalState.showMessage(
       title: appLocalizations.recovery,
@@ -59,66 +52,12 @@ class BackupAndRecovery extends StatelessWidget {
     );
   }
 
-  _handleRecoveryOnWebDAV(BuildContext context, DAVClient client) async {
+  _handleRecovery() async {
     final recoveryOption = await globalState.showCommonDialog<RecoveryOption>(
       child: const RecoveryOptionsDialog(),
     );
-    if (recoveryOption == null || !context.mounted) return;
-    _recoveryOnWebDAV(context, client, recoveryOption);
-  }
-
-  _backupOnLocal(BuildContext context) async {
-    final commonScaffoldState = context.commonScaffoldState;
-    final res = await commonScaffoldState?.loadingRun<bool>(
-      () async {
-        final backupData = await globalState.appController.backupData();
-        final value = await picker.saveFile(
-          other.getBackupFileName(),
-          Uint8List.fromList(backupData),
-        );
-        if (value == null) return false;
-        return true;
-      },
-      title: appLocalizations.backup,
-    );
-    if (res != true) return;
-    globalState.showMessage(
-      title: appLocalizations.backup,
-      message: TextSpan(text: appLocalizations.backupSuccess),
-    );
-  }
-
-  _recoveryOnLocal(
-    BuildContext context,
-    RecoveryOption recoveryOption,
-  ) async {
-    final file = await picker.pickerFile();
-    final data = file?.bytes;
-    if (data == null || !context.mounted) return;
-    final commonScaffoldState = context.commonScaffoldState;
-    final res = await commonScaffoldState?.loadingRun<bool>(
-      () async {
-        await globalState.appController.recoveryData(
-          List<int>.from(data),
-          recoveryOption,
-        );
-        return true;
-      },
-      title: appLocalizations.recovery,
-    );
-    if (res != true) return;
-    globalState.showMessage(
-      title: appLocalizations.recovery,
-      message: TextSpan(text: appLocalizations.recoverySuccess),
-    );
-  }
-
-  _handleRecoveryOnLocal(BuildContext context) async {
-    final recoveryOption = await globalState.showCommonDialog<RecoveryOption>(
-      child: const RecoveryOptionsDialog(),
-    );
-    if (recoveryOption == null || !context.mounted) return;
-    _recoveryOnLocal(context, recoveryOption);
+    if (recoveryOption == null) return;
+    _recovery(recoveryOption);
   }
 
   @override
@@ -126,11 +65,12 @@ class BackupAndRecovery extends StatelessWidget {
     return Selector<Config, DAV?>(
       selector: (_, config) => config.dav,
       builder: (_, dav, __) {
-        final client = dav != null ? DAVClient(dav) : null;
-        return ListView(
-          children: [
-            ListHeader(title: appLocalizations.remote),
-            if (dav == null)
+        if (dav == null) {
+          return ListView(
+            children: [
+              ListHeader(
+                title: appLocalizations.account,
+              ),
               ListItem(
                 leading: const Icon(Icons.account_box),
                 title: Text(appLocalizations.noInfo),
@@ -143,113 +83,96 @@ class BackupAndRecovery extends StatelessWidget {
                     appLocalizations.bind,
                   ),
                 ),
-              )
-            else ...[
-              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: client!.pingCompleter.future,
-                        builder: (_, snapshot) {
-                          return Center(
-                            child: FadeBox(
-                              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,
-                                    ),
-                            ),
-                          );
-                        },
-                      ),
-                    ],
-                  ),
-                ),
-                trailing: FilledButton.tonal(
-                  onPressed: () {
-                    _showAddWebDAV(dav);
-                  },
-                  child: Text(
-                    appLocalizations.edit,
-                  ),
-                ),
-              ),
-              const SizedBox(
-                height: 4,
-              ),
-              ListItem.input(
-                title: Text(appLocalizations.file),
-                subtitle: Text(dav.fileName),
-                delegate: InputDelegate(
-                  title: appLocalizations.file,
-                  value: dav.fileName,
-                  resetValue: defaultDavFileName,
-                  onChanged: (String? value) {
-                    if (value == null) {
-                      return;
-                    }
-                    globalState.appController.config.dav =
-                        globalState.appController.config.dav?.copyWith(
-                      fileName: value,
-                    );
-                  },
-                ),
-              ),
-              ListItem(
-                onTap: () {
-                  _backupOnWebDAV(context, client);
-                },
-                title: Text(appLocalizations.backup),
-                subtitle: Text(appLocalizations.remoteBackupDesc),
-              ),
-              ListItem(
-                onTap: () {
-                  _handleRecoveryOnWebDAV(context, client);
-                },
-                title: Text(appLocalizations.recovery),
-                subtitle: Text(appLocalizations.remoteRecoveryDesc),
               ),
             ],
-            ListHeader(title: appLocalizations.local),
+          );
+        }
+        _client = DAVClient(dav);
+        final pingFuture = _client!.pingCompleter.future;
+        return ListView(
+          children: [
+            ListHeader(title: appLocalizations.account),
             ListItem(
-              onTap: () {
-                _backupOnLocal(context);
-              },
-              title: Text(appLocalizations.backup),
-              subtitle: Text(appLocalizations.localBackupDesc),
+              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,
+                                    ),
+                                  )
+                                : 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,
+                ),
+              ),
             ),
-            ListItem(
-              onTap: () {
-                _handleRecoveryOnLocal(context);
+            FutureBuilder<bool>(
+              future: pingFuture,
+              builder: (_, snapshot) {
+                return FadeBox(
+                  key: const Key("fade_box_2"),
+                  child: snapshot.data == true
+                      ? Column(
+                          children: [
+                            ListHeader(
+                                title: appLocalizations.backupAndRecovery),
+                            ListItem(
+                              onTab: _backup,
+                              title: Text(appLocalizations.backup),
+                              subtitle: Text(appLocalizations.backupDesc),
+                            ),
+                            ListItem(
+                              onTab: _handleRecovery,
+                              title: Text(appLocalizations.recovery),
+                              subtitle: Text(appLocalizations.recoveryDesc),
+                            ),
+                          ],
+                        )
+                      : Container(),
+                );
               },
-              title: Text(appLocalizations.recovery),
-              subtitle: Text(appLocalizations.localRecoveryDesc),
             ),
           ],
         );
@@ -258,50 +181,6 @@ class BackupAndRecovery extends StatelessWidget {
   }
 }
 
-class RecoveryOptionsDialog extends StatefulWidget {
-  const RecoveryOptionsDialog({super.key});
-
-  @override
-  State<RecoveryOptionsDialog> createState() => _RecoveryOptionsDialogState();
-}
-
-class _RecoveryOptionsDialogState extends State<RecoveryOptionsDialog> {
-  _handleOnTab(RecoveryOption? value) {
-    if (value == null) return;
-    Navigator.of(context).pop(value);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text(appLocalizations.recovery),
-      contentPadding: const EdgeInsets.symmetric(
-        horizontal: 8,
-        vertical: 16,
-      ),
-      content: SizedBox(
-        width: 250,
-        child: Wrap(
-          children: [
-            ListItem(
-              onTap: () {
-                _handleOnTab(RecoveryOption.onlyProfiles);
-              },
-              title: Text(appLocalizations.recoveryProfiles),
-            ),
-            ListItem(
-              onTap: () {
-                _handleOnTab(RecoveryOption.all);
-              },
-              title: Text(appLocalizations.recoveryAll),
-            )
-          ],
-        ),
-      ),
-    );
-  }
-}
-
 class WebDAVFormDialog extends StatefulWidget {
   final DAV? dav;
 
@@ -360,7 +239,7 @@ class _WebDAVFormDialogState extends State<WebDAVFormDialog> {
             children: [
               TextFormField(
                 controller: uriController,
-                maxLines: 5,
+                maxLines: 2,
                 minLines: 1,
                 decoration: InputDecoration(
                   prefixIcon: const Icon(Icons.link),
@@ -435,3 +314,47 @@ class _WebDAVFormDialogState extends State<WebDAVFormDialog> {
     );
   }
 }
+
+class RecoveryOptionsDialog extends StatefulWidget {
+  const RecoveryOptionsDialog({super.key});
+
+  @override
+  State<RecoveryOptionsDialog> createState() => _RecoveryOptionsDialogState();
+}
+
+class _RecoveryOptionsDialogState extends State<RecoveryOptionsDialog> {
+  _handleOnTab(RecoveryOption? value) {
+    if (value == null) return;
+    Navigator.of(context).pop(value);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(appLocalizations.recovery),
+      contentPadding: const EdgeInsets.symmetric(
+        horizontal: 8,
+        vertical: 16,
+      ),
+      content: SizedBox(
+        width: 250,
+        child: Wrap(
+          children: [
+            ListItem(
+              onTab: () {
+                _handleOnTab(RecoveryOption.onlyProfiles);
+              },
+              title: Text(appLocalizations.recoveryProfiles),
+            ),
+            ListItem(
+              onTab: () {
+                _handleOnTab(RecoveryOption.all);
+              },
+              title: Text(appLocalizations.recoveryAll),
+            )
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/fragments/config.dart

@@ -0,0 +1,557 @@
+import 'dart:io';
+
+import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class ConfigFragment extends StatefulWidget {
+  const ConfigFragment({super.key});
+
+  @override
+  State<ConfigFragment> createState() => _ConfigFragmentState();
+}
+
+class _ConfigFragmentState extends State<ConfigFragment> {
+  _modifyMixedPort(num mixedPort) async {
+    final port = await globalState.showCommonDialog(
+      child: MixedPortFormDialog(
+        mixedPort: mixedPort,
+      ),
+    );
+    if (port != null && port != mixedPort && mounted) {
+      try {
+        final mixedPort = int.parse(port);
+        if (mixedPort < 1024 || mixedPort > 49151) throw "Invalid port";
+        globalState.appController.clashConfig.mixedPort = mixedPort;
+        globalState.appController.updateClashConfigDebounce();
+      } catch (e) {
+        globalState.showMessage(
+          title: appLocalizations.proxyPort,
+          message: TextSpan(
+            text: e.toString(),
+          ),
+        );
+      }
+    }
+  }
+
+  _showLogLevelDialog(LogLevel value) {
+    globalState.showCommonDialog(
+      child: AlertDialog(
+        title: Text(appLocalizations.logLevel),
+        contentPadding: const EdgeInsets.symmetric(
+          horizontal: 8,
+          vertical: 16,
+        ),
+        content: SizedBox(
+          width: 250,
+          child: Wrap(
+            children: [
+              for (final logLevel in LogLevel.values)
+                ListItem.radio(
+                  delegate: RadioDelegate<LogLevel>(
+                    value: logLevel,
+                    groupValue: value,
+                    onChanged: (LogLevel? value) {
+                      if (value == null) {
+                        return;
+                      }
+                      final appController = globalState.appController;
+                      appController.clashConfig.logLevel = value;
+                      appController.updateClashConfigDebounce();
+                      Navigator.of(context).pop();
+                    },
+                  ),
+                  title: Text(logLevel.name),
+                )
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  _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;
+                  },
+                ),
+              );
+            },
+          ),
+        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.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),
+              onTab: () {
+                _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),
+              onTab: () {
+                _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),
+              onTab: () {
+                _modifyTestUrl(value);
+              },
+            );
+          },
+        ),
+        Selector<ClashConfig, int>(
+          selector: (_, clashConfig) => clashConfig.mixedPort,
+          builder: (_, mixedPort, __) {
+            return ListItem(
+              onTab: () {
+                _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",
+                ),
+              ),
+            );
+          },
+        ),
+        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();
+                },
+              ),
+            );
+          },
+        ),
+      ],
+    );
+  }
+
+  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();
+                  },
+                ),
+              );
+            },
+          ),
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    List<Widget> items = [
+      ..._buildAppSection(),
+      ..._buildGeneralSection(),
+      ..._buildMoreSection(),
+    ];
+    return ListView.builder(
+      padding: const EdgeInsets.only(bottom: 32),
+      itemBuilder: (_, index) {
+        return Container(
+          alignment: Alignment.center,
+          child: items[index],
+        );
+      },
+      itemCount: items.length,
+    );
+  }
+}
+
+class MixedPortFormDialog extends StatefulWidget {
+  final num mixedPort;
+
+  const MixedPortFormDialog({super.key, required this.mixedPort});
+
+  @override
+  State<MixedPortFormDialog> createState() => _MixedPortFormDialogState();
+}
+
+class _MixedPortFormDialogState extends State<MixedPortFormDialog> {
+  late TextEditingController portController;
+
+  @override
+  void initState() {
+    super.initState();
+    portController = TextEditingController(text: "${widget.mixedPort}");
+  }
+
+  _handleUpdate() async {
+    final port = portController.value.text;
+    if (port.isEmpty) return;
+    Navigator.of(context).pop<String>(port);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(appLocalizations.proxyPort),
+      content: SizedBox(
+        width: 300,
+        child: Wrap(
+          runSpacing: 16,
+          children: [
+            TextField(
+              controller: portController,
+              decoration: const InputDecoration(
+                border: OutlineInputBorder(),
+              ),
+            ),
+          ],
+        ),
+      ),
+      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,
+          child: Text(appLocalizations.submit),
+        )
+      ],
+    );
+  }
+}

lib/fragments/config/app.dart

@@ -1,63 +0,0 @@
-import 'dart:io';
-
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/config.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class CloseConnectionsSwitch extends StatelessWidget {
-  const CloseConnectionsSwitch({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return 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;
-            },
-          ),
-        );
-      },
-    );
-  }
-}
-
-class UsageSwitch extends StatelessWidget {
-  const UsageSwitch({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return 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;
-            },
-          ),
-        );
-      },
-    );
-  }
-}
-
-final appItems = [
-  const CloseConnectionsSwitch(),
-  const UsageSwitch(),
-];

lib/fragments/config/config.dart

@@ -1,91 +0,0 @@
-import 'dart:io';
-
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/fragments/config/app.dart';
-import 'package:fl_clash/fragments/config/dns.dart';
-import 'package:fl_clash/fragments/config/general.dart';
-import 'package:fl_clash/fragments/config/vpn.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-
-class ConfigFragment extends StatefulWidget {
-  const ConfigFragment({super.key});
-
-  @override
-  State<ConfigFragment> createState() => _ConfigFragmentState();
-}
-
-class _ConfigFragmentState extends State<ConfigFragment> {
-  @override
-  Widget build(BuildContext context) {
-    List<Widget> items = [
-      ListItem.open(
-        title: Text(appLocalizations.app),
-        subtitle: Text(appLocalizations.appDesc),
-        leading: const Icon(Icons.settings_applications),
-        delegate: OpenDelegate(
-          title: appLocalizations.app,
-          isBlur: false,
-          widget: generateListView(
-            appItems
-                .separated(
-                  const Divider(
-                    height: 0,
-                  ),
-                )
-                .toList(),
-          ),
-        ),
-      ),
-      if (Platform.isAndroid)
-        ListItem.open(
-          title: const Text("VPN"),
-          subtitle: Text(appLocalizations.vpnDesc),
-          leading: const Icon(Icons.vpn_key),
-          delegate: OpenDelegate(
-            title: "VPN",
-            isBlur: false,
-            widget: generateListView(
-              vpnItems,
-            ),
-          ),
-        ),
-      ListItem.open(
-        title: Text(appLocalizations.general),
-        subtitle: Text(appLocalizations.generalDesc),
-        leading: const Icon(Icons.build),
-        delegate: OpenDelegate(
-          title: appLocalizations.general,
-          widget: generateListView(
-            generalItems,
-          ),
-          isBlur: false,
-          extendPageWidth: 360,
-        ),
-      ),
-      ListItem.open(
-        title: const Text("DNS"),
-        subtitle: Text(appLocalizations.dnsDesc),
-        leading: const Icon(Icons.dns),
-        delegate: OpenDelegate(
-          title: "DNS",
-          widget: generateListView(
-            dnsItems,
-          ),
-          isScaffold: true,
-          isBlur: false,
-          extendPageWidth: 360,
-        ),
-      )
-    ];
-    return generateListView(
-      items
-          .separated(
-            const Divider(
-              height: 0,
-            ),
-          )
-          .toList(),
-    );
-  }
-}