Add tcp concurrent switch

Add system proxy switch

Add geodata loader switch

Add external controller switch

Add auto gc on trim memory

Fix android notification error

android/app/build.gradle

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

android/app/src/main/AndroidManifest.xml

@@ -23,6 +23,7 @@
         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"

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/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){
-                            result.success(null)
-                            return@withContext
-                        }
-                        if (context == null) {
-                            result.success(null)
-                            return@withContext
-                        }
+                        if (context == null) result.success(null)
+                        val source = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
+                        val target = InetSocketAddress(
+                            metadata.host.ifEmpty { metadata.destinationIP },
+                            metadata.destinationPort
+                        )
                         if (connectivity == null) {
                             connectivity = context!!.getSystemService<ConnectivityManager>()
                         }
-                        val src = InetSocketAddress(metadata.sourceIP, metadata.sourcePort)
-                        val dst = InetSocketAddress(
-                            metadata.destinationIP.ifEmpty { metadata.host },
-                            metadata.destinationPort
-                        )
-                        val uid = try {
-                            connectivity?.getConnectionOwnerUid(protocol, src, dst)
-                        } catch (_: Exception) {
-                            null
-                        }
+                        val uid =
+                            connectivity?.getConnectionOwnerUid(protocol, source, target)
                         if (uid == null || uid == -1) {
                             result.success(null)
                             return@withContext
@@ -150,6 +125,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 val message = call.argument<String>("message")
                 tip(message)
                 result.success(true)
+
             }
 
             else -> {
@@ -161,12 +137,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     private suspend fun getPackageIcon(packageName: String): String? {
         val packageManager = context?.packageManager
         if (iconMap[packageName] == null) {
-            iconMap[packageName] = try {
-                packageManager?.getApplicationIcon(packageName)?.getBase64()
-            } catch (_: Exception) {
-                null
-            }
-
+            iconMap[packageName] = packageManager?.getApplicationIcon(packageName)?.getBase64()
         }
         return iconMap[packageName]
     }
@@ -192,7 +163,7 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
     }
 
     fun requestGc() {
-        channel.invokeMethod("gc", null)
+        channel.invokeMethod("gc",null)
     }
 
     override fun onAttachedToActivity(binding: ActivityPluginBinding) {

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

@@ -16,6 +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.AccessControl
 import com.follow.clash.models.Props
 import com.follow.clash.services.FlClashVpnService
 import com.google.gson.Gson

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

@@ -44,7 +44,7 @@ class FlClashTileService : TileService() {
 
     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) {
             PendingIntent.getActivity(
                 this,

core/common.go

@@ -2,24 +2,26 @@ 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/dns"
 	"github.com/metacubex/mihomo/hub"
 	"github.com/metacubex/mihomo/hub/executor"
-	"github.com/metacubex/mihomo/hub/route"
 	"github.com/metacubex/mihomo/listener"
 	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/tunnel"
+	"math"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
+	"sync"
 	"syscall"
 	"time"
 )
@@ -82,13 +84,10 @@ type Delay struct {
 }
 
 type Process struct {
-	Id       int64              `json:"id"`
-	Metadata *constant.Metadata `json:"metadata"`
-}
-
-type ProcessMapItem struct {
-	Id    int64  `json:"id"`
-	Value string `json:"value"`
+	Uid     uint32 `json:"uid"`
+	Network string `json:"network"`
+	Source  string `json:"source"`
+	Target  string `json:"target"`
 }
 
 type Now struct {
@@ -335,7 +334,7 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	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
@@ -347,11 +346,11 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	if targetConfig.DNS.Enable == false {
 		targetConfig.DNS = patchConfig.DNS
 	}
-	//if runtime.GOOS == "android" {
-	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
-	//} else if runtime.GOOS == "windows" {
-	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
-	//}
+	if runtime.GOOS == "android" {
+		targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder)
+	} else if runtime.GOOS == "windows" {
+		targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
+	}
 	if compatible == false {
 		targetConfig.ProxyProvider = make(map[string]map[string]any)
 		targetConfig.RuleProvider = make(map[string]map[string]any)
@@ -361,17 +360,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 +380,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 +413,7 @@ func applyConfig(isPatch bool) {
 	if isPatch {
 		patchConfig(cfg.General)
 	} else {
-		executor.Shutdown()
-		runtime.GC()
 		hub.UltraApplyConfig(cfg, true)
+		hcCompatibleProvider(tunnel.Providers())
 	}
 }

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) {
-	data, err := json.Marshal(message)
-	return string(data), err
+func (message *Message) Json() string {
+	data, _ := json.Marshal(message)
+	return string(data)
 }
 
 func SendMessage(message Message) {
-	if Port == nil {
-		return
-	}
-	s, err := message.Json()
-	if err != nil {
-		return
-	}
-	SendToPort(*Port, s)
+	SendToPort(*Port, message.Json())
 }

core/hub.go

@@ -188,26 +188,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 +404,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/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

@@ -35,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()
@@ -46,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() {
@@ -54,6 +66,7 @@ func stopTun() {
 
 		if tun != nil {
 			tun.Close()
+			applyConfig(true)
 			tun = nil
 		}
 	}()

lib/application.dart

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

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) as Map;
-      if(proxies.isEmpty) return [];
+      final proxies = json.decode(proxiesRawString);
       final groupNames = [
         UsedProxy.GLOBAL.name,
         ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
-          final proxy = proxies[e] ?? {};
-          return GroupTypeExtension.valueList.contains(proxy['type']) &&
-              proxy['hidden'] != true;
+          final proxy = proxies[e];
+          return GroupTypeExtension.valueList.contains(proxy['type']);
         })
       ];
       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>)
-          .map(
-            (item) => ExternalProvider.fromJson(item),
-      )
-          .toList();
+          (json.decode(externalProvidersRawString) as List<dynamic>)
+              .map(
+                (item) => ExternalProvider.fromJson(item),
+              )
+              .toList();
       return externalProviders;
     });
   }
@@ -178,11 +175,9 @@ class ClashCore {
     );
     Future.delayed(httpTimeoutDuration + moreDuration, () {
       receiver.close();
-      if(!completer.isCompleted){
-        completer.complete(
-          Delay(name: proxyName, value: -1),
-        );
-      }
+      completer.complete(
+        Delay(name: proxyName, value: -1),
+      );
     });
     return completer.future;
   }
@@ -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,7 +210,7 @@ class ClashCore {
     clashFFI.startTUN(fd);
   }
 
-  requestGc() {
+  requestGc(){
     clashFFI.forceGc();
   }
 
@@ -233,27 +218,13 @@ class ClashCore {
     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

@@ -983,24 +983,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,20 +1130,6 @@ class ClashFFI {
       _lookup<ffi.NativeFunction<ffi.Void Function()>>('stopLog');
   late final _stopLog = _stopLogPtr.asFunction<void Function()>();
 
-  void setProcessMap(
-    ffi.Pointer<ffi.Char> s,
-  ) {
-    return _setProcessMap(
-      s,
-    );
-  }
-
-  late final _setProcessMapPtr =
-      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Char>)>>(
-          'setProcessMap');
-  late final _setProcessMap =
-      _setProcessMapPtr.asFunction<void Function(ffi.Pointer<ffi.Char>)>();
-
   void startTUN(
     int fd,
   ) {
@@ -1174,6 +1142,20 @@ class ClashFFI {
       _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Int)>>('startTUN');
   late final _startTUN = _startTUNPtr.asFunction<void 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 onRequest(Connection connection) {}
+  void onProcess(Metadata metadata) {}
 
   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/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();
-
-  // Future<Directory> _createDesktopCacheDir() async {
-  //   final path = join(dirname(Platform.resolvedExecutable), 'cache');
-  //   final dir = Directory(path);
-  //   if (await dir.exists()) {
-  //     await dir.create(recursive: true);
-  //   }
-  //   return dir;
-  // }
+  Completer<Directory> applicationSupportDirectoryCompleter = Completer();
 
   AppPath._internal() {
-    getApplicationSupportDirectory().then((value) {
-      cacheDir.complete(value);
-    });
-    // if (Platform.isAndroid) {
-    //   getApplicationSupportDirectory().then((value) {
-    //     cacheDir.complete(value);
-    //   });
-    // } else {
-    //   _createDesktopCacheDir().then((value) {
-    //     cacheDir.complete(value);
-    //   });
-    // }
+    getApplicationSupportDirectory().then(
+      (value) => applicationSupportDirectoryCompleter.complete(value),
+    );
   }
 
   factory AppPath() {
@@ -40,12 +22,12 @@ class AppPath {
   }
 
   Future<String> getHomeDirPath() async {
-    final directory = await cacheDir.future;
+    final directory = await applicationSupportDirectoryCompleter.future;
     return directory.path;
   }
 
   Future<String> getProfilesPath() async {
-    final directory = await cacheDir.future;
+    final directory = await applicationSupportDirectoryCompleter.future;
     return join(directory.path, profilesDirectoryName);
   }
 

lib/common/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 {
-    await profile.update();
-    config.setProfile(await profile.update());
+  Future<void> updateProfile(String id) async {
+    final profile = config.getCurrentProfileForId(id);
+    if (profile != null) {
+      final tempProfile = profile.copyWith();
+      await tempProfile.update();
+      config.setProfile(tempProfile);
+    }
   }
 
   Future<void> updateClashConfig({bool isPatch = true}) async {
@@ -144,16 +145,7 @@ class AppController {
       if (isNotNeedUpdate == false || profile.type == ProfileType.file) {
         continue;
       }
-      try {
-        updateProfile(profile);
-      } catch (e) {
-        appState.addLog(
-          Log(
-            logLevel: LogLevel.info,
-            payload: e.toString(),
-          ),
-        );
-      }
+      await updateProfile(profile.id);
     }
   }
 
@@ -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,
               ),
           ],
         ),
@@ -266,20 +257,19 @@ class AppController {
   }
 
   init() async {
-    updateLogStatus();
     if (!config.silentLaunch) {
       window?.show();
     }
     final commonScaffoldState = globalState.homeScaffoldKey.currentState;
-    if (commonScaffoldState?.mounted == true) {
+    if(commonScaffoldState?.mounted == true){
       await commonScaffoldState?.loadingRun(() async {
         await globalState.applyProfile(
           appState: appState,
           config: config,
           clashConfig: clashConfig,
         );
-      }, title: appLocalizations.init);
-    } else {
+      });
+    }else{
       await globalState.applyProfile(
         appState: appState,
         config: config,
@@ -290,13 +280,14 @@ class AppController {
   }
 
   afterInit() async {
-    await proxyManager.updateStartTime();
-    if (proxyManager.isStart) {
+    if (config.autoRun) {
       await updateSystemProxy(true);
     } else {
-      await updateSystemProxy(config.autoRun);
+      await proxyManager.updateStartTime();
+      await updateSystemProxy(proxyManager.isStart);
     }
     autoUpdateProfiles();
+    updateLogStatus();
     autoCheckUpdate();
   }
 
@@ -365,9 +356,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 +383,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}",
     );

lib/enum/enum.dart

@@ -56,16 +56,9 @@ enum ProfileType { file, url }
 
 enum ResultType { success, error }
 
-enum MessageType { log, tun, delay, process, now, request, run }
-
-enum FindProcessMode { always, off }
+enum MessageType { log, tun, delay, process, now }
 
 enum RecoveryOption {
   all,
   onlyProfiles,
 }
-
-enum ChipType {
-  action,
-  delete,
-}

lib/fragments/access.dart

@@ -35,13 +35,6 @@ class _AccessFragmentState extends State<AccessFragment> {
     });
   }
 
-
-  @override
-  void dispose() {
-    super.dispose();
-    packagesListenable.dispose();
-  }
-
   Widget _buildAppProxyModePopup() {
     final items = [
       CommonPopupMenuItem(

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

@@ -39,7 +39,14 @@ class _ConfigFragmentState extends State<ConfigFragment> {
     }
   }
 
-  Widget _buildAppSection() {
+  _updateLoglevel(LogLevel? logLevel) {
+    if (logLevel == null ||
+        logLevel == globalState.appController.clashConfig.logLevel) return;
+    globalState.appController.clashConfig.logLevel = logLevel;
+    globalState.appController.updateClashConfigDebounce();
+  }
+
+  _buildAppSection() {
     final items = [
       if (Platform.isAndroid)
         Selector<Config, bool>(
@@ -114,56 +121,34 @@ class _ConfigFragmentState extends State<ConfigFragment> {
     );
   }
 
-  _showLogLevelDialog(LogLevel value) {
-    globalState.showCommonDialog(
-      child: AlertDialog(
-        title: Text(appLocalizations.logLevel),
-        contentPadding: const EdgeInsets.symmetric(
-          horizontal: 8,
-          vertical: 16,
-        ),
-        content: SizedBox(
-          width: 250,
-          child: Wrap(
-            children: [
-              for (final logLevel in LogLevel.values)
-                ListItem.radio(
-                  delegate: RadioDelegate<LogLevel>(
-                    value: logLevel,
-                    groupValue: value,
-                    onChanged: (LogLevel? value) {
-                      if (value == null) {
-                        return;
-                      }
-                      final appController = globalState.appController;
-                      appController.clashConfig.logLevel = value;
-                      appController.updateClashConfigDebounce();
-                      Navigator.of(context).pop();
-                    },
-                  ),
-                  title: Text(logLevel.name),
-                )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildGeneralSection() {
+  _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);
-            },
-          );
-        },
+      Padding(
+        padding: kMaterialListPadding,
+        child: Selector<ClashConfig, LogLevel>(
+          selector: (_, clashConfig) => clashConfig.logLevel,
+          builder: (_, value, __) {
+            return ListItem(
+              leading: const Icon(Icons.info_outline),
+              title: Text(appLocalizations.logLevel),
+              trailing: SizedBox(
+                height: 48,
+                child: DropdownMenu<LogLevel>(
+                  width: 124,
+                  initialSelection: value,
+                  dropdownMenuEntries: [
+                    for (final logLevel in LogLevel.values)
+                      DropdownMenuEntry<LogLevel>(
+                        value: logLevel,
+                        label: logLevel.name,
+                      )
+                  ],
+                  onSelected: _updateLoglevel,
+                ),
+              ),
+            );
+          },
+        ),
       ),
       Selector<ClashConfig, int>(
         selector: (_, clashConfig) => clashConfig.mixedPort,
@@ -240,26 +225,6 @@ class _ConfigFragmentState extends State<ConfigFragment> {
           );
         },
       ),
-      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) =>
-            clashConfig.findProcessMode == FindProcessMode.always,
-        builder: (_, findProcess, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.polymer_outlined),
-            title: Text(appLocalizations.findProcessMode),
-            subtitle: Text(appLocalizations.findProcessModeDesc),
-            delegate: SwitchDelegate(
-              value: findProcess,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.clashConfig.findProcessMode =
-                    value ? FindProcessMode.always : FindProcessMode.off;
-                appController.updateClashConfigDebounce();
-              },
-            ),
-          );
-        },
-      ),
       Selector<ClashConfig, bool>(
         selector: (_, clashConfig) => clashConfig.tcpConcurrent,
         builder: (_, tcpConcurrent, __) {
@@ -293,7 +258,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
                 appController.clashConfig.geodataLoader = value
                     ? geodataLoaderMemconservative
                     : geodataLoaderStandard;
-                appController.updateClashConfigDebounce();
+                appController.updateClashConfigDebounce;
               },
             ),
           );
@@ -312,7 +277,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
                 final appController = globalState.appController;
                 appController.clashConfig.externalController =
                     value ? defaultExternalController : '';
-                appController.updateClashConfigDebounce();
+                appController.updateClashConfigDebounce;
               },
             ),
           );
@@ -335,56 +300,14 @@ class _ConfigFragmentState extends State<ConfigFragment> {
     );
   }
 
-  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(
-      padding: const EdgeInsets.only(bottom: 32),
+      padding: const EdgeInsets.only(bottom: 16),
       itemBuilder: (_, index) {
         return Container(
           alignment: Alignment.center,

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

lib/fragments/dashboard/core_info.dart

@@ -31,7 +31,7 @@ class CoreInfo extends StatelessWidget {
                     style: context
                         .textTheme
                         .titleMedium
-                        ?.toSoftBold,
+                        ?.toSoftBold(),
                   ),
                 ),
                 const SizedBox(
@@ -44,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,89 +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,
-      ),
-      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,7 +19,6 @@ class _NetworkDetectionState extends State<NetworkDetection> {
   final timeoutNotifier = ValueNotifier<bool>(false);
   bool? _preIsStart;
   CancelToken? cancelToken;
-  Function? _checkIpDebounce;
 
   _checkIp(
     bool isInit,
@@ -45,7 +44,6 @@ class _NetworkDetectionState extends State<NetworkDetection> {
   }
 
   _checkIpContainer(Widget child) {
-    _checkIpDebounce = debounce(_checkIp);
     return Selector2<AppState, Config, CheckIpSelectorState>(
       selector: (_, appState, config) {
         return CheckIpSelectorState(
@@ -55,22 +53,13 @@ class _NetworkDetectionState extends State<NetworkDetection> {
         );
       },
       builder: (_, state, __) {
-        if (_checkIpDebounce != null) {
-          _checkIpDebounce!([state.isInit, state.isStart]);
-        }
+        _checkIp(state.isInit, state.isStart);
         return child;
       },
       child: child,
     );
   }
 
-  @override
-  void dispose() {
-    super.dispose();
-    ipInfoNotifier.dispose();
-    timeoutNotifier.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return _checkIpContainer(
@@ -135,7 +124,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                 ),
                 Container(
                   height:
-                      globalState.appController.measure.titleLargeHeight + 24 - 1,
+                      globalState.appController.measure.titleLargeHeight + 24,
                   alignment: Alignment.centerLeft,
                   padding: const EdgeInsets.all(16).copyWith(top: 0),
                   child: FadeBox(
@@ -150,7 +139,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                                   text: Text(
                                     ipInfo.ip,
                                     style: context.textTheme.titleLarge
-                                        ?.toSoftBold.toMinus,
+                                        ?.toSoftBold(),
                                     maxLines: 1,
                                     overflow: TextOverflow.ellipsis,
                                   ),
@@ -164,9 +153,9 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                               if (timeout) {
                                 return Text(
                                   "timeout",
-                                  style: context.textTheme.titleLarge
+                                  style: context.textTheme.titleMedium
                                       ?.copyWith(color: Colors.red)
-                                      .toSoftBold.toMinus,
+                                      .toSoftBold(),
                                   maxLines: 1,
                                   overflow: TextOverflow.ellipsis,
                                 );

lib/fragments/dashboard/network_speed.dart

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

lib/fragments/dashboard/outbound_mode.dart

@@ -67,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;
-    if (isStart == appController.appState.isStart) {
-      isStart = !isStart;
-      updateController();
-      appController.updateSystemProxy(isStart);
-    }
+    isStart = !isStart;
+    updateController();
+    updateSystemProxy();
   }
 
   updateController() {
@@ -49,18 +48,11 @@ class _StartButtonState extends State<StartButton>
     }
   }
 
-  Widget _updateControllerContainer(Widget child) {
-    return Selector<AppState, bool>(
-      selector: (_, appState) => appState.isStart,
-      builder: (_, isStart, child) {
-        if(isStart != this.isStart){
-          this.isStart = isStart;
-          updateController();
-        }
-        return child!;
-      },
-      child: child,
-    );
+  updateSystemProxy() {
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      final appController = globalState.appController;
+      await appController.updateSystemProxy(isStart);
+    });
   }
 
   @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(
-        Selector<AppState, int?>(
+      child: Selector<AppState, bool>(
+        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(),
         ),
       ],
     );
@@ -55,11 +55,21 @@ class TrafficUsage extends StatelessWidget {
         label: appLocalizations.trafficUsage,
         iconData: Icons.data_saver_off,
       ),
-      child: Selector<AppState, Traffic>(
-        selector: (_, appState) => appState.totalTraffic,
-        builder: (_, totalTraffic, __) {
-          final upTotalTrafficValue = totalTraffic.up;
-          final downTotalTrafficValue = totalTraffic.down;
+      child: Selector<AppState, List<Traffic>>(
+        selector: (_, appState) => appState.traffics,
+        builder: (_, traffics, __) {
+          final trafficTotal = traffics.isNotEmpty
+              ? 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(
@@ -70,7 +80,7 @@ class TrafficUsage extends StatelessWidget {
                   child: getTrafficDataItem(
                     context,
                     Icons.arrow_upward,
-                    upTotalTrafficValue,
+                    upTrafficValue,
                   ),
                 ),
                 const SizedBox(
@@ -81,7 +91,7 @@ class TrafficUsage extends StatelessWidget {
                   child: getTrafficDataItem(
                     context,
                     Icons.arrow_downward,
-                    downTotalTrafficValue,
+                    downTrafficValue,
                   ),
                 ),
               ],

lib/fragments/fragments.dart

@@ -1,4 +1,4 @@
-export 'proxies/proxies.dart';
+export 'proxies.dart';
 export 'dashboard/dashboard.dart';
 export 'tools.dart';
 export 'profiles/profiles.dart';
@@ -9,5 +9,4 @@ export 'config.dart';
 export 'application_setting.dart';
 export 'about.dart';
 export 'backup_and_recovery.dart';
-export 'resources.dart';
-export 'requests.dart';
+export 'resources.dart';

lib/fragments/logs.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:collection/collection.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
@@ -17,32 +16,20 @@ class LogsFragment extends StatefulWidget {
 }
 
 class _LogsFragmentState extends State<LogsFragment> {
-  final logsNotifier = ValueNotifier<LogsAndKeywords>(const LogsAndKeywords());
-  final scrollController = ScrollController(
-    keepScrollOffset: false,
-  );
-  List<GlobalObjectKey<_LogItemState>> keys = [];
-
+  final logsNotifier = ValueNotifier<List<Log>>([]);
   Timer? timer;
 
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final appState = globalState.appController.appState;
-      logsNotifier.value = logsNotifier.value.copyWith(logs: appState.logs);
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      logsNotifier.value = context.read<AppState>().logs;
       if (timer != null) {
         timer?.cancel();
         timer = null;
       }
       timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
-        final logs = appState.logs;
-        if (!const ListEquality<Log>().equals(
-          logsNotifier.value.logs,
-          logs,
-        )) {
-          logsNotifier.value = logsNotifier.value.copyWith(logs: logs);
-        }
+        logsNotifier.value = globalState.appController.appState.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) {
-    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,
+  _buildList() {
+    return ValueListenableBuilder<List<Log>>(
+      valueListenable: logsNotifier,
+      builder: (_, List<Log> logs, __) {
+        if (logs.isEmpty) {
+          return NullStatus(
+            label: appLocalizations.nullLogsDesc,
+          );
+        }
+        logs = logs.reversed.toList();
+        return ListView.separated(
+          physics: const AlwaysScrollableScrollPhysics(),
+          itemCount: logs.length,
+          itemBuilder: (BuildContext context, int index) {
+            final log = logs[index];
+            return LogItem(
+              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>(
-        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,
-                ),
-              )
-            ],
-          );
-        },
-      ),
+      child: _buildList(),
     );
   }
 }
 
 class LogsSearchDelegate extends SearchDelegate {
-  ValueNotifier<LogsAndKeywords> logsNotifier;
+  List<Log> logs = [];
 
   LogsSearchDelegate({
-    required LogsAndKeywords logs,
-  }) : logsNotifier = ValueNotifier(logs);
-
-  @override
-  void dispose() {
-    super.dispose();
-    logsNotifier.dispose();
-  }
-
-  get state => logsNotifier.value;
+    required this.logs,
+  });
 
   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(
-      valueListenable: logsNotifier,
-      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 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,
-              ),
-            )
-          ],
+    return ListView.separated(
+      physics: const AlwaysScrollableScrollPhysics(),
+      itemCount: _results.length,
+      itemBuilder: (BuildContext context, int index) {
+        final log = _results[index];
+        return LogItem(
+          key: ValueKey(log.dateTime),
+          log: log,
+        );
+      },
+      separatorBuilder: (BuildContext context, int index) {
+        return const Divider(
+          height: 0,
         );
       },
     );
   }
 }
 
-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,7 +91,6 @@ class _URLFormDialogState extends State<URLFormDialog> {
           runSpacing: 16,
           children: [
             TextField(
-              maxLines: null,
               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(
-      url: urlController.text,
-      label: labelController.text,
-      autoUpdate: autoUpdate,
-      autoUpdateDuration: Duration(
-        minutes: int.parse(
-          autoUpdateDurationController.text,
-        ),
-      ),
-    );
-    final hasUpdate = widget.profile.url != profile.url;
-    config.setProfile(profile);
+    final hasUpdate = urlController.text.isNotEmpty && widget.profile.url != urlController.text;
+    widget.profile.url = urlController.text;
+    widget.profile.label = labelController.text;
+    widget.profile.autoUpdate = autoUpdate;
+    widget.profile.autoUpdateDuration =
+        Duration(minutes: int.parse(autoUpdateDurationController.text));
+    config.setProfile(widget.profile);
     if (hasUpdate) {
-      globalState.homeScaffoldKey.currentState?.loadingRun(
-        () async {
-          if (hasUpdate) {
-            await globalState.appController.updateProfile(profile);
-          }
-        },
-      );
+      widget.context.findAncestorStateOfType<CommonScaffoldState>()?.loadingRun(
+            () => globalState.appController.updateProfile(
+              widget.profile.id,
+            ),
+          );
     }
     Navigator.of(context).pop();
   }
@@ -90,11 +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: null,
+            minLines: 1,
+            maxLines: 2,
             decoration: InputDecoration(
               border: const OutlineInputBorder(),
               labelText: appLocalizations.url,

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,7 +15,6 @@ enum ProfileActions {
   edit,
   update,
   delete,
-  view,
 }
 
 class ProfilesFragment extends StatefulWidget {
@@ -29,8 +27,6 @@ class ProfilesFragment extends StatefulWidget {
 class _ProfilesFragmentState extends State<ProfilesFragment> {
   final hasPadding = ValueNotifier<bool>(false);
 
-  List<GlobalObjectKey<_ProfileItemState>> profileItemKeys = [];
-
   _handleShowAddExtendPage() {
     showExtendPage(
       globalState.navigatorKey.currentState!.context,
@@ -52,22 +48,19 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     }
   }
 
-  _updateProfiles() async {
-    final updateProfiles = profileItemKeys.map<Future>(
-        (key) async => await key.currentState?.updateProfile(false));
-    final result = 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),
           ),
@@ -86,12 +79,6 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     );
   }
 
-  @override
-  void dispose() {
-    super.dispose();
-    hasPadding.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return Selector<AppState, bool>(
@@ -114,9 +101,6 @@ 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(
@@ -148,11 +132,10 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
                       crossAxisSpacing: 16,
                       crossAxisCount: columns,
                       children: [
-                        for (int i = 0; i < state.profiles.length; i++)
+                        for (final profile in state.profiles)
                           GridItem(
                             child: ProfileItem(
-                              key: profileItemKeys[i],
-                              profile: state.profiles[i],
+                              profile: profile,
                               groupValue: state.currentProfileId,
                               onChanged:
                                   globalState.appController.changeProfile,
@@ -190,51 +173,42 @@ class ProfileItem extends StatefulWidget {
 class _ProfileItemState extends State<ProfileItem> {
   final isUpdating = ValueNotifier<bool>(false);
 
-  _handleDeleteProfile() async {
-    globalState.appController.deleteProfile(widget.profile.id);
+  _handleDeleteProfile(String id) async {
+    globalState.appController.deleteProfile(id);
   }
 
-  _handleUpdateProfile() async {
-    await globalState.safeRun<void>(updateProfile);
-  }
-
-  Future updateProfile([isSingle = true]) async {
+  _handleUpdateProfile(String id) async {
     isUpdating.value = true;
-    try {
-      await globalState.appController.updateProfile(widget.profile);
-    } catch (e) {
-      isUpdating.value = false;
-      if (!isSingle) {
-        return e.toString();
-      }
-    }
+    await globalState.safeRun<void>(() async {
+      await globalState.appController.updateProfile(id);
+    });
     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 +227,53 @@ class _ProfileItemState extends State<ProfileItem> {
               ),
               Text(
                 profile.lastUpdateDate?.lastUpdateTimeDesc ?? '',
-                style: textTheme.labelMedium?.toLight,
+                style: textTheme.labelMedium?.toLight(),
               ),
             ],
           ),
-          Builder(builder: (context) {
-            final userInfo = profile.userInfo ?? const 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
-                ? 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,
+          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(
+                    "到期时间:",
+                    style: textTheme.labelMedium?.toLighter(),
                   ),
-                  child: LinearProgressIndicator(
-                    minHeight: 6,
-                    value: progress,
+                  const SizedBox(
+                    width: 4,
                   ),
-                ),
-                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,
-                    ),
-                  ],
-                )
-              ],
-            );
-            // 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,
-            // );
-          }),
+                  Text(
+                    expireShow,
+                    style: textTheme.labelMedium?.toLighter(),
+                  ),
+                ],
+              )
+            ],
+          ),
         ],
       ),
     );
   }
 
-  @override
-  void dispose() {
-    isUpdating.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     final profile = widget.profile;
@@ -412,63 +298,40 @@ class _ProfileItemState extends State<ProfileItem> {
           onChanged: onChanged,
         ),
         padding: const EdgeInsets.symmetric(horizontal: 16),
-        trailing: SizedBox(
-          height: 48,
-          width: 48,
-          child: ValueListenableBuilder(
-            valueListenable: isUpdating,
-            builder: (_, isUpdating, ___) {
-              return FadeBox(
-                  child: isUpdating
-                      ? const Padding(
-                          padding: EdgeInsets.all(8),
-                          child: CircularProgressIndicator(),
-                        )
-                      : CommonPopupMenu<ProfileActions>(
-                          items: [
-                            CommonPopupMenuItem(
-                              action: ProfileActions.edit,
-                              label: appLocalizations.edit,
-                              iconData: Icons.edit,
-                            ),
-                            if (profile.type == ProfileType.url)
-                              CommonPopupMenuItem(
-                                action: ProfileActions.update,
-                                label: appLocalizations.update,
-                                iconData: Icons.sync,
-                              ),
-                            CommonPopupMenuItem(
-                              action: ProfileActions.delete,
-                              label: appLocalizations.delete,
-                              iconData: Icons.delete,
-                            ),
-                            CommonPopupMenuItem(
-                              action: ProfileActions.view,
-                              label: "查看",
-                              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;
-                            }
-                          },
-                        ));
-            },
-          ),
+        trailing: CommonPopupMenu<ProfileActions>(
+          items: [
+            CommonPopupMenuItem(
+              action: ProfileActions.edit,
+              label: appLocalizations.edit,
+              iconData: Icons.edit,
+            ),
+            if (profile.type == ProfileType.url)
+              CommonPopupMenuItem(
+                action: ProfileActions.update,
+                label: appLocalizations.update,
+                iconData: Icons.sync,
+              ),
+            CommonPopupMenuItem(
+              action: ProfileActions.delete,
+              label: appLocalizations.delete,
+              iconData: Icons.delete,
+            ),
+          ],
+          onSelected: (ProfileActions? action) async {
+            switch (action) {
+              case ProfileActions.edit:
+                _handleShowEditExtendPage(profile);
+                break;
+              case ProfileActions.delete:
+                _handleDeleteProfile(profile.id);
+                break;
+              case ProfileActions.update:
+                _handleUpdateProfile(profile.id);
+                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/proxies.dart

@@ -1,107 +1,130 @@
-import 'package:collection/collection.dart';
 import 'package:fl_clash/clash/clash.dart';
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/state.dart';
-import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-class ProxiesTabFragment extends StatefulWidget {
-  const ProxiesTabFragment({super.key});
+import '../enum/enum.dart';
+import '../models/models.dart';
+import '../common/common.dart';
+import '../widgets/widgets.dart';
+
+class ProxiesFragment extends StatefulWidget {
+  const ProxiesFragment({super.key});
 
   @override
-  State<ProxiesTabFragment> createState() => _ProxiesTabFragmentState();
+  State<ProxiesFragment> createState() => _ProxiesFragmentState();
 }
 
-class _ProxiesTabFragmentState extends State<ProxiesTabFragment> with TickerProviderStateMixin {
+class _ProxiesFragmentState extends State<ProxiesFragment>
+    with TickerProviderStateMixin {
   TabController? _tabController;
 
-  _handleTabControllerChange() {
-    final indexIsChanging = _tabController?.indexIsChanging ?? false;
-    if (indexIsChanging) return;
-    final index = _tabController?.index;
-    if (index == null) return;
-    final appController = globalState.appController;
-    final currentGroups = appController.appState.currentGroups;
-    if (currentGroups.length > index) {
-      appController.config.updateCurrentGroupName(currentGroups[index].name);
-    }
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    _tabController?.dispose();
+  _initActions() {
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      final commonScaffoldState =
+          context.findAncestorStateOfType<CommonScaffoldState>();
+      final items = [
+        CommonPopupMenuItem(
+          action: ProxiesSortType.none,
+          label: appLocalizations.defaultSort,
+          iconData: Icons.sort,
+        ),
+        CommonPopupMenuItem(
+            action: ProxiesSortType.delay,
+            label: appLocalizations.delaySort,
+            iconData: Icons.network_ping),
+        CommonPopupMenuItem(
+            action: ProxiesSortType.name,
+            label: appLocalizations.nameSort,
+            iconData: Icons.sort_by_alpha),
+      ];
+      commonScaffoldState?.actions = [
+        Selector<Config, ProxiesSortType>(
+          selector: (_, config) => config.proxiesSortType,
+          builder: (_, proxiesSortType, __) {
+            return CommonPopupMenu<ProxiesSortType>.radio(
+              items: items,
+              onSelected: (value) {
+                final config = context.read<Config>();
+                config.proxiesSortType = value;
+              },
+              selectedValue: proxiesSortType,
+            );
+          },
+        ),
+        const SizedBox(
+          width: 8,
+        )
+      ];
+    });
   }
 
   @override
   Widget build(BuildContext context) {
-    return Selector2<AppState, Config, ProxiesSelectorState>(
-      selector: (_, appState, config) {
-        final currentGroups = appState.currentGroups;
-        final groupNames = currentGroups.map((e) => e.name).toList();
-        return ProxiesSelectorState(
-          groupNames: groupNames,
-          currentGroupName: config.currentGroupName,
-        );
-      },
-      shouldRebuild: (prev, next) {
-        if (!const ListEquality<String>()
-            .equals(prev.groupNames, next.groupNames)) {
-          _tabController?.removeListener(_handleTabControllerChange);
-          _tabController?.dispose();
-          _tabController = null;
-          return true;
+    return Selector<AppState, bool>(
+      selector: (_, appState) => appState.currentLabel == 'proxies',
+      builder: (_, isCurrent, child) {
+        if (isCurrent) {
+          _initActions();
         }
-        return false;
+        return child!;
       },
-      builder: (_, state, __) {
-        final index = state.groupNames.indexWhere(
-              (item) => item == state.currentGroupName,
-        );
-        _tabController ??= TabController(
-          length: state.groupNames.length,
-          initialIndex: index == -1 ? 0 : index,
-          vsync: this,
-        )..addListener(_handleTabControllerChange);
-        return Column(
-          mainAxisAlignment: MainAxisAlignment.start,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            TabBar(
-              controller: _tabController,
-              padding: const EdgeInsets.symmetric(horizontal: 16),
-              dividerColor: Colors.transparent,
-              isScrollable: true,
-              tabAlignment: TabAlignment.start,
-              overlayColor:
-              const WidgetStatePropertyAll(Colors.transparent),
-              tabs: [
-                for (final groupName in state.groupNames)
-                  Tab(
-                    text: groupName,
-                  ),
-              ],
-            ),
-            Expanded(
-              child: TabBarView(
+      child: Selector3<AppState, Config, ClashConfig, ProxiesSelectorState>(
+        selector: (_, appState, config, clashConfig) {
+          final currentGroups = appState.currentGroups;
+          final groupNames = currentGroups.map((e) => e.name).toList();
+          return ProxiesSelectorState(
+            groupNames: groupNames,
+          );
+        },
+        shouldRebuild: (prev, next) {
+          if (prev.groupNames.length != next.groupNames.length) {
+            _tabController?.dispose();
+            _tabController = null;
+          }
+          return prev != next;
+        },
+        builder: (_, state, __) {
+          _tabController ??= TabController(
+            length: state.groupNames.length,
+            vsync: this,
+          );
+          return Column(
+            mainAxisAlignment: MainAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              TabBar(
                 controller: _tabController,
-                children: [
+                padding: const EdgeInsets.symmetric(horizontal: 16),
+                dividerColor: Colors.transparent,
+                isScrollable: true,
+                tabAlignment: TabAlignment.start,
+                overlayColor: const WidgetStatePropertyAll(Colors.transparent),
+                tabs: [
                   for (final groupName in state.groupNames)
-                    KeepContainer(
-                      key: ObjectKey(groupName),
-                      child: ProxiesTabView(
-                        groupName: groupName,
-                      ),
+                    Tab(
+                      text: groupName,
                     ),
                 ],
               ),
-            )
-          ],
-        );
-      },
+              Expanded(
+                child: TabBarView(
+                  controller: _tabController,
+                  children: [
+                    for (final groupName in state.groupNames)
+                      KeepContainer(
+                        key: ObjectKey(groupName),
+                        child: ProxiesTabView(
+                          groupName: groupName,
+                        ),
+                      ),
+                  ],
+                ),
+              )
+            ],
+          );
+        },
+      ),
     );
   }
 }
@@ -117,7 +140,7 @@ class ProxiesTabView extends StatelessWidget {
   List<Proxy> _sortOfName(List<Proxy> proxies) {
     return List.of(proxies)
       ..sort(
-            (a, b) => other.sortByChar(a.name, b.name),
+        (a, b) => other.sortByChar(a.name, b.name),
       );
   }
 
@@ -125,7 +148,7 @@ class ProxiesTabView extends StatelessWidget {
     final appState = context.read<AppState>();
     return proxies = List.of(proxies)
       ..sort(
-            (a, b) {
+        (a, b) {
           final aDelay = appState.getDelay(a.name);
           final bDelay = appState.getDelay(b.name);
           if (aDelay == null && bDelay == null) {
@@ -143,10 +166,10 @@ class ProxiesTabView extends StatelessWidget {
   }
 
   _getProxies(
-      BuildContext context,
-      List<Proxy> proxies,
-      ProxiesSortType proxiesSortType,
-      ) {
+    BuildContext context,
+    List<Proxy> proxies,
+    ProxiesSortType proxiesSortType,
+  ) {
     if (proxiesSortType == ProxiesSortType.delay) {
       return _sortOfDelay(context, proxies);
     }
@@ -177,8 +200,7 @@ class ProxiesTabView extends StatelessWidget {
   _delayTest(List<Proxy> proxies) async {
     for (final proxy in proxies) {
       final appController = globalState.appController;
-      final proxyName =
-          appController.appState.getRealProxyName(proxy.name) ?? proxy.name;
+      final proxyName = appController.appState.getRealProxyName(proxy.name) ?? proxy.name;
       globalState.appController.setDelay(
         Delay(
           name: proxyName,
@@ -329,7 +351,7 @@ class ProxyCard extends StatelessWidget {
                           style: context.textTheme.bodySmall?.copyWith(
                             overflow: TextOverflow.ellipsis,
                             color:
-                            context.textTheme.bodySmall?.color?.toLight(),
+                                context.textTheme.bodySmall?.color?.toLight(),
                           ),
                         ),
                       );

lib/fragments/proxies/expansion_panel.dart

@@ -1,59 +0,0 @@
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/widgets/card.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class ProxiesExpansionPanelFragment extends StatefulWidget {
-  const ProxiesExpansionPanelFragment({super.key});
-
-  @override
-  State<ProxiesExpansionPanelFragment> createState() =>
-      _ProxiesExpansionPanelFragmentState();
-}
-
-class _ProxiesExpansionPanelFragmentState
-    extends State<ProxiesExpansionPanelFragment> {
-  @override
-  Widget build(BuildContext context) {
-    return Selector2<AppState, Config, ProxiesSelectorState>(
-      selector: (_, appState, config) {
-        final currentGroups = appState.currentGroups;
-        final groupNames = currentGroups.map((e) => e.name).toList();
-        return ProxiesSelectorState(
-          groupNames: groupNames,
-          currentGroupName: config.currentGroupName,
-        );
-      },
-      builder: (_, state, __) {
-        return ListView.separated(
-          padding: const EdgeInsets.all(16),
-          itemCount: state.groupNames.length,
-          itemBuilder: (_, index) {
-            final groupName = state.groupNames[index];
-            return CommonCard(
-              child: ExpansionTile(
-                title: Text(groupName),
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(0.0),
-                  side: const BorderSide(color: Colors.transparent),
-                ),
-                collapsedShape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(0.0),
-                  side: const BorderSide(color: Colors.transparent),
-                ),
-                children: [
-                  Text("1212313"),
-                ],
-              ),
-            );
-          },
-          separatorBuilder: (BuildContext context, int index) {
-            return const SizedBox(
-              height: 16,
-            );
-          },
-        );
-      },
-    );
-  }
-}

lib/fragments/proxies/proxies.dart

@@ -1,72 +0,0 @@
-import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/fragments/proxies/tabview.dart';
-import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/widgets/widgets.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-class ProxiesFragment extends StatefulWidget {
-  const ProxiesFragment({super.key});
-
-  @override
-  State<ProxiesFragment> createState() => _ProxiesFragmentState();
-}
-
-class _ProxiesFragmentState extends State<ProxiesFragment> {
-
-  _initActions() {
-    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-      final commonScaffoldState =
-          context.findAncestorStateOfType<CommonScaffoldState>();
-      final items = [
-        CommonPopupMenuItem(
-          action: ProxiesSortType.none,
-          label: appLocalizations.defaultSort,
-          iconData: Icons.sort,
-        ),
-        CommonPopupMenuItem(
-            action: ProxiesSortType.delay,
-            label: appLocalizations.delaySort,
-            iconData: Icons.network_ping),
-        CommonPopupMenuItem(
-            action: ProxiesSortType.name,
-            label: appLocalizations.nameSort,
-            iconData: Icons.sort_by_alpha),
-      ];
-      commonScaffoldState?.actions = [
-        Selector<Config, ProxiesSortType>(
-          selector: (_, config) => config.proxiesSortType,
-          builder: (_, proxiesSortType, __) {
-            return CommonPopupMenu<ProxiesSortType>.radio(
-              items: items,
-              onSelected: (value) {
-                final config = context.read<Config>();
-                config.proxiesSortType = value;
-              },
-              selectedValue: proxiesSortType,
-            );
-          },
-        ),
-        const SizedBox(
-          width: 8,
-        )
-      ];
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Selector<AppState, bool>(
-      selector: (_, appState) => appState.currentLabel == 'proxies',
-      builder: (_, isCurrent, child) {
-        if (isCurrent) {
-          _initActions();
-        }
-        return child!;
-      },
-      child: const ProxiesTabFragment(),
-    );
-  }
-}
-

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/l10n/arb/intl_en.arb

@@ -176,21 +176,5 @@
   "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"
+  "geodataLoaderDesc": "Enabling will use the Geo low memory loader"
 }

lib/l10n/arb/intl_zh_CN.arb

@@ -176,21 +176,5 @@
   "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": "粘贴"
+  "geodataLoaderDesc": "开启将使用Geo低内存加载器"
 }

lib/l10n/intl/messages_en.dart

@@ -92,16 +92,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,8 +117,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(
@@ -135,9 +128,6 @@ 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":
@@ -149,10 +139,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "hours": MessageLookupByLibrary.simpleMessage("Hours"),
         "importFromURL":
             MessageLookupByLibrary.simpleMessage("Import from URL"),
-        "infiniteTime":
-            MessageLookupByLibrary.simpleMessage("Long term effective"),
-        "init": MessageLookupByLibrary.simpleMessage("Init"),
-        "intranetIp": MessageLookupByLibrary.simpleMessage("Intranet IP"),
         "ipCheckTimeout":
             MessageLookupByLibrary.simpleMessage("Ip check timeout"),
         "ipv6Desc": MessageLookupByLibrary.simpleMessage(
@@ -185,14 +171,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"),
@@ -201,7 +184,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":
@@ -243,9 +225,6 @@ 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"),
@@ -294,7 +273,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "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

@@ -75,15 +75,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,7 +97,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "edit": MessageLookupByLibrary.simpleMessage("编辑"),
         "en": MessageLookupByLibrary.simpleMessage("英语"),
         "exit": MessageLookupByLibrary.simpleMessage("退出"),
-        "expirationTime": MessageLookupByLibrary.simpleMessage("到期时间"),
         "externalController": MessageLookupByLibrary.simpleMessage("外部控制器"),
         "externalControllerDesc":
             MessageLookupByLibrary.simpleMessage("开启后将可以通过9090端口控制clash内核"),
@@ -109,9 +104,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "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低内存模式"),
@@ -121,9 +113,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "goDownload": MessageLookupByLibrary.simpleMessage("前往下载"),
         "hours": MessageLookupByLibrary.simpleMessage("小时"),
         "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
-        "infiniteTime": MessageLookupByLibrary.simpleMessage("长期有效"),
-        "init": MessageLookupByLibrary.simpleMessage("初始化"),
-        "intranetIp": MessageLookupByLibrary.simpleMessage("内网 IP"),
         "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
         "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收ipv6流量"),
         "just": MessageLookupByLibrary.simpleMessage("刚刚"),
@@ -150,19 +139,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":
@@ -194,8 +180,6 @@ 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("规则"),
@@ -236,7 +220,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "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

@@ -1829,166 +1829,6 @@ class AppLocalizations {
       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: [],
-    );
-  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

lib/main.dart

@@ -31,6 +31,7 @@ Future<void> main() async {
     config: config,
     clashConfig: clashConfig,
   );
+
   runAppWithPreferences(
     const Application(),
     appState: appState,
@@ -54,18 +55,21 @@ Future<void> vpnService() async {
       int.parse(fd),
     );
   }));
-
   await globalState.init(
     appState: appState,
     config: config,
     clashConfig: clashConfig,
   );
 
-  globalState.applyProfile(
-    appState: appState,
-    config: config,
-    clashConfig: clashConfig,
-  );
+  if (appState.isInit) {
+    await globalState.applyProfile(
+      appState: appState,
+      config: config,
+      clashConfig: clashConfig,
+    );
+  } else {
+    exit(0);
+  }
 
   final appLocalizations = await AppLocalizations.load(
     other.getLocaleForString(config.locale) ??
@@ -75,7 +79,6 @@ Future<void> vpnService() async {
   handleStart() async {
     await app?.tip(appLocalizations.startVpn);
     await globalState.startSystemProxy(
-      appState: appState,
       config: config,
       clashConfig: clashConfig,
     );
@@ -87,18 +90,19 @@ Future<void> vpnService() async {
     ];
   }
 
-  handleStart();
-
-  tile?.addListener(
-    TileListenerWithVpn(
-      onStop: () async {
-        await app?.tip(appLocalizations.stopVpn);
-        await globalState.stopSystemProxy();
-        clashCore.shutdown();
-        exit(0);
-      },
-    ),
-  );
+  if (appState.isInit) {
+    handleStart();
+    tile?.addListener(
+      TileListenerWithVpn(
+        onStop: () async {
+          await app?.tip(appLocalizations.stopVpn);
+          await globalState.stopSystemProxy();
+          clashCore.shutdown();
+          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,
@@ -159,39 +152,8 @@ class AppState with ChangeNotifier {
     }
   }
 
-  addTraffic(Traffic traffic) {
-    _traffics = List.from(_traffics)..add(traffic);
-    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);
-    }
+  addTraffic(Traffic value) {
+    _traffics = List.from(_traffics)..add(value);
     notifyListeners();
   }
 
@@ -205,10 +167,9 @@ class AppState with ChangeNotifier {
   }
 
   addLog(Log log) {
-    _logs = List.from(_logs)..add(log);
-    final maxLength = Platform.isAndroid ? 1000 : 60;
-    if (_logs.length > maxLength) {
-      _logs = _logs.sublist(_logs.length - maxLength);
+    _logs.add(log);
+    if (_logs.length > 60) {
+      _logs = _logs.sublist(_logs.length - 60);
     }
     notifyListeners();
   }

lib/models/clash_config.dart

@@ -113,29 +113,39 @@ class ClashConfig extends ChangeNotifier {
   LogLevel _logLevel;
   String _externalController;
   Mode _mode;
-  FindProcessMode _findProcessMode;
   bool _unifiedDelay;
   bool _tcpConcurrent;
   Tun _tun;
   Dns _dns;
   List<String> _rules;
 
-  ClashConfig()
-      : _mixedPort = 7890,
-        _mode = Mode.rule,
-        _ipv6 = false,
-        _findProcessMode = FindProcessMode.off,
-        _allowLan = false,
-        _tcpConcurrent = false,
-        _logLevel = LogLevel.info,
-        _tun = const Tun(),
-        _unifiedDelay = false,
-        _geodataLoader = geodataLoaderMemconservative,
-        _externalController = '',
-        _dns = Dns(),
-        _rules = [];
+  ClashConfig({
+    int? mixedPort,
+    Mode? mode,
+    bool? allowLan,
+    bool? ipv6,
+    LogLevel? logLevel,
+    String? externalController,
+    String? geodataLoader,
+    bool? unifiedDelay,
+    Tun? tun,
+    Dns? dns,
+    bool? tcpConcurrent,
+    List<String>? rules,
+  })  : _mixedPort = mixedPort ?? 7890,
+        _mode = mode ?? Mode.rule,
+        _ipv6 = ipv6 ?? false,
+        _allowLan = allowLan ?? false,
+        _tcpConcurrent = tcpConcurrent ?? false,
+        _logLevel = logLevel ?? LogLevel.info,
+        _tun = tun ?? const Tun(),
+        _unifiedDelay = unifiedDelay ?? false,
+        _geodataLoader = geodataLoader ?? geodataLoaderMemconservative,
+        _externalController = externalController ?? '',
+        _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 +155,6 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
-  @JsonKey(defaultValue: Mode.rule)
   Mode get mode => _mode;
 
   set mode(Mode value) {
@@ -155,16 +164,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 +174,7 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
-  @JsonKey(name: "log-level", defaultValue: LogLevel.info)
+  @JsonKey(name: "log-level")
   LogLevel get logLevel => _logLevel;
 
   set logLevel(LogLevel value) {
@@ -283,6 +282,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

@@ -32,7 +32,8 @@ class Props with _$Props {
     bool? systemProxy,
   }) = _Props;
 
-  factory Props.fromJson(Map<String, Object?> json) => _$PropsFromJson(json);
+  factory Props.fromJson(Map<String, Object?> json) =>
+      _$PropsFromJson(json);
 }
 
 @JsonSerializable()
@@ -70,7 +71,7 @@ class Config extends ChangeNotifier {
         _isMinimizeOnExit = true,
         _isAccessControl = false,
         _autoCheckUpdate = true,
-        _systemProxy = true,
+        _systemProxy = false,
         _accessControl = const AccessControl(),
         _isAnimateToPage = true,
         _allowBypass = true;
@@ -143,22 +144,10 @@ class Config extends ChangeNotifier {
   }
 
   Profile? get currentProfile {
-    final index =
-        profiles.indexWhere((profile) => profile.id == _currentProfileId);
-    return index == -1 ? null : profiles[index];
-  }
-
-  String? get currentGroupName => currentProfile?.currentGroupName;
-
-  updateCurrentGroupName(String groupName) {
-    if (currentProfile != null &&
-        currentProfile!.currentGroupName != groupName) {
-      _setProfile(
-        currentProfile!.copyWith(
-          currentGroupName: groupName,
-        ),
-      );
-      notifyListeners();
+    try {
+      return profiles.firstWhere((element) => element.id == _currentProfileId);
+    } catch (_) {
+      return null;
     }
   }
 
@@ -167,16 +156,9 @@ class Config extends ChangeNotifier {
   }
 
   updateCurrentSelectedMap(String groupName, String proxyName) {
-    if (currentProfile != null &&
-        currentProfile!.selectedMap[groupName] != proxyName) {
-      final SelectedMap selectedMap = Map.from(
-        currentProfile?.selectedMap ?? {},
-      )..[groupName] = proxyName;
-      _setProfile(
-        currentProfile!.copyWith(
-          selectedMap: selectedMap,
-        ),
-      );
+    if (currentProfile?.selectedMap[groupName] != proxyName) {
+      currentProfile?.selectedMap = Map.from(currentProfile?.selectedMap ?? {})
+        ..[groupName] = proxyName;
       notifyListeners();
     }
   }

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 Metadata metadata,
+    required int uid,
+    required String network,
+    required String source,
+    required String target,
   }) = _Process;
 
   factory Process.fromJson(Map<String, Object?> json) =>
       _$ProcessFromJson(json);
 }
 
-@freezed
-class ProcessMapItem with _$ProcessMapItem {
-  const factory ProcessMapItem({
-    required int id,
-    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.g.dart

@@ -35,29 +35,30 @@ Map<String, dynamic> _$DnsToJson(Dns instance) => <String, dynamic>{
       'fake-ip-filter': instance.fakeIpFilter,
     };
 
-ClashConfig _$ClashConfigFromJson(Map<String, dynamic> json) => ClashConfig()
-  ..mixedPort = (json['mixed-port'] as num?)?.toInt() ?? 7890
-  ..mode = $enumDecodeNullable(_$ModeEnumMap, json['mode']) ?? Mode.rule
-  ..findProcessMode = $enumDecodeNullable(
-          _$FindProcessModeEnumMap, json['find-process-mode']) ??
-      FindProcessMode.off
-  ..allowLan = json['allow-lan'] as bool
-  ..logLevel =
-      $enumDecodeNullable(_$LogLevelEnumMap, json['log-level']) ?? LogLevel.info
-  ..externalController = json['external-controller'] as String? ?? ''
-  ..ipv6 = json['ipv6'] as bool? ?? false
-  ..geodataLoader = json['geodata-loader'] as String? ?? 'memconservative'
-  ..unifiedDelay = json['unified-delay'] as bool? ?? false
-  ..tcpConcurrent = json['tcp-concurrent'] as bool? ?? false
-  ..tun = Tun.fromJson(json['tun'] as Map<String, dynamic>)
-  ..dns = Dns.fromJson(json['dns'] as Map<String, dynamic>)
-  ..rules = (json['rules'] as List<dynamic>).map((e) => e as String).toList();
+ClashConfig _$ClashConfigFromJson(Map<String, dynamic> json) => ClashConfig(
+      mixedPort: (json['mixed-port'] as num?)?.toInt(),
+      mode: $enumDecodeNullable(_$ModeEnumMap, json['mode']),
+      allowLan: json['allow-lan'] as bool?,
+      ipv6: json['ipv6'] as bool? ?? false,
+      logLevel: $enumDecodeNullable(_$LogLevelEnumMap, json['log-level']),
+      externalController: json['external-controller'] as String? ?? '',
+      geodataLoader: json['geodata-loader'] as String? ?? 'memconservative',
+      unifiedDelay: json['unified-delay'] as bool? ?? false,
+      tun: json['tun'] == null
+          ? null
+          : Tun.fromJson(json['tun'] as Map<String, dynamic>),
+      dns: json['dns'] == null
+          ? null
+          : Dns.fromJson(json['dns'] as Map<String, dynamic>),
+      tcpConcurrent: json['tcp-concurrent'] as bool? ?? false,
+      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,
@@ -76,11 +77,6 @@ const _$ModeEnumMap = {
   Mode.direct: 'direct',
 };
 
-const _$FindProcessModeEnumMap = {
-  FindProcessMode.always: 'always',
-  FindProcessMode.off: 'off',
-};
-
 const _$LogLevelEnumMap = {
   LogLevel.debug: 'debug',
   LogLevel.info: 'info',

lib/models/generated/connection.freezed.dart

@@ -27,7 +27,6 @@ mixin _$Metadata {
   String get destinationIP => throw _privateConstructorUsedError;
   String get destinationPort => throw _privateConstructorUsedError;
   String get host => throw _privateConstructorUsedError;
-  String get process => throw _privateConstructorUsedError;
   String get remoteDestination => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@@ -49,7 +48,6 @@ abstract class $MetadataCopyWith<$Res> {
       String destinationIP,
       String destinationPort,
       String host,
-      String process,
       String remoteDestination});
 }
 
@@ -73,7 +71,6 @@ class _$MetadataCopyWithImpl<$Res, $Val extends Metadata>
     Object? destinationIP = null,
     Object? destinationPort = null,
     Object? host = null,
-    Object? process = null,
     Object? remoteDestination = null,
   }) {
     return _then(_value.copyWith(
@@ -105,10 +102,6 @@ class _$MetadataCopyWithImpl<$Res, $Val extends Metadata>
           ? _value.host
           : host // ignore: cast_nullable_to_non_nullable
               as String,
-      process: null == process
-          ? _value.process
-          : process // ignore: cast_nullable_to_non_nullable
-              as String,
       remoteDestination: null == remoteDestination
           ? _value.remoteDestination
           : remoteDestination // ignore: cast_nullable_to_non_nullable
@@ -133,7 +126,6 @@ abstract class _$$MetadataImplCopyWith<$Res>
       String destinationIP,
       String destinationPort,
       String host,
-      String process,
       String remoteDestination});
 }
 
@@ -155,7 +147,6 @@ class __$$MetadataImplCopyWithImpl<$Res>
     Object? destinationIP = null,
     Object? destinationPort = null,
     Object? host = null,
-    Object? process = null,
     Object? remoteDestination = null,
   }) {
     return _then(_$MetadataImpl(
@@ -187,10 +178,6 @@ class __$$MetadataImplCopyWithImpl<$Res>
           ? _value.host
           : host // ignore: cast_nullable_to_non_nullable
               as String,
-      process: null == process
-          ? _value.process
-          : process // ignore: cast_nullable_to_non_nullable
-              as String,
       remoteDestination: null == remoteDestination
           ? _value.remoteDestination
           : remoteDestination // ignore: cast_nullable_to_non_nullable
@@ -210,7 +197,6 @@ class _$MetadataImpl implements _Metadata {
       required this.destinationIP,
       required this.destinationPort,
       required this.host,
-      required this.process,
       required this.remoteDestination});
 
   factory _$MetadataImpl.fromJson(Map<String, dynamic> json) =>
@@ -231,13 +217,11 @@ class _$MetadataImpl implements _Metadata {
   @override
   final String host;
   @override
-  final String process;
-  @override
   final String remoteDestination;
 
   @override
   String toString() {
-    return 'Metadata(uid: $uid, network: $network, sourceIP: $sourceIP, sourcePort: $sourcePort, destinationIP: $destinationIP, destinationPort: $destinationPort, host: $host, process: $process, remoteDestination: $remoteDestination)';
+    return 'Metadata(uid: $uid, network: $network, sourceIP: $sourceIP, sourcePort: $sourcePort, destinationIP: $destinationIP, destinationPort: $destinationPort, host: $host, remoteDestination: $remoteDestination)';
   }
 
   @override
@@ -256,24 +240,14 @@ class _$MetadataImpl implements _Metadata {
             (identical(other.destinationPort, destinationPort) ||
                 other.destinationPort == destinationPort) &&
             (identical(other.host, host) || other.host == host) &&
-            (identical(other.process, process) || other.process == process) &&
             (identical(other.remoteDestination, remoteDestination) ||
                 other.remoteDestination == remoteDestination));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      uid,
-      network,
-      sourceIP,
-      sourcePort,
-      destinationIP,
-      destinationPort,
-      host,
-      process,
-      remoteDestination);
+  int get hashCode => Object.hash(runtimeType, uid, network, sourceIP,
+      sourcePort, destinationIP, destinationPort, host, remoteDestination);
 
   @JsonKey(ignore: true)
   @override
@@ -298,7 +272,6 @@ abstract class _Metadata implements Metadata {
       required final String destinationIP,
       required final String destinationPort,
       required final String host,
-      required final String process,
       required final String remoteDestination}) = _$MetadataImpl;
 
   factory _Metadata.fromJson(Map<String, dynamic> json) =
@@ -319,8 +292,6 @@ abstract class _Metadata implements Metadata {
   @override
   String get host;
   @override
-  String get process;
-  @override
   String get remoteDestination;
   @override
   @JsonKey(ignore: true)
@@ -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;
-  Metadata get metadata => throw _privateConstructorUsedError;
+  int get uid => throw _privateConstructorUsedError;
+  String get network => throw _privateConstructorUsedError;
+  String get source => throw _privateConstructorUsedError;
+  String get target => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -861,9 +863,7 @@ abstract class $ProcessCopyWith<$Res> {
   factory $ProcessCopyWith(Process value, $Res Function(Process) then) =
       _$ProcessCopyWithImpl<$Res, Process>;
   @useResult
-  $Res call({int id, Metadata metadata});
-
-  $MetadataCopyWith<$Res> get metadata;
+  $Res call({int uid, String network, String source, String target});
 }
 
 /// @nodoc
@@ -879,28 +879,30 @@ class _$ProcessCopyWithImpl<$Res, $Val extends Process>
   @pragma('vm:prefer-inline')
   @override
   $Res call({
-    Object? id = null,
-    Object? metadata = null,
+    Object? uid = null,
+    Object? network = null,
+    Object? source = null,
+    Object? target = null,
   }) {
     return _then(_value.copyWith(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
+      uid: null == uid
+          ? _value.uid
+          : uid // ignore: cast_nullable_to_non_nullable
               as int,
-      metadata: null == metadata
-          ? _value.metadata
-          : metadata // ignore: cast_nullable_to_non_nullable
-              as Metadata,
+      network: null == network
+          ? _value.network
+          : network // ignore: cast_nullable_to_non_nullable
+              as String,
+      source: null == source
+          ? _value.source
+          : source // ignore: cast_nullable_to_non_nullable
+              as String,
+      target: null == target
+          ? _value.target
+          : target // ignore: cast_nullable_to_non_nullable
+              as String,
     ) as $Val);
   }
-
-  @override
-  @pragma('vm:prefer-inline')
-  $MetadataCopyWith<$Res> get metadata {
-    return $MetadataCopyWith<$Res>(_value.metadata, (value) {
-      return _then(_value.copyWith(metadata: value) as $Val);
-    });
-  }
 }
 
 /// @nodoc
@@ -910,10 +912,7 @@ abstract class _$$ProcessImplCopyWith<$Res> implements $ProcessCopyWith<$Res> {
       __$$ProcessImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({int id, Metadata metadata});
-
-  @override
-  $MetadataCopyWith<$Res> get metadata;
+  $Res call({int uid, String network, String source, String target});
 }
 
 /// @nodoc
@@ -927,18 +926,28 @@ class __$$ProcessImplCopyWithImpl<$Res>
   @pragma('vm:prefer-inline')
   @override
   $Res call({
-    Object? id = null,
-    Object? metadata = null,
+    Object? uid = null,
+    Object? network = null,
+    Object? source = null,
+    Object? target = null,
   }) {
     return _then(_$ProcessImpl(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
+      uid: null == uid
+          ? _value.uid
+          : uid // ignore: cast_nullable_to_non_nullable
               as int,
-      metadata: null == metadata
-          ? _value.metadata
-          : metadata // ignore: cast_nullable_to_non_nullable
-              as Metadata,
+      network: null == network
+          ? _value.network
+          : network // ignore: cast_nullable_to_non_nullable
+              as String,
+      source: null == source
+          ? _value.source
+          : source // ignore: cast_nullable_to_non_nullable
+              as String,
+      target: null == target
+          ? _value.target
+          : target // ignore: cast_nullable_to_non_nullable
+              as String,
     ));
   }
 }
@@ -946,19 +955,27 @@ class __$$ProcessImplCopyWithImpl<$Res>
 /// @nodoc
 @JsonSerializable()
 class _$ProcessImpl implements _Process {
-  const _$ProcessImpl({required this.id, required this.metadata});
+  const _$ProcessImpl(
+      {required this.uid,
+      required this.network,
+      required this.source,
+      required this.target});
 
   factory _$ProcessImpl.fromJson(Map<String, dynamic> json) =>
       _$$ProcessImplFromJson(json);
 
   @override
-  final int id;
+  final int uid;
   @override
-  final Metadata metadata;
+  final String network;
+  @override
+  final String source;
+  @override
+  final String target;
 
   @override
   String toString() {
-    return 'Process(id: $id, metadata: $metadata)';
+    return 'Process(uid: $uid, network: $network, source: $source, target: $target)';
   }
 
   @override
@@ -966,14 +983,15 @@ class _$ProcessImpl implements _Process {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$ProcessImpl &&
-            (identical(other.id, id) || other.id == id) &&
-            (identical(other.metadata, metadata) ||
-                other.metadata == metadata));
+            (identical(other.uid, uid) || other.uid == uid) &&
+            (identical(other.network, network) || other.network == network) &&
+            (identical(other.source, source) || other.source == source) &&
+            (identical(other.target, target) || other.target == target));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(runtimeType, id, metadata);
+  int get hashCode => Object.hash(runtimeType, uid, network, source, target);
 
   @JsonKey(ignore: true)
   @override
@@ -991,176 +1009,27 @@ class _$ProcessImpl implements _Process {
 
 abstract class _Process implements Process {
   const factory _Process(
-      {required final int id,
-      required final Metadata metadata}) = _$ProcessImpl;
+      {required final int uid,
+      required final String network,
+      required final String source,
+      required final String target}) = _$ProcessImpl;
 
   factory _Process.fromJson(Map<String, dynamic> json) = _$ProcessImpl.fromJson;
 
   @override
-  int get id;
+  int get uid;
   @override
-  Metadata get metadata;
+  String get network;
+  @override
+  String get source;
+  @override
+  String get target;
   @override
   @JsonKey(ignore: true)
   _$$ProcessImplCopyWith<_$ProcessImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
 
-ProcessMapItem _$ProcessMapItemFromJson(Map<String, dynamic> json) {
-  return _ProcessMapItem.fromJson(json);
-}
-
-/// @nodoc
-mixin _$ProcessMapItem {
-  int get id => throw _privateConstructorUsedError;
-  String get value => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $ProcessMapItemCopyWith<ProcessMapItem> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $ProcessMapItemCopyWith<$Res> {
-  factory $ProcessMapItemCopyWith(
-          ProcessMapItem value, $Res Function(ProcessMapItem) then) =
-      _$ProcessMapItemCopyWithImpl<$Res, ProcessMapItem>;
-  @useResult
-  $Res call({int id, String value});
-}
-
-/// @nodoc
-class _$ProcessMapItemCopyWithImpl<$Res, $Val extends ProcessMapItem>
-    implements $ProcessMapItemCopyWith<$Res> {
-  _$ProcessMapItemCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? id = null,
-    Object? value = 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(),
-      metadata: Metadata.fromJson(json['metadata'] as Map<String, dynamic>),
+      uid: (json['uid'] as num).toInt(),
+      network: json['network'] as String,
+      source: json['source'] as String,
+      target: json['target'] as String,
     );
 
 Map<String, dynamic> _$$ProcessImplToJson(_$ProcessImpl instance) =>
     <String, dynamic>{
-      'id': instance.id,
-      'metadata': instance.metadata,
-    };
-
-_$ProcessMapItemImpl _$$ProcessMapItemImplFromJson(Map<String, dynamic> json) =>
-    _$ProcessMapItemImpl(
-      id: (json['id'] as num).toInt(),
-      value: json['value'] as String,
-    );
-
-Map<String, dynamic> _$$ProcessMapItemImplToJson(
-        _$ProcessMapItemImpl instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'value': instance.value,
+      'uid': instance.uid,
+      'network': instance.network,
+      'source': instance.source,
+      'target': instance.target,
     };
 
 _$ExternalProviderImpl _$$ExternalProviderImplFromJson(

lib/models/generated/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,546 +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;
-
-  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});
-
-  $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,
-  }) {
-    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>,
-    ) 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});
-
-  @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,
-  }) {
-    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>,
-    ));
-  }
-}
-
-/// @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 {}})
-      : _selectedMap = selectedMap;
-
-  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);
-  }
-
-  @override
-  String toString() {
-    return 'Profile(id: $id, label: $label, currentGroupName: $currentGroupName, url: $url, lastUpdateDate: $lastUpdateDate, autoUpdateDuration: $autoUpdateDuration, userInfo: $userInfo, autoUpdate: $autoUpdate, selectedMap: $selectedMap)';
-  }
-
-  @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));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      id,
-      label,
-      currentGroupName,
-      url,
-      lastUpdateDate,
-      autoUpdateDuration,
-      userInfo,
-      autoUpdate,
-      const DeepCollectionEquality().hash(_selectedMap));
-
-  @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}) = _$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
-  @JsonKey(ignore: true)
-  _$$ProfileImplCopyWith<_$ProfileImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}

lib/models/generated/profile.g.dart

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

lib/models/generated/selector.freezed.dart

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

lib/models/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
-class UserInfo with _$UserInfo {
-  const factory UserInfo({
-    @Default(0) int upload,
-    @Default(0) int download,
-    @Default(0) int total,
-    @Default(0) int expire,
-  }) = _UserInfo;
+@JsonSerializable()
+class UserInfo {
+  int upload;
+  int download;
+  int total;
+  int expire;
 
-  factory UserInfo.fromJson(Map<String, Object?> json) =>
-      _$UserInfoFromJson(json);
+  UserInfo({
+    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,76 +45,73 @@ class UserInfo with _$UserInfo {
       map[keyValue[0]] = int.tryParse(keyValue[1]);
     }
     return UserInfo(
-      upload: map["upload"] ?? 0,
-      download: map["download"] ?? 0,
-      total: map["total"] ?? 0,
-      expire: map["expire"] ?? 0,
+      upload: map["upload"],
+      download: map["download"],
+      total: map["total"],
+      expire: map["expire"],
     );
   }
+
+  @override
+  String toString() {
+    return 'UserInfo{upload: $upload, download: $download, total: $total, expire: $expire}';
+  }
 }
 
-@freezed
-class Profile with _$Profile {
-  const factory Profile({
-    required String id,
-    String? label,
-    String? currentGroupName,
-    @Default("") String url,
-    DateTime? lastUpdateDate,
-    required Duration autoUpdateDuration,
-    UserInfo? userInfo,
-    @Default(true) bool autoUpdate,
-    @Default({}) SelectedMap selectedMap,
-  }) = _Profile;
+@JsonSerializable()
+class Profile {
+  String id;
+  String? label;
+  String? proxyName;
+  String? url;
+  DateTime? lastUpdateDate;
+  Duration autoUpdateDuration;
+  UserInfo? userInfo;
+  bool autoUpdate;
+  SelectedMap selectedMap;
 
-  factory Profile.fromJson(Map<String, Object?> json) =>
-      _$ProfileFromJson(json);
+  Profile({
+    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;
-
-  bool get realAutoUpdate =>
-      url.isEmpty == true ? false : autoUpdate;
+      url == null || url?.isEmpty == true ? ProfileType.file : ProfileType.url;
 
   Future<void> checkAndUpdate() async {
     final isExists = await check();
     if (!isExists) {
-      if (url.isNotEmpty) {
-        await update();
+      if (url != null) {
+        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 {
-    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 {
+  Future<void> saveFile(Uint8List bytes) async {
     final message = await clashCore.validateConfig(utf8.decode(bytes));
     if (message.isNotEmpty) {
       throw message;
@@ -115,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 {
-    final message = await clashCore.validateConfig(value);
-    if (message.isNotEmpty) {
-      throw message;
-    }
-    final path = await appPath.getProfilePath(id);
-    final file = File(path!);
-    final isExists = await file.exists();
-    if (!isExists) {
-      await file.create(recursive: true);
-    }
-    await file.writeAsString(value);
-    return copyWith(lastUpdateDate: DateTime.now());
+  Map<String, dynamic> toJson() {
+    return _$ProfileToJson(this);
+  }
+
+  factory Profile.fromJson(Map<String, dynamic> json) {
+    return _$ProfileFromJson(json);
+  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is Profile &&
+          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,7 +94,6 @@ class ProxiesCardSelectorState with _$ProxiesCardSelectorState {
 class ProxiesSelectorState with _$ProxiesSelectorState {
   const factory ProxiesSelectorState({
     required List<String> groupNames,
-    required String? currentGroupName,
   }) = _ProxiesSelectorState;
 }
 

lib/plugins/app.dart

@@ -18,11 +18,6 @@ class App {
       methodChannel = const MethodChannel("app");
       methodChannel!.setMethodCallHandler((call) async {
         switch (call.method) {
-          case "exit":
-            if (onExit != null) {
-              await onExit!();
-            }
-            break;
           case "gc":
             clashCore.requestGc();
             break;
@@ -68,9 +63,9 @@ class App {
     });
   }
 
-  Future<String?> resolverProcess(Process process) async {
-    return await methodChannel?.invokeMethod<String>("resolverProcess", {
-      "data": json.encode(process),
+  Future<String?> getPackageName(Metadata metadata) async {
+    return await methodChannel?.invokeMethod<String>("getPackageName", {
+      "data": json.encode(metadata),
     });
   }
 }

lib/plugins/proxy.dart

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

lib/state.dart

@@ -17,6 +17,7 @@ class GlobalState {
   Function? updateCurrentDelayDebounce;
   PageController? pageController;
   final navigatorKey = GlobalKey<NavigatorState>();
+  final Map<int, String?> packageNameMap = {};
   late AppController appController;
   GlobalKey<CommonScaffoldState> homeScaffoldKey = GlobalKey();
   List<Function> updateFunctionLists = [];
@@ -57,7 +58,6 @@ class GlobalState {
   }
 
   Future<void> startSystemProxy({
-    required AppState appState,
     required Config config,
     required ClashConfig clashConfig,
   }) async {
@@ -74,11 +74,6 @@ class GlobalState {
       args: args,
     );
     startListenUpdate();
-    applyProfile(
-      appState: appState,
-      config: config,
-      clashConfig: clashConfig,
-    );
   }
 
   Future<void> stopSystemProxy() async {
@@ -201,7 +196,6 @@ class GlobalState {
     final traffic = clashCore.getTraffic();
     if (appState != null) {
       appState.addTraffic(traffic);
-      appState.totalTraffic = clashCore.getTotalTraffic();
     }
     if (Platform.isAndroid) {
       final currentProfile = config.currentProfile;
@@ -218,30 +212,30 @@ class GlobalState {
     required String message,
     SnackBarAction? action,
   }) {
-    // final width = context.width;
-    // EdgeInsets margin;
-    // if (width < 600) {
-    //   margin = const EdgeInsets.only(
-    //     bottom: 96,
-    //     right: 16,
-    //     left: 16,
-    //   );
-    // } else {
-    //   margin = EdgeInsets.only(
-    //     bottom: 16,
-    //     left: 16,
-    //     right: width - 316,
-    //   );
-    // }
-    // ScaffoldMessenger.of(context).showSnackBar(
-    //   SnackBar(
-    //     action: action,
-    //     content: Text(message),
-    //     behavior: SnackBarBehavior.floating,
-    //     duration: const Duration(milliseconds: 1500),
-    //     margin: margin,
-    //   ),
-    // );
+    final width = context.width;
+    EdgeInsets margin;
+    if (width < 600) {
+      margin = const EdgeInsets.only(
+        bottom: 96,
+        right: 16,
+        left: 16,
+      );
+    } else {
+      margin = EdgeInsets.only(
+        bottom: 16,
+        left: 16,
+        right: width - 316,
+      );
+    }
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        action: action,
+        content: Text(message),
+        behavior: SnackBarBehavior.floating,
+        duration: const Duration(milliseconds: 1500),
+        margin: margin,
+      ),
+    );
   }
 
   Future<T?> safeRun<T>(

lib/widgets/chip.dart

@@ -1,36 +1,21 @@
-import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
 
 class CommonChip extends StatelessWidget {
   final String label;
-  final VoidCallback? onPressed;
-  final ChipType type;
-  final Widget? avatar;
 
   const CommonChip({
     super.key,
     required this.label,
-    this.onPressed,
-    this.avatar,
-    this.type = ChipType.action,
   });
 
   @override
   Widget build(BuildContext context) {
-    if(type == ChipType.delete){
-      return Chip(
-        avatar: avatar,
-        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-        onDeleted: onPressed ?? () {},
-        side: BorderSide(color: Theme.of(context).dividerColor.withOpacity(0.2)),
-        labelStyle: Theme.of(context).textTheme.bodyMedium,
-        label: Text(label),
-      );
-    }
-    return ActionChip(
+    return Chip(
       materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-      avatar: avatar,
-      onPressed: onPressed ?? () {},
+      padding: const EdgeInsets.symmetric(
+        vertical: 0,
+        horizontal: 4,
+      ),
       side: BorderSide(color: Theme.of(context).dividerColor.withOpacity(0.2)),
       labelStyle: Theme.of(context).textTheme.bodyMedium,
       label: Text(label),

lib/widgets/clash_message_container.dart

@@ -1,7 +1,6 @@
 import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/models/models.dart';
-import 'package:fl_clash/plugins/proxy.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:fl_clash/plugins/app.dart';
@@ -57,26 +56,9 @@ class _ClashMessageContainerState extends State<ClashMessageContainer>
   }
 
   @override
-  void onProcess(Process process) async {
-    var packageName = await app?.resolverProcess(process);
-    clashCore.setProcessMap(
-      ProcessMapItem(
-        id: process.id,
-        value: packageName ?? "",
-      ),
-    );
-    super.onProcess(process);
-  }
-
-  @override
-  void onRequest(Connection connection) async {
-    globalState.appController.appState.addRequest(connection);
-    super.onRequest(connection);
-  }
-
-  @override
-  void onRun(String runTime) async {
-    // proxy?.updateStartTime();
-    super.onRun(runTime);
+  void onProcess(Metadata metadata) async {
+    var packageName = await app?.getPackageName(metadata);
+    globalState.packageNameMap[metadata.uid] = packageName;
+    super.onProcess(metadata);
   }
 }

lib/widgets/null_status.dart

@@ -11,7 +11,7 @@ class NullStatus extends StatelessWidget {
     return Center(
       child: Text(
         label,
-        style: Theme.of(context).textTheme.titleMedium?.toBold,
+        style: Theme.of(context).textTheme.titleMedium?.toBold(),
       ),
     );
   }

lib/widgets/popup_menu.dart

@@ -53,12 +53,6 @@ class _CommonPopupMenuState<T> extends State<CommonPopupMenu<T>> {
     widget.onSelected(value);
   }
 
-  @override
-  void dispose() {
-    groupValue.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return PopupMenuButton<T>(

lib/widgets/scaffold.dart

@@ -7,7 +7,6 @@ import 'package:flutter/services.dart';
 class CommonScaffold extends StatefulWidget {
   final Widget body;
   final Widget? bottomNavigationBar;
-  final Widget? floatingActionButton;
   final String title;
   final Widget? leading;
   final List<Widget>? actions;
@@ -20,7 +19,6 @@ class CommonScaffold extends StatefulWidget {
     this.leading,
     required this.title,
     this.actions,
-    this.floatingActionButton,
     this.automaticallyImplyLeading = true,
   });
 
@@ -88,13 +86,6 @@ class CommonScaffoldState extends State<CommonScaffold> {
     }
   }
 
-  @override
-  void dispose() {
-    _actions.dispose();
-    _floatingActionButton.dispose();
-    super.dispose();
-  }
-
   @override
   void didUpdateWidget(covariant CommonScaffold oldWidget) {
     super.didUpdateWidget(oldWidget);
@@ -125,14 +116,12 @@ class CommonScaffoldState extends State<CommonScaffold> {
   Widget build(BuildContext context) {
     return _platformContainer(
       child: Scaffold(
-        floatingActionButton: widget.floatingActionButton ??
-            ValueListenableBuilder(
-              valueListenable: _floatingActionButton,
-              builder: (_, floatingActionButton, __) {
-                return floatingActionButton ?? Container();
-              },
-            ),
-        resizeToAvoidBottomInset: true,
+        floatingActionButton: ValueListenableBuilder(
+          valueListenable: _floatingActionButton,
+          builder: (_, floatingActionButton, __) {
+            return floatingActionButton ?? Container();
+          },
+        ),
         appBar: PreferredSize(
           preferredSize: const Size.fromHeight(kToolbarHeight),
           child: Stack(

pubspec.lock

@@ -517,22 +517,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
-  isolate_contactor:
-    dependency: transitive
-    description:
-      name: isolate_contactor
-      sha256: f1be0a90f91e4309ef37cc45280b2a84e769e848aae378318dd3dd263cfc482a
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.2.0"
-  isolate_manager:
-    dependency: transitive
-    description:
-      name: isolate_manager
-      sha256: "8fb916c4444fd408f089448f904f083ac3e169ea1789fd4d987b25809af92188"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.3.1"
   jovial_misc:
     dependency: transitive
     description:
@@ -721,10 +705,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a
+      sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.6"
+    version: "2.2.5"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -836,22 +820,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.2.1"
-  re_editor:
-    dependency: "direct main"
-    description:
-      name: re_editor
-      sha256: db7a82e95f0f74301e85d4d5c805a8b8a5ba43d6c0d26673b7e35dc011f06635
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.0"
-  re_highlight:
-    dependency: "direct main"
-    description:
-      name: re_highlight
-      sha256: "6c4ac3f76f939fb7ca9df013df98526634e17d8f7460e028bd23a035870024f2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.0.3"
   screen_retriever:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,7 +1,7 @@
 name: fl_clash
 description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
 publish_to: 'none'
-version: 0.8.27
+version: 0.8.21
 environment:
   sdk: '>=3.1.0 <4.0.0'
 
@@ -17,7 +17,7 @@ dependencies:
   provider: ^6.0.5
   window_manager: ^0.3.8
   ffi: ^2.1.0
-  dynamic_color: ^1.7.0
+  dynamic_color: ^1.6.0
   proxy:
     path: plugins/proxy
   launch_at_startup: ^0.2.2
@@ -39,8 +39,6 @@ dependencies:
   webdav_client: ^1.2.2
   dio: ^5.4.3+1
   country_flags: ^2.2.0
-  re_editor: ^0.3.0
-  re_highlight: ^0.0.3
 dev_dependencies:
   flutter_test:
     sdk: flutter