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/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,13 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
-        tools:ignore="SystemPermissionTypo" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission"/>
-    <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
             android:name="com.follow.clash.MainActivity"
@@ -72,8 +73,7 @@
         <service
             android:name=".services.FlClashTileService"
             android:exported="true"
-            android:icon="@drawable/icon"
+            android:icon="@drawable/tile_icon"
-            android:foregroundServiceType="specialUse"
             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
@@ -19,9 +18,6 @@ class GlobalState {
         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
@@ -64,6 +61,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
         toast!!.show()
     }
 
+    @RequiresApi(Build.VERSION_CODES.Q)
     override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
         when (call.method) {
             "moveTaskToBack" -> {
@@ -80,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)
@@ -115,27 +100,17 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 }
                 scope.launch {
                     withContext(Dispatchers.Default) {
-                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q){
+                        if (context == null) result.success(null)
-                            result.success(null)
+                        val source = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
-                            return@withContext
+                        val target = InetSocketAddress(
-                        }
+                            metadata.host.ifEmpty { metadata.destinationIP },
-                        if (context == null) {
+                            metadata.destinationPort
-                            result.success(null)
+                        )
-                            return@withContext
-                        }
                         if (connectivity == null) {
                             connectivity = context!!.getSystemService<ConnectivityManager>()
                         }
-                        val src = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
+                        val uid =
-                        val dst = InetSocketAddress(
+                            connectivity?.getConnectionOwnerUid(protocol, source, target)
-                            metadata.destinationIP.ifEmpty { metadata.host },
-                            metadata.destinationPort
-                        )
-                        val uid = try {
-                            connectivity?.getConnectionOwnerUid(protocol, src, dst)
-                        } catch (_: Exception) {
-                            null
-                        }
                         if (uid == null || uid == -1) {
                             result.success(null)
                             return@withContext
@@ -150,6 +125,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 val message = call.argument<String>("message")
                 tip(message)
                 result.success(true)
+
             }
 
             else -> {
@@ -161,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 {
+            iconMap[packageName] = packageManager?.getApplicationIcon(packageName)?.getBase64()
-                packageManager?.getApplicationIcon(packageName)?.getBase64()
-            } catch (_: Exception) {
-                null
-            }
-
         }
         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 {
@@ -191,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
@@ -41,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
 
@@ -73,8 +73,8 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         "StartProxy" -> {
             port = call.argument<Int>("port")
             val args = call.argument<String>("args")
-            props =
+            accessControl =
-                if (args != null) Gson().fromJson(args, Props::class.java) else null
+                if (args != null) Gson().fromJson(args, AccessControl::class.java) else null
             handleStartVpn()
             result.success(true)
         }
@@ -121,7 +121,7 @@ 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()

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)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        val pendingIntent = if (Build.VERSION.SDK_INT >= 31) {
+        if (Build.VERSION.SDK_INT >= 34) {
-            PendingIntent.getActivity(
+            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()
-                allowBypass()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && props?.systemProxy == true) {
                 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
+            priority = NotificationCompat.PRIORITY_LOW
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
-            }
             setOngoing(true)
             setShowWhen(false)
             setOnlyAlertOnce(true)
-            setAutoCancel(true);
         }
     }
 
-    override fun onTrimMemory(level: Int) {
+    @SuppressLint("ForegroundServiceType", "WrongConstant")
-        super.onTrimMemory(level)
-        GlobalState.getCurrentAppPlugin()?.requestGc()
-    }
-
     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)
+            manager.createNotificationChannel(channel)
-            if (channel == null) {
-                channel =
-                    NotificationChannel(CHANNEL, "FlClash", NotificationManager.IMPORTANCE_LOW)
-                manager?.createNotificationChannel(channel)
-            }
         }
         val notification =
             notificationBuilder.setContentTitle(title).setContentText(content).build()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.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/constant/provider"
-	"github.com/metacubex/mihomo/hub"
+	"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"`
+	Uid     uint32 `json:"uid"`
-	Metadata *constant.Metadata `json:"metadata"`
+	Network string `json:"network"`
-}
+	Source  string `json:"source"`
-
+	Target  string `json:"target"`
-type ProcessMapItem struct {
-	Id    int64  `json:"id"`
-	Value string `json:"value"`
 }
 
 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.DNSHijack = patchConfig.Tun.DNSHijack
-	//targetConfig.Tun.Stack = patchConfig.Tun.Stack
+	targetConfig.Tun.Stack = patchConfig.Tun.Stack
-	targetConfig.GeodataLoader = patchConfig.GeodataLoader
+	targetConfig.GeodataLoader = "standard"
 	targetConfig.Profile.StoreSelected = false
 	if targetConfig.DNS.Enable == false {
 		targetConfig.DNS = patchConfig.DNS
 	}
-	//if runtime.GOOS == "android" {
+	if runtime.GOOS == "android" {
-	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
+		targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
-	//} else if runtime.GOOS == "windows" {
+	} else if runtime.GOOS == "windows" {
-	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
+		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 {
-		executor.Shutdown()
+		executor.ApplyConfig(cfg, true)
-		runtime.GC()
+		hcCompatibleProvider(tunnel.Providers())
-		hub.UltraApplyConfig(cfg, true)
 	}
 }

core/dart-bridge/message.go

@@ -12,8 +12,6 @@ const (
 	Delay   MessageType = "delay"
 	Now     MessageType = "now"
 	Process MessageType = "process"
-	Request MessageType = "request"
-	Run     MessageType = "run"
 )
 
 type Message struct {
@@ -21,18 +19,11 @@ type Message struct {
 	Data interface{} `json:"data"`
 }
 
-func (message *Message) Json() (string, error) {
+func (message *Message) Json() string {
-	data, err := json.Marshal(message)
+	data, _ := json.Marshal(message)
-	return string(data), err
+	return string(data)
 }
 
 func SendMessage(message Message) {
-	if Port == nil {
+	SendToPort(*Port, message.Json())
-		return
-	}
-	s, err := message.Json()
-	if err != nil {
-		return
-	}
-	SendToPort(*Port, s)
 }

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)
@@ -188,26 +180,6 @@ func getTraffic() *C.char {
 	return C.CString(string(data))
 }
 
-//export getTotalTraffic
-func getTotalTraffic() *C.char {
-	up, down := statistic.DefaultManager.Total()
-	traffic := map[string]int64{
-		"up":   up,
-		"down": down,
-	}
-	data, err := json.Marshal(traffic)
-	if err != nil {
-		fmt.Println("Error:", err)
-		return C.CString("")
-	}
-	return C.CString(string(data))
-}
-
-//export resetTraffic
-func resetTraffic() {
-	statistic.DefaultManager.ResetStatistic()
-}
-
 //export asyncTestDelay
 func asyncTestDelay(s *C.char, port C.longlong) {
 	i := int64(port)
@@ -424,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/process.go

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

core/tun.go

@@ -4,9 +4,7 @@ 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"
@@ -37,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()
@@ -48,6 +48,16 @@ func startTUN(fd C.int) {
 	}()
 }
 
+//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() {
 	go func() {
@@ -56,18 +66,14 @@ func stopTun() {
 
 		if tun != nil {
 			tun.Close()
+			applyConfig(true)
 			tun = nil
 		}
 	}()
 }
 
-var errBlocked = errors.New("blocked")
-
 func init() {
 	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
-		if platform.ShouldBlockConnection() {
-			return errBlocked
-		}
 		return conn.Control(func(fd uintptr) {
 			if tun != nil {
 				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;
+      globalState.appController.afterInit();
-      if (currentContext != null) {
-        globalState.appController = AppController(currentContext);
-      }
-      await globalState.appController.init();
       globalState.appController.initLink();
       _updateGroups();
     });
@@ -130,6 +126,7 @@ class ApplicationState extends State<Application> {
       httpTimeoutDuration,
       (timer) async {
         await globalState.appController.updateGroups();
+        globalState.appController.appState.sortNum++;
       },
     );
   }
@@ -150,7 +147,6 @@ class ApplicationState extends State<Application> {
                 builder: (lightDynamic, darkDynamic) {
                   _updateSystemColorSchemes(lightDynamic, darkDynamic);
                   return MaterialApp(
-                    debugShowCheckedModeBanner: false,
                     navigatorKey: globalState.navigatorKey,
                     localizationsDelegates: const [
                       AppLocalizations.delegate,
@@ -165,6 +161,7 @@ class ApplicationState extends State<Application> {
                     themeMode: state.themeMode,
                     theme: ThemeData(
                       useMaterial3: true,
+                      fontFamily: '',
                       pageTransitionsTheme: _pageTransitionsTheme,
                       colorScheme: _getAppColorScheme(
                         brightness: Brightness.light,
@@ -174,6 +171,7 @@ class ApplicationState extends State<Application> {
                     ),
                     darkTheme: ThemeData(
                       useMaterial3: true,
+                      fontFamily: '',
                       pageTransitionsTheme: _pageTransitionsTheme,
                       colorScheme: _getAppColorScheme(
                         brightness: Brightness.dark,

lib/clash/core.dart

@@ -46,8 +46,8 @@ class ClashCore {
 
   bool init(String homeDir) {
     return clashFFI.initClash(
-      homeDir.toNativeUtf8().cast(),
+          homeDir.toNativeUtf8().cast(),
-    ) ==
+        ) ==
         1;
   }
 
@@ -95,15 +95,12 @@ class ClashCore {
     final proxiesRaw = clashFFI.getProxies();
     final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
     return Isolate.run<List<Group>>(() {
-      if(proxiesRawString.isEmpty) return [];
+      final proxies = json.decode(proxiesRawString);
-      final proxies = (json.decode(proxiesRawString) ?? {}) as Map;
-      if(proxies.isEmpty) return [];
       final groupNames = [
         UsedProxy.GLOBAL.name,
         ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
-          final proxy = proxies[e] ?? {};
+          final proxy = proxies[e];
-          return GroupTypeExtension.valueList.contains(proxy['type']) &&
+          return GroupTypeExtension.valueList.contains(proxy['type']);
-              proxy['hidden'] != true;
         })
       ];
       final groupsRaw = groupNames.map((groupName) {
@@ -111,7 +108,7 @@ class ClashCore {
         group["all"] = ((group["all"] ?? []) as List)
             .map(
               (name) => proxies[name],
-        )
+            )
             .toList();
         return group;
       }).toList();
@@ -122,14 +119,14 @@ class ClashCore {
   Future<List<ExternalProvider>> getExternalProviders() {
     final externalProvidersRaw = clashFFI.getExternalProviders();
     final externalProvidersRawString =
-    externalProvidersRaw.cast<Utf8>().toDartString();
+        externalProvidersRaw.cast<Utf8>().toDartString();
     return Isolate.run<List<ExternalProvider>>(() {
       final externalProviders =
-      (json.decode(externalProvidersRawString) as List<dynamic>)
+          (json.decode(externalProvidersRawString) as List<dynamic>)
-          .map(
+              .map(
-            (item) => ExternalProvider.fromJson(item),
+                (item) => ExternalProvider.fromJson(item),
-      )
+              )
-          .toList();
+              .toList();
       return externalProviders;
     });
   }
@@ -178,11 +175,9 @@ class ClashCore {
     );
     Future.delayed(httpTimeoutDuration + moreDuration, () {
       receiver.close();
-      if(!completer.isCompleted){
+      completer.complete(
-        completer.complete(
+        Delay(name: proxyName, value: -1),
-          Delay(name: proxyName, value: -1),
+      );
-        );
-      }
     });
     return completer.future;
   }
@@ -203,16 +198,6 @@ class ClashCore {
     return Traffic.fromMap(trafficMap);
   }
 
-  Traffic getTotalTraffic() {
-    final trafficRaw = clashFFI.getTotalTraffic();
-    final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
-    return Traffic.fromMap(trafficMap);
-  }
-
-  void resetTraffic(){
-    clashFFI.resetTraffic();
-  }
-
   void startLog() {
     clashFFI.startLog();
   }
@@ -225,35 +210,17 @@ 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 =
-    json.decode(connectionsDataRaw.cast<Utf8>().toDartString()) as Map;
+        json.decode(connectionsDataRaw.cast<Utf8>().toDartString()) as Map;
     final connectionsRaw = connectionsData['connections'] as List? ?? [];
     return connectionsRaw.map((e) => Connection.fromJson(e)).toList();
   }
-
-  closeConnections(String id) {
-    clashFFI.closeConnection(id.toNativeUtf8().cast());
-  }
 }
 
 final clashCore = ClashCore();

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,
@@ -983,24 +975,6 @@ class ClashFFI {
   late final _getTraffic =
       _getTrafficPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
 
-  ffi.Pointer<ffi.Char> getTotalTraffic() {
-    return _getTotalTraffic();
-  }
-
-  late final _getTotalTrafficPtr =
-      _lookup<ffi.NativeFunction<ffi.Pointer<ffi.Char> Function()>>(
-          'getTotalTraffic');
-  late final _getTotalTraffic =
-      _getTotalTrafficPtr.asFunction<ffi.Pointer<ffi.Char> Function()>();
-
-  void resetTraffic() {
-    return _resetTraffic();
-  }
-
-  late final _resetTrafficPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function()>>('resetTraffic');
-  late final _resetTraffic = _resetTrafficPtr.asFunction<void Function()>();
-
   void asyncTestDelay(
     ffi.Pointer<ffi.Char> s,
     int port,
@@ -1148,21 +1122,7 @@ class ClashFFI {
       _lookup<ffi.NativeFunction<ffi.Void Function()>>('stopLog');
   late final _stopLog = _stopLogPtr.asFunction<void Function()>();
 
-  void setProcessMap(
+  int startTUN(
-    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 fd,
   ) {
     return _startTUN(
@@ -1171,8 +1131,22 @@ class ClashFFI {
   }
 
   late final _startTUNPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Int)>>('startTUN');
+      _lookup<ffi.NativeFunction<GoUint8 Function(ffi.Int)>>('startTUN');
-  late final _startTUN = _startTUNPtr.asFunction<void Function(int)>();
+  late final _startTUN = _startTUNPtr.asFunction<int Function(int)>();
+
+  int updateMarkSocketPort(
+    int markSocketPort,
+  ) {
+    return _updateMarkSocketPort(
+      markSocketPort,
+    );
+  }
+
+  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,13 +14,9 @@ abstract mixin class ClashMessageListener {
 
   void onDelay(Delay delay) {}
 
-  void onProcess(Process process) {}
+  void onProcess(Metadata metadata) {}
-
-  void onRequest(Connection connection) {}
 
   void onNow(Now now) {}
-
-  void onRun(String runTime) {}
 }
 
 class ClashMessage {
@@ -45,17 +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;
-          case MessageType.run:
-            listener.onRun(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

@@ -7,7 +7,6 @@ const coreName = "clash.meta";
 const packageName = "FlClash";
 const httpTimeoutDuration = Duration(milliseconds: 5000);
 const moreDuration = Duration(milliseconds: 100);
-const animateDuration = Duration(milliseconds: 100);
 const defaultUpdateDuration = Duration(days: 1);
 const mmdbFileName = "geoip.metadb";
 const geoSiteFileName = "GeoSite.dat";
@@ -19,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/context.dart

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

lib/common/navigation.dart

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

lib/common/path.dart

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

lib/common/picker.dart

@@ -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/common/text.dart

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

lib/controller.dart

@@ -31,7 +31,6 @@ class AppController {
   Future<void> updateSystemProxy(bool isStart) async {
     if (isStart) {
       await globalState.startSystemProxy(
-        appState: appState,
         config: config,
         clashConfig: clashConfig,
       );
@@ -43,9 +42,7 @@ class AppController {
       ];
     } else {
       await globalState.stopSystemProxy();
-      clashCore.resetTraffic();
       appState.traffics = [];
-      appState.totalTraffic = Traffic();
       appState.runTime = null;
     }
   }
@@ -100,9 +97,13 @@ class AppController {
     }
   }
 
-  Future<void> updateProfile(Profile profile) async {
+  Future<void> updateProfile(String id) async {
-    await profile.update();
+    final profile = config.getCurrentProfileForId(id);
-    config.setProfile(await profile.update());
+    if (profile != null) {
+      final tempProfile = profile.copyWith();
+      await tempProfile.update();
+      config.setProfile(tempProfile);
+    }
   }
 
   Future<void> updateClashConfig({bool isPatch = true}) async {
@@ -144,16 +145,7 @@ class AppController {
       if (isNotNeedUpdate == false || profile.type == ProfileType.file) {
         continue;
       }
-      try {
+      await updateProfile(profile.id);
-        updateProfile(profile);
-      } catch (e) {
-        appState.addLog(
-          Log(
-            logLevel: LogLevel.info,
-            payload: e.toString(),
-          ),
-        );
-      }
     }
   }
 
@@ -162,7 +154,7 @@ class AppController {
       if (profile.type == ProfileType.file) {
         continue;
       }
-      await updateProfile(profile);
+      await updateProfile(profile.id);
     }
   }
 
@@ -230,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,
               ),
           ],
         ),
@@ -265,38 +256,18 @@ class AppController {
     }
   }
 
-  init() async {
+  afterInit() async {
+    if (config.autoRun) {
+      await updateSystemProxy(true);
+    } else {
+      await proxyManager.updateStartTime();
+      await updateSystemProxy(proxyManager.isStart);
+    }
+    autoUpdateProfiles();
     updateLogStatus();
     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 {
-    await proxyManager.updateStartTime();
-    if (proxyManager.isStart) {
-      await updateSystemProxy(true);
-    } else {
-      await updateSystemProxy(config.autoRun);
-    }
-    autoUpdateProfiles();
     autoCheckUpdate();
   }
 
@@ -365,9 +336,11 @@ class AppController {
     if (commonScaffoldState?.mounted != true) return;
     final profile = await commonScaffoldState?.loadingRun<Profile>(
       () async {
-        return await Profile.normal(
+        final profile = Profile(
           url: url,
-        ).update();
+        );
+        await profile.update();
+        return profile;
       },
       title: "${appLocalizations.add}${appLocalizations.profile}",
     );
@@ -390,7 +363,9 @@ class AppController {
         if (bytes == null) {
           return null;
         }
-        return await Profile.normal(label: platformFile?.name).saveFile(bytes);
+        final profile = Profile(label: platformFile?.name);
+        await profile.saveFile(bytes);
+        return profile;
       },
       title: "${appLocalizations.add}${appLocalizations.profile}",
     );
@@ -405,55 +380,9 @@ class AppController {
     addProfileFormURL(url);
   }
 
-  int get columns =>
-      globalState.getColumns(appState.viewMode, config.proxiesColumns);
-
-  changeColumns() {
-    config.proxiesColumns = globalState.getColumns(
-      appState.viewMode,
-      columns - 1,
-    );
-  }
-
   updateViewWidth(double width) {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       appState.viewWidth = width;
     });
   }
-
-
-  List<Proxy> _sortOfName(List<Proxy> proxies) {
-    return List.of(proxies)
-      ..sort(
-            (a, b) => other.sortByChar(a.name, b.name),
-      );
-  }
-
-  List<Proxy> _sortOfDelay(List<Proxy> proxies) {
-    return proxies = List.of(proxies)
-      ..sort(
-            (a, b) {
-          final aDelay = appState.getDelay(a.name);
-          final bDelay = appState.getDelay(b.name);
-          if (aDelay == null && bDelay == null) {
-            return 0;
-          }
-          if (aDelay == null || aDelay == -1) {
-            return 1;
-          }
-          if (bDelay == null || bDelay == -1) {
-            return -1;
-          }
-          return aDelay.compareTo(bDelay);
-        },
-      );
-  }
-
-  List<Proxy> getSortProxies(List<Proxy> proxies){
-    return switch(config.proxiesSortType){
-      ProxiesSortType.none => proxies,
-      ProxiesSortType.delay => _sortOfDelay(proxies),
-      ProxiesSortType.name =>_sortOfName(proxies),
-    };
-  }
 }

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,19 +56,9 @@ enum ProfileType { file, url }
 
 enum ResultType { success, error }
 
-enum MessageType { log, tun, delay, process, now, request, run }
+enum MessageType { log, tun, delay, process, now }
-
-enum FindProcessMode { always, off }
 
 enum RecoveryOption {
   all,
   onlyProfiles,
-}
+}
-
-enum ChipType { action, delete }
-
-enum CommonCardType { plain, filled }
-
-enum ProxiesType { tab, expansion }
-
-enum ProxyCardType { expand, shrink }

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});
 
@@ -35,13 +28,6 @@ class _AccessFragmentState extends State<AccessFragment> {
     });
   }
 
-
-  @override
-  void dispose() {
-    super.dispose();
-    packagesListenable.dispose();
-  }
-
   Widget _buildAppProxyModePopup() {
     final items = [
       CommonPopupMenuItem(
@@ -97,70 +83,136 @@ class _AccessFragmentState extends State<AccessFragment> {
     );
   }
 
-  Widget _buildSearchButton(List<Package> packages) {
+  Widget _buildSelectedAllButton({
-    return IconButton(
-      tooltip: appLocalizations.search,
-      onPressed: () {
-        showSearch(
-          context: context,
-          delegate: AccessControlSearchDelegate(
-            packages: packages,
-          ),
-        ).then((_) => {setState(() {})});
-      },
-      icon: const Icon(Icons.search),
-    );
-  }
-
-  _buildSelectedAllButton({
-    required bool isAccessControl,
     required bool isSelectedAll,
     required List<String> allValueList,
   }) {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
+    return Builder(
-      final tooltip = isSelectedAll
+      builder: (context) {
-          ? appLocalizations.cancelSelectAll
+        final tooltip = isSelectedAll
-          : appLocalizations.selectAll;
+            ? appLocalizations.cancelSelectAll
-      final commonScaffoldState =
+            : appLocalizations.selectAll;
-          context.findAncestorStateOfType<CommonScaffoldState>();
+        return IconButton(
-      commonScaffoldState?.floatingActionButton = DisabledMask(
+          tooltip: tooltip,
-        status: !isAccessControl,
+          onPressed: () {
-        child: AbsorbPointer(
+            final config = globalState.appController.config;
-          absorbing: !isAccessControl,
+            final isAccept =
-          child: FloatingActionButton (
+                config.accessControl.mode == AccessControlMode.acceptSelected;
-            tooltip: tooltip,
-            onPressed: () {
-              final config = globalState.appController.config;
-              final isAccept =
-                  config.accessControl.mode == AccessControlMode.acceptSelected;
 
-              if (isSelectedAll) {
+            if (isSelectedAll) {
-                config.accessControl = switch (isAccept) {
+              config.accessControl = switch (isAccept) {
-                  true => config.accessControl.copyWith(
+                true => config.accessControl.copyWith(
-                      acceptList: [],
+                    acceptList: [],
-                    ),
+                  ),
-                  false => config.accessControl.copyWith(
+                false => config.accessControl.copyWith(
-                      rejectList: [],
+                    rejectList: [],
-                    ),
+                  ),
-                };
+              };
-              } else {
+            } else {
-                config.accessControl = switch (isAccept) {
+              config.accessControl = switch (isAccept) {
-                  true => config.accessControl.copyWith(
+                true => config.accessControl.copyWith(
-                      acceptList: allValueList,
+                    acceptList: allValueList,
-                    ),
+                  ),
-                  false => config.accessControl.copyWith(
+                false => config.accessControl.copyWith(
-                      rejectList: allValueList,
+                    rejectList: allValueList,
-                    ),
+                  ),
-                };
+              };
-              }
+            }
-            },
+          },
-            child: isSelectedAll
+          icon: isSelectedAll
-                ? const Icon(Icons.deselect)
+              ? const Icon(Icons.deselect)
-                : const Icon(Icons.select_all),
+              : 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() {
@@ -200,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)
+                .where((element) => element.isSystem == false)
-                    .toList()
+                .toList()
                 : packages;
             final packageNameList =
                 currentPackages.map((e) => e.packageName).toList();
@@ -213,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(
+                  _actionHeader(
-                    absorbing: !isAccessControl,
+                    isAccessControl: isAccessControl,
-                    child: Padding(
+                    valueList: valueList,
-                      padding: const EdgeInsets.only(
+                    describe: describe,
-                        top: 4,
+                    packageNameList: packageNameList,
-                        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()),
-                            ],
-                          ),
-                        ],
-                      ),
-                    ),
                   ),
                   Expanded(
                     flex: 1,
@@ -450,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/backup_and_recovery.dart

@@ -228,13 +228,6 @@ class _WebDAVFormDialogState extends State<WebDAVFormDialog> {
     Navigator.pop(context);
   }
 
-
-  @override
-  void dispose() {
-    super.dispose();
-    _obscureController.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return AlertDialog(

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> {
     }
   }
 
-  Widget _buildAppSection() {
+  _updateLoglevel(LogLevel? logLevel) {
-    final items = [
+    if (logLevel == null ||
-      if (Platform.isAndroid)
+        logLevel == globalState.appController.clashConfig.logLevel) return;
-        Selector<Config, bool>(
+    globalState.appController.clashConfig.logLevel = logLevel;
-          selector: (_, config) => config.allowBypass,
+    globalState.appController.updateClashConfigDebounce();
-          builder: (_, allowBypass, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.arrow_forward_outlined),
-              title: Text(appLocalizations.allowBypass),
-              subtitle: Text(appLocalizations.allowBypassDesc),
-              delegate: SwitchDelegate(
-                value: allowBypass,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.config.allowBypass = value;
-                },
-              ),
-            );
-          },
-        ),
-      if (Platform.isAndroid)
-        Selector<Config, bool>(
-          selector: (_, config) => config.systemProxy,
-          builder: (_, systemProxy, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.settings_ethernet),
-              title: Text(appLocalizations.systemProxy),
-              subtitle: Text(appLocalizations.systemProxyDesc),
-              delegate: SwitchDelegate(
-                value: systemProxy,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.config.systemProxy = value;
-                },
-              ),
-            );
-          },
-        ),
-      Selector<Config, bool>(
-        selector: (_, config) => config.isCompatible,
-        builder: (_, isCompatible, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.expand_outlined),
-            title: Text(appLocalizations.compatible),
-            subtitle: Text(appLocalizations.compatibleDesc),
-            delegate: SwitchDelegate(
-              value: isCompatible,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.config.isCompatible = value;
-                await appController.updateClashConfig(isPatch: false);
-                await appController.updateGroups();
-                appController.changeProxy();
-              },
-            ),
-          );
-        },
-      ),
-    ];
-    return Section(
-      title: appLocalizations.app,
-      child: Column(
-        children: [
-          for (final item in items) ...[
-            item,
-            if (items.last != item)
-              const Divider(
-                height: 0,
-              )
-          ]
-        ],
-      ),
-    );
   }
 
-  _showLogLevelDialog(LogLevel value) {
+  @override
-    globalState.showCommonDialog(
+  Widget build(BuildContext context) {
-      child: AlertDialog(
+    List<Widget> items = [
-        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),
-                )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildGeneralSection() {
-    final items = [
-      Selector<ClashConfig, LogLevel>(
-        selector: (_, clashConfig) => clashConfig.logLevel,
-        builder: (_, value, __) {
-          return ListItem(
-            leading: const Icon(Icons.info_outline),
-            title: Text(appLocalizations.logLevel),
-            subtitle: Text(value.name),
-            onTab: () {
-              _showLogLevelDialog(value);
-            },
-          );
-        },
-      ),
       Selector<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,175 +86,92 @@ class _ConfigFragmentState extends State<ConfigFragment> {
           );
         },
       ),
-      Selector<ClashConfig, bool>(
+      // if (system.isDesktop)
-        selector: (_, clashConfig) => clashConfig.unifiedDelay,
+      //   Selector<ClashConfig, bool>(
-        builder: (_, unifiedDelay, __) {
+      //     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),
+            leading: const Icon(Icons.expand),
-            title: Text(appLocalizations.unifiedDelay),
+            title: Text(appLocalizations.compatible),
-            subtitle: Text(appLocalizations.unifiedDelayDesc),
+            subtitle: Text(appLocalizations.compatibleDesc),
             delegate: SwitchDelegate(
-              value: unifiedDelay,
+              value: isCompatible,
               onChanged: (bool value) async {
                 final appController = globalState.appController;
-                appController.clashConfig.unifiedDelay = value;
+                appController.config.isCompatible = value;
-                appController.updateClashConfigDebounce();
+                await appController.updateClashConfig(isPatch: false);
+                await appController.updateGroups();
+                appController.changeProxy();
               },
             ),
           );
         },
       ),
-      Selector<ClashConfig, bool>(
+      Padding(
-        selector: (_, clashConfig) =>
+        padding: kMaterialListPadding,
-            clashConfig.findProcessMode == FindProcessMode.always,
+        child: Selector<ClashConfig, LogLevel>(
-        builder: (_, findProcess, __) {
+          selector: (_, clashConfig) => clashConfig.logLevel,
-          return ListItem.switchItem(
+          builder: (_, value, __) {
-            leading: const Icon(Icons.polymer_outlined),
+            return ListItem(
-            title: Text(appLocalizations.findProcessMode),
+              leading: const Icon(Icons.feedback),
-            subtitle: Text(appLocalizations.findProcessModeDesc),
+              title: Text(appLocalizations.logLevel),
-            delegate: SwitchDelegate(
+              trailing: SizedBox(
-              value: findProcess,
+                height: 48,
-              onChanged: (bool value) async {
+                child: DropdownMenu<LogLevel>(
-                final appController = globalState.appController;
+                  width: 124,
-                appController.clashConfig.findProcessMode =
+                  inputDecorationTheme: const InputDecorationTheme(
-                    value ? FindProcessMode.always : FindProcessMode.off;
+                    filled: true,
-                appController.updateClashConfigDebounce();
+                    contentPadding: EdgeInsets.symmetric(
-              },
+                      vertical: 5,
-            ),
+                      horizontal: 16,
-          );
+                    ),
-        },
+                  ),
-      ),
+                  initialSelection: value,
-      Selector<ClashConfig, bool>(
+                  dropdownMenuEntries: [
-        selector: (_, clashConfig) => clashConfig.tcpConcurrent,
+                    for (final logLevel in LogLevel.values)
-        builder: (_, tcpConcurrent, __) {
+                      DropdownMenuEntry<LogLevel>(
-          return ListItem.switchItem(
+                        value: logLevel,
-            leading: const Icon(Icons.double_arrow_outlined),
+                        label: logLevel.name,
-            title: Text(appLocalizations.tcpConcurrent),
+                      )
-            subtitle: Text(appLocalizations.tcpConcurrentDesc),
+                  ],
-            delegate: SwitchDelegate(
+                  onSelected: _updateLoglevel,
-              value: tcpConcurrent,
+                ),
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.clashConfig.tcpConcurrent = value;
-                appController.updateClashConfigDebounce();
-              },
-            ),
-          );
-        },
-      ),
-      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) =>
-            clashConfig.geodataLoader == geodataLoaderMemconservative,
-        builder: (_, memconservative, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.memory),
-            title: Text(appLocalizations.geodataLoader),
-            subtitle: Text(appLocalizations.geodataLoaderDesc),
-            delegate: SwitchDelegate(
-              value: memconservative,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.clashConfig.geodataLoader = value
-                    ? geodataLoaderMemconservative
-                    : geodataLoaderStandard;
-                appController.updateClashConfigDebounce();
-              },
-            ),
-          );
-        },
-      ),
-      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) => clashConfig.externalController.isNotEmpty,
-        builder: (_, hasExternalController, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.api_outlined),
-            title: Text(appLocalizations.externalController),
-            subtitle: Text(appLocalizations.externalControllerDesc),
-            delegate: SwitchDelegate(
-              value: hasExternalController,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.clashConfig.externalController =
-                    value ? defaultExternalController : '';
-                appController.updateClashConfigDebounce();
-              },
-            ),
-          );
-        },
-      ),
-    ];
-    return Section(
-      title: appLocalizations.general,
-      child: Column(
-        children: [
-          for (final item in items) ...[
-            item,
-            if (items.last != item)
-              const Divider(
-                height: 0,
-              )
-          ]
-        ],
-      ),
-    );
-  }
-
-  Widget _buildMoreSection() {
-    final items = [
-      if (false)
-        Selector<ClashConfig, bool>(
-          selector: (_, clashConfig) => clashConfig.tun.enable,
-          builder: (_, tunEnable, __) {
-            return ListItem.switchItem(
-              leading: const Icon(
-                Icons.important_devices_outlined
-              ),
-              title: Text(appLocalizations.tun),
-              subtitle: Text(appLocalizations.tunDesc),
-              delegate: SwitchDelegate(
-                value: tunEnable,
-                onChanged: (bool value) async {
-                  final clashConfig = context.read<ClashConfig>();
-                  clashConfig.tun = Tun(enable: value);
-                  globalState.appController.updateClashConfigDebounce();
-                },
               ),
             );
           },
         ),
-    ];
-    if(items.isEmpty) return Container();
-    return Section(
-      title: appLocalizations.general,
-      child: Column(
-        children: [
-          for (final item in items) ...[
-            item,
-            if (items.last != item)
-              const Divider(
-                height: 0,
-              )
-          ]
-        ],
       ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    List<Widget> items = [
-      _buildAppSection(),
-      _buildGeneralSection(),
-      _buildMoreSection(),
     ];
-    return ListView.builder(
+    return ListView.separated(
-      padding: const EdgeInsets.only(bottom: 32),
       itemBuilder: (_, index) {
         return Container(
           alignment: Alignment.center,
           child: items[index],
         );
       },
+      separatorBuilder: (_, __) {
+        return const Divider(
+          height: 0,
+        );
+      },
       itemCount: items.length,
     );
   }

lib/fragments/connections.dart

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

lib/fragments/dashboard/core_info.dart

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

lib/fragments/dashboard/dashboard.dart

@@ -1,11 +1,11 @@
 import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/fragments/dashboard/intranet_ip.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:flutter/material.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:provider/provider.dart';
 
 import 'network_detection.dart';
+import 'core_info.dart';
 import 'outbound_mode.dart';
 import 'start_button.dart';
 import 'network_speed.dart';
@@ -56,7 +56,7 @@ class _DashboardFragmentState extends State<DashboardFragment> {
                   ),
                   GridItem(
                     crossAxisCellCount: isDesktop ? 4 : 6,
-                    child: const IntranetIP(),
+                    child: const CoreInfo(),
                   ),
                 ],
               );

lib/fragments/dashboard/intranet_ip.dart

@@ -1,92 +0,0 @@
-import 'dart:io';
-
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-
-class IntranetIP extends StatefulWidget {
-  const IntranetIP({super.key});
-
-  @override
-  State<IntranetIP> createState() => _IntranetIPState();
-}
-
-class _IntranetIPState extends State<IntranetIP> {
-  final ipNotifier = ValueNotifier<String>("");
-
-  Future<String?> getLocalIpAddress() async {
-    List<NetworkInterface> interfaces = await NetworkInterface.list();
-    for (final interface in interfaces) {
-      for (final address in interface.addresses) {
-        if (!address.isLoopback) {
-          return address.address;
-        }
-      }
-    }
-    return null;
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    ipNotifier.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      ipNotifier.value = await getLocalIpAddress() ?? "";
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return CommonCard(
-      info: Info(
-        label: appLocalizations.intranetIP,
-        iconData: Icons.devices,
-      ),
-      onPressed: (){
-
-      },
-      child: Container(
-        padding: const EdgeInsets.all(16).copyWith(top: 0),
-        height: globalState.appController.measure.titleLargeHeight + 24 - 1,
-        child: ValueListenableBuilder(
-          valueListenable: ipNotifier,
-          builder: (_, value, __) {
-            return FadeBox(
-              child: value.isNotEmpty
-                  ? Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Flexible(
-                          flex: 1,
-                          child: TooltipText(
-                            text: Text(
-                              value,
-                              style: context.textTheme.titleLarge?.toSoftBold.toMinus,
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                            ),
-                          ),
-                        ),
-                      ],
-                    )
-                  : const Padding(
-                      padding: EdgeInsets.all(2),
-                      child: AspectRatio(
-                        aspectRatio: 1,
-                        child: CircularProgressIndicator(),
-                      ),
-                    ),
-            );
-          },
-        ),
-      ),
-    );
-  }
-}

lib/fragments/dashboard/network_detection.dart

@@ -19,14 +19,12 @@ class _NetworkDetectionState extends State<NetworkDetection> {
   final timeoutNotifier = ValueNotifier<bool>(false);
   bool? _preIsStart;
   CancelToken? cancelToken;
-  Function? _checkIpDebounce;
 
   _checkIp(
     bool isInit,
     bool isStart,
   ) async {
     if (!isInit) return;
-    timeoutNotifier.value = false;
     if (_preIsStart == false && _preIsStart == isStart) return;
     if (cancelToken != null) {
       cancelToken!.cancel();
@@ -40,12 +38,10 @@ class _NetworkDetectionState extends State<NetworkDetection> {
     } else {
       timeoutNotifier.value = false;
     }
-    _preIsStart = isStart;
     ipInfoNotifier.value = ipInfo;
   }
 
   _checkIpContainer(Widget child) {
-    _checkIpDebounce = debounce(_checkIp);
     return Selector2<AppState, Config, CheckIpSelectorState>(
       selector: (_, appState, config) {
         return CheckIpSelectorState(
@@ -55,22 +51,13 @@ class _NetworkDetectionState extends State<NetworkDetection> {
         );
       },
       builder: (_, state, __) {
-        if (_checkIpDebounce != null) {
+        _checkIp(state.isInit, state.isStart);
-          _checkIpDebounce!([state.isInit, state.isStart]);
-        }
         return child;
       },
       child: child,
     );
   }
 
-  @override
-  void dispose() {
-    super.dispose();
-    ipInfoNotifier.dispose();
-    timeoutNotifier.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return _checkIpContainer(
@@ -78,7 +65,6 @@ class _NetworkDetectionState extends State<NetworkDetection> {
         valueListenable: ipInfoNotifier,
         builder: (_, ipInfo, __) {
           return CommonCard(
-            onPressed: () {},
             child: Column(
               children: [
                 Flexible(
@@ -135,9 +121,8 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                   ),
                 ),
                 Container(
-                  height: globalState.appController.measure.titleLargeHeight +
+                  height:
-                      24 -
+                      globalState.appController.measure.titleLargeHeight + 24,
-                      1,
                   alignment: Alignment.centerLeft,
                   padding: const EdgeInsets.all(16).copyWith(top: 0),
                   child: FadeBox(
@@ -152,7 +137,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                                   text: Text(
                                     ipInfo.ip,
                                     style: context.textTheme.titleLarge
-                                        ?.toSoftBold.toMinus,
+                                        ?.toSoftBold(),
                                     maxLines: 1,
                                     overflow: TextOverflow.ellipsis,
                                   ),
@@ -165,11 +150,9 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                             builder: (_, timeout, __) {
                               if (timeout) {
                                 return Text(
-                                  "timeout",
+                                  appLocalizations.ipCheckTimeout,
                                   style: context.textTheme.titleLarge
-                                      ?.copyWith(color: Colors.red)
+                                      ?.toSoftBold(),
-                                      .toSoftBold
-                                      .toMinus,
                                   maxLines: 1,
                                   overflow: TextOverflow.ellipsis,
                                 );

lib/fragments/dashboard/network_speed.dart

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

lib/fragments/dashboard/outbound_mode.dart

@@ -33,7 +33,6 @@ class OutboundMode extends StatelessWidget {
       selector: (_, clashConfig) => clashConfig.mode,
       builder: (_, mode, __) {
         return CommonCard(
-          onPressed: () {},
           info: Info(
             label: appLocalizations.outboundMode,
             iconData: Icons.call_split,
@@ -68,7 +67,7 @@ class OutboundMode extends StatelessWidget {
                           .of(context)
                           .textTheme
                           .titleMedium
-                          ?.toSoftBold,
+                          ?.toSoftBold(),
                     ),
                   ),
               ],

lib/fragments/dashboard/start_button.dart

@@ -13,17 +13,19 @@ class StartButton extends StatefulWidget {
 
 class _StartButtonState extends State<StartButton>
     with SingleTickerProviderStateMixin {
-  late AnimationController _controller;
   bool isStart = false;
+  bool isInit = false;
+  late AnimationController _controller;
 
   @override
   void initState() {
-    super.initState();
+    isStart = globalState.appController.appState.isStart;
     _controller = AnimationController(
       vsync: this,
-      value: 0,
+      value: isStart ? 1 : 0,
       duration: const Duration(milliseconds: 200),
     );
+    super.initState();
   }
 
   @override
@@ -33,12 +35,9 @@ class _StartButtonState extends State<StartButton>
   }
 
   handleSwitchStart() {
-    final appController = globalState.appController;
+    isStart = !isStart;
-    if (isStart == appController.appState.isStart) {
+    updateController();
-      isStart = !isStart;
+    updateSystemProxy();
-      updateController();
-      appController.updateSystemProxy(isStart);
-    }
   }
 
   updateController() {
@@ -49,18 +48,11 @@ class _StartButtonState extends State<StartButton>
     }
   }
 
-  Widget _updateControllerContainer(Widget child) {
+  updateSystemProxy() {
-    return Selector<AppState, bool>(
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      selector: (_, appState) => appState.isStart,
+      final appController = globalState.appController;
-      builder: (_, isStart, child) {
+      await appController.updateSystemProxy(isStart);
-        if(isStart != this.isStart){
+    });
-          this.isStart = isStart;
-          updateController();
-        }
-        return child!;
-      },
-      child: child,
-    );
   }
 
   @override
@@ -80,7 +72,8 @@ class _StartButtonState extends State<StartButton>
                     other.getTimeDifference(
                       DateTime.now(),
                     ),
-                    style: Theme.of(context).textTheme.titleMedium?.toSoftBold,
+                    style:
+                        Theme.of(context).textTheme.titleMedium?.toSoftBold(),
                   ),
                 )
                 .width +
@@ -126,14 +119,24 @@ class _StartButtonState extends State<StartButton>
           child: child,
         );
       },
-      child: _updateControllerContainer(
+      child: Selector<AppState, bool>(
-        Selector<AppState, int?>(
+        selector: (_, appState) => appState.runTime != null,
+        builder: (_, isRun, child) {
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            if (isStart != isRun) {
+              isStart = isRun;
+              updateController();
+            }
+          });
+          return child!;
+        },
+        child: Selector<AppState, int?>(
           selector: (_, appState) => appState.runTime,
           builder: (_, int? value, __) {
             final text = other.getTimeText(value);
             return Text(
               text,
-              style: Theme.of(context).textTheme.titleMedium?.toSoftBold,
+              style: Theme.of(context).textTheme.titleMedium?.toSoftBold(),
             );
           },
         ),

lib/fragments/dashboard/traffic_usage.dart

@@ -42,7 +42,7 @@ class TrafficUsage extends StatelessWidget {
         ),
         Text(
           trafficValue.showUnit,
-          style: context.textTheme.labelMedium?.toLight,
+          style: context.textTheme.labelMedium?.toLight(),
         ),
       ],
     );
@@ -51,16 +51,25 @@ class TrafficUsage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return CommonCard(
-      onPressed: () {},
       info: Info(
         label: appLocalizations.trafficUsage,
         iconData: Icons.data_saver_off,
       ),
-      child: Selector<AppState, Traffic>(
+      child: Selector<AppState, List<Traffic>>(
-        selector: (_, appState) => appState.totalTraffic,
+        selector: (_, appState) => appState.traffics,
-        builder: (_, totalTraffic, __) {
+        builder: (_, traffics, __) {
-          final upTotalTrafficValue = totalTraffic.up;
+          final trafficTotal = traffics.isNotEmpty
-          final downTotalTrafficValue = totalTraffic.down;
+              ? traffics.reduce(
+                  (value, element) {
+                    return Traffic(
+                      up: element.up.value + value.up.value,
+                      down: element.down.value + value.down.value,
+                    );
+                  },
+                )
+              : Traffic();
+          final upTrafficValue = trafficTotal.up;
+          final downTrafficValue = trafficTotal.down;
           return Padding(
             padding: const EdgeInsets.all(16).copyWith(top: 0),
             child: Column(
@@ -71,7 +80,7 @@ class TrafficUsage extends StatelessWidget {
                   child: getTrafficDataItem(
                     context,
                     Icons.arrow_upward,
-                    upTotalTrafficValue,
+                    upTrafficValue,
                   ),
                 ),
                 const SizedBox(
@@ -82,7 +91,7 @@ class TrafficUsage extends StatelessWidget {
                   child: getTrafficDataItem(
                     context,
                     Icons.arrow_downward,
-                    downTotalTrafficValue,
+                    downTrafficValue,
                   ),
                 ),
               ],

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 'resources.dart';
-export 'requests.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';
@@ -17,32 +16,20 @@ class LogsFragment extends StatefulWidget {
 }
 
 class _LogsFragmentState extends State<LogsFragment> {
-  final logsNotifier = ValueNotifier<LogsAndKeywords>(const LogsAndKeywords());
+  final logsNotifier = ValueNotifier<List<Log>>([]);
-  final scrollController = ScrollController(
-    keepScrollOffset: false,
-  );
-  List<GlobalObjectKey<_LogItemState>> keys = [];
-
   Timer? timer;
 
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-      final appState = globalState.appController.appState;
+      logsNotifier.value = context.read<AppState>().logs;
-      logsNotifier.value = logsNotifier.value.copyWith(logs: appState.logs);
       if (timer != null) {
         timer?.cancel();
         timer = null;
       }
       timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
-        final logs = appState.logs;
+        logsNotifier.value = globalState.appController.appState.logs;
-        if (!const ListEquality<Log>().equals(
-          logsNotifier.value.logs,
-          logs,
-        )) {
-          logsNotifier.value = logsNotifier.value.copyWith(logs: logs);
-        }
       });
     });
   }
@@ -51,8 +38,6 @@ class _LogsFragmentState extends State<LogsFragment> {
   void dispose() {
     super.dispose();
     timer?.cancel();
-    logsNotifier.dispose();
-    scrollController.dispose();
     timer = null;
   }
 
@@ -66,7 +51,7 @@ class _LogsFragmentState extends State<LogsFragment> {
             showSearch(
               context: context,
               delegate: LogsSearchDelegate(
-                logs: logsNotifier.value,
+                logs: logsNotifier.value.reversed.toList(),
               ),
             );
           },
@@ -79,23 +64,32 @@ class _LogsFragmentState extends State<LogsFragment> {
     });
   }
 
-  _addKeyword(String keyword) {
+  _buildList() {
-    final isContains = logsNotifier.value.keywords.contains(keyword);
+    return ValueListenableBuilder<List<Log>>(
-    if (isContains) return;
+      valueListenable: logsNotifier,
-    final keywords = List<String>.from(logsNotifier.value.keywords)
+      builder: (_, List<Log> logs, __) {
-      ..add(keyword);
+        if (logs.isEmpty) {
-    logsNotifier.value = logsNotifier.value.copyWith(
+          return NullStatus(
-      keywords: keywords,
+            label: appLocalizations.nullLogsDesc,
-    );
+          );
-  }
+        }
-
+        logs = logs.reversed.toList();
-  _deleteKeyword(String keyword) {
+        return ListView.separated(
-    final isContains = logsNotifier.value.keywords.contains(keyword);
+          physics: const AlwaysScrollableScrollPhysics(),
-    if (!isContains) return;
+          itemCount: logs.length,
-    final keywords = List<String>.from(logsNotifier.value.keywords)
+          itemBuilder: (BuildContext context, int index) {
-      ..remove(keyword);
+            final log = logs[index];
-    logsNotifier.value = logsNotifier.value.copyWith(
+            return LogItem(
-      keywords: keywords,
+              log: log,
+            );
+          },
+          separatorBuilder: (BuildContext context, int index) {
+            return const Divider(
+              height: 0,
+            );
+          },
+        );
+      },
     );
   }
 
@@ -112,88 +106,21 @@ class _LogsFragmentState extends State<LogsFragment> {
         }
         return child!;
       },
-      child: ValueListenableBuilder<LogsAndKeywords>(
+      child: _buildList(),
-        valueListenable: logsNotifier,
-        builder: (_, state, __) {
-          var logs = state.filteredLogs;
-          if (logs.isEmpty) {
-            return NullStatus(
-              label: appLocalizations.nullLogsDesc,
-            );
-          }
-          logs = logs.reversed.toList();
-          keys = logs
-              .map((log) => GlobalObjectKey<_LogItemState>(log.dateTime))
-              .toList();
-          return Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              if (state.keywords.isNotEmpty)
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 16,
-                    vertical: 16,
-                  ),
-                  child: Wrap(
-                    runSpacing: 8,
-                    spacing: 8,
-                    children: [
-                      for (final keyword in state.keywords)
-                        CommonChip(
-                          label: keyword,
-                          type: ChipType.delete,
-                          onPressed: () {
-                            _deleteKeyword(keyword);
-                          },
-                        ),
-                    ],
-                  ),
-                ),
-              Expanded(
-                child: ListView.separated(
-                  controller: scrollController,
-                  itemBuilder: (_, index) {
-                    final log = logs[index];
-                    return LogItem(
-                      key: Key(log.dateTime.toString()),
-                      log: log,
-                      onClick: _addKeyword,
-                    );
-                  },
-                  separatorBuilder: (BuildContext context, int index) {
-                    return const Divider(
-                      height: 0,
-                    );
-                  },
-                  itemCount: logs.length,
-                ),
-              )
-            ],
-          );
-        },
-      ),
     );
   }
 }
 
 class LogsSearchDelegate extends SearchDelegate {
-  ValueNotifier<LogsAndKeywords> logsNotifier;
+  List<Log> logs = [];
 
   LogsSearchDelegate({
-    required LogsAndKeywords logs,
+    required this.logs,
-  }) : logsNotifier = ValueNotifier(logs);
+  });
-
-  @override
-  void dispose() {
-    super.dispose();
-    logsNotifier.dispose();
-  }
-
-  get state => logsNotifier.value;
 
   List<Log> get _results {
     final lowQuery = query.toLowerCase();
-    return logsNotifier.value.filteredLogs
+    return logs
         .where(
           (log) =>
               (log.payload?.toLowerCase().contains(lowQuery) ?? false) ||
@@ -236,98 +163,37 @@ class LogsSearchDelegate extends SearchDelegate {
     return buildSuggestions(context);
   }
 
-  _addKeyword(String keyword) {
-    final isContains = logsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(logsNotifier.value.keywords)..add(keyword);
-    logsNotifier.value = logsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = logsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(logsNotifier.value.keywords)..remove(keyword);
-    logsNotifier.value = logsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
   @override
   Widget buildSuggestions(BuildContext context) {
-    return ValueListenableBuilder(
+    return ListView.separated(
-      valueListenable: logsNotifier,
+      physics: const AlwaysScrollableScrollPhysics(),
-      builder: (_, __, ___) {
+      itemCount: _results.length,
-        return Column(
+      itemBuilder: (BuildContext context, int index) {
-          crossAxisAlignment: CrossAxisAlignment.start,
+        final log = _results[index];
-          children: [
+        return LogItem(
-            if (state.keywords.isNotEmpty)
+          key: ValueKey(log.dateTime),
-              Padding(
+          log: log,
-                padding: const EdgeInsets.symmetric(
+        );
-                  horizontal: 16,
+      },
-                  vertical: 16,
+      separatorBuilder: (BuildContext context, int index) {
-                ),
+        return const Divider(
-                child: Wrap(
+          height: 0,
-                  runSpacing: 8,
-                  spacing: 8,
-                  children: [
-                    for (final keyword in state.keywords)
-                      CommonChip(
-                        label: keyword,
-                        type: ChipType.delete,
-                        onPressed: () {
-                          _deleteKeyword(keyword);
-                        },
-                      ),
-                  ],
-                ),
-              ),
-            Expanded(
-              child: ListView.separated(
-                itemBuilder: (_, index) {
-                  final log = _results[index];
-                  return LogItem(
-                    key: Key(log.dateTime.toString()),
-                    log: log,
-                    onClick: (value) {
-                      _addKeyword(value);
-                    },
-                  );
-                },
-                separatorBuilder: (BuildContext context, int index) {
-                  return const Divider(
-                    height: 0,
-                  );
-                },
-                itemCount: _results.length,
-              ),
-            )
-          ],
         );
       },
     );
   }
 }
 
-class LogItem extends StatefulWidget {
+class LogItem extends StatelessWidget {
   final Log log;
-  final Function(String)? onClick;
 
   const LogItem({
     super.key,
     required this.log,
-    this.onClick,
   });
 
-  @override
-  State<LogItem> createState() => _LogItemState();
-}
-
-class _LogItemState extends State<LogItem> {
   @override
   Widget build(BuildContext context) {
-    final log = widget.log;
     return ListTile(
       title: SelectableText(log.payload ?? ''),
       subtitle: Column(
@@ -349,10 +215,6 @@ class _LogItemState extends State<LogItem> {
               vertical: 8,
             ),
             child: CommonChip(
-              onPressed: () {
-                if (widget.onClick == null) return;
-                widget.onClick!(log.logLevel.name);
-              },
               label: log.logLevel.name,
             ),
           ),

lib/fragments/profiles/add_profile.dart

@@ -91,8 +91,6 @@ class _URLFormDialogState extends State<URLFormDialog> {
           runSpacing: 16,
           children: [
             TextField(
-              maxLines: 5,
-              minLines: 1,
               controller: urlController,
               decoration: InputDecoration(
                 border: const OutlineInputBorder(),

lib/fragments/profiles/edit_profile.dart

@@ -41,26 +41,19 @@ class _EditProfileState extends State<EditProfile> {
   _handleConfirm() {
     if (!_formKey.currentState!.validate()) return;
     final config = widget.context.read<Config>();
-    final profile = widget.profile.copyWith(
+    final hasUpdate = urlController.text.isNotEmpty && widget.profile.url != urlController.text;
-      url: urlController.text,
+    widget.profile.url = urlController.text;
-      label: labelController.text,
+    widget.profile.label = labelController.text;
-      autoUpdate: autoUpdate,
+    widget.profile.autoUpdate = autoUpdate;
-      autoUpdateDuration: Duration(
+    widget.profile.autoUpdateDuration =
-        minutes: int.parse(
+        Duration(minutes: int.parse(autoUpdateDurationController.text));
-          autoUpdateDurationController.text,
+    config.setProfile(widget.profile);
-        ),
-      ),
-    );
-    final hasUpdate = widget.profile.url != profile.url;
-    config.setProfile(profile);
     if (hasUpdate) {
-      globalState.homeScaffoldKey.currentState?.loadingRun(
+      widget.context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
-        () async {
+            () => globalState.appController.updateProfile(
-          if (hasUpdate) {
+              widget.profile.id,
-            await globalState.appController.updateProfile(profile);
+            ),
-          }
+          );
-        },
-      );
     }
     Navigator.of(context).pop();
   }
@@ -90,12 +83,12 @@ class _EditProfileState extends State<EditProfile> {
           },
         ),
       ),
-      if (widget.profile.type == ProfileType.url) ...[
+      if (widget.profile.type == ProfileType.url)...[
         ListItem(
           title: TextFormField(
             controller: urlController,
-            maxLines: 5,
             minLines: 1,
+            maxLines: 2,
             decoration: InputDecoration(
               border: const OutlineInputBorder(),
               labelText: appLocalizations.url,
@@ -159,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

@@ -1,6 +1,5 @@
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/fragments/profiles/edit_profile.dart';
-import 'package:fl_clash/fragments/profiles/view_profile.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/state.dart';
@@ -16,21 +15,11 @@ enum ProfileActions {
   edit,
   update,
   delete,
-  view,
 }
 
-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);
-
-  List<GlobalObjectKey<_ProfileItemState>> profileItemKeys = [];
-
   _handleShowAddExtendPage() {
     showExtendPage(
       globalState.navigatorKey.currentState!.context,
@@ -52,24 +41,21 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     }
   }
 
-  _updateProfiles() async {
+  _initScaffoldState(BuildContext context) {
-    final updateProfiles = profileItemKeys.map<Future>(
-        (key) async => await key.currentState?.updateProfile(false));
-    await Future.wait(updateProfiles);
-  }
-
-  _initScaffoldState() {
     WidgetsBinding.instance.addPostFrameCallback(
       (_) {
         final commonScaffoldState =
             context.findAncestorStateOfType<CommonScaffoldState>();
-        if (!context.mounted) return;
         commonScaffoldState?.actions = [
           IconButton(
             onPressed: () {
-              _updateProfiles();
+              commonScaffoldState.loadingRun<void>(
+                () async {
+                  await globalState.appController.updateProfiles();
+                },
+              );
             },
-            icon: const Icon(Icons.sync),
+            icon: const Icon(Icons.download),
           ),
           const SizedBox(
             width: 8,
@@ -86,19 +72,13 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     );
   }
 
-  @override
-  void dispose() {
-    super.dispose();
-    hasPadding.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return Selector<AppState, bool>(
       selector: (_, appState) => appState.currentLabel == 'profiles',
       builder: (_, isCurrent, child) {
         if (isCurrent) {
-          _initScaffoldState();
+          _initScaffoldState(context);
         }
         return child!;
       },
@@ -114,54 +94,31 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
               label: appLocalizations.nullProfileDesc,
             );
           }
-          profileItemKeys = state.profiles
-              .map((profile) => GlobalObjectKey<_ProfileItemState>(profile.id))
-              .toList();
           final columns = _getColumns(state.viewMode);
           final isMobile = state.viewMode == ViewMode.mobile;
           return Align(
             alignment: Alignment.topCenter,
-            child: NotificationListener<ScrollNotification>(
+            child: SingleChildScrollView(
-              onNotification: (scrollNotification) {
+              padding: !isMobile
-                WidgetsBinding.instance.addPostFrameCallback((_) {
+                  ? const EdgeInsets.symmetric(
-                  hasPadding.value =
+                      horizontal: 16,
-                      scrollNotification.metrics.maxScrollExtent > 0;
+                      vertical: 16,
-                });
+                    )
-                return true;
+                  : EdgeInsets.zero,
-              },
+              child: Grid(
-              child: ValueListenableBuilder(
+                mainAxisSpacing: isMobile ? 8 : 16,
-                valueListenable: hasPadding,
+                crossAxisSpacing: 16,
-                builder: (_, hasPadding, __) {
+                crossAxisCount: columns,
-                  return SingleChildScrollView(
+                children: [
-                    padding: !isMobile
+                  for (final profile in state.profiles)
-                        ? EdgeInsets.only(
+                    GridItem(
-                            left: 16,
+                      child: ProfileItem(
-                            right: 16,
+                        profile: profile,
-                            top: 16,
+                        groupValue: state.currentProfileId,
-                            bottom: 16 + (hasPadding ? 56 : 0),
+                        onChanged: globalState.appController.changeProfile,
-                          )
+                      ),
-                        : EdgeInsets.only(
-                            bottom: 0 + (hasPadding ? 56 : 0),
-                          ),
-                    child: Grid(
-                      mainAxisSpacing: isMobile ? 8 : 16,
-                      crossAxisSpacing: 16,
-                      crossAxisCount: columns,
-                      children: [
-                        for (int i = 0; i < state.profiles.length; i++)
-                          GridItem(
-                            child: ProfileItem(
-                              key: profileItemKeys[i],
-                              profile: state.profiles[i],
-                              groupValue: state.currentProfileId,
-                              onChanged:
-                                  globalState.appController.changeProfile,
-                            ),
-                          ),
-                      ],
                     ),
-                  );
+                ],
-                },
               ),
             ),
           );
@@ -190,51 +147,42 @@ class ProfileItem extends StatefulWidget {
 class _ProfileItemState extends State<ProfileItem> {
   final isUpdating = ValueNotifier<bool>(false);
 
-  _handleDeleteProfile() async {
+  _handleDeleteProfile(String id) async {
-    globalState.appController.deleteProfile(widget.profile.id);
+    globalState.appController.deleteProfile(id);
   }
 
-  _handleUpdateProfile() async {
+  _handleUpdateProfile(String id) async {
-    await globalState.safeRun<void>(updateProfile);
-  }
-
-  Future updateProfile([isSingle = true]) async {
     isUpdating.value = true;
-    try {
+    await globalState.safeRun<void>(() async {
-      await globalState.appController.updateProfile(widget.profile);
+      await globalState.appController.updateProfile(id);
-    } catch (e) {
+    });
-      isUpdating.value = false;
-      if (!isSingle) {
-        return e.toString();
-      }
-    }
     isUpdating.value = false;
-    return null;
   }
 
-  _handleShowEditExtendPage() {
+  _handleShowEditExtendPage(
+    Profile profile,
+  ) {
     showExtendPage(
       context,
       body: EditProfile(
-        profile: widget.profile,
+        profile: profile.copyWith(),
         context: context,
       ),
       title: "${appLocalizations.edit}${appLocalizations.profile}",
     );
   }
 
-  _handleViewProfile() {
-    Navigator.of(context).push(
-      MaterialPageRoute(
-        builder: (context) => ViewProfile(
-          profile: widget.profile,
-        ),
-      ),
-    );
-  }
-
   _buildTitle(Profile profile) {
     final textTheme = context.textTheme;
+    final userInfo = profile.userInfo ?? UserInfo();
+    final use = userInfo.upload + userInfo.download;
+    final total = userInfo.total;
+    final useShow = TrafficValue(value: use).show;
+    final totalShow = TrafficValue(value: total).show;
+    final progress = total == 0 ? 0.0 : use / total;
+    final expireShow = userInfo.expire == 0
+        ? "长期有效"
+        : DateTime.fromMillisecondsSinceEpoch(userInfo.expire * 1000).show;
     return Container(
       padding: const EdgeInsets.symmetric(vertical: 4),
       child: Column(
@@ -253,141 +201,53 @@ class _ProfileItemState extends State<ProfileItem> {
               ),
               Text(
                 profile.lastUpdateDate?.lastUpdateTimeDesc ?? '',
-                style: textTheme.labelMedium?.toLight,
+                style: textTheme.labelMedium?.toLight(),
               ),
             ],
           ),
-          Builder(builder: (context) {
+          Column(
-            final userInfo = profile.userInfo ?? const UserInfo();
+            mainAxisSize: MainAxisSize.min,
-            final use = userInfo.upload + userInfo.download;
+            crossAxisAlignment: CrossAxisAlignment.start,
-            final total = userInfo.total;
+            mainAxisAlignment: MainAxisAlignment.center,
-            final useShow = TrafficValue(value: use).show;
+            children: [
-            final totalShow = TrafficValue(value: total).show;
+              Container(
-            final progress = total == 0 ? 0.0 : use / total;
+                margin: const EdgeInsets.symmetric(
-            final expireShow = userInfo.expire == 0
+                  vertical: 8,
-                ? appLocalizations.infiniteTime
+                ),
-                : DateTime.fromMillisecondsSinceEpoch(userInfo.expire * 1000)
+                child: LinearProgressIndicator(
-                    .show;
+                  minHeight: 6,
-            return Column(
+                  value: progress,
-              mainAxisSize: MainAxisSize.min,
+                ),
-              crossAxisAlignment: CrossAxisAlignment.start,
+              ),
-              mainAxisAlignment: MainAxisAlignment.center,
+              Text(
-              children: [
+                "$useShow / $totalShow",
-                Container(
+                style: textTheme.labelMedium?.toLight(),
-                  margin: const EdgeInsets.symmetric(
+              ),
-                    vertical: 8,
+              const SizedBox(
+                height: 2,
+              ),
+              Row(
+                children: [
+                  Text(
+                    "到期时间:",
+                    style: textTheme.labelMedium?.toLighter(),
                   ),
-                  child: LinearProgressIndicator(
+                  const SizedBox(
-                    minHeight: 6,
+                    width: 4,
-                    value: progress,
                   ),
-                ),
+                  Text(
-                Text(
+                    expireShow,
-                  "$useShow / $totalShow",
+                    style: textTheme.labelMedium?.toLighter(),
-                  style: textTheme.labelMedium?.toLight,
+                  ),
-                ),
+                ],
-                const SizedBox(
+              )
-                  height: 2,
+            ],
-                ),
+          ),
-                Row(
-                  children: [
-                    Text(
-                      appLocalizations.expirationTime,
-                      style: textTheme.labelMedium?.toLighter,
-                    ),
-                    const SizedBox(
-                      width: 4,
-                    ),
-                    Text(
-                      expireShow,
-                      style: textTheme.labelMedium?.toLighter,
-                    ),
-                  ],
-                )
-              ],
-            );
-            // final child = switch (userInfo != null) {
-            //   true => () {
-            //       final use = userInfo!.upload + userInfo.download;
-            //       final total = userInfo.total;
-            //       final useShow = TrafficValue(value: use).show;
-            //       final totalShow = TrafficValue(value: total).show;
-            //       final progress = total == 0 ? 0.0 : use / total;
-            //       final expireShow = userInfo.expire == 0
-            //           ? appLocalizations.infiniteTime
-            //           : DateTime.fromMillisecondsSinceEpoch(
-            //                   userInfo.expire * 1000)
-            //               .show;
-            //       return Column(
-            //         mainAxisSize: MainAxisSize.min,
-            //         crossAxisAlignment: CrossAxisAlignment.start,
-            //         mainAxisAlignment: MainAxisAlignment.center,
-            //         children: [
-            //           Container(
-            //             margin: const EdgeInsets.symmetric(
-            //               vertical: 8,
-            //             ),
-            //             child: LinearProgressIndicator(
-            //               minHeight: 6,
-            //               value: progress,
-            //             ),
-            //           ),
-            //           Text(
-            //             "$useShow / $totalShow",
-            //             style: textTheme.labelMedium?.toLight(),
-            //           ),
-            //           const SizedBox(
-            //             height: 2,
-            //           ),
-            //           Row(
-            //             children: [
-            //               Text(
-            //                 appLocalizations.expirationTime,
-            //                 style: textTheme.labelMedium?.toLighter(),
-            //               ),
-            //               const SizedBox(
-            //                 width: 4,
-            //               ),
-            //               Text(
-            //                 expireShow,
-            //                 style: textTheme.labelMedium?.toLighter(),
-            //               ),
-            //             ],
-            //           )
-            //         ],
-            //       );
-            //     }(),
-            //   false => Column(
-            //       children: [
-            //         Padding(
-            //           padding: const EdgeInsets.only(top: 8),
-            //           child: CommonChip(
-            //             onPressed: _handleViewProfile,
-            //             avatar: const Icon(Icons.remove_red_eye),
-            //             label: appLocalizations.view,
-            //           ),
-            //         ),
-            //       ],
-            //     ),
-            // };
-            // final measure = globalState.appController.measure;
-            // final height = 6 + 8 * 2 + 2 + measure.labelMediumHeight * 2;
-            // return SizedBox(
-            //   height: height,
-            //   child: child,
-            // );
-          }),
         ],
       ),
     );
   }
 
-  @override
-  void dispose() {
-    isUpdating.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     final profile = widget.profile;
@@ -412,63 +272,40 @@ class _ProfileItemState extends State<ProfileItem> {
           onChanged: onChanged,
         ),
         padding: const EdgeInsets.symmetric(horizontal: 16),
-        trailing: SizedBox(
+        trailing: CommonPopupMenu<ProfileActions>(
-          height: 48,
+          items: [
-          width: 48,
+            CommonPopupMenuItem(
-          child: ValueListenableBuilder(
+              action: ProfileActions.edit,
-            valueListenable: isUpdating,
+              label: appLocalizations.edit,
-            builder: (_, isUpdating, ___) {
+              iconData: Icons.edit,
-              return FadeBox(
+            ),
-                  child: isUpdating
+            if (profile.type == ProfileType.url)
-                      ? const Padding(
+              CommonPopupMenuItem(
-                          padding: EdgeInsets.all(8),
+                action: ProfileActions.update,
-                          child: CircularProgressIndicator(),
+                label: appLocalizations.update,
-                        )
+                iconData: Icons.sync,
-                      : CommonPopupMenu<ProfileActions>(
+              ),
-                          items: [
+            CommonPopupMenuItem(
-                            CommonPopupMenuItem(
+              action: ProfileActions.delete,
-                              action: ProfileActions.edit,
+              label: appLocalizations.delete,
-                              label: appLocalizations.edit,
+              iconData: Icons.delete,
-                              iconData: Icons.edit,
+            ),
-                            ),
+          ],
-                            if (profile.type == ProfileType.url)
+          onSelected: (ProfileActions? action) async {
-                              CommonPopupMenuItem(
+            switch (action) {
-                                action: ProfileActions.update,
+              case ProfileActions.edit:
-                                label: appLocalizations.update,
+                _handleShowEditExtendPage(profile);
-                                iconData: Icons.sync,
+                break;
-                              ),
+              case ProfileActions.delete:
-                            CommonPopupMenuItem(
+                _handleDeleteProfile(profile.id);
-                              action: ProfileActions.delete,
+                break;
-                              label: appLocalizations.delete,
+              case ProfileActions.update:
-                              iconData: Icons.delete,
+                _handleUpdateProfile(profile.id);
-                            ),
+                break;
-                            CommonPopupMenuItem(
+              case null:
-                              action: ProfileActions.view,
+                break;
-                              label: appLocalizations.view,
+            }
-                              iconData: Icons.visibility,
+          },
-                            ),
-                          ],
-                          onSelected: (ProfileActions? action) async {
-                            switch (action) {
-                              case ProfileActions.edit:
-                                _handleShowEditExtendPage();
-                                break;
-                              case ProfileActions.delete:
-                                _handleDeleteProfile();
-                                break;
-                              case ProfileActions.update:
-                                _handleUpdateProfile();
-                                break;
-                              case ProfileActions.view:
-                                _handleViewProfile();
-                                break;
-                              case null:
-                                break;
-                            }
-                          },
-                        ));
-            },
-          ),
         ),
         title: _buildTitle(profile),
         tileTitleAlignment: ListTileTitleAlignment.titleHeight,

lib/fragments/profiles/view_profile.dart

@@ -1,207 +0,0 @@
-import 'dart:io';
-
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/scaffold.dart';
-import 'package:flutter/material.dart';
-import 'package:re_editor/re_editor.dart';
-import 'package:re_highlight/languages/yaml.dart';
-import 'package:re_highlight/styles/intellij-light.dart';
-
-class ViewProfile extends StatefulWidget {
-  final Profile profile;
-
-  const ViewProfile({
-    super.key,
-    required this.profile,
-  });
-
-  @override
-  State<ViewProfile> createState() => _ViewProfileState();
-}
-
-class _ViewProfileState extends State<ViewProfile> {
-  bool readOnly = true;
-  CodeLineEditingController? controller;
-  final contentNotifier = ValueNotifier<String>("");
-  final key = GlobalKey<CommonScaffoldState>();
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      final profilePath = await appPath.getProfilePath(widget.profile.id);
-      if (profilePath == null) {
-        return;
-      }
-      final file = File(profilePath);
-      final text = await file.readAsString();
-      contentNotifier.value = text;
-    });
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    contentNotifier.dispose();
-    controller?.dispose();
-  }
-
-  Profile get profile => widget.profile;
-
-  _handleChangeReadOnly() async {
-    if (readOnly == true) {
-      setState(() {
-        readOnly = false;
-      });
-    } else {
-      final text = controller?.text;
-      if (text == null || text == contentNotifier.value) {
-        setState(() {
-          readOnly = true;
-        });
-        return;
-      }
-      contentNotifier.value = text;
-      final newProfile = await key.currentState?.loadingRun<Profile>(() async {
-        return await profile.saveFileWithString(text);
-      });
-      if (newProfile == null) return;
-      globalState.appController.config.setProfile(newProfile);
-      setState(() {
-        readOnly = true;
-      });
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return CommonScaffold(
-      key: key,
-      actions: [
-        IconButton(
-          onPressed: controller?.undo,
-          icon: const Icon(Icons.undo),
-        ),
-        IconButton(
-          onPressed: controller?.redo,
-          icon: const Icon(Icons.redo),
-        ),
-        if (!widget.profile.realAutoUpdate)
-          IconButton(
-            onPressed: _handleChangeReadOnly,
-            icon: readOnly ? const Icon(Icons.edit) : const Icon(Icons.save),
-          ),
-        const SizedBox(
-          width: 8,
-        )
-      ],
-      body: ValueListenableBuilder(
-        valueListenable: contentNotifier,
-        builder: (_, value, __) {
-          if (value.isEmpty) return Container();
-          controller = CodeLineEditingController.fromText(value);
-          return CodeEditor(
-            autofocus: false,
-            readOnly: readOnly,
-            scrollbarBuilder: (context, child, details) {
-              return Scrollbar(
-                controller: details.controller,
-                thickness: 8,
-                radius: const Radius.circular(2),
-                interactive: true,
-                child: child,
-              );
-            },
-            showCursorWhenReadOnly: false,
-            controller: controller,
-            toolbarController:
-                !readOnly ? const ContextMenuControllerImpl() : null,
-            shortcutsActivatorsBuilder:
-                const DefaultCodeShortcutsActivatorsBuilder(),
-            indicatorBuilder:
-                (context, editingController, chunkController, notifier) {
-              return Row(
-                children: [
-                  DefaultCodeLineNumber(
-                    controller: editingController,
-                    notifier: notifier,
-                  ),
-                  DefaultCodeChunkIndicator(
-                    width: 20,
-                    controller: chunkController,
-                    notifier: notifier,
-                  )
-                ],
-              );
-            },
-            style: CodeEditorStyle(
-              fontSize: 14,
-              codeTheme: CodeHighlightTheme(
-                languages: {
-                  'yaml': CodeHighlightThemeMode(
-                    mode: langYaml,
-                  )
-                },
-                theme: intellijLightTheme,
-              ),
-            ),
-          );
-        },
-      ),
-      title: widget.profile.label ?? widget.profile.id,
-    );
-  }
-}
-
-class ContextMenuItemWidget extends PopupMenuItem<void> {
-  ContextMenuItemWidget({
-    super.key,
-    required String text,
-    required VoidCallback super.onTap,
-  }) : super(child: Text(text));
-}
-
-class ContextMenuControllerImpl implements SelectionToolbarController {
-  const ContextMenuControllerImpl();
-
-  @override
-  void hide(BuildContext context) {}
-
-  @override
-  void show({
-    required BuildContext context,
-    required CodeLineEditingController controller,
-    required TextSelectionToolbarAnchors anchors,
-    Rect? renderRect,
-    required LayerLink layerLink,
-    required ValueNotifier<bool> visibility,
-  }) {
-    if (controller.selectedText.isEmpty) {
-      return;
-    }
-    showMenu(
-      context: context,
-      position: RelativeRect.fromSize(
-        (anchors.secondaryAnchor ?? anchors.primaryAnchor) &
-            const Size(150, double.infinity),
-        MediaQuery.of(context).size,
-      ),
-      items: [
-        ContextMenuItemWidget(
-          text: appLocalizations.cut,
-          onTap: controller.cut,
-        ),
-        ContextMenuItemWidget(
-          text: appLocalizations.copy,
-          onTap: controller.copy,
-        ),
-        ContextMenuItemWidget(
-          text: appLocalizations.paste,
-          onTap: controller.paste,
-        ),
-      ],
-    );
-  }
-}

lib/fragments/requests.dart

@@ -1,417 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-
-import 'package:collection/collection.dart';
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/plugins/app.dart';
-import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class RequestsFragment extends StatefulWidget {
-  const RequestsFragment({super.key});
-
-  @override
-  State<RequestsFragment> createState() => _RequestsFragmentState();
-}
-
-class _RequestsFragmentState extends State<RequestsFragment> {
-  final requestsNotifier =
-      ValueNotifier<ConnectionsAndKeywords>(const ConnectionsAndKeywords());
-  final ScrollController _scrollController = ScrollController(
-    keepScrollOffset: false,
-  );
-
-  Timer? timer;
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final appState = globalState.appController.appState;
-      requestsNotifier.value =
-          requestsNotifier.value.copyWith(connections: appState.requests);
-      if (timer != null) {
-        timer?.cancel();
-        timer = null;
-      }
-      timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
-        final requests = appState.requests;
-        if (!const ListEquality<Connection>().equals(
-          requestsNotifier.value.connections,
-          requests,
-        )) {
-          requestsNotifier.value =
-              requestsNotifier.value.copyWith(connections: requests);
-        }
-      });
-    });
-  }
-
-  _initActions() {
-    WidgetsBinding.instance.addPostFrameCallback(
-      (_) {
-        final commonScaffoldState =
-            context.findAncestorStateOfType<CommonScaffoldState>();
-        commonScaffoldState?.actions = [
-          IconButton(
-            onPressed: () {
-              showSearch(
-                context: context,
-                delegate: RequestsSearchDelegate(
-                  state: requestsNotifier.value,
-                ),
-              );
-            },
-            icon: const Icon(Icons.search),
-          ),
-          const SizedBox(
-            width: 8,
-          )
-        ];
-      },
-    );
-  }
-
-  _addKeyword(String keyword) {
-    final isContains = requestsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(requestsNotifier.value.keywords)
-      ..add(keyword);
-    requestsNotifier.value = requestsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = requestsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(requestsNotifier.value.keywords)
-      ..remove(keyword);
-    requestsNotifier.value = requestsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    timer?.cancel();
-    _scrollController.dispose();
-    timer = null;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<AppState, bool?>(
-      selector: (_, appState) =>
-          appState.currentLabel == 'requests' ||
-          appState.viewMode == ViewMode.mobile &&
-              appState.currentLabel == "tools",
-      builder: (_, isCurrent, child) {
-        if (isCurrent == null || isCurrent) {
-          _initActions();
-        }
-        return child!;
-      },
-      child: ValueListenableBuilder<ConnectionsAndKeywords>(
-        valueListenable: requestsNotifier,
-        builder: (_, state, __) {
-          var connections = state.filteredConnections;
-          if (connections.isEmpty) {
-            return NullStatus(
-              label: appLocalizations.nullRequestsDesc,
-            );
-          }
-          connections = connections.reversed.toList();
-          return Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              if (state.keywords.isNotEmpty)
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 16,
-                    vertical: 16,
-                  ),
-                  child: Wrap(
-                    runSpacing: 8,
-                    spacing: 8,
-                    children: [
-                      for (final keyword in state.keywords)
-                        CommonChip(
-                          label: keyword,
-                          type: ChipType.delete,
-                          onPressed: () {
-                            _deleteKeyword(keyword);
-                          },
-                        ),
-                    ],
-                  ),
-                ),
-              Expanded(
-                child: ListView.separated(
-                  controller: _scrollController,
-                  itemBuilder: (_, index) {
-                    final connection = connections[index];
-                    return RequestItem(
-                      key: Key(connection.id),
-                      connection: connection,
-                      onClick: _addKeyword,
-                    );
-                  },
-                  separatorBuilder: (BuildContext context, int index) {
-                    return const Divider(
-                      height: 0,
-                    );
-                  },
-                  itemCount: connections.length,
-                ),
-              )
-            ],
-          );
-        },
-      ),
-    );
-  }
-}
-
-class RequestItem extends StatelessWidget {
-  final Connection connection;
-  final Function(String)? onClick;
-
-  const RequestItem({
-    super.key,
-    required this.connection,
-    this.onClick,
-  });
-
-  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 ListItem(
-      tileTitleAlignment: ListTileTitleAlignment.titleHeight,
-      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,
-                  onPressed: () {
-                    if (onClick == null) return;
-                    onClick!(chain);
-                  },
-                ),
-            ],
-          ),
-          const SizedBox(
-            height: 12,
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class RequestsSearchDelegate extends SearchDelegate {
-  ValueNotifier<ConnectionsAndKeywords> requestsNotifier;
-
-  RequestsSearchDelegate({
-    required ConnectionsAndKeywords state,
-  }) : requestsNotifier = ValueNotifier<ConnectionsAndKeywords>(state);
-
-  get state => requestsNotifier.value;
-
-  List<Connection> get _results {
-    final lowerQuery = query.toLowerCase().trim();
-    return requestsNotifier.value.filteredConnections.where((request) {
-      final lowerNetwork = request.metadata.network.toLowerCase();
-      final lowerHost = request.metadata.host.toLowerCase();
-      final lowerDestinationIP = request.metadata.destinationIP.toLowerCase();
-      final lowerProcess = request.metadata.process.toLowerCase();
-      final lowerChains = request.chains.join("").toLowerCase();
-      return lowerNetwork.contains(lowerQuery) ||
-          lowerHost.contains(lowerQuery) ||
-          lowerDestinationIP.contains(lowerQuery) ||
-          lowerProcess.contains(lowerQuery) ||
-          lowerChains.contains(lowerQuery);
-    }).toList();
-  }
-
-  _addKeyword(String keyword) {
-    final isContains = requestsNotifier.value.keywords.contains(keyword);
-    if (isContains) return;
-    final keywords = List<String>.from(requestsNotifier.value.keywords)
-      ..add(keyword);
-    requestsNotifier.value = requestsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  _deleteKeyword(String keyword) {
-    final isContains = requestsNotifier.value.keywords.contains(keyword);
-    if (!isContains) return;
-    final keywords = List<String>.from(requestsNotifier.value.keywords)
-      ..remove(keyword);
-    requestsNotifier.value = requestsNotifier.value.copyWith(
-      keywords: keywords,
-    );
-  }
-
-  @override
-  List<Widget>? buildActions(BuildContext context) {
-    return [
-      IconButton(
-        onPressed: () {
-          if (query.isEmpty) {
-            close(context, null);
-            return;
-          }
-          query = '';
-        },
-        icon: const Icon(Icons.clear),
-      ),
-      const SizedBox(
-        width: 8,
-      )
-    ];
-  }
-
-  @override
-  Widget? buildLeading(BuildContext context) {
-    return IconButton(
-      onPressed: () {
-        close(context, null);
-      },
-      icon: const Icon(Icons.arrow_back),
-    );
-  }
-
-  @override
-  Widget buildResults(BuildContext context) {
-    return buildSuggestions(context);
-  }
-
-  @override
-  void dispose() {
-    requestsNotifier.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget buildSuggestions(BuildContext context) {
-    return ValueListenableBuilder(
-      valueListenable: requestsNotifier,
-      builder: (_, __, ___) {
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (state.keywords.isNotEmpty)
-              Padding(
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 16,
-                  vertical: 16,
-                ),
-                child: Wrap(
-                  runSpacing: 8,
-                  spacing: 8,
-                  children: [
-                    for (final keyword in state.keywords)
-                      CommonChip(
-                        label: keyword,
-                        type: ChipType.delete,
-                        onPressed: () {
-                          _deleteKeyword(keyword);
-                        },
-                      ),
-                  ],
-                ),
-              ),
-            Expanded(
-              child: ListView.separated(
-                itemBuilder: (_, index) {
-                  final connection = _results[index];
-                  return RequestItem(
-                    key: Key(connection.id),
-                    connection: connection,
-                    onClick: (value) {
-                      _addKeyword(value);
-                    },
-                  );
-                },
-                separatorBuilder: (BuildContext context, int index) {
-                  return const Divider(
-                    height: 0,
-                  );
-                },
-                itemCount: _results.length,
-              ),
-            )
-          ],
-        );
-      },
-    );
-  }
-}

lib/fragments/resources.dart

@@ -78,9 +78,9 @@ class _ResourcesState extends State<Resources> {
                                 const Padding(
                                   padding: EdgeInsets.only(left: 12,right: 4),
                                   child: VerticalDivider(
-                                    endIndent: 6,
+                                    endIndent: 2,
                                     width: 4,
-                                    indent: 6,
+                                    indent: 2,
                                   ),
                                 ),
                                 externalProvider.vehicleType == "HTTP"

lib/fragments/theme.dart

@@ -111,10 +111,9 @@ class ThemeFragment extends StatelessWidget {
       null,
       defaultPrimaryColor,
       Colors.pinkAccent,
-      Colors.lightBlue,
       Colors.greenAccent,
       Colors.yellowAccent,
-      Colors.purple,
+      Colors.purple
     ];
     return Column(
       children: [

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,35 +160,5 @@
   "checking": "Checking...",
   "country": "Country",
   "checkError": "Check error",
-  "search": "Search",
+  "ipCheckTimeout": "Ip check timeout"
-  "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",
-  "findProcessMode": "Find process",
-  "findProcessModeDesc": "There is a risk of flashback after opening",
-  "init": "Init",
-  "infiniteTime": "Long term effective",
-  "expirationTime": "Expiration time",
-  "connections": "Connections",
-  "connectionsDesc": "View current connection",
-  "nullRequestsDesc": "No requests",
-  "nullConnectionsDesc": "No connections",
-  "intranetIP": "Intranet IP",
-  "view": "View",
-  "cut": "Cut",
-  "copy": "Copy",
-  "paste": "Paste"
 }

lib/l10n/arb/intl_zh_CN.arb

@@ -111,7 +111,6 @@
   "noMoreInfoDesc": "暂无更多信息",
   "profileParseErrorDesc": "配置文件解析错误",
   "proxyPort": "代理端口",
-  "proxyPortDesc": "设置Clash监听端口",
   "port": "端口",
   "logLevel": "日志等级",
   "show": "显示",
@@ -161,35 +160,5 @@
   "checking": "检测中...",
   "country": "区域",
   "checkError": "检测失败",
-  "search": "搜索",
+  "ipCheckTimeout": "Ip检测超时"
-  "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": "查看最近请求数据",
-  "findProcessMode": "查找进程",
-  "findProcessModeDesc": "开启后存在闪退风险",
-  "init": "初始化",
-  "infiniteTime": "长期有效",
-  "expirationTime": "到期时间",
-  "connections": "连接",
-  "connectionsDesc": "查看当前连接",
-  "nullRequestsDesc": "暂无请求",
-  "nullConnectionsDesc": "暂无连接",
-  "intranetIP": "内网 IP",
-  "view": "查看",
-  "cut": "剪切",
-  "copy": "复制",
-  "paste": "粘贴"
 }

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"),
@@ -92,16 +87,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "compatibleDesc": MessageLookupByLibrary.simpleMessage(
             "Opening it will lose part of its application ability and gain the support of full amount of Clash."),
         "confirm": MessageLookupByLibrary.simpleMessage("Confirm"),
-        "connections": MessageLookupByLibrary.simpleMessage("Connections"),
-        "connectionsDesc":
-            MessageLookupByLibrary.simpleMessage("View current connection"),
         "connectivity": MessageLookupByLibrary.simpleMessage("Connectivity："),
-        "copy": MessageLookupByLibrary.simpleMessage("Copy"),
         "core": MessageLookupByLibrary.simpleMessage("Core"),
         "coreInfo": MessageLookupByLibrary.simpleMessage("Core info"),
         "country": MessageLookupByLibrary.simpleMessage("Country"),
         "create": MessageLookupByLibrary.simpleMessage("Create"),
-        "cut": MessageLookupByLibrary.simpleMessage("Cut"),
         "dark": MessageLookupByLibrary.simpleMessage("Dark"),
         "dashboard": MessageLookupByLibrary.simpleMessage("Dashboard"),
         "days": MessageLookupByLibrary.simpleMessage("Days"),
@@ -122,12 +112,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "edit": MessageLookupByLibrary.simpleMessage("Edit"),
         "en": MessageLookupByLibrary.simpleMessage("English"),
         "exit": MessageLookupByLibrary.simpleMessage("Exit"),
-        "expirationTime":
-            MessageLookupByLibrary.simpleMessage("Expiration time"),
-        "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"),
@@ -135,26 +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"),
-        "infiniteTime":
+        "ipCheckTimeout":
-            MessageLookupByLibrary.simpleMessage("Long term effective"),
+            MessageLookupByLibrary.simpleMessage("Ip check timeout"),
-        "init": MessageLookupByLibrary.simpleMessage("Init"),
-        "intranetIP": MessageLookupByLibrary.simpleMessage("Intranet IP"),
-        "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"),
@@ -183,14 +155,11 @@ class MessageLookup extends MessageLookupByLibrary {
             "Please create a profile or add a valid profile"),
         "notSelectedTip": MessageLookupByLibrary.simpleMessage(
             "The current proxy group cannot be selected."),
-        "nullConnectionsDesc":
-            MessageLookupByLibrary.simpleMessage("No connections"),
         "nullCoreInfoDesc":
             MessageLookupByLibrary.simpleMessage("Unable to obtain core info"),
         "nullLogsDesc": MessageLookupByLibrary.simpleMessage("No logs"),
         "nullProfileDesc": MessageLookupByLibrary.simpleMessage(
             "No profile, Please add a profile"),
-        "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("No requests"),
         "other": MessageLookupByLibrary.simpleMessage("Other"),
         "outboundMode": MessageLookupByLibrary.simpleMessage("Outbound mode"),
         "override": MessageLookupByLibrary.simpleMessage("Override"),
@@ -199,7 +168,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "password": MessageLookupByLibrary.simpleMessage("Password"),
         "passwordTip":
             MessageLookupByLibrary.simpleMessage("Password cannot be empty"),
-        "paste": MessageLookupByLibrary.simpleMessage("Paste"),
         "pleaseBindWebDAV":
             MessageLookupByLibrary.simpleMessage("Please bind WebDAV"),
         "pleaseUploadFile":
@@ -227,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"),
@@ -241,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"),
@@ -261,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(
@@ -283,16 +240,12 @@ 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"),
         "url": MessageLookupByLibrary.simpleMessage("URL"),
         "urlDesc":
             MessageLookupByLibrary.simpleMessage("Obtain profile through URL"),
-        "view": MessageLookupByLibrary.simpleMessage("View"),
         "webDAVConfiguration":
             MessageLookupByLibrary.simpleMessage("WebDAV configuration"),
         "whitelistMode": MessageLookupByLibrary.simpleMessage("Whitelist mode"),

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("修改应用程序相关设置"),
@@ -75,15 +71,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "compatibleDesc":
             MessageLookupByLibrary.simpleMessage("开启将失去部分应用能力，获得全量的Clash的支持"),
         "confirm": MessageLookupByLibrary.simpleMessage("确定"),
-        "connections": MessageLookupByLibrary.simpleMessage("连接"),
-        "connectionsDesc": MessageLookupByLibrary.simpleMessage("查看当前连接"),
         "connectivity": MessageLookupByLibrary.simpleMessage("连通性："),
-        "copy": MessageLookupByLibrary.simpleMessage("复制"),
         "core": MessageLookupByLibrary.simpleMessage("内核"),
         "coreInfo": MessageLookupByLibrary.simpleMessage("内核信息"),
         "country": MessageLookupByLibrary.simpleMessage("区域"),
         "create": MessageLookupByLibrary.simpleMessage("创建"),
-        "cut": MessageLookupByLibrary.simpleMessage("剪切"),
         "dark": MessageLookupByLibrary.simpleMessage("深色"),
         "dashboard": MessageLookupByLibrary.simpleMessage("仪表盘"),
         "days": MessageLookupByLibrary.simpleMessage("天"),
@@ -101,30 +93,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "edit": MessageLookupByLibrary.simpleMessage("编辑"),
         "en": MessageLookupByLibrary.simpleMessage("英语"),
         "exit": MessageLookupByLibrary.simpleMessage("退出"),
-        "expirationTime": 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导入"),
-        "infiniteTime": MessageLookupByLibrary.simpleMessage("长期有效"),
+        "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
-        "init": MessageLookupByLibrary.simpleMessage("初始化"),
-        "intranetIP": MessageLookupByLibrary.simpleMessage("内网 IP"),
-        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收IPv6流量"),
         "just": MessageLookupByLibrary.simpleMessage("刚刚"),
         "language": MessageLookupByLibrary.simpleMessage("语言"),
         "light": MessageLookupByLibrary.simpleMessage("浅色"),
@@ -149,19 +127,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "noProxyDesc":
             MessageLookupByLibrary.simpleMessage("请创建配置文件或者添加有效配置文件"),
         "notSelectedTip": MessageLookupByLibrary.simpleMessage("当前代理组无法选中"),
-        "nullConnectionsDesc": MessageLookupByLibrary.simpleMessage("暂无连接"),
         "nullCoreInfoDesc": MessageLookupByLibrary.simpleMessage("无法获取内核信息"),
         "nullLogsDesc": MessageLookupByLibrary.simpleMessage("暂无日志"),
         "nullProfileDesc":
             MessageLookupByLibrary.simpleMessage("没有配置文件,请先添加配置文件"),
-        "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("暂无请求"),
         "other": MessageLookupByLibrary.simpleMessage("其他"),
         "outboundMode": MessageLookupByLibrary.simpleMessage("出站模式"),
         "override": MessageLookupByLibrary.simpleMessage("覆写"),
         "overrideDesc": MessageLookupByLibrary.simpleMessage("覆写代理相关配置"),
         "password": MessageLookupByLibrary.simpleMessage("密码"),
         "passwordTip": MessageLookupByLibrary.simpleMessage("密码不能为空"),
-        "paste": MessageLookupByLibrary.simpleMessage("粘贴"),
         "pleaseBindWebDAV": MessageLookupByLibrary.simpleMessage("请绑定WebDAV"),
         "pleaseUploadFile": MessageLookupByLibrary.simpleMessage("请上传文件"),
         "pleaseUploadValidQrcode":
@@ -185,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("恢复"),
@@ -193,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("设置"),
@@ -210,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("设置深色模式，调整色彩"),
@@ -228,14 +195,11 @@ 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("上传"),
         "url": MessageLookupByLibrary.simpleMessage("URL"),
         "urlDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
-        "view": MessageLookupByLibrary.simpleMessage("查看"),
         "webDAVConfiguration": MessageLookupByLibrary.simpleMessage("WebDAV配置"),
         "whitelistMode": MessageLookupByLibrary.simpleMessage("白名单模式"),
         "years": 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(
@@ -1670,311 +1660,11 @@ class AppLocalizations {
     );
   }
 
-  /// `Search`
+  /// `Ip check timeout`
-  String get search {
+  String get ipCheckTimeout {
     return Intl.message(
-      'Search',
+      'Ip check timeout',
-      name: 'search',
+      name: 'ipCheckTimeout',
-      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: [],
-    );
-  }
-
-  /// `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: [],
-    );
-  }
-
-  /// `Long term effective`
-  String get infiniteTime {
-    return Intl.message(
-      'Long term effective',
-      name: 'infiniteTime',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Expiration time`
-  String get expirationTime {
-    return Intl.message(
-      'Expiration time',
-      name: 'expirationTime',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Connections`
-  String get connections {
-    return Intl.message(
-      'Connections',
-      name: 'connections',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `View current connection`
-  String get connectionsDesc {
-    return Intl.message(
-      'View current connection',
-      name: 'connectionsDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `No requests`
-  String get nullRequestsDesc {
-    return Intl.message(
-      'No requests',
-      name: 'nullRequestsDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `No connections`
-  String get nullConnectionsDesc {
-    return Intl.message(
-      'No connections',
-      name: 'nullConnectionsDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Intranet IP`
-  String get intranetIP {
-    return Intl.message(
-      'Intranet IP',
-      name: 'intranetIP',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `View`
-  String get view {
-    return Intl.message(
-      'View',
-      name: 'view',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Cut`
-  String get cut {
-    return Intl.message(
-      'Cut',
-      name: 'cut',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Copy`
-  String get copy {
-    return Intl.message(
-      'Copy',
-      name: 'copy',
-      desc: '',
-      args: [],
-    );
-  }
-
-  /// `Paste`
-  String get paste {
-    return Intl.message(
-      'Paste',
-      name: 'paste',
       desc: '',
       args: [],
     );

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,
@@ -54,19 +55,12 @@ Future<void> vpnService() async {
       int.parse(fd),
     );
   }));
-
   await globalState.init(
     appState: appState,
     config: config,
     clashConfig: clashConfig,
   );
 
-  globalState.applyProfile(
-    appState: appState,
-    config: config,
-    clashConfig: clashConfig,
-  );
-
   final appLocalizations = await AppLocalizations.load(
     other.getLocaleForString(config.locale) ??
         WidgetsBinding.instance.platformDispatcher.locale,
@@ -75,7 +69,6 @@ Future<void> vpnService() async {
   handleStart() async {
     await app?.tip(appLocalizations.startVpn);
     await globalState.startSystemProxy(
-      appState: appState,
       config: config,
       clashConfig: clashConfig,
     );
@@ -87,18 +80,19 @@ Future<void> vpnService() async {
     ];
   }
 
-  handleStart();
+  if (appState.isInit) {
-
+    handleStart();
-  tile?.addListener(
+    tile?.addListener(
-    TileListenerWithVpn(
+      TileListenerWithVpn(
-      onStop: () async {
+        onStop: () async {
-        await app?.tip(appLocalizations.stopVpn);
+          await app?.tip(appLocalizations.stopVpn);
-        await globalState.stopSystemProxy();
+          await globalState.stopSystemProxy();
-        clashCore.shutdown();
+          clashCore.shutdown();
-        exit(0);
+          exit(0);
-      },
+        },
-    ),
+      ),
-  );
+    );
+  }
 }
 
 class ClashMessageListenerWithVpn with ClashMessageListener {

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';
@@ -22,7 +19,6 @@ class AppState with ChangeNotifier {
   bool _isInit;
   VersionInfo? _versionInfo;
   List<Traffic> _traffics;
-  Traffic _totalTraffic;
   List<Log> _logs;
   String _currentLabel;
   SystemColorSchemes _systemColorSchemes;
@@ -33,7 +29,6 @@ class AppState with ChangeNotifier {
   bool _isCompatible;
   List<Group> _groups;
   double _viewWidth;
-  List<Connection> _requests;
 
   AppState({
     required Mode mode,
@@ -47,9 +42,7 @@ class AppState with ChangeNotifier {
         _viewWidth = 0,
         _selectedMap = selectedMap,
         _sortNum = 0,
-        _requests = [],
         _mode = mode,
-        _totalTraffic = Traffic(),
         _delayMap = {},
         _groups = [],
         _isCompatible = isCompatible,
@@ -114,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})";
     }
   }
 
@@ -159,39 +152,8 @@ class AppState with ChangeNotifier {
     }
   }
 
-  addTraffic(Traffic traffic) {
+  addTraffic(Traffic value) {
-    _traffics = List.from(_traffics)..add(traffic);
+    _traffics = List.from(_traffics)..add(value);
-    const maxLength = 60;
-    if (_traffics.length > maxLength) {
-      _traffics = _traffics.sublist(_traffics.length - maxLength);
-    }
-    notifyListeners();
-  }
-
-  Traffic get totalTraffic => _totalTraffic;
-
-  set totalTraffic(Traffic value) {
-    if (_totalTraffic != value) {
-      _totalTraffic = value;
-      notifyListeners();
-    }
-  }
-
-  List<Connection> get requests => _requests;
-
-  set requests(List<Connection> value) {
-    if (_requests != value) {
-      _requests = value;
-      notifyListeners();
-    }
-  }
-
-  addRequest(Connection value) {
-    _requests = List.from(_requests)..add(value);
-    final maxLength = Platform.isAndroid ? 1000 : 60;
-    if (_requests.length > maxLength) {
-      _requests = _requests.sublist(_requests.length - maxLength);
-    }
     notifyListeners();
   }
 
@@ -205,10 +167,9 @@ class AppState with ChangeNotifier {
   }
 
   addLog(Log log) {
-    _logs = List.from(_logs)..add(log);
+    _logs.add(log);
-    final maxLength = Platform.isAndroid ? 1000 : 60;
+    if (_logs.length > 60) {
-    if (_logs.length > maxLength) {
+      _logs = _logs.sublist(_logs.length - 60);
-      _logs = _logs.sublist(_logs.length - maxLength);
     }
     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;
+  LogLevel _logLevel;
-  bool _unifiedDelay;
-  bool _tcpConcurrent;
   Tun _tun;
   Dns _dns;
   List<String> _rules;
 
-  ClashConfig()
+  ClashConfig({
-      : _mixedPort = 7890,
+    int? mixedPort,
-        _mode = Mode.rule,
+    Mode? mode,
-        _ipv6 = false,
+    bool? allowLan,
-        _findProcessMode = FindProcessMode.off,
+    LogLevel? logLevel,
-        _allowLan = false,
+    Tun? tun,
-        _tcpConcurrent = false,
+    Dns? dns,
-        _logLevel = LogLevel.info,
+    List<String>? rules,
-        _tun = const Tun(),
+  })  : _mixedPort = mixedPort ?? 7890,
-        _unifiedDelay = false,
+        _mode = mode ?? Mode.rule,
-        _geodataLoader = geodataLoaderMemconservative,
+        _allowLan = allowLan ?? false,
-        _externalController = '',
+        _logLevel = logLevel ?? LogLevel.info,
-        _dns = Dns(),
+        _tun = tun ?? const Tun(),
-        _rules = [];
+        _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

@@ -1,6 +1,5 @@
 import 'dart:io';
 
-import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
@@ -9,7 +8,6 @@ import '../common/common.dart';
 import 'models.dart';
 
 part 'generated/config.g.dart';
-
 part 'generated/config.freezed.dart';
 
 @freezed
@@ -25,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;
@@ -54,12 +41,7 @@ class Config extends ChangeNotifier {
   AccessControl _accessControl;
   bool _isAnimateToPage;
   bool _autoCheckUpdate;
-  bool _allowBypass;
-  bool _systemProxy;
   DAV? _dav;
-  ProxiesType _proxiesType;
-  ProxyCardType _proxyCardType;
-  int _proxiesColumns;
 
   Config()
       : _profiles = [],
@@ -74,13 +56,8 @@ class Config extends ChangeNotifier {
         _isMinimizeOnExit = true,
         _isAccessControl = false,
         _autoCheckUpdate = true,
-        _systemProxy = true,
         _accessControl = const AccessControl(),
-        _isAnimateToPage = true,
+        _isAnimateToPage = true;
-        _allowBypass = true,
-        _proxyCardType = ProxyCardType.expand,
-        _proxiesType = ProxiesType.tab,
-        _proxiesColumns = 2;
 
   deleteProfileById(String id) {
     _profiles = profiles.where((element) => element.id != id).toList();
@@ -150,35 +127,10 @@ class Config extends ChangeNotifier {
   }
 
   Profile? get currentProfile {
-    final index =
+    try {
-        profiles.indexWhere((profile) => profile.id == _currentProfileId);
+      return profiles.firstWhere((element) => element.id == _currentProfileId);
-    return index == -1 ? null : profiles[index];
+    } catch (_) {
-  }
+      return null;
-
-  String? get currentGroupName => currentProfile?.currentGroupName;
-
-  Set<String> get currentUnfoldSet => currentProfile?.unfoldSet ?? {};
-
-  updateCurrentUnfoldSet(Set<String> value) {
-    if (!const SetEquality<String>().equals(currentUnfoldSet, value)) {
-      _setProfile(
-        currentProfile!.copyWith(
-          unfoldSet: value,
-        ),
-      );
-      notifyListeners();
-    }
-  }
-
-  updateCurrentGroupName(String groupName) {
-    if (currentProfile != null &&
-        currentProfile!.currentGroupName != groupName) {
-      _setProfile(
-        currentProfile!.copyWith(
-          currentGroupName: groupName,
-        ),
-      );
-      notifyListeners();
     }
   }
 
@@ -187,16 +139,9 @@ class Config extends ChangeNotifier {
   }
 
   updateCurrentSelectedMap(String groupName, String proxyName) {
-    if (currentProfile != null &&
+    if (currentProfile?.selectedMap[groupName] != proxyName) {
-        currentProfile!.selectedMap[groupName] != proxyName) {
+      currentProfile?.selectedMap = Map.from(currentProfile?.selectedMap ?? {})
-      final SelectedMap selectedMap = Map.from(
+        ..[groupName] = proxyName;
-        currentProfile?.selectedMap ?? {},
-      )..[groupName] = proxyName;
-      _setProfile(
-        currentProfile!.copyWith(
-          selectedMap: selectedMap,
-        ),
-      );
       notifyListeners();
     }
   }
@@ -360,64 +305,8 @@ class Config extends ChangeNotifier {
     }
   }
 
-  @JsonKey(defaultValue: true)
+  update(
-  bool get allowBypass {
+      [Config? config, RecoveryOption recoveryOptions = RecoveryOption.all]) {
-    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();
-    }
-  }
-
-  @JsonKey(defaultValue: ProxiesType.tab)
-  ProxiesType get proxiesType => _proxiesType;
-
-  set proxiesType(ProxiesType value) {
-    if (_proxiesType != value) {
-      _proxiesType = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(defaultValue: ProxyCardType.expand)
-  ProxyCardType get proxyCardType => _proxyCardType;
-
-  set proxyCardType(ProxyCardType value) {
-    if (_proxyCardType != value) {
-      _proxyCardType = value;
-      notifyListeners();
-    }
-  }
-
-  @JsonKey(defaultValue: 2)
-  int get proxiesColumns => _proxiesColumns;
-
-  set proxiesColumns(int value) {
-    if (_proxiesColumns != value) {
-      _proxiesColumns = value;
-      notifyListeners();
-    }
-  }
-
-  update([
-    Config? config,
-    RecoveryOption recoveryOptions = RecoveryOption.all,
-  ]) {
     if (config != null) {
       _profiles = config._profiles;
       for (final profile in config._profiles) {
@@ -433,11 +322,9 @@ class Config extends ChangeNotifier {
       _autoLaunch = config._autoLaunch;
       _silentLaunch = config._silentLaunch;
       _autoRun = config._autoRun;
-      _proxiesType = config._proxiesType;
       _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;
 
@@ -23,7 +22,7 @@ class Metadata with _$Metadata {
 }
 
 @freezed
-class Connection with _$Connection {
+class Connection with _$Connection{
   const factory Connection({
     required String id,
     num? upload,
@@ -36,19 +35,3 @@ class Connection with _$Connection {
   factory Connection.fromJson(Map<String, Object?> json) =>
       _$ConnectionFromJson(json);
 }
-
-@freezed
-class ConnectionsAndKeywords with _$ConnectionsAndKeywords {
-  const factory ConnectionsAndKeywords({
-    @Default([]) List<Connection> connections,
-    @Default([]) List<String> keywords,
-  }) = _ConnectionsAndKeywords;
-
-  factory ConnectionsAndKeywords.fromJson(Map<String, Object?> json) =>
-      _$ConnectionsAndKeywordsFromJson(json);
-}
-
-
-extension ConnectionsAndKeywordsExt on ConnectionsAndKeywords{
-  List<Connection> get filteredConnections => connections.where((connection)=> Set.from(connection.chains).containsAll(keywords)).toList();
-}

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 int uid,
-    required Metadata metadata,
+    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,
-    required 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()
+ClashConfig _$ClashConfigFromJson(Map<String, dynamic> json) => ClashConfig(
-  ..mixedPort = (json['mixed-port'] as num?)?.toInt() ?? 7890
+      mixedPort: (json['mixed-port'] as num?)?.toInt(),
-  ..mode = $enumDecodeNullable(_$ModeEnumMap, json['mode']) ?? Mode.rule
+      mode: $enumDecodeNullable(_$ModeEnumMap, json['mode']),
-  ..findProcessMode = $enumDecodeNullable(
+      allowLan: json['allow-lan'] as bool?,
-          _$FindProcessModeEnumMap, json['find-process-mode']) ??
+      logLevel: $enumDecodeNullable(_$LogLevelEnumMap, json['log-level']),
-      FindProcessMode.off
+      tun: json['tun'] == null
-  ..allowLan = json['allow-lan'] as bool
+          ? null
-  ..logLevel =
+          : Tun.fromJson(json['tun'] as Map<String, dynamic>),
-      $enumDecodeNullable(_$LogLevelEnumMap, json['log-level']) ?? LogLevel.info
+      dns: json['dns'] == null
-  ..externalController = json['external-controller'] as String? ?? ''
+          ? null
-  ..ipv6 = json['ipv6'] as bool? ?? false
+          : Dns.fromJson(json['dns'] as Map<String, dynamic>),
-  ..geodataLoader = json['geodata-loader'] as String? ?? 'memconservative'
+      rules:
-  ..unifiedDelay = json['unified-delay'] as bool? ?? false
+          (json['rules'] as List<dynamic>?)?.map((e) => e as String).toList(),
-  ..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();
 
 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,16 +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
+  ..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true;
-  ..allowBypass = json['allowBypass'] as bool? ?? true
-  ..systemProxy = json['systemProxy'] as bool? ?? true
-  ..proxiesType =
-      $enumDecodeNullable(_$ProxiesTypeEnumMap, json['proxiesType']) ??
-          ProxiesType.tab
-  ..proxyCardType =
-      $enumDecodeNullable(_$ProxyCardTypeEnumMap, json['proxyCardType']) ??
-          ProxyCardType.expand
-  ..proxiesColumns = (json['proxiesColumns'] as num?)?.toInt() ?? 2;
 
 Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
       'profiles': instance.profiles,
@@ -61,11 +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,
-      'proxiesType': _$ProxiesTypeEnumMap[instance.proxiesType]!,
-      'proxyCardType': _$ProxyCardTypeEnumMap[instance.proxyCardType]!,
-      'proxiesColumns': instance.proxiesColumns,
     };
 
 const _$ThemeModeEnumMap = {
@@ -80,16 +66,6 @@ const _$ProxiesSortTypeEnumMap = {
   ProxiesSortType.name: 'name',
 };
 
-const _$ProxiesTypeEnumMap = {
-  ProxiesType.tab: 'tab',
-  ProxiesType.expansion: 'expansion',
-};
-
-const _$ProxyCardTypeEnumMap = {
-  ProxyCardType.expand: 'expand',
-  ProxyCardType.shrink: 'shrink',
-};
-
 _$AccessControlImpl _$$AccessControlImplFromJson(Map<String, dynamic> json) =>
     _$AccessControlImpl(
       mode: $enumDecodeNullable(_$AccessControlModeEnumMap, json['mode']) ??
@@ -117,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(
+  int get hashCode => Object.hash(runtimeType, uid, network, sourceIP,
-      runtimeType,
+      sourcePort, destinationIP, destinationPort, host, remoteDestination);
-      uid,
-      network,
-      sourceIP,
-      sourcePort,
-      destinationIP,
-      destinationPort,
-      host,
-      process,
-      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)
@@ -589,184 +560,3 @@ abstract class _Connection implements Connection {
   _$$ConnectionImplCopyWith<_$ConnectionImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
-
-ConnectionsAndKeywords _$ConnectionsAndKeywordsFromJson(
-    Map<String, dynamic> json) {
-  return _ConnectionsAndKeywords.fromJson(json);
-}
-
-/// @nodoc
-mixin _$ConnectionsAndKeywords {
-  List<Connection> get connections => throw _privateConstructorUsedError;
-  List<String> get keywords => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $ConnectionsAndKeywordsCopyWith<ConnectionsAndKeywords> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $ConnectionsAndKeywordsCopyWith<$Res> {
-  factory $ConnectionsAndKeywordsCopyWith(ConnectionsAndKeywords value,
-          $Res Function(ConnectionsAndKeywords) then) =
-      _$ConnectionsAndKeywordsCopyWithImpl<$Res, ConnectionsAndKeywords>;
-  @useResult
-  $Res call({List<Connection> connections, List<String> keywords});
-}
-
-/// @nodoc
-class _$ConnectionsAndKeywordsCopyWithImpl<$Res,
-        $Val extends ConnectionsAndKeywords>
-    implements $ConnectionsAndKeywordsCopyWith<$Res> {
-  _$ConnectionsAndKeywordsCopyWithImpl(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? connections = null,
-    Object? keywords = null,
-  }) {
-    return _then(_value.copyWith(
-      connections: null == connections
-          ? _value.connections
-          : connections // ignore: cast_nullable_to_non_nullable
-              as List<Connection>,
-      keywords: null == keywords
-          ? _value.keywords
-          : keywords // ignore: cast_nullable_to_non_nullable
-              as List<String>,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$ConnectionsAndKeywordsImplCopyWith<$Res>
-    implements $ConnectionsAndKeywordsCopyWith<$Res> {
-  factory _$$ConnectionsAndKeywordsImplCopyWith(
-          _$ConnectionsAndKeywordsImpl value,
-          $Res Function(_$ConnectionsAndKeywordsImpl) then) =
-      __$$ConnectionsAndKeywordsImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call({List<Connection> connections, List<String> keywords});
-}
-
-/// @nodoc
-class __$$ConnectionsAndKeywordsImplCopyWithImpl<$Res>
-    extends _$ConnectionsAndKeywordsCopyWithImpl<$Res,
-        _$ConnectionsAndKeywordsImpl>
-    implements _$$ConnectionsAndKeywordsImplCopyWith<$Res> {
-  __$$ConnectionsAndKeywordsImplCopyWithImpl(
-      _$ConnectionsAndKeywordsImpl _value,
-      $Res Function(_$ConnectionsAndKeywordsImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? connections = null,
-    Object? keywords = null,
-  }) {
-    return _then(_$ConnectionsAndKeywordsImpl(
-      connections: null == connections
-          ? _value._connections
-          : connections // ignore: cast_nullable_to_non_nullable
-              as List<Connection>,
-      keywords: null == keywords
-          ? _value._keywords
-          : keywords // ignore: cast_nullable_to_non_nullable
-              as List<String>,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$ConnectionsAndKeywordsImpl implements _ConnectionsAndKeywords {
-  const _$ConnectionsAndKeywordsImpl(
-      {final List<Connection> connections = const [],
-      final List<String> keywords = const []})
-      : _connections = connections,
-        _keywords = keywords;
-
-  factory _$ConnectionsAndKeywordsImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ConnectionsAndKeywordsImplFromJson(json);
-
-  final List<Connection> _connections;
-  @override
-  @JsonKey()
-  List<Connection> get connections {
-    if (_connections is EqualUnmodifiableListView) return _connections;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_connections);
-  }
-
-  final List<String> _keywords;
-  @override
-  @JsonKey()
-  List<String> get keywords {
-    if (_keywords is EqualUnmodifiableListView) return _keywords;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_keywords);
-  }
-
-  @override
-  String toString() {
-    return 'ConnectionsAndKeywords(connections: $connections, keywords: $keywords)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$ConnectionsAndKeywordsImpl &&
-            const DeepCollectionEquality()
-                .equals(other._connections, _connections) &&
-            const DeepCollectionEquality().equals(other._keywords, _keywords));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      const DeepCollectionEquality().hash(_connections),
-      const DeepCollectionEquality().hash(_keywords));
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$ConnectionsAndKeywordsImplCopyWith<_$ConnectionsAndKeywordsImpl>
-      get copyWith => __$$ConnectionsAndKeywordsImplCopyWithImpl<
-          _$ConnectionsAndKeywordsImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ConnectionsAndKeywordsImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _ConnectionsAndKeywords implements ConnectionsAndKeywords {
-  const factory _ConnectionsAndKeywords(
-      {final List<Connection> connections,
-      final List<String> keywords}) = _$ConnectionsAndKeywordsImpl;
-
-  factory _ConnectionsAndKeywords.fromJson(Map<String, dynamic> json) =
-      _$ConnectionsAndKeywordsImpl.fromJson;
-
-  @override
-  List<Connection> get connections;
-  @override
-  List<String> get keywords;
-  @override
-  @JsonKey(ignore: true)
-  _$$ConnectionsAndKeywordsImplCopyWith<_$ConnectionsAndKeywordsImpl>
-      get copyWith => throw _privateConstructorUsedError;
-}

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,
     };
 
@@ -52,23 +50,3 @@ Map<String, dynamic> _$$ConnectionImplToJson(_$ConnectionImpl instance) =>
       'metadata': instance.metadata,
       'chains': instance.chains,
     };
-
-_$ConnectionsAndKeywordsImpl _$$ConnectionsAndKeywordsImplFromJson(
-        Map<String, dynamic> json) =>
-    _$ConnectionsAndKeywordsImpl(
-      connections: (json['connections'] as List<dynamic>?)
-              ?.map((e) => Connection.fromJson(e as Map<String, dynamic>))
-              .toList() ??
-          const [],
-      keywords: (json['keywords'] as List<dynamic>?)
-              ?.map((e) => e as String)
-              .toList() ??
-          const [],
-    );
-
-Map<String, dynamic> _$$ConnectionsAndKeywordsImplToJson(
-        _$ConnectionsAndKeywordsImpl instance) =>
-    <String, dynamic>{
-      'connections': instance.connections,
-      'keywords': instance.keywords,
-    };

lib/models/generated/ffi.freezed.dart

@@ -848,8 +848,10 @@ Process _$ProcessFromJson(Map<String, dynamic> json) {
 
 /// @nodoc
 mixin _$Process {
-  int get id => throw _privateConstructorUsedError;
+  int get uid => throw _privateConstructorUsedError;
-  Metadata get metadata => 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});
+  $Res call({int uid, String network, String source, String target});
-
-  $MetadataCopyWith<$Res> get metadata;
 }
 
 /// @nodoc
@@ -879,28 +879,30 @@ class _$ProcessCopyWithImpl<$Res, $Val extends Process>
   @pragma('vm:prefer-inline')
   @override
   $Res call({
-    Object? id = null,
+    Object? uid = null,
-    Object? metadata = null,
+    Object? network = null,
+    Object? source = null,
+    Object? target = null,
   }) {
     return _then(_value.copyWith(
-      id: null == id
+      uid: null == uid
-          ? _value.id
+          ? _value.uid
-          : id // ignore: cast_nullable_to_non_nullable
+          : uid // ignore: cast_nullable_to_non_nullable
               as int,
-      metadata: null == metadata
+      network: null == network
-          ? _value.metadata
+          ? _value.network
-          : metadata // ignore: cast_nullable_to_non_nullable
+          : network // ignore: cast_nullable_to_non_nullable
-              as Metadata,
+              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});
+  $Res call({int uid, String network, String source, String target});
-
-  @override
-  $MetadataCopyWith<$Res> get metadata;
 }
 
 /// @nodoc
@@ -927,18 +926,28 @@ class __$$ProcessImplCopyWithImpl<$Res>
   @pragma('vm:prefer-inline')
   @override
   $Res call({
-    Object? id = null,
+    Object? uid = null,
-    Object? metadata = null,
+    Object? network = null,
+    Object? source = null,
+    Object? target = null,
   }) {
     return _then(_$ProcessImpl(
-      id: null == id
+      uid: null == uid
-          ? _value.id
+          ? _value.uid
-          : id // ignore: cast_nullable_to_non_nullable
+          : uid // ignore: cast_nullable_to_non_nullable
               as int,
-      metadata: null == metadata
+      network: null == network
-          ? _value.metadata
+          ? _value.network
-          : metadata // ignore: cast_nullable_to_non_nullable
+          : network // ignore: cast_nullable_to_non_nullable
-              as Metadata,
+              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.uid, uid) || other.uid == uid) &&
-            (identical(other.metadata, metadata) ||
+            (identical(other.network, network) || other.network == network) &&
-                other.metadata == metadata));
+            (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,176 +1009,27 @@ class _$ProcessImpl implements _Process {
 
 abstract class _Process implements Process {
   const factory _Process(
-      {required final int id,
+      {required final int uid,
-      required final Metadata metadata}) = _$ProcessImpl;
+      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 = null,
-  }) {
-    return _then(_value.copyWith(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as int,
-      value: null == 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 = null,
-  }) {
-    return _then(_$ProcessMapItemImpl(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as int,
-      value: null == value
-          ? _value.value
-          : value // ignore: cast_nullable_to_non_nullable
-              as String,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$ProcessMapItemImpl implements _ProcessMapItem {
-  const _$ProcessMapItemImpl({required this.id, required 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,
-      required 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,8 +56,6 @@ const _$MessageTypeEnumMap = {
   MessageType.delay: 'delay',
   MessageType.process: 'process',
   MessageType.now: 'now',
-  MessageType.request: 'request',
-  MessageType.run: 'run',
 };
 
 _$DelayImpl _$$DelayImplFromJson(Map<String, dynamic> json) => _$DelayImpl(
@@ -83,27 +81,18 @@ Map<String, dynamic> _$$NowImplToJson(_$NowImpl instance) => <String, dynamic>{
 
 _$ProcessImpl _$$ProcessImplFromJson(Map<String, dynamic> json) =>
     _$ProcessImpl(
-      id: (json['id'] as num).toInt(),
+      uid: (json['uid'] as num).toInt(),
-      metadata: Metadata.fromJson(json['metadata'] as Map<String, dynamic>),
+      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,
+      'uid': instance.uid,
-      'metadata': instance.metadata,
+      'network': instance.network,
-    };
+      'source': instance.source,
-
+      'target': instance.target,
-_$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,
     };
 
 _$ExternalProviderImpl _$$ExternalProviderImplFromJson(

lib/models/generated/log.freezed.dart

@@ -1,189 +0,0 @@
-// coverage:ignore-file
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
-
-part of '../log.dart';
-
-// **************************************************************************
-// FreezedGenerator
-// **************************************************************************
-
-T _$identity<T>(T value) => value;
-
-final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
-
-LogsAndKeywords _$LogsAndKeywordsFromJson(Map<String, dynamic> json) {
-  return _LogsAndKeywords.fromJson(json);
-}
-
-/// @nodoc
-mixin _$LogsAndKeywords {
-  List<Log> get logs => throw _privateConstructorUsedError;
-  List<String> get keywords => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $LogsAndKeywordsCopyWith<LogsAndKeywords> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $LogsAndKeywordsCopyWith<$Res> {
-  factory $LogsAndKeywordsCopyWith(
-          LogsAndKeywords value, $Res Function(LogsAndKeywords) then) =
-      _$LogsAndKeywordsCopyWithImpl<$Res, LogsAndKeywords>;
-  @useResult
-  $Res call({List<Log> logs, List<String> keywords});
-}
-
-/// @nodoc
-class _$LogsAndKeywordsCopyWithImpl<$Res, $Val extends LogsAndKeywords>
-    implements $LogsAndKeywordsCopyWith<$Res> {
-  _$LogsAndKeywordsCopyWithImpl(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? logs = null,
-    Object? keywords = null,
-  }) {
-    return _then(_value.copyWith(
-      logs: null == logs
-          ? _value.logs
-          : logs // ignore: cast_nullable_to_non_nullable
-              as List<Log>,
-      keywords: null == keywords
-          ? _value.keywords
-          : keywords // ignore: cast_nullable_to_non_nullable
-              as List<String>,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$LogsAndKeywordsImplCopyWith<$Res>
-    implements $LogsAndKeywordsCopyWith<$Res> {
-  factory _$$LogsAndKeywordsImplCopyWith(_$LogsAndKeywordsImpl value,
-          $Res Function(_$LogsAndKeywordsImpl) then) =
-      __$$LogsAndKeywordsImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call({List<Log> logs, List<String> keywords});
-}
-
-/// @nodoc
-class __$$LogsAndKeywordsImplCopyWithImpl<$Res>
-    extends _$LogsAndKeywordsCopyWithImpl<$Res, _$LogsAndKeywordsImpl>
-    implements _$$LogsAndKeywordsImplCopyWith<$Res> {
-  __$$LogsAndKeywordsImplCopyWithImpl(
-      _$LogsAndKeywordsImpl _value, $Res Function(_$LogsAndKeywordsImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? logs = null,
-    Object? keywords = null,
-  }) {
-    return _then(_$LogsAndKeywordsImpl(
-      logs: null == logs
-          ? _value._logs
-          : logs // ignore: cast_nullable_to_non_nullable
-              as List<Log>,
-      keywords: null == keywords
-          ? _value._keywords
-          : keywords // ignore: cast_nullable_to_non_nullable
-              as List<String>,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$LogsAndKeywordsImpl implements _LogsAndKeywords {
-  const _$LogsAndKeywordsImpl(
-      {final List<Log> logs = const [], final List<String> keywords = const []})
-      : _logs = logs,
-        _keywords = keywords;
-
-  factory _$LogsAndKeywordsImpl.fromJson(Map<String, dynamic> json) =>
-      _$$LogsAndKeywordsImplFromJson(json);
-
-  final List<Log> _logs;
-  @override
-  @JsonKey()
-  List<Log> get logs {
-    if (_logs is EqualUnmodifiableListView) return _logs;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_logs);
-  }
-
-  final List<String> _keywords;
-  @override
-  @JsonKey()
-  List<String> get keywords {
-    if (_keywords is EqualUnmodifiableListView) return _keywords;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_keywords);
-  }
-
-  @override
-  String toString() {
-    return 'LogsAndKeywords(logs: $logs, keywords: $keywords)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$LogsAndKeywordsImpl &&
-            const DeepCollectionEquality().equals(other._logs, _logs) &&
-            const DeepCollectionEquality().equals(other._keywords, _keywords));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      const DeepCollectionEquality().hash(_logs),
-      const DeepCollectionEquality().hash(_keywords));
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$LogsAndKeywordsImplCopyWith<_$LogsAndKeywordsImpl> get copyWith =>
-      __$$LogsAndKeywordsImplCopyWithImpl<_$LogsAndKeywordsImpl>(
-          this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$LogsAndKeywordsImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _LogsAndKeywords implements LogsAndKeywords {
-  const factory _LogsAndKeywords(
-      {final List<Log> logs,
-      final List<String> keywords}) = _$LogsAndKeywordsImpl;
-
-  factory _LogsAndKeywords.fromJson(Map<String, dynamic> json) =
-      _$LogsAndKeywordsImpl.fromJson;
-
-  @override
-  List<Log> get logs;
-  @override
-  List<String> get keywords;
-  @override
-  @JsonKey(ignore: true)
-  _$$LogsAndKeywordsImplCopyWith<_$LogsAndKeywordsImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}

lib/models/generated/log.g.dart

@@ -23,23 +23,3 @@ const _$LogLevelEnumMap = {
   LogLevel.error: 'error',
   LogLevel.silent: 'silent',
 };
-
-_$LogsAndKeywordsImpl _$$LogsAndKeywordsImplFromJson(
-        Map<String, dynamic> json) =>
-    _$LogsAndKeywordsImpl(
-      logs: (json['logs'] as List<dynamic>?)
-              ?.map((e) => Log.fromJson(e as Map<String, dynamic>))
-              .toList() ??
-          const [],
-      keywords: (json['keywords'] as List<dynamic>?)
-              ?.map((e) => e as String)
-              .toList() ??
-          const [],
-    );
-
-Map<String, dynamic> _$$LogsAndKeywordsImplToJson(
-        _$LogsAndKeywordsImpl instance) =>
-    <String, dynamic>{
-      'logs': instance.logs,
-      'keywords': instance.keywords,
-    };

lib/models/generated/profile.freezed.dart

@@ -1,576 +0,0 @@
-// coverage:ignore-file
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
-
-part of '../profile.dart';
-
-// **************************************************************************
-// FreezedGenerator
-// **************************************************************************
-
-T _$identity<T>(T value) => value;
-
-final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
-
-UserInfo _$UserInfoFromJson(Map<String, dynamic> json) {
-  return _UserInfo.fromJson(json);
-}
-
-/// @nodoc
-mixin _$UserInfo {
-  int get upload => throw _privateConstructorUsedError;
-  int get download => throw _privateConstructorUsedError;
-  int get total => throw _privateConstructorUsedError;
-  int get expire => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $UserInfoCopyWith<UserInfo> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $UserInfoCopyWith<$Res> {
-  factory $UserInfoCopyWith(UserInfo value, $Res Function(UserInfo) then) =
-      _$UserInfoCopyWithImpl<$Res, UserInfo>;
-  @useResult
-  $Res call({int upload, int download, int total, int expire});
-}
-
-/// @nodoc
-class _$UserInfoCopyWithImpl<$Res, $Val extends UserInfo>
-    implements $UserInfoCopyWith<$Res> {
-  _$UserInfoCopyWithImpl(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? upload = null,
-    Object? download = null,
-    Object? total = null,
-    Object? expire = null,
-  }) {
-    return _then(_value.copyWith(
-      upload: null == upload
-          ? _value.upload
-          : upload // ignore: cast_nullable_to_non_nullable
-              as int,
-      download: null == download
-          ? _value.download
-          : download // ignore: cast_nullable_to_non_nullable
-              as int,
-      total: null == total
-          ? _value.total
-          : total // ignore: cast_nullable_to_non_nullable
-              as int,
-      expire: null == expire
-          ? _value.expire
-          : expire // ignore: cast_nullable_to_non_nullable
-              as int,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$UserInfoImplCopyWith<$Res>
-    implements $UserInfoCopyWith<$Res> {
-  factory _$$UserInfoImplCopyWith(
-          _$UserInfoImpl value, $Res Function(_$UserInfoImpl) then) =
-      __$$UserInfoImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call({int upload, int download, int total, int expire});
-}
-
-/// @nodoc
-class __$$UserInfoImplCopyWithImpl<$Res>
-    extends _$UserInfoCopyWithImpl<$Res, _$UserInfoImpl>
-    implements _$$UserInfoImplCopyWith<$Res> {
-  __$$UserInfoImplCopyWithImpl(
-      _$UserInfoImpl _value, $Res Function(_$UserInfoImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? upload = null,
-    Object? download = null,
-    Object? total = null,
-    Object? expire = null,
-  }) {
-    return _then(_$UserInfoImpl(
-      upload: null == upload
-          ? _value.upload
-          : upload // ignore: cast_nullable_to_non_nullable
-              as int,
-      download: null == download
-          ? _value.download
-          : download // ignore: cast_nullable_to_non_nullable
-              as int,
-      total: null == total
-          ? _value.total
-          : total // ignore: cast_nullable_to_non_nullable
-              as int,
-      expire: null == expire
-          ? _value.expire
-          : expire // ignore: cast_nullable_to_non_nullable
-              as int,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$UserInfoImpl implements _UserInfo {
-  const _$UserInfoImpl(
-      {this.upload = 0, this.download = 0, this.total = 0, this.expire = 0});
-
-  factory _$UserInfoImpl.fromJson(Map<String, dynamic> json) =>
-      _$$UserInfoImplFromJson(json);
-
-  @override
-  @JsonKey()
-  final int upload;
-  @override
-  @JsonKey()
-  final int download;
-  @override
-  @JsonKey()
-  final int total;
-  @override
-  @JsonKey()
-  final int expire;
-
-  @override
-  String toString() {
-    return 'UserInfo(upload: $upload, download: $download, total: $total, expire: $expire)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$UserInfoImpl &&
-            (identical(other.upload, upload) || other.upload == upload) &&
-            (identical(other.download, download) ||
-                other.download == download) &&
-            (identical(other.total, total) || other.total == total) &&
-            (identical(other.expire, expire) || other.expire == expire));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(runtimeType, upload, download, total, expire);
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$UserInfoImplCopyWith<_$UserInfoImpl> get copyWith =>
-      __$$UserInfoImplCopyWithImpl<_$UserInfoImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$UserInfoImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _UserInfo implements UserInfo {
-  const factory _UserInfo(
-      {final int upload,
-      final int download,
-      final int total,
-      final int expire}) = _$UserInfoImpl;
-
-  factory _UserInfo.fromJson(Map<String, dynamic> json) =
-      _$UserInfoImpl.fromJson;
-
-  @override
-  int get upload;
-  @override
-  int get download;
-  @override
-  int get total;
-  @override
-  int get expire;
-  @override
-  @JsonKey(ignore: true)
-  _$$UserInfoImplCopyWith<_$UserInfoImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-Profile _$ProfileFromJson(Map<String, dynamic> json) {
-  return _Profile.fromJson(json);
-}
-
-/// @nodoc
-mixin _$Profile {
-  String get id => throw _privateConstructorUsedError;
-  String? get label => throw _privateConstructorUsedError;
-  String? get currentGroupName => throw _privateConstructorUsedError;
-  String get url => throw _privateConstructorUsedError;
-  DateTime? get lastUpdateDate => throw _privateConstructorUsedError;
-  Duration get autoUpdateDuration => throw _privateConstructorUsedError;
-  UserInfo? get userInfo => throw _privateConstructorUsedError;
-  bool get autoUpdate => throw _privateConstructorUsedError;
-  Map<String, String> get selectedMap => throw _privateConstructorUsedError;
-  Set<String> get unfoldSet => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $ProfileCopyWith<Profile> get copyWith => throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $ProfileCopyWith<$Res> {
-  factory $ProfileCopyWith(Profile value, $Res Function(Profile) then) =
-      _$ProfileCopyWithImpl<$Res, Profile>;
-  @useResult
-  $Res call(
-      {String id,
-      String? label,
-      String? currentGroupName,
-      String url,
-      DateTime? lastUpdateDate,
-      Duration autoUpdateDuration,
-      UserInfo? userInfo,
-      bool autoUpdate,
-      Map<String, String> selectedMap,
-      Set<String> unfoldSet});
-
-  $UserInfoCopyWith<$Res>? get userInfo;
-}
-
-/// @nodoc
-class _$ProfileCopyWithImpl<$Res, $Val extends Profile>
-    implements $ProfileCopyWith<$Res> {
-  _$ProfileCopyWithImpl(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? label = freezed,
-    Object? currentGroupName = freezed,
-    Object? url = null,
-    Object? lastUpdateDate = freezed,
-    Object? autoUpdateDuration = null,
-    Object? userInfo = freezed,
-    Object? autoUpdate = null,
-    Object? selectedMap = null,
-    Object? unfoldSet = null,
-  }) {
-    return _then(_value.copyWith(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as String,
-      label: freezed == label
-          ? _value.label
-          : label // ignore: cast_nullable_to_non_nullable
-              as String?,
-      currentGroupName: freezed == currentGroupName
-          ? _value.currentGroupName
-          : currentGroupName // ignore: cast_nullable_to_non_nullable
-              as String?,
-      url: null == url
-          ? _value.url
-          : url // ignore: cast_nullable_to_non_nullable
-              as String,
-      lastUpdateDate: freezed == lastUpdateDate
-          ? _value.lastUpdateDate
-          : lastUpdateDate // ignore: cast_nullable_to_non_nullable
-              as DateTime?,
-      autoUpdateDuration: null == autoUpdateDuration
-          ? _value.autoUpdateDuration
-          : autoUpdateDuration // ignore: cast_nullable_to_non_nullable
-              as Duration,
-      userInfo: freezed == userInfo
-          ? _value.userInfo
-          : userInfo // ignore: cast_nullable_to_non_nullable
-              as UserInfo?,
-      autoUpdate: null == autoUpdate
-          ? _value.autoUpdate
-          : autoUpdate // ignore: cast_nullable_to_non_nullable
-              as bool,
-      selectedMap: null == selectedMap
-          ? _value.selectedMap
-          : selectedMap // ignore: cast_nullable_to_non_nullable
-              as Map<String, String>,
-      unfoldSet: null == unfoldSet
-          ? _value.unfoldSet
-          : unfoldSet // ignore: cast_nullable_to_non_nullable
-              as Set<String>,
-    ) as $Val);
-  }
-
-  @override
-  @pragma('vm:prefer-inline')
-  $UserInfoCopyWith<$Res>? get userInfo {
-    if (_value.userInfo == null) {
-      return null;
-    }
-
-    return $UserInfoCopyWith<$Res>(_value.userInfo!, (value) {
-      return _then(_value.copyWith(userInfo: value) as $Val);
-    });
-  }
-}
-
-/// @nodoc
-abstract class _$$ProfileImplCopyWith<$Res> implements $ProfileCopyWith<$Res> {
-  factory _$$ProfileImplCopyWith(
-          _$ProfileImpl value, $Res Function(_$ProfileImpl) then) =
-      __$$ProfileImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call(
-      {String id,
-      String? label,
-      String? currentGroupName,
-      String url,
-      DateTime? lastUpdateDate,
-      Duration autoUpdateDuration,
-      UserInfo? userInfo,
-      bool autoUpdate,
-      Map<String, String> selectedMap,
-      Set<String> unfoldSet});
-
-  @override
-  $UserInfoCopyWith<$Res>? get userInfo;
-}
-
-/// @nodoc
-class __$$ProfileImplCopyWithImpl<$Res>
-    extends _$ProfileCopyWithImpl<$Res, _$ProfileImpl>
-    implements _$$ProfileImplCopyWith<$Res> {
-  __$$ProfileImplCopyWithImpl(
-      _$ProfileImpl _value, $Res Function(_$ProfileImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? id = null,
-    Object? label = freezed,
-    Object? currentGroupName = freezed,
-    Object? url = null,
-    Object? lastUpdateDate = freezed,
-    Object? autoUpdateDuration = null,
-    Object? userInfo = freezed,
-    Object? autoUpdate = null,
-    Object? selectedMap = null,
-    Object? unfoldSet = null,
-  }) {
-    return _then(_$ProfileImpl(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as String,
-      label: freezed == label
-          ? _value.label
-          : label // ignore: cast_nullable_to_non_nullable
-              as String?,
-      currentGroupName: freezed == currentGroupName
-          ? _value.currentGroupName
-          : currentGroupName // ignore: cast_nullable_to_non_nullable
-              as String?,
-      url: null == url
-          ? _value.url
-          : url // ignore: cast_nullable_to_non_nullable
-              as String,
-      lastUpdateDate: freezed == lastUpdateDate
-          ? _value.lastUpdateDate
-          : lastUpdateDate // ignore: cast_nullable_to_non_nullable
-              as DateTime?,
-      autoUpdateDuration: null == autoUpdateDuration
-          ? _value.autoUpdateDuration
-          : autoUpdateDuration // ignore: cast_nullable_to_non_nullable
-              as Duration,
-      userInfo: freezed == userInfo
-          ? _value.userInfo
-          : userInfo // ignore: cast_nullable_to_non_nullable
-              as UserInfo?,
-      autoUpdate: null == autoUpdate
-          ? _value.autoUpdate
-          : autoUpdate // ignore: cast_nullable_to_non_nullable
-              as bool,
-      selectedMap: null == selectedMap
-          ? _value._selectedMap
-          : selectedMap // ignore: cast_nullable_to_non_nullable
-              as Map<String, String>,
-      unfoldSet: null == unfoldSet
-          ? _value._unfoldSet
-          : unfoldSet // ignore: cast_nullable_to_non_nullable
-              as Set<String>,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$ProfileImpl implements _Profile {
-  const _$ProfileImpl(
-      {required this.id,
-      this.label,
-      this.currentGroupName,
-      this.url = "",
-      this.lastUpdateDate,
-      required this.autoUpdateDuration,
-      this.userInfo,
-      this.autoUpdate = true,
-      final Map<String, String> selectedMap = const {},
-      final Set<String> unfoldSet = const {}})
-      : _selectedMap = selectedMap,
-        _unfoldSet = unfoldSet;
-
-  factory _$ProfileImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ProfileImplFromJson(json);
-
-  @override
-  final String id;
-  @override
-  final String? label;
-  @override
-  final String? currentGroupName;
-  @override
-  @JsonKey()
-  final String url;
-  @override
-  final DateTime? lastUpdateDate;
-  @override
-  final Duration autoUpdateDuration;
-  @override
-  final UserInfo? userInfo;
-  @override
-  @JsonKey()
-  final bool autoUpdate;
-  final Map<String, String> _selectedMap;
-  @override
-  @JsonKey()
-  Map<String, String> get selectedMap {
-    if (_selectedMap is EqualUnmodifiableMapView) return _selectedMap;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableMapView(_selectedMap);
-  }
-
-  final Set<String> _unfoldSet;
-  @override
-  @JsonKey()
-  Set<String> get unfoldSet {
-    if (_unfoldSet is EqualUnmodifiableSetView) return _unfoldSet;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableSetView(_unfoldSet);
-  }
-
-  @override
-  String toString() {
-    return 'Profile(id: $id, label: $label, currentGroupName: $currentGroupName, url: $url, lastUpdateDate: $lastUpdateDate, autoUpdateDuration: $autoUpdateDuration, userInfo: $userInfo, autoUpdate: $autoUpdate, selectedMap: $selectedMap, unfoldSet: $unfoldSet)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$ProfileImpl &&
-            (identical(other.id, id) || other.id == id) &&
-            (identical(other.label, label) || other.label == label) &&
-            (identical(other.currentGroupName, currentGroupName) ||
-                other.currentGroupName == currentGroupName) &&
-            (identical(other.url, url) || other.url == url) &&
-            (identical(other.lastUpdateDate, lastUpdateDate) ||
-                other.lastUpdateDate == lastUpdateDate) &&
-            (identical(other.autoUpdateDuration, autoUpdateDuration) ||
-                other.autoUpdateDuration == autoUpdateDuration) &&
-            (identical(other.userInfo, userInfo) ||
-                other.userInfo == userInfo) &&
-            (identical(other.autoUpdate, autoUpdate) ||
-                other.autoUpdate == autoUpdate) &&
-            const DeepCollectionEquality()
-                .equals(other._selectedMap, _selectedMap) &&
-            const DeepCollectionEquality()
-                .equals(other._unfoldSet, _unfoldSet));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      id,
-      label,
-      currentGroupName,
-      url,
-      lastUpdateDate,
-      autoUpdateDuration,
-      userInfo,
-      autoUpdate,
-      const DeepCollectionEquality().hash(_selectedMap),
-      const DeepCollectionEquality().hash(_unfoldSet));
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$ProfileImplCopyWith<_$ProfileImpl> get copyWith =>
-      __$$ProfileImplCopyWithImpl<_$ProfileImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ProfileImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _Profile implements Profile {
-  const factory _Profile(
-      {required final String id,
-      final String? label,
-      final String? currentGroupName,
-      final String url,
-      final DateTime? lastUpdateDate,
-      required final Duration autoUpdateDuration,
-      final UserInfo? userInfo,
-      final bool autoUpdate,
-      final Map<String, String> selectedMap,
-      final Set<String> unfoldSet}) = _$ProfileImpl;
-
-  factory _Profile.fromJson(Map<String, dynamic> json) = _$ProfileImpl.fromJson;
-
-  @override
-  String get id;
-  @override
-  String? get label;
-  @override
-  String? get currentGroupName;
-  @override
-  String get url;
-  @override
-  DateTime? get lastUpdateDate;
-  @override
-  Duration get autoUpdateDuration;
-  @override
-  UserInfo? get userInfo;
-  @override
-  bool get autoUpdate;
-  @override
-  Map<String, String> get selectedMap;
-  @override
-  Set<String> get unfoldSet;
-  @override
-  @JsonKey(ignore: true)
-  _$$ProfileImplCopyWith<_$ProfileImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}

lib/models/generated/profile.g.dart

@@ -6,57 +6,48 @@ part of '../profile.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$UserInfoImpl _$$UserInfoImplFromJson(Map<String, dynamic> json) =>
+UserInfo _$UserInfoFromJson(Map<String, dynamic> json) => UserInfo(
-    _$UserInfoImpl(
+      upload: (json['upload'] as num?)?.toInt(),
-      upload: (json['upload'] as num?)?.toInt() ?? 0,
+      download: (json['download'] as num?)?.toInt(),
-      download: (json['download'] as num?)?.toInt() ?? 0,
+      total: (json['total'] as num?)?.toInt(),
-      total: (json['total'] as num?)?.toInt() ?? 0,
+      expire: (json['expire'] as num?)?.toInt(),
-      expire: (json['expire'] as num?)?.toInt() ?? 0,
     );
 
-Map<String, dynamic> _$$UserInfoImplToJson(_$UserInfoImpl instance) =>
+Map<String, dynamic> _$UserInfoToJson(UserInfo instance) => <String, dynamic>{
-    <String, dynamic>{
       'upload': instance.upload,
       'download': instance.download,
       'total': instance.total,
       'expire': instance.expire,
     };
 
-_$ProfileImpl _$$ProfileImplFromJson(Map<String, dynamic> json) =>
+Profile _$ProfileFromJson(Map<String, dynamic> json) => Profile(
-    _$ProfileImpl(
+      id: json['id'] as String?,
-      id: json['id'] as String,
       label: json['label'] as String?,
-      currentGroupName: json['currentGroupName'] as String?,
+      url: json['url'] as String?,
-      url: json['url'] as String? ?? "",
-      lastUpdateDate: json['lastUpdateDate'] == null
-          ? null
-          : DateTime.parse(json['lastUpdateDate'] as String),
-      autoUpdateDuration:
-          Duration(microseconds: (json['autoUpdateDuration'] as num).toInt()),
       userInfo: json['userInfo'] == null
           ? null
           : UserInfo.fromJson(json['userInfo'] as Map<String, dynamic>),
-      autoUpdate: json['autoUpdate'] as bool? ?? true,
+      proxyName: json['proxyName'] as String?,
+      lastUpdateDate: json['lastUpdateDate'] == null
+          ? null
+          : DateTime.parse(json['lastUpdateDate'] as String),
       selectedMap: (json['selectedMap'] as Map<String, dynamic>?)?.map(
-            (k, e) => MapEntry(k, e as String),
+        (k, e) => MapEntry(k, e as String),
-          ) ??
+      ),
-          const {},
+      autoUpdateDuration: json['autoUpdateDuration'] == null
-      unfoldSet: (json['unfoldSet'] as List<dynamic>?)
+          ? null
-              ?.map((e) => e as String)
+          : Duration(microseconds: (json['autoUpdateDuration'] as num).toInt()),
-              .toSet() ??
+      autoUpdate: json['autoUpdate'] as bool? ?? true,
-          const {},
     );
 
-Map<String, dynamic> _$$ProfileImplToJson(_$ProfileImpl instance) =>
+Map<String, dynamic> _$ProfileToJson(Profile instance) => <String, dynamic>{
-    <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,
       'userInfo': instance.userInfo,
       'autoUpdate': instance.autoUpdate,
       'selectedMap': instance.selectedMap,
-      'unfoldSet': instance.unfoldSet.toList(),
     };

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(
+  const _$ProxiesSelectorStateImpl({required final List<String> groupNames})
-      {required final List<String> groupNames, required this.currentGroupName})
       : _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) &&
+                .equals(other._groupNames, _groupNames));
-            (identical(other.currentGroupName, currentGroupName) ||
-                other.currentGroupName == currentGroupName));
   }
 
   @override
-  int get hashCode => Object.hash(runtimeType,
+  int get hashCode => Object.hash(
-      const DeepCollectionEquality().hash(_groupNames), currentGroupName);
+      runtimeType, const DeepCollectionEquality().hash(_groupNames));
 
   @JsonKey(ignore: true)
   @override
@@ -1716,51 +1699,50 @@ class _$ProxiesSelectorStateImpl implements _ProxiesSelectorState {
 
 abstract class _ProxiesSelectorState implements ProxiesSelectorState {
   const factory _ProxiesSelectorState(
-      {required final List<String> groupNames,
+      {required final List<String> groupNames}) = _$ProxiesSelectorStateImpl;
-      required final String? currentGroupName}) = _$ProxiesSelectorStateImpl;
 
   @override
   List<String> get groupNames;
   @override
-  String? get currentGroupName;
-  @override
   @JsonKey(ignore: true)
   _$$ProxiesSelectorStateImplCopyWith<_$ProxiesSelectorStateImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-mixin _$ProxyGroupSelectorState {
+mixin _$ProxiesTabViewSelectorState {
   ProxiesSortType get proxiesSortType => throw _privateConstructorUsedError;
-  ProxyCardType get proxyCardType => throw _privateConstructorUsedError;
   num get sortNum => throw _privateConstructorUsedError;
-  List<Proxy> get proxies => throw _privateConstructorUsedError;
+  Group get group => throw _privateConstructorUsedError;
-  int get columns => throw _privateConstructorUsedError;
+  ViewMode get viewMode => throw _privateConstructorUsedError;
 
   @JsonKey(ignore: true)
-  $ProxyGroupSelectorStateCopyWith<ProxyGroupSelectorState> get copyWith =>
+  $ProxiesTabViewSelectorStateCopyWith<ProxiesTabViewSelectorState>
-      throw _privateConstructorUsedError;
+      get copyWith => throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract class $ProxyGroupSelectorStateCopyWith<$Res> {
+abstract class $ProxiesTabViewSelectorStateCopyWith<$Res> {
-  factory $ProxyGroupSelectorStateCopyWith(ProxyGroupSelectorState value,
+  factory $ProxiesTabViewSelectorStateCopyWith(
-          $Res Function(ProxyGroupSelectorState) then) =
+          ProxiesTabViewSelectorState value,
-      _$ProxyGroupSelectorStateCopyWithImpl<$Res, ProxyGroupSelectorState>;
+          $Res Function(ProxiesTabViewSelectorState) then) =
+      _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
+          ProxiesTabViewSelectorState>;
   @useResult
   $Res call(
       {ProxiesSortType proxiesSortType,
-      ProxyCardType proxyCardType,
       num sortNum,
-      List<Proxy> proxies,
+      Group group,
-      int columns});
+      ViewMode viewMode});
+
+  $GroupCopyWith<$Res> get group;
 }
 
 /// @nodoc
-class _$ProxyGroupSelectorStateCopyWithImpl<$Res,
+class _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
-        $Val extends ProxyGroupSelectorState>
+        $Val extends ProxiesTabViewSelectorState>
-    implements $ProxyGroupSelectorStateCopyWith<$Res> {
+    implements $ProxiesTabViewSelectorStateCopyWith<$Res> {
-  _$ProxyGroupSelectorStateCopyWithImpl(this._value, this._then);
+  _$ProxiesTabViewSelectorStateCopyWithImpl(this._value, this._then);
 
   // ignore: unused_field
   final $Val _value;
@@ -1771,177 +1753,165 @@ class _$ProxyGroupSelectorStateCopyWithImpl<$Res,
   @override
   $Res call({
     Object? proxiesSortType = null,
-    Object? proxyCardType = null,
     Object? sortNum = null,
-    Object? proxies = null,
+    Object? group = null,
-    Object? columns = null,
+    Object? viewMode = null,
   }) {
     return _then(_value.copyWith(
       proxiesSortType: null == proxiesSortType
           ? _value.proxiesSortType
           : proxiesSortType // ignore: cast_nullable_to_non_nullable
               as ProxiesSortType,
-      proxyCardType: null == proxyCardType
-          ? _value.proxyCardType
-          : proxyCardType // ignore: cast_nullable_to_non_nullable
-              as ProxyCardType,
       sortNum: null == sortNum
           ? _value.sortNum
           : sortNum // ignore: cast_nullable_to_non_nullable
               as num,
-      proxies: null == proxies
+      group: null == group
-          ? _value.proxies
+          ? _value.group
-          : proxies // ignore: cast_nullable_to_non_nullable
+          : group // ignore: cast_nullable_to_non_nullable
-              as List<Proxy>,
+              as Group,
-      columns: null == columns
+      viewMode: null == viewMode
-          ? _value.columns
+          ? _value.viewMode
-          : columns // ignore: cast_nullable_to_non_nullable
+          : viewMode // ignore: cast_nullable_to_non_nullable
-              as int,
+              as ViewMode,
     ) as $Val);
   }
+
+  @override
+  @pragma('vm:prefer-inline')
+  $GroupCopyWith<$Res> get group {
+    return $GroupCopyWith<$Res>(_value.group, (value) {
+      return _then(_value.copyWith(group: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
-abstract class _$$ProxyGroupSelectorStateImplCopyWith<$Res>
+abstract class _$$ProxiesTabViewSelectorStateImplCopyWith<$Res>
-    implements $ProxyGroupSelectorStateCopyWith<$Res> {
+    implements $ProxiesTabViewSelectorStateCopyWith<$Res> {
-  factory _$$ProxyGroupSelectorStateImplCopyWith(
+  factory _$$ProxiesTabViewSelectorStateImplCopyWith(
-          _$ProxyGroupSelectorStateImpl value,
+          _$ProxiesTabViewSelectorStateImpl value,
-          $Res Function(_$ProxyGroupSelectorStateImpl) then) =
+          $Res Function(_$ProxiesTabViewSelectorStateImpl) then) =
-      __$$ProxyGroupSelectorStateImplCopyWithImpl<$Res>;
+      __$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
       {ProxiesSortType proxiesSortType,
-      ProxyCardType proxyCardType,
       num sortNum,
-      List<Proxy> proxies,
+      Group group,
-      int columns});
+      ViewMode viewMode});
+
+  @override
+  $GroupCopyWith<$Res> get group;
 }
 
 /// @nodoc
-class __$$ProxyGroupSelectorStateImplCopyWithImpl<$Res>
+class __$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>
-    extends _$ProxyGroupSelectorStateCopyWithImpl<$Res,
+    extends _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
-        _$ProxyGroupSelectorStateImpl>
+        _$ProxiesTabViewSelectorStateImpl>
-    implements _$$ProxyGroupSelectorStateImplCopyWith<$Res> {
+    implements _$$ProxiesTabViewSelectorStateImplCopyWith<$Res> {
-  __$$ProxyGroupSelectorStateImplCopyWithImpl(
+  __$$ProxiesTabViewSelectorStateImplCopyWithImpl(
-      _$ProxyGroupSelectorStateImpl _value,
+      _$ProxiesTabViewSelectorStateImpl _value,
-      $Res Function(_$ProxyGroupSelectorStateImpl) _then)
+      $Res Function(_$ProxiesTabViewSelectorStateImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
   @override
   $Res call({
     Object? proxiesSortType = null,
-    Object? proxyCardType = null,
     Object? sortNum = null,
-    Object? proxies = null,
+    Object? group = null,
-    Object? columns = null,
+    Object? viewMode = null,
   }) {
-    return _then(_$ProxyGroupSelectorStateImpl(
+    return _then(_$ProxiesTabViewSelectorStateImpl(
       proxiesSortType: null == proxiesSortType
           ? _value.proxiesSortType
           : proxiesSortType // ignore: cast_nullable_to_non_nullable
               as ProxiesSortType,
-      proxyCardType: null == proxyCardType
-          ? _value.proxyCardType
-          : proxyCardType // ignore: cast_nullable_to_non_nullable
-              as ProxyCardType,
       sortNum: null == sortNum
           ? _value.sortNum
           : sortNum // ignore: cast_nullable_to_non_nullable
               as num,
-      proxies: null == proxies
+      group: null == group
-          ? _value._proxies
+          ? _value.group
-          : proxies // ignore: cast_nullable_to_non_nullable
+          : group // ignore: cast_nullable_to_non_nullable
-              as List<Proxy>,
+              as Group,
-      columns: null == columns
+      viewMode: null == viewMode
-          ? _value.columns
+          ? _value.viewMode
-          : columns // ignore: cast_nullable_to_non_nullable
+          : viewMode // ignore: cast_nullable_to_non_nullable
-              as int,
+              as ViewMode,
     ));
   }
 }
 
 /// @nodoc
 
-class _$ProxyGroupSelectorStateImpl implements _ProxyGroupSelectorState {
+class _$ProxiesTabViewSelectorStateImpl
-  const _$ProxyGroupSelectorStateImpl(
+    implements _ProxiesTabViewSelectorState {
+  const _$ProxiesTabViewSelectorStateImpl(
       {required this.proxiesSortType,
-      required this.proxyCardType,
       required this.sortNum,
-      required final List<Proxy> proxies,
+      required this.group,
-      required this.columns})
+      required this.viewMode});
-      : _proxies = proxies;
 
   @override
   final ProxiesSortType proxiesSortType;
   @override
-  final ProxyCardType proxyCardType;
-  @override
   final num sortNum;
-  final List<Proxy> _proxies;
   @override
-  List<Proxy> get proxies {
+  final Group group;
-    if (_proxies is EqualUnmodifiableListView) return _proxies;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_proxies);
-  }
-
   @override
-  final int columns;
+  final ViewMode viewMode;
 
   @override
   String toString() {
-    return 'ProxyGroupSelectorState(proxiesSortType: $proxiesSortType, proxyCardType: $proxyCardType, sortNum: $sortNum, proxies: $proxies, columns: $columns)';
+    return 'ProxiesTabViewSelectorState(proxiesSortType: $proxiesSortType, sortNum: $sortNum, group: $group, viewMode: $viewMode)';
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$ProxyGroupSelectorStateImpl &&
+            other is _$ProxiesTabViewSelectorStateImpl &&
             (identical(other.proxiesSortType, proxiesSortType) ||
                 other.proxiesSortType == proxiesSortType) &&
-            (identical(other.proxyCardType, proxyCardType) ||
-                other.proxyCardType == proxyCardType) &&
             (identical(other.sortNum, sortNum) || other.sortNum == sortNum) &&
-            const DeepCollectionEquality().equals(other._proxies, _proxies) &&
+            (identical(other.group, group) || other.group == group) &&
-            (identical(other.columns, columns) || other.columns == columns));
+            (identical(other.viewMode, viewMode) ||
+                other.viewMode == viewMode));
   }
 
   @override
-  int get hashCode => Object.hash(runtimeType, proxiesSortType, proxyCardType,
+  int get hashCode =>
-      sortNum, const DeepCollectionEquality().hash(_proxies), columns);
+      Object.hash(runtimeType, proxiesSortType, sortNum, group, viewMode);
 
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$ProxyGroupSelectorStateImplCopyWith<_$ProxyGroupSelectorStateImpl>
+  _$$ProxiesTabViewSelectorStateImplCopyWith<_$ProxiesTabViewSelectorStateImpl>
-      get copyWith => __$$ProxyGroupSelectorStateImplCopyWithImpl<
+      get copyWith => __$$ProxiesTabViewSelectorStateImplCopyWithImpl<
-          _$ProxyGroupSelectorStateImpl>(this, _$identity);
+          _$ProxiesTabViewSelectorStateImpl>(this, _$identity);
 }
 
-abstract class _ProxyGroupSelectorState implements ProxyGroupSelectorState {
+abstract class _ProxiesTabViewSelectorState
-  const factory _ProxyGroupSelectorState(
+    implements ProxiesTabViewSelectorState {
+  const factory _ProxiesTabViewSelectorState(
       {required final ProxiesSortType proxiesSortType,
-      required final ProxyCardType proxyCardType,
       required final num sortNum,
-      required final List<Proxy> proxies,
+      required final Group group,
-      required final int columns}) = _$ProxyGroupSelectorStateImpl;
+      required final ViewMode viewMode}) = _$ProxiesTabViewSelectorStateImpl;
 
   @override
   ProxiesSortType get proxiesSortType;
   @override
-  ProxyCardType get proxyCardType;
-  @override
   num get sortNum;
   @override
-  List<Proxy> get proxies;
+  Group get group;
   @override
-  int get columns;
+  ViewMode get viewMode;
   @override
   @JsonKey(ignore: true)
-  _$$ProxyGroupSelectorStateImplCopyWith<_$ProxyGroupSelectorStateImpl>
+  _$$ProxiesTabViewSelectorStateImplCopyWith<_$ProxiesTabViewSelectorStateImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 

lib/models/log.dart

@@ -1,12 +1,8 @@
-// ignore_for_file: invalid_annotation_target
-
 import 'package:fl_clash/enum/enum.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:json_annotation/json_annotation.dart';
 
 part 'generated/log.g.dart';
 
-part 'generated/log.freezed.dart';
-
 @JsonSerializable()
 class Log {
   @JsonKey(name: "LogLevel")
@@ -35,22 +31,3 @@ class Log {
     return 'Log{logLevel: $logLevel, payload: $payload, dateTime: $dateTime}';
   }
 }
-
-@freezed
-class LogsAndKeywords with _$LogsAndKeywords {
-  const factory LogsAndKeywords({
-    @Default([]) List<Log> logs,
-    @Default([]) List<String> keywords,
-  }) = _LogsAndKeywords;
-
-  factory LogsAndKeywords.fromJson(Map<String, Object?> json) =>
-      _$LogsAndKeywordsFromJson(json);
-}
-
-extension LogsAndKeywordsExt on LogsAndKeywords {
-  List<Log> get filteredLogs => logs
-      .where(
-        (log) => {log.logLevel.name}.containsAll(keywords),
-      )
-      .toList();
-}

lib/models/profile.dart

@@ -5,28 +5,39 @@ import 'dart:typed_data';
 import 'package:fl_clash/clash/core.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:json_annotation/json_annotation.dart';
 
 part 'generated/profile.g.dart';
 
-part 'generated/profile.freezed.dart';
-
 typedef SelectedMap = Map<String, String>;
 
-@freezed
+@JsonSerializable()
-class UserInfo with _$UserInfo {
+class UserInfo {
-  const factory UserInfo({
+  int upload;
-    @Default(0) int upload,
+  int download;
-    @Default(0) int download,
+  int total;
-    @Default(0) int total,
+  int expire;
-    @Default(0) int expire,
-  }) = _UserInfo;
 
-  factory UserInfo.fromJson(Map<String, Object?> json) =>
+  UserInfo({
-      _$UserInfoFromJson(json);
+    int? upload,
+    int? download,
+    int? total,
+    int? expire,
+  })  : upload = upload ?? 0,
+        download = download ?? 0,
+        total = total ?? 0,
+        expire = expire ?? 0;
+
+  Map<String, dynamic> toJson() {
+    return _$UserInfoToJson(this);
+  }
+
+  factory UserInfo.fromJson(Map<String, dynamic> json) {
+    return _$UserInfoFromJson(json);
+  }
 
   factory UserInfo.formHString(String? info) {
-    if (info == null) return const UserInfo();
+    if (info == null) return UserInfo();
     final list = info.split(";");
     Map<String, int?> map = {};
     for (final i in list) {
@@ -34,77 +45,73 @@ class UserInfo with _$UserInfo {
       map[keyValue[0]] = int.tryParse(keyValue[1]);
     }
     return UserInfo(
-      upload: map["upload"] ?? 0,
+      upload: map["upload"],
-      download: map["download"] ?? 0,
+      download: map["download"],
-      total: map["total"] ?? 0,
+      total: map["total"],
-      expire: map["expire"] ?? 0,
+      expire: map["expire"],
     );
   }
+
+  @override
+  String toString() {
+    return 'UserInfo{upload: $upload, download: $download, total: $total, expire: $expire}';
+  }
 }
 
-@freezed
+@JsonSerializable()
-class Profile with _$Profile {
+class Profile {
-  const factory Profile({
+  String id;
-    required String id,
+  String? label;
-    String? label,
+  String? proxyName;
-    String? currentGroupName,
+  String? url;
-    @Default("") String url,
+  DateTime? lastUpdateDate;
-    DateTime? lastUpdateDate,
+  Duration autoUpdateDuration;
-    required Duration autoUpdateDuration,
+  UserInfo? userInfo;
-    UserInfo? userInfo,
+  bool autoUpdate;
-    @Default(true) bool autoUpdate,
+  SelectedMap selectedMap;
-    @Default({}) SelectedMap selectedMap,
-    @Default({}) Set<String> unfoldSet,
-  }) = _Profile;
 
-  factory Profile.fromJson(Map<String, Object?> json) =>
+  Profile({
-      _$ProfileFromJson(json);
+    String? id,
+    this.label,
+    this.url,
+    this.userInfo,
+    this.proxyName,
+    this.lastUpdateDate,
+    SelectedMap? selectedMap,
+    Duration? autoUpdateDuration,
+    this.autoUpdate = true,
+  })  : id = id ?? DateTime.now().millisecondsSinceEpoch.toString(),
+        autoUpdateDuration = autoUpdateDuration ?? defaultUpdateDuration,
+        selectedMap = selectedMap ?? {};
 
-  factory Profile.normal({
-    String? label,
-    String url = '',
-}) {
-    return Profile(
-      label: label,
-      url: url,
-      id: DateTime.now().millisecondsSinceEpoch.toString(),
-      autoUpdateDuration: defaultUpdateDuration,
-    );
-  }
-}
-
-extension ProfileExtension on Profile {
   ProfileType get type =>
-      url.isEmpty == true ? ProfileType.file : ProfileType.url;
+      url == null || url?.isEmpty == true ? ProfileType.file : ProfileType.url;
-
-  bool get realAutoUpdate =>
-      url.isEmpty == true ? false : autoUpdate;
 
   Future<void> checkAndUpdate() async {
     final isExists = await check();
     if (!isExists) {
-      if (url.isNotEmpty) {
+      if (url != null) {
-        await update();
+        return await update();
       }
     }
   }
 
+  Future<void> update() async {
+    final response = await request.getFileResponseForUrl(url!);
+    final disposition = response.headers.value("content-disposition");
+    label ??= other.getFileNameForDisposition(disposition) ?? id;
+    final userinfo = response.headers.value('subscription-userinfo');
+    userInfo = UserInfo.formHString(userinfo);
+    await saveFile(response.data);
+    lastUpdateDate = DateTime.now();
+  }
+
   Future<bool> check() async {
     final profilePath = await appPath.getProfilePath(id);
     return await File(profilePath!).exists();
   }
 
-  Future<Profile> update() async {
+  Future<void> saveFile(Uint8List bytes) async {
-    final response = await request.getFileResponseForUrl(url);
-    final disposition = response.headers.value("content-disposition");
-    final userinfo = response.headers.value('subscription-userinfo');
-    return await copyWith(
-      label: label ?? other.getFileNameForDisposition(disposition) ?? id,
-      userInfo: UserInfo.formHString(userinfo),
-    ).saveFile(response.data);
-  }
-
-  Future<Profile> saveFile(Uint8List bytes) async {
     final message = await clashCore.validateConfig(utf8.decode(bytes));
     if (message.isNotEmpty) {
       throw message;
@@ -116,21 +123,68 @@ extension ProfileExtension on Profile {
       await file.create(recursive: true);
     }
     await file.writeAsBytes(bytes);
-    return copyWith(lastUpdateDate: DateTime.now());
+    lastUpdateDate = DateTime.now();
   }
 
-  Future<Profile> saveFileWithString(String value) async {
+  Map<String, dynamic> toJson() {
-    final message = await clashCore.validateConfig(value);
+    return _$ProfileToJson(this);
-    if (message.isNotEmpty) {
+  }
-      throw message;
+
-    }
+  factory Profile.fromJson(Map<String, dynamic> json) {
-    final path = await appPath.getProfilePath(id);
+    return _$ProfileFromJson(json);
-    final file = File(path!);
+  }
-    final isExists = await file.exists();
+
-    if (!isExists) {
+  @override
-      await file.create(recursive: true);
+  bool operator ==(Object other) =>
-    }
+      identical(this, other) ||
-    await file.writeAsString(value);
+      other is Profile &&
-    return copyWith(lastUpdateDate: DateTime.now());
+          runtimeType == other.runtimeType &&
+          id == other.id &&
+          label == other.label &&
+          proxyName == other.proxyName &&
+          url == other.url &&
+          lastUpdateDate == other.lastUpdateDate &&
+          autoUpdateDuration == other.autoUpdateDuration &&
+          userInfo == other.userInfo &&
+          autoUpdate == other.autoUpdate;
+
+  @override
+  int get hashCode =>
+      id.hashCode ^
+      label.hashCode ^
+      proxyName.hashCode ^
+      url.hashCode ^
+      lastUpdateDate.hashCode ^
+      autoUpdateDuration.hashCode ^
+      userInfo.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? groupName,
+    String? proxyName,
+    DateTime? lastUpdateDate,
+    Duration? autoUpdateDuration,
+    bool? autoUpdate,
+    SelectedMap? selectedMap,
+  }) {
+    return Profile(
+      id: id,
+      label: label ?? this.label,
+      url: url ?? this.url,
+      proxyName: proxyName ?? this.proxyName,
+      userInfo: userInfo ?? this.userInfo,
+      selectedMap: selectedMap ?? this.selectedMap,
+      lastUpdateDate: lastUpdateDate ?? this.lastUpdateDate,
+      autoUpdateDuration: autoUpdateDuration ?? this.autoUpdateDuration,
+      autoUpdate: autoUpdate ?? this.autoUpdate,
+    );
   }
 }

lib/models/selector.dart

@@ -94,19 +94,17 @@ class ProxiesCardSelectorState with _$ProxiesCardSelectorState {
 class ProxiesSelectorState with _$ProxiesSelectorState {
   const factory ProxiesSelectorState({
     required List<String> groupNames,
-    required String? currentGroupName,
   }) = _ProxiesSelectorState;
 }
 
 @freezed
-class ProxyGroupSelectorState with _$ProxyGroupSelectorState {
+class ProxiesTabViewSelectorState with _$ProxiesTabViewSelectorState {
-  const factory ProxyGroupSelectorState({
+  const factory ProxiesTabViewSelectorState({
     required ProxiesSortType proxiesSortType,
-    required ProxyCardType proxyCardType,
     required num sortNum,
-    required List<Proxy> proxies,
+    required Group group,
-    required int columns,
+    required ViewMode viewMode,
-  }) = _ProxyGroupSelectorState;
+  }) = _ProxiesTabViewSelectorState;
 }
 
 @freezed

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 {
+  Future<String?> getPackageName(Metadata metadata) async {
-    return await methodChannel?.invokeMethod<String>("resolverProcess", {
+    return await methodChannel?.invokeMethod<String>("getPackageName", {
-      "data": json.encode(process),
+      "data": json.encode(metadata),
     });
   }
 }

lib/plugins/proxy.dart

@@ -79,10 +79,6 @@ class Proxy extends ProxyPlatform {
     }
   }
 
-  // updateStartTime() async {
-  //   startTime = clashCore.getRunTime();
-  // }
-
   updateStartTime() async {
     startTime = await getRunTime();
   }

lib/state.dart

@@ -4,7 +4,6 @@ import 'dart:io';
 
 import 'package:animations/animations.dart';
 import 'package:fl_clash/clash/clash.dart';
-import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
 
@@ -18,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 = [];
@@ -58,28 +58,16 @@ class GlobalState {
   }
 
   Future<void> startSystemProxy({
-    required AppState appState,
     required Config config,
     required ClashConfig clashConfig,
   }) async {
-    final args = config.isAccessControl
+    final args =
-        ? json.encode(
+        config.isAccessControl ? json.encode(config.accessControl) : null;
-            Props(
-              accessControl: config.accessControl,
-              allowBypass: config.allowBypass,
-            ),
-          )
-        : null;
     await proxyManager.startProxy(
       port: clashConfig.mixedPort,
       args: args,
     );
     startListenUpdate();
-    applyProfile(
-      appState: appState,
-      config: config,
-      clashConfig: clashConfig,
-    );
   }
 
   Future<void> stopSystemProxy() async {
@@ -117,6 +105,12 @@ class GlobalState {
         clashConfig: clashConfig,
       );
     }
+    if (!appState.isInit) return;
+    await applyProfile(
+      appState: appState,
+      config: config,
+      clashConfig: clashConfig,
+    );
     updateCoreVersionInfo(appState);
   }
 
@@ -139,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();
   }
@@ -202,7 +209,6 @@ class GlobalState {
     final traffic = clashCore.getTraffic();
     if (appState != null) {
       appState.addTraffic(traffic);
-      appState.totalTraffic = clashCore.getTotalTraffic();
     }
     if (Platform.isAndroid) {
       final currentProfile = config.currentProfile;
@@ -219,30 +225,30 @@ class GlobalState {
     required String message,
     SnackBarAction? action,
   }) {
-    // final width = context.width;
+    final width = context.width;
-    // EdgeInsets margin;
+    EdgeInsets margin;
-    // if (width < 600) {
+    if (width < 600) {
-    //   margin = const EdgeInsets.only(
+      margin = const EdgeInsets.only(
-    //     bottom: 96,
+        bottom: 96,
-    //     right: 16,
+        right: 16,
-    //     left: 16,
+        left: 16,
-    //   );
+      );
-    // } else {
+    } else {
-    //   margin = EdgeInsets.only(
+      margin = EdgeInsets.only(
-    //     bottom: 16,
+        bottom: 16,
-    //     left: 16,
+        left: 16,
-    //     right: width - 316,
+        right: width - 316,
-    //   );
+      );
-    // }
+    }
-    // ScaffoldMessenger.of(context).showSnackBar(
+    ScaffoldMessenger.of(context).showSnackBar(
-    //   SnackBar(
+      SnackBar(
-    //     action: action,
+        action: action,
-    //     content: Text(message),
+        content: Text(message),
-    //     behavior: SnackBarBehavior.floating,
+        behavior: SnackBarBehavior.floating,
-    //     duration: const Duration(milliseconds: 1500),
+        duration: const Duration(milliseconds: 1500),
-    //     margin: margin,
+        margin: margin,
-    //   ),
+      ),
-    // );
+    );
   }
 
   Future<T?> safeRun<T>(
@@ -262,18 +268,6 @@ class GlobalState {
       return null;
     }
   }
-
-  int getColumns(ViewMode viewMode,int currentColumns){
-    final targetColumnsArray = switch (viewMode) {
-      ViewMode.mobile => [2, 1],
-      ViewMode.laptop => [3, 2],
-      ViewMode.desktop => [4, 3],
-    };
-    if (targetColumnsArray.contains(currentColumns)) {
-      return currentColumns;
-    }
-    return targetColumnsArray.first;
-  }
 }
 
 final globalState = GlobalState();