Update build.yml

Add expire show

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: build
 on:
   push:
     tags:
-      - 'v*'
+      - '*'
 
 jobs:
   build:
@@ -21,12 +21,6 @@ jobs:
             os: macos-13
 
     steps:
-      - name: Check Matrix
-        run: |
-            echo "Running on ${{ matrix.os }}"
-            echo "Arch: ${{ runner.arch }}"
-            gcc --version
-
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -88,7 +82,7 @@ jobs:
 
 
   upload-release:
-    if: ${{ !contains(github.ref, '+') }}
+    if: ${{ !endsWith(github.ref, '-debug') }}
     permissions: write-all
     needs: [ build ]
     runs-on: ubuntu-latest

.gitmodules

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

README.md

@@ -34,8 +34,6 @@ on Mobile:
 
 💡 Based on Material You Design, [Surfboard](https://github.com/getsurfboard/surfboard)-like UI
 
-☁️ Supports data sync via WebDAV
-
 ✨ Support subscription link, Dark mode
 
 ## Contact

README_zh_CN.md

@@ -34,8 +34,6 @@ on Mobile:
 
 💡 基本 Material You 设计, 类[Surfboard](https://github.com/getsurfboard/surfboard)用户界面
 
-☁️ 支持通过WebDAV同步数据
-
 ✨ 支持一键导入订阅, 深色模式
 
 ## Contact

android/app/build.gradle

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

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-feature
+            android:name="android.software.leanback"
+            android:required="false" />
     <uses-feature
             android:name="android.hardware.touchscreen"
             android:required="false" />
@@ -14,15 +17,12 @@
     <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"
-        tools:ignore="SystemPermissionTypo" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
-        tools:ignore="QueryAllPackagesPermission" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission"/>
 
     <application
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:extractNativeLibs="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:label="FlClash">
         <activity
@@ -73,8 +73,7 @@
         <service
             android:name=".services.FlClashTileService"
             android:exported="true"
-            android:icon="@drawable/icon"
-            android:foregroundServiceType="specialUse"
+            android:icon="@drawable/tile_icon"
             android:label="FlClash"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>

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

@@ -1,7 +1,6 @@
 package com.follow.clash
 
 import androidx.lifecycle.MutableLiveData
-import com.follow.clash.plugins.AppPlugin
 import com.follow.clash.plugins.TilePlugin
 import io.flutter.embedding.engine.FlutterEngine
 import java.util.Date
@@ -15,12 +14,10 @@ enum class RunState {
 class GlobalState {
     companion object {
         val runState: MutableLiveData<RunState> = MutableLiveData<RunState>(RunState.STOP)
+        var runTime: Date? = null
         var flutterEngine: FlutterEngine? = null
         fun getCurrentTilePlugin(): TilePlugin? =
             flutterEngine?.plugins?.get(TilePlugin::class.java) as TilePlugin?
-
-        fun getCurrentAppPlugin(): AppPlugin? =
-            flutterEngine?.plugins?.get(AppPlugin::class.java) as AppPlugin?
     }
 }
 

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

@@ -1,18 +1,17 @@
 package com.follow.clash.extensions
 
+import java.net.InetSocketAddress
+
 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 {
@@ -30,8 +29,3 @@ fun Metadata.getProtocol(): Int? {
     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/models/AccessControl.kt

@@ -10,9 +10,3 @@ data class AccessControl(
     val acceptList: List<String>,
     val rejectList: List<String>,
 )
-
-data class Props(
-    val accessControl: AccessControl?,
-    val allowBypass: Boolean?,
-    val systemProxy: Boolean?,
-)

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

@@ -1,15 +1,11 @@
 package com.follow.clash.models
 
-data class Process(
-    val id: Int,
-    val metadata: Metadata,
-)
-
 data class Metadata(
     val network: String,
     val sourceIP: String,
     val sourcePort: Int,
     val destinationIP: String,
     val destinationPort: Int,
+    val remoteDestination: String,
     val host: String
 )

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

@@ -6,16 +6,13 @@ import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.net.ConnectivityManager
-import android.net.Uri
 import android.os.Build
 import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.core.content.getSystemService
-import androidx.core.graphics.drawable.toBitmap
 import com.follow.clash.extensions.getBase64
-import com.follow.clash.extensions.getInetSocketAddress
 import com.follow.clash.extensions.getProtocol
-import com.follow.clash.models.Process
+import com.follow.clash.models.Metadata
 import com.follow.clash.models.Package
 import com.google.gson.Gson
 import io.flutter.embedding.engine.plugins.FlutterPlugin
@@ -81,34 +78,21 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
             "getPackageIcon" -> {
                 scope.launch {
                     val packageName = call.argument<String>("packageName")
-                    if (packageName == null) {
+                    if (packageName != null) {
+                        result.success(getPackageIcon(packageName))
+                    } else {
                         result.success(null)
-                        return@launch
-                    }
-                    val packageIcon = getPackageIcon(packageName)
-                    packageIcon.let {
-                        if (it != null) {
-                            result.success(it)
-                            return@launch
-                        }
-                        if (iconMap["default"] == null) {
-                            iconMap["default"] =
-                                context?.packageManager?.defaultActivityIcon?.getBase64()
-                        }
-                        result.success(iconMap["default"])
-                        return@launch
                     }
                 }
             }
 
-            "resolverProcess" -> {
+            "getPackageName" -> {
                 val data = call.argument<String>("data")
-                val process =
+                val metadata =
                     if (data != null) Gson().fromJson(
                         data,
-                        Process::class.java
+                        Metadata::class.java
                     ) else null
-                val metadata = process?.metadata
                 val protocol = metadata?.getProtocol()
                 if (protocol == null) {
                     result.success(null)
@@ -116,27 +100,17 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 }
                 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 (context == null) result.success(null)
+                        val source = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
+                        val target = InetSocketAddress(
+                            metadata.host.ifEmpty { metadata.destinationIP },
+                            metadata.destinationPort
+                        )
                         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
-                        }
+                        val uid =
+                            connectivity?.getConnectionOwnerUid(protocol, source, target)
                         if (uid == null || uid == -1) {
                             result.success(null)
                             return@withContext
@@ -163,18 +137,13 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     private suspend fun getPackageIcon(packageName: String): String? {
         val packageManager = context?.packageManager
         if (iconMap[packageName] == null) {
-            iconMap[packageName] = try {
-                packageManager?.getApplicationIcon(packageName)?.getBase64()
-            } catch (_: Exception) {
-                null
-            }
-
+            iconMap[packageName] = packageManager?.getApplicationIcon(packageName)?.getBase64()
         }
         return iconMap[packageName]
     }
 
     private suspend fun getPackages(): String {
-        return withContext(Dispatchers.Default) {
+        return withContext(Dispatchers.Default){
             val packageManager = context?.packageManager
             val packages: List<Package>? =
                 packageManager?.getInstalledPackages(PackageManager.GET_META_DATA)?.filter {
@@ -193,10 +162,6 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         }
     }
 
-    fun requestGc() {
-        channel.invokeMethod("gc", null)
-    }
-
     override fun onAttachedToActivity(binding: ActivityPluginBinding) {
         activity = binding.activity;
         scope = CoroutineScope(Dispatchers.Default)

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

@@ -16,7 +16,7 @@ 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.models.AccessControl
 import com.follow.clash.services.FlClashVpnService
 import com.google.gson.Gson
 import io.flutter.embedding.android.FlutterActivity
@@ -25,6 +25,7 @@ import io.flutter.embedding.engine.plugins.activity.ActivityAware
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
+import java.util.Date
 
 
 class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware {
@@ -40,7 +41,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
     private var flClashVpnService: FlClashVpnService? = null
     private var isBound = false
     private var port: Int? = null
-    private var props: Props? = null
+    private var accessControl: AccessControl? = null
     private lateinit var title: String
     private lateinit var content: String
 
@@ -72,8 +73,8 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         "StartProxy" -> {
             port = call.argument<Int>("port")
             val args = call.argument<String>("args")
-            props =
-                if (args != null) Gson().fromJson(args, Props::class.java) else null
+            accessControl =
+                if (args != null) Gson().fromJson(args, AccessControl::class.java) else null
             handleStartVpn()
             result.success(true)
         }
@@ -93,6 +94,10 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
             }
         }
 
+        "GetRunTimeStamp" -> {
+            result.success(GlobalState.runTime?.time)
+        }
+
         "startForeground" -> {
             title = call.argument<String>("title") as String
             content = call.argument<String>("content") as String
@@ -116,8 +121,9 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
 
     private fun startVpn(port: Int) {
         if (GlobalState.runState.value == RunState.START) return;
-        flClashVpnService?.start(port, props)
+        flClashVpnService?.start(port, accessControl)
         GlobalState.runState.value = RunState.START
+        GlobalState.runTime = Date()
         startAfter()
     }
 
@@ -126,6 +132,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         flClashVpnService?.stop()
         unbindService()
         GlobalState.runState.value = RunState.STOP;
+        GlobalState.runTime = null;
     }
 
     @SuppressLint("ForegroundServiceType")

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

@@ -19,6 +19,7 @@ import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.embedding.engine.dart.DartExecutor
 
 
+@RequiresApi(Build.VERSION_CODES.N)
 class FlClashTileService : TileService() {
 
     private val observer = Observer<RunState> { runState ->
@@ -42,27 +43,19 @@ class FlClashTileService : TileService() {
         GlobalState.runState.observeForever(observer)
     }
 
+    @SuppressLint("StartActivityAndCollapseDeprecated")
     private fun activityTransfer() {
         val intent = Intent(this, TempActivity::class.java)
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
-        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
-            PendingIntent.getActivity(
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        if (Build.VERSION.SDK_INT >= 34) {
+            val pendingIntent = PendingIntent.getActivity(
                 this,
                 0,
                 intent,
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+                PendingIntent.FLAG_IMMUTABLE
             )
-        } else {
-            PendingIntent.getActivity(
-                this,
-                0,
-                intent,
-                PendingIntent.FLAG_UPDATE_CURRENT
-            )
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             startActivityAndCollapse(pendingIntent)
-        }else{
+        } else {
             startActivityAndCollapse(intent)
         }
     }

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

@@ -1,9 +1,10 @@
 package com.follow.clash.services
 
-import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
+import android.annotation.SuppressLint
 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.net.ProxyInfo
@@ -12,13 +13,15 @@ import android.os.Binder
 import android.os.Build
 import android.os.IBinder
 import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE
+import androidx.core.graphics.drawable.IconCompat
 import com.follow.clash.GlobalState
 import com.follow.clash.MainActivity
-import com.follow.clash.R
+import com.follow.clash.models.AccessControl
 import com.follow.clash.models.AccessControlMode
-import com.follow.clash.models.Props
 
 
+@SuppressLint("WrongConstant")
 class FlClashVpnService : VpnService() {
 
 
@@ -51,12 +54,12 @@ class FlClashVpnService : VpnService() {
         return START_STICKY
     }
 
-    fun start(port: Int, props: Props?) {
+    fun start(port: Int, accessControl: AccessControl?) {
         fd = with(Builder()) {
             addAddress("172.16.0.1", 30)
             setMtu(9000)
             addRoute("0.0.0.0", 0)
-            props?.accessControl?.let { accessControl ->
+            if (accessControl != null) {
                 when (accessControl.mode) {
                     AccessControlMode.acceptSelected -> {
                         (accessControl.acceptList + packageName).forEach {
@@ -77,10 +80,8 @@ class FlClashVpnService : VpnService() {
             if (Build.VERSION.SDK_INT >= 29) {
                 setMetered(false)
             }
-            if (props?.allowBypass == true) {
-                allowBypass()
-            }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && props?.systemProxy == true) {
+            allowBypass()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 setHttpProxy(
                     ProxyInfo.buildDirectProxy(
                         "127.0.0.1",
@@ -99,10 +100,10 @@ class FlClashVpnService : VpnService() {
     }
 
 
-    private val notificationBuilder: NotificationCompat.Builder by lazy {
+    private val notificationBuilder by lazy {
         val intent = Intent(this, MainActivity::class.java)
 
-        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
+        val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             PendingIntent.getActivity(
                 this,
                 0,
@@ -118,40 +119,34 @@ class FlClashVpnService : VpnService() {
             )
         }
 
+        val icon = IconCompat.createWithResource(this, this.applicationInfo.icon)
+
         with(NotificationCompat.Builder(this, CHANNEL)) {
-            setSmallIcon(R.drawable.ic_stat_name)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                setSmallIcon(icon)
+            }
             setContentTitle("FlClash")
+            foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
             setContentIntent(pendingIntent)
             setCategory(NotificationCompat.CATEGORY_SERVICE)
-            priority = NotificationCompat.PRIORITY_MIN
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
-            }
+            priority = NotificationCompat.PRIORITY_LOW
             setOngoing(true)
             setShowWhen(false)
             setOnlyAlertOnce(true)
-            setAutoCancel(true);
         }
     }
 
-    override fun onTrimMemory(level: Int) {
-        super.onTrimMemory(level)
-        GlobalState.getCurrentAppPlugin()?.requestGc()
-    }
-
+    @SuppressLint("ForegroundServiceType", "WrongConstant")
     fun startForeground(title: String, content: String) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel =
+                NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
             val manager = getSystemService(NotificationManager::class.java)
-            var channel = manager?.getNotificationChannel(CHANNEL)
-            if (channel == null) {
-                channel =
-                    NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
-                manager?.createNotificationChannel(channel)
-            }
+            manager.createNotificationChannel(channel)
         }
         val notification =
             notificationBuilder.setContentTitle(title).setContentText(content).build()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
         } else {
             startForeground(notificationId, notification)
@@ -160,7 +155,7 @@ class FlClashVpnService : VpnService() {
 
     private fun stopForeground() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            stopForeground(STOP_FOREGROUND_REMOVE)
+            stopForeground(Service.STOP_FOREGROUND_REMOVE)
         }
     }
 

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

@@ -4,6 +4,7 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

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

@@ -4,6 +4,7 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

core/common.go

@@ -2,24 +2,25 @@ package main
 
 import "C"
 import (
-	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/inbound"
 	ap "github.com/metacubex/mihomo/adapter/provider"
 	"github.com/metacubex/mihomo/component/dialer"
+	"github.com/metacubex/mihomo/component/process"
 	"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/constant/provider"
+	"github.com/metacubex/mihomo/dns"
 	"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"
+	"math"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
+	"sync"
 	"syscall"
 	"time"
 )
@@ -82,13 +83,10 @@ type Delay struct {
 }
 
 type Process struct {
-	Id       int64             `json:"id"`
-	Metadata constant.Metadata `json:"metadata"`
-}
-
-type ProcessMapItem struct {
-	Id    int64   `json:"id"`
-	Value *string `json:"value"`
+	Uid     uint32 `json:"uid"`
+	Network string `json:"network"`
+	Source  string `json:"source"`
+	Target  string `json:"target"`
 }
 
 type Now struct {
@@ -323,35 +321,33 @@ func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
 }
 
 func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig, compatible bool) {
-	targetConfig.ExternalController = patchConfig.ExternalController
+	targetConfig.ExternalController = ""
 	targetConfig.ExternalUI = ""
 	targetConfig.Interface = ""
 	targetConfig.ExternalUIURL = ""
-	targetConfig.TCPConcurrent = patchConfig.TCPConcurrent
-	targetConfig.UnifiedDelay = patchConfig.UnifiedDelay
 	targetConfig.GeodataMode = false
-	targetConfig.IPv6 = patchConfig.IPv6
+	//targetConfig.IPv6 = patchConfig.IPv6
 	targetConfig.LogLevel = patchConfig.LogLevel
 	targetConfig.Port = 0
 	targetConfig.SocksPort = 0
 	targetConfig.MixedPort = patchConfig.MixedPort
-	targetConfig.FindProcessMode = patchConfig.FindProcessMode
+	targetConfig.FindProcessMode = process.FindProcessAlways
 	targetConfig.AllowLan = patchConfig.AllowLan
 	targetConfig.Mode = patchConfig.Mode
 	targetConfig.Tun.Enable = patchConfig.Tun.Enable
 	targetConfig.Tun.Device = patchConfig.Tun.Device
-	//targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
-	//targetConfig.Tun.Stack = patchConfig.Tun.Stack
-	targetConfig.GeodataLoader = patchConfig.GeodataLoader
+	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
+	targetConfig.Tun.Stack = patchConfig.Tun.Stack
+	targetConfig.GeodataLoader = "standard"
 	targetConfig.Profile.StoreSelected = false
 	if targetConfig.DNS.Enable == false {
 		targetConfig.DNS = patchConfig.DNS
 	}
-	//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 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 compatible == false {
 		targetConfig.ProxyProvider = make(map[string]map[string]any)
 		targetConfig.RuleProvider = make(map[string]map[string]any)
@@ -361,17 +357,14 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 
 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)
@@ -384,10 +377,31 @@ func patchConfig(general *config.General) {
 	listener.ReCreateTuic(general.TuicServer, tunnel.Tunnel)
 	tunnel.SetMode(general.Mode)
 	log.SetLevel(general.LogLevel)
-
 	resolver.DisableIPv6 = !general.IPv6
 }
 
+const concurrentCount = math.MaxInt
+
+func hcCompatibleProvider(proxyProviders map[string]provider.ProxyProvider) {
+	wg := sync.WaitGroup{}
+	ch := make(chan struct{}, concurrentCount)
+	for _, proxyProvider := range proxyProviders {
+		proxyProvider := proxyProvider
+		if proxyProvider.VehicleType() == provider.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)
+				}
+			}()
+		}
+
+	}
+}
+
 func applyConfig(isPatch bool) {
 	cfg, err := config.ParseRawConfig(currentConfig)
 	if err != nil {
@@ -396,8 +410,7 @@ func applyConfig(isPatch bool) {
 	if isPatch {
 		patchConfig(cfg.General)
 	} else {
-		runtime.GC()
-		executor.Shutdown()
-		hub.UltraApplyConfig(cfg, true)
+		executor.ApplyConfig(cfg, true)
+		hcCompatibleProvider(tunnel.Providers())
 	}
 }

core/dart-bridge/message.go

@@ -12,7 +12,6 @@ const (
 	Delay   MessageType = "delay"
 	Now     MessageType = "now"
 	Process MessageType = "process"
-	Request MessageType = "request"
 )
 
 type Message struct {

core/go.mod

@@ -1,6 +1,6 @@
 module core
 
-go 1.21.0
+go 1.20
 
 replace github.com/metacubex/mihomo => ./Clash.Meta
 
@@ -17,7 +17,6 @@ require (
 	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
@@ -31,9 +30,6 @@ require (
 	github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gaukas/godicttls v0.0.4 // indirect
-	github.com/go-chi/chi/v5 v5.0.12 // indirect
-	github.com/go-chi/cors v1.2.1 // indirect
-	github.com/go-chi/render v1.0.3 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect

core/go.sum

@@ -9,8 +9,6 @@ github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4
 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=
 github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
@@ -37,25 +35,16 @@ github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9/go.mod h1:hkIF
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391/go.mod h1:K2R7GhgxrlJzHw2qiPWsCZXf/kXEJN9PLnQK73Ll0po=
 github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c h1:RUzBDdZ+e/HEe2Nh8lYsduiPAZygUfVXJn0Ncj5sHMg=
-github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c/go.mod h1:ETASDWf/FmEb6Ysrtd1QhjNedUU/ZQxBCRLh60bQ/UI=
 github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 h1:tlDMEdcPRQKBEz5nGDMvswiajqh7k8ogWRlhRwKy5mY=
 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.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s=
-github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
-github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
-github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
-github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
@@ -71,7 +60,6 @@ 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=
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -81,7 +69,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
-github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7spovjlY=
 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=
@@ -96,9 +83,7 @@ github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6K
 github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
 github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-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=
@@ -140,7 +125,6 @@ github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7/go.mod h1:U
 github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
 github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
 github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
-github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
 github.com/openacid/errors v0.8.1/go.mod h1:GUQEJJOJE3W9skHm8E8Y4phdl2LLEN8iD7c5gcGgdx0=
 github.com/openacid/low v0.1.21 h1:Tr2GNu4N/+rGRYdOsEHOE89cxUIaDViZbVmKz29uKGo=
 github.com/openacid/low v0.1.21/go.mod h1:q+MsKI6Pz2xsCkzV4BLj7NR5M4EX0sGz5AqotpZDVh0=
@@ -162,7 +146,6 @@ github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1
 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/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-20220905062125-8043b4a9aa97 h1:iL5gZI3uFp0X6EslacyapiRz7LLSJyr4RajF/BhMVyE=
@@ -266,7 +249,6 @@ golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
@@ -281,7 +263,6 @@ google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFW
 google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

core/hub.go

@@ -60,14 +60,6 @@ func shutdownClash() bool {
 	return true
 }
 
-//export forceGc
-func forceGc() {
-	go func() {
-		log.Infoln("[APP] request force GC")
-		runtime.GC()
-	}()
-}
-
 //export validateConfig
 func validateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
@@ -404,10 +396,4 @@ func init() {
 			Data: delayData,
 		})
 	}
-	statistic.DefaultRequestNotify = func(c statistic.Tracker) {
-		bridge.SendMessage(bridge.Message{
-			Type: bridge.Request,
-			Data: c,
-		})
-	}
 }

core/log.go

@@ -18,9 +18,6 @@ func startLog() {
 	logSubscriber = log.Subscribe()
 	go func() {
 		for logData := range logSubscriber {
-			if logData.LogLevel < log.Level() {
-				continue
-			}
 			message := &bridge.Message{
 				Type: bridge.Log,
 				Data: logData,

core/platform/limit.go

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

core/platform/procfs.go

@@ -1,171 +0,0 @@
-//go:build android
-
-package platform
-
-import (
-	"bufio"
-	"encoding/binary"
-	"encoding/hex"
-	"fmt"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-	"unsafe"
-)
-
-var netIndexOfLocal = -1
-var netIndexOfUid = -1
-
-var nativeEndian binary.ByteOrder
-
-func QuerySocketUidFromProcFs(source, _ net.Addr) int {
-	if netIndexOfLocal < 0 || netIndexOfUid < 0 {
-		return -1
-	}
-
-	network := source.Network()
-
-	if strings.HasSuffix(network, "4") || strings.HasSuffix(network, "6") {
-		network = network[:len(network)-1]
-	}
-
-	path := "/proc/net/" + network
-
-	var sIP net.IP
-	var sPort int
-
-	switch s := source.(type) {
-	case *net.TCPAddr:
-		sIP = s.IP
-		sPort = s.Port
-	case *net.UDPAddr:
-		sIP = s.IP
-		sPort = s.Port
-	default:
-		return -1
-	}
-
-	sIP = sIP.To16()
-	if sIP == nil {
-		return -1
-	}
-
-	uid := doQuery(path+"6", sIP, sPort)
-	if uid == -1 {
-		sIP = sIP.To4()
-		if sIP == nil {
-			return -1
-		}
-		uid = doQuery(path, sIP, sPort)
-	}
-
-	return uid
-}
-
-func doQuery(path string, sIP net.IP, sPort int) int {
-	file, err := os.Open(path)
-	if err != nil {
-		return -1
-	}
-
-	defer file.Close()
-
-	reader := bufio.NewReader(file)
-
-	var bytes [2]byte
-
-	binary.BigEndian.PutUint16(bytes[:], uint16(sPort))
-
-	local := fmt.Sprintf("%s:%s", hex.EncodeToString(nativeEndianIP(sIP)), hex.EncodeToString(bytes[:]))
-
-	for {
-		row, _, err := reader.ReadLine()
-		if err != nil {
-			return -1
-		}
-
-		fields := strings.Fields(string(row))
-
-		if len(fields) <= netIndexOfLocal || len(fields) <= netIndexOfUid {
-			continue
-		}
-
-		if strings.EqualFold(local, fields[netIndexOfLocal]) {
-			uid, err := strconv.Atoi(fields[netIndexOfUid])
-			if err != nil {
-				return -1
-			}
-
-			return uid
-		}
-	}
-}
-
-func nativeEndianIP(ip net.IP) []byte {
-	result := make([]byte, len(ip))
-
-	for i := 0; i < len(ip); i += 4 {
-		value := binary.BigEndian.Uint32(ip[i:])
-
-		nativeEndian.PutUint32(result[i:], value)
-	}
-
-	return result
-}
-
-func init() {
-	file, err := os.Open("/proc/net/tcp")
-	if err != nil {
-		return
-	}
-
-	defer file.Close()
-
-	reader := bufio.NewReader(file)
-
-	header, _, err := reader.ReadLine()
-	if err != nil {
-		return
-	}
-
-	columns := strings.Fields(string(header))
-
-	var txQueue, rxQueue, tr, tmWhen bool
-
-	for idx, col := range columns {
-		offset := 0
-
-		if txQueue && rxQueue {
-			offset--
-		}
-
-		if tr && tmWhen {
-			offset--
-		}
-
-		switch col {
-		case "tx_queue":
-			txQueue = true
-		case "rx_queue":
-			rxQueue = true
-		case "tr":
-			tr = true
-		case "tm->when":
-			tmWhen = true
-		case "local_address":
-			netIndexOfLocal = idx + offset
-		case "uid":
-			netIndexOfUid = idx + offset
-		}
-	}
-}
-
-func init() {
-	var x uint32 = 0x01020304
-	if *(*byte)(unsafe.Pointer(&x)) == 0x01 {
-		nativeEndian = binary.BigEndian
-	} else {
-		nativeEndian = binary.LittleEndian
-	}
-}

core/process.go

@@ -1,72 +1,3 @@
 //go:build android
 
 package main
-
-import "C"
-import (
-	bridge "core/dart-bridge"
-	"encoding/json"
-	"errors"
-	"github.com/metacubex/mihomo/component/process"
-	"github.com/metacubex/mihomo/constant"
-	"github.com/metacubex/mihomo/log"
-	"sync/atomic"
-	"time"
-)
-
-var (
-	counter int64
-)
-
-var processMap = make(map[int64]*string)
-
-func init() {
-	process.DefaultPackageNameResolver = func(metadata *constant.Metadata) (string, error) {
-		if metadata == nil {
-			return "", process.ErrInvalidNetwork
-		}
-		id := atomic.AddInt64(&counter, 1)
-
-		timeout := time.After(200 * time.Millisecond)
-
-		message := &bridge.Message{
-			Type: bridge.Process,
-			Data: Process{
-				Id:       id,
-				Metadata: *metadata,
-			},
-		}
-
-		bridge.SendMessage(*message)
-
-		for {
-			select {
-			case <-timeout:
-				return "", errors.New("package resolver timeout")
-			default:
-				value, exists := processMap[counter]
-				if exists {
-					if value != nil {
-						log.Infoln("[PKG] %s --> %s by [%s]", metadata.SourceAddress(), metadata.RemoteAddress(), *value)
-						return *value, nil
-					} else {
-						return "", process.ErrInvalidNetwork
-					}
-				}
-				time.Sleep(10 * time.Millisecond)
-			}
-		}
-	}
-}
-
-//export setProcessMap
-func setProcessMap(s *C.char) {
-	go func() {
-		paramsString := C.GoString(s)
-		var processMapItem = &ProcessMapItem{}
-		err := json.Unmarshal([]byte(paramsString), processMapItem)
-		if err == nil {
-			processMap[processMapItem.Id] = processMapItem.Value
-		}
-	}()
-}

core/tun.go

@@ -4,13 +4,10 @@ package main
 
 import "C"
 import (
-	"core/platform"
 	t "core/tun"
-	"errors"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/log"
 	"golang.org/x/sync/semaphore"
-	"strconv"
 	"sync"
 	"syscall"
 	"time"
@@ -18,16 +15,11 @@ import (
 
 var tunLock sync.Mutex
 var tun *t.Tun
-var runTime *time.Time
 
 //export startTUN
 func startTUN(fd C.int) {
-	tunLock.Lock()
-
-	now := time.Now()
-	runTime = &now
-
 	go func() {
+		tunLock.Lock()
 		defer tunLock.Unlock()
 
 		if tun != nil {
@@ -43,6 +35,8 @@ func startTUN(fd C.int) {
 
 		closer, err := t.Start(f, gateway, portal, dns)
 
+		applyConfig(true)
+
 		if err != nil {
 			log.Errorln("startTUN error: %v", err)
 			tempTun.Close()
@@ -51,30 +45,28 @@ func startTUN(fd C.int) {
 		tempTun.Closer = closer
 
 		tun = tempTun
-
-		applyConfig(true)
 	}()
 }
 
-//export getRunTime
-func getRunTime() *C.char {
-	if runTime == nil {
-		return C.CString("")
-	}
-	return C.CString(strconv.FormatInt(runTime.UnixMilli(), 10))
+//export updateMarkSocketPort
+func updateMarkSocketPort(markSocketPort C.longlong) bool {
+	tunLock.Lock()
+	defer tunLock.Unlock()
+	//if tun != nil {
+	//	tun.MarkSocketPort = int64(markSocketPort)
+	//}
+	return true
 }
 
 //export stopTun
 func stopTun() {
-	tunLock.Lock()
-
-	runTime = nil
-
 	go func() {
+		tunLock.Lock()
 		defer tunLock.Unlock()
 
 		if tun != nil {
 			tun.Close()
+			applyConfig(true)
 			tun = nil
 		}
 	}()
@@ -82,9 +74,6 @@ func stopTun() {
 
 func init() {
 	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
-		if platform.ShouldBlockConnection() {
-			return errors.New("blocked")
-		}
 		return conn.Control(func(fd uintptr) {
 			if tun != nil {
 				tun.MarkSocket(int(fd))

lib/application.dart

@@ -82,11 +82,7 @@ class ApplicationState extends State<Application> {
     super.initState();
     globalState.appController = AppController(context);
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
-      final currentContext = globalState.navigatorKey.currentContext;
-      if (currentContext != null) {
-        globalState.appController = AppController(currentContext);
-      }
-      await globalState.appController.init();
+      globalState.appController.afterInit();
       globalState.appController.initLink();
       _updateGroups();
     });

lib/clash/core.dart

@@ -99,8 +99,8 @@ class ClashCore {
       final groupNames = [
         UsedProxy.GLOBAL.name,
         ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
-          final proxy = proxies[e] ?? {};
-          return GroupTypeExtension.valueList.contains(proxy['type']) && proxy['hidden'] != true;
+          final proxy = proxies[e];
+          return GroupTypeExtension.valueList.contains(proxy['type']);
         })
       ];
       final groupsRaw = groupNames.map((groupName) {
@@ -210,24 +210,10 @@ class ClashCore {
     clashFFI.startTUN(fd);
   }
 
-  requestGc() {
-    clashFFI.forceGc();
-  }
-
   void stopTun() {
     clashFFI.stopTun();
   }
 
-  void setProcessMap(ProcessMapItem processMapItem) {
-    clashFFI.setProcessMap(json.encode(processMapItem).toNativeUtf8().cast());
-  }
-
-  DateTime? getRunTime() {
-    final runTimeString = clashFFI.getRunTime().cast<Utf8>().toDartString();
-    if (runTimeString.isEmpty) return null;
-    return DateTime.fromMillisecondsSinceEpoch(int.parse(runTimeString));
-  }
-
   List<Connection> getConnections() {
     final connectionsDataRaw = clashFFI.getConnections();
     final connectionsData =

lib/clash/generated/clash_ffi.dart

@@ -893,14 +893,6 @@ class ClashFFI {
       _lookup<ffi.NativeFunction<GoUint8 Function()>>('shutdownClash');
   late final _shutdownClash = _shutdownClashPtr.asFunction<int Function()>();
 
-  void forceGc() {
-    return _forceGc();
-  }
-
-  late final _forceGcPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function()>>('forceGc');
-  late final _forceGc = _forceGcPtr.asFunction<void Function()>();
-
   void validateConfig(
     ffi.Pointer<ffi.Char> s,
     int port,
@@ -1130,21 +1122,7 @@ class ClashFFI {
       _lookup<ffi.NativeFunction<ffi.Void Function()>>('stopLog');
   late final _stopLog = _stopLogPtr.asFunction<void Function()>();
 
-  void setProcessMap(
-    ffi.Pointer<ffi.Char> s,
-  ) {
-    return _setProcessMap(
-      s,
-    );
-  }
-
-  late final _setProcessMapPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
-          'setProcessMap');
-  late final _setProcessMap =
-      _setProcessMapPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
-
-  void startTUN(
+  int startTUN(
     int fd,
   ) {
     return _startTUN(
@@ -1153,18 +1131,22 @@ class ClashFFI {
   }
 
   late final _startTUNPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Int)>>('startTUN');
-  late final _startTUN = _startTUNPtr.asFunction<void Function(int)>();
+      _lookup<ffi.NativeFunction<GoUint8 Function(ffi.Int)>>('startTUN');
+  late final _startTUN = _startTUNPtr.asFunction<int Function(int)>();
 
-  ffi.Pointer<ffi.Char> getRunTime() {
-    return _getRunTime();
+  int updateMarkSocketPort(
+    int markSocketPort,
+  ) {
+    return _updateMarkSocketPort(
+      markSocketPort,
+    );
   }
 
-  late final _getRunTimePtr =
-      _lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>(
-          'getRunTime');
-  late final _getRunTime =
-      _getRunTimePtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
+  late final _updateMarkSocketPortPtr =
+      _lookup<ffi.NativeFunction<GoUint8 Function(ffi.LongLong)>>(
+          'updateMarkSocketPort');
+  late final _updateMarkSocketPort =
+      _updateMarkSocketPortPtr.asFunction<int Function(int)>();
 
   void stopTun() {
     return _stopTun();

lib/clash/message.dart

@@ -14,9 +14,7 @@ abstract mixin class ClashMessageListener {
 
   void onDelay(Delay delay) {}
 
-  void onProcess(Process process) {}
-
-  void onRequest(Connection connection) {}
+  void onProcess(Metadata metadata) {}
 
   void onNow(Now now) {}
 }
@@ -43,14 +41,11 @@ class ClashMessage {
             listener.onDelay(Delay.fromJson(m.data));
             break;
           case MessageType.process:
-            listener.onProcess(Process.fromJson(m.data));
+            listener.onProcess(Metadata.fromJson(m.data));
             break;
           case MessageType.now:
             listener.onNow(Now.fromJson(m.data));
             break;
-          case MessageType.request:
-            listener.onRequest(Connection.fromJson(m.data));
-            break;
         }
       }
     });

lib/common/android.dart

@@ -7,7 +7,6 @@ class Android {
   init() async {
     app?.onExit = () {
       clashCore.shutdown();
-      print("adsadda==>");
       exit(0);
     };
   }

lib/common/constant.dart

@@ -18,11 +18,8 @@ const configKey = "config";
 const listItemPadding = EdgeInsets.symmetric(horizontal: 16);
 const double dialogCommonWidth = 300;
 const repository = "chen08209/FlClash";
-const defaultExternalController = "127.0.0.1:9090";
 const maxMobileWidth = 600;
 const maxLaptopWidth = 840;
-const geodataLoaderMemconservative = "memconservative";
-const geodataLoaderStandard = "standard";
 final filter = ImageFilter.blur(
   sigmaX: 5,
   sigmaY: 5,

lib/common/navigation.dart

@@ -29,13 +29,6 @@ class Navigation {
         label: "profiles",
         fragment: ProfilesFragment(),
       ),
-      const NavigationItem(
-        icon:  Icon(Icons.ballot),
-        label: "requests",
-        fragment:  RequestFragment(),
-        description: "requestsDesc",
-        modes: [NavigationItemMode.desktop, NavigationItemMode.more],
-      ),
       const NavigationItem(
         icon: Icon(Icons.swap_vert_circle),
         label: "resources",

lib/common/picker.dart

@@ -10,7 +10,8 @@ class Picker {
     if (Platform.isAndroid) {
       filePickerResult = await FilePicker.platform.pickFiles(
         withData: true,
-        allowMultiple: false,
+        type: FileType.custom,
+        allowedExtensions: ['txt', 'conf'],
       );
     } else {
       filePickerResult = await FilePicker.platform.pickFiles(

lib/controller.dart

@@ -145,16 +145,7 @@ class AppController {
       if (isNotNeedUpdate == false || profile.type == ProfileType.file) {
         continue;
       }
-      try {
-        await updateProfile(profile.id);
-      } catch (e) {
-        appState.addLog(
-          Log(
-            logLevel: LogLevel.info,
-            payload: e.toString(),
-          ),
-        );
-      }
+      await updateProfile(profile.id);
     }
   }
 
@@ -231,21 +222,20 @@ class AppController {
       final tagName = data['tag_name'];
       final body = data['body'];
       final submits = other.parseReleaseBody(body);
-      final textTheme = context.textTheme;
       globalState.showMessage(
         title: appLocalizations.discoverNewVersion,
         message: TextSpan(
           text: "$tagName \n",
-          style: textTheme.headlineSmall,
+          style: context.textTheme.headlineSmall,
           children: [
             TextSpan(
               text: "\n",
-              style: textTheme.bodyMedium,
+              style: context.textTheme.bodyMedium,
             ),
             for (final submit in submits)
               TextSpan(
                 text: "- $submit \n",
-                style: textTheme.bodyMedium,
+                style: context.textTheme.bodyMedium,
               ),
           ],
         ),
@@ -266,29 +256,6 @@ class AppController {
     }
   }
 
-  init() async {
-    if (!config.silentLaunch) {
-      window?.show();
-    }
-    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 globalState.applyProfile(
-        appState: appState,
-        config: config,
-        clashConfig: clashConfig,
-      );
-    }
-    await afterInit();
-  }
-
   afterInit() async {
     if (config.autoRun) {
       await updateSystemProxy(true);
@@ -298,6 +265,9 @@ class AppController {
     }
     autoUpdateProfiles();
     updateLogStatus();
+    if (!config.silentLaunch) {
+      window?.show();
+    }
     autoCheckUpdate();
   }
 

lib/enum/enum.dart

@@ -1,6 +1,6 @@
 // ignore_for_file: constant_identifier_names
 
-enum GroupType { Selector, URLTest, Fallback, LoadBalance, Relay }
+enum GroupType { Selector, URLTest, Fallback }
 
 enum GroupName { GLOBAL, Proxy, Auto, Fallback }
 
@@ -56,11 +56,9 @@ enum ProfileType { file, url }
 
 enum ResultType { success, error }
 
-enum MessageType { log, tun, delay, process, now, request }
-
-enum FindProcessMode { always, off }
+enum MessageType { log, tun, delay, process, now }
 
 enum RecoveryOption {
   all,
   onlyProfiles,
-}
+}

lib/fragments/access.dart

@@ -8,13 +8,6 @@ import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.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});
 
@@ -90,70 +83,136 @@ class _AccessFragmentState extends State<AccessFragment> {
     );
   }
 
-  Widget _buildSearchButton(List<Package> packages) {
-    return IconButton(
-      tooltip: appLocalizations.search,
-      onPressed: () {
-        showSearch(
-          context: context,
-          delegate: AccessControlSearchDelegate(
-            packages: packages,
-          ),
-        ).then((_) => {setState(() {})});
-      },
-      icon: const Icon(Icons.search),
-    );
-  }
-
-  _buildSelectedAllButton({
-    required bool isAccessControl,
+  Widget _buildSelectedAllButton({
     required bool isSelectedAll,
     required List<String> allValueList,
   }) {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final tooltip = isSelectedAll
-          ? appLocalizations.cancelSelectAll
-          : appLocalizations.selectAll;
-      final commonScaffoldState =
-          context.findAncestorStateOfType<CommonScaffoldState>();
-      commonScaffoldState?.floatingActionButton = DisabledMask(
-        status: !isAccessControl,
-        child: AbsorbPointer(
-          absorbing: !isAccessControl,
-          child: FloatingActionButton (
-            tooltip: tooltip,
-            onPressed: () {
-              final config = globalState.appController.config;
-              final isAccept =
-                  config.accessControl.mode == AccessControlMode.acceptSelected;
+    return Builder(
+      builder: (context) {
+        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,
-                    ),
-                };
-              }
-            },
-            child: isSelectedAll
-                ? const Icon(Icons.deselect)
-                : const Icon(Icons.select_all),
-          ),
+            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),
+        );
+      },
+    );
+  }
+
+  Widget _actionHeader({
+    required bool isAccessControl,
+    required List<String> valueList,
+    required String describe,
+    required List<String> packageNameList,
+  }) {
+    return AbsorbPointer(
+      absorbing: !isAccessControl,
+      child: Padding(
+        padding: const EdgeInsets.only(
+          top: 4,
+          bottom: 4,
+          left: 16,
+          right: 8,
         ),
-      );
-    });
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          mainAxisSize: MainAxisSize.max,
+          children: [
+            Expanded(
+              child: IntrinsicHeight(
+                child: Column(
+                  mainAxisSize: MainAxisSize.max,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Expanded(
+                      child: Row(
+                        children: [
+                          Flexible(
+                            child: Text(
+                              appLocalizations.selected,
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .labelLarge
+                                  ?.copyWith(
+                                    color:
+                                        Theme.of(context).colorScheme.primary,
+                                  ),
+                            ),
+                          ),
+                          const Flexible(
+                            child: SizedBox(
+                              width: 8,
+                            ),
+                          ),
+                          Flexible(
+                            child: Text(
+                              "${valueList.length}",
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .labelLarge
+                                  ?.copyWith(
+                                    color:
+                                        Theme.of(context).colorScheme.primary,
+                                  ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    Flexible(
+                      child: Text(describe),
+                    )
+                  ],
+                ),
+              ),
+            ),
+            Row(
+              mainAxisSize: MainAxisSize.min,
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                Flexible(
+                  child: _buildSelectedAllButton(
+                    isSelectedAll: const ListEquality<String>()
+                        .equals(valueList, packageNameList),
+                    allValueList: packageNameList,
+                  ),
+                ),
+                Flexible(child: _buildFilterSystemAppButton()),
+                Flexible(child: _buildAppProxyModePopup()),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
   }
 
   Widget _buildPackageList() {
@@ -193,11 +252,14 @@ class _AccessFragmentState extends State<AccessFragment> {
                 accessControlMode == AccessControlMode.acceptSelected
                     ? acceptPackages
                     : rejectPackages;
-            final currentList = accessControl.currentList;
+            final currentList =
+                accessControlMode == AccessControlMode.acceptSelected
+                    ? accessControl.acceptList
+                    : accessControl.rejectList;
             final currentPackages = isFilterSystemApp
                 ? packages
-                    .where((element) => element.isSystem == false)
-                    .toList()
+                .where((element) => element.isSystem == false)
+                .toList()
                 : packages;
             final packageNameList =
                 currentPackages.map((e) => e.packageName).toList();
@@ -206,91 +268,15 @@ class _AccessFragmentState extends State<AccessFragment> {
                 accessControlMode == AccessControlMode.acceptSelected
                     ? appLocalizations.accessControlAllowDesc
                     : appLocalizations.accessControlNotAllowDesc;
-            _buildSelectedAllButton(
-              isAccessControl: isAccessControl,
-              isSelectedAll: valueList.length == packageNameList.length,
-              allValueList: packageNameList,
-            );
             return DisabledMask(
               status: !isAccessControl,
               child: Column(
                 children: [
-                  AbsorbPointer(
-                    absorbing: !isAccessControl,
-                    child: Padding(
-                      padding: const EdgeInsets.only(
-                        top: 4,
-                        bottom: 4,
-                        left: 16,
-                        right: 8,
-                      ),
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        mainAxisSize: MainAxisSize.max,
-                        children: [
-                          Expanded(
-                            child: IntrinsicHeight(
-                              child: Column(
-                                mainAxisSize: MainAxisSize.max,
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Expanded(
-                                    child: Row(
-                                      children: [
-                                        Flexible(
-                                          child: Text(
-                                            appLocalizations.selected,
-                                            style: Theme.of(context)
-                                                .textTheme
-                                                .labelLarge
-                                                ?.copyWith(
-                                                  color: Theme.of(context)
-                                                      .colorScheme
-                                                      .primary,
-                                                ),
-                                          ),
-                                        ),
-                                        const Flexible(
-                                          child: SizedBox(
-                                            width: 8,
-                                          ),
-                                        ),
-                                        Flexible(
-                                          child: Text(
-                                            "${valueList.length}",
-                                            style: Theme.of(context)
-                                                .textTheme
-                                                .labelLarge
-                                                ?.copyWith(
-                                                  color: Theme.of(context)
-                                                      .colorScheme
-                                                      .primary,
-                                                ),
-                                          ),
-                                        ),
-                                      ],
-                                    ),
-                                  ),
-                                  Flexible(
-                                    child: Text(describe),
-                                  )
-                                ],
-                              ),
-                            ),
-                          ),
-                          Row(
-                            mainAxisSize: MainAxisSize.min,
-                            mainAxisAlignment: MainAxisAlignment.end,
-                            children: [
-                              Flexible(
-                                  child: _buildSearchButton(currentPackages)),
-                              Flexible(child: _buildFilterSystemAppButton()),
-                              Flexible(child: _buildAppProxyModePopup()),
-                            ],
-                          ),
-                        ],
-                      ),
-                    ),
+                  _actionHeader(
+                    isAccessControl: isAccessControl,
+                    valueList: valueList,
+                    describe: describe,
+                    packageNameList: packageNameList,
                   ),
                   Expanded(
                     flex: 1,
@@ -443,111 +429,3 @@ class PackageListItem extends StatelessWidget {
     );
   }
 }
-
-class AccessControlSearchDelegate extends SearchDelegate {
-  final List<Package> packages;
-
-  AccessControlSearchDelegate({
-    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 [
-      IconButton(
-        onPressed: () {
-          if (query.isEmpty) {
-            close(context, null);
-            return;
-          }
-          query = '';
-        },
-        icon: const Icon(Icons.clear),
-      ),
-      const SizedBox(
-        width: 8,
-      )
-    ];
-  }
-
-  @override
-  Widget? buildLeading(BuildContext context) {
-    return IconButton(
-      onPressed: () {
-        close(context, null);
-      },
-      icon: const Icon(Icons.arrow_back),
-    );
-  }
-
-  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 isAccessControl = state.isAccessControl;
-        final accessControlMode = accessControl.mode;
-        final currentList = accessControl.currentList;
-        final packageNameList =
-            this.packages.map((e) => e.packageName).toList();
-        final valueList = currentList.intersection(packageNameList);
-        return DisabledMask(
-          status: !isAccessControl,
-          child: 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,
-                    );
-                  }
-                },
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-
-  @override
-  Widget buildResults(BuildContext context) {
-    return buildSuggestions(context);
-  }
-
-  @override
-  Widget buildSuggestions(BuildContext context) {
-    return _packageList(_results);
-  }
-}

lib/fragments/config.dart

@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
@@ -39,132 +37,16 @@ class _ConfigFragmentState extends State<ConfigFragment> {
     }
   }
 
-  _buildAppSection() {
-    final items = [
-      if (Platform.isAndroid)
-        Selector<Config, bool>(
-          selector: (_, config) => config.allowBypass,
-          builder: (_, allowBypass, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.arrow_forward_outlined),
-              title: Text(appLocalizations.allowBypass),
-              subtitle: Text(appLocalizations.allowBypassDesc),
-              delegate: SwitchDelegate(
-                value: allowBypass,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.config.allowBypass = value;
-                },
-              ),
-            );
-          },
-        ),
-      if (Platform.isAndroid)
-        Selector<Config, bool>(
-          selector: (_, config) => config.systemProxy,
-          builder: (_, systemProxy, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.settings_ethernet),
-              title: Text(appLocalizations.systemProxy),
-              subtitle: Text(appLocalizations.systemProxyDesc),
-              delegate: SwitchDelegate(
-                value: systemProxy,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.config.systemProxy = value;
-                },
-              ),
-            );
-          },
-        ),
-      Selector<Config, bool>(
-        selector: (_, config) => config.isCompatible,
-        builder: (_, isCompatible, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.expand_outlined),
-            title: Text(appLocalizations.compatible),
-            subtitle: Text(appLocalizations.compatibleDesc),
-            delegate: SwitchDelegate(
-              value: isCompatible,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.config.isCompatible = value;
-                await appController.updateClashConfig(isPatch: false);
-                await appController.updateGroups();
-                appController.changeProxy();
-              },
-            ),
-          );
-        },
-      ),
-    ];
-    return Section(
-      title: appLocalizations.app,
-      child: Column(
-        children: [
-          for (final item in items) ...[
-            item,
-            if (items.last != item)
-              const Divider(
-                height: 0,
-              )
-          ]
-        ],
-      ),
-    );
+  _updateLoglevel(LogLevel? logLevel) {
+    if (logLevel == null ||
+        logLevel == globalState.appController.clashConfig.logLevel) return;
+    globalState.appController.clashConfig.logLevel = logLevel;
+    globalState.appController.updateClashConfigDebounce();
   }
 
-  _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),
-                )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  _buildGeneralSection() {
-    final items = [
-      Selector<ClashConfig, LogLevel>(
-        selector: (_, clashConfig) => clashConfig.logLevel,
-        builder: (_, value, __) {
-          return ListItem(
-            leading: const Icon(Icons.info_outline),
-            title: Text(appLocalizations.logLevel),
-            subtitle: Text(value.name),
-            onTab: () {
-              _showLogLevelDialog(value);
-            },
-          );
-        },
-      ),
+  @override
+  Widget build(BuildContext context) {
+    List<Widget> items = [
       Selector<ClashConfig, int>(
         selector: (_, clashConfig) => clashConfig.mixedPort,
         builder: (_, mixedPort, __) {
@@ -172,9 +54,9 @@ class _ConfigFragmentState extends State<ConfigFragment> {
             onTab: () {
               _modifyMixedPort(mixedPort);
             },
-            leading: const Icon(Icons.adjust_outlined),
+            padding: const EdgeInsets.symmetric(horizontal: 16,vertical: 4),
+            leading: const Icon(Icons.adjust),
             title: Text(appLocalizations.proxyPort),
-            subtitle: Text(appLocalizations.proxyPortDesc),
             trailing: FilledButton.tonal(
               onPressed: () {
                 _modifyMixedPort(mixedPort);
@@ -186,24 +68,6 @@ class _ConfigFragmentState extends State<ConfigFragment> {
           );
         },
       ),
-      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, __) {
@@ -222,133 +86,92 @@ class _ConfigFragmentState extends State<ConfigFragment> {
           );
         },
       ),
-      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) => clashConfig.unifiedDelay,
-        builder: (_, unifiedDelay, __) {
+      // if (system.isDesktop)
+      //   Selector<ClashConfig, bool>(
+      //     selector: (_, clashConfig) => clashConfig.tun.enable,
+      //     builder: (_, tunEnable, __) {
+      //       return ListItem.switchItem(
+      //         leading: const Icon(Icons.support),
+      //         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();
+      //           },
+      //         ),
+      //       );
+      //     },
+      //   ),
+      Selector<Config, bool>(
+        selector: (_, config) => config.isCompatible,
+        builder: (_, isCompatible, __) {
           return ListItem.switchItem(
-            leading: const Icon(Icons.compress_outlined),
-            title: Text(appLocalizations.unifiedDelay),
-            subtitle: Text(appLocalizations.unifiedDelayDesc),
+            leading: const Icon(Icons.expand),
+            title: Text(appLocalizations.compatible),
+            subtitle: Text(appLocalizations.compatibleDesc),
             delegate: SwitchDelegate(
-              value: unifiedDelay,
+              value: isCompatible,
               onChanged: (bool value) async {
                 final appController = globalState.appController;
-                appController.clashConfig.unifiedDelay = value;
-                appController.updateClashConfigDebounce();
+                appController.config.isCompatible = value;
+                await appController.updateClashConfig(isPatch: false);
+                await appController.updateGroups();
+                appController.changeProxy();
               },
             ),
           );
         },
       ),
-      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();
-              },
-            ),
-          );
-        },
+      Padding(
+        padding: kMaterialListPadding,
+        child: Selector<ClashConfig, LogLevel>(
+          selector: (_, clashConfig) => clashConfig.logLevel,
+          builder: (_, value, __) {
+            return ListItem(
+              leading: const Icon(Icons.feedback),
+              title: Text(appLocalizations.logLevel),
+              trailing: SizedBox(
+                height: 48,
+                child: DropdownMenu<LogLevel>(
+                  width: 124,
+                  inputDecorationTheme: const InputDecorationTheme(
+                    filled: true,
+                    contentPadding: EdgeInsets.symmetric(
+                      vertical: 5,
+                      horizontal: 16,
+                    ),
+                  ),
+                  initialSelection: value,
+                  dropdownMenuEntries: [
+                    for (final logLevel in LogLevel.values)
+                      DropdownMenuEntry<LogLevel>(
+                        value: logLevel,
+                        label: logLevel.name,
+                      )
+                  ],
+                  onSelected: _updateLoglevel,
+                ),
+              ),
+            );
+          },
+        ),
       ),
     ];
-    return Section(
-      title: appLocalizations.general,
-      child: Column(
-        children: [
-          for (final item in items) ...[
-            item,
-            if (items.last != item)
-              const Divider(
-                height: 0,
-              )
-          ]
-        ],
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    List<Widget> items = [
-      _buildAppSection(),
-      _buildGeneralSection(),
-    ];
-    return ListView.builder(
-      padding: const EdgeInsets.only(bottom: 16),
+    return ListView.separated(
       itemBuilder: (_, index) {
         return Container(
           alignment: Alignment.center,
           child: items[index],
         );
       },
+      separatorBuilder: (_, __) {
+        return const Divider(
+          height: 0,
+        );
+      },
       itemCount: items.length,
     );
   }

lib/fragments/connections.dart

@@ -1,140 +1,140 @@
-// import 'dart:async';
-//
-// import 'package:fl_clash/clash/core.dart';
-// import 'package:fl_clash/models/models.dart';
-// import 'package:fl_clash/plugins/app.dart';
-// import 'package:fl_clash/state.dart';
-// import 'package:fl_clash/widgets/widgets.dart';
-// import 'package:flutter/material.dart';
-//
-// class ConnectionsFragment extends StatefulWidget {
-//   const ConnectionsFragment({super.key});
-//
-//   @override
-//   State<ConnectionsFragment> createState() => _ConnectionsFragmentState();
-// }
-//
-// class _ConnectionsFragmentState extends State<ConnectionsFragment> {
-//   final connectionsNotifier = ValueNotifier<List<Connection>>([]);
-//   Map<String, String?> idPackageNameMap = {};
-//
-//   Timer? timer;
-//
-//   @override
-//   void initState() {
-//     super.initState();
-//     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-//       _getConnections();
-//       if (timer != null) {
-//         timer?.cancel();
-//         timer = null;
-//       }
-//       timer = Timer.periodic(const Duration(seconds: 3), (timer) {
-//         if (mounted) {
-//           _getConnections();
-//         }
-//       });
-//     });
-//   }
-//
-//   _getConnections() {
-//     connectionsNotifier.value = clashCore
-//         .getConnections();
-//   }
-//
-//   @override
-//   void dispose() {
-//     super.dispose();
-//     timer?.cancel();
-//     timer = null;
-//   }
-//
-//   Future<ImageProvider?> _getPackageIconWithConnection(
-//       Connection connection) async {
-//     final uid = connection.metadata.uid;
-//     // if(globalState.packageNameMap[uid] == null){
-//     //   globalState.packageNameMap[uid] = await app?.getPackageName(connection.metadata);
-//     // }
-//     final packageName = globalState.packageNameMap[uid];
-//     if(packageName == null) return null;
-//     return await app?.getPackageIcon(packageName);
-//   }
-//
-//   @override
-//   Widget build(BuildContext context) {
-//     return ValueListenableBuilder<List<Connection>>(
-//       valueListenable: connectionsNotifier,
-//       builder: (_, List<Connection> connections, __) {
-//         if (connections.isEmpty) {
-//           return const NullStatus(
-//             label: "未开启代理,或者没有连接数据",
-//           );
-//         }
-//         return ListView.separated(
-//           physics: const AlwaysScrollableScrollPhysics(),
-//           itemBuilder: (_, index) {
-//             final connection = connections[index];
-//             return ListTile(
-//               titleAlignment: ListTileTitleAlignment.top,
-//               leading: Container(
-//                 margin: const EdgeInsets.only(top: 4),
-//                 width: 48,
-//                 height: 48,
-//                 child: FutureBuilder<ImageProvider?>(
-//                   future: _getPackageIconWithConnection(connection),
-//                   builder: (_, snapshot) {
-//                     if (!snapshot.hasData && snapshot.data == null) {
-//                       return Container();
-//                     } else {
-//                       return Image(
-//                         image: snapshot.data!,
-//                         gaplessPlayback: true,
-//                         width: 48,
-//                         height: 48,
-//                       );
-//                     }
-//                   },
-//                 ),
-//               ),
-//               contentPadding:
-//                   const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
-//               title: Column(
-//                 crossAxisAlignment: CrossAxisAlignment.start,
-//                 children: [
-//                   Text(connection.metadata.host.isNotEmpty
-//                       ? connection.metadata.host
-//                       : connection.metadata.destinationIP),
-//                   Padding(
-//                     padding: const EdgeInsets.only(
-//                       top: 12,
-//                     ),
-//                     child: Wrap(
-//                       runSpacing: 8,
-//                       spacing: 8,
-//                       children: [
-//                         for (final chain in connection.chains)
-//                           CommonChip(
-//                             label: chain,
-//                           ),
-//                       ],
-//                     ),
-//                   ),
-//                 ],
-//               ),
-//               trailing: IconButton(
-//                 icon: const Icon(Icons.block),
-//                 onPressed: () {},
-//               ),
-//             );
-//           },
-//           separatorBuilder: (BuildContext context, int index) {
-//             return const Divider(
-//               height: 0,
-//             );
-//           },
-//           itemCount: connections.length,
-//         );
-//       },
-//     );
-//   }
-// }
+import 'dart:async';
+
+import 'package:fl_clash/clash/core.dart';
+import 'package:fl_clash/models/models.dart';
+import 'package:fl_clash/plugins/app.dart';
+import 'package:fl_clash/state.dart';
+import 'package:fl_clash/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+
+class ConnectionsFragment extends StatefulWidget {
+  const ConnectionsFragment({super.key});
+
+  @override
+  State<ConnectionsFragment> createState() => _ConnectionsFragmentState();
+}
+
+class _ConnectionsFragmentState extends State<ConnectionsFragment> {
+  final connectionsNotifier = ValueNotifier<List<Connection>>([]);
+  Map<String, String?> idPackageNameMap = {};
+
+  Timer? timer;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      _getConnections();
+      if (timer != null) {
+        timer?.cancel();
+        timer = null;
+      }
+      timer = Timer.periodic(const Duration(seconds: 3), (timer) {
+        if (mounted) {
+          _getConnections();
+        }
+      });
+    });
+  }
+
+  _getConnections() {
+    connectionsNotifier.value = clashCore
+        .getConnections();
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    timer?.cancel();
+    timer = null;
+  }
+
+  Future<ImageProvider?> _getPackageIconWithConnection(
+      Connection connection) async {
+    final uid = connection.metadata.uid;
+    // if(globalState.packageNameMap[uid] == null){
+    //   globalState.packageNameMap[uid] = await app?.getPackageName(connection.metadata);
+    // }
+    final packageName = globalState.packageNameMap[uid];
+    if(packageName == null) return null;
+    return await app?.getPackageIcon(packageName);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ValueListenableBuilder<List<Connection>>(
+      valueListenable: connectionsNotifier,
+      builder: (_, List<Connection> connections, __) {
+        if (connections.isEmpty) {
+          return const NullStatus(
+            label: "未开启代理,或者没有连接数据",
+          );
+        }
+        return ListView.separated(
+          physics: const AlwaysScrollableScrollPhysics(),
+          itemBuilder: (_, index) {
+            final connection = connections[index];
+            return ListTile(
+              titleAlignment: ListTileTitleAlignment.top,
+              leading: Container(
+                margin: const EdgeInsets.only(top: 4),
+                width: 48,
+                height: 48,
+                child: FutureBuilder<ImageProvider?>(
+                  future: _getPackageIconWithConnection(connection),
+                  builder: (_, snapshot) {
+                    if (!snapshot.hasData && snapshot.data == null) {
+                      return Container();
+                    } else {
+                      return Image(
+                        image: snapshot.data!,
+                        gaplessPlayback: true,
+                        width: 48,
+                        height: 48,
+                      );
+                    }
+                  },
+                ),
+              ),
+              contentPadding:
+                  const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
+              title: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(connection.metadata.host.isNotEmpty
+                      ? connection.metadata.host
+                      : connection.metadata.destinationIP),
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      top: 12,
+                    ),
+                    child: Wrap(
+                      runSpacing: 8,
+                      spacing: 8,
+                      children: [
+                        for (final chain in connection.chains)
+                          CommonChip(
+                            label: chain,
+                          ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+              trailing: IconButton(
+                icon: const Icon(Icons.block),
+                onPressed: () {},
+              ),
+            );
+          },
+          separatorBuilder: (BuildContext context, int index) {
+            return const Divider(
+              height: 0,
+            );
+          },
+          itemCount: connections.length,
+        );
+      },
+    );
+  }
+}

lib/fragments/dashboard/network_detection.dart

@@ -25,7 +25,6 @@ class _NetworkDetectionState extends State<NetworkDetection> {
     bool isStart,
   ) async {
     if (!isInit) return;
-    timeoutNotifier.value = false;
     if (_preIsStart == false && _preIsStart == isStart) return;
     if (cancelToken != null) {
       cancelToken!.cancel();
@@ -39,7 +38,6 @@ class _NetworkDetectionState extends State<NetworkDetection> {
     } else {
       timeoutNotifier.value = false;
     }
-    _preIsStart = isStart;
     ipInfoNotifier.value = ipInfo;
   }
 
@@ -152,10 +150,9 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                             builder: (_, timeout, __) {
                               if (timeout) {
                                 return Text(
-                                  "timeout",
-                                  style: context.textTheme.titleMedium
-                                      ?.copyWith(color: Colors.red)
-                                      .toSoftBold(),
+                                  appLocalizations.ipCheckTimeout,
+                                  style: context.textTheme.titleLarge
+                                      ?.toSoftBold(),
                                   maxLines: 1,
                                   overflow: TextOverflow.ellipsis,
                                 );

lib/fragments/fragments.dart

@@ -9,5 +9,4 @@ export 'config.dart';
 export 'application_setting.dart';
 export 'about.dart';
 export 'backup_and_recovery.dart';
-export 'resources.dart';
-export 'requests.dart';
+export 'resources.dart';

lib/fragments/logs.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:collection/collection.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
@@ -23,21 +22,14 @@ class _LogsFragmentState extends State<LogsFragment> {
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final appState = globalState.appController.appState;
-      logsNotifier.value = List<Log>.from(appState.logs);
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      logsNotifier.value = context.read<AppState>().logs;
       if (timer != null) {
         timer?.cancel();
         timer = null;
       }
       timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
-        final logs = List<Log>.from(appState.logs);
-        if (!const ListEquality<Log>().equals(
-          logsNotifier.value,
-          logs,
-        )) {
-          logsNotifier.value = logs;
-        }
+        logsNotifier.value = globalState.appController.appState.logs;
       });
     });
   }

lib/fragments/profiles/edit_profile.dart

@@ -152,7 +152,6 @@ class _EditProfileState extends State<EditProfile> {
             vertical: 16,
           ),
           child: ListView.separated(
-            primary: true,
             itemBuilder: (_, index) {
               return items[index];
             },

lib/fragments/profiles/profiles.dart

@@ -17,16 +17,9 @@ enum ProfileActions {
   delete,
 }
 
-class ProfilesFragment extends StatefulWidget {
+class ProfilesFragment extends StatelessWidget {
   const ProfilesFragment({super.key});
 
-  @override
-  State<ProfilesFragment> createState() => _ProfilesFragmentState();
-}
-
-class _ProfilesFragmentState extends State<ProfilesFragment> {
-  final hasPadding = ValueNotifier<bool>(false);
-
   _handleShowAddExtendPage() {
     showExtendPage(
       globalState.navigatorKey.currentState!.context,
@@ -48,7 +41,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     }
   }
 
-  _initScaffoldState() {
+  _initScaffoldState(BuildContext context) {
     WidgetsBinding.instance.addPostFrameCallback(
       (_) {
         final commonScaffoldState =
@@ -62,7 +55,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
                 },
               );
             },
-            icon: const Icon(Icons.sync),
+            icon: const Icon(Icons.download),
           ),
           const SizedBox(
             width: 8,
@@ -85,7 +78,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
       selector: (_, appState) => appState.currentLabel == 'profiles',
       builder: (_, isCurrent, child) {
         if (isCurrent) {
-          _initScaffoldState();
+          _initScaffoldState(context);
         }
         return child!;
       },
@@ -105,46 +98,27 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
           final isMobile = state.viewMode == ViewMode.mobile;
           return Align(
             alignment: Alignment.topCenter,
-            child: NotificationListener<ScrollNotification>(
-              onNotification: (scrollNotification) {
-                WidgetsBinding.instance.addPostFrameCallback((_) {
-                  hasPadding.value =
-                      scrollNotification.metrics.maxScrollExtent > 0;
-                });
-                return true;
-              },
-              child: ValueListenableBuilder(
-                valueListenable: hasPadding,
-                builder: (_, hasPadding, __) {
-                  return SingleChildScrollView(
-                    padding: !isMobile
-                        ? EdgeInsets.only(
-                            left: 16,
-                            right: 16,
-                            top: 16,
-                            bottom: 16 + (hasPadding ? 56 : 0),
-                          )
-                        : EdgeInsets.only(
-                            bottom: 0 + (hasPadding ? 56 : 0),
-                          ),
-                    child: Grid(
-                      mainAxisSpacing: isMobile ? 8 : 16,
-                      crossAxisSpacing: 16,
-                      crossAxisCount: columns,
-                      children: [
-                        for (final profile in state.profiles)
-                          GridItem(
-                            child: ProfileItem(
-                              profile: profile,
-                              groupValue: state.currentProfileId,
-                              onChanged:
-                                  globalState.appController.changeProfile,
-                            ),
-                          ),
-                      ],
+            child: SingleChildScrollView(
+              padding: !isMobile
+                  ? const EdgeInsets.symmetric(
+                      horizontal: 16,
+                      vertical: 16,
+                    )
+                  : EdgeInsets.zero,
+              child: Grid(
+                mainAxisSpacing: isMobile ? 8 : 16,
+                crossAxisSpacing: 16,
+                crossAxisCount: columns,
+                children: [
+                  for (final profile in state.profiles)
+                    GridItem(
+                      child: ProfileItem(
+                        profile: profile,
+                        groupValue: state.currentProfileId,
+                        onChanged: globalState.appController.changeProfile,
+                      ),
                     ),
-                  );
-                },
+                ],
               ),
             ),
           );

lib/fragments/proxies.dart

@@ -1,4 +1,3 @@
-import 'package:collection/collection.dart';
 import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
@@ -60,18 +59,6 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
     });
   }
 
-  _handleTabControllerChange() {
-    final indexIsChanging = _tabController?.indexIsChanging ?? false;
-    if (indexIsChanging) return;
-    final index = _tabController?.index;
-    if(index == null) return;
-    final appController = globalState.appController;
-    final currentGroups = appController.appState.currentGroups;
-    if (currentGroups.length > index) {
-      appController.config.updateCurrentGroupName(currentGroups[index].name);
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     return Selector<AppState, bool>(
@@ -82,34 +69,26 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
         }
         return child!;
       },
-      child: Selector2<AppState, Config, ProxiesSelectorState>(
-        selector: (_, appState, config) {
+      child: Selector3<AppState, Config, ClashConfig, ProxiesSelectorState>(
+        selector: (_, appState, config, clashConfig) {
           final currentGroups = appState.currentGroups;
           final groupNames = currentGroups.map((e) => e.name).toList();
           return ProxiesSelectorState(
             groupNames: groupNames,
-            currentGroupName: config.currentGroupName,
           );
         },
         shouldRebuild: (prev, next) {
-          if (!const ListEquality<String>()
-              .equals(prev.groupNames, next.groupNames)) {
-            _tabController?.removeListener(_handleTabControllerChange);
+          if (prev.groupNames.length != next.groupNames.length) {
             _tabController?.dispose();
             _tabController = null;
-            return true;
           }
-          return false;
+          return prev != next;
         },
         builder: (_, state, __) {
-          final index = state.groupNames.indexWhere(
-            (item) => item == state.currentGroupName,
-          );
           _tabController ??= TabController(
             length: state.groupNames.length,
-            initialIndex: index == -1 ? 0 : index,
             vsync: this,
-          )..addListener(_handleTabControllerChange);
+          );
           return Column(
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -220,16 +199,10 @@ class ProxiesTabView extends StatelessWidget {
 
   _delayTest(List<Proxy> proxies) async {
     for (final proxy in proxies) {
-      final appController = globalState.appController;
-      final proxyName =
-          appController.appState.getRealProxyName(proxy.name) ?? proxy.name;
       globalState.appController.setDelay(
-        Delay(
-          name: proxyName,
-          value: 0,
-        ),
+        Delay(name: proxy.name, value: 0),
       );
-      clashCore.getDelay(proxyName).then((delay) {
+      clashCore.getDelay(proxy.name).then((delay) {
         globalState.appController.setDelay(delay);
       });
     }
@@ -461,7 +434,7 @@ class _DelayTestButtonContainerState extends State<DelayTestButtonContainer>
     _controller = AnimationController(
       vsync: this,
       duration: const Duration(
-        milliseconds: 200,
+        milliseconds: 600,
       ),
     );
     _scale = Tween<double>(

lib/fragments/requests.dart

@@ -1,178 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-
-import 'package:collection/collection.dart';
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/plugins/app.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-
-class RequestFragment extends StatefulWidget {
-  const RequestFragment({super.key});
-
-  @override
-  State<RequestFragment> createState() => _RequestFragmentState();
-}
-
-class _RequestFragmentState extends State<RequestFragment> {
-  final requestsNotifier = ValueNotifier<List<Connection>>([]);
-  final ScrollController _scrollController = ScrollController(
-    keepScrollOffset: false,
-  );
-
-  Timer? timer;
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final appState = globalState.appController.appState;
-      requestsNotifier.value = List<Connection>.from(appState.requests);
-      if (timer != null) {
-        timer?.cancel();
-        timer = null;
-      }
-      timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
-        final requests = List<Connection>.from(appState.requests);
-        if (!const ListEquality<Connection>().equals(
-          requestsNotifier.value,
-          requests,
-        )) {
-          requestsNotifier.value = requests;
-        }
-      });
-    });
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    timer?.cancel();
-    _scrollController.dispose();
-    timer = null;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ValueListenableBuilder<List<Connection>>(
-      valueListenable: requestsNotifier,
-      builder: (_, List<Connection> connections, __) {
-        if (connections.isEmpty) {
-          return NullStatus(
-            label: appLocalizations.nullRequestsDesc,
-          );
-        }
-        connections = connections.reversed.toList();
-        return ListView.separated(
-          controller: _scrollController,
-          itemBuilder: (_, index) {
-            final connection = connections[index];
-            return RequestItem(
-              key: Key(connection.id),
-              connection: connection,
-            );
-          },
-          separatorBuilder: (BuildContext context, int index) {
-            return const Divider(
-              height: 0,
-            );
-          },
-          itemCount: connections.length,
-        );
-      },
-    );
-  }
-}
-
-class RequestItem extends StatelessWidget {
-  final Connection connection;
-
-  const RequestItem({
-    super.key,
-    required this.connection,
-  });
-
-  Future<ImageProvider?> _getPackageIcon(Connection connection) async {
-    return await app?.getPackageIcon(connection.metadata.process);
-  }
-
-  String _getRequestText(Metadata metadata) {
-    var text = "${metadata.network}:://";
-    final ips = [
-      metadata.host,
-      metadata.destinationIP,
-    ].where((ip) => ip.isNotEmpty);
-    text += ips.join("/");
-    text += ":${metadata.destinationPort}";
-    return text;
-  }
-
-  String _getSourceText(Connection connection) {
-    final metadata = connection.metadata;
-    if (metadata.process.isEmpty) {
-      return connection.start.lastUpdateTimeDesc;
-    }
-    return "${metadata.process} · ${connection.start.lastUpdateTimeDesc}";
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      titleAlignment: ListTileTitleAlignment.top,
-      leading: Platform.isAndroid
-          ? Container(
-              margin: const EdgeInsets.only(top: 4),
-              width: 48,
-              height: 48,
-              child: FutureBuilder<ImageProvider?>(
-                future: _getPackageIcon(connection),
-                builder: (_, snapshot) {
-                  if (!snapshot.hasData && snapshot.data == null) {
-                    return Container();
-                  } else {
-                    return Image(
-                      image: snapshot.data!,
-                      gaplessPlayback: true,
-                      width: 48,
-                      height: 48,
-                    );
-                  }
-                },
-              ),
-            )
-          : null,
-      title: Text(
-        _getRequestText(connection.metadata),
-      ),
-      subtitle: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          const SizedBox(
-            height: 12,
-          ),
-          Text(
-            _getSourceText(connection),
-          ),
-          const SizedBox(
-            height: 12,
-          ),
-          Wrap(
-            runSpacing: 8,
-            spacing: 8,
-            children: [
-              for (final chain in connection.chains)
-                CommonChip(
-                  label: chain,
-                ),
-            ],
-          ),
-          const SizedBox(
-            height: 12,
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/fragments/tools.dart

@@ -166,7 +166,6 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
         delegate: OpenDelegate(
           title: appLocalizations.override,
           widget: const ConfigFragment(),
-          extendPageWidth: 360,
         ),
       ),
       ListItem.open(

lib/l10n/arb/intl_en.arb

@@ -111,7 +111,6 @@
   "noMoreInfoDesc": "No more info",
   "profileParseErrorDesc": "profile parse error",
   "proxyPort": "ProxyPort",
-  "proxyPortDesc": "Set the clash listening port",
   "port": "Port",
   "logLevel": "LogLevel",
   "show": "Show",
@@ -161,26 +160,5 @@
   "checking": "Checking...",
   "country": "Country",
   "checkError": "Check error",
-  "ipCheckTimeout": "Ip check timeout",
-  "search": "Search",
-  "allowBypass": "Allow applications to bypass VPN",
-  "allowBypassDesc": "Some apps can bypass VPN when turned on",
-  "externalController": "ExternalController",
-  "externalControllerDesc": "Once enabled, the clash kernel can be controlled on port 9090",
-  "ipv6Desc": "When turned on it will be able to receive ipv6 traffic",
-  "app": "App",
-  "general": "General",
-  "systemProxyDesc": "Attach HTTP proxy to VpnService",
-  "unifiedDelay": "Unified delay",
-  "unifiedDelayDesc": "Remove extra delays such as handshaking",
-  "tcpConcurrent": "Tcp concurrent",
-  "tcpConcurrentDesc": "Enabling it will allow tcp concurrency",
-  "geodataLoader": "Geo Low Memory Mode",
-  "geodataLoaderDesc": "Enabling will use the Geo low memory loader",
-  "requests": "Requests",
-  "requestsDesc": "View recently requested data",
-  "nullRequestsDesc": "No proxy or no request",
-  "findProcessMode": "Find process",
-  "findProcessModeDesc": "There is a risk of flashback after opening",
-  "init": "Init"
+  "ipCheckTimeout": "Ip check timeout"
 }

lib/l10n/arb/intl_zh_CN.arb

@@ -111,7 +111,6 @@
   "noMoreInfoDesc": "暂无更多信息",
   "profileParseErrorDesc": "配置文件解析错误",
   "proxyPort": "代理端口",
-  "proxyPortDesc": "设置clash监听端口",
   "port": "端口",
   "logLevel": "日志等级",
   "show": "显示",
@@ -161,26 +160,5 @@
   "checking": "检测中...",
   "country": "区域",
   "checkError": "检测失败",
-  "ipCheckTimeout": "Ip检测超时",
-  "search": "搜索",
-  "allowBypass": "允许应用绕过vpn",
-  "allowBypassDesc": "开启后部分应用可绕过VPN",
-  "externalController": "外部控制器",
-  "externalControllerDesc": "开启后将可以通过9090端口控制clash内核",
-  "ipv6Desc": "开启后将可以接收ipv6流量",
-  "app": "应用",
-  "general": "基础",
-  "systemProxyDesc": "为VpnService附加HTTP代理",
-  "unifiedDelay": "统一延迟",
-  "unifiedDelayDesc": "去除握手等额外延迟",
-  "tcpConcurrent": "TCP并发",
-  "tcpConcurrentDesc": "开启后允许tcp并发",
-  "geodataLoader": "Geo低内存模式",
-  "geodataLoaderDesc": "开启将使用Geo低内存加载器",
-  "requests": "请求",
-  "requestsDesc": "查看最近请求数据",
-  "nullRequestsDesc": "未开启代理或者没有请求",
-  "findProcessMode": "查找进程",
-  "findProcessModeDesc": "开启后存在闪退风险",
-  "init": "初始化"
+  "ipCheckTimeout": "Ip检测超时"
 }

lib/l10n/intl/messages_en.dart

@@ -40,14 +40,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "addressTip": MessageLookupByLibrary.simpleMessage(
             "Please enter a valid WebDAV address"),
         "ago": MessageLookupByLibrary.simpleMessage(" Ago"),
-        "allowBypass": MessageLookupByLibrary.simpleMessage(
-            "Allow applications to bypass VPN"),
-        "allowBypassDesc": MessageLookupByLibrary.simpleMessage(
-            "Some apps can bypass VPN when turned on"),
         "allowLan": MessageLookupByLibrary.simpleMessage("AllowLan"),
         "allowLanDesc": MessageLookupByLibrary.simpleMessage(
             "Allow access proxy through the LAN"),
-        "app": MessageLookupByLibrary.simpleMessage("App"),
         "appAccessControl":
             MessageLookupByLibrary.simpleMessage("App access control"),
         "application": MessageLookupByLibrary.simpleMessage("Application"),
@@ -117,10 +112,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "edit": MessageLookupByLibrary.simpleMessage("Edit"),
         "en": MessageLookupByLibrary.simpleMessage("English"),
         "exit": MessageLookupByLibrary.simpleMessage("Exit"),
-        "externalController":
-            MessageLookupByLibrary.simpleMessage("ExternalController"),
-        "externalControllerDesc": MessageLookupByLibrary.simpleMessage(
-            "Once enabled, the clash kernel can be controlled on port 9090"),
         "externalResources":
             MessageLookupByLibrary.simpleMessage("External resources"),
         "file": MessageLookupByLibrary.simpleMessage("File"),
@@ -128,25 +119,14 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Directly upload profile"),
         "filterSystemApp":
             MessageLookupByLibrary.simpleMessage("Filter system app"),
-        "findProcessMode": MessageLookupByLibrary.simpleMessage("Find process"),
-        "findProcessModeDesc": MessageLookupByLibrary.simpleMessage(
-            "There is a risk of flashback after opening"),
-        "general": MessageLookupByLibrary.simpleMessage("General"),
         "geoData": MessageLookupByLibrary.simpleMessage("GeoData"),
-        "geodataLoader":
-            MessageLookupByLibrary.simpleMessage("Geo Low Memory Mode"),
-        "geodataLoaderDesc": MessageLookupByLibrary.simpleMessage(
-            "Enabling will use the Geo low memory loader"),
         "global": MessageLookupByLibrary.simpleMessage("Global"),
         "goDownload": MessageLookupByLibrary.simpleMessage("Go to download"),
         "hours": MessageLookupByLibrary.simpleMessage("Hours"),
         "importFromURL":
             MessageLookupByLibrary.simpleMessage("Import from URL"),
-        "init": MessageLookupByLibrary.simpleMessage("Init"),
         "ipCheckTimeout":
             MessageLookupByLibrary.simpleMessage("Ip check timeout"),
-        "ipv6Desc": MessageLookupByLibrary.simpleMessage(
-            "When turned on it will be able to receive ipv6 traffic"),
         "just": MessageLookupByLibrary.simpleMessage("Just"),
         "language": MessageLookupByLibrary.simpleMessage("Language"),
         "light": MessageLookupByLibrary.simpleMessage("Light"),
@@ -180,8 +160,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "nullLogsDesc": MessageLookupByLibrary.simpleMessage("No logs"),
         "nullProfileDesc": MessageLookupByLibrary.simpleMessage(
             "No profile, Please add a profile"),
-        "nullRequestsDesc":
-            MessageLookupByLibrary.simpleMessage("No proxy or no request"),
         "other": MessageLookupByLibrary.simpleMessage("Other"),
         "outboundMode": MessageLookupByLibrary.simpleMessage("Outbound mode"),
         "override": MessageLookupByLibrary.simpleMessage("Override"),
@@ -217,8 +195,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "project": MessageLookupByLibrary.simpleMessage("Project"),
         "proxies": MessageLookupByLibrary.simpleMessage("Proxies"),
         "proxyPort": MessageLookupByLibrary.simpleMessage("ProxyPort"),
-        "proxyPortDesc": MessageLookupByLibrary.simpleMessage(
-            "Set the clash listening port"),
         "qrcode": MessageLookupByLibrary.simpleMessage("QR code"),
         "qrcodeDesc": MessageLookupByLibrary.simpleMessage(
             "Scan QR code to obtain profile"),
@@ -231,15 +207,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Only recovery profiles"),
         "recoverySuccess":
             MessageLookupByLibrary.simpleMessage("Recovery success"),
-        "requests": MessageLookupByLibrary.simpleMessage("Requests"),
-        "requestsDesc": MessageLookupByLibrary.simpleMessage(
-            "View recently requested data"),
         "resources": MessageLookupByLibrary.simpleMessage("Resources"),
         "resourcesDesc": MessageLookupByLibrary.simpleMessage(
             "External resource related info"),
         "rule": MessageLookupByLibrary.simpleMessage("Rule"),
         "save": MessageLookupByLibrary.simpleMessage("Save"),
-        "search": MessageLookupByLibrary.simpleMessage("Search"),
         "selectAll": MessageLookupByLibrary.simpleMessage("Select all"),
         "selected": MessageLookupByLibrary.simpleMessage("Selected"),
         "settings": MessageLookupByLibrary.simpleMessage("Settings"),
@@ -251,14 +223,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "stopVpn": MessageLookupByLibrary.simpleMessage("Stopping VPN..."),
         "submit": MessageLookupByLibrary.simpleMessage("Submit"),
         "systemProxy": MessageLookupByLibrary.simpleMessage("SystemProxy"),
-        "systemProxyDesc": MessageLookupByLibrary.simpleMessage(
-            "Attach HTTP proxy to VpnService"),
         "tabAnimation": MessageLookupByLibrary.simpleMessage("Tab animation"),
         "tabAnimationDesc": MessageLookupByLibrary.simpleMessage(
             "When enabled, the home tab will add a toggle animation"),
-        "tcpConcurrent": MessageLookupByLibrary.simpleMessage("Tcp concurrent"),
-        "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage(
-            "Enabling it will allow tcp concurrency"),
         "theme": MessageLookupByLibrary.simpleMessage("Theme"),
         "themeColor": MessageLookupByLibrary.simpleMessage("Theme color"),
         "themeDesc": MessageLookupByLibrary.simpleMessage(
@@ -273,9 +240,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "unableToUpdateCurrentProfileDesc":
             MessageLookupByLibrary.simpleMessage(
                 "unable to update current profile"),
-        "unifiedDelay": MessageLookupByLibrary.simpleMessage("Unified delay"),
-        "unifiedDelayDesc": MessageLookupByLibrary.simpleMessage(
-            "Remove extra delays such as handshaking"),
         "unknown": MessageLookupByLibrary.simpleMessage("Unknown"),
         "update": MessageLookupByLibrary.simpleMessage("Update"),
         "upload": MessageLookupByLibrary.simpleMessage("Upload"),

lib/l10n/intl/messages_zh_CN.dart

@@ -36,12 +36,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "addressHelp": MessageLookupByLibrary.simpleMessage("WebDAV服务器地址"),
         "addressTip": MessageLookupByLibrary.simpleMessage("请输入有效的WebDAV地址"),
         "ago": MessageLookupByLibrary.simpleMessage("前"),
-        "allowBypass": MessageLookupByLibrary.simpleMessage("允许应用绕过vpn"),
-        "allowBypassDesc":
-            MessageLookupByLibrary.simpleMessage("开启后部分应用可绕过VPN"),
         "allowLan": MessageLookupByLibrary.simpleMessage("局域网代理"),
         "allowLanDesc": MessageLookupByLibrary.simpleMessage("允许通过局域网访问代理"),
-        "app": MessageLookupByLibrary.simpleMessage("应用"),
         "appAccessControl": MessageLookupByLibrary.simpleMessage("应用访问控制"),
         "application": MessageLookupByLibrary.simpleMessage("应用程序"),
         "applicationDesc": MessageLookupByLibrary.simpleMessage("修改应用程序相关设置"),
@@ -97,28 +93,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "edit": MessageLookupByLibrary.simpleMessage("编辑"),
         "en": MessageLookupByLibrary.simpleMessage("英语"),
         "exit": MessageLookupByLibrary.simpleMessage("退出"),
-        "externalController": MessageLookupByLibrary.simpleMessage("外部控制器"),
-        "externalControllerDesc":
-            MessageLookupByLibrary.simpleMessage("开启后将可以通过9090端口控制clash内核"),
         "externalResources": MessageLookupByLibrary.simpleMessage("外部资源"),
         "file": MessageLookupByLibrary.simpleMessage("文件"),
         "fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
         "filterSystemApp": MessageLookupByLibrary.simpleMessage("过滤系统应用"),
-        "findProcessMode": MessageLookupByLibrary.simpleMessage("查找进程"),
-        "findProcessModeDesc":
-            MessageLookupByLibrary.simpleMessage("开启后存在闪退风险"),
-        "general": MessageLookupByLibrary.simpleMessage("基础"),
         "geoData": MessageLookupByLibrary.simpleMessage("地理数据"),
-        "geodataLoader": MessageLookupByLibrary.simpleMessage("Geo低内存模式"),
-        "geodataLoaderDesc":
-            MessageLookupByLibrary.simpleMessage("开启将使用Geo低内存加载器"),
         "global": MessageLookupByLibrary.simpleMessage("全局"),
         "goDownload": MessageLookupByLibrary.simpleMessage("前往下载"),
         "hours": MessageLookupByLibrary.simpleMessage("小时"),
         "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
-        "init": MessageLookupByLibrary.simpleMessage("初始化"),
         "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
-        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收ipv6流量"),
         "just": MessageLookupByLibrary.simpleMessage("刚刚"),
         "language": MessageLookupByLibrary.simpleMessage("语言"),
         "light": MessageLookupByLibrary.simpleMessage("浅色"),
@@ -147,7 +131,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "nullLogsDesc": MessageLookupByLibrary.simpleMessage("暂无日志"),
         "nullProfileDesc":
             MessageLookupByLibrary.simpleMessage("没有配置文件,请先添加配置文件"),
-        "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("未开启代理或者没有请求"),
         "other": MessageLookupByLibrary.simpleMessage("其他"),
         "outboundMode": MessageLookupByLibrary.simpleMessage("出站模式"),
         "override": MessageLookupByLibrary.simpleMessage("覆写"),
@@ -177,7 +160,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "project": MessageLookupByLibrary.simpleMessage("项目"),
         "proxies": MessageLookupByLibrary.simpleMessage("代理"),
         "proxyPort": MessageLookupByLibrary.simpleMessage("代理端口"),
-        "proxyPortDesc": MessageLookupByLibrary.simpleMessage("设置clash监听端口"),
         "qrcode": MessageLookupByLibrary.simpleMessage("二维码"),
         "qrcodeDesc": MessageLookupByLibrary.simpleMessage("扫描二维码获取配置文件"),
         "recovery": MessageLookupByLibrary.simpleMessage("恢复"),
@@ -185,13 +167,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "recoveryDesc": MessageLookupByLibrary.simpleMessage("从WebDAV恢复数据"),
         "recoveryProfiles": MessageLookupByLibrary.simpleMessage("仅恢复配置文件"),
         "recoverySuccess": MessageLookupByLibrary.simpleMessage("恢复成功"),
-        "requests": MessageLookupByLibrary.simpleMessage("请求"),
-        "requestsDesc": MessageLookupByLibrary.simpleMessage("查看最近请求数据"),
         "resources": MessageLookupByLibrary.simpleMessage("资源"),
         "resourcesDesc": MessageLookupByLibrary.simpleMessage("外部资源相关信息"),
         "rule": MessageLookupByLibrary.simpleMessage("规则"),
         "save": MessageLookupByLibrary.simpleMessage("保存"),
-        "search": MessageLookupByLibrary.simpleMessage("搜索"),
         "selectAll": MessageLookupByLibrary.simpleMessage("全选"),
         "selected": MessageLookupByLibrary.simpleMessage("已选择"),
         "settings": MessageLookupByLibrary.simpleMessage("设置"),
@@ -202,13 +181,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "stopVpn": MessageLookupByLibrary.simpleMessage("正在停止VPN..."),
         "submit": MessageLookupByLibrary.simpleMessage("提交"),
         "systemProxy": MessageLookupByLibrary.simpleMessage("系统代理"),
-        "systemProxyDesc":
-            MessageLookupByLibrary.simpleMessage("为VpnService附加HTTP代理"),
         "tabAnimation": MessageLookupByLibrary.simpleMessage("选项卡动画"),
         "tabAnimationDesc":
             MessageLookupByLibrary.simpleMessage("开启后，主页选项卡将添加切换动画"),
-        "tcpConcurrent": MessageLookupByLibrary.simpleMessage("TCP并发"),
-        "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage("开启后允许tcp并发"),
         "theme": MessageLookupByLibrary.simpleMessage("主题"),
         "themeColor": MessageLookupByLibrary.simpleMessage("主题色彩"),
         "themeDesc": MessageLookupByLibrary.simpleMessage("设置深色模式，调整色彩"),
@@ -220,8 +195,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "tunDesc": MessageLookupByLibrary.simpleMessage("仅在管理员模式生效"),
         "unableToUpdateCurrentProfileDesc":
             MessageLookupByLibrary.simpleMessage("无法更新当前配置文件"),
-        "unifiedDelay": MessageLookupByLibrary.simpleMessage("统一延迟"),
-        "unifiedDelayDesc": MessageLookupByLibrary.simpleMessage("去除握手等额外延迟"),
         "unknown": MessageLookupByLibrary.simpleMessage("未知"),
         "update": MessageLookupByLibrary.simpleMessage("更新"),
         "upload": MessageLookupByLibrary.simpleMessage("上传"),

lib/l10n/l10n.dart

@@ -1170,16 +1170,6 @@ class AppLocalizations {
     );
   }
 
-  /// `Set the clash listening port`
-  String get proxyPortDesc {
-    return Intl.message(
-      'Set the clash listening port',
-      name: 'proxyPortDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
   /// `Port`
   String get port {
     return Intl.message(
@@ -1679,216 +1669,6 @@ class AppLocalizations {
       args: [],
     );
   }
-
-  /// `Search`
-  String get search {
-    return Intl.message(
-      'Search',
-      name: 'search',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Allow applications to bypass VPN`
-  String get allowBypass {
-    return Intl.message(
-      'Allow applications to bypass VPN',
-      name: 'allowBypass',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Some apps can bypass VPN when turned on`
-  String get allowBypassDesc {
-    return Intl.message(
-      'Some apps can bypass VPN when turned on',
-      name: 'allowBypassDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `ExternalController`
-  String get externalController {
-    return Intl.message(
-      'ExternalController',
-      name: 'externalController',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Once enabled, the clash kernel can be controlled on port 9090`
-  String get externalControllerDesc {
-    return Intl.message(
-      'Once enabled, the clash kernel can be controlled on port 9090',
-      name: 'externalControllerDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `When turned on it will be able to receive ipv6 traffic`
-  String get ipv6Desc {
-    return Intl.message(
-      'When turned on it will be able to receive ipv6 traffic',
-      name: 'ipv6Desc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `App`
-  String get app {
-    return Intl.message(
-      'App',
-      name: 'app',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `General`
-  String get general {
-    return Intl.message(
-      'General',
-      name: 'general',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Attach HTTP proxy to VpnService`
-  String get systemProxyDesc {
-    return Intl.message(
-      'Attach HTTP proxy to VpnService',
-      name: 'systemProxyDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Unified delay`
-  String get unifiedDelay {
-    return Intl.message(
-      'Unified delay',
-      name: 'unifiedDelay',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Remove extra delays such as handshaking`
-  String get unifiedDelayDesc {
-    return Intl.message(
-      'Remove extra delays such as handshaking',
-      name: 'unifiedDelayDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Tcp concurrent`
-  String get tcpConcurrent {
-    return Intl.message(
-      'Tcp concurrent',
-      name: 'tcpConcurrent',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Enabling it will allow tcp concurrency`
-  String get tcpConcurrentDesc {
-    return Intl.message(
-      'Enabling it will allow tcp concurrency',
-      name: 'tcpConcurrentDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Geo Low Memory Mode`
-  String get geodataLoader {
-    return Intl.message(
-      'Geo Low Memory Mode',
-      name: 'geodataLoader',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Enabling will use the Geo low memory loader`
-  String get geodataLoaderDesc {
-    return Intl.message(
-      'Enabling will use the Geo low memory loader',
-      name: 'geodataLoaderDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Requests`
-  String get requests {
-    return Intl.message(
-      'Requests',
-      name: 'requests',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `View recently requested data`
-  String get requestsDesc {
-    return Intl.message(
-      'View recently requested data',
-      name: 'requestsDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `No proxy or no request`
-  String get nullRequestsDesc {
-    return Intl.message(
-      'No proxy or no request',
-      name: 'nullRequestsDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Find process`
-  String get findProcessMode {
-    return Intl.message(
-      'Find process',
-      name: 'findProcessMode',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `There is a risk of flashback after opening`
-  String get findProcessModeDesc {
-    return Intl.message(
-      'There is a risk of flashback after opening',
-      name: 'findProcessModeDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Init`
-  String get init {
-    return Intl.message(
-      'Init',
-      name: 'init',
-      desc: '',
-      args: [],
-    );
-  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

lib/main.dart

@@ -22,15 +22,16 @@ Future<void> main() async {
     isCompatible: config.isCompatible,
     selectedMap: config.currentSelectedMap,
   );
-  appState.navigationItems = navigation.getItems(
-    openLogs: config.openLogs,
-    hasProxies: false,
-  );
   await globalState.init(
     appState: appState,
     config: config,
     clashConfig: clashConfig,
   );
+  globalState.updateNavigationItems(
+    appState: appState,
+    config: config,
+    clashConfig: clashConfig,
+  );
   runAppWithPreferences(
     const Application(),
     appState: appState,
@@ -60,16 +61,6 @@ Future<void> vpnService() async {
     clashConfig: clashConfig,
   );
 
-  if (appState.isInit) {
-    globalState.applyProfile(
-      appState: appState,
-      config: config,
-      clashConfig: clashConfig,
-    );
-  } else {
-    exit(0);
-  }
-
   final appLocalizations = await AppLocalizations.load(
     other.getLocaleForString(config.locale) ??
         WidgetsBinding.instance.platformDispatcher.locale,

lib/models/app.dart

@@ -1,10 +1,7 @@
-import 'dart:io';
-
 import 'package:collection/collection.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
-import 'connection.dart';
 import 'ffi.dart';
 import 'log.dart';
 import 'navigation.dart';
@@ -32,7 +29,6 @@ class AppState with ChangeNotifier {
   bool _isCompatible;
   List<Group> _groups;
   double _viewWidth;
-  List<Connection> _requests;
 
   AppState({
     required Mode mode,
@@ -46,7 +42,6 @@ class AppState with ChangeNotifier {
         _viewWidth = 0,
         _selectedMap = selectedMap,
         _sortNum = 0,
-        _requests = [],
         _mode = mode,
         _delayMap = {},
         _groups = [],
@@ -112,7 +107,7 @@ class AppState with ChangeNotifier {
     } else {
       final index = groups.indexWhere((element) => element.name == proxyName);
       if (index == -1) return type;
-      return "$type(${groups[index].now ?? '*'})";
+      return "$type(${groups[index].now})";
     }
   }
 
@@ -162,24 +157,6 @@ class AppState with ChangeNotifier {
     notifyListeners();
   }
 
-  List<Connection> get requests => _requests;
-
-  set requests(List<Connection> value) {
-    if (_requests != value) {
-      _requests = value;
-      notifyListeners();
-    }
-  }
-
-  addRequest(Connection value) {
-    _requests.add(value);
-    final maxLength = Platform.isAndroid ? 1000 : 60;
-    if (_requests.length > maxLength) {
-      _requests = _requests.sublist(_requests.length - maxLength);
-    }
-    notifyListeners();
-  }
-
   List<Log> get logs => _logs;
 
   set logs(List<Log> value) {
@@ -191,10 +168,8 @@ class AppState with ChangeNotifier {
 
   addLog(Log log) {
     _logs.add(log);
-    if (!Platform.isAndroid) {
-      if (_logs.length > 60) {
-        _logs = _logs.sublist(_logs.length - 60);
-      }
+    if (_logs.length > 60) {
+      _logs = _logs.sublist(_logs.length - 60);
     }
     notifyListeners();
   }

lib/models/clash_config.dart

@@ -16,7 +16,7 @@ class Tun with _$Tun {
   const factory Tun({
     @Default(false) bool enable,
     @Default(appName) String device,
-    @Default(TunStack.gvisor) TunStack stack,
+    @Default(TunStack.mixed) TunStack stack,
     @JsonKey(name: "dns-hijack") @Default(["any:53"]) List<String> dnsHijack,
   }) = _Tun;
 
@@ -108,34 +108,29 @@ class Dns {
 class ClashConfig extends ChangeNotifier {
   int _mixedPort;
   bool _allowLan;
-  bool _ipv6;
-  String _geodataLoader;
-  LogLevel _logLevel;
-  String _externalController;
   Mode _mode;
-  FindProcessMode _findProcessMode;
-  bool _unifiedDelay;
-  bool _tcpConcurrent;
+  LogLevel _logLevel;
   Tun _tun;
   Dns _dns;
   List<String> _rules;
 
-  ClashConfig()
-      : _mixedPort = 7890,
-        _mode = Mode.rule,
-        _ipv6 = false,
-        _findProcessMode = FindProcessMode.off,
-        _allowLan = false,
-        _tcpConcurrent = false,
-        _logLevel = LogLevel.info,
-        _tun = const Tun(),
-        _unifiedDelay = false,
-        _geodataLoader = geodataLoaderMemconservative,
-        _externalController = '',
-        _dns = Dns(),
-        _rules = [];
+  ClashConfig({
+    int? mixedPort,
+    Mode? mode,
+    bool? allowLan,
+    LogLevel? logLevel,
+    Tun? tun,
+    Dns? dns,
+    List<String>? rules,
+  })  : _mixedPort = mixedPort ?? 7890,
+        _mode = mode ?? Mode.rule,
+        _allowLan = allowLan ?? false,
+        _logLevel = logLevel ?? LogLevel.info,
+        _tun = tun ?? const Tun(),
+        _dns = dns ?? Dns(),
+        _rules = rules ?? [];
 
-  @JsonKey(name: "mixed-port", defaultValue: 7890)
+  @JsonKey(name: "mixed-port")
   int get mixedPort => _mixedPort;
 
   set mixedPort(int value) {
@@ -145,7 +140,6 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
-  @JsonKey(defaultValue: Mode.rule)
   Mode get mode => _mode;
 
   set mode(Mode value) {
@@ -155,16 +149,6 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
-  @JsonKey(name: "find-process-mode", defaultValue: FindProcessMode.off)
-  FindProcessMode get findProcessMode => _findProcessMode;
-
-  set findProcessMode(FindProcessMode value) {
-    if (_findProcessMode != value) {
-      _findProcessMode = value;
-      notifyListeners();
-    }
-  }
-
   @JsonKey(name: "allow-lan")
   bool get allowLan => _allowLan;
 
@@ -175,7 +159,7 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
-  @JsonKey(name: "log-level", defaultValue: LogLevel.info)
+  @JsonKey(name: "log-level")
   LogLevel get logLevel => _logLevel;
 
   set logLevel(LogLevel value) {
@@ -185,56 +169,6 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
-  @JsonKey(name: "external-controller", defaultValue: '')
-  String get externalController => _externalController;
-
-  set externalController(String value) {
-    if (_externalController != value) {
-      _externalController = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(defaultValue: false)
-  bool get ipv6 => _ipv6;
-
-  set ipv6(bool value) {
-    if (_ipv6 != value) {
-      _ipv6 = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(name: "geodata-loader", defaultValue: geodataLoaderMemconservative)
-  String get geodataLoader => _geodataLoader;
-
-  set geodataLoader(String value) {
-    if (_geodataLoader != value) {
-      _geodataLoader = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(name: "unified-delay", defaultValue: false)
-  bool get unifiedDelay => _unifiedDelay;
-
-  set unifiedDelay(bool value) {
-    if (_unifiedDelay != value) {
-      _unifiedDelay = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(name: "tcp-concurrent", defaultValue: false)
-  bool get tcpConcurrent => _tcpConcurrent;
-
-  set tcpConcurrent(bool value) {
-    if (_tcpConcurrent != value) {
-      _tcpConcurrent = value;
-      notifyListeners();
-    }
-  }
-
   Tun get tun => _tun;
 
   set tun(Tun value) {
@@ -283,6 +217,17 @@ class ClashConfig extends ChangeNotifier {
     return _$ClashConfigFromJson(json);
   }
 
+  ClashConfig copyWith({Tun? tun}) {
+    return ClashConfig(
+      mixedPort: mixedPort,
+      mode: mode,
+      logLevel: logLevel,
+      tun: tun ?? this.tun,
+      dns: dns,
+      allowLan: allowLan,
+    );
+  }
+
   @override
   String toString() {
     return 'ClashConfig{_mixedPort: $_mixedPort, _allowLan: $_allowLan, _mode: $_mode, _logLevel: $_logLevel, _tun: $_tun, _dns: $_dns, _rules: $_rules}';

lib/models/config.dart

@@ -8,7 +8,6 @@ import '../common/common.dart';
 import 'models.dart';
 
 part 'generated/config.g.dart';
-
 part 'generated/config.freezed.dart';
 
 @freezed
@@ -24,17 +23,6 @@ class AccessControl with _$AccessControl {
       _$AccessControlFromJson(json);
 }
 
-@freezed
-class Props with _$Props {
-  const factory Props({
-    AccessControl? accessControl,
-    bool? allowBypass,
-    bool? systemProxy,
-  }) = _Props;
-
-  factory Props.fromJson(Map<String, Object?> json) => _$PropsFromJson(json);
-}
-
 @JsonSerializable()
 class Config extends ChangeNotifier {
   List<Profile> _profiles;
@@ -53,8 +41,6 @@ class Config extends ChangeNotifier {
   AccessControl _accessControl;
   bool _isAnimateToPage;
   bool _autoCheckUpdate;
-  bool _allowBypass;
-  bool _systemProxy;
   DAV? _dav;
 
   Config()
@@ -70,10 +56,8 @@ class Config extends ChangeNotifier {
         _isMinimizeOnExit = true,
         _isAccessControl = false,
         _autoCheckUpdate = true,
-        _systemProxy = true,
         _accessControl = const AccessControl(),
-        _isAnimateToPage = true,
-        _allowBypass = true;
+        _isAnimateToPage = true;
 
   deleteProfileById(String id) {
     _profiles = profiles.where((element) => element.id != id).toList();
@@ -150,15 +134,6 @@ class Config extends ChangeNotifier {
     }
   }
 
-  String? get currentGroupName => currentProfile?.currentGroupName;
-
-  updateCurrentGroupName(String groupName) {
-    if (currentProfile?.currentGroupName != groupName) {
-      currentProfile?.currentGroupName = groupName;
-      notifyListeners();
-    }
-  }
-
   SelectedMap get currentSelectedMap {
     return currentProfile?.selectedMap ?? {};
   }
@@ -330,34 +305,8 @@ class Config extends ChangeNotifier {
     }
   }
 
-  @JsonKey(defaultValue: true)
-  bool get allowBypass {
-    return _allowBypass;
-  }
-
-  set allowBypass(bool value) {
-    if (_allowBypass != value) {
-      _allowBypass = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(defaultValue: true)
-  bool get systemProxy {
-    return _systemProxy;
-  }
-
-  set systemProxy(bool value) {
-    if (_systemProxy != value) {
-      _systemProxy = value;
-      notifyListeners();
-    }
-  }
-
-  update([
-    Config? config,
-    RecoveryOption recoveryOptions = RecoveryOption.all,
-  ]) {
+  update(
+      [Config? config, RecoveryOption recoveryOptions = RecoveryOption.all]) {
     if (config != null) {
       _profiles = config._profiles;
       for (final profile in config._profiles) {
@@ -376,7 +325,6 @@ class Config extends ChangeNotifier {
       _openLog = config._openLog;
       _themeMode = config._themeMode;
       _locale = config._locale;
-      _allowBypass = config._allowBypass;
       _primaryColor = config._primaryColor;
       _proxiesSortType = config._proxiesSortType;
       _isMinimizeOnExit = config._isMinimizeOnExit;

lib/models/connection.dart

@@ -14,7 +14,6 @@ class Metadata with _$Metadata {
     required String destinationIP,
     required String destinationPort,
     required String host,
-    required String process,
     required String remoteDestination,
   }) = _Metadata;
 

lib/models/ffi.dart

@@ -2,7 +2,6 @@
 
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/clash_config.dart';
-import 'package:fl_clash/models/connection.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'generated/ffi.g.dart';
@@ -67,25 +66,16 @@ class Now with _$Now {
 @freezed
 class Process with _$Process {
   const factory Process({
-    required int id,
-    required Metadata metadata,
+    required int uid,
+    required String network,
+    required String source,
+    required String target,
   }) = _Process;
 
   factory Process.fromJson(Map<String, Object?> json) =>
       _$ProcessFromJson(json);
 }
 
-@freezed
-class ProcessMapItem with _$ProcessMapItem {
-  const factory ProcessMapItem({
-    required int id,
-    String? value,
-  }) = _ProcessMapItem;
-
-  factory ProcessMapItem.fromJson(Map<String, Object?> json) =>
-      _$ProcessMapItemFromJson(json);
-}
-
 @freezed
 class ExternalProvider with _$ExternalProvider {
   const factory ExternalProvider({

lib/models/generated/clash_config.freezed.dart

@@ -135,7 +135,7 @@ class _$TunImpl implements _Tun {
   const _$TunImpl(
       {this.enable = false,
       this.device = appName,
-      this.stack = TunStack.gvisor,
+      this.stack = TunStack.mixed,
       @JsonKey(name: "dns-hijack")
       final List<String> dnsHijack = const ["any:53"]})
       : _dnsHijack = dnsHijack;

lib/models/generated/clash_config.g.dart

@@ -35,36 +35,27 @@ Map<String, dynamic> _$DnsToJson(Dns instance) => <String, dynamic>{
       'fake-ip-filter': instance.fakeIpFilter,
     };
 
-ClashConfig _$ClashConfigFromJson(Map<String, dynamic> json) => ClashConfig()
-  ..mixedPort = (json['mixed-port'] as num?)?.toInt() ?? 7890
-  ..mode = $enumDecodeNullable(_$ModeEnumMap, json['mode']) ?? Mode.rule
-  ..findProcessMode = $enumDecodeNullable(
-          _$FindProcessModeEnumMap, json['find-process-mode']) ??
-      FindProcessMode.off
-  ..allowLan = json['allow-lan'] as bool
-  ..logLevel =
-      $enumDecodeNullable(_$LogLevelEnumMap, json['log-level']) ?? LogLevel.info
-  ..externalController = json['external-controller'] as String? ?? ''
-  ..ipv6 = json['ipv6'] as bool? ?? false
-  ..geodataLoader = json['geodata-loader'] as String? ?? 'memconservative'
-  ..unifiedDelay = json['unified-delay'] as bool? ?? false
-  ..tcpConcurrent = json['tcp-concurrent'] as bool? ?? false
-  ..tun = Tun.fromJson(json['tun'] as Map<String, dynamic>)
-  ..dns = Dns.fromJson(json['dns'] as Map<String, dynamic>)
-  ..rules = (json['rules'] as List<dynamic>).map((e) => e as String).toList();
+ClashConfig _$ClashConfigFromJson(Map<String, dynamic> json) => ClashConfig(
+      mixedPort: (json['mixed-port'] as num?)?.toInt(),
+      mode: $enumDecodeNullable(_$ModeEnumMap, json['mode']),
+      allowLan: json['allow-lan'] as bool?,
+      logLevel: $enumDecodeNullable(_$LogLevelEnumMap, json['log-level']),
+      tun: json['tun'] == null
+          ? null
+          : Tun.fromJson(json['tun'] as Map<String, dynamic>),
+      dns: json['dns'] == null
+          ? null
+          : Dns.fromJson(json['dns'] as Map<String, dynamic>),
+      rules:
+          (json['rules'] as List<dynamic>?)?.map((e) => e as String).toList(),
+    );
 
 Map<String, dynamic> _$ClashConfigToJson(ClashConfig instance) =>
     <String, dynamic>{
       'mixed-port': instance.mixedPort,
       'mode': _$ModeEnumMap[instance.mode]!,
-      'find-process-mode': _$FindProcessModeEnumMap[instance.findProcessMode]!,
       'allow-lan': instance.allowLan,
       'log-level': _$LogLevelEnumMap[instance.logLevel]!,
-      'external-controller': instance.externalController,
-      'ipv6': instance.ipv6,
-      'geodata-loader': instance.geodataLoader,
-      'unified-delay': instance.unifiedDelay,
-      'tcp-concurrent': instance.tcpConcurrent,
       'tun': instance.tun,
       'dns': instance.dns,
       'rules': instance.rules,
@@ -76,11 +67,6 @@ const _$ModeEnumMap = {
   Mode.direct: 'direct',
 };
 
-const _$FindProcessModeEnumMap = {
-  FindProcessMode.always: 'always',
-  FindProcessMode.off: 'off',
-};
-
 const _$LogLevelEnumMap = {
   LogLevel.debug: 'debug',
   LogLevel.info: 'info',
@@ -93,7 +79,7 @@ _$TunImpl _$$TunImplFromJson(Map<String, dynamic> json) => _$TunImpl(
       enable: json['enable'] as bool? ?? false,
       device: json['device'] as String? ?? appName,
       stack: $enumDecodeNullable(_$TunStackEnumMap, json['stack']) ??
-          TunStack.gvisor,
+          TunStack.mixed,
       dnsHijack: (json['dns-hijack'] as List<dynamic>?)
               ?.map((e) => e as String)
               .toList() ??

lib/models/generated/config.freezed.dart

@@ -239,193 +239,3 @@ abstract class _AccessControl implements AccessControl {
   _$$AccessControlImplCopyWith<_$AccessControlImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
-
-Props _$PropsFromJson(Map<String, dynamic> json) {
-  return _Props.fromJson(json);
-}
-
-/// @nodoc
-mixin _$Props {
-  AccessControl? get accessControl => throw _privateConstructorUsedError;
-  bool? get allowBypass => throw _privateConstructorUsedError;
-  bool? get systemProxy => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $PropsCopyWith<Props> get copyWith => throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $PropsCopyWith<$Res> {
-  factory $PropsCopyWith(Props value, $Res Function(Props) then) =
-      _$PropsCopyWithImpl<$Res, Props>;
-  @useResult
-  $Res call(
-      {AccessControl? accessControl, bool? allowBypass, bool? systemProxy});
-
-  $AccessControlCopyWith<$Res>? get accessControl;
-}
-
-/// @nodoc
-class _$PropsCopyWithImpl<$Res, $Val extends Props>
-    implements $PropsCopyWith<$Res> {
-  _$PropsCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? accessControl = freezed,
-    Object? allowBypass = freezed,
-    Object? systemProxy = freezed,
-  }) {
-    return _then(_value.copyWith(
-      accessControl: freezed == accessControl
-          ? _value.accessControl
-          : accessControl // ignore: cast_nullable_to_non_nullable
-              as AccessControl?,
-      allowBypass: freezed == allowBypass
-          ? _value.allowBypass
-          : allowBypass // ignore: cast_nullable_to_non_nullable
-              as bool?,
-      systemProxy: freezed == systemProxy
-          ? _value.systemProxy
-          : systemProxy // ignore: cast_nullable_to_non_nullable
-              as bool?,
-    ) as $Val);
-  }
-
-  @override
-  @pragma('vm:prefer-inline')
-  $AccessControlCopyWith<$Res>? get accessControl {
-    if (_value.accessControl == null) {
-      return null;
-    }
-
-    return $AccessControlCopyWith<$Res>(_value.accessControl!, (value) {
-      return _then(_value.copyWith(accessControl: value) as $Val);
-    });
-  }
-}
-
-/// @nodoc
-abstract class _$$PropsImplCopyWith<$Res> implements $PropsCopyWith<$Res> {
-  factory _$$PropsImplCopyWith(
-          _$PropsImpl value, $Res Function(_$PropsImpl) then) =
-      __$$PropsImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call(
-      {AccessControl? accessControl, bool? allowBypass, bool? systemProxy});
-
-  @override
-  $AccessControlCopyWith<$Res>? get accessControl;
-}
-
-/// @nodoc
-class __$$PropsImplCopyWithImpl<$Res>
-    extends _$PropsCopyWithImpl<$Res, _$PropsImpl>
-    implements _$$PropsImplCopyWith<$Res> {
-  __$$PropsImplCopyWithImpl(
-      _$PropsImpl _value, $Res Function(_$PropsImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? accessControl = freezed,
-    Object? allowBypass = freezed,
-    Object? systemProxy = freezed,
-  }) {
-    return _then(_$PropsImpl(
-      accessControl: freezed == accessControl
-          ? _value.accessControl
-          : accessControl // ignore: cast_nullable_to_non_nullable
-              as AccessControl?,
-      allowBypass: freezed == allowBypass
-          ? _value.allowBypass
-          : allowBypass // ignore: cast_nullable_to_non_nullable
-              as bool?,
-      systemProxy: freezed == systemProxy
-          ? _value.systemProxy
-          : systemProxy // ignore: cast_nullable_to_non_nullable
-              as bool?,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$PropsImpl implements _Props {
-  const _$PropsImpl({this.accessControl, this.allowBypass, this.systemProxy});
-
-  factory _$PropsImpl.fromJson(Map<String, dynamic> json) =>
-      _$$PropsImplFromJson(json);
-
-  @override
-  final AccessControl? accessControl;
-  @override
-  final bool? allowBypass;
-  @override
-  final bool? systemProxy;
-
-  @override
-  String toString() {
-    return 'Props(accessControl: $accessControl, allowBypass: $allowBypass, systemProxy: $systemProxy)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$PropsImpl &&
-            (identical(other.accessControl, accessControl) ||
-                other.accessControl == accessControl) &&
-            (identical(other.allowBypass, allowBypass) ||
-                other.allowBypass == allowBypass) &&
-            (identical(other.systemProxy, systemProxy) ||
-                other.systemProxy == systemProxy));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode =>
-      Object.hash(runtimeType, accessControl, allowBypass, systemProxy);
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$PropsImplCopyWith<_$PropsImpl> get copyWith =>
-      __$$PropsImplCopyWithImpl<_$PropsImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$PropsImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _Props implements Props {
-  const factory _Props(
-      {final AccessControl? accessControl,
-      final bool? allowBypass,
-      final bool? systemProxy}) = _$PropsImpl;
-
-  factory _Props.fromJson(Map<String, dynamic> json) = _$PropsImpl.fromJson;
-
-  @override
-  AccessControl? get accessControl;
-  @override
-  bool? get allowBypass;
-  @override
-  bool? get systemProxy;
-  @override
-  @JsonKey(ignore: true)
-  _$$PropsImplCopyWith<_$PropsImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}

lib/models/generated/config.g.dart

@@ -32,9 +32,7 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
       : DAV.fromJson(json['dav'] as Map<String, dynamic>)
   ..isAnimateToPage = json['isAnimateToPage'] as bool? ?? true
   ..isCompatible = json['isCompatible'] as bool? ?? true
-  ..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true
-  ..allowBypass = json['allowBypass'] as bool? ?? true
-  ..systemProxy = json['systemProxy'] as bool? ?? true;
+  ..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true;
 
 Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
       'profiles': instance.profiles,
@@ -54,8 +52,6 @@ Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
       'isAnimateToPage': instance.isAnimateToPage,
       'isCompatible': instance.isCompatible,
       'autoCheckUpdate': instance.autoCheckUpdate,
-      'allowBypass': instance.allowBypass,
-      'systemProxy': instance.systemProxy,
     };
 
 const _$ThemeModeEnumMap = {
@@ -97,19 +93,3 @@ const _$AccessControlModeEnumMap = {
   AccessControlMode.acceptSelected: 'acceptSelected',
   AccessControlMode.rejectSelected: 'rejectSelected',
 };
-
-_$PropsImpl _$$PropsImplFromJson(Map<String, dynamic> json) => _$PropsImpl(
-      accessControl: json['accessControl'] == null
-          ? null
-          : AccessControl.fromJson(
-              json['accessControl'] as Map<String, dynamic>),
-      allowBypass: json['allowBypass'] as bool?,
-      systemProxy: json['systemProxy'] as bool?,
-    );
-
-Map<String, dynamic> _$$PropsImplToJson(_$PropsImpl instance) =>
-    <String, dynamic>{
-      'accessControl': instance.accessControl,
-      'allowBypass': instance.allowBypass,
-      'systemProxy': instance.systemProxy,
-    };

lib/models/generated/connection.freezed.dart

@@ -27,7 +27,6 @@ mixin _$Metadata {
   String get destinationIP => throw _privateConstructorUsedError;
   String get destinationPort => throw _privateConstructorUsedError;
   String get host => throw _privateConstructorUsedError;
-  String get process => throw _privateConstructorUsedError;
   String get remoteDestination => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@@ -49,7 +48,6 @@ abstract class $MetadataCopyWith<$Res> {
       String destinationIP,
       String destinationPort,
       String host,
-      String process,
       String remoteDestination});
 }
 
@@ -73,7 +71,6 @@ class _$MetadataCopyWithImpl<$Res, $Val extends Metadata>
     Object? destinationIP = null,
     Object? destinationPort = null,
     Object? host = null,
-    Object? process = null,
     Object? remoteDestination = null,
   }) {
     return _then(_value.copyWith(
@@ -105,10 +102,6 @@ class _$MetadataCopyWithImpl<$Res, $Val extends Metadata>
           ? _value.host
           : host // ignore: cast_nullable_to_non_nullable
               as String,
-      process: null == process
-          ? _value.process
-          : process // ignore: cast_nullable_to_non_nullable
-              as String,
       remoteDestination: null == remoteDestination
           ? _value.remoteDestination
           : remoteDestination // ignore: cast_nullable_to_non_nullable
@@ -133,7 +126,6 @@ abstract class _$$MetadataImplCopyWith<$Res>
       String destinationIP,
       String destinationPort,
       String host,
-      String process,
       String remoteDestination});
 }
 
@@ -155,7 +147,6 @@ class __$$MetadataImplCopyWithImpl<$Res>
     Object? destinationIP = null,
     Object? destinationPort = null,
     Object? host = null,
-    Object? process = null,
     Object? remoteDestination = null,
   }) {
     return _then(_$MetadataImpl(
@@ -187,10 +178,6 @@ class __$$MetadataImplCopyWithImpl<$Res>
           ? _value.host
           : host // ignore: cast_nullable_to_non_nullable
               as String,
-      process: null == process
-          ? _value.process
-          : process // ignore: cast_nullable_to_non_nullable
-              as String,
       remoteDestination: null == remoteDestination
           ? _value.remoteDestination
           : remoteDestination // ignore: cast_nullable_to_non_nullable
@@ -210,7 +197,6 @@ class _$MetadataImpl implements _Metadata {
       required this.destinationIP,
       required this.destinationPort,
       required this.host,
-      required this.process,
       required this.remoteDestination});
 
   factory _$MetadataImpl.fromJson(Map<String, dynamic> json) =>
@@ -231,13 +217,11 @@ class _$MetadataImpl implements _Metadata {
   @override
   final String host;
   @override
-  final String process;
-  @override
   final String remoteDestination;
 
   @override
   String toString() {
-    return 'Metadata(uid: $uid, network: $network, sourceIP: $sourceIP, sourcePort: $sourcePort, destinationIP: $destinationIP, destinationPort: $destinationPort, host: $host, process: $process, remoteDestination: $remoteDestination)';
+    return 'Metadata(uid: $uid, network: $network, sourceIP: $sourceIP, sourcePort: $sourcePort, destinationIP: $destinationIP, destinationPort: $destinationPort, host: $host, remoteDestination: $remoteDestination)';
   }
 
   @override
@@ -256,24 +240,14 @@ class _$MetadataImpl implements _Metadata {
             (identical(other.destinationPort, destinationPort) ||
                 other.destinationPort == destinationPort) &&
             (identical(other.host, host) || other.host == host) &&
-            (identical(other.process, process) || other.process == process) &&
             (identical(other.remoteDestination, remoteDestination) ||
                 other.remoteDestination == remoteDestination));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      uid,
-      network,
-      sourceIP,
-      sourcePort,
-      destinationIP,
-      destinationPort,
-      host,
-      process,
-      remoteDestination);
+  int get hashCode => Object.hash(runtimeType, uid, network, sourceIP,
+      sourcePort, destinationIP, destinationPort, host, remoteDestination);
 
   @JsonKey(ignore: true)
   @override
@@ -298,7 +272,6 @@ abstract class _Metadata implements Metadata {
       required final String destinationIP,
       required final String destinationPort,
       required final String host,
-      required final String process,
       required final String remoteDestination}) = _$MetadataImpl;
 
   factory _Metadata.fromJson(Map<String, dynamic> json) =
@@ -319,8 +292,6 @@ abstract class _Metadata implements Metadata {
   @override
   String get host;
   @override
-  String get process;
-  @override
   String get remoteDestination;
   @override
   @JsonKey(ignore: true)

lib/models/generated/connection.g.dart

@@ -15,7 +15,6 @@ _$MetadataImpl _$$MetadataImplFromJson(Map<String, dynamic> json) =>
       destinationIP: json['destinationIP'] as String,
       destinationPort: json['destinationPort'] as String,
       host: json['host'] as String,
-      process: json['process'] as String,
       remoteDestination: json['remoteDestination'] as String,
     );
 
@@ -28,7 +27,6 @@ Map<String, dynamic> _$$MetadataImplToJson(_$MetadataImpl instance) =>
       'destinationIP': instance.destinationIP,
       'destinationPort': instance.destinationPort,
       'host': instance.host,
-      'process': instance.process,
       'remoteDestination': instance.remoteDestination,
     };
 

lib/models/generated/ffi.freezed.dart

@@ -848,8 +848,10 @@ Process _$ProcessFromJson(Map<String, dynamic> json) {
 
 /// @nodoc
 mixin _$Process {
-  int get id => throw _privateConstructorUsedError;
-  Metadata get metadata => throw _privateConstructorUsedError;
+  int get uid => throw _privateConstructorUsedError;
+  String get network => throw _privateConstructorUsedError;
+  String get source => throw _privateConstructorUsedError;
+  String get target => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -861,9 +863,7 @@ abstract class $ProcessCopyWith<$Res> {
   factory $ProcessCopyWith(Process value, $Res Function(Process) then) =
       _$ProcessCopyWithImpl<$Res, Process>;
   @useResult
-  $Res call({int id, Metadata metadata});
-
-  $MetadataCopyWith<$Res> get metadata;
+  $Res call({int uid, String network, String source, String target});
 }
 
 /// @nodoc
@@ -879,28 +879,30 @@ class _$ProcessCopyWithImpl<$Res, $Val extends Process>
   @pragma('vm:prefer-inline')
   @override
   $Res call({
-    Object? id = null,
-    Object? metadata = null,
+    Object? uid = null,
+    Object? network = null,
+    Object? source = null,
+    Object? target = null,
   }) {
     return _then(_value.copyWith(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
+      uid: null == uid
+          ? _value.uid
+          : uid // ignore: cast_nullable_to_non_nullable
               as int,
-      metadata: null == metadata
-          ? _value.metadata
-          : metadata // ignore: cast_nullable_to_non_nullable
-              as Metadata,
+      network: null == network
+          ? _value.network
+          : network // ignore: cast_nullable_to_non_nullable
+              as String,
+      source: null == source
+          ? _value.source
+          : source // ignore: cast_nullable_to_non_nullable
+              as String,
+      target: null == target
+          ? _value.target
+          : target // ignore: cast_nullable_to_non_nullable
+              as String,
     ) as $Val);
   }
-
-  @override
-  @pragma('vm:prefer-inline')
-  $MetadataCopyWith<$Res> get metadata {
-    return $MetadataCopyWith<$Res>(_value.metadata, (value) {
-      return _then(_value.copyWith(metadata: value) as $Val);
-    });
-  }
 }
 
 /// @nodoc
@@ -910,10 +912,7 @@ abstract class _$$ProcessImplCopyWith<$Res> implements $ProcessCopyWith<$Res> {
       __$$ProcessImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({int id, Metadata metadata});
-
-  @override
-  $MetadataCopyWith<$Res> get metadata;
+  $Res call({int uid, String network, String source, String target});
 }
 
 /// @nodoc
@@ -927,18 +926,28 @@ class __$$ProcessImplCopyWithImpl<$Res>
   @pragma('vm:prefer-inline')
   @override
   $Res call({
-    Object? id = null,
-    Object? metadata = null,
+    Object? uid = null,
+    Object? network = null,
+    Object? source = null,
+    Object? target = null,
   }) {
     return _then(_$ProcessImpl(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
+      uid: null == uid
+          ? _value.uid
+          : uid // ignore: cast_nullable_to_non_nullable
               as int,
-      metadata: null == metadata
-          ? _value.metadata
-          : metadata // ignore: cast_nullable_to_non_nullable
-              as Metadata,
+      network: null == network
+          ? _value.network
+          : network // ignore: cast_nullable_to_non_nullable
+              as String,
+      source: null == source
+          ? _value.source
+          : source // ignore: cast_nullable_to_non_nullable
+              as String,
+      target: null == target
+          ? _value.target
+          : target // ignore: cast_nullable_to_non_nullable
+              as String,
     ));
   }
 }
@@ -946,19 +955,27 @@ class __$$ProcessImplCopyWithImpl<$Res>
 /// @nodoc
 @JsonSerializable()
 class _$ProcessImpl implements _Process {
-  const _$ProcessImpl({required this.id, required this.metadata});
+  const _$ProcessImpl(
+      {required this.uid,
+      required this.network,
+      required this.source,
+      required this.target});
 
   factory _$ProcessImpl.fromJson(Map<String, dynamic> json) =>
       _$$ProcessImplFromJson(json);
 
   @override
-  final int id;
+  final int uid;
   @override
-  final Metadata metadata;
+  final String network;
+  @override
+  final String source;
+  @override
+  final String target;
 
   @override
   String toString() {
-    return 'Process(id: $id, metadata: $metadata)';
+    return 'Process(uid: $uid, network: $network, source: $source, target: $target)';
   }
 
   @override
@@ -966,14 +983,15 @@ class _$ProcessImpl implements _Process {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$ProcessImpl &&
-            (identical(other.id, id) || other.id == id) &&
-            (identical(other.metadata, metadata) ||
-                other.metadata == metadata));
+            (identical(other.uid, uid) || other.uid == uid) &&
+            (identical(other.network, network) || other.network == network) &&
+            (identical(other.source, source) || other.source == source) &&
+            (identical(other.target, target) || other.target == target));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(runtimeType, id, metadata);
+  int get hashCode => Object.hash(runtimeType, uid, network, source, target);
 
   @JsonKey(ignore: true)
   @override
@@ -991,175 +1009,27 @@ class _$ProcessImpl implements _Process {
 
 abstract class _Process implements Process {
   const factory _Process(
-      {required final int id,
-      required final Metadata metadata}) = _$ProcessImpl;
+      {required final int uid,
+      required final String network,
+      required final String source,
+      required final String target}) = _$ProcessImpl;
 
   factory _Process.fromJson(Map<String, dynamic> json) = _$ProcessImpl.fromJson;
 
   @override
-  int get id;
+  int get uid;
   @override
-  Metadata get metadata;
+  String get network;
+  @override
+  String get source;
+  @override
+  String get target;
   @override
   @JsonKey(ignore: true)
   _$$ProcessImplCopyWith<_$ProcessImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
-ProcessMapItem _$ProcessMapItemFromJson(Map<String, dynamic> json) {
-  return _ProcessMapItem.fromJson(json);
-}
-
-/// @nodoc
-mixin _$ProcessMapItem {
-  int get id => throw _privateConstructorUsedError;
-  String? get value => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $ProcessMapItemCopyWith<ProcessMapItem> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $ProcessMapItemCopyWith<$Res> {
-  factory $ProcessMapItemCopyWith(
-          ProcessMapItem value, $Res Function(ProcessMapItem) then) =
-      _$ProcessMapItemCopyWithImpl<$Res, ProcessMapItem>;
-  @useResult
-  $Res call({int id, String? value});
-}
-
-/// @nodoc
-class _$ProcessMapItemCopyWithImpl<$Res, $Val extends ProcessMapItem>
-    implements $ProcessMapItemCopyWith<$Res> {
-  _$ProcessMapItemCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? id = null,
-    Object? value = freezed,
-  }) {
-    return _then(_value.copyWith(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as int,
-      value: freezed == value
-          ? _value.value
-          : value // ignore: cast_nullable_to_non_nullable
-              as String?,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$ProcessMapItemImplCopyWith<$Res>
-    implements $ProcessMapItemCopyWith<$Res> {
-  factory _$$ProcessMapItemImplCopyWith(_$ProcessMapItemImpl value,
-          $Res Function(_$ProcessMapItemImpl) then) =
-      __$$ProcessMapItemImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call({int id, String? value});
-}
-
-/// @nodoc
-class __$$ProcessMapItemImplCopyWithImpl<$Res>
-    extends _$ProcessMapItemCopyWithImpl<$Res, _$ProcessMapItemImpl>
-    implements _$$ProcessMapItemImplCopyWith<$Res> {
-  __$$ProcessMapItemImplCopyWithImpl(
-      _$ProcessMapItemImpl _value, $Res Function(_$ProcessMapItemImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? id = null,
-    Object? value = freezed,
-  }) {
-    return _then(_$ProcessMapItemImpl(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as int,
-      value: freezed == value
-          ? _value.value
-          : value // ignore: cast_nullable_to_non_nullable
-              as String?,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$ProcessMapItemImpl implements _ProcessMapItem {
-  const _$ProcessMapItemImpl({required this.id, this.value});
-
-  factory _$ProcessMapItemImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ProcessMapItemImplFromJson(json);
-
-  @override
-  final int id;
-  @override
-  final String? value;
-
-  @override
-  String toString() {
-    return 'ProcessMapItem(id: $id, value: $value)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$ProcessMapItemImpl &&
-            (identical(other.id, id) || other.id == id) &&
-            (identical(other.value, value) || other.value == value));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(runtimeType, id, value);
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$ProcessMapItemImplCopyWith<_$ProcessMapItemImpl> get copyWith =>
-      __$$ProcessMapItemImplCopyWithImpl<_$ProcessMapItemImpl>(
-          this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ProcessMapItemImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _ProcessMapItem implements ProcessMapItem {
-  const factory _ProcessMapItem({required final int id, final String? value}) =
-      _$ProcessMapItemImpl;
-
-  factory _ProcessMapItem.fromJson(Map<String, dynamic> json) =
-      _$ProcessMapItemImpl.fromJson;
-
-  @override
-  int get id;
-  @override
-  String? get value;
-  @override
-  @JsonKey(ignore: true)
-  _$$ProcessMapItemImplCopyWith<_$ProcessMapItemImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
 ExternalProvider _$ExternalProviderFromJson(Map<String, dynamic> json) {
   return _ExternalProvider.fromJson(json);
 }

lib/models/generated/ffi.g.dart

@@ -56,7 +56,6 @@ const _$MessageTypeEnumMap = {
   MessageType.delay: 'delay',
   MessageType.process: 'process',
   MessageType.now: 'now',
-  MessageType.request: 'request',
 };
 
 _$DelayImpl _$$DelayImplFromJson(Map<String, dynamic> json) => _$DelayImpl(
@@ -82,27 +81,18 @@ Map<String, dynamic> _$$NowImplToJson(_$NowImpl instance) => <String, dynamic>{
 
 _$ProcessImpl _$$ProcessImplFromJson(Map<String, dynamic> json) =>
     _$ProcessImpl(
-      id: (json['id'] as num).toInt(),
-      metadata: Metadata.fromJson(json['metadata'] as Map<String, dynamic>),
+      uid: (json['uid'] as num).toInt(),
+      network: json['network'] as String,
+      source: json['source'] as String,
+      target: json['target'] as String,
     );
 
 Map<String, dynamic> _$$ProcessImplToJson(_$ProcessImpl instance) =>
     <String, dynamic>{
-      'id': instance.id,
-      'metadata': instance.metadata,
-    };
-
-_$ProcessMapItemImpl _$$ProcessMapItemImplFromJson(Map<String, dynamic> json) =>
-    _$ProcessMapItemImpl(
-      id: (json['id'] as num).toInt(),
-      value: json['value'] as String?,
-    );
-
-Map<String, dynamic> _$$ProcessMapItemImplToJson(
-        _$ProcessMapItemImpl instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'value': instance.value,
+      'uid': instance.uid,
+      'network': instance.network,
+      'source': instance.source,
+      'target': instance.target,
     };
 
 _$ExternalProviderImpl _$$ExternalProviderImplFromJson(

lib/models/generated/profile.g.dart

@@ -24,10 +24,10 @@ Profile _$ProfileFromJson(Map<String, dynamic> json) => Profile(
       id: json['id'] as String?,
       label: json['label'] as String?,
       url: json['url'] as String?,
-      currentGroupName: json['currentGroupName'] as String?,
       userInfo: json['userInfo'] == null
           ? null
           : UserInfo.fromJson(json['userInfo'] as Map<String, dynamic>),
+      proxyName: json['proxyName'] as String?,
       lastUpdateDate: json['lastUpdateDate'] == null
           ? null
           : DateTime.parse(json['lastUpdateDate'] as String),
@@ -43,7 +43,7 @@ Profile _$ProfileFromJson(Map<String, dynamic> json) => Profile(
 Map<String, dynamic> _$ProfileToJson(Profile instance) => <String, dynamic>{
       'id': instance.id,
       'label': instance.label,
-      'currentGroupName': instance.currentGroupName,
+      'proxyName': instance.proxyName,
       'url': instance.url,
       'lastUpdateDate': instance.lastUpdateDate?.toIso8601String(),
       'autoUpdateDuration': instance.autoUpdateDuration.inMicroseconds,

lib/models/generated/proxy.g.dart

@@ -28,8 +28,6 @@ const _$GroupTypeEnumMap = {
   GroupType.Selector: 'Selector',
   GroupType.URLTest: 'URLTest',
   GroupType.Fallback: 'Fallback',
-  GroupType.LoadBalance: 'LoadBalance',
-  GroupType.Relay: 'Relay',
 };
 
 _$ProxyImpl _$$ProxyImplFromJson(Map<String, dynamic> json) => _$ProxyImpl(

lib/models/generated/selector.freezed.dart

@@ -1583,7 +1583,6 @@ abstract class _ProxiesCardSelectorState implements ProxiesCardSelectorState {
 /// @nodoc
 mixin _$ProxiesSelectorState {
   List<String> get groupNames => throw _privateConstructorUsedError;
-  String? get currentGroupName => throw _privateConstructorUsedError;
 
   @JsonKey(ignore: true)
   $ProxiesSelectorStateCopyWith<ProxiesSelectorState> get copyWith =>
@@ -1596,7 +1595,7 @@ abstract class $ProxiesSelectorStateCopyWith<$Res> {
           $Res Function(ProxiesSelectorState) then) =
       _$ProxiesSelectorStateCopyWithImpl<$Res, ProxiesSelectorState>;
   @useResult
-  $Res call({List<String> groupNames, String? currentGroupName});
+  $Res call({List<String> groupNames});
 }
 
 /// @nodoc
@@ -1614,17 +1613,12 @@ class _$ProxiesSelectorStateCopyWithImpl<$Res,
   @override
   $Res call({
     Object? groupNames = null,
-    Object? currentGroupName = freezed,
   }) {
     return _then(_value.copyWith(
       groupNames: null == groupNames
           ? _value.groupNames
           : groupNames // ignore: cast_nullable_to_non_nullable
               as List<String>,
-      currentGroupName: freezed == currentGroupName
-          ? _value.currentGroupName
-          : currentGroupName // ignore: cast_nullable_to_non_nullable
-              as String?,
     ) as $Val);
   }
 }
@@ -1637,7 +1631,7 @@ abstract class _$$ProxiesSelectorStateImplCopyWith<$Res>
       __$$ProxiesSelectorStateImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({List<String> groupNames, String? currentGroupName});
+  $Res call({List<String> groupNames});
 }
 
 /// @nodoc
@@ -1652,17 +1646,12 @@ class __$$ProxiesSelectorStateImplCopyWithImpl<$Res>
   @override
   $Res call({
     Object? groupNames = null,
-    Object? currentGroupName = freezed,
   }) {
     return _then(_$ProxiesSelectorStateImpl(
       groupNames: null == groupNames
           ? _value._groupNames
           : groupNames // ignore: cast_nullable_to_non_nullable
               as List<String>,
-      currentGroupName: freezed == currentGroupName
-          ? _value.currentGroupName
-          : currentGroupName // ignore: cast_nullable_to_non_nullable
-              as String?,
     ));
   }
 }
@@ -1670,8 +1659,7 @@ class __$$ProxiesSelectorStateImplCopyWithImpl<$Res>
 /// @nodoc
 
 class _$ProxiesSelectorStateImpl implements _ProxiesSelectorState {
-  const _$ProxiesSelectorStateImpl(
-      {required final List<String> groupNames, required this.currentGroupName})
+  const _$ProxiesSelectorStateImpl({required final List<String> groupNames})
       : _groupNames = groupNames;
 
   final List<String> _groupNames;
@@ -1682,12 +1670,9 @@ class _$ProxiesSelectorStateImpl implements _ProxiesSelectorState {
     return EqualUnmodifiableListView(_groupNames);
   }
 
-  @override
-  final String? currentGroupName;
-
   @override
   String toString() {
-    return 'ProxiesSelectorState(groupNames: $groupNames, currentGroupName: $currentGroupName)';
+    return 'ProxiesSelectorState(groupNames: $groupNames)';
   }
 
   @override
@@ -1696,14 +1681,12 @@ class _$ProxiesSelectorStateImpl implements _ProxiesSelectorState {
         (other.runtimeType == runtimeType &&
             other is _$ProxiesSelectorStateImpl &&
             const DeepCollectionEquality()
-                .equals(other._groupNames, _groupNames) &&
-            (identical(other.currentGroupName, currentGroupName) ||
-                other.currentGroupName == currentGroupName));
+                .equals(other._groupNames, _groupNames));
   }
 
   @override
-  int get hashCode => Object.hash(runtimeType,
-      const DeepCollectionEquality().hash(_groupNames), currentGroupName);
+  int get hashCode => Object.hash(
+      runtimeType, const DeepCollectionEquality().hash(_groupNames));
 
   @JsonKey(ignore: true)
   @override
@@ -1716,14 +1699,11 @@ class _$ProxiesSelectorStateImpl implements _ProxiesSelectorState {
 
 abstract class _ProxiesSelectorState implements ProxiesSelectorState {
   const factory _ProxiesSelectorState(
-      {required final List<String> groupNames,
-      required final String? currentGroupName}) = _$ProxiesSelectorStateImpl;
+      {required final List<String> groupNames}) = _$ProxiesSelectorStateImpl;
 
   @override
   List<String> get groupNames;
   @override
-  String? get currentGroupName;
-  @override
   @JsonKey(ignore: true)
   _$$ProxiesSelectorStateImplCopyWith<_$ProxiesSelectorStateImpl>
       get copyWith => throw _privateConstructorUsedError;

lib/models/profile.dart

@@ -62,7 +62,7 @@ class UserInfo {
 class Profile {
   String id;
   String? label;
-  String? currentGroupName;
+  String? proxyName;
   String? url;
   DateTime? lastUpdateDate;
   Duration autoUpdateDuration;
@@ -74,8 +74,8 @@ class Profile {
     String? id,
     this.label,
     this.url,
-    this.currentGroupName,
     this.userInfo,
+    this.proxyName,
     this.lastUpdateDate,
     SelectedMap? selectedMap,
     Duration? autoUpdateDuration,
@@ -134,7 +134,6 @@ class Profile {
     return _$ProfileFromJson(json);
   }
 
-
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -142,31 +141,34 @@ class Profile {
           runtimeType == other.runtimeType &&
           id == other.id &&
           label == other.label &&
-          currentGroupName == other.currentGroupName &&
+          proxyName == other.proxyName &&
           url == other.url &&
           lastUpdateDate == other.lastUpdateDate &&
           autoUpdateDuration == other.autoUpdateDuration &&
           userInfo == other.userInfo &&
-          autoUpdate == other.autoUpdate &&
-          selectedMap == other.selectedMap;
+          autoUpdate == other.autoUpdate;
 
   @override
   int get hashCode =>
       id.hashCode ^
       label.hashCode ^
-      currentGroupName.hashCode ^
+      proxyName.hashCode ^
       url.hashCode ^
       lastUpdateDate.hashCode ^
       autoUpdateDuration.hashCode ^
       userInfo.hashCode ^
-      autoUpdate.hashCode ^
-      selectedMap.hashCode;
+      autoUpdate.hashCode;
+
+  @override
+  String toString() {
+    return 'Profile{id: $id, label: $label, proxyName: $proxyName, url: $url, lastUpdateDate: $lastUpdateDate, autoUpdateDuration: $autoUpdateDuration, userInfo: $userInfo, autoUpdate: $autoUpdate}';
+  }
 
   Profile copyWith({
     String? label,
     String? url,
     UserInfo? userInfo,
-    String? currentGroupName,
+    String? groupName,
     String? proxyName,
     DateTime? lastUpdateDate,
     Duration? autoUpdateDuration,
@@ -177,7 +179,7 @@ class Profile {
       id: id,
       label: label ?? this.label,
       url: url ?? this.url,
-      currentGroupName: currentGroupName ?? this.currentGroupName,
+      proxyName: proxyName ?? this.proxyName,
       userInfo: userInfo ?? this.userInfo,
       selectedMap: selectedMap ?? this.selectedMap,
       lastUpdateDate: lastUpdateDate ?? this.lastUpdateDate,

lib/models/selector.dart

@@ -94,7 +94,6 @@ class ProxiesCardSelectorState with _$ProxiesCardSelectorState {
 class ProxiesSelectorState with _$ProxiesSelectorState {
   const factory ProxiesSelectorState({
     required List<String> groupNames,
-    required String? currentGroupName,
   }) = _ProxiesSelectorState;
 }
 

lib/pages/scan.dart

@@ -107,9 +107,6 @@ class _ScanPageState extends State<ScanPage> with WidgetsBindingObserver {
                     case TorchState.unavailable:
                       icon = const Icon(Icons.flash_off);
                       backgroundColor = Colors.transparent;
-                    case TorchState.auto:
-                      icon = const Icon(Icons.flash_auto);
-                      backgroundColor = Colors.orange;
                   }
                   return Container(
                     margin: const EdgeInsets.symmetric(horizontal: 8),

lib/plugins/app.dart

@@ -3,7 +3,6 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -23,9 +22,6 @@ class App {
               await onExit!();
             }
             break;
-          case "gc":
-            clashCore.requestGc();
-            break;
           default:
             throw MissingPluginException();
         }
@@ -33,6 +29,10 @@ class App {
     }
   }
 
+  setOnExit(Function() onExit) {
+    this.onExit = onExit;
+  }
+
   factory App() {
     _instance ??= App._internal();
     return _instance!;
@@ -68,9 +68,9 @@ class App {
     });
   }
 
-  Future<String?> resolverProcess(Process process) async {
-    return await methodChannel?.invokeMethod<String>("resolverProcess", {
-      "data": json.encode(process),
+  Future<String?> getPackageName(Metadata metadata) async {
+    return await methodChannel?.invokeMethod<String>("getPackageName", {
+      "data": json.encode(metadata),
     });
   }
 }

lib/plugins/proxy.dart

@@ -56,6 +56,10 @@ class Proxy extends ProxyPlatform {
     return await methodChannel.invokeMethod<bool?>("SetProtect", {'fd': fd});
   }
 
+  Future<int?> getRunTimeStamp() async {
+    return await methodChannel.invokeMethod<int?>("GetRunTimeStamp");
+  }
+
   Future<bool?> startForeground({
     required String title,
     required String content,
@@ -76,7 +80,14 @@ class Proxy extends ProxyPlatform {
   }
 
   updateStartTime() async {
-    startTime = clashCore.getRunTime();
+    startTime = await getRunTime();
+  }
+
+  Future<DateTime?> getRunTime() async {
+    final runTimeStamp = await getRunTimeStamp();
+    return runTimeStamp != null
+        ? DateTime.fromMillisecondsSinceEpoch(runTimeStamp)
+        : null;
   }
 }
 

lib/state.dart

@@ -17,6 +17,7 @@ class GlobalState {
   Function? updateCurrentDelayDebounce;
   PageController? pageController;
   final navigatorKey = GlobalKey<NavigatorState>();
+  final Map<int, String?> packageNameMap = {};
   late AppController appController;
   GlobalKey<CommonScaffoldState> homeScaffoldKey = GlobalKey();
   List<Function> updateFunctionLists = [];
@@ -60,14 +61,8 @@ class GlobalState {
     required Config config,
     required ClashConfig clashConfig,
   }) async {
-    final args = config.isAccessControl
-        ? json.encode(
-            Props(
-              accessControl: config.accessControl,
-              allowBypass: config.allowBypass,
-            ),
-          )
-        : null;
+    final args =
+        config.isAccessControl ? json.encode(config.accessControl) : null;
     await proxyManager.startProxy(
       port: clashConfig.mixedPort,
       args: args,
@@ -110,6 +105,12 @@ class GlobalState {
         clashConfig: clashConfig,
       );
     }
+    if (!appState.isInit) return;
+    await applyProfile(
+      appState: appState,
+      config: config,
+      clashConfig: clashConfig,
+    );
     updateCoreVersionInfo(appState);
   }
 
@@ -132,6 +133,19 @@ class GlobalState {
     });
   }
 
+  updateNavigationItems({
+    required AppState appState,
+    required Config config,
+    required ClashConfig clashConfig,
+  }) {
+    final group = appState.currentGroups;
+    final hasProfile = config.profiles.isNotEmpty;
+    appState.navigationItems = navigation.getItems(
+      openLogs: config.openLogs,
+      hasProxies: group.isNotEmpty && hasProfile,
+    );
+  }
+
   Future<void> updateGroups(AppState appState) async {
     appState.groups = await clashCore.getProxiesGroups();
   }
@@ -211,30 +225,30 @@ class GlobalState {
     required String message,
     SnackBarAction? action,
   }) {
-    // final width = context.width;
-    // EdgeInsets margin;
-    // if (width < 600) {
-    //   margin = const EdgeInsets.only(
-    //     bottom: 96,
-    //     right: 16,
-    //     left: 16,
-    //   );
-    // } else {
-    //   margin = EdgeInsets.only(
-    //     bottom: 16,
-    //     left: 16,
-    //     right: width - 316,
-    //   );
-    // }
-    // ScaffoldMessenger.of(context).showSnackBar(
-    //   SnackBar(
-    //     action: action,
-    //     content: Text(message),
-    //     behavior: SnackBarBehavior.floating,
-    //     duration: const Duration(milliseconds: 1500),
-    //     margin: margin,
-    //   ),
-    // );
+    final width = context.width;
+    EdgeInsets margin;
+    if (width < 600) {
+      margin = const EdgeInsets.only(
+        bottom: 96,
+        right: 16,
+        left: 16,
+      );
+    } else {
+      margin = EdgeInsets.only(
+        bottom: 16,
+        left: 16,
+        right: width - 316,
+      );
+    }
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        action: action,
+        content: Text(message),
+        behavior: SnackBarBehavior.floating,
+        duration: const Duration(milliseconds: 1500),
+        margin: margin,
+      ),
+    );
   }
 
   Future<T?> safeRun<T>(

lib/widgets/clash_message_container.dart

@@ -56,20 +56,9 @@ class _ClashMessageContainerState extends State<ClashMessageContainer>
   }
 
   @override
-  void onProcess(Process process) async {
-    var packageName = await app?.resolverProcess(process);
-    clashCore.setProcessMap(
-      ProcessMapItem(
-        id: process.id,
-        value: packageName,
-      ),
-    );
-    super.onProcess(process);
-  }
-
-  @override
-  void onRequest(Connection connection) async {
-    globalState.appController.appState.addRequest(connection);
-    super.onRequest(connection);
+  void onProcess(Metadata metadata) async {
+    var packageName = await app?.getPackageName(metadata);
+    globalState.packageNameMap[metadata.uid] = packageName;
+    super.onProcess(metadata);
   }
 }

lib/widgets/scaffold.dart

@@ -122,7 +122,7 @@ class CommonScaffoldState extends State<CommonScaffold> {
             return floatingActionButton ?? Container();
           },
         ),
-        resizeToAvoidBottomInset: true,
+        floatingActionButtonAnimator: FloatingActionButtonAnimator.scaling,
         appBar: PreferredSize(
           preferredSize: const Size.fromHeight(kToolbarHeight),
           child: Stack(

pubspec.yaml

@@ -1,7 +1,7 @@
 name: fl_clash
 description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
 publish_to: 'none'
-version: 0.8.23
+version: 0.8.16
 environment:
   sdk: '>=3.1.0 <4.0.0'
 
@@ -17,14 +17,14 @@ dependencies:
   provider: ^6.0.5
   window_manager: ^0.3.8
   ffi: ^2.1.0
-  dynamic_color: ^1.6.0
+  dynamic_color: ^1.7.0
   proxy:
     path: plugins/proxy
   launch_at_startup: ^0.2.2
   windows_single_instance: ^1.0.1
   json_annotation: ^4.9.0
   file_picker: ^8.0.3
-  mobile_scanner: ^5.1.1
+  mobile_scanner: 5.0.1
   app_links: ^3.5.0
   win32_registry: ^1.1.2
   tray_manager: ^0.2.1

setup.dart

@@ -12,7 +12,10 @@ enum PlatformType {
   macos,
 }
 
-enum Arch { amd64, arm64, arm }
+enum Arch {
+  amd64,
+  arm64,
+}
 
 class BuildLibItem {
   PlatformType platform;
@@ -61,11 +64,6 @@ class Build {
           arch: Arch.amd64,
           archName: 'amd64',
         ),
-        BuildLibItem(
-          platform: PlatformType.android,
-          arch: Arch.arm,
-          archName: 'armeabi-v7a',
-        ),
         BuildLibItem(
           platform: PlatformType.android,
           arch: Arch.arm64,
@@ -336,7 +334,7 @@ class BuildCommand extends Command {
     final archName = argResults?['arch'];
     final currentArches =
         arches.where((element) => element.name == archName).toList();
-    final arch = currentArches.isEmpty ? null : currentArches.first;
+    final arch = currentArches.isEmpty ? null : arches.first;
     await _buildLib(arch);
     if (build != "all") {
       return;
@@ -359,11 +357,10 @@ class BuildCommand extends Command {
         break;
       case PlatformType.android:
         final targetMap = {
-          Arch.arm: "android-arm",
-          Arch.arm64: "android-arm64",
           Arch.amd64: "android-x64",
+          Arch.arm64: "android-arm64"
         };
-        final defaultArches = [Arch.arm, Arch.arm64, Arch.amd64];
+        final defaultArches = [Arch.amd64, Arch.arm64];
         final defaultTargets = defaultArches
             .where((element) => arch == null ? true : element == arch)
             .map((e) => targetMap[e])

test/command_test.dart

@@ -1,4 +1,5 @@
 // ignore_for_file: avoid_print
+
 void main() async {
   String input = """
 您