Fix url validate issues

Fix check ip performance problem

Optimize resources page

.github/workflows/build.yml

@@ -21,11 +21,25 @@ jobs:
             os: macos-13
 
     steps:
+      - name: Setup Mingw64
+        if: startsWith(matrix.platform,'windows')
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: mingw64
+          install: mingw-w64-x86_64-gcc
+          update: true
+
+
+      - name: Set Mingw64 Env
+        if: startsWith(matrix.platform,'windows')
+        run: |
+          echo "${{ runner.temp }}\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
       - name: Check Matrix
         run: |
-            echo "Running on ${{ matrix.os }}"
+          echo "Running on ${{ matrix.os }}"
-            echo "Arch: ${{ runner.arch }}"
+          echo "Arch: ${{ runner.arch }}"
-            gcc --version
+          gcc --version
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -52,10 +66,10 @@ jobs:
         if: startsWith(matrix.platform,'android')
         run: |
           echo "${{ secrets.KEYSTORE }}" | base64 --decode > android/app/keystore.jks
-          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties    
+          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> android/local.properties
           echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> android/local.properties
           echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> android/local.properties
-          
+
 
       - name: Setup Go
         uses: actions/setup-go@v5

android/app/build.gradle

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

android/app/src/main/AndroidManifest.xml

@@ -22,9 +22,10 @@
     <application
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:extractNativeLibs="true"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:label="FlClash">
+        android:extractNativeLibs="true"
+        android:label="FlClash"
+        tools:targetApi="n">
         <activity
             android:name="com.follow.clash.MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

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

@@ -64,7 +64,6 @@ 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" -> {
@@ -151,7 +150,6 @@ class AppPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAware
                 val message = call.argument<String>("message")
                 tip(message)
                 result.success(true)
-
             }
 
             else -> {

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

@@ -44,6 +44,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
     private var props: Props? = null
     private lateinit var title: String
     private lateinit var content: String
+    var isBlockNotification: Boolean = false
 
     private val connection = object : ServiceConnection {
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
@@ -135,7 +136,6 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         GlobalState.runTime = null;
     }
 
-    @SuppressLint("ForegroundServiceType")
     private fun startForeground() {
         if (GlobalState.runState.value != RunState.START) return
         flClashVpnService?.startForeground(title, content)
@@ -152,13 +152,14 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
             if (permission == PackageManager.PERMISSION_GRANTED) {
                 startForeground()
             } else {
-                activity?.let {
+                if (isBlockNotification) return
-                    ActivityCompat.requestPermissions(
+                if (activity == null) return
-                        it,
+                ActivityCompat.requestPermissions(
-                        arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                    activity!!,
-                        NOTIFICATION_PERMISSION_REQUEST_CODE
+                    arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-                    )
+                    NOTIFICATION_PERMISSION_REQUEST_CODE
-                }
+                )
+
             }
         } else {
             startForeground()
@@ -192,11 +193,14 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
         grantResults: IntArray
     ): Boolean {
         if (requestCode == NOTIFICATION_PERMISSION_REQUEST_CODE) {
-            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            isBlockNotification = true
-                startForeground()
+            if (grantResults.isNotEmpty()) {
+                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    startForeground()
+                }
             }
         }
-        return true;
+        return false;
     }
 
 

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

@@ -47,10 +47,6 @@ class FlClashVpnService : VpnService() {
         "192.168.*"
     )
 
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        return START_STICKY
-    }
-
     fun start(port: Int, props: Props?) {
         fd = with(Builder()) {
             addAddress("172.16.0.1", 30)

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

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

core/common.go

@@ -4,6 +4,7 @@ import "C"
 import (
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/inbound"
+	"github.com/metacubex/mihomo/adapter/outboundgroup"
 	ap "github.com/metacubex/mihomo/adapter/provider"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/component/resolver"
@@ -20,6 +21,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+	"sync"
 	"syscall"
 	"time"
 )
@@ -59,11 +61,17 @@ type ruleProviderSchema struct {
 	Interval int    `provider:"interval,omitempty"`
 }
 
+type ConfigExtendedParams struct {
+	IsPatch      bool              `json:"is-patch"`
+	IsCompatible bool              `json:"is-compatible"`
+	SelectedMap  map[string]string `json:"selected-map"`
+	TestURL      *string           `json:"test-url"`
+}
+
 type GenerateConfigParams struct {
-	ProfilePath  *string           `json:"profile-path"`
+	ProfilePath *string              `json:"profile-path"`
-	Config       *config.RawConfig `json:"config" `
+	Config      config.RawConfig     `json:"config" `
-	IsPatch      *bool             `json:"is-patch"`
+	Params      ConfigExtendedParams `json:"params"`
-	IsCompatible *bool             `json:"is-compatible"`
 }
 
 type ChangeProxyParams struct {
@@ -170,9 +178,9 @@ func getRawConfigWithPath(path *string) *config.RawConfig {
 	}
 }
 
-func decorationConfig(profilePath *string, cfg config.RawConfig, compatible bool) *config.RawConfig {
+func decorationConfig(profilePath *string, cfg config.RawConfig) *config.RawConfig {
 	prof := getRawConfigWithPath(profilePath)
-	overwriteConfig(prof, cfg, compatible)
+	overwriteConfig(prof, cfg)
 	return prof
 }
 
@@ -322,7 +330,7 @@ func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
 	*rule = computedRule
 }
 
-func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig, compatible bool) {
+func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig) {
 	targetConfig.ExternalController = patchConfig.ExternalController
 	targetConfig.ExternalUI = ""
 	targetConfig.Interface = ""
@@ -340,8 +348,8 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.Mode = patchConfig.Mode
 	targetConfig.Tun.Enable = patchConfig.Tun.Enable
 	targetConfig.Tun.Device = patchConfig.Tun.Device
-	//targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
+	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
-	//targetConfig.Tun.Stack = patchConfig.Tun.Stack
+	targetConfig.Tun.Stack = patchConfig.Tun.Stack
 	targetConfig.GeodataLoader = patchConfig.GeodataLoader
 	targetConfig.Profile.StoreSelected = false
 	if targetConfig.DNS.Enable == false {
@@ -352,7 +360,7 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	//} else if runtime.GOOS == "windows" {
 	//	targetConfig.DNS.NameServer = append(targetConfig.DNS.NameServer, dns.SystemDNSPlaceholder)
 	//}
-	if compatible == false {
+	if configParams.IsCompatible == false {
 		targetConfig.ProxyProvider = make(map[string]map[string]any)
 		targetConfig.RuleProvider = make(map[string]map[string]any)
 		generateProxyGroupAndRule(&targetConfig.ProxyGroup, &targetConfig.Rule)
@@ -388,14 +396,48 @@ func patchConfig(general *config.General) {
 	resolver.DisableIPv6 = !general.IPv6
 }
 
-func applyConfig(isPatch bool) {
+func patchSelectGroup() {
+	mapping := configParams.SelectedMap
+	if mapping == nil {
+		return
+	}
+	for name, proxy := range tunnel.ProxiesWithProviders() {
+		outbound, ok := proxy.(*adapter.Proxy)
+		if !ok {
+			continue
+		}
+
+		selector, ok := outbound.ProxyAdapter.(outboundgroup.SelectAble)
+		if !ok {
+			continue
+		}
+
+		selected, exist := mapping[name]
+		if !exist {
+			continue
+		}
+
+		selector.ForceSet(selected)
+	}
+}
+
+var applyLock sync.Mutex
+
+func applyConfig() {
+	applyLock.Lock()
+	defer applyLock.Unlock()
 	cfg, err := config.ParseRawConfig(currentConfig)
 	if err != nil {
 		cfg, _ = config.ParseRawConfig(config.DefaultRawConfig())
 	}
-	if isPatch {
+	if configParams.TestURL != nil {
+		constant.DefaultTestURL = *configParams.TestURL
+	}
+	if configParams.IsPatch {
 		patchConfig(cfg.General)
 	} else {
+		runtime.GC()
 		hub.UltraApplyConfig(cfg, true)
+		patchSelectGroup()
 	}
 }

core/dart-bridge/lib.go

@@ -1,6 +1,7 @@
 package dart_bridge
 
 /*
+#include <stdlib.h>
 #include "stdint.h"
 #include "include/dart_api_dl.h"
 #include "include/dart_api_dl.c"
@@ -28,6 +29,7 @@ func SendToPort(port int64, msg string) {
 	var obj C.Dart_CObject
 	obj._type = C.Dart_CObject_kString
 	msgString := C.CString(msg)
+	defer C.free(unsafe.Pointer(msgString))
 	ptr := unsafe.Pointer(&obj.value[0])
 	*(**C.char)(ptr) = msgString
 	isSuccess := C.GoDart_PostCObject(C.Dart_Port_DL(port), &obj)

core/dart-bridge/message.go

@@ -14,6 +14,7 @@ const (
 	Process MessageType = "process"
 	Request MessageType = "request"
 	Run     MessageType = "run"
+	Loaded  MessageType = "loaded"
 )
 
 type Message struct {

core/hub.go

@@ -1,5 +1,8 @@
 package main
 
+/*
+#include <stdlib.h>
+*/
 import "C"
 import (
 	bridge "core/dart-bridge"
@@ -28,6 +31,8 @@ import (
 
 var currentConfig = config.DefaultRawConfig()
 
+var configParams = ConfigExtendedParams{}
+
 var isInit = false
 
 //export initClash
@@ -71,8 +76,8 @@ func forceGc() {
 //export validateConfig
 func validateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
+	bytes := []byte(C.GoString(s))
 	go func() {
-		bytes := []byte(C.GoString(s))
 		_, err := config.UnmarshalRawConfig(bytes)
 		if err != nil {
 			bridge.SendToPort(i, err.Error())
@@ -85,21 +90,18 @@ func validateConfig(s *C.char, port C.longlong) {
 //export updateConfig
 func updateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
+	paramsString := C.GoString(s)
 	go func() {
-		paramsString := C.GoString(s)
 		var params = &GenerateConfigParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
 			bridge.SendToPort(i, err.Error())
 			return
 		}
-		prof := decorationConfig(params.ProfilePath, *params.Config, *params.IsCompatible)
+		configParams = params.Params
+		prof := decorationConfig(params.ProfilePath, params.Config)
 		currentConfig = prof
-		if *params.IsPatch {
+		applyConfig()
-			applyConfig(true)
-		} else {
-			applyConfig(false)
-		}
 		bridge.SendToPort(i, "")
 	}()
 }
@@ -147,30 +149,32 @@ func getProxies() *C.char {
 }
 
 //export changeProxy
-func changeProxy(s *C.char) bool {
+func changeProxy(s *C.char) {
+	paramsString := C.GoString(s)
 	go func() {
-		paramsString := C.GoString(s)
 		var params = &ChangeProxyParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
 			log.Infoln("Unmarshal ChangeProxyParams %v", err)
 		}
+		groupName := *params.GroupName
+		proxyName := *params.ProxyName
 		proxies := tunnel.ProxiesWithProviders()
-		proxy := proxies[*params.GroupName]
+		group, ok := proxies[groupName]
-		if proxy == nil {
+		if !ok {
 			return
 		}
-		log.Infoln("change proxy %s", proxy.Name())
+		adapterProxy := group.(*adapter.Proxy)
-		adapterProxy := proxy.(*adapter.Proxy)
 		selector, ok := adapterProxy.ProxyAdapter.(*outboundgroup.Selector)
 		if !ok {
 			return
 		}
-		if err := selector.Set(*params.ProxyName); err != nil {
+
-			return
+		err = selector.Set(proxyName)
+		if err == nil {
+			log.Infoln("[Selector] %s selected %s", groupName, proxyName)
 		}
 	}()
-	return true
 }
 
 //export getTraffic
@@ -203,11 +207,16 @@ func getTotalTraffic() *C.char {
 	return C.CString(string(data))
 }
 
+//export resetTraffic
+func resetTraffic() {
+	statistic.DefaultManager.ResetStatistic()
+}
+
 //export asyncTestDelay
 func asyncTestDelay(s *C.char, port C.longlong) {
 	i := int64(port)
+	paramsString := C.GoString(s)
 	go func() {
-		paramsString := C.GoString(s)
 		var params = &TestDelayParams{}
 		err := json.Unmarshal([]byte(paramsString), params)
 		if err != nil {
@@ -291,7 +300,6 @@ func closeConnections() bool {
 //export closeConnection
 func closeConnection(id *C.char) bool {
 	connectionId := C.GoString(id)
-
 	err := statistic.DefaultManager.Get(connectionId).Close()
 	if err != nil {
 		return false
@@ -302,10 +310,13 @@ func closeConnection(id *C.char) bool {
 //export getProviders
 func getProviders() *C.char {
 	data, err := json.Marshal(tunnel.Providers())
+	var msg *C.char
 	if err != nil {
-		return C.CString("")
+		msg = C.CString("")
+		return msg
 	}
-	return C.CString(string(data))
+	msg = C.CString(string(data))
+	return msg
 }
 
 //export getProvider
@@ -355,10 +366,9 @@ func getExternalProviders() *C.char {
 //export updateExternalProvider
 func updateExternalProvider(providerName *C.char, providerType *C.char, port C.longlong) {
 	i := int64(port)
+	providerNameString := C.GoString(providerName)
+	providerTypeString := C.GoString(providerType)
 	go func() {
-		providerNameString := C.GoString(providerName)
-		providerTypeString := C.GoString(providerType)
-
 		switch providerTypeString {
 		case "Proxy":
 			providers := tunnel.Providers()
@@ -404,6 +414,11 @@ func initNativeApiBridge(api unsafe.Pointer, port C.longlong) {
 	bridge.Port = &i
 }
 
+//export freeCString
+func freeCString(s *C.char) {
+	C.free(unsafe.Pointer(s))
+}
+
 func init() {
 	provider.HealthcheckHook = func(name string, delay uint16) {
 		delayData := &Delay{
@@ -425,4 +440,10 @@ func init() {
 			Data: c,
 		})
 	}
+	executor.DefaultProxyProviderLoadedHook = func(providerName string) {
+		bridge.SendMessage(bridge.Message{
+			Type: bridge.Loaded,
+			Data: providerName,
+		})
+	}
 }

core/platform/limit.go

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

core/process.go

@@ -71,8 +71,8 @@ func setProcessMap(s *C.char) {
 	if s == nil {
 		return
 	}
+	paramsString := C.GoString(s)
 	go func() {
-		paramsString := C.GoString(s)
 		var processMapItem = &ProcessMapItem{}
 		err := json.Unmarshal([]byte(paramsString), processMapItem)
 		if err == nil {

core/tun.go

@@ -4,11 +4,14 @@ package main
 
 import "C"
 import (
+	"core/platform"
 	t "core/tun"
+	"errors"
 	"github.com/metacubex/mihomo/component/dialer"
 	"github.com/metacubex/mihomo/log"
 	"golang.org/x/sync/semaphore"
 	"sync"
+	"sync/atomic"
 	"syscall"
 	"time"
 )
@@ -16,6 +19,21 @@ import (
 var tunLock sync.Mutex
 var tun *t.Tun
 
+type FdMap struct {
+	m sync.Map
+}
+
+func (cm *FdMap) Store(key int64) {
+	cm.m.Store(key, struct{}{})
+}
+
+func (cm *FdMap) Load(key int64) bool {
+	_, ok := cm.m.Load(key)
+	return ok
+}
+
+var fdMap FdMap
+
 //export startTUN
 func startTUN(fd C.int) {
 	go func() {
@@ -59,12 +77,47 @@ func stopTun() {
 	}()
 }
 
+var errBlocked = errors.New("blocked")
+
+//export setFdMap
+func setFdMap(fd C.long) {
+	fdInt := int64(fd)
+	go func() {
+		fdMap.Store(fdInt)
+	}()
+}
+
+var fdCounter int64 = 0
+
 func init() {
 	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
+		if platform.ShouldBlockConnection() {
+			return errBlocked
+		}
 		return conn.Control(func(fd uintptr) {
-			if tun != nil {
+			if tun == nil {
-				tun.MarkSocket(int(fd))
+				return
-				time.Sleep(time.Millisecond * 100)
+			}
+
+			fdInt := int64(fd)
+			timeout := time.After(100 * time.Millisecond)
+			id := atomic.AddInt64(&fdCounter, 1)
+			tun.MarkSocket(t.Fd{
+				Id:    id,
+				Value: fdInt,
+			})
+
+			for {
+				select {
+				case <-timeout:
+					return
+				default:
+					exists := fdMap.Load(id)
+					if exists {
+						return
+					}
+					time.Sleep(10 * time.Millisecond)
+				}
 			}
 		})
 	}

core/tun/tun.go

@@ -19,7 +19,6 @@ import (
 	"io"
 	"net"
 	"os"
-	"strconv"
 	"time"
 )
 
@@ -187,7 +186,12 @@ func Start(fd int, gateway, portal, dns string) (io.Closer, error) {
 	return stack, nil
 }
 
-func (t *Tun) MarkSocket(fd int) {
+type Fd struct {
+	Id    int64 `json:"id"`
+	Value int64 `json:"value"`
+}
+
+func (t *Tun) MarkSocket(fd Fd) {
 	_ = t.Limit.Acquire(context.Background(), 1)
 	defer t.Limit.Release(1)
 
@@ -197,7 +201,7 @@ func (t *Tun) MarkSocket(fd int) {
 
 	message := &bridge.Message{
 		Type: bridge.Tun,
-		Data: strconv.Itoa(fd),
+		Data: fd,
 	}
 
 	bridge.SendMessage(*message)

lib/application.dart

@@ -115,7 +115,6 @@ class ApplicationState extends State<Application> {
       lightColorScheme: lightDynamic,
       darkColorScheme: darkDynamic,
     );
-
     WidgetsBinding.instance.addPostFrameCallback((_) {
       globalState.appController.updateSystemColorSchemes(systemColorSchemes);
     });
@@ -130,7 +129,6 @@ class ApplicationState extends State<Application> {
       httpTimeoutDuration,
       (timer) async {
         await globalState.appController.updateGroups();
-        globalState.appController.appState.sortNum++;
       },
     );
   }
@@ -165,7 +163,6 @@ class ApplicationState extends State<Application> {
                     themeMode: state.themeMode,
                     theme: ThemeData(
                       useMaterial3: true,
-                      fontFamily: '',
                       pageTransitionsTheme: _pageTransitionsTheme,
                       colorScheme: _getAppColorScheme(
                         brightness: Brightness.light,
@@ -175,7 +172,6 @@ class ApplicationState extends State<Application> {
                     ),
                     darkTheme: ThemeData(
                       useMaterial3: true,
-                      fontFamily: '',
                       pageTransitionsTheme: _pageTransitionsTheme,
                       colorScheme: _getAppColorScheme(
                         brightness: Brightness.dark,

lib/clash/core.dart

@@ -45,10 +45,10 @@ class ClashCore {
   }
 
   bool init(String homeDir) {
-    return clashFFI.initClash(
+    final homeDirChar = homeDir.toNativeUtf8().cast<Char>();
-      homeDir.toNativeUtf8().cast(),
+    final isInit = clashFFI.initClash(homeDirChar) == 1;
-    ) ==
+    malloc.free(homeDirChar);
-        1;
+    return isInit;
   }
 
   shutdown() {
@@ -67,10 +67,12 @@ class ClashCore {
         receiver.close();
       }
     });
+    final dataChar = data.toNativeUtf8().cast<Char>();
     clashFFI.validateConfig(
-      data.toNativeUtf8().cast(),
+      dataChar,
       receiver.sendPort.nativePort,
     );
+    malloc.free(dataChar);
     return completer.future;
   }
 
@@ -84,18 +86,23 @@ class ClashCore {
       }
     });
     final params = json.encode(updateConfigParams);
+    final paramsChar = params.toNativeUtf8().cast<Char>();
     clashFFI.updateConfig(
-      params.toNativeUtf8().cast(),
+      paramsChar,
       receiver.sendPort.nativePort,
     );
+    malloc.free(paramsChar);
     return completer.future;
   }
 
   Future<List<Group>> getProxiesGroups() {
     final proxiesRaw = clashFFI.getProxies();
     final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(proxiesRaw);
     return Isolate.run<List<Group>>(() {
-      final proxies = json.decode(proxiesRawString);
+      if (proxiesRawString.isEmpty) return [];
+      final proxies = (json.decode(proxiesRawString) ?? {}) as Map;
+      if (proxies.isEmpty) return [];
       final groupNames = [
         UsedProxy.GLOBAL.name,
         ...(proxies[UsedProxy.GLOBAL.name]["all"] as List).where((e) {
@@ -109,7 +116,8 @@ class ClashCore {
         group["all"] = ((group["all"] ?? []) as List)
             .map(
               (name) => proxies[name],
-        )
+            )
+            .where((proxy) => proxy != null)
             .toList();
         return group;
       }).toList();
@@ -120,14 +128,15 @@ class ClashCore {
   Future<List<ExternalProvider>> getExternalProviders() {
     final externalProvidersRaw = clashFFI.getExternalProviders();
     final externalProvidersRawString =
-    externalProvidersRaw.cast<Utf8>().toDartString();
+        externalProvidersRaw.cast<Utf8>().toDartString();
+    clashFFI.freeCString(externalProvidersRaw);
     return Isolate.run<List<ExternalProvider>>(() {
       final externalProviders =
-      (json.decode(externalProvidersRawString) as List<dynamic>)
+          (json.decode(externalProvidersRawString) as List<dynamic>)
-          .map(
+              .map(
-            (item) => ExternalProvider.fromJson(item),
+                (item) => ExternalProvider.fromJson(item),
-      )
+              )
-          .toList();
+              .toList();
       return externalProviders;
     });
   }
@@ -144,17 +153,23 @@ class ClashCore {
         receiver.close();
       }
     });
+    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
+    final providerTypeChar = providerType.toNativeUtf8().cast<Char>();
     clashFFI.updateExternalProvider(
-      providerName.toNativeUtf8().cast(),
+      providerNameChar,
-      providerType.toNativeUtf8().cast(),
+      providerTypeChar,
       receiver.sendPort.nativePort,
     );
+    malloc.free(providerNameChar);
+    malloc.free(providerTypeChar);
     return completer.future;
   }
 
-  bool changeProxy(ChangeProxyParams changeProxyParams) {
+  changeProxy(ChangeProxyParams changeProxyParams) {
     final params = json.encode(changeProxyParams);
-    return clashFFI.changeProxy(params.toNativeUtf8().cast()) == 1;
+    final paramsChar = params.toNativeUtf8().cast<Char>();
+    clashFFI.changeProxy(paramsChar);
+    malloc.free(paramsChar);
   }
 
   Future<Delay> getDelay(String proxyName) {
@@ -170,42 +185,55 @@ class ClashCore {
         receiver.close();
       }
     });
+    final delayParamsChar =
+        json.encode(delayParams).toNativeUtf8().cast<Char>();
     clashFFI.asyncTestDelay(
-      json.encode(delayParams).toNativeUtf8().cast(),
+      delayParamsChar,
       receiver.sendPort.nativePort,
     );
+    malloc.free(delayParamsChar);
     Future.delayed(httpTimeoutDuration + moreDuration, () {
       receiver.close();
-      completer.complete(
+      if (!completer.isCompleted) {
-        Delay(name: proxyName, value: -1),
+        completer.complete(
-      );
+          Delay(name: proxyName, value: -1),
+        );
+      }
     });
     return completer.future;
   }
 
   clearEffect(String path) {
-    clashFFI.clearEffect(path.toNativeUtf8().cast());
+    final pathChar = path.toNativeUtf8().cast<Char>();
+    clashFFI.clearEffect(pathChar);
+    malloc.free(pathChar);
   }
 
   VersionInfo getVersionInfo() {
     final versionInfoRaw = clashFFI.getVersionInfo();
     final versionInfo = json.decode(versionInfoRaw.cast<Utf8>().toDartString());
+    clashFFI.freeCString(versionInfoRaw);
     return VersionInfo.fromJson(versionInfo);
   }
 
   Traffic getTraffic() {
     final trafficRaw = clashFFI.getTraffic();
     final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
+    clashFFI.freeCString(trafficRaw);
     return Traffic.fromMap(trafficMap);
   }
 
-
   Traffic getTotalTraffic() {
     final trafficRaw = clashFFI.getTotalTraffic();
     final trafficMap = json.decode(trafficRaw.cast<Utf8>().toDartString());
+    clashFFI.freeCString(trafficRaw);
     return Traffic.fromMap(trafficMap);
   }
 
+  void resetTraffic() {
+    clashFFI.resetTraffic();
+  }
+
   void startLog() {
     clashFFI.startLog();
   }
@@ -227,7 +255,14 @@ class ClashCore {
   }
 
   void setProcessMap(ProcessMapItem processMapItem) {
-    clashFFI.setProcessMap(json.encode(processMapItem).toNativeUtf8().cast());
+    final processMapItemChar =
+        json.encode(processMapItem).toNativeUtf8().cast<Char>();
+    clashFFI.setProcessMap(processMapItemChar);
+    malloc.free(processMapItemChar);
+  }
+
+  void setFdMap(int fd) {
+    clashFFI.setFdMap(fd);
   }
 
   // DateTime? getRunTime() {
@@ -239,10 +274,17 @@ class ClashCore {
   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;
+    clashFFI.freeCString(connectionsDataRaw);
     final connectionsRaw = connectionsData['connections'] as List? ?? [];
     return connectionsRaw.map((e) => Connection.fromJson(e)).toList();
   }
+
+  closeConnections(String id) {
+    final idChar = id.toNativeUtf8().cast<Char>();
+    clashFFI.closeConnection(idChar);
+    malloc.free(idChar);
+  }
 }
 
 final clashCore = ClashCore();

lib/clash/message.dart

@@ -10,7 +10,7 @@ import 'core.dart';
 abstract mixin class ClashMessageListener {
   void onLog(Log log) {}
 
-  void onTun(String fd) {}
+  void onTun(Fd fd) {}
 
   void onDelay(Delay delay) {}
 
@@ -21,6 +21,8 @@ abstract mixin class ClashMessageListener {
   void onNow(Now now) {}
 
   void onRun(String runTime) {}
+
+  void onLoaded(String groupName) {}
 }
 
 class ClashMessage {
@@ -39,7 +41,7 @@ class ClashMessage {
             listener.onLog(Log.fromJson(m.data));
             break;
           case MessageType.tun:
-            listener.onTun(m.data);
+            listener.onTun(Fd.fromJson(m.data));
             break;
           case MessageType.delay:
             listener.onDelay(Delay.fromJson(m.data));
@@ -56,6 +58,9 @@ class ClashMessage {
           case MessageType.run:
             listener.onRun(m.data);
             break;
+          case MessageType.loaded:
+            listener.onLoaded(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/common.dart

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

lib/common/constant.dart

@@ -7,6 +7,7 @@ const coreName = "clash.meta";
 const packageName = "FlClash";
 const httpTimeoutDuration = Duration(milliseconds: 5000);
 const moreDuration = Duration(milliseconds: 100);
+const animateDuration = Duration(milliseconds: 100);
 const defaultUpdateDuration = Duration(days: 1);
 const mmdbFileName = "geoip.metadb";
 const geoSiteFileName = "GeoSite.dat";
@@ -23,6 +24,7 @@ const maxMobileWidth = 600;
 const maxLaptopWidth = 840;
 const geodataLoaderMemconservative = "memconservative";
 const geodataLoaderStandard = "standard";
+const defaultTestUrl = "https://www.gstatic.com/generate_204";
 final filter = ImageFilter.blur(
   sigmaX: 5,
   sigmaY: 5,

lib/common/context.dart

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

lib/common/iterable.dart

@@ -0,0 +1,13 @@
+extension IterableExt<T> on Iterable<T> {
+  Iterable<T> separated(T separator) sync* {
+    final iterator = this.iterator;
+    if (!iterator.moveNext()) return;
+
+    yield iterator.current;
+
+    while (iterator.moveNext()) {
+      yield separator;
+      yield iterator.current;
+    }
+  }
+}

lib/common/navigation.dart

@@ -30,12 +30,19 @@ class Navigation {
         fragment: ProfilesFragment(),
       ),
       const NavigationItem(
-        icon:  Icon(Icons.ballot),
+        icon:  Icon(Icons.view_timeline),
         label: "requests",
-        fragment:  RequestFragment(),
+        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/package.dart

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

lib/common/path.dart

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

lib/common/picker.dart

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

lib/common/request.dart

@@ -12,17 +12,18 @@ class Request {
   bool _isStart = false;
 
   Request() {
-    _dio = Dio(
+    _dio = Dio();
-      BaseOptions(
+    _dio.options = BaseOptions(
-        headers: {"User-Agent": coreName},
+      headers: {"User-Agent": globalState.appController.clashConfig.globalUa},
+    );
+    _dio.interceptors.add(
+      InterceptorsWrapper(
+        onRequest: (options, handler) {
+          _syncProxy();
+          return handler.next(options); // 继续请求
+        },
       ),
     );
-    _dio.interceptors.add(InterceptorsWrapper(
-      onRequest: (options, handler) {
-        _syncProxy();
-        return handler.next(options); // 继续请求
-      },
-    ));
   }
 
   _syncProxy() {
@@ -68,8 +69,7 @@ class Request {
     if (response.statusCode != 200) return null;
     final data = response.data as Map<String, dynamic>;
     final remoteVersion = data['tag_name'];
-    final packageInfo = await appPackage.packageInfoCompleter.future;
+    final version = globalState.packageInfo.version;
-    final version = packageInfo.version;
     final hasUpdate =
         other.compareVersions(remoteVersion.replaceAll('v', ''), version) > 0;
     if (!hasUpdate) return null;

lib/common/service.dart

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

lib/common/string.dart

@@ -1,10 +1,14 @@
 extension StringExtension on String {
   bool get isUrl {
-    try {
+    return RegExp(
-      Uri.parse(this);
+      r'^(https?:\/\/)?'
-      return true;
+      r'((([a-z\d]([a-z\d-]*[a-z\d])*)\.)+[a-z]{2,}|'
-    } catch (e) {
+      r'((\d{1,3}\.){3}\d{1,3}))'
-      return false;
+      r'(:\d+)?'
-    }
+      r'(\/[-a-z\d%_.~+]*)*'
+      r'(\?[;&a-z\d%_.~+=-]*)?'
+      r'(\#[-a-z\d_]*)?$',
+      caseSensitive: false,
+    ).hasMatch(this);
   }
 }

lib/common/text.dart

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

lib/controller.dart

@@ -17,6 +17,7 @@ class AppController {
   late ClashConfig clashConfig;
   late Measure measure;
   late Function updateClashConfigDebounce;
+  late Function addCheckIpNumDebounce;
 
   AppController(this.context) {
     appState = context.read<AppState>();
@@ -25,6 +26,9 @@ class AppController {
     updateClashConfigDebounce = debounce<Function()>(() async {
       await updateClashConfig();
     });
+    addCheckIpNumDebounce = debounce((){
+      appState.checkIpNum++;
+    });
     measure = Measure.of(context);
   }
 
@@ -43,7 +47,9 @@ class AppController {
       ];
     } else {
       await globalState.stopSystemProxy();
+      clashCore.resetTraffic();
       appState.traffics = [];
+      appState.totalTraffic = Traffic();
       appState.runTime = null;
     }
   }
@@ -69,14 +75,6 @@ class AppController {
     );
   }
 
-  changeProxy() {
-    globalState.changeProxy(
-      appState: appState,
-      config: config,
-      clashConfig: clashConfig,
-    );
-  }
-
   addProfile(Profile profile) async {
     config.setProfile(profile);
     if (config.currentProfileId != null) return;
@@ -98,13 +96,9 @@ class AppController {
     }
   }
 
-  Future<void> updateProfile(String id) async {
+  Future<void> updateProfile(Profile profile) async {
-    final profile = config.getCurrentProfileForId(id);
+    await profile.update();
-    if (profile != null) {
+    config.setProfile(await profile.update());
-      final tempProfile = profile.copyWith();
-      await tempProfile.update();
-      config.setProfile(tempProfile);
-    }
   }
 
   Future<void> updateClashConfig({bool isPatch = true}) async {
@@ -147,7 +141,7 @@ class AppController {
         continue;
       }
       try {
-        await updateProfile(profile.id);
+        updateProfile(profile);
       } catch (e) {
         appState.addLog(
           Log(
@@ -164,7 +158,7 @@ class AppController {
       if (profile.type == ProfileType.file) {
         continue;
       }
-      await updateProfile(profile.id);
+      await updateProfile(profile);
     }
   }
 
@@ -268,6 +262,7 @@ class AppController {
   }
 
   init() async {
+    updateLogStatus();
     if (!config.silentLaunch) {
       window?.show();
     }
@@ -279,7 +274,7 @@ class AppController {
           config: config,
           clashConfig: clashConfig,
         );
-      },title: appLocalizations.init);
+      }, title: appLocalizations.init);
     } else {
       await globalState.applyProfile(
         appState: appState,
@@ -291,14 +286,13 @@ class AppController {
   }
 
   afterInit() async {
-    if (config.autoRun) {
+    await proxyManager.updateStartTime();
+    if (proxyManager.isStart) {
       await updateSystemProxy(true);
     } else {
-      await proxyManager.updateStartTime();
+      await updateSystemProxy(config.autoRun);
-      await updateSystemProxy(proxyManager.isStart);
     }
     autoUpdateProfiles();
-    updateLogStatus();
     autoCheckUpdate();
   }
 
@@ -361,17 +355,17 @@ class AppController {
   }
 
   addProfileFormURL(String url) async {
-    globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
+    if (globalState.navigatorKey.currentState?.canPop() ?? false) {
+      globalState.navigatorKey.currentState?.popUntil((route) => route.isFirst);
+    }
     toProfiles();
     final commonScaffoldState = globalState.homeScaffoldKey.currentState;
     if (commonScaffoldState?.mounted != true) return;
     final profile = await commonScaffoldState?.loadingRun<Profile>(
       () async {
-        final profile = Profile(
+        return await Profile.normal(
           url: url,
-        );
+        ).update();
-        await profile.update();
-        return profile;
       },
       title: "${appLocalizations.add}${appLocalizations.profile}",
     );
@@ -394,9 +388,7 @@ class AppController {
         if (bytes == null) {
           return null;
         }
-        final profile = Profile(label: platformFile?.name);
+        return await Profile.normal(label: platformFile?.name).saveFile(bytes);
-        await profile.saveFile(bytes);
-        return profile;
       },
       title: "${appLocalizations.add}${appLocalizations.profile}",
     );
@@ -411,9 +403,54 @@ class AppController {
     addProfileFormURL(url);
   }
 
+  int get columns =>
+      globalState.getColumns(appState.viewMode, config.proxiesColumns);
+
+  changeColumns() {
+    config.proxiesColumns = globalState.getColumns(
+      appState.viewMode,
+      columns - 1,
+    );
+  }
+
   updateViewWidth(double width) {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       appState.viewWidth = width;
     });
   }
+
+  List<Proxy> _sortOfName(List<Proxy> proxies) {
+    return List.of(proxies)
+      ..sort(
+        (a, b) => other.sortByChar(a.name, b.name),
+      );
+  }
+
+  List<Proxy> _sortOfDelay(List<Proxy> proxies) {
+    return proxies = List.of(proxies)
+      ..sort(
+        (a, b) {
+          final aDelay = appState.getDelay(a.name);
+          final bDelay = appState.getDelay(b.name);
+          if (aDelay == null && bDelay == null) {
+            return 0;
+          }
+          if (aDelay == null || aDelay == -1) {
+            return 1;
+          }
+          if (bDelay == null || bDelay == -1) {
+            return -1;
+          }
+          return aDelay.compareTo(bDelay);
+        },
+      );
+  }
+
+  List<Proxy> getSortProxies(List<Proxy> proxies) {
+    return switch (config.proxiesSortType) {
+      ProxiesSortType.none => proxies,
+      ProxiesSortType.delay => _sortOfDelay(proxies),
+      ProxiesSortType.name => _sortOfName(proxies),
+    };
+  }
 }

lib/enum/enum.dart

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

lib/fragments/about.dart

@@ -1,7 +1,6 @@
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
-import 'package:package_info_plus/package_info_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class AboutFragment extends StatelessWidget {
@@ -49,16 +48,9 @@ class AboutFragment extends StatelessWidget {
                         appName,
                         style: Theme.of(context).textTheme.headlineSmall,
                       ),
-                      FutureBuilder<PackageInfo>(
+                      Text(
-                        future: appPackage.packageInfoCompleter.future,
+                        globalState.packageInfo.version,
-                        builder: (_, package) {
+                        style: Theme.of(context).textTheme.labelLarge,
-                          final version = package.data?.version;
-                          if (version == null) return Container();
-                          return Text(
-                            version,
-                            style: Theme.of(context).textTheme.labelLarge,
-                          );
-                        },
                       )
                     ],
                   )

lib/fragments/access.dart

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

lib/fragments/backup_and_recovery.dart

@@ -6,7 +6,6 @@ import 'package:fl_clash/models/dav.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/fade_box.dart';
 import 'package:fl_clash/widgets/list.dart';
-import 'package:fl_clash/widgets/section.dart';
 import 'package:fl_clash/widgets/text.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -34,7 +33,7 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
     final res = await commonScaffoldState?.loadingRun<bool>(() async {
       return await _client?.backup();
     });
-    if(res != true) return;
+    if (res != true) return;
     globalState.showMessage(
       title: appLocalizations.recovery,
       message: TextSpan(text: appLocalizations.backupSuccess),
@@ -46,7 +45,7 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
     final res = await commonScaffoldState?.loadingRun<bool>(() async {
       return await _client?.recovery(recoveryOption: recoveryOption);
     });
-    if(res != true) return;
+    if (res != true) return;
     globalState.showMessage(
       title: appLocalizations.recovery,
       message: TextSpan(text: appLocalizations.recoverySuccess),
@@ -69,26 +68,22 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
         if (dav == null) {
           return ListView(
             children: [
-              Section(
+              ListHeader(
                 title: appLocalizations.account,
-                child: Builder(
+              ),
-                  builder: (_) {
+              ListItem(
-                    return ListItem(
+                leading: const Icon(Icons.account_box),
-                      leading: const Icon(Icons.account_box),
+                title: Text(appLocalizations.noInfo),
-                      title: Text(appLocalizations.noInfo),
+                subtitle: Text(appLocalizations.pleaseBindWebDAV),
-                      subtitle: Text(appLocalizations.pleaseBindWebDAV),
+                trailing: FilledButton.tonal(
-                      trailing: FilledButton.tonal(
+                  onPressed: () {
-                        onPressed: () {
+                    _showAddWebDAV(dav);
-                          _showAddWebDAV(dav);
-                        },
-                        child: Text(
-                          appLocalizations.bind,
-                        ),
-                      ),
-                    );
                   },
+                  child: Text(
+                    appLocalizations.bind,
+                  ),
                 ),
-              )
+              ),
             ],
           );
         }
@@ -96,62 +91,60 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
         final pingFuture = _client!.pingCompleter.future;
         return ListView(
           children: [
-            Section(
+            ListHeader(title: appLocalizations.account),
-              title: appLocalizations.account,
+            ListItem(
-              child: ListItem(
+              leading: const Icon(Icons.account_box),
-                leading: const Icon(Icons.account_box),
+              title: TooltipText(
-                title: TooltipText(
+                text: Text(
-                  text: Text(
+                  dav.user,
-                    dav.user,
+                  maxLines: 1,
-                    maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
-                    overflow: TextOverflow.ellipsis,
-                  ),
                 ),
-                subtitle: Padding(
+              ),
-                  padding: const EdgeInsets.symmetric(vertical: 4),
+              subtitle: Padding(
-                  child: Row(
+                padding: const EdgeInsets.symmetric(vertical: 4),
-                    crossAxisAlignment: CrossAxisAlignment.center,
+                child: Row(
-                    children: [
+                  crossAxisAlignment: CrossAxisAlignment.center,
-                      Text(appLocalizations.connectivity),
+                  children: [
-                      FutureBuilder<bool>(
+                    Text(appLocalizations.connectivity),
-                        future: pingFuture,
+                    FutureBuilder<bool>(
-                        builder: (_, snapshot) {
+                      future: pingFuture,
-                          return Center(
+                      builder: (_, snapshot) {
-                            child: FadeBox(
+                        return Center(
-                              key: const Key("fade_box_1"),
+                          child: FadeBox(
-                              child: snapshot.connectionState ==
+                            key: const Key("fade_box_1"),
-                                      ConnectionState.waiting
+                            child: snapshot.connectionState ==
-                                  ? const SizedBox(
+                                    ConnectionState.waiting
-                                      width: 12,
+                                ? const SizedBox(
-                                      height: 12,
+                                    width: 12,
-                                      child: CircularProgressIndicator(
+                                    height: 12,
-                                        strokeWidth: 1,
+                                    child: CircularProgressIndicator(
-                                      ),
+                                      strokeWidth: 1,
-                                    )
-                                  : Container(
-                                      decoration: BoxDecoration(
-                                        shape: BoxShape.circle,
-                                        color: snapshot.data == true
-                                            ? Colors.green
-                                            : Colors.red,
-                                      ),
-                                      width: 12,
-                                      height: 12,
                                     ),
-                            ),
+                                  )
-                          );
+                                : Container(
-                        },
+                                    decoration: BoxDecoration(
-                      ),
+                                      shape: BoxShape.circle,
-                    ],
+                                      color: snapshot.data == true
-                  ),
+                                          ? Colors.green
+                                          : Colors.red,
+                                    ),
+                                    width: 12,
+                                    height: 12,
+                                  ),
+                          ),
+                        );
+                      },
+                    ),
+                  ],
                 ),
-                trailing: FilledButton.tonal(
+              ),
-                  onPressed: () {
+              trailing: FilledButton.tonal(
-                    _showAddWebDAV(dav);
+                onPressed: () {
-                  },
+                  _showAddWebDAV(dav);
-                  child: Text(
+                },
-                    appLocalizations.edit,
+                child: Text(
-                  ),
+                  appLocalizations.edit,
                 ),
               ),
             ),
@@ -161,22 +154,21 @@ class _BackupAndRecoveryState extends State<BackupAndRecovery> {
                 return FadeBox(
                   key: const Key("fade_box_2"),
                   child: snapshot.data == true
-                      ? Section(
+                      ? Column(
-                          title: appLocalizations.backupAndRecovery,
+                          children: [
-                          child: Column(
+                            ListHeader(
-                            children: [
+                                title: appLocalizations.backupAndRecovery),
-                              ListItem(
+                            ListItem(
-                                onTab: _backup,
+                              onTab: _backup,
-                                title: Text(appLocalizations.backup),
+                              title: Text(appLocalizations.backup),
-                                subtitle: Text(appLocalizations.backupDesc),
+                              subtitle: Text(appLocalizations.backupDesc),
-                              ),
+                            ),
-                              ListItem(
+                            ListItem(
-                                onTab: _handleRecovery,
+                              onTab: _handleRecovery,
-                                title: Text(appLocalizations.recovery),
+                              title: Text(appLocalizations.recovery),
-                                subtitle: Text(appLocalizations.recoveryDesc),
+                              subtitle: Text(appLocalizations.recoveryDesc),
-                              ),
+                            ),
-                            ],
+                          ],
-                          ),
                         )
                       : Container(),
                 );
@@ -228,6 +220,12 @@ 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,81 +39,6 @@ class _ConfigFragmentState extends State<ConfigFragment> {
     }
   }
 
-  Widget _buildAppSection() {
-    final items = [
-      if (Platform.isAndroid)
-        Selector<Config, bool>(
-          selector: (_, config) => config.allowBypass,
-          builder: (_, allowBypass, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.arrow_forward_outlined),
-              title: Text(appLocalizations.allowBypass),
-              subtitle: Text(appLocalizations.allowBypassDesc),
-              delegate: SwitchDelegate(
-                value: allowBypass,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.config.allowBypass = value;
-                },
-              ),
-            );
-          },
-        ),
-      if (Platform.isAndroid)
-        Selector<Config, bool>(
-          selector: (_, config) => config.systemProxy,
-          builder: (_, systemProxy, __) {
-            return ListItem.switchItem(
-              leading: const Icon(Icons.settings_ethernet),
-              title: Text(appLocalizations.systemProxy),
-              subtitle: Text(appLocalizations.systemProxyDesc),
-              delegate: SwitchDelegate(
-                value: systemProxy,
-                onChanged: (bool value) async {
-                  final appController = globalState.appController;
-                  appController.config.systemProxy = value;
-                },
-              ),
-            );
-          },
-        ),
-      Selector<Config, bool>(
-        selector: (_, config) => config.isCompatible,
-        builder: (_, isCompatible, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.expand_outlined),
-            title: Text(appLocalizations.compatible),
-            subtitle: Text(appLocalizations.compatibleDesc),
-            delegate: SwitchDelegate(
-              value: isCompatible,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.config.isCompatible = value;
-                await appController.updateClashConfig(isPatch: false);
-                await appController.updateGroups();
-                appController.changeProxy();
-              },
-            ),
-          );
-        },
-      ),
-    ];
-    return Section(
-      title: appLocalizations.app,
-      child: Column(
-        children: [
-          for (final item in items) ...[
-            item,
-            if (items.last != item)
-              const Divider(
-                height: 0,
-              )
-          ]
-        ],
-      ),
-    );
-  }
-
   _showLogLevelDialog(LogLevel value) {
     globalState.showCommonDialog(
       child: AlertDialog(
@@ -150,238 +75,364 @@ class _ConfigFragmentState extends State<ConfigFragment> {
     );
   }
 
-  Widget _buildGeneralSection() {
+  _showUaDialog(String? value) {
-    final items = [
+    const uas = [
-      Selector<ClashConfig, LogLevel>(
+      null,
-        selector: (_, clashConfig) => clashConfig.logLevel,
+      "clash-verge/v1.6.6",
-        builder: (_, value, __) {
+      "ClashforWindows/0.19.23",
-          return ListItem(
-            leading: const Icon(Icons.info_outline),
-            title: Text(appLocalizations.logLevel),
-            subtitle: Text(value.name),
-            onTab: () {
-              _showLogLevelDialog(value);
-            },
-          );
-        },
-      ),
-      Selector<ClashConfig, int>(
-        selector: (_, clashConfig) => clashConfig.mixedPort,
-        builder: (_, mixedPort, __) {
-          return ListItem(
-            onTab: () {
-              _modifyMixedPort(mixedPort);
-            },
-            leading: const Icon(Icons.adjust_outlined),
-            title: Text(appLocalizations.proxyPort),
-            subtitle: Text(appLocalizations.proxyPortDesc),
-            trailing: FilledButton.tonal(
-              onPressed: () {
-                _modifyMixedPort(mixedPort);
-              },
-              child: Text(
-                "$mixedPort",
-              ),
-            ),
-          );
-        },
-      ),
-      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) => clashConfig.ipv6,
-        builder: (_, ipv6, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.water_outlined),
-            title: const Text("Ipv6"),
-            subtitle: Text(appLocalizations.ipv6Desc),
-            delegate: SwitchDelegate(
-              value: ipv6,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.clashConfig.ipv6 = value;
-                appController.updateClashConfigDebounce();
-              },
-            ),
-          );
-        },
-      ),
-      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) => clashConfig.allowLan,
-        builder: (_, allowLan, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.device_hub),
-            title: Text(appLocalizations.allowLan),
-            subtitle: Text(appLocalizations.allowLanDesc),
-            delegate: SwitchDelegate(
-              value: allowLan,
-              onChanged: (bool value) async {
-                final clashConfig = context.read<ClashConfig>();
-                clashConfig.allowLan = value;
-                globalState.appController.updateClashConfigDebounce();
-              },
-            ),
-          );
-        },
-      ),
-      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) => clashConfig.unifiedDelay,
-        builder: (_, unifiedDelay, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.compress_outlined),
-            title: Text(appLocalizations.unifiedDelay),
-            subtitle: Text(appLocalizations.unifiedDelayDesc),
-            delegate: SwitchDelegate(
-              value: unifiedDelay,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.clashConfig.unifiedDelay = value;
-                appController.updateClashConfigDebounce();
-              },
-            ),
-          );
-        },
-      ),
-      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) =>
-            clashConfig.findProcessMode == FindProcessMode.always,
-        builder: (_, findProcess, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.polymer_outlined),
-            title: Text(appLocalizations.findProcessMode),
-            subtitle: Text(appLocalizations.findProcessModeDesc),
-            delegate: SwitchDelegate(
-              value: findProcess,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.clashConfig.findProcessMode =
-                    value ? FindProcessMode.always : FindProcessMode.off;
-                appController.updateClashConfigDebounce();
-              },
-            ),
-          );
-        },
-      ),
-      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) => clashConfig.tcpConcurrent,
-        builder: (_, tcpConcurrent, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.double_arrow_outlined),
-            title: Text(appLocalizations.tcpConcurrent),
-            subtitle: Text(appLocalizations.tcpConcurrentDesc),
-            delegate: SwitchDelegate(
-              value: tcpConcurrent,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.clashConfig.tcpConcurrent = value;
-                appController.updateClashConfigDebounce();
-              },
-            ),
-          );
-        },
-      ),
-      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) =>
-            clashConfig.geodataLoader == geodataLoaderMemconservative,
-        builder: (_, memconservative, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.memory),
-            title: Text(appLocalizations.geodataLoader),
-            subtitle: Text(appLocalizations.geodataLoaderDesc),
-            delegate: SwitchDelegate(
-              value: memconservative,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.clashConfig.geodataLoader = value
-                    ? geodataLoaderMemconservative
-                    : geodataLoaderStandard;
-                appController.updateClashConfigDebounce();
-              },
-            ),
-          );
-        },
-      ),
-      Selector<ClashConfig, bool>(
-        selector: (_, clashConfig) => clashConfig.externalController.isNotEmpty,
-        builder: (_, hasExternalController, __) {
-          return ListItem.switchItem(
-            leading: const Icon(Icons.api_outlined),
-            title: Text(appLocalizations.externalController),
-            subtitle: Text(appLocalizations.externalControllerDesc),
-            delegate: SwitchDelegate(
-              value: hasExternalController,
-              onChanged: (bool value) async {
-                final appController = globalState.appController;
-                appController.clashConfig.externalController =
-                    value ? defaultExternalController : '';
-                appController.updateClashConfigDebounce();
-              },
-            ),
-          );
-        },
-      ),
     ];
-    return Section(
+    globalState.showCommonDialog(
-      title: appLocalizations.general,
+      child: AlertDialog(
-      child: Column(
+        title: const Text("UA"),
-        children: [
+        contentPadding: const EdgeInsets.symmetric(
-          for (final item in items) ...[
+          horizontal: 8,
-            item,
+          vertical: 16,
-            if (items.last != item)
+        ),
-              const Divider(
+        content: SizedBox(
-                height: 0,
+          width: 250,
-              )
+          child: Wrap(
-          ]
+            children: [
-        ],
+              for (final ua in uas)
+                ListItem.radio(
+                  delegate: RadioDelegate<String?>(
+                    value: ua,
+                    groupValue: value,
+                    onChanged: (String? value) {
+                      final appController = globalState.appController;
+                      appController.clashConfig.globalRealUa = value;
+                      appController.updateClashConfigDebounce();
+                      Navigator.of(context).pop();
+                    },
+                  ),
+                  title: Text(ua ?? appLocalizations.defaultText),
+                )
+            ],
+          ),
+        ),
       ),
     );
   }
 
-  Widget _buildMoreSection() {
+  _modifyTestUrl(String testUrl) async {
-    final items = [
+    final newTestUrl = await globalState.showCommonDialog<String>(
-      if (false)
+      child: TestUrlFormDialog(
-        Selector<ClashConfig, bool>(
+        testUrl: testUrl,
-          selector: (_, clashConfig) => clashConfig.tun.enable,
+      ),
-          builder: (_, tunEnable, __) {
+    );
+    if (newTestUrl != null && newTestUrl != testUrl && mounted) {
+      try {
+        if (!newTestUrl.isUrl) {
+          throw "Invalid url";
+        }
+        globalState.appController.config.testUrl = newTestUrl;
+        globalState.appController.updateClashConfigDebounce();
+      } catch (e) {
+        globalState.showMessage(
+          title: appLocalizations.testUrl,
+          message: TextSpan(
+            text: e.toString(),
+          ),
+        );
+      }
+    }
+  }
+
+  List<Widget> _buildAppSection() {
+    return generateSection(
+      title: appLocalizations.app,
+      items: [
+        if (Platform.isAndroid)
+          Selector<Config, bool>(
+            selector: (_, config) => config.allowBypass,
+            builder: (_, allowBypass, __) {
+              return ListItem.switchItem(
+                leading: const Icon(Icons.arrow_forward_outlined),
+                title: Text(appLocalizations.allowBypass),
+                subtitle: Text(appLocalizations.allowBypassDesc),
+                delegate: SwitchDelegate(
+                  value: allowBypass,
+                  onChanged: (bool value) async {
+                    final appController = globalState.appController;
+                    appController.config.allowBypass = value;
+                  },
+                ),
+              );
+            },
+          ),
+        if (Platform.isAndroid)
+          Selector<Config, bool>(
+            selector: (_, config) => config.systemProxy,
+            builder: (_, systemProxy, __) {
+              return ListItem.switchItem(
+                leading: const Icon(Icons.settings_ethernet),
+                title: Text(appLocalizations.systemProxy),
+                subtitle: Text(appLocalizations.systemProxyDesc),
+                delegate: SwitchDelegate(
+                  value: systemProxy,
+                  onChanged: (bool value) async {
+                    final appController = globalState.appController;
+                    appController.config.systemProxy = value;
+                  },
+                ),
+              );
+            },
+          ),
+        Selector<Config, bool>(
+          selector: (_, config) => config.isCompatible,
+          builder: (_, isCompatible, __) {
             return ListItem.switchItem(
-              leading: const Icon(
+              leading: const Icon(Icons.expand_outlined),
-                Icons.important_devices_outlined
+              title: Text(appLocalizations.compatible),
-              ),
+              subtitle: Text(appLocalizations.compatibleDesc),
-              title: Text(appLocalizations.tun),
-              subtitle: Text(appLocalizations.tunDesc),
               delegate: SwitchDelegate(
-                value: tunEnable,
+                value: isCompatible,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.config.isCompatible = value;
+                  await appController.applyProfile();
+                },
+              ),
+            );
+          },
+        ),
+      ],
+    );
+  }
+
+  List<Widget> _buildGeneralSection() {
+    return generateSection(
+      title: appLocalizations.general,
+      items: [
+        Selector<ClashConfig, LogLevel>(
+          selector: (_, clashConfig) => clashConfig.logLevel,
+          builder: (_, value, __) {
+            return ListItem(
+              leading: const Icon(Icons.info_outline),
+              title: Text(appLocalizations.logLevel),
+              subtitle: Text(value.name),
+              onTab: () {
+                _showLogLevelDialog(value);
+              },
+            );
+          },
+        ),
+        Selector<ClashConfig, String?>(
+          selector: (_, clashConfig) => clashConfig.globalRealUa,
+          builder: (_, value, __) {
+            return ListItem(
+              leading: const Icon(Icons.computer_outlined),
+              title: const Text("UA"),
+              subtitle: Text(value ?? appLocalizations.defaultText),
+              onTab: () {
+                _showUaDialog(value);
+              },
+            );
+          },
+        ),
+        Selector<Config, String>(
+          selector: (_, config) => config.testUrl,
+          builder: (_, value, __) {
+            return ListItem(
+              leading: const Icon(Icons.timeline),
+              title: Text(appLocalizations.testUrl),
+              subtitle: Text(value),
+              onTab: () {
+                _modifyTestUrl(value);
+              },
+            );
+          },
+        ),
+        Selector<ClashConfig, int>(
+          selector: (_, clashConfig) => clashConfig.mixedPort,
+          builder: (_, mixedPort, __) {
+            return ListItem(
+              onTab: () {
+                _modifyMixedPort(mixedPort);
+              },
+              leading: const Icon(Icons.adjust_outlined),
+              title: Text(appLocalizations.proxyPort),
+              subtitle: Text(appLocalizations.proxyPortDesc),
+              trailing: FilledButton.tonal(
+                onPressed: () {
+                  _modifyMixedPort(mixedPort);
+                },
+                child: Text(
+                  "$mixedPort",
+                ),
+              ),
+            );
+          },
+        ),
+        Selector<ClashConfig, bool>(
+          selector: (_, clashConfig) => clashConfig.ipv6,
+          builder: (_, ipv6, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.water_outlined),
+              title: const Text("IPv6"),
+              subtitle: Text(appLocalizations.ipv6Desc),
+              delegate: SwitchDelegate(
+                value: ipv6,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.clashConfig.ipv6 = value;
+                  appController.updateClashConfigDebounce();
+                },
+              ),
+            );
+          },
+        ),
+        Selector<ClashConfig, bool>(
+          selector: (_, clashConfig) => clashConfig.allowLan,
+          builder: (_, allowLan, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.device_hub),
+              title: Text(appLocalizations.allowLan),
+              subtitle: Text(appLocalizations.allowLanDesc),
+              delegate: SwitchDelegate(
+                value: allowLan,
                 onChanged: (bool value) async {
                   final clashConfig = context.read<ClashConfig>();
-                  clashConfig.tun = Tun(enable: value);
+                  clashConfig.allowLan = value;
                   globalState.appController.updateClashConfigDebounce();
                 },
               ),
             );
           },
         ),
-    ];
+        Selector<ClashConfig, bool>(
-    if(items.isEmpty) return Container();
+          selector: (_, clashConfig) => clashConfig.unifiedDelay,
-    return Section(
+          builder: (_, unifiedDelay, __) {
-      title: appLocalizations.general,
+            return ListItem.switchItem(
-      child: Column(
+              leading: const Icon(Icons.compress_outlined),
-        children: [
+              title: Text(appLocalizations.unifiedDelay),
-          for (final item in items) ...[
+              subtitle: Text(appLocalizations.unifiedDelayDesc),
-            item,
+              delegate: SwitchDelegate(
-            if (items.last != item)
+                value: unifiedDelay,
-              const Divider(
+                onChanged: (bool value) async {
-                height: 0,
+                  final appController = globalState.appController;
-              )
+                  appController.clashConfig.unifiedDelay = value;
-          ]
+                  appController.updateClashConfigDebounce();
-        ],
+                },
-      ),
+              ),
+            );
+          },
+        ),
+        Selector<ClashConfig, bool>(
+          selector: (_, clashConfig) =>
+              clashConfig.findProcessMode == FindProcessMode.always,
+          builder: (_, findProcess, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.polymer_outlined),
+              title: Text(appLocalizations.findProcessMode),
+              subtitle: Text(appLocalizations.findProcessModeDesc),
+              delegate: SwitchDelegate(
+                value: findProcess,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.clashConfig.findProcessMode =
+                      value ? FindProcessMode.always : FindProcessMode.off;
+                  appController.updateClashConfigDebounce();
+                },
+              ),
+            );
+          },
+        ),
+        Selector<ClashConfig, bool>(
+          selector: (_, clashConfig) => clashConfig.tcpConcurrent,
+          builder: (_, tcpConcurrent, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.double_arrow_outlined),
+              title: Text(appLocalizations.tcpConcurrent),
+              subtitle: Text(appLocalizations.tcpConcurrentDesc),
+              delegate: SwitchDelegate(
+                value: tcpConcurrent,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.clashConfig.tcpConcurrent = value;
+                  appController.updateClashConfigDebounce();
+                },
+              ),
+            );
+          },
+        ),
+        Selector<ClashConfig, bool>(
+          selector: (_, clashConfig) =>
+              clashConfig.geodataLoader == geodataLoaderMemconservative,
+          builder: (_, memconservative, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.memory),
+              title: Text(appLocalizations.geodataLoader),
+              subtitle: Text(appLocalizations.geodataLoaderDesc),
+              delegate: SwitchDelegate(
+                value: memconservative,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.clashConfig.geodataLoader = value
+                      ? geodataLoaderMemconservative
+                      : geodataLoaderStandard;
+                  appController.updateClashConfigDebounce();
+                },
+              ),
+            );
+          },
+        ),
+        Selector<ClashConfig, bool>(
+          selector: (_, clashConfig) =>
+              clashConfig.externalController.isNotEmpty,
+          builder: (_, hasExternalController, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.api_outlined),
+              title: Text(appLocalizations.externalController),
+              subtitle: Text(appLocalizations.externalControllerDesc),
+              delegate: SwitchDelegate(
+                value: hasExternalController,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.clashConfig.externalController =
+                      value ? defaultExternalController : '';
+                  appController.updateClashConfigDebounce();
+                },
+              ),
+            );
+          },
+        ),
+      ],
+    );
+  }
+
+  List<Widget> _buildMoreSection() {
+    return generateSection(
+      title: appLocalizations.more,
+      items: [
+        if (system.isDesktop)
+          Selector<ClashConfig, bool>(
+            selector: (_, clashConfig) => clashConfig.tun.enable,
+            builder: (_, tunEnable, __) {
+              return ListItem.switchItem(
+                leading: const Icon(Icons.important_devices_outlined),
+                title: Text(appLocalizations.tun),
+                subtitle: Text(appLocalizations.tunDesc),
+                delegate: SwitchDelegate(
+                  value: tunEnable,
+                  onChanged: (bool value) async {
+                    final clashConfig = context.read<ClashConfig>();
+                    clashConfig.tun = Tun(enable: value);
+                    globalState.appController.updateClashConfigDebounce();
+                  },
+                ),
+              );
+            },
+          ),
+      ],
     );
   }
 
   @override
   Widget build(BuildContext context) {
     List<Widget> items = [
-      _buildAppSection(),
+      ..._buildAppSection(),
-      _buildGeneralSection(),
+      ..._buildGeneralSection(),
-      _buildMoreSection(),
+      ..._buildMoreSection(),
     ];
     return ListView.builder(
       padding: const EdgeInsets.only(bottom: 32),
@@ -414,7 +465,7 @@ class _MixedPortFormDialogState extends State<MixedPortFormDialog> {
     portController = TextEditingController(text: "${widget.mixedPort}");
   }
 
-  _handleAddProfileFormURL() async {
+  _handleUpdate() async {
     final port = portController.value.text;
     if (port.isEmpty) return;
     Navigator.of(context).pop<String>(port);
@@ -440,7 +491,64 @@ class _MixedPortFormDialogState extends State<MixedPortFormDialog> {
       ),
       actions: [
         TextButton(
-          onPressed: _handleAddProfileFormURL,
+          onPressed: _handleUpdate,
+          child: Text(appLocalizations.submit),
+        )
+      ],
+    );
+  }
+}
+
+class TestUrlFormDialog extends StatefulWidget {
+  final String testUrl;
+
+  const TestUrlFormDialog({
+    super.key,
+    required this.testUrl,
+  });
+
+  @override
+  State<TestUrlFormDialog> createState() => _TestUrlFormDialogState();
+}
+
+class _TestUrlFormDialogState extends State<TestUrlFormDialog> {
+  late TextEditingController testUrlController;
+
+  @override
+  void initState() {
+    super.initState();
+    testUrlController = TextEditingController(text: widget.testUrl);
+  }
+
+  _handleUpdate() async {
+    final testUrl = testUrlController.value.text;
+    if (testUrl.isEmpty) return;
+    Navigator.of(context).pop<String>(testUrl);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(appLocalizations.testUrl),
+      content: SizedBox(
+        width: 300,
+        child: Wrap(
+          runSpacing: 16,
+          children: [
+            TextField(
+              maxLines: 5,
+              minLines: 1,
+              controller: testUrlController,
+              decoration: const InputDecoration(
+                border: OutlineInputBorder(),
+              ),
+            ),
+          ],
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: _handleUpdate,
           child: Text(appLocalizations.submit),
         )
       ],

lib/fragments/connections.dart

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

lib/fragments/dashboard/core_info.dart

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

lib/fragments/dashboard/intranet_ip.dart

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

lib/fragments/dashboard/network_detection.dart

@@ -19,6 +19,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
   final timeoutNotifier = ValueNotifier<bool>(false);
   bool? _preIsStart;
   CancelToken? cancelToken;
+  Function? _checkIpDebounce;
 
   _checkIp(
     bool isInit,
@@ -44,22 +45,33 @@ class _NetworkDetectionState extends State<NetworkDetection> {
   }
 
   _checkIpContainer(Widget child) {
+    _checkIpDebounce = debounce(_checkIp);
     return Selector2<AppState, Config, CheckIpSelectorState>(
       selector: (_, appState, config) {
         return CheckIpSelectorState(
           isInit: appState.isInit,
           selectedMap: appState.selectedMap,
           isStart: appState.isStart,
+          checkIpNum: appState.checkIpNum,
         );
       },
       builder: (_, state, __) {
-        _checkIp(state.isInit, state.isStart);
+        if (_checkIpDebounce != null) {
+          _checkIpDebounce!([state.isInit, state.isStart]);
+        }
         return child;
       },
       child: child,
     );
   }
 
+  @override
+  void dispose() {
+    super.dispose();
+    ipInfoNotifier.dispose();
+    timeoutNotifier.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return _checkIpContainer(
@@ -67,6 +79,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
         valueListenable: ipInfoNotifier,
         builder: (_, ipInfo, __) {
           return CommonCard(
+            onPressed: () {},
             child: Column(
               children: [
                 Flexible(
@@ -123,8 +136,9 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                   ),
                 ),
                 Container(
-                  height:
+                  height: globalState.appController.measure.titleLargeHeight +
-                      globalState.appController.measure.titleLargeHeight + 24,
+                      24 -
+                      2,
                   alignment: Alignment.centerLeft,
                   padding: const EdgeInsets.all(16).copyWith(top: 0),
                   child: FadeBox(
@@ -139,7 +153,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                                   text: Text(
                                     ipInfo.ip,
                                     style: context.textTheme.titleLarge
-                                        ?.toSoftBold(),
+                                        ?.toSoftBold.toMinus,
                                     maxLines: 1,
                                     overflow: TextOverflow.ellipsis,
                                   ),
@@ -153,9 +167,10 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                               if (timeout) {
                                 return Text(
                                   "timeout",
-                                  style: context.textTheme.titleMedium
+                                  style: context.textTheme.titleLarge
                                       ?.copyWith(color: Colors.red)
-                                      .toSoftBold(),
+                                      .toSoftBold
+                                      .toMinus,
                                   maxLines: 1,
                                   overflow: TextOverflow.ellipsis,
                                 );

lib/fragments/dashboard/network_speed.dart

@@ -47,8 +47,8 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
     final showValue = value.showValue;
     final showUnit = "${value.showUnit}/s";
     final titleLargeSoftBold =
-        Theme.of(context).textTheme.titleLarge?.toSoftBold();
+        Theme.of(context).textTheme.titleLarge?.toSoftBold;
-    final bodyMedium = Theme.of(context).textTheme.bodySmall?.toLight();
+    final bodyMedium = Theme.of(context).textTheme.bodySmall?.toLight;
     final valueText = Text(
       showValue,
       style: titleLargeSoftBold,
@@ -75,7 +75,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,6 +111,7 @@ class _NetworkSpeedState extends State<NetworkSpeed> {
   @override
   Widget build(BuildContext context) {
     return CommonCard(
+      onPressed: () {},
       info: Info(
         label: appLocalizations.networkSpeed,
         iconData: Icons.speed,

lib/fragments/dashboard/outbound_mode.dart

@@ -13,18 +13,9 @@ class OutboundMode extends StatelessWidget {
   _changeMode(BuildContext context, Mode? value) async {
     final appController = globalState.appController;
     final clashConfig = appController.clashConfig;
-    final config = appController.config;
     if (value == null || clashConfig.mode == value) return;
     clashConfig.mode = value;
     await appController.updateClashConfig();
-    if (!config.isCompatible) {
-      final proxySelected = config.currentSelectedMap[GroupName.Proxy.name];
-      final globalSelected = config.currentSelectedMap[GroupName.GLOBAL.name];
-      if (proxySelected != null && globalSelected == null) {
-        config.updateCurrentSelectedMap(GroupName.GLOBAL.name, proxySelected);
-      }
-    }
-    appController.changeProxy();
   }
 
   @override
@@ -33,6 +24,7 @@ class OutboundMode extends StatelessWidget {
       selector: (_, clashConfig) => clashConfig.mode,
       builder: (_, mode, __) {
         return CommonCard(
+          onPressed: () {},
           info: Info(
             label: appLocalizations.outboundMode,
             iconData: Icons.call_split,
@@ -63,11 +55,8 @@ class OutboundMode extends StatelessWidget {
                     ),
                     title: Text(
                       Intl.message(item.name),
-                      style: Theme
+                      style:
-                          .of(context)
+                          Theme.of(context).textTheme.titleMedium?.toSoftBold,
-                          .textTheme
-                          .titleMedium
-                          ?.toSoftBold(),
                     ),
                   ),
               ],

lib/fragments/dashboard/start_button.dart

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

lib/fragments/dashboard/traffic_usage.dart

@@ -42,7 +42,7 @@ class TrafficUsage extends StatelessWidget {
         ),
         Text(
           trafficValue.showUnit,
-          style: context.textTheme.labelMedium?.toLight(),
+          style: context.textTheme.labelMedium?.toLight,
         ),
       ],
     );
@@ -51,6 +51,7 @@ class TrafficUsage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return CommonCard(
+      onPressed: () {},
       info: Info(
         label: appLocalizations.trafficUsage,
         iconData: Icons.data_saver_off,

lib/fragments/logs.dart

@@ -17,7 +17,12 @@ class LogsFragment extends StatefulWidget {
 }
 
 class _LogsFragmentState extends State<LogsFragment> {
-  final logsNotifier = ValueNotifier<List<Log>>([]);
+  final logsNotifier = ValueNotifier<LogsAndKeywords>(const LogsAndKeywords());
+  final scrollController = ScrollController(
+    keepScrollOffset: false,
+  );
+  List<GlobalObjectKey<_LogItemState>> keys = [];
+
   Timer? timer;
 
   @override
@@ -25,18 +30,18 @@ class _LogsFragmentState extends State<LogsFragment> {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       final appState = globalState.appController.appState;
-      logsNotifier.value = List<Log>.from(appState.logs);
+      logsNotifier.value = logsNotifier.value.copyWith(logs: appState.logs);
       if (timer != null) {
         timer?.cancel();
         timer = null;
       }
       timer = Timer.periodic(const Duration(milliseconds: 200), (timer) {
-        final logs = List<Log>.from(appState.logs);
+        final logs = appState.logs;
         if (!const ListEquality<Log>().equals(
-          logsNotifier.value,
+          logsNotifier.value.logs,
           logs,
         )) {
-          logsNotifier.value = logs;
+          logsNotifier.value = logsNotifier.value.copyWith(logs: logs);
         }
       });
     });
@@ -46,6 +51,8 @@ class _LogsFragmentState extends State<LogsFragment> {
   void dispose() {
     super.dispose();
     timer?.cancel();
+    logsNotifier.dispose();
+    scrollController.dispose();
     timer = null;
   }
 
@@ -59,7 +66,7 @@ class _LogsFragmentState extends State<LogsFragment> {
             showSearch(
               context: context,
               delegate: LogsSearchDelegate(
-                logs: logsNotifier.value.reversed.toList(),
+                logs: logsNotifier.value,
               ),
             );
           },
@@ -72,32 +79,23 @@ class _LogsFragmentState extends State<LogsFragment> {
     });
   }
 
-  _buildList() {
+  _addKeyword(String keyword) {
-    return ValueListenableBuilder<List<Log>>(
+    final isContains = logsNotifier.value.keywords.contains(keyword);
-      valueListenable: logsNotifier,
+    if (isContains) return;
-      builder: (_, List<Log> logs, __) {
+    final keywords = List<String>.from(logsNotifier.value.keywords)
-        if (logs.isEmpty) {
+      ..add(keyword);
-          return NullStatus(
+    logsNotifier.value = logsNotifier.value.copyWith(
-            label: appLocalizations.nullLogsDesc,
+      keywords: keywords,
-          );
+    );
-        }
+  }
-        logs = logs.reversed.toList();
+
-        return ListView.separated(
+  _deleteKeyword(String keyword) {
-          physics: const AlwaysScrollableScrollPhysics(),
+    final isContains = logsNotifier.value.keywords.contains(keyword);
-          itemCount: logs.length,
+    if (!isContains) return;
-          itemBuilder: (BuildContext context, int index) {
+    final keywords = List<String>.from(logsNotifier.value.keywords)
-            final log = logs[index];
+      ..remove(keyword);
-            return LogItem(
+    logsNotifier.value = logsNotifier.value.copyWith(
-              log: log,
+      keywords: keywords,
-            );
-          },
-          separatorBuilder: (BuildContext context, int index) {
-            return const Divider(
-              height: 0,
-            );
-          },
-        );
-      },
     );
   }
 
@@ -114,21 +112,88 @@ class _LogsFragmentState extends State<LogsFragment> {
         }
         return child!;
       },
-      child: _buildList(),
+      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,
+                ),
+              )
+            ],
+          );
+        },
+      ),
     );
   }
 }
 
 class LogsSearchDelegate extends SearchDelegate {
-  List<Log> logs = [];
+  ValueNotifier<LogsAndKeywords> logsNotifier;
 
   LogsSearchDelegate({
-    required this.logs,
+    required LogsAndKeywords logs,
-  });
+  }) : logsNotifier = ValueNotifier(logs);
+
+  @override
+  void dispose() {
+    super.dispose();
+    logsNotifier.dispose();
+  }
+
+  get state => logsNotifier.value;
 
   List<Log> get _results {
     final lowQuery = query.toLowerCase();
-    return logs
+    return logsNotifier.value.filteredLogs
         .where(
           (log) =>
               (log.payload?.toLowerCase().contains(lowQuery) ?? false) ||
@@ -171,58 +236,120 @@ 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 ListView.separated(
+    return ValueListenableBuilder(
-      physics: const AlwaysScrollableScrollPhysics(),
+      valueListenable: logsNotifier,
-      itemCount: _results.length,
+      builder: (_, __, ___) {
-      itemBuilder: (BuildContext context, int index) {
+        return Column(
-        final log = _results[index];
+          crossAxisAlignment: CrossAxisAlignment.start,
-        return LogItem(
+          children: [
-          key: ValueKey(log.dateTime),
+            if (state.keywords.isNotEmpty)
-          log: log,
+              Padding(
-        );
+                padding: const EdgeInsets.symmetric(
-      },
+                  horizontal: 16,
-      separatorBuilder: (BuildContext context, int index) {
+                  vertical: 16,
-        return const Divider(
+                ),
-          height: 0,
+                child: Wrap(
+                  runSpacing: 6,
+                  spacing: 6,
+                  children: [
+                    for (final keyword in state.keywords)
+                      CommonChip(
+                        label: keyword,
+                        type: ChipType.delete,
+                        onPressed: () {
+                          _deleteKeyword(keyword);
+                        },
+                      ),
+                  ],
+                ),
+              ),
+            Expanded(
+              child: ListView.separated(
+                itemBuilder: (_, index) {
+                  final log = _results[index];
+                  return LogItem(
+                    key: Key(log.dateTime.toString()),
+                    log: log,
+                    onClick: (value) {
+                      _addKeyword(value);
+                    },
+                  );
+                },
+                separatorBuilder: (BuildContext context, int index) {
+                  return const Divider(
+                    height: 0,
+                  );
+                },
+                itemCount: _results.length,
+              ),
+            )
+          ],
         );
       },
     );
   }
 }
 
-class LogItem extends StatelessWidget {
+class LogItem extends StatefulWidget {
   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) {
-    return ListTile(
+    final log = widget.log;
+    return ListItem(
+      padding: const EdgeInsets.symmetric(
+        horizontal: 16,
+        vertical: 4,
+      ),
       title: SelectableText(log.payload ?? ''),
       subtitle: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Padding(
+          SelectableText(
-            padding: const EdgeInsets.only(
+            "${log.dateTime}",
-              top: 8,
+            style: context.textTheme.bodySmall
-            ),
+                ?.copyWith(color: context.colorScheme.primary),
-            child: SelectableText(
-              "${log.dateTime}",
-              style: context.textTheme.bodySmall
-                  ?.copyWith(color: context.colorScheme.primary),
-            ),
           ),
+          const SizedBox(height: 8,),
           Container(
             alignment: Alignment.centerLeft,
-            padding: const EdgeInsets.symmetric(
-              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

@@ -25,7 +25,9 @@ class AddProfile extends StatelessWidget {
     final url = await Navigator.of(context)
         .push<String>(MaterialPageRoute(builder: (_) => const ScanPage()));
     if (url != null) {
-      _handleAddProfileFormURL(url);
+      WidgetsBinding.instance.addPostFrameCallback((_){
+        _handleAddProfileFormURL(url);
+      });
     }
   }
 
@@ -91,6 +93,8 @@ class _URLFormDialogState extends State<URLFormDialog> {
           runSpacing: 16,
           children: [
             TextField(
+              maxLines: 5,
+              minLines: 1,
               controller: urlController,
               decoration: InputDecoration(
                 border: const OutlineInputBorder(),

lib/fragments/profiles/edit_profile.dart

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

lib/fragments/profiles/profiles.dart

@@ -28,6 +28,9 @@ class ProfilesFragment extends StatefulWidget {
 
 class _ProfilesFragmentState extends State<ProfilesFragment> {
   final hasPadding = ValueNotifier<bool>(false);
+  Function? applyConfigDebounce;
+
+  List<GlobalObjectKey<_ProfileItemState>> profileItemKeys = [];
 
   _handleShowAddExtendPage() {
     showExtendPage(
@@ -50,19 +53,22 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     }
   }
 
+  _updateProfiles() async {
+    final updateProfiles = profileItemKeys.map<Future>(
+        (key) async => await key.currentState?.updateProfile(false));
+    await Future.wait(updateProfiles);
+  }
+
   _initScaffoldState() {
     WidgetsBinding.instance.addPostFrameCallback(
       (_) {
         final commonScaffoldState =
             context.findAncestorStateOfType<CommonScaffoldState>();
+        if (!context.mounted) return;
         commonScaffoldState?.actions = [
           IconButton(
             onPressed: () {
-              commonScaffoldState.loadingRun<void>(
+              _updateProfiles();
-                () async {
-                  await globalState.appController.updateProfiles();
-                },
-              );
             },
             icon: const Icon(Icons.sync),
           ),
@@ -81,6 +87,30 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
     );
   }
 
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    hasPadding.dispose();
+  }
+
+  _changeProfile(String? id) async {
+    final appController = globalState.appController;
+    final config = appController.config;
+    if (id == config.currentProfileId) return;
+    config.currentProfileId = id;
+    applyConfigDebounce ??= debounce<Function()>(() async {
+      await appController.applyProfile();
+      appController.appState.delayMap = {};
+      appController.saveConfigPreferences();
+    });
+    applyConfigDebounce!();
+  }
+
   @override
   Widget build(BuildContext context) {
     return Selector<AppState, bool>(
@@ -103,44 +133,44 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
               label: appLocalizations.nullProfileDesc,
             );
           }
+          profileItemKeys = state.profiles
+              .map((profile) => GlobalObjectKey<_ProfileItemState>(profile.id))
+              .toList();
           final columns = _getColumns(state.viewMode);
-          final isMobile = state.viewMode == ViewMode.mobile;
           return Align(
             alignment: Alignment.topCenter,
             child: NotificationListener<ScrollNotification>(
               onNotification: (scrollNotification) {
-                WidgetsBinding.instance.addPostFrameCallback((_) {
+                WidgetsBinding.instance.addPostFrameCallback(
-                  hasPadding.value =
+                  (_) {
-                      scrollNotification.metrics.maxScrollExtent > 0;
+                    hasPadding.value =
-                });
+                        scrollNotification.metrics.maxScrollExtent > 0;
+                  },
+                );
                 return true;
               },
               child: ValueListenableBuilder(
                 valueListenable: hasPadding,
                 builder: (_, hasPadding, __) {
                   return SingleChildScrollView(
-                    padding: !isMobile
+                    padding: EdgeInsets.only(
-                        ? EdgeInsets.only(
+                      left: 16,
-                            left: 16,
+                      right: 16,
-                            right: 16,
+                      top: 16,
-                            top: 16,
+                      bottom: 16 + (hasPadding ? 56 : 0),
-                            bottom: 16 + (hasPadding ? 56 : 0),
+                    ),
-                          )
-                        : EdgeInsets.only(
-                            bottom: 0 + (hasPadding ? 56 : 0),
-                          ),
                     child: Grid(
-                      mainAxisSpacing: isMobile ? 8 : 16,
+                      mainAxisSpacing: 16,
                       crossAxisSpacing: 16,
                       crossAxisCount: columns,
                       children: [
-                        for (final profile in state.profiles)
+                        for (int i = 0; i < state.profiles.length; i++)
                           GridItem(
                             child: ProfileItem(
-                              profile: profile,
+                              key: profileItemKeys[i],
+                              profile: state.profiles[i],
                               groupValue: state.currentProfileId,
-                              onChanged:
+                              onChanged: _changeProfile,
-                                  globalState.appController.changeProfile,
                             ),
                           ),
                       ],
@@ -175,36 +205,46 @@ class ProfileItem extends StatefulWidget {
 class _ProfileItemState extends State<ProfileItem> {
   final isUpdating = ValueNotifier<bool>(false);
 
-  _handleDeleteProfile(String id) async {
+  _handleDeleteProfile() async {
-    globalState.appController.deleteProfile(id);
+    globalState.appController.deleteProfile(widget.profile.id);
   }
 
-  _handleUpdateProfile(String id) async {
+  _handleUpdateProfile() async {
+    await globalState.safeRun<void>(updateProfile);
+  }
+
+  Future updateProfile([isSingle = true]) async {
     isUpdating.value = true;
-    await globalState.safeRun<void>(() async {
+    try {
-      await globalState.appController.updateProfile(id);
+      await globalState.appController.updateProfile(widget.profile);
-    });
+    } catch (e) {
+      isUpdating.value = false;
+      if (!isSingle) {
+        return e.toString();
+      } else {
+        rethrow;
+      }
+    }
     isUpdating.value = false;
+    return null;
   }
 
-  _handleShowEditExtendPage(
+  _handleShowEditExtendPage() {
-    Profile profile,
-  ) {
     showExtendPage(
       context,
       body: EditProfile(
-        profile: profile.copyWith(),
+        profile: widget.profile,
         context: context,
       ),
       title: "${appLocalizations.edit}${appLocalizations.profile}",
     );
   }
 
-  _handleViewProfile(Profile profile) {
+  _handleViewProfile() {
     Navigator.of(context).push(
       MaterialPageRoute(
         builder: (context) => ViewProfile(
-          profile: profile.copyWith(),
+          profile: widget.profile,
         ),
       ),
     );
@@ -212,15 +252,6 @@ class _ProfileItemState extends State<ProfileItem> {
 
   _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
-        ? appLocalizations.infiniteTime
-        : DateTime.fromMillisecondsSinceEpoch(userInfo.expire * 1000).show;
     return Container(
       padding: const EdgeInsets.symmetric(vertical: 4),
       child: Column(
@@ -239,68 +270,147 @@ class _ProfileItemState extends State<ProfileItem> {
               ),
               Text(
                 profile.lastUpdateDate?.lastUpdateTimeDesc ?? '',
-                style: textTheme.labelMedium?.toLight(),
+                style: textTheme.labelMedium?.toLight,
               ),
             ],
           ),
-          Column(
+          Builder(builder: (context) {
-            mainAxisSize: MainAxisSize.min,
+            final userInfo = profile.userInfo ?? const UserInfo();
-            crossAxisAlignment: CrossAxisAlignment.start,
+            final use = userInfo.upload + userInfo.download;
-            mainAxisAlignment: MainAxisAlignment.center,
+            final total = userInfo.total;
-            children: [
+            final useShow = TrafficValue(value: use).show;
-              Container(
+            final totalShow = TrafficValue(value: total).show;
-                margin: const EdgeInsets.symmetric(
+            final progress = total == 0 ? 0.0 : use / total;
-                  vertical: 8,
+            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,
+                  ),
                 ),
-                child: LinearProgressIndicator(
+                Text(
-                  minHeight: 6,
+                  "$useShow / $totalShow",
-                  value: progress,
+                  style: textTheme.labelMedium?.toLight,
                 ),
-              ),
+                const SizedBox(
-              Text(
+                  height: 2,
-                "$useShow / $totalShow",
+                ),
-                style: textTheme.labelMedium?.toLight(),
+                Row(
-              ),
+                  children: [
-              const SizedBox(
+                    Text(
-                height: 2,
+                      appLocalizations.expirationTime,
-              ),
+                      style: textTheme.labelMedium?.toLighter,
-              Row(
+                    ),
-                children: [
+                    const SizedBox(
-                  Text(
+                      width: 4,
-                    appLocalizations.expirationTime,
+                    ),
-                    style: textTheme.labelMedium?.toLighter(),
+                    Text(
-                  ),
+                      expireShow,
-                  const SizedBox(
+                      style: textTheme.labelMedium?.toLighter,
-                    width: 4,
+                    ),
-                  ),
+                  ],
-                  Text(
+                )
-                    expireShow,
+              ],
-                    style: textTheme.labelMedium?.toLighter(),
+            );
-                  ),
+            // final child = switch (userInfo != null) {
-                ],
+            //   true => () {
-              )
+            //       final use = userInfo!.upload + userInfo.download;
-            ],
+            //       final total = userInfo.total;
-          ),
+            //       final useShow = TrafficValue(value: use).show;
+            //       final totalShow = TrafficValue(value: total).show;
+            //       final progress = total == 0 ? 0.0 : use / total;
+            //       final expireShow = userInfo.expire == 0
+            //           ? appLocalizations.infiniteTime
+            //           : DateTime.fromMillisecondsSinceEpoch(
+            //                   userInfo.expire * 1000)
+            //               .show;
+            //       return Column(
+            //         mainAxisSize: MainAxisSize.min,
+            //         crossAxisAlignment: CrossAxisAlignment.start,
+            //         mainAxisAlignment: MainAxisAlignment.center,
+            //         children: [
+            //           Container(
+            //             margin: const EdgeInsets.symmetric(
+            //               vertical: 8,
+            //             ),
+            //             child: LinearProgressIndicator(
+            //               minHeight: 6,
+            //               value: progress,
+            //             ),
+            //           ),
+            //           Text(
+            //             "$useShow / $totalShow",
+            //             style: textTheme.labelMedium?.toLight(),
+            //           ),
+            //           const SizedBox(
+            //             height: 2,
+            //           ),
+            //           Row(
+            //             children: [
+            //               Text(
+            //                 appLocalizations.expirationTime,
+            //                 style: textTheme.labelMedium?.toLighter(),
+            //               ),
+            //               const SizedBox(
+            //                 width: 4,
+            //               ),
+            //               Text(
+            //                 expireShow,
+            //                 style: textTheme.labelMedium?.toLighter(),
+            //               ),
+            //             ],
+            //           )
+            //         ],
+            //       );
+            //     }(),
+            //   false => Column(
+            //       children: [
+            //         Padding(
+            //           padding: const EdgeInsets.only(top: 8),
+            //           child: CommonChip(
+            //             onPressed: _handleViewProfile,
+            //             avatar: const Icon(Icons.remove_red_eye),
+            //             label: appLocalizations.view,
+            //           ),
+            //         ),
+            //       ],
+            //     ),
+            // };
+            // final measure = globalState.appController.measure;
+            // final height = 6 + 8 * 2 + 2 + measure.labelMediumHeight * 2;
+            // return SizedBox(
+            //   height: height,
+            //   child: child,
+            // );
+          }),
         ],
       ),
     );
   }
 
+  @override
+  void dispose() {
+    isUpdating.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     final profile = widget.profile;
     final groupValue = widget.groupValue;
     final onChanged = widget.onChanged;
-    return Selector<AppState, ViewMode>(
+    return CommonCard(
-      selector: (_, appState) => appState.viewMode,
-      builder: (_, viewMode, child) {
-        if (viewMode == ViewMode.mobile) {
-          return child!;
-        }
-        return CommonCard(
-          child: child!,
-        );
-      },
       child: ListItem.radio(
         key: Key(profile.id),
         horizontalTitleGap: 16,
@@ -310,48 +420,63 @@ class _ProfileItemState extends State<ProfileItem> {
           onChanged: onChanged,
         ),
         padding: const EdgeInsets.symmetric(horizontal: 16),
-        trailing: CommonPopupMenu<ProfileActions>(
+        trailing: SizedBox(
-          items: [
+          height: 48,
-            CommonPopupMenuItem(
+          width: 48,
-              action: ProfileActions.edit,
+          child: ValueListenableBuilder(
-              label: appLocalizations.edit,
+            valueListenable: isUpdating,
-              iconData: Icons.edit,
+            builder: (_, isUpdating, ___) {
-            ),
+              return FadeBox(
-            if (profile.type == ProfileType.url)
+                  child: isUpdating
-              CommonPopupMenuItem(
+                      ? const Padding(
-                action: ProfileActions.update,
+                          padding: EdgeInsets.all(8),
-                label: appLocalizations.update,
+                          child: CircularProgressIndicator(),
-                iconData: Icons.sync,
+                        )
-              ),
+                      : CommonPopupMenu<ProfileActions>(
-            CommonPopupMenuItem(
+                          items: [
-              action: ProfileActions.delete,
+                            CommonPopupMenuItem(
-              label: appLocalizations.delete,
+                              action: ProfileActions.edit,
-              iconData: Icons.delete,
+                              label: appLocalizations.edit,
-            ),
+                              iconData: Icons.edit,
-            // CommonPopupMenuItem(
+                            ),
-            //   action: ProfileActions.view,
+                            if (profile.type == ProfileType.url)
-            //   label: "查看",
+                              CommonPopupMenuItem(
-            //   iconData: Icons.visibility,
+                                action: ProfileActions.update,
-            // ),
+                                label: appLocalizations.update,
-          ],
+                                iconData: Icons.sync,
-          onSelected: (ProfileActions? action) async {
+                              ),
-            switch (action) {
+                            CommonPopupMenuItem(
-              case ProfileActions.edit:
+                              action: ProfileActions.view,
-                _handleShowEditExtendPage(profile);
+                              label: appLocalizations.view,
-                break;
+                              iconData: Icons.visibility,
-              case ProfileActions.delete:
+                            ),
-                _handleDeleteProfile(profile.id);
+                            CommonPopupMenuItem(
-                break;
+                              action: ProfileActions.delete,
-              case ProfileActions.update:
+                              label: appLocalizations.delete,
-                _handleUpdateProfile(profile.id);
+                              iconData: Icons.delete,
-                break;
+                            ),
-              case ProfileActions.view:
+                          ],
-                _handleViewProfile(profile);
+                          onSelected: (ProfileActions? action) async {
-                break;
+                            switch (action) {
-              case null:
+                              case ProfileActions.edit:
-                break;
+                                _handleShowEditExtendPage();
-            }
+                                break;
-          },
+                              case ProfileActions.delete:
+                                _handleDeleteProfile();
+                                break;
+                              case ProfileActions.update:
+                                _handleUpdateProfile();
+                                break;
+                              case ProfileActions.view:
+                                _handleViewProfile();
+                                break;
+                              case null:
+                                break;
+                            }
+                          },
+                        ));
+            },
+          ),
         ),
         title: _buildTitle(profile),
         tileTitleAlignment: ListTileTitleAlignment.titleHeight,

lib/fragments/profiles/view_profile.dart

@@ -2,6 +2,7 @@ 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';
@@ -22,7 +23,9 @@ class ViewProfile extends StatefulWidget {
 
 class _ViewProfileState extends State<ViewProfile> {
   bool readOnly = true;
-  final controller = CodeLineEditingController();
+  CodeLineEditingController? controller;
+  final contentNotifier = ValueNotifier<String>("");
+  final key = GlobalKey<CommonScaffoldState>();
 
   @override
   void initState() {
@@ -34,80 +37,120 @@ class _ViewProfileState extends State<ViewProfile> {
       }
       final file = File(profilePath);
       final text = await file.readAsString();
-      controller.text = text;
+      contentNotifier.value = text;
-      // _codeController.text = 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,
+          onPressed: controller?.undo,
           icon: const Icon(Icons.undo),
         ),
         IconButton(
-          onPressed: controller.redo,
+          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: CodeEditor(
+      body: ValueListenableBuilder(
-        autofocus: false,
+        valueListenable: contentNotifier,
-        readOnly: readOnly,
+        builder: (_, value, __) {
-        scrollbarBuilder: (context, child, details) {
+          if (value.isEmpty) return Container();
-          return Scrollbar(
+          controller = CodeLineEditingController.fromText(value);
-            controller: details.controller,
+          return CodeEditor(
-            thumbVisibility: true,
+            autofocus: false,
-            interactive: true,
+            readOnly: readOnly,
-            child: child,
+            scrollbarBuilder: (context, child, details) {
-          );
+              return Scrollbar(
-        },
+                controller: details.controller,
-        showCursorWhenReadOnly: false,
+                thickness: 8,
-        controller: controller,
+                radius: const Radius.circular(2),
-        toolbarController: const ContextMenuControllerImpl(),
+                interactive: true,
-        shortcutsActivatorsBuilder:
+                child: child,
-            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,
+            showCursorWhenReadOnly: false,
-          ),
+            controller: controller,
-        ),
+            toolbarController:
-      ),
+                !readOnly ? const ContextMenuControllerImpl() : null,
-      title: "查看",
+            shortcutsActivatorsBuilder:
-      floatingActionButton: FloatingActionButton(
+                const DefaultCodeShortcutsActivatorsBuilder(),
-        onPressed: () {
+            indicatorBuilder:
-          setState(() {
+                (context, editingController, chunkController, notifier) {
-            readOnly = !readOnly;
+              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,
+              ),
+            ),
+          );
         },
-        child: readOnly ? const Icon(Icons.edit) : const Icon(Icons.save),
       ),
+      title: widget.profile.label ?? widget.profile.id,
     );
   }
 }
@@ -140,7 +183,6 @@ class ContextMenuControllerImpl implements SelectionToolbarController {
     }
     showMenu(
       context: context,
-      popUpAnimationStyle: AnimationStyle.noAnimation,
       position: RelativeRect.fromSize(
         (anchors.secondaryAnchor ?? anchors.primaryAnchor) &
             const Size(150, double.infinity),
@@ -148,22 +190,16 @@ class ContextMenuControllerImpl implements SelectionToolbarController {
       ),
       items: [
         ContextMenuItemWidget(
-          text: 'Cut',
+          text: appLocalizations.cut,
-          onTap: () {
+          onTap: controller.cut,
-            controller.cut();
-          },
         ),
         ContextMenuItemWidget(
-          text: 'Copy',
+          text: appLocalizations.copy,
-          onTap: () {
+          onTap: controller.copy,
-            controller.copy();
-          },
         ),
         ContextMenuItemWidget(
-          text: 'Paste',
+          text: appLocalizations.paste,
-          onTap: () {
+          onTap: controller.paste,
-            controller.paste();
-          },
         ),
       ],
     );

lib/fragments/requests.dart

@@ -3,21 +3,24 @@ 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 RequestFragment extends StatefulWidget {
+class RequestsFragment extends StatefulWidget {
-  const RequestFragment({super.key});
+  const RequestsFragment({super.key});
 
   @override
-  State<RequestFragment> createState() => _RequestFragmentState();
+  State<RequestsFragment> createState() => _RequestsFragmentState();
 }
 
-class _RequestFragmentState extends State<RequestFragment> {
+class _RequestsFragmentState extends State<RequestsFragment> {
-  final requestsNotifier = ValueNotifier<List<Connection>>([]);
+  final requestsNotifier =
+      ValueNotifier<ConnectionsAndKeywords>(const ConnectionsAndKeywords());
   final ScrollController _scrollController = ScrollController(
     keepScrollOffset: false,
   );
@@ -29,23 +32,70 @@ class _RequestFragmentState extends State<RequestFragment> {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       final appState = globalState.appController.appState;
-      requestsNotifier.value = List<Connection>.from(appState.requests);
+      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 = List<Connection>.from(appState.requests);
+        final requests = appState.requests;
         if (!const ListEquality<Connection>().equals(
-          requestsNotifier.value,
+          requestsNotifier.value.connections,
           requests,
         )) {
-          requestsNotifier.value = 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();
@@ -56,42 +106,86 @@ class _RequestFragmentState extends State<RequestFragment> {
 
   @override
   Widget build(BuildContext context) {
-    return ValueListenableBuilder<List<Connection>>(
+    return Selector<AppState, bool?>(
-      valueListenable: requestsNotifier,
+      selector: (_, appState) =>
-      builder: (_, List<Connection> connections, __) {
+          appState.currentLabel == 'requests' ||
-        if (connections.isEmpty) {
+          appState.viewMode == ViewMode.mobile &&
-          return NullStatus(
+              appState.currentLabel == "tools",
-            label: appLocalizations.nullRequestsDesc,
+      builder: (_, isCurrent, child) {
-          );
+        if (isCurrent == null || isCurrent) {
+          _initActions();
         }
-        connections = connections.reversed.toList();
+        return child!;
-        return ListView.separated(
-          controller: _scrollController,
-          itemBuilder: (_, index) {
-            final connection = connections[index];
-            return RequestItem(
-              key: Key(connection.id),
-              connection: connection,
-            );
-          },
-          separatorBuilder: (BuildContext context, int index) {
-            return const Divider(
-              height: 0,
-            );
-          },
-          itemCount: connections.length,
-        );
       },
+      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: 6,
+                    spacing: 6,
+                    children: [
+                      for (final keyword in state.keywords)
+                        CommonChip(
+                          label: keyword,
+                          type: ChipType.delete,
+                          onPressed: () {
+                            _deleteKeyword(keyword);
+                          },
+                        ),
+                    ],
+                  ),
+                ),
+              Expanded(
+                child: ListView.separated(
+                  controller: _scrollController,
+                  itemBuilder: (_, index) {
+                    final connection = connections[index];
+                    return 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 {
@@ -99,7 +193,7 @@ class RequestItem extends StatelessWidget {
   }
 
   String _getRequestText(Metadata metadata) {
-    var text = "${metadata.network}:://";
+    var text = "${metadata.network}://";
     final ips = [
       metadata.host,
       metadata.destinationIP,
@@ -119,8 +213,12 @@ class RequestItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ListTile(
+    return ListItem(
-      titleAlignment: ListTileTitleAlignment.top,
+      padding: const EdgeInsets.symmetric(
+        horizontal: 16,
+        vertical: 4,
+      ),
+      tileTitleAlignment: ListTileTitleAlignment.titleHeight,
       leading: Platform.isAndroid
           ? Container(
               margin: const EdgeInsets.only(top: 4),
@@ -150,29 +248,171 @@ class RequestItem extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           const SizedBox(
-            height: 12,
+            height: 8,
           ),
           Text(
             _getSourceText(connection),
           ),
           const SizedBox(
-            height: 12,
+            height: 8,
           ),
           Wrap(
-            runSpacing: 8,
+            runSpacing: 6,
-            spacing: 8,
+            spacing: 6,
             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: 6,
+                  spacing: 6,
+                  children: [
+                    for (final keyword in state.keywords)
+                      CommonChip(
+                        label: keyword,
+                        type: ChipType.delete,
+                        onPressed: () {
+                          _deleteKeyword(keyword);
+                        },
+                      ),
+                  ],
+                ),
+              ),
+            Expanded(
+              child: ListView.separated(
+                itemBuilder: (_, index) {
+                  final connection = _results[index];
+                  return 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

@@ -2,7 +2,8 @@ import 'dart:io';
 
 import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/models/ffi.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:path/path.dart' hide context;
@@ -18,6 +19,17 @@ class GeoItem {
   });
 }
 
+@immutable
+class FileInfo {
+  final String size;
+  final DateTime lastModified;
+
+  const FileInfo({
+    required this.size,
+    required this.lastModified,
+  });
+}
+
 class Resources extends StatefulWidget {
   const Resources({super.key});
 
@@ -26,147 +38,356 @@ class Resources extends StatefulWidget {
 }
 
 class _ResourcesState extends State<Resources> {
-  _updateExternalProvider(
+  List<ExternalProvider> externalProviders = [];
-    String providerName,
+
-    String providerType,
+  List<GlobalObjectKey<_ProviderItemState>> providerItemKeys = [];
-  ) async {
+
-    final commonScaffoldState = context.commonScaffoldState;
+  @override
-    await commonScaffoldState?.loadingRun(() async {
+  void initState() {
-      final message = await clashCore.updateExternalProvider(
+    super.initState();
-        providerName: providerName,
+    WidgetsBinding.instance.addPostFrameCallback((_) {
-        providerType: providerType,
+      _syncExternalProviders();
-      );
-      if (message.isNotEmpty) throw message;
     });
+  }
+
+  _syncExternalProviders() async {
+    externalProviders = await clashCore.getExternalProviders();
     setState(() {});
   }
 
-  Future<DateTime> _getGeoFileLastModified(String fileName) async {
+  _updateProviders() async {
-    final homePath = await appPath.getHomeDirPath();
+    print(providerItemKeys);
-    return await File(join(homePath, fileName)).lastModified();
+    final updateProviders = providerItemKeys.map<Future>(
-  }
+      (key) async => await key.currentState?.updateProvider(false),
-
-  Widget _buildExternalProviderSection() {
-    return FutureBuilder<List<ExternalProvider>>(
-      future: () async {
-        await Future.delayed(const Duration(milliseconds: 200));
-        return await clashCore.getExternalProviders();
-      }(),
-      builder: (_, snapshot) {
-        return Center(
-          child: FadeBox(
-            key: const Key("external_providers"),
-            child: snapshot.data == null || snapshot.data!.isEmpty
-                ? Container()
-                : Section(
-                    title: appLocalizations.externalResources,
-                    child: Column(
-                      children: [
-                        for (final externalProvider in snapshot.data!)
-                          ListItem(
-                            title: Text(externalProvider.name),
-                            subtitle: Text(
-                              "${externalProvider.type} (${externalProvider.vehicleType})",
-                            ),
-                            trailing: Row(
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                Text(
-                                  externalProvider.updateAt.lastUpdateTimeDesc,
-                                  style: context.textTheme.bodyMedium,
-                                ),
-                                const Padding(
-                                  padding: EdgeInsets.only(left: 12,right: 4),
-                                  child: VerticalDivider(
-                                    endIndent: 2,
-                                    width: 4,
-                                    indent: 2,
-                                  ),
-                                ),
-                                externalProvider.vehicleType == "HTTP"
-                                    ? IconButton(
-                                        icon: const Icon(Icons.sync),
-                                        onPressed: () {
-                                          _updateExternalProvider(
-                                            externalProvider.name,
-                                            externalProvider.type,
-                                          );
-                                        },
-                                      )
-                                    : Container(),
-                              ],
-                            ),
-                          )
-                      ],
-                    ),
-                  ),
-          ),
-        );
-      },
     );
+    await Future.wait(updateProviders);
+    _syncExternalProviders();
   }
 
-  Widget _buildGeoDataSection() {
+  List<Widget> _buildExternalProviderSection() {
+    List<GlobalObjectKey<_ProviderItemState>> keys = [];
+    final res = generateSection(
+      title: appLocalizations.externalResources,
+      actions: [
+        IconButton(
+          onPressed: () {
+            _updateProviders();
+          },
+          icon: const Icon(
+            Icons.sync,
+          ),
+        )
+      ],
+      items: externalProviders.map(
+        (externalProvider) {
+          final key =
+              GlobalObjectKey<_ProviderItemState>(externalProvider.name);
+          keys.add(key);
+          return ProviderItem(
+            key: key,
+            provider: externalProvider,
+            onUpdated: () {
+              _syncExternalProviders();
+            },
+          );
+        },
+      ),
+    );
+    providerItemKeys = keys;
+    return res;
+  }
+
+  List<Widget> _buildGeoDataSection() {
     const geoItems = <GeoItem>[
       GeoItem(label: "GeoIp", fileName: mmdbFileName),
       GeoItem(label: "GeoSite", fileName: geoSiteFileName),
       GeoItem(label: "ASN", fileName: asnFileName),
     ];
-    return Section(
+    return generateSection(
       title: appLocalizations.geoData,
-      child: Column(
+      items: geoItems.map(
-        children: [
+        (geoItem) => GeoDataListItem(
-          for (final geoItem in geoItems)
+          geoItem: geoItem,
-            ListItem(
+        ),
-              title: Text(geoItem.label),
-              subtitle: FutureBuilder<DateTime>(
-                future: () async {
-                  await Future.delayed(const Duration(milliseconds: 200));
-                  return await _getGeoFileLastModified(geoItem.fileName);
-                }(),
-                builder: (_, snapshot) {
-                  return Container(
-                    alignment: Alignment.centerLeft,
-                    height: 24,
-                    child: FadeBox(
-                      key: Key("fade_box_${geoItem.label}"),
-                      child: snapshot.data == null
-                          ? const SizedBox(
-                              width: 24,
-                              height: 24,
-                              child: CircularProgressIndicator(
-                                strokeWidth: 2,
-                              ),
-                            )
-                          : Text(
-                              snapshot.data!.lastUpdateTimeDesc,
-                            ),
-                    ),
-                  );
-                },
-              ),
-              trailing: IconButton(
-                icon: const Icon(Icons.sync),
-                onPressed: () {
-                  _updateExternalProvider(
-                    geoItem.fileName,
-                    geoItem.label,
-                  );
-                },
-              ),
-            ),
-        ],
       ),
     );
   }
 
   @override
   Widget build(BuildContext context) {
-    return ListView(
+    return generateListView(
-      children: [
+      [
-        _buildGeoDataSection(),
+        ..._buildGeoDataSection(),
-        _buildExternalProviderSection(),
+        ..._buildExternalProviderSection(),
       ],
     );
   }
 }
+
+class GeoDataListItem extends StatefulWidget {
+  final GeoItem geoItem;
+
+  const GeoDataListItem({
+    super.key,
+    required this.geoItem,
+  });
+
+  @override
+  State<GeoDataListItem> createState() => _GeoDataListItemState();
+}
+
+class _GeoDataListItemState extends State<GeoDataListItem> {
+  final isUpdating = ValueNotifier<bool>(false);
+
+  GeoItem get geoItem => widget.geoItem;
+
+  Future<FileInfo> _getGeoFileLastModified(String fileName) async {
+    final homePath = await appPath.getHomeDirPath();
+    final file = File(join(homePath, fileName));
+    final lastModified = await file.lastModified();
+    final size = await file.length();
+    return FileInfo(
+      size: TrafficValue(value: size).show,
+      lastModified: lastModified,
+    );
+  }
+
+  // _uploadGeoFile(String fileName) async {
+  //   final res = await picker.pickerGeoDataFile();
+  //   if (res == null || res.bytes == null) return;
+  //   final homePath = await appPath.getHomeDirPath();
+  //   final file = File(join(homePath, fileName));
+  //   await file.writeAsBytes(
+  //     res.bytes!,
+  //     flush: true,
+  //   );
+  //   setState(() {});
+  // }
+
+  String _buildFileInfoDesc(FileInfo fileInfo) {
+    return "${fileInfo.size}  ·  ${fileInfo.lastModified.lastUpdateTimeDesc}";
+  }
+
+  Widget _buildSubtitle() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        const SizedBox(
+          height: 4,
+        ),
+        FutureBuilder<FileInfo>(
+          future: _getGeoFileLastModified(geoItem.fileName),
+          builder: (_, snapshot) {
+            return SizedBox(
+              height: 24,
+              child: FadeBox(
+                key: Key("fade_box_${geoItem.label}"),
+                child: snapshot.data == null
+                    ? const SizedBox(
+                        width: 24,
+                        height: 24,
+                        child: CircularProgressIndicator(
+                          strokeWidth: 2,
+                        ),
+                      )
+                    : Text(
+                        _buildFileInfoDesc(snapshot.data!),
+                      ),
+              ),
+            );
+          },
+        ),
+        const SizedBox(
+          height: 8,
+        ),
+        Wrap(
+          runSpacing: 6,
+          spacing: 12,
+          children: [
+            // CommonChip(
+            //   avatar: const Icon(Icons.upload),
+            //   label: "编辑",
+            //   onPressed: () {
+            //     _uploadGeoFile(geoItem.fileName);
+            //   },
+            // ),
+            CommonChip(
+              avatar: const Icon(Icons.sync),
+              label: appLocalizations.sync,
+              onPressed: () {
+                _handleUpdateGeoDataItem();
+              },
+            ),
+          ],
+        ),
+      ],
+    );
+  }
+
+  _handleUpdateGeoDataItem() async {
+    await globalState.safeRun<void>(updateGeoDateItem);
+    setState(() {});
+  }
+
+  updateGeoDateItem() async {
+    isUpdating.value = true;
+    try {
+      final message = await clashCore.updateExternalProvider(
+        providerName: geoItem.fileName,
+        providerType: geoItem.label,
+      );
+      if (message.isNotEmpty) throw message;
+    } catch (e) {
+      isUpdating.value = false;
+      rethrow;
+    }
+    isUpdating.value = false;
+    return null;
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    isUpdating.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ListItem(
+      padding: const EdgeInsets.symmetric(
+        horizontal: 16,
+        vertical: 4,
+      ),
+      title: Text(geoItem.label),
+      subtitle: _buildSubtitle(),
+      trailing: SizedBox(
+        height: 48,
+        width: 48,
+        child: ValueListenableBuilder(
+          valueListenable: isUpdating,
+          builder: (_, isUpdating, ___) {
+            return FadeBox(
+              child: isUpdating
+                  ? const Padding(
+                      padding: EdgeInsets.all(8),
+                      child: CircularProgressIndicator(),
+                    )
+                  : const SizedBox(),
+            );
+          },
+        ),
+      ),
+    );
+  }
+}
+
+class ProviderItem extends StatefulWidget {
+  final ExternalProvider provider;
+  final Function onUpdated;
+
+  const ProviderItem({
+    super.key,
+    required this.provider,
+    required this.onUpdated,
+  });
+
+  @override
+  State<ProviderItem> createState() => _ProviderItemState();
+}
+
+class _ProviderItemState extends State<ProviderItem> {
+  final isUpdating = ValueNotifier<bool>(false);
+
+  ExternalProvider get provider => widget.provider;
+
+  _handleUpdateProfile() async {
+    await globalState.safeRun<void>(updateProvider);
+    widget.onUpdated();
+  }
+
+  updateProvider([isSingle = true]) async {
+    if (provider.vehicleType != "HTTP") return;
+    isUpdating.value = true;
+    try {
+      final message = await clashCore.updateExternalProvider(
+        providerName: provider.name,
+        providerType: provider.type,
+      );
+      if (message.isNotEmpty) throw message;
+    } catch (e) {
+      isUpdating.value = false;
+      if (!isSingle) {
+        return e.toString();
+      } else {
+        rethrow;
+      }
+    }
+    isUpdating.value = false;
+    return null;
+  }
+
+  String _buildProviderDesc() {
+    return "${provider.type} (${provider.vehicleType})  ·  ${provider.updateAt.lastUpdateTimeDesc}";
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    isUpdating.dispose();
+  }
+
+  Widget _buildSubtitle() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        const SizedBox(
+          height: 4,
+        ),
+        Text(
+          _buildProviderDesc(),
+        ),
+        if (provider.vehicleType == "HTTP") ...[
+          const SizedBox(
+            height: 8,
+          ),
+          CommonChip(
+            avatar: const Icon(Icons.sync),
+            label: appLocalizations.sync,
+            onPressed: () {
+              _handleUpdateProfile();
+            },
+          ),
+        ],
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ListItem(
+      padding: const EdgeInsets.symmetric(
+        horizontal: 16,
+        vertical: 4,
+      ),
+      title: Text(provider.name),
+      subtitle: _buildSubtitle(),
+      trailing: SizedBox(
+        height: 48,
+        width: 48,
+        child: ValueListenableBuilder(
+          valueListenable: isUpdating,
+          builder: (_, isUpdating, ___) {
+            return FadeBox(
+              child: isUpdating
+                  ? const Padding(
+                      padding: EdgeInsets.all(8),
+                      child: CircularProgressIndicator(),
+                    )
+                  : const SizedBox(),
+            );
+          },
+        ),
+      ),
+    );
+  }
+}

lib/fragments/tools.dart

@@ -57,138 +57,120 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
     return Intl.message(locale.toString());
   }
 
-  Widget _getOtherList() {
+  List<Widget> _getOtherList() {
-    List<Widget> items = [
+    return generateSection(
-      ListItem.open(
+      title: appLocalizations.other,
-        leading: const Icon(Icons.info),
+      items: [
-        title: Text(appLocalizations.about),
+        ListItem.open(
-        delegate: OpenDelegate(
+          leading: const Icon(Icons.info),
-          title: appLocalizations.about,
+          title: Text(appLocalizations.about),
-          widget: const AboutFragment(),
+          delegate: OpenDelegate(
+            title: appLocalizations.about,
+            widget: const AboutFragment(),
+          ),
         ),
-      ),
-    ];
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        for (final item in items) ...[
-          item,
-          if (item != items.last)
-            const Divider(
-              height: 0,
-            ),
-        ]
       ],
     );
   }
 
-  Widget _getSettingList() {
+  List<Widget> _getSettingList() {
-    List<Widget> items = [
+    return generateSection(
-      Selector<Config, String?>(
+      title: appLocalizations.settings,
-        selector: (_, config) => config.locale,
+      items: [
-        builder: (_, localeString, __) {
+        Selector<Config, String?>(
-          final subTitle = localeString ?? appLocalizations.defaultText;
+          selector: (_, config) => config.locale,
-          final currentLocale = other.getLocaleForString(localeString);
+          builder: (_, localeString, __) {
-          return ListTile(
+            final subTitle = localeString ?? appLocalizations.defaultText;
-            leading: const Icon(Icons.language_outlined),
+            final currentLocale = other.getLocaleForString(localeString);
-            title: Text(appLocalizations.language),
+            return ListTile(
-            subtitle: Text(Intl.message(subTitle)),
+              leading: const Icon(Icons.language_outlined),
-            onTap: () {
+              title: Text(appLocalizations.language),
-              globalState.showCommonDialog(
+              subtitle: Text(Intl.message(subTitle)),
-                child: AlertDialog(
+              onTap: () {
-                  title: Text(appLocalizations.language),
+                globalState.showCommonDialog(
-                  contentPadding: const EdgeInsets.symmetric(
+                  child: AlertDialog(
-                    horizontal: 8,
+                    title: Text(appLocalizations.language),
-                    vertical: 16,
+                    contentPadding: const EdgeInsets.symmetric(
-                  ),
+                      horizontal: 8,
-                  content: SizedBox(
+                      vertical: 16,
-                    width: 250,
+                    ),
-                    child: Wrap(
+                    content: SizedBox(
-                      children: [
+                      width: 250,
-                        for (final locale in [
+                      child: Wrap(
-                          null,
+                        children: [
-                          ...AppLocalizations.delegate.supportedLocales
+                          for (final locale in [
-                        ])
+                            null,
-                          ListItem.radio(
+                            ...AppLocalizations.delegate.supportedLocales
-                            delegate: RadioDelegate<Locale?>(
+                          ])
-                              value: locale,
+                            ListItem.radio(
-                              groupValue: currentLocale,
+                              delegate: RadioDelegate<Locale?>(
-                              onChanged: (Locale? value) {
+                                value: locale,
-                                final config = context.read<Config>();
+                                groupValue: currentLocale,
-                                config.locale = value?.toString();
+                                onChanged: (Locale? value) {
-                                Navigator.of(context).pop();
+                                  final config = context.read<Config>();
-                              },
+                                  config.locale = value?.toString();
-                            ),
+                                  Navigator.of(context).pop();
-                            title: Text(_getLocaleString(locale)),
+                                },
-                          )
+                              ),
-                      ],
+                              title: Text(_getLocaleString(locale)),
+                            )
+                        ],
+                      ),
                     ),
                   ),
-                ),
+                );
-              );
+              },
-            },
+            );
-          );
+          },
-        },
-      ),
-      ListItem.open(
-        leading: const Icon(Icons.style),
-        title: Text(appLocalizations.theme),
-        subtitle: Text(appLocalizations.themeDesc),
-        delegate: OpenDelegate(
-          title: appLocalizations.theme,
-          widget: const ThemeFragment(),
-          extendPageWidth: 360,
         ),
-      ),
-      ListItem.open(
-        leading: const Icon(Icons.cloud_sync),
-        title: Text(appLocalizations.backupAndRecovery),
-        subtitle: Text(appLocalizations.backupAndRecoveryDesc),
-        delegate: OpenDelegate(
-          title: appLocalizations.backupAndRecovery,
-          widget: const BackupAndRecovery(),
-        ),
-      ),
-      if (Platform.isAndroid)
         ListItem.open(
-          leading: const Icon(Icons.view_list),
+          leading: const Icon(Icons.style),
-          title: Text(appLocalizations.accessControl),
+          title: Text(appLocalizations.theme),
-          subtitle: Text(appLocalizations.accessControlDesc),
+          subtitle: Text(appLocalizations.themeDesc),
           delegate: OpenDelegate(
-            title: appLocalizations.appAccessControl,
+            title: appLocalizations.theme,
-            widget: const AccessFragment(),
+            widget: const ThemeFragment(),
+            extendPageWidth: 360,
           ),
         ),
-      ListItem.open(
+        ListItem.open(
-        leading: const Icon(Icons.edit),
+          leading: const Icon(Icons.cloud_sync),
-        title: Text(appLocalizations.override),
+          title: Text(appLocalizations.backupAndRecovery),
-        subtitle: Text(appLocalizations.overrideDesc),
+          subtitle: Text(appLocalizations.backupAndRecoveryDesc),
-        delegate: OpenDelegate(
+          delegate: OpenDelegate(
-          title: appLocalizations.override,
+            title: appLocalizations.backupAndRecovery,
-          widget: const ConfigFragment(),
+            widget: const BackupAndRecovery(),
-          extendPageWidth: 360,
+          ),
         ),
-      ),
+        if (Platform.isAndroid)
-      ListItem.open(
+          ListItem.open(
-        leading: const Icon(Icons.settings_applications),
+            leading: const Icon(Icons.view_list),
-        title: Text(appLocalizations.application),
+            title: Text(appLocalizations.accessControl),
-        subtitle: Text(appLocalizations.applicationDesc),
+            subtitle: Text(appLocalizations.accessControlDesc),
-        delegate: OpenDelegate(
+            delegate: OpenDelegate(
-          title: appLocalizations.application,
+              title: appLocalizations.appAccessControl,
-          widget: const ApplicationSettingFragment(),
+              widget: const AccessFragment(),
-        ),
-      ),
-    ];
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        for (final item in items) ...[
-          item,
-          if (item != items.last)
-            const Divider(
-              height: 0,
             ),
-        ]
+          ),
+        ListItem.open(
+          leading: const Icon(Icons.edit),
+          title: Text(appLocalizations.override),
+          subtitle: Text(appLocalizations.overrideDesc),
+          delegate: OpenDelegate(
+            title: appLocalizations.override,
+            widget: const ConfigFragment(),
+            extendPageWidth: 360,
+          ),
+        ),
+        ListItem.open(
+          leading: const Icon(Icons.settings_applications),
+          title: Text(appLocalizations.application),
+          subtitle: Text(appLocalizations.applicationDesc),
+          delegate: OpenDelegate(
+            title: appLocalizations.application,
+            widget: const ApplicationSettingFragment(),
+          ),
+        ),
       ],
     );
   }
@@ -216,20 +198,16 @@ class _ToolboxFragmentState extends State<ToolsFragment> {
               if (state.navigationItems.isEmpty) {
                 return Container();
               }
-              return Section(
+              return Column(
-                title: appLocalizations.more,
+                children: [
-                child: _buildNavigationMenu(state.navigationItems),
+                  ListHeader(title: appLocalizations.more),
+                  _buildNavigationMenu(state.navigationItems)
+                ],
               );
             },
           ),
-          Section(
+          ..._getSettingList(),
-            title: appLocalizations.settings,
+          ..._getOtherList(),
-            child: _getSettingList(),
-          ),
-          Section(
-            title: appLocalizations.other,
-            child: _getOtherList(),
-          ),
         ];
         return ListView.builder(
           itemCount: items.length,

lib/l10n/arb/intl_en.arb

@@ -37,7 +37,7 @@
   "overrideDesc": "Override Proxy related config",
   "allowLan": "AllowLan",
   "allowLanDesc": "Allow access proxy through the LAN",
-  "tun": "Tun mode",
+  "tun": "TUN mode",
   "tunDesc": "only effective in administrator mode",
   "minimizeOnExit": "Minimize on exit",
   "minimizeOnExitDesc": "Modify the default system exit event",
@@ -111,7 +111,7 @@
   "noMoreInfoDesc": "No more info",
   "profileParseErrorDesc": "profile parse error",
   "proxyPort": "ProxyPort",
-  "proxyPortDesc": "Set the clash listening port",
+  "proxyPortDesc": "Set the Clash listening port",
   "port": "Port",
   "logLevel": "LogLevel",
   "show": "Show",
@@ -161,28 +161,37 @@
   "checking": "Checking...",
   "country": "Country",
   "checkError": "Check error",
-  "ipCheckTimeout": "Ip check timeout",
   "search": "Search",
   "allowBypass": "Allow applications to bypass VPN",
   "allowBypassDesc": "Some apps can bypass VPN when turned on",
   "externalController": "ExternalController",
-  "externalControllerDesc": "Once enabled, the clash kernel can be controlled on port 9090",
+  "externalControllerDesc": "Once enabled, the Clash kernel can be controlled on port 9090",
-  "ipv6Desc": "When turned on it will be able to receive ipv6 traffic",
+  "ipv6Desc": "When turned on it will be able to receive IPv6 traffic",
   "app": "App",
   "general": "General",
   "systemProxyDesc": "Attach HTTP proxy to VpnService",
   "unifiedDelay": "Unified delay",
   "unifiedDelayDesc": "Remove extra delays such as handshaking",
-  "tcpConcurrent": "Tcp concurrent",
+  "tcpConcurrent": "TCP concurrent",
-  "tcpConcurrentDesc": "Enabling it will allow tcp concurrency",
+  "tcpConcurrentDesc": "Enabling it will allow TCP concurrency",
   "geodataLoader": "Geo Low Memory Mode",
   "geodataLoaderDesc": "Enabling will use the Geo low memory loader",
   "requests": "Requests",
   "requestsDesc": "View recently requested data",
-  "nullRequestsDesc": "No proxy or no request",
   "findProcessMode": "Find process",
   "findProcessModeDesc": "There is a risk of flashback after opening",
   "init": "Init",
   "infiniteTime": "Long term effective",
-  "expirationTime": "Expiration time"
+  "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",
+  "testUrl": "Test url",
+  "sync": "Sync"
 }

lib/l10n/arb/intl_zh_CN.arb

@@ -37,7 +37,7 @@
   "overrideDesc": "覆写代理相关配置",
   "allowLan": "局域网代理",
   "allowLanDesc": "允许通过局域网访问代理",
-  "tun": "Tun模式",
+  "tun": "TUN模式",
   "tunDesc": "仅在管理员模式生效",
   "minimizeOnExit": "退出时最小化",
   "minimizeOnExitDesc": "修改系统默认退出事件",
@@ -111,7 +111,7 @@
   "noMoreInfoDesc": "暂无更多信息",
   "profileParseErrorDesc": "配置文件解析错误",
   "proxyPort": "代理端口",
-  "proxyPortDesc": "设置clash监听端口",
+  "proxyPortDesc": "设置Clash监听端口",
   "port": "端口",
   "logLevel": "日志等级",
   "show": "显示",
@@ -161,28 +161,37 @@
   "checking": "检测中...",
   "country": "区域",
   "checkError": "检测失败",
-  "ipCheckTimeout": "Ip检测超时",
   "search": "搜索",
-  "allowBypass": "允许应用绕过vpn",
+  "allowBypass": "允许应用绕过VPN",
   "allowBypassDesc": "开启后部分应用可绕过VPN",
   "externalController": "外部控制器",
-  "externalControllerDesc": "开启后将可以通过9090端口控制clash内核",
+  "externalControllerDesc": "开启后将可以通过9090端口控制Clash内核",
-  "ipv6Desc": "开启后将可以接收ipv6流量",
+  "ipv6Desc": "开启后将可以接收IPv6流量",
   "app": "应用",
   "general": "基础",
   "systemProxyDesc": "为VpnService附加HTTP代理",
   "unifiedDelay": "统一延迟",
   "unifiedDelayDesc": "去除握手等额外延迟",
   "tcpConcurrent": "TCP并发",
-  "tcpConcurrentDesc": "开启后允许tcp并发",
+  "tcpConcurrentDesc": "开启后允许TCP并发",
   "geodataLoader": "Geo低内存模式",
   "geodataLoaderDesc": "开启将使用Geo低内存加载器",
   "requests": "请求",
   "requestsDesc": "查看最近请求数据",
-  "nullRequestsDesc": "未开启代理或者没有请求",
   "findProcessMode": "查找进程",
   "findProcessModeDesc": "开启后存在闪退风险",
   "init": "初始化",
   "infiniteTime": "长期有效",
-  "expirationTime": "到期时间"
+  "expirationTime": "到期时间",
+  "connections": "连接",
+  "connectionsDesc": "查看当前连接",
+  "nullRequestsDesc": "暂无请求",
+  "nullConnectionsDesc": "暂无连接",
+  "intranetIP": "内网 IP",
+  "view": "查看",
+  "cut": "剪切",
+  "copy": "复制",
+  "paste": "粘贴",
+  "testUrl": "测速链接",
+  "sync": "同步"
 }

lib/l10n/intl/messages_en.dart

@@ -92,11 +92,16 @@ 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,7 +127,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "externalController":
             MessageLookupByLibrary.simpleMessage("ExternalController"),
         "externalControllerDesc": MessageLookupByLibrary.simpleMessage(
-            "Once enabled, the clash kernel can be controlled on port 9090"),
+            "Once enabled, the Clash kernel can be controlled on port 9090"),
         "externalResources":
             MessageLookupByLibrary.simpleMessage("External resources"),
         "file": MessageLookupByLibrary.simpleMessage("File"),
@@ -147,10 +152,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "infiniteTime":
             MessageLookupByLibrary.simpleMessage("Long term effective"),
         "init": MessageLookupByLibrary.simpleMessage("Init"),
-        "ipCheckTimeout":
+        "intranetIP": MessageLookupByLibrary.simpleMessage("Intranet IP"),
-            MessageLookupByLibrary.simpleMessage("Ip check timeout"),
         "ipv6Desc": MessageLookupByLibrary.simpleMessage(
-            "When turned on it will be able to receive ipv6 traffic"),
+            "When turned on it will be able to receive IPv6 traffic"),
         "just": MessageLookupByLibrary.simpleMessage("Just"),
         "language": MessageLookupByLibrary.simpleMessage("Language"),
         "light": MessageLookupByLibrary.simpleMessage("Light"),
@@ -179,13 +183,14 @@ 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":
+        "nullRequestsDesc": MessageLookupByLibrary.simpleMessage("No requests"),
-            MessageLookupByLibrary.simpleMessage("No proxy or no request"),
         "other": MessageLookupByLibrary.simpleMessage("Other"),
         "outboundMode": MessageLookupByLibrary.simpleMessage("Outbound mode"),
         "override": MessageLookupByLibrary.simpleMessage("Override"),
@@ -194,6 +199,7 @@ 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":
@@ -222,7 +228,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "proxies": MessageLookupByLibrary.simpleMessage("Proxies"),
         "proxyPort": MessageLookupByLibrary.simpleMessage("ProxyPort"),
         "proxyPortDesc": MessageLookupByLibrary.simpleMessage(
-            "Set the clash listening port"),
+            "Set the Clash listening port"),
         "qrcode": MessageLookupByLibrary.simpleMessage("QR code"),
         "qrcodeDesc": MessageLookupByLibrary.simpleMessage(
             "Scan QR code to obtain profile"),
@@ -254,15 +260,17 @@ class MessageLookup extends MessageLookupByLibrary {
         "startVpn": MessageLookupByLibrary.simpleMessage("Staring VPN..."),
         "stopVpn": MessageLookupByLibrary.simpleMessage("Stopping VPN..."),
         "submit": MessageLookupByLibrary.simpleMessage("Submit"),
+        "sync": MessageLookupByLibrary.simpleMessage("Sync"),
         "systemProxy": MessageLookupByLibrary.simpleMessage("SystemProxy"),
         "systemProxyDesc": MessageLookupByLibrary.simpleMessage(
             "Attach HTTP proxy to VpnService"),
         "tabAnimation": MessageLookupByLibrary.simpleMessage("Tab animation"),
         "tabAnimationDesc": MessageLookupByLibrary.simpleMessage(
             "When enabled, the home tab will add a toggle animation"),
-        "tcpConcurrent": MessageLookupByLibrary.simpleMessage("Tcp concurrent"),
+        "tcpConcurrent": MessageLookupByLibrary.simpleMessage("TCP concurrent"),
         "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage(
-            "Enabling it will allow tcp concurrency"),
+            "Enabling it will allow TCP concurrency"),
+        "testUrl": MessageLookupByLibrary.simpleMessage("Test url"),
         "theme": MessageLookupByLibrary.simpleMessage("Theme"),
         "themeColor": MessageLookupByLibrary.simpleMessage("Theme color"),
         "themeDesc": MessageLookupByLibrary.simpleMessage(
@@ -271,7 +279,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "tip": MessageLookupByLibrary.simpleMessage("tip"),
         "tools": MessageLookupByLibrary.simpleMessage("Tools"),
         "trafficUsage": MessageLookupByLibrary.simpleMessage("Traffic usage"),
-        "tun": MessageLookupByLibrary.simpleMessage("Tun mode"),
+        "tun": MessageLookupByLibrary.simpleMessage("TUN mode"),
         "tunDesc": MessageLookupByLibrary.simpleMessage(
             "only effective in administrator mode"),
         "unableToUpdateCurrentProfileDesc":
@@ -286,6 +294,7 @@ 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

@@ -36,7 +36,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "addressHelp": MessageLookupByLibrary.simpleMessage("WebDAV服务器地址"),
         "addressTip": MessageLookupByLibrary.simpleMessage("请输入有效的WebDAV地址"),
         "ago": MessageLookupByLibrary.simpleMessage("前"),
-        "allowBypass": MessageLookupByLibrary.simpleMessage("允许应用绕过vpn"),
+        "allowBypass": MessageLookupByLibrary.simpleMessage("允许应用绕过VPN"),
         "allowBypassDesc":
             MessageLookupByLibrary.simpleMessage("开启后部分应用可绕过VPN"),
         "allowLan": MessageLookupByLibrary.simpleMessage("局域网代理"),
@@ -75,11 +75,15 @@ 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("天"),
@@ -100,7 +104,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "expirationTime": MessageLookupByLibrary.simpleMessage("到期时间"),
         "externalController": MessageLookupByLibrary.simpleMessage("外部控制器"),
         "externalControllerDesc":
-            MessageLookupByLibrary.simpleMessage("开启后将可以通过9090端口控制clash内核"),
+            MessageLookupByLibrary.simpleMessage("开启后将可以通过9090端口控制Clash内核"),
         "externalResources": MessageLookupByLibrary.simpleMessage("外部资源"),
         "file": MessageLookupByLibrary.simpleMessage("文件"),
         "fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
@@ -119,8 +123,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
         "infiniteTime": MessageLookupByLibrary.simpleMessage("长期有效"),
         "init": MessageLookupByLibrary.simpleMessage("初始化"),
-        "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
+        "intranetIP": MessageLookupByLibrary.simpleMessage("内网 IP"),
-        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收ipv6流量"),
+        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收IPv6流量"),
         "just": MessageLookupByLibrary.simpleMessage("刚刚"),
         "language": MessageLookupByLibrary.simpleMessage("语言"),
         "light": MessageLookupByLibrary.simpleMessage("浅色"),
@@ -145,17 +149,19 @@ 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("未开启代理或者没有请求"),
+        "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":
@@ -179,7 +185,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "project": MessageLookupByLibrary.simpleMessage("项目"),
         "proxies": MessageLookupByLibrary.simpleMessage("代理"),
         "proxyPort": MessageLookupByLibrary.simpleMessage("代理端口"),
-        "proxyPortDesc": MessageLookupByLibrary.simpleMessage("设置clash监听端口"),
+        "proxyPortDesc": MessageLookupByLibrary.simpleMessage("设置Clash监听端口"),
         "qrcode": MessageLookupByLibrary.simpleMessage("二维码"),
         "qrcodeDesc": MessageLookupByLibrary.simpleMessage("扫描二维码获取配置文件"),
         "recovery": MessageLookupByLibrary.simpleMessage("恢复"),
@@ -203,6 +209,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "startVpn": MessageLookupByLibrary.simpleMessage("正在启动VPN..."),
         "stopVpn": MessageLookupByLibrary.simpleMessage("正在停止VPN..."),
         "submit": MessageLookupByLibrary.simpleMessage("提交"),
+        "sync": MessageLookupByLibrary.simpleMessage("同步"),
         "systemProxy": MessageLookupByLibrary.simpleMessage("系统代理"),
         "systemProxyDesc":
             MessageLookupByLibrary.simpleMessage("为VpnService附加HTTP代理"),
@@ -210,7 +217,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "tabAnimationDesc":
             MessageLookupByLibrary.simpleMessage("开启后，主页选项卡将添加切换动画"),
         "tcpConcurrent": MessageLookupByLibrary.simpleMessage("TCP并发"),
-        "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage("开启后允许tcp并发"),
+        "tcpConcurrentDesc": MessageLookupByLibrary.simpleMessage("开启后允许TCP并发"),
+        "testUrl": MessageLookupByLibrary.simpleMessage("测速链接"),
         "theme": MessageLookupByLibrary.simpleMessage("主题"),
         "themeColor": MessageLookupByLibrary.simpleMessage("主题色彩"),
         "themeDesc": MessageLookupByLibrary.simpleMessage("设置深色模式，调整色彩"),
@@ -218,7 +226,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "tip": MessageLookupByLibrary.simpleMessage("提示"),
         "tools": MessageLookupByLibrary.simpleMessage("工具"),
         "trafficUsage": MessageLookupByLibrary.simpleMessage("流量统计"),
-        "tun": MessageLookupByLibrary.simpleMessage("Tun模式"),
+        "tun": MessageLookupByLibrary.simpleMessage("TUN模式"),
         "tunDesc": MessageLookupByLibrary.simpleMessage("仅在管理员模式生效"),
         "unableToUpdateCurrentProfileDesc":
             MessageLookupByLibrary.simpleMessage("无法更新当前配置文件"),
@@ -229,6 +237,7 @@ 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

@@ -430,10 +430,10 @@ class AppLocalizations {
     );
   }
 
-  /// `Tun mode`
+  /// `TUN mode`
   String get tun {
     return Intl.message(
-      'Tun mode',
+      'TUN mode',
       name: 'tun',
       desc: '',
       args: [],
@@ -1170,10 +1170,10 @@ class AppLocalizations {
     );
   }
 
-  /// `Set the clash listening port`
+  /// `Set the Clash listening port`
   String get proxyPortDesc {
     return Intl.message(
-      'Set the clash listening port',
+      'Set the Clash listening port',
       name: 'proxyPortDesc',
       desc: '',
       args: [],
@@ -1670,16 +1670,6 @@ class AppLocalizations {
     );
   }
 
-  /// `Ip check timeout`
-  String get ipCheckTimeout {
-    return Intl.message(
-      'Ip check timeout',
-      name: 'ipCheckTimeout',
-      desc: '',
-      args: [],
-    );
-  }
-
   /// `Search`
   String get search {
     return Intl.message(
@@ -1720,20 +1710,20 @@ class AppLocalizations {
     );
   }
 
-  /// `Once enabled, the clash kernel can be controlled on port 9090`
+  /// `Once enabled, the Clash kernel can be controlled on port 9090`
   String get externalControllerDesc {
     return Intl.message(
-      'Once enabled, the clash kernel can be controlled on port 9090',
+      'Once enabled, the Clash kernel can be controlled on port 9090',
       name: 'externalControllerDesc',
       desc: '',
       args: [],
     );
   }
 
-  /// `When turned on it will be able to receive ipv6 traffic`
+  /// `When turned on it will be able to receive IPv6 traffic`
   String get ipv6Desc {
     return Intl.message(
-      'When turned on it will be able to receive ipv6 traffic',
+      'When turned on it will be able to receive IPv6 traffic',
       name: 'ipv6Desc',
       desc: '',
       args: [],
@@ -1790,20 +1780,20 @@ class AppLocalizations {
     );
   }
 
-  /// `Tcp concurrent`
+  /// `TCP concurrent`
   String get tcpConcurrent {
     return Intl.message(
-      'Tcp concurrent',
+      'TCP concurrent',
       name: 'tcpConcurrent',
       desc: '',
       args: [],
     );
   }
 
-  /// `Enabling it will allow tcp concurrency`
+  /// `Enabling it will allow TCP concurrency`
   String get tcpConcurrentDesc {
     return Intl.message(
-      'Enabling it will allow tcp concurrency',
+      'Enabling it will allow TCP concurrency',
       name: 'tcpConcurrentDesc',
       desc: '',
       args: [],
@@ -1850,16 +1840,6 @@ class AppLocalizations {
     );
   }
 
-  /// `No proxy or no request`
-  String get nullRequestsDesc {
-    return Intl.message(
-      'No proxy or no request',
-      name: 'nullRequestsDesc',
-      desc: '',
-      args: [],
-    );
-  }
-
   /// `Find process`
   String get findProcessMode {
     return Intl.message(
@@ -1909,6 +1889,116 @@ class AppLocalizations {
       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: [],
+    );
+  }
+
+  /// `Test url`
+  String get testUrl {
+    return Intl.message(
+      'Test url',
+      name: 'testUrl',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Sync`
+  String get sync {
+    return Intl.message(
+      'Sync',
+      name: 'sync',
+      desc: '',
+      args: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {

lib/main.dart

@@ -6,6 +6,7 @@ import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/plugins/tile.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'application.dart';
 import 'l10n/l10n.dart';
 import 'models/models.dart';
@@ -15,6 +16,7 @@ Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await android?.init();
   await window?.init();
+  globalState.packageInfo = await PackageInfo.fromPlatform();
   final config = await preferences.getConfig() ?? Config();
   final clashConfig = await preferences.getClashConfig() ?? ClashConfig();
   final appState = AppState(
@@ -49,11 +51,25 @@ Future<void> vpnService() async {
     isCompatible: config.isCompatible,
     selectedMap: config.currentSelectedMap,
   );
-  clashMessage.addListener(ClashMessageListenerWithVpn(onTun: (String fd) {
+  clashMessage.addListener(
-    proxyManager.setProtect(
+    ClashMessageListenerWithVpn(
-      int.parse(fd),
+      onTun: (Fd fd) async {
-    );
+        await proxyManager.setProtect(fd.value);
-  }));
+        clashCore.setFdMap(fd.id);
+      },
+      onLoaded: (String groupName) {
+        final currentSelectedMap = config.currentSelectedMap;
+        final proxyName = currentSelectedMap[groupName];
+        if (proxyName == null) return;
+        clashCore.changeProxy(
+          ChangeProxyParams(
+            groupName: groupName,
+            proxyName: proxyName,
+          ),
+        );
+      },
+    ),
+  );
 
   await globalState.init(
     appState: appState,
@@ -61,7 +77,7 @@ Future<void> vpnService() async {
     clashConfig: clashConfig,
   );
 
-  await globalState.applyProfile(
+  globalState.applyProfile(
     appState: appState,
     config: config,
     clashConfig: clashConfig,
@@ -102,16 +118,24 @@ Future<void> vpnService() async {
 }
 
 class ClashMessageListenerWithVpn with ClashMessageListener {
-  final Function(String fd) _onTun;
+  final Function(Fd fd) _onTun;
+  final Function(String) _onLoaded;
 
   ClashMessageListenerWithVpn({
-    required Function(String fd) onTun,
+    required Function(Fd fd) onTun,
-  }) : _onTun = onTun;
+    required Function(String) onLoaded,
+  })  : _onTun = onTun,
+        _onLoaded = onLoaded;
 
   @override
-  void onTun(String fd) {
+  void onTun(Fd fd) {
     _onTun(fd);
   }
+
+  @override
+  void onLoaded(String groupName) {
+    _onLoaded(groupName);
+  }
 }
 
 class TileListenerWithVpn with TileListener {

lib/models/app.dart

@@ -34,6 +34,7 @@ class AppState with ChangeNotifier {
   List<Group> _groups;
   double _viewWidth;
   List<Connection> _requests;
+  num _checkIpNum;
 
   AppState({
     required Mode mode,
@@ -47,6 +48,7 @@ class AppState with ChangeNotifier {
         _viewWidth = 0,
         _selectedMap = selectedMap,
         _sortNum = 0,
+        _checkIpNum = 0,
         _requests = [],
         _mode = mode,
         _totalTraffic = Traffic(),
@@ -123,9 +125,10 @@ class AppState with ChangeNotifier {
     final index = groups.indexWhere((element) => element.name == proxyName);
     if (index == -1) return proxyName;
     final group = groups[index];
-    return getRealProxyName(selectedMap.containsKey(proxyName)
+    return getRealProxyName((selectedMap.containsKey(proxyName)
-        ? selectedMap[proxyName]
+            ? selectedMap[proxyName]
-        : group.now);
+            : group.now)) ??
+        proxyName;
   }
 
   String? get showProxyName {
@@ -187,7 +190,7 @@ class AppState with ChangeNotifier {
   }
 
   addRequest(Connection value) {
-    _requests.add(value);
+    _requests = List.from(_requests)..add(value);
     final maxLength = Platform.isAndroid ? 1000 : 60;
     if (_requests.length > maxLength) {
       _requests = _requests.sublist(_requests.length - maxLength);
@@ -205,7 +208,7 @@ class AppState with ChangeNotifier {
   }
 
   addLog(Log log) {
-    _logs.add(log);
+    _logs = List.from(_logs)..add(log);
     final maxLength = Platform.isAndroid ? 1000 : 60;
     if (_logs.length > maxLength) {
       _logs = _logs.sublist(_logs.length - maxLength);
@@ -240,6 +243,15 @@ class AppState with ChangeNotifier {
     }
   }
 
+  num get checkIpNum => _checkIpNum;
+
+  set checkIpNum(num value) {
+    if (_checkIpNum != value) {
+      _checkIpNum = value;
+      notifyListeners();
+    }
+  }
+
   Mode get mode => _mode;
 
   set mode(Mode value) {

lib/models/clash_config.dart

@@ -1,7 +1,9 @@
 // ignore_for_file: invalid_annotation_target
 
+import 'dart:io';
+
 import 'package:fl_clash/common/common.dart';
-import 'package:fl_clash/common/constant.dart';
+import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
@@ -119,6 +121,7 @@ class ClashConfig extends ChangeNotifier {
   Tun _tun;
   Dns _dns;
   List<String> _rules;
+  String? _globalRealUa;
 
   ClashConfig()
       : _mixedPort = 7890,
@@ -235,7 +238,12 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
-  Tun get tun => _tun;
+  Tun get tun {
+    if (Platform.isAndroid) {
+      return _tun.copyWith(enable: false);
+    }
+    return _tun;
+  }
 
   set tun(Tun value) {
     if (_tun != value) {
@@ -262,6 +270,25 @@ class ClashConfig extends ChangeNotifier {
     }
   }
 
+  @JsonKey(name: "global-ua", defaultValue: null)
+  String get globalUa {
+    if (_globalRealUa == null) {
+      return globalState.packageInfo.ua;
+    } else {
+      return _globalRealUa!;
+    }
+  }
+
+  @JsonKey(name: "global-real-ua", defaultValue: null)
+  String? get globalRealUa => _globalRealUa;
+
+  set globalRealUa(String? value) {
+    if (_globalRealUa != value) {
+      _globalRealUa = value;
+      notifyListeners();
+    }
+  }
+
   update([ClashConfig? clashConfig]) {
     if (clashConfig != null) {
       _mixedPort = clashConfig._mixedPort;
@@ -271,6 +298,7 @@ class ClashConfig extends ChangeNotifier {
       _tun = clashConfig._tun;
       _dns = clashConfig._dns;
       _rules = clashConfig._rules;
+      _globalRealUa = clashConfig.globalRealUa;
     }
     notifyListeners();
   }
@@ -282,9 +310,4 @@ class ClashConfig extends ChangeNotifier {
   factory ClashConfig.fromJson(Map<String, dynamic> json) {
     return _$ClashConfigFromJson(json);
   }
-
-  @override
-  String toString() {
-    return 'ClashConfig{_mixedPort: $_mixedPort, _allowLan: $_allowLan, _mode: $_mode, _logLevel: $_logLevel, _tun: $_tun, _dns: $_dns, _rules: $_rules}';
-  }
 }

lib/models/config.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
@@ -56,6 +57,10 @@ class Config extends ChangeNotifier {
   bool _allowBypass;
   bool _systemProxy;
   DAV? _dav;
+  ProxiesType _proxiesType;
+  ProxyCardType _proxyCardType;
+  int _proxiesColumns;
+  String _testUrl;
 
   Config()
       : _profiles = [],
@@ -71,9 +76,13 @@ class Config extends ChangeNotifier {
         _isAccessControl = false,
         _autoCheckUpdate = true,
         _systemProxy = true,
+        _testUrl = defaultTestUrl,
         _accessControl = const AccessControl(),
         _isAnimateToPage = true,
-        _allowBypass = true;
+        _allowBypass = true,
+        _proxyCardType = ProxyCardType.expand,
+        _proxiesType = ProxiesType.tab,
+        _proxiesColumns = 2;
 
   deleteProfileById(String id) {
     _profiles = profiles.where((element) => element.id != id).toList();
@@ -143,18 +152,34 @@ class Config extends ChangeNotifier {
   }
 
   Profile? get currentProfile {
-    try {
+    final index =
-      return profiles.firstWhere((element) => element.id == _currentProfileId);
+        profiles.indexWhere((profile) => profile.id == _currentProfileId);
-    } catch (_) {
+    return index == -1 ? null : profiles[index];
-      return null;
-    }
   }
 
   String? get currentGroupName => currentProfile?.currentGroupName;
 
+  Set<String> get currentUnfoldSet => currentProfile?.unfoldSet ?? {};
+
+  updateCurrentUnfoldSet(Set<String> value) {
+    if (!const SetEquality<String>().equals(currentUnfoldSet, value)) {
+      _setProfile(
+        currentProfile!.copyWith(
+          unfoldSet: value,
+        ),
+      );
+      notifyListeners();
+    }
+  }
+
   updateCurrentGroupName(String groupName) {
-    if (currentProfile?.currentGroupName != groupName) {
+    if (currentProfile != null &&
-      currentProfile?.currentGroupName = groupName;
+        currentProfile!.currentGroupName != groupName) {
+      _setProfile(
+        currentProfile!.copyWith(
+          currentGroupName: groupName,
+        ),
+      );
       notifyListeners();
     }
   }
@@ -164,9 +189,16 @@ class Config extends ChangeNotifier {
   }
 
   updateCurrentSelectedMap(String groupName, String proxyName) {
-    if (currentProfile?.selectedMap[groupName] != proxyName) {
+    if (currentProfile != null &&
-      currentProfile?.selectedMap = Map.from(currentProfile?.selectedMap ?? {})
+        currentProfile!.selectedMap[groupName] != proxyName) {
-        ..[groupName] = proxyName;
+      final SelectedMap selectedMap = Map.from(
+        currentProfile?.selectedMap ?? {},
+      )..[groupName] = proxyName;
+      _setProfile(
+        currentProfile!.copyWith(
+          selectedMap: selectedMap,
+        ),
+      );
       notifyListeners();
     }
   }
@@ -354,6 +386,47 @@ class Config extends ChangeNotifier {
     }
   }
 
+  @JsonKey(defaultValue: ProxiesType.tab)
+  ProxiesType get proxiesType => _proxiesType;
+
+  set proxiesType(ProxiesType value) {
+    if (_proxiesType != value) {
+      _proxiesType = value;
+      notifyListeners();
+    }
+  }
+
+  @JsonKey(defaultValue: ProxyCardType.expand)
+  ProxyCardType get proxyCardType => _proxyCardType;
+
+  set proxyCardType(ProxyCardType value) {
+    if (_proxyCardType != value) {
+      _proxyCardType = value;
+      notifyListeners();
+    }
+  }
+
+  @JsonKey(defaultValue: 2)
+  int get proxiesColumns => _proxiesColumns;
+
+  set proxiesColumns(int value) {
+    if (_proxiesColumns != value) {
+      _proxiesColumns = value;
+      notifyListeners();
+    }
+  }
+
+
+  @JsonKey(name: "test-url", defaultValue: defaultTestUrl)
+  String get testUrl => _testUrl;
+
+  set testUrl(String value) {
+    if (_testUrl != value) {
+      _testUrl = value;
+      notifyListeners();
+    }
+  }
+
   update([
     Config? config,
     RecoveryOption recoveryOptions = RecoveryOption.all,
@@ -373,6 +446,7 @@ class Config extends ChangeNotifier {
       _autoLaunch = config._autoLaunch;
       _silentLaunch = config._silentLaunch;
       _autoRun = config._autoRun;
+      _proxiesType = config._proxiesType;
       _openLog = config._openLog;
       _themeMode = config._themeMode;
       _locale = config._locale;
@@ -385,6 +459,7 @@ class Config extends ChangeNotifier {
       _isAnimateToPage = config._isAnimateToPage;
       _autoCheckUpdate = config._autoCheckUpdate;
       _dav = config._dav;
+      _testUrl = config.testUrl;
     }
     notifyListeners();
   }

lib/models/connection.dart

@@ -23,7 +23,7 @@ class Metadata with _$Metadata {
 }
 
 @freezed
-class Connection with _$Connection{
+class Connection with _$Connection {
   const factory Connection({
     required String id,
     num? upload,
@@ -36,3 +36,19 @@ 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

@@ -3,19 +3,32 @@
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/clash_config.dart';
 import 'package:fl_clash/models/connection.dart';
+import 'package:fl_clash/models/models.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'generated/ffi.g.dart';
 
 part 'generated/ffi.freezed.dart';
 
+@freezed
+class ConfigExtendedParams with _$ConfigExtendedParams {
+  const factory ConfigExtendedParams({
+    @JsonKey(name: "is-patch") required bool isPatch,
+    @JsonKey(name: "is-compatible") required bool isCompatible,
+    @JsonKey(name: "selected-map") required SelectedMap selectedMap,
+    @JsonKey(name: "test-url") required String testUrl,
+  }) = _ConfigExtendedParams;
+
+  factory ConfigExtendedParams.fromJson(Map<String, Object?> json) =>
+      _$ConfigExtendedParamsFromJson(json);
+}
+
 @freezed
 class UpdateConfigParams with _$UpdateConfigParams {
   const factory UpdateConfigParams({
     @JsonKey(name: "profile-path") String? profilePath,
     required ClashConfig config,
-    @JsonKey(name: "is-patch") required bool isPatch,
+    required ConfigExtendedParams params,
-    @JsonKey(name: "is-compatible") required bool isCompatible,
   }) = _UpdateConfigParams;
 
   factory UpdateConfigParams.fromJson(Map<String, Object?> json) =>
@@ -75,6 +88,16 @@ class Process with _$Process {
       _$ProcessFromJson(json);
 }
 
+@freezed
+class Fd with _$Fd {
+  const factory Fd({
+    required int id,
+    required int value,
+  }) = _Fd;
+
+  factory Fd.fromJson(Map<String, Object?> json) => _$FdFromJson(json);
+}
+
 @freezed
 class ProcessMapItem with _$ProcessMapItem {
   const factory ProcessMapItem({

lib/models/generated/clash_config.g.dart

@@ -51,7 +51,8 @@ ClashConfig _$ClashConfigFromJson(Map<String, dynamic> json) => ClashConfig()
   ..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();
+  ..rules = (json['rules'] as List<dynamic>).map((e) => e as String).toList()
+  ..globalRealUa = json['global-real-ua'] as String?;
 
 Map<String, dynamic> _$ClashConfigToJson(ClashConfig instance) =>
     <String, dynamic>{
@@ -68,6 +69,7 @@ Map<String, dynamic> _$ClashConfigToJson(ClashConfig instance) =>
       'tun': instance.tun,
       'dns': instance.dns,
       'rules': instance.rules,
+      'global-real-ua': instance.globalRealUa,
     };
 
 const _$ModeEnumMap = {

lib/models/generated/config.g.dart

@@ -34,7 +34,16 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
   ..isCompatible = json['isCompatible'] as bool? ?? true
   ..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true
   ..allowBypass = json['allowBypass'] as bool? ?? true
-  ..systemProxy = json['systemProxy'] as bool? ?? true;
+  ..systemProxy = json['systemProxy'] as bool? ?? true
+  ..proxiesType =
+      $enumDecodeNullable(_$ProxiesTypeEnumMap, json['proxiesType']) ??
+          ProxiesType.tab
+  ..proxyCardType =
+      $enumDecodeNullable(_$ProxyCardTypeEnumMap, json['proxyCardType']) ??
+          ProxyCardType.expand
+  ..proxiesColumns = (json['proxiesColumns'] as num?)?.toInt() ?? 2
+  ..testUrl =
+      json['test-url'] as String? ?? 'https://www.gstatic.com/generate_204';
 
 Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
       'profiles': instance.profiles,
@@ -56,6 +65,10 @@ Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
       'autoCheckUpdate': instance.autoCheckUpdate,
       'allowBypass': instance.allowBypass,
       'systemProxy': instance.systemProxy,
+      'proxiesType': _$ProxiesTypeEnumMap[instance.proxiesType]!,
+      'proxyCardType': _$ProxyCardTypeEnumMap[instance.proxyCardType]!,
+      'proxiesColumns': instance.proxiesColumns,
+      'test-url': instance.testUrl,
     };
 
 const _$ThemeModeEnumMap = {
@@ -70,6 +83,16 @@ const _$ProxiesSortTypeEnumMap = {
   ProxiesSortType.name: 'name',
 };
 
+const _$ProxiesTypeEnumMap = {
+  ProxiesType.tab: 'tab',
+  ProxiesType.expansion: 'expansion',
+};
+
+const _$ProxyCardTypeEnumMap = {
+  ProxyCardType.expand: 'expand',
+  ProxyCardType.shrink: 'shrink',
+};
+
 _$AccessControlImpl _$$AccessControlImplFromJson(Map<String, dynamic> json) =>
     _$AccessControlImpl(
       mode: $enumDecodeNullable(_$AccessControlModeEnumMap, json['mode']) ??

lib/models/generated/connection.freezed.dart

@@ -589,3 +589,184 @@ 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

@@ -52,3 +52,23 @@ 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

@@ -14,6 +14,234 @@ 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');
 
+ConfigExtendedParams _$ConfigExtendedParamsFromJson(Map<String, dynamic> json) {
+  return _ConfigExtendedParams.fromJson(json);
+}
+
+/// @nodoc
+mixin _$ConfigExtendedParams {
+  @JsonKey(name: "is-patch")
+  bool get isPatch => throw _privateConstructorUsedError;
+  @JsonKey(name: "is-compatible")
+  bool get isCompatible => throw _privateConstructorUsedError;
+  @JsonKey(name: "selected-map")
+  Map<String, String> get selectedMap => throw _privateConstructorUsedError;
+  @JsonKey(name: "test-url")
+  String get testUrl => throw _privateConstructorUsedError;
+
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  @JsonKey(ignore: true)
+  $ConfigExtendedParamsCopyWith<ConfigExtendedParams> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $ConfigExtendedParamsCopyWith<$Res> {
+  factory $ConfigExtendedParamsCopyWith(ConfigExtendedParams value,
+          $Res Function(ConfigExtendedParams) then) =
+      _$ConfigExtendedParamsCopyWithImpl<$Res, ConfigExtendedParams>;
+  @useResult
+  $Res call(
+      {@JsonKey(name: "is-patch") bool isPatch,
+      @JsonKey(name: "is-compatible") bool isCompatible,
+      @JsonKey(name: "selected-map") Map<String, String> selectedMap,
+      @JsonKey(name: "test-url") String testUrl});
+}
+
+/// @nodoc
+class _$ConfigExtendedParamsCopyWithImpl<$Res,
+        $Val extends ConfigExtendedParams>
+    implements $ConfigExtendedParamsCopyWith<$Res> {
+  _$ConfigExtendedParamsCopyWithImpl(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? isPatch = null,
+    Object? isCompatible = null,
+    Object? selectedMap = null,
+    Object? testUrl = null,
+  }) {
+    return _then(_value.copyWith(
+      isPatch: null == isPatch
+          ? _value.isPatch
+          : isPatch // ignore: cast_nullable_to_non_nullable
+              as bool,
+      isCompatible: null == isCompatible
+          ? _value.isCompatible
+          : isCompatible // ignore: cast_nullable_to_non_nullable
+              as bool,
+      selectedMap: null == selectedMap
+          ? _value.selectedMap
+          : selectedMap // ignore: cast_nullable_to_non_nullable
+              as Map<String, String>,
+      testUrl: null == testUrl
+          ? _value.testUrl
+          : testUrl // ignore: cast_nullable_to_non_nullable
+              as String,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$ConfigExtendedParamsImplCopyWith<$Res>
+    implements $ConfigExtendedParamsCopyWith<$Res> {
+  factory _$$ConfigExtendedParamsImplCopyWith(_$ConfigExtendedParamsImpl value,
+          $Res Function(_$ConfigExtendedParamsImpl) then) =
+      __$$ConfigExtendedParamsImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call(
+      {@JsonKey(name: "is-patch") bool isPatch,
+      @JsonKey(name: "is-compatible") bool isCompatible,
+      @JsonKey(name: "selected-map") Map<String, String> selectedMap,
+      @JsonKey(name: "test-url") String testUrl});
+}
+
+/// @nodoc
+class __$$ConfigExtendedParamsImplCopyWithImpl<$Res>
+    extends _$ConfigExtendedParamsCopyWithImpl<$Res, _$ConfigExtendedParamsImpl>
+    implements _$$ConfigExtendedParamsImplCopyWith<$Res> {
+  __$$ConfigExtendedParamsImplCopyWithImpl(_$ConfigExtendedParamsImpl _value,
+      $Res Function(_$ConfigExtendedParamsImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? isPatch = null,
+    Object? isCompatible = null,
+    Object? selectedMap = null,
+    Object? testUrl = null,
+  }) {
+    return _then(_$ConfigExtendedParamsImpl(
+      isPatch: null == isPatch
+          ? _value.isPatch
+          : isPatch // ignore: cast_nullable_to_non_nullable
+              as bool,
+      isCompatible: null == isCompatible
+          ? _value.isCompatible
+          : isCompatible // ignore: cast_nullable_to_non_nullable
+              as bool,
+      selectedMap: null == selectedMap
+          ? _value._selectedMap
+          : selectedMap // ignore: cast_nullable_to_non_nullable
+              as Map<String, String>,
+      testUrl: null == testUrl
+          ? _value.testUrl
+          : testUrl // ignore: cast_nullable_to_non_nullable
+              as String,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$ConfigExtendedParamsImpl implements _ConfigExtendedParams {
+  const _$ConfigExtendedParamsImpl(
+      {@JsonKey(name: "is-patch") required this.isPatch,
+      @JsonKey(name: "is-compatible") required this.isCompatible,
+      @JsonKey(name: "selected-map")
+      required final Map<String, String> selectedMap,
+      @JsonKey(name: "test-url") required this.testUrl})
+      : _selectedMap = selectedMap;
+
+  factory _$ConfigExtendedParamsImpl.fromJson(Map<String, dynamic> json) =>
+      _$$ConfigExtendedParamsImplFromJson(json);
+
+  @override
+  @JsonKey(name: "is-patch")
+  final bool isPatch;
+  @override
+  @JsonKey(name: "is-compatible")
+  final bool isCompatible;
+  final Map<String, String> _selectedMap;
+  @override
+  @JsonKey(name: "selected-map")
+  Map<String, String> get selectedMap {
+    if (_selectedMap is EqualUnmodifiableMapView) return _selectedMap;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_selectedMap);
+  }
+
+  @override
+  @JsonKey(name: "test-url")
+  final String testUrl;
+
+  @override
+  String toString() {
+    return 'ConfigExtendedParams(isPatch: $isPatch, isCompatible: $isCompatible, selectedMap: $selectedMap, testUrl: $testUrl)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$ConfigExtendedParamsImpl &&
+            (identical(other.isPatch, isPatch) || other.isPatch == isPatch) &&
+            (identical(other.isCompatible, isCompatible) ||
+                other.isCompatible == isCompatible) &&
+            const DeepCollectionEquality()
+                .equals(other._selectedMap, _selectedMap) &&
+            (identical(other.testUrl, testUrl) || other.testUrl == testUrl));
+  }
+
+  @JsonKey(ignore: true)
+  @override
+  int get hashCode => Object.hash(runtimeType, isPatch, isCompatible,
+      const DeepCollectionEquality().hash(_selectedMap), testUrl);
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$ConfigExtendedParamsImplCopyWith<_$ConfigExtendedParamsImpl>
+      get copyWith =>
+          __$$ConfigExtendedParamsImplCopyWithImpl<_$ConfigExtendedParamsImpl>(
+              this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$ConfigExtendedParamsImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _ConfigExtendedParams implements ConfigExtendedParams {
+  const factory _ConfigExtendedParams(
+          {@JsonKey(name: "is-patch") required final bool isPatch,
+          @JsonKey(name: "is-compatible") required final bool isCompatible,
+          @JsonKey(name: "selected-map")
+          required final Map<String, String> selectedMap,
+          @JsonKey(name: "test-url") required final String testUrl}) =
+      _$ConfigExtendedParamsImpl;
+
+  factory _ConfigExtendedParams.fromJson(Map<String, dynamic> json) =
+      _$ConfigExtendedParamsImpl.fromJson;
+
+  @override
+  @JsonKey(name: "is-patch")
+  bool get isPatch;
+  @override
+  @JsonKey(name: "is-compatible")
+  bool get isCompatible;
+  @override
+  @JsonKey(name: "selected-map")
+  Map<String, String> get selectedMap;
+  @override
+  @JsonKey(name: "test-url")
+  String get testUrl;
+  @override
+  @JsonKey(ignore: true)
+  _$$ConfigExtendedParamsImplCopyWith<_$ConfigExtendedParamsImpl>
+      get copyWith => throw _privateConstructorUsedError;
+}
+
 UpdateConfigParams _$UpdateConfigParamsFromJson(Map<String, dynamic> json) {
   return _UpdateConfigParams.fromJson(json);
 }
@@ -23,10 +251,7 @@ mixin _$UpdateConfigParams {
   @JsonKey(name: "profile-path")
   String? get profilePath => throw _privateConstructorUsedError;
   ClashConfig get config => throw _privateConstructorUsedError;
-  @JsonKey(name: "is-patch")
+  ConfigExtendedParams get params => throw _privateConstructorUsedError;
-  bool get isPatch => throw _privateConstructorUsedError;
-  @JsonKey(name: "is-compatible")
-  bool get isCompatible => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -43,8 +268,9 @@ abstract class $UpdateConfigParamsCopyWith<$Res> {
   $Res call(
       {@JsonKey(name: "profile-path") String? profilePath,
       ClashConfig config,
-      @JsonKey(name: "is-patch") bool isPatch,
+      ConfigExtendedParams params});
-      @JsonKey(name: "is-compatible") bool isCompatible});
+
+  $ConfigExtendedParamsCopyWith<$Res> get params;
 }
 
 /// @nodoc
@@ -62,8 +288,7 @@ class _$UpdateConfigParamsCopyWithImpl<$Res, $Val extends UpdateConfigParams>
   $Res call({
     Object? profilePath = freezed,
     Object? config = null,
-    Object? isPatch = null,
+    Object? params = null,
-    Object? isCompatible = null,
   }) {
     return _then(_value.copyWith(
       profilePath: freezed == profilePath
@@ -74,16 +299,20 @@ class _$UpdateConfigParamsCopyWithImpl<$Res, $Val extends UpdateConfigParams>
           ? _value.config
           : config // ignore: cast_nullable_to_non_nullable
               as ClashConfig,
-      isPatch: null == isPatch
+      params: null == params
-          ? _value.isPatch
+          ? _value.params
-          : isPatch // ignore: cast_nullable_to_non_nullable
+          : params // ignore: cast_nullable_to_non_nullable
-              as bool,
+              as ConfigExtendedParams,
-      isCompatible: null == isCompatible
-          ? _value.isCompatible
-          : isCompatible // ignore: cast_nullable_to_non_nullable
-              as bool,
     ) as $Val);
   }
+
+  @override
+  @pragma('vm:prefer-inline')
+  $ConfigExtendedParamsCopyWith<$Res> get params {
+    return $ConfigExtendedParamsCopyWith<$Res>(_value.params, (value) {
+      return _then(_value.copyWith(params: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -97,8 +326,10 @@ abstract class _$$UpdateConfigParamsImplCopyWith<$Res>
   $Res call(
       {@JsonKey(name: "profile-path") String? profilePath,
       ClashConfig config,
-      @JsonKey(name: "is-patch") bool isPatch,
+      ConfigExtendedParams params});
-      @JsonKey(name: "is-compatible") bool isCompatible});
+
+  @override
+  $ConfigExtendedParamsCopyWith<$Res> get params;
 }
 
 /// @nodoc
@@ -114,8 +345,7 @@ class __$$UpdateConfigParamsImplCopyWithImpl<$Res>
   $Res call({
     Object? profilePath = freezed,
     Object? config = null,
-    Object? isPatch = null,
+    Object? params = null,
-    Object? isCompatible = null,
   }) {
     return _then(_$UpdateConfigParamsImpl(
       profilePath: freezed == profilePath
@@ -126,14 +356,10 @@ class __$$UpdateConfigParamsImplCopyWithImpl<$Res>
           ? _value.config
           : config // ignore: cast_nullable_to_non_nullable
               as ClashConfig,
-      isPatch: null == isPatch
+      params: null == params
-          ? _value.isPatch
+          ? _value.params
-          : isPatch // ignore: cast_nullable_to_non_nullable
+          : params // ignore: cast_nullable_to_non_nullable
-              as bool,
+              as ConfigExtendedParams,
-      isCompatible: null == isCompatible
-          ? _value.isCompatible
-          : isCompatible // ignore: cast_nullable_to_non_nullable
-              as bool,
     ));
   }
 }
@@ -144,8 +370,7 @@ class _$UpdateConfigParamsImpl implements _UpdateConfigParams {
   const _$UpdateConfigParamsImpl(
       {@JsonKey(name: "profile-path") this.profilePath,
       required this.config,
-      @JsonKey(name: "is-patch") required this.isPatch,
+      required this.params});
-      @JsonKey(name: "is-compatible") required this.isCompatible});
 
   factory _$UpdateConfigParamsImpl.fromJson(Map<String, dynamic> json) =>
       _$$UpdateConfigParamsImplFromJson(json);
@@ -156,15 +381,11 @@ class _$UpdateConfigParamsImpl implements _UpdateConfigParams {
   @override
   final ClashConfig config;
   @override
-  @JsonKey(name: "is-patch")
+  final ConfigExtendedParams params;
-  final bool isPatch;
-  @override
-  @JsonKey(name: "is-compatible")
-  final bool isCompatible;
 
   @override
   String toString() {
-    return 'UpdateConfigParams(profilePath: $profilePath, config: $config, isPatch: $isPatch, isCompatible: $isCompatible)';
+    return 'UpdateConfigParams(profilePath: $profilePath, config: $config, params: $params)';
   }
 
   @override
@@ -175,15 +396,12 @@ class _$UpdateConfigParamsImpl implements _UpdateConfigParams {
             (identical(other.profilePath, profilePath) ||
                 other.profilePath == profilePath) &&
             (identical(other.config, config) || other.config == config) &&
-            (identical(other.isPatch, isPatch) || other.isPatch == isPatch) &&
+            (identical(other.params, params) || other.params == params));
-            (identical(other.isCompatible, isCompatible) ||
-                other.isCompatible == isCompatible));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode =>
+  int get hashCode => Object.hash(runtimeType, profilePath, config, params);
-      Object.hash(runtimeType, profilePath, config, isPatch, isCompatible);
 
   @JsonKey(ignore: true)
   @override
@@ -202,11 +420,9 @@ class _$UpdateConfigParamsImpl implements _UpdateConfigParams {
 
 abstract class _UpdateConfigParams implements UpdateConfigParams {
   const factory _UpdateConfigParams(
-          {@JsonKey(name: "profile-path") final String? profilePath,
+      {@JsonKey(name: "profile-path") final String? profilePath,
-          required final ClashConfig config,
+      required final ClashConfig config,
-          @JsonKey(name: "is-patch") required final bool isPatch,
+      required final ConfigExtendedParams params}) = _$UpdateConfigParamsImpl;
-          @JsonKey(name: "is-compatible") required final bool isCompatible}) =
-      _$UpdateConfigParamsImpl;
 
   factory _UpdateConfigParams.fromJson(Map<String, dynamic> json) =
       _$UpdateConfigParamsImpl.fromJson;
@@ -217,11 +433,7 @@ abstract class _UpdateConfigParams implements UpdateConfigParams {
   @override
   ClashConfig get config;
   @override
-  @JsonKey(name: "is-patch")
+  ConfigExtendedParams get params;
-  bool get isPatch;
-  @override
-  @JsonKey(name: "is-compatible")
-  bool get isCompatible;
   @override
   @JsonKey(ignore: true)
   _$$UpdateConfigParamsImplCopyWith<_$UpdateConfigParamsImpl> get copyWith =>
@@ -1006,6 +1218,151 @@ abstract class _Process implements Process {
       throw _privateConstructorUsedError;
 }
 
+Fd _$FdFromJson(Map<String, dynamic> json) {
+  return _Fd.fromJson(json);
+}
+
+/// @nodoc
+mixin _$Fd {
+  int get id => throw _privateConstructorUsedError;
+  int get value => throw _privateConstructorUsedError;
+
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  @JsonKey(ignore: true)
+  $FdCopyWith<Fd> get copyWith => throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $FdCopyWith<$Res> {
+  factory $FdCopyWith(Fd value, $Res Function(Fd) then) =
+      _$FdCopyWithImpl<$Res, Fd>;
+  @useResult
+  $Res call({int id, int value});
+}
+
+/// @nodoc
+class _$FdCopyWithImpl<$Res, $Val extends Fd> implements $FdCopyWith<$Res> {
+  _$FdCopyWithImpl(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 int,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$FdImplCopyWith<$Res> implements $FdCopyWith<$Res> {
+  factory _$$FdImplCopyWith(_$FdImpl value, $Res Function(_$FdImpl) then) =
+      __$$FdImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({int id, int value});
+}
+
+/// @nodoc
+class __$$FdImplCopyWithImpl<$Res> extends _$FdCopyWithImpl<$Res, _$FdImpl>
+    implements _$$FdImplCopyWith<$Res> {
+  __$$FdImplCopyWithImpl(_$FdImpl _value, $Res Function(_$FdImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? id = null,
+    Object? value = null,
+  }) {
+    return _then(_$FdImpl(
+      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 int,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$FdImpl implements _Fd {
+  const _$FdImpl({required this.id, required this.value});
+
+  factory _$FdImpl.fromJson(Map<String, dynamic> json) =>
+      _$$FdImplFromJson(json);
+
+  @override
+  final int id;
+  @override
+  final int value;
+
+  @override
+  String toString() {
+    return 'Fd(id: $id, value: $value)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$FdImpl &&
+            (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')
+  _$$FdImplCopyWith<_$FdImpl> get copyWith =>
+      __$$FdImplCopyWithImpl<_$FdImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$FdImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _Fd implements Fd {
+  const factory _Fd({required final int id, required final int value}) =
+      _$FdImpl;
+
+  factory _Fd.fromJson(Map<String, dynamic> json) = _$FdImpl.fromJson;
+
+  @override
+  int get id;
+  @override
+  int get value;
+  @override
+  @JsonKey(ignore: true)
+  _$$FdImplCopyWith<_$FdImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
 ProcessMapItem _$ProcessMapItemFromJson(Map<String, dynamic> json) {
   return _ProcessMapItem.fromJson(json);
 }

lib/models/generated/ffi.g.dart

@@ -6,13 +6,31 @@ part of '../ffi.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
+_$ConfigExtendedParamsImpl _$$ConfigExtendedParamsImplFromJson(
+        Map<String, dynamic> json) =>
+    _$ConfigExtendedParamsImpl(
+      isPatch: json['is-patch'] as bool,
+      isCompatible: json['is-compatible'] as bool,
+      selectedMap: Map<String, String>.from(json['selected-map'] as Map),
+      testUrl: json['test-url'] as String,
+    );
+
+Map<String, dynamic> _$$ConfigExtendedParamsImplToJson(
+        _$ConfigExtendedParamsImpl instance) =>
+    <String, dynamic>{
+      'is-patch': instance.isPatch,
+      'is-compatible': instance.isCompatible,
+      'selected-map': instance.selectedMap,
+      'test-url': instance.testUrl,
+    };
+
 _$UpdateConfigParamsImpl _$$UpdateConfigParamsImplFromJson(
         Map<String, dynamic> json) =>
     _$UpdateConfigParamsImpl(
       profilePath: json['profile-path'] as String?,
       config: ClashConfig.fromJson(json['config'] as Map<String, dynamic>),
-      isPatch: json['is-patch'] as bool,
+      params:
-      isCompatible: json['is-compatible'] as bool,
+          ConfigExtendedParams.fromJson(json['params'] as Map<String, dynamic>),
     );
 
 Map<String, dynamic> _$$UpdateConfigParamsImplToJson(
@@ -20,8 +38,7 @@ Map<String, dynamic> _$$UpdateConfigParamsImplToJson(
     <String, dynamic>{
       'profile-path': instance.profilePath,
       'config': instance.config,
-      'is-patch': instance.isPatch,
+      'params': instance.params,
-      'is-compatible': instance.isCompatible,
     };
 
 _$ChangeProxyParamsImpl _$$ChangeProxyParamsImplFromJson(
@@ -58,6 +75,7 @@ const _$MessageTypeEnumMap = {
   MessageType.now: 'now',
   MessageType.request: 'request',
   MessageType.run: 'run',
+  MessageType.loaded: 'loaded',
 };
 
 _$DelayImpl _$$DelayImplFromJson(Map<String, dynamic> json) => _$DelayImpl(
@@ -93,6 +111,16 @@ Map<String, dynamic> _$$ProcessImplToJson(_$ProcessImpl instance) =>
       'metadata': instance.metadata,
     };
 
+_$FdImpl _$$FdImplFromJson(Map<String, dynamic> json) => _$FdImpl(
+      id: (json['id'] as num).toInt(),
+      value: (json['value'] as num).toInt(),
+    );
+
+Map<String, dynamic> _$$FdImplToJson(_$FdImpl instance) => <String, dynamic>{
+      'id': instance.id,
+      'value': instance.value,
+    };
+
 _$ProcessMapItemImpl _$$ProcessMapItemImplFromJson(Map<String, dynamic> json) =>
     _$ProcessMapItemImpl(
       id: (json['id'] as num).toInt(),

lib/models/generated/log.freezed.dart

@@ -0,0 +1,189 @@
+// 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,3 +23,23 @@ 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

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

lib/models/generated/profile.g.dart

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

lib/models/generated/selector.freezed.dart

@@ -161,6 +161,7 @@ mixin _$CheckIpSelectorState {
   bool get isInit => throw _privateConstructorUsedError;
   bool get isStart => throw _privateConstructorUsedError;
   Map<String, String> get selectedMap => throw _privateConstructorUsedError;
+  num get checkIpNum => throw _privateConstructorUsedError;
 
   @JsonKey(ignore: true)
   $CheckIpSelectorStateCopyWith<CheckIpSelectorState> get copyWith =>
@@ -173,7 +174,11 @@ abstract class $CheckIpSelectorStateCopyWith<$Res> {
           $Res Function(CheckIpSelectorState) then) =
       _$CheckIpSelectorStateCopyWithImpl<$Res, CheckIpSelectorState>;
   @useResult
-  $Res call({bool isInit, bool isStart, Map<String, String> selectedMap});
+  $Res call(
+      {bool isInit,
+      bool isStart,
+      Map<String, String> selectedMap,
+      num checkIpNum});
 }
 
 /// @nodoc
@@ -193,6 +198,7 @@ class _$CheckIpSelectorStateCopyWithImpl<$Res,
     Object? isInit = null,
     Object? isStart = null,
     Object? selectedMap = null,
+    Object? checkIpNum = null,
   }) {
     return _then(_value.copyWith(
       isInit: null == isInit
@@ -207,6 +213,10 @@ class _$CheckIpSelectorStateCopyWithImpl<$Res,
           ? _value.selectedMap
           : selectedMap // ignore: cast_nullable_to_non_nullable
               as Map<String, String>,
+      checkIpNum: null == checkIpNum
+          ? _value.checkIpNum
+          : checkIpNum // ignore: cast_nullable_to_non_nullable
+              as num,
     ) as $Val);
   }
 }
@@ -219,7 +229,11 @@ abstract class _$$CheckIpSelectorStateImplCopyWith<$Res>
       __$$CheckIpSelectorStateImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({bool isInit, bool isStart, Map<String, String> selectedMap});
+  $Res call(
+      {bool isInit,
+      bool isStart,
+      Map<String, String> selectedMap,
+      num checkIpNum});
 }
 
 /// @nodoc
@@ -236,6 +250,7 @@ class __$$CheckIpSelectorStateImplCopyWithImpl<$Res>
     Object? isInit = null,
     Object? isStart = null,
     Object? selectedMap = null,
+    Object? checkIpNum = null,
   }) {
     return _then(_$CheckIpSelectorStateImpl(
       isInit: null == isInit
@@ -250,6 +265,10 @@ class __$$CheckIpSelectorStateImplCopyWithImpl<$Res>
           ? _value._selectedMap
           : selectedMap // ignore: cast_nullable_to_non_nullable
               as Map<String, String>,
+      checkIpNum: null == checkIpNum
+          ? _value.checkIpNum
+          : checkIpNum // ignore: cast_nullable_to_non_nullable
+              as num,
     ));
   }
 }
@@ -260,7 +279,8 @@ class _$CheckIpSelectorStateImpl implements _CheckIpSelectorState {
   const _$CheckIpSelectorStateImpl(
       {required this.isInit,
       required this.isStart,
-      required final Map<String, String> selectedMap})
+      required final Map<String, String> selectedMap,
+      required this.checkIpNum})
       : _selectedMap = selectedMap;
 
   @override
@@ -275,9 +295,12 @@ class _$CheckIpSelectorStateImpl implements _CheckIpSelectorState {
     return EqualUnmodifiableMapView(_selectedMap);
   }
 
+  @override
+  final num checkIpNum;
+
   @override
   String toString() {
-    return 'CheckIpSelectorState(isInit: $isInit, isStart: $isStart, selectedMap: $selectedMap)';
+    return 'CheckIpSelectorState(isInit: $isInit, isStart: $isStart, selectedMap: $selectedMap, checkIpNum: $checkIpNum)';
   }
 
   @override
@@ -288,12 +311,14 @@ class _$CheckIpSelectorStateImpl implements _CheckIpSelectorState {
             (identical(other.isInit, isInit) || other.isInit == isInit) &&
             (identical(other.isStart, isStart) || other.isStart == isStart) &&
             const DeepCollectionEquality()
-                .equals(other._selectedMap, _selectedMap));
+                .equals(other._selectedMap, _selectedMap) &&
+            (identical(other.checkIpNum, checkIpNum) ||
+                other.checkIpNum == checkIpNum));
   }
 
   @override
   int get hashCode => Object.hash(runtimeType, isInit, isStart,
-      const DeepCollectionEquality().hash(_selectedMap));
+      const DeepCollectionEquality().hash(_selectedMap), checkIpNum);
 
   @JsonKey(ignore: true)
   @override
@@ -306,10 +331,10 @@ class _$CheckIpSelectorStateImpl implements _CheckIpSelectorState {
 
 abstract class _CheckIpSelectorState implements CheckIpSelectorState {
   const factory _CheckIpSelectorState(
-          {required final bool isInit,
+      {required final bool isInit,
-          required final bool isStart,
+      required final bool isStart,
-          required final Map<String, String> selectedMap}) =
+      required final Map<String, String> selectedMap,
-      _$CheckIpSelectorStateImpl;
+      required final num checkIpNum}) = _$CheckIpSelectorStateImpl;
 
   @override
   bool get isInit;
@@ -318,6 +343,8 @@ abstract class _CheckIpSelectorState implements CheckIpSelectorState {
   @override
   Map<String, String> get selectedMap;
   @override
+  num get checkIpNum;
+  @override
   @JsonKey(ignore: true)
   _$$CheckIpSelectorStateImplCopyWith<_$CheckIpSelectorStateImpl>
       get copyWith => throw _privateConstructorUsedError;
@@ -1730,39 +1757,37 @@ abstract class _ProxiesSelectorState implements ProxiesSelectorState {
 }
 
 /// @nodoc
-mixin _$ProxiesTabViewSelectorState {
+mixin _$ProxyGroupSelectorState {
   ProxiesSortType get proxiesSortType => throw _privateConstructorUsedError;
+  ProxyCardType get proxyCardType => throw _privateConstructorUsedError;
   num get sortNum => throw _privateConstructorUsedError;
-  Group get group => throw _privateConstructorUsedError;
+  List<Proxy> get proxies => throw _privateConstructorUsedError;
-  ViewMode get viewMode => throw _privateConstructorUsedError;
+  int get columns => throw _privateConstructorUsedError;
 
   @JsonKey(ignore: true)
-  $ProxiesTabViewSelectorStateCopyWith<ProxiesTabViewSelectorState>
+  $ProxyGroupSelectorStateCopyWith<ProxyGroupSelectorState> get copyWith =>
-      get copyWith => throw _privateConstructorUsedError;
+      throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract class $ProxiesTabViewSelectorStateCopyWith<$Res> {
+abstract class $ProxyGroupSelectorStateCopyWith<$Res> {
-  factory $ProxiesTabViewSelectorStateCopyWith(
+  factory $ProxyGroupSelectorStateCopyWith(ProxyGroupSelectorState value,
-          ProxiesTabViewSelectorState value,
+          $Res Function(ProxyGroupSelectorState) then) =
-          $Res Function(ProxiesTabViewSelectorState) then) =
+      _$ProxyGroupSelectorStateCopyWithImpl<$Res, ProxyGroupSelectorState>;
-      _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
-          ProxiesTabViewSelectorState>;
   @useResult
   $Res call(
       {ProxiesSortType proxiesSortType,
+      ProxyCardType proxyCardType,
       num sortNum,
-      Group group,
+      List<Proxy> proxies,
-      ViewMode viewMode});
+      int columns});
-
-  $GroupCopyWith<$Res> get group;
 }
 
 /// @nodoc
-class _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
+class _$ProxyGroupSelectorStateCopyWithImpl<$Res,
-        $Val extends ProxiesTabViewSelectorState>
+        $Val extends ProxyGroupSelectorState>
-    implements $ProxiesTabViewSelectorStateCopyWith<$Res> {
+    implements $ProxyGroupSelectorStateCopyWith<$Res> {
-  _$ProxiesTabViewSelectorStateCopyWithImpl(this._value, this._then);
+  _$ProxyGroupSelectorStateCopyWithImpl(this._value, this._then);
 
   // ignore: unused_field
   final $Val _value;
@@ -1773,165 +1798,177 @@ class _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
   @override
   $Res call({
     Object? proxiesSortType = null,
+    Object? proxyCardType = null,
     Object? sortNum = null,
-    Object? group = null,
+    Object? proxies = null,
-    Object? viewMode = null,
+    Object? columns = null,
   }) {
     return _then(_value.copyWith(
       proxiesSortType: null == proxiesSortType
           ? _value.proxiesSortType
           : proxiesSortType // ignore: cast_nullable_to_non_nullable
               as ProxiesSortType,
+      proxyCardType: null == proxyCardType
+          ? _value.proxyCardType
+          : proxyCardType // ignore: cast_nullable_to_non_nullable
+              as ProxyCardType,
       sortNum: null == sortNum
           ? _value.sortNum
           : sortNum // ignore: cast_nullable_to_non_nullable
               as num,
-      group: null == group
+      proxies: null == proxies
-          ? _value.group
+          ? _value.proxies
-          : group // ignore: cast_nullable_to_non_nullable
+          : proxies // ignore: cast_nullable_to_non_nullable
-              as Group,
+              as List<Proxy>,
-      viewMode: null == viewMode
+      columns: null == columns
-          ? _value.viewMode
+          ? _value.columns
-          : viewMode // ignore: cast_nullable_to_non_nullable
+          : columns // ignore: cast_nullable_to_non_nullable
-              as ViewMode,
+              as int,
     ) as $Val);
   }
-
-  @override
-  @pragma('vm:prefer-inline')
-  $GroupCopyWith<$Res> get group {
-    return $GroupCopyWith<$Res>(_value.group, (value) {
-      return _then(_value.copyWith(group: value) as $Val);
-    });
-  }
 }
 
 /// @nodoc
-abstract class _$$ProxiesTabViewSelectorStateImplCopyWith<$Res>
+abstract class _$$ProxyGroupSelectorStateImplCopyWith<$Res>
-    implements $ProxiesTabViewSelectorStateCopyWith<$Res> {
+    implements $ProxyGroupSelectorStateCopyWith<$Res> {
-  factory _$$ProxiesTabViewSelectorStateImplCopyWith(
+  factory _$$ProxyGroupSelectorStateImplCopyWith(
-          _$ProxiesTabViewSelectorStateImpl value,
+          _$ProxyGroupSelectorStateImpl value,
-          $Res Function(_$ProxiesTabViewSelectorStateImpl) then) =
+          $Res Function(_$ProxyGroupSelectorStateImpl) then) =
-      __$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>;
+      __$$ProxyGroupSelectorStateImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
       {ProxiesSortType proxiesSortType,
+      ProxyCardType proxyCardType,
       num sortNum,
-      Group group,
+      List<Proxy> proxies,
-      ViewMode viewMode});
+      int columns});
-
-  @override
-  $GroupCopyWith<$Res> get group;
 }
 
 /// @nodoc
-class __$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>
+class __$$ProxyGroupSelectorStateImplCopyWithImpl<$Res>
-    extends _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
+    extends _$ProxyGroupSelectorStateCopyWithImpl<$Res,
-        _$ProxiesTabViewSelectorStateImpl>
+        _$ProxyGroupSelectorStateImpl>
-    implements _$$ProxiesTabViewSelectorStateImplCopyWith<$Res> {
+    implements _$$ProxyGroupSelectorStateImplCopyWith<$Res> {
-  __$$ProxiesTabViewSelectorStateImplCopyWithImpl(
+  __$$ProxyGroupSelectorStateImplCopyWithImpl(
-      _$ProxiesTabViewSelectorStateImpl _value,
+      _$ProxyGroupSelectorStateImpl _value,
-      $Res Function(_$ProxiesTabViewSelectorStateImpl) _then)
+      $Res Function(_$ProxyGroupSelectorStateImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
   @override
   $Res call({
     Object? proxiesSortType = null,
+    Object? proxyCardType = null,
     Object? sortNum = null,
-    Object? group = null,
+    Object? proxies = null,
-    Object? viewMode = null,
+    Object? columns = null,
   }) {
-    return _then(_$ProxiesTabViewSelectorStateImpl(
+    return _then(_$ProxyGroupSelectorStateImpl(
       proxiesSortType: null == proxiesSortType
           ? _value.proxiesSortType
           : proxiesSortType // ignore: cast_nullable_to_non_nullable
               as ProxiesSortType,
+      proxyCardType: null == proxyCardType
+          ? _value.proxyCardType
+          : proxyCardType // ignore: cast_nullable_to_non_nullable
+              as ProxyCardType,
       sortNum: null == sortNum
           ? _value.sortNum
           : sortNum // ignore: cast_nullable_to_non_nullable
               as num,
-      group: null == group
+      proxies: null == proxies
-          ? _value.group
+          ? _value._proxies
-          : group // ignore: cast_nullable_to_non_nullable
+          : proxies // ignore: cast_nullable_to_non_nullable
-              as Group,
+              as List<Proxy>,
-      viewMode: null == viewMode
+      columns: null == columns
-          ? _value.viewMode
+          ? _value.columns
-          : viewMode // ignore: cast_nullable_to_non_nullable
+          : columns // ignore: cast_nullable_to_non_nullable
-              as ViewMode,
+              as int,
     ));
   }
 }
 
 /// @nodoc
 
-class _$ProxiesTabViewSelectorStateImpl
+class _$ProxyGroupSelectorStateImpl implements _ProxyGroupSelectorState {
-    implements _ProxiesTabViewSelectorState {
+  const _$ProxyGroupSelectorStateImpl(
-  const _$ProxiesTabViewSelectorStateImpl(
       {required this.proxiesSortType,
+      required this.proxyCardType,
       required this.sortNum,
-      required this.group,
+      required final List<Proxy> proxies,
-      required this.viewMode});
+      required this.columns})
+      : _proxies = proxies;
 
   @override
   final ProxiesSortType proxiesSortType;
   @override
+  final ProxyCardType proxyCardType;
+  @override
   final num sortNum;
+  final List<Proxy> _proxies;
   @override
-  final Group group;
+  List<Proxy> get proxies {
+    if (_proxies is EqualUnmodifiableListView) return _proxies;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_proxies);
+  }
+
   @override
-  final ViewMode viewMode;
+  final int columns;
 
   @override
   String toString() {
-    return 'ProxiesTabViewSelectorState(proxiesSortType: $proxiesSortType, sortNum: $sortNum, group: $group, viewMode: $viewMode)';
+    return 'ProxyGroupSelectorState(proxiesSortType: $proxiesSortType, proxyCardType: $proxyCardType, sortNum: $sortNum, proxies: $proxies, columns: $columns)';
   }
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$ProxiesTabViewSelectorStateImpl &&
+            other is _$ProxyGroupSelectorStateImpl &&
             (identical(other.proxiesSortType, proxiesSortType) ||
                 other.proxiesSortType == proxiesSortType) &&
+            (identical(other.proxyCardType, proxyCardType) ||
+                other.proxyCardType == proxyCardType) &&
             (identical(other.sortNum, sortNum) || other.sortNum == sortNum) &&
-            (identical(other.group, group) || other.group == group) &&
+            const DeepCollectionEquality().equals(other._proxies, _proxies) &&
-            (identical(other.viewMode, viewMode) ||
+            (identical(other.columns, columns) || other.columns == columns));
-                other.viewMode == viewMode));
   }
 
   @override
-  int get hashCode =>
+  int get hashCode => Object.hash(runtimeType, proxiesSortType, proxyCardType,
-      Object.hash(runtimeType, proxiesSortType, sortNum, group, viewMode);
+      sortNum, const DeepCollectionEquality().hash(_proxies), columns);
 
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$ProxiesTabViewSelectorStateImplCopyWith<_$ProxiesTabViewSelectorStateImpl>
+  _$$ProxyGroupSelectorStateImplCopyWith<_$ProxyGroupSelectorStateImpl>
-      get copyWith => __$$ProxiesTabViewSelectorStateImplCopyWithImpl<
+      get copyWith => __$$ProxyGroupSelectorStateImplCopyWithImpl<
-          _$ProxiesTabViewSelectorStateImpl>(this, _$identity);
+          _$ProxyGroupSelectorStateImpl>(this, _$identity);
 }
 
-abstract class _ProxiesTabViewSelectorState
+abstract class _ProxyGroupSelectorState implements ProxyGroupSelectorState {
-    implements ProxiesTabViewSelectorState {
+  const factory _ProxyGroupSelectorState(
-  const factory _ProxiesTabViewSelectorState(
       {required final ProxiesSortType proxiesSortType,
+      required final ProxyCardType proxyCardType,
       required final num sortNum,
-      required final Group group,
+      required final List<Proxy> proxies,
-      required final ViewMode viewMode}) = _$ProxiesTabViewSelectorStateImpl;
+      required final int columns}) = _$ProxyGroupSelectorStateImpl;
 
   @override
   ProxiesSortType get proxiesSortType;
   @override
+  ProxyCardType get proxyCardType;
+  @override
   num get sortNum;
   @override
-  Group get group;
+  List<Proxy> get proxies;
   @override
-  ViewMode get viewMode;
+  int get columns;
   @override
   @JsonKey(ignore: true)
-  _$$ProxiesTabViewSelectorStateImplCopyWith<_$ProxiesTabViewSelectorStateImpl>
+  _$$ProxyGroupSelectorStateImplCopyWith<_$ProxyGroupSelectorStateImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
 

lib/models/log.dart

@@ -1,8 +1,12 @@
+// ignore_for_file: invalid_annotation_target
+
 import 'package:fl_clash/enum/enum.dart';
-import 'package:json_annotation/json_annotation.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'generated/log.g.dart';
 
+part 'generated/log.freezed.dart';
+
 @JsonSerializable()
 class Log {
   @JsonKey(name: "LogLevel")
@@ -31,3 +35,22 @@ 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,39 +5,28 @@ 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:json_annotation/json_annotation.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'generated/profile.g.dart';
 
+part 'generated/profile.freezed.dart';
+
 typedef SelectedMap = Map<String, String>;
 
-@JsonSerializable()
+@freezed
-class UserInfo {
+class UserInfo with _$UserInfo {
-  int upload;
+  const factory UserInfo({
-  int download;
+    @Default(0) int upload,
-  int total;
+    @Default(0) int download,
-  int expire;
+    @Default(0) int total,
+    @Default(0) int expire,
+  }) = _UserInfo;
 
-  UserInfo({
+  factory UserInfo.fromJson(Map<String, Object?> json) =>
-    int? upload,
+      _$UserInfoFromJson(json);
-    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 UserInfo();
+    if (info == null) return const UserInfo();
     final list = info.split(";");
     Map<String, int?> map = {};
     for (final i in list) {
@@ -45,73 +34,77 @@ class UserInfo {
       map[keyValue[0]] = int.tryParse(keyValue[1]);
     }
     return UserInfo(
-      upload: map["upload"],
+      upload: map["upload"] ?? 0,
-      download: map["download"],
+      download: map["download"] ?? 0,
-      total: map["total"],
+      total: map["total"] ?? 0,
-      expire: map["expire"],
+      expire: map["expire"] ?? 0,
     );
   }
-
-  @override
-  String toString() {
-    return 'UserInfo{upload: $upload, download: $download, total: $total, expire: $expire}';
-  }
 }
 
-@JsonSerializable()
+@freezed
-class Profile {
+class Profile with _$Profile {
-  String id;
+  const factory Profile({
-  String? label;
+    required String id,
-  String? currentGroupName;
+    String? label,
-  String? url;
+    String? currentGroupName,
-  DateTime? lastUpdateDate;
+    @Default("") String url,
-  Duration autoUpdateDuration;
+    DateTime? lastUpdateDate,
-  UserInfo? userInfo;
+    required Duration autoUpdateDuration,
-  bool autoUpdate;
+    UserInfo? userInfo,
-  SelectedMap selectedMap;
+    @Default(true) bool autoUpdate,
+    @Default({}) SelectedMap selectedMap,
+    @Default({}) Set<String> unfoldSet,
+  }) = _Profile;
 
-  Profile({
+  factory Profile.fromJson(Map<String, Object?> json) =>
-    String? id,
+      _$ProfileFromJson(json);
-    this.label,
-    this.url,
-    this.currentGroupName,
-    this.userInfo,
-    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 == null || url?.isEmpty == true ? ProfileType.file : ProfileType.url;
+      url.isEmpty == true ? ProfileType.file : ProfileType.url;
+
+  bool get realAutoUpdate =>
+      url.isEmpty == true ? false : autoUpdate;
 
   Future<void> checkAndUpdate() async {
     final isExists = await check();
     if (!isExists) {
-      if (url != null) {
+      if (url.isNotEmpty) {
-        return await update();
+        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<void> saveFile(Uint8List bytes) async {
+  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 {
     final message = await clashCore.validateConfig(utf8.decode(bytes));
     if (message.isNotEmpty) {
       throw message;
@@ -123,66 +116,21 @@ class Profile {
       await file.create(recursive: true);
     }
     await file.writeAsBytes(bytes);
-    lastUpdateDate = DateTime.now();
+    return copyWith(lastUpdateDate: DateTime.now());
   }
 
-  Map<String, dynamic> toJson() {
+  Future<Profile> saveFileWithString(String value) async {
-    return _$ProfileToJson(this);
+    final message = await clashCore.validateConfig(value);
-  }
+    if (message.isNotEmpty) {
-
+      throw message;
-  factory Profile.fromJson(Map<String, dynamic> json) {
+    }
-    return _$ProfileFromJson(json);
+    final path = await appPath.getProfilePath(id);
-  }
+    final file = File(path!);
-
+    final isExists = await file.exists();
-
+    if (!isExists) {
-  @override
+      await file.create(recursive: true);
-  bool operator ==(Object other) =>
+    }
-      identical(this, other) ||
+    await file.writeAsString(value);
-      other is Profile &&
+    return copyWith(lastUpdateDate: DateTime.now());
-          runtimeType == other.runtimeType &&
-          id == other.id &&
-          label == other.label &&
-          currentGroupName == other.currentGroupName &&
-          url == other.url &&
-          lastUpdateDate == other.lastUpdateDate &&
-          autoUpdateDuration == other.autoUpdateDuration &&
-          userInfo == other.userInfo &&
-          autoUpdate == other.autoUpdate &&
-          selectedMap == other.selectedMap;
-
-  @override
-  int get hashCode =>
-      id.hashCode ^
-      label.hashCode ^
-      currentGroupName.hashCode ^
-      url.hashCode ^
-      lastUpdateDate.hashCode ^
-      autoUpdateDuration.hashCode ^
-      userInfo.hashCode ^
-      autoUpdate.hashCode ^
-      selectedMap.hashCode;
-
-  Profile copyWith({
-    String? label,
-    String? url,
-    UserInfo? userInfo,
-    String? currentGroupName,
-    String? proxyName,
-    DateTime? lastUpdateDate,
-    Duration? autoUpdateDuration,
-    bool? autoUpdate,
-    SelectedMap? selectedMap,
-  }) {
-    return Profile(
-      id: id,
-      label: label ?? this.label,
-      url: url ?? this.url,
-      currentGroupName: currentGroupName ?? this.currentGroupName,
-      userInfo: userInfo ?? this.userInfo,
-      selectedMap: selectedMap ?? this.selectedMap,
-      lastUpdateDate: lastUpdateDate ?? this.lastUpdateDate,
-      autoUpdateDuration: autoUpdateDuration ?? this.autoUpdateDuration,
-      autoUpdate: autoUpdate ?? this.autoUpdate,
-    );
   }
 }

lib/models/selector.dart

@@ -19,6 +19,7 @@ class CheckIpSelectorState with _$CheckIpSelectorState {
     required bool isInit,
     required bool isStart,
     required SelectedMap selectedMap,
+    required num checkIpNum
   }) = _CheckIpSelectorState;
 }
 
@@ -99,13 +100,14 @@ class ProxiesSelectorState with _$ProxiesSelectorState {
 }
 
 @freezed
-class ProxiesTabViewSelectorState with _$ProxiesTabViewSelectorState {
+class ProxyGroupSelectorState with _$ProxyGroupSelectorState {
-  const factory ProxiesTabViewSelectorState({
+  const factory ProxyGroupSelectorState({
     required ProxiesSortType proxiesSortType,
+    required ProxyCardType proxyCardType,
     required num sortNum,
-    required Group group,
+    required List<Proxy> proxies,
-    required ViewMode viewMode,
+    required int columns,
-  }) = _ProxiesTabViewSelectorState;
+  }) = _ProxyGroupSelectorState;
 }
 
 @freezed

lib/models/system_color_scheme.dart

@@ -1,24 +1,30 @@
 import 'package:fl_clash/common/constant.dart';
 import 'package:flutter/material.dart';
 
+@immutable
 class SystemColorSchemes {
-  SystemColorSchemes({
+  final ColorScheme? lightColorScheme;
-    ColorScheme? lightColorScheme,
+  final ColorScheme? darkColorScheme;
-    ColorScheme? darkColorScheme,
+
-  })  : lightColorScheme = lightColorScheme ??
+  const SystemColorSchemes({
-            ColorScheme.fromSeed(seedColor: defaultPrimaryColor),
+    this.lightColorScheme,
-        darkColorScheme = darkColorScheme ??
+    this.darkColorScheme,
-            ColorScheme.fromSeed(
+  });
-              seedColor: defaultPrimaryColor,
-              brightness: Brightness.dark,
-            );
-  ColorScheme lightColorScheme;
-  ColorScheme darkColorScheme;
 
   getSystemColorSchemeForBrightness(Brightness? brightness) {
     if (brightness != null && brightness == Brightness.dark) {
-      return darkColorScheme;
+      return darkColorScheme != null
+          ? ColorScheme.fromSeed(
+              seedColor: darkColorScheme!.primary,
+              brightness: brightness,
+            )
+          : ColorScheme.fromSeed(
+              seedColor: defaultPrimaryColor,
+              brightness: brightness,
+            );
     }
-    return lightColorScheme;
+    return lightColorScheme != null
+        ? ColorScheme.fromSeed(seedColor: darkColorScheme!.primary)
+        : ColorScheme.fromSeed(seedColor: defaultPrimaryColor);
   }
 }

lib/state.dart

@@ -4,8 +4,10 @@ import 'dart:io';
 
 import 'package:animations/animations.dart';
 import 'package:fl_clash/clash/clash.dart';
+import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 
 import 'controller.dart';
 import 'models/models.dart';
@@ -14,6 +16,7 @@ import 'common/common.dart';
 class GlobalState {
   Timer? timer;
   Timer? groupsUpdateTimer;
+  late PackageInfo packageInfo;
   Function? updateCurrentDelayDebounce;
   PageController? pageController;
   final navigatorKey = GlobalKey<NavigatorState>();
@@ -42,13 +45,18 @@ class GlobalState {
   }) async {
     final profilePath = await appPath.getProfilePath(config.currentProfileId);
     await config.currentProfile?.checkAndUpdate();
-    debugPrint("update config");
+    final res = await clashCore.updateConfig(
-    final res = await clashCore.updateConfig(UpdateConfigParams(
+      UpdateConfigParams(
-      profilePath: profilePath,
+        profilePath: profilePath,
-      config: clashConfig,
+        config: clashConfig,
-      isPatch: isPatch,
+        params: ConfigExtendedParams(
-      isCompatible: config.isCompatible,
+          isPatch: isPatch,
-    ));
+          isCompatible: config.isCompatible,
+          selectedMap: config.currentSelectedMap,
+          testUrl: config.testUrl,
+        ),
+      ),
+    );
     if (res.isNotEmpty) throw res;
   }
 
@@ -78,7 +86,9 @@ class GlobalState {
       appState: appState,
       config: config,
       clashConfig: clashConfig,
-    );
+    ).then((_){
+      appController.addCheckIpNumDebounce();
+    });
   }
 
   Future<void> stopSystemProxy() async {
@@ -86,7 +96,7 @@ class GlobalState {
     stopListenUpdate();
   }
 
-  Future<void> applyProfile({
+  Future applyProfile({
     required AppState appState,
     required Config config,
     required ClashConfig clashConfig,
@@ -97,11 +107,6 @@ class GlobalState {
       isPatch: false,
     );
     await updateGroups(appState);
-    changeProxy(
-      appState: appState,
-      config: config,
-      clashConfig: clashConfig,
-    );
   }
 
   init({
@@ -119,25 +124,6 @@ class GlobalState {
     updateCoreVersionInfo(appState);
   }
 
-  changeProxy({
-    required AppState appState,
-    required Config config,
-    required ClashConfig clashConfig,
-  }) {
-    if (config.profiles.isEmpty) {
-      stopSystemProxy();
-      return;
-    }
-    config.currentSelectedMap.forEach((key, value) {
-      clashCore.changeProxy(
-        ChangeProxyParams(
-          groupName: key,
-          proxyName: value,
-        ),
-      );
-    });
-  }
-
   Future<void> updateGroups(AppState appState) async {
     appState.groups = await clashCore.getProxiesGroups();
   }
@@ -261,6 +247,18 @@ class GlobalState {
       return null;
     }
   }
+
+  int getColumns(ViewMode viewMode, int currentColumns) {
+    final targetColumnsArray = switch (viewMode) {
+      ViewMode.mobile => [2, 1],
+      ViewMode.laptop => [3, 2],
+      ViewMode.desktop => [4, 3],
+    };
+    if (targetColumnsArray.contains(currentColumns)) {
+      return currentColumns;
+    }
+    return targetColumnsArray.first;
+  }
 }
 
 final globalState = GlobalState();

lib/widgets/card.dart

@@ -1,4 +1,5 @@
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/enum/enum.dart';
 import 'package:flutter/material.dart';
 
 import 'text.dart';
@@ -54,6 +55,7 @@ class CommonCard extends StatelessWidget {
   const CommonCard({
     super.key,
     bool? isSelected,
+    this.type = CommonCardType.plain,
     this.onPressed,
     this.info,
     this.selectWidget,
@@ -65,10 +67,14 @@ class CommonCard extends StatelessWidget {
   final Widget? selectWidget;
   final Widget child;
   final Info? info;
+  final CommonCardType type;
 
   BorderSide getBorderSide(BuildContext context, Set<WidgetState> states) {
+    if(type == CommonCardType.filled){
+      return BorderSide.none;
+    }
     final colorScheme = Theme.of(context).colorScheme;
-    var hoverColor = isSelected
+    final hoverColor = isSelected
         ? colorScheme.primary.toLight()
         : colorScheme.primary.toLighter();
     if (states.contains(WidgetState.hovered) ||
@@ -86,17 +92,28 @@ class CommonCard extends StatelessWidget {
 
   Color? getBackgroundColor(BuildContext context, Set<WidgetState> states) {
     final colorScheme = Theme.of(context).colorScheme;
-    if (isSelected) {
+    switch(type){
-      return colorScheme.secondaryContainer;
+      case CommonCardType.plain:
+        if (isSelected) {
+          return colorScheme.secondaryContainer;
+        }
+        if (states.isEmpty) {
+          return colorScheme.secondaryContainer.toLittle();
+        }
+        return Theme.of(context)
+            .outlinedButtonTheme
+            .style
+            ?.backgroundColor
+            ?.resolve(states);
+      case CommonCardType.filled:
+        if (isSelected) {
+          return colorScheme.secondaryContainer;
+        }
+        if (states.isEmpty) {
+          return colorScheme.surfaceContainerLow;
+        }
+        return colorScheme.surfaceContainer;
     }
-    if (states.isEmpty) {
-      return colorScheme.secondaryContainer.toLittle();
-    }
-    return Theme.of(context)
-        .outlinedButtonTheme
-        .style
-        ?.backgroundColor
-        ?.resolve(states);
   }
 
   @override
@@ -136,11 +153,7 @@ class CommonCard extends StatelessWidget {
           (states) => getBorderSide(context, states),
         ),
       ),
-      onPressed: () {
+      onPressed: onPressed,
-        if (onPressed != null) {
-          onPressed!();
-        }
-      },
       child: Builder(
         builder: (_) {
           List<Widget> children = [];

lib/widgets/chip.dart

@@ -1,21 +1,45 @@
+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) {
-    return Chip(
+    if (type == ChipType.delete) {
+      return Chip(
+        avatar: avatar,
+        labelPadding:const EdgeInsets.symmetric(
+          vertical: 0,
+          horizontal: 4,
+        ),
+        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(
       materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-      padding: const EdgeInsets.symmetric(
+      avatar: avatar,
+      labelPadding:const EdgeInsets.symmetric(
         vertical: 0,
         horizontal: 4,
       ),
+      onPressed: onPressed ?? () {},
       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';
@@ -51,8 +50,9 @@ class _ClashMessageContainerState extends State<ClashMessageContainer>
   }
 
   @override
-  void onTun(String fd) {
+  Future<void> onTun(Fd fd) async {
-    proxyManager.setProtect(int.parse(fd));
+    await proxyManager.setProtect(fd.value);
+    clashCore.setFdMap(fd.id);
     super.onTun(fd);
   }
 
@@ -75,8 +75,18 @@ class _ClashMessageContainerState extends State<ClashMessageContainer>
   }
 
   @override
-  void onRun(String runTime) async {
+  void onLoaded(String groupName) {
-    // proxy?.updateStartTime();
+    final appController = globalState.appController;
-    super.onRun(runTime);
+    final currentSelectedMap = appController.config.currentSelectedMap;
+    final proxyName = currentSelectedMap[groupName];
+    if (proxyName == null) return;
+    clashCore.changeProxy(
+      ChangeProxyParams(
+        groupName: groupName,
+        proxyName: proxyName,
+      ),
+    );
+    appController.addCheckIpNumDebounce();
+    super.onLoaded(proxyName);
   }
 }

lib/widgets/list.dart

@@ -1,3 +1,4 @@
+import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/open_container.dart';
@@ -214,7 +215,8 @@ class ListItem<T> extends StatelessWidget {
       return OpenContainer(
         closedBuilder: (_, action) {
           openAction() {
-            final isMobile = globalState.appController.appState.viewMode == ViewMode.mobile;
+            final isMobile =
+                globalState.appController.appState.viewMode == ViewMode.mobile;
             if (!isMobile) {
               showExtendPage(
                 context,
@@ -243,7 +245,8 @@ class ListItem<T> extends StatelessWidget {
       final nextDelegate = delegate as NextDelegate;
       return _buildListTile(
         onTab: () {
-          final isMobile = globalState.appController.appState.viewMode == ViewMode.mobile;
+          final isMobile =
+              globalState.appController.appState.viewMode == ViewMode.mobile;
           if (!isMobile) {
             showExtendPage(
               context,
@@ -319,3 +322,77 @@ class ListItem<T> extends StatelessWidget {
     );
   }
 }
+
+class ListHeader extends StatelessWidget {
+  final String title;
+  final List<Widget> actions;
+
+  const ListHeader({
+    super.key,
+    required this.title,
+    List<Widget>? actions,
+  }) : actions = actions ?? const [];
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      alignment: Alignment.centerLeft,
+      padding: const EdgeInsets.symmetric(
+        horizontal: 16,
+        vertical: 12,
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.max,
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Text(
+            title,
+            style: Theme.of(context).textTheme.labelLarge?.copyWith(
+                  color: Theme.of(context).colorScheme.primary,
+                ),
+          ),
+          Expanded(
+            flex: 1,
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                ...actions,
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+List<Widget> generateSection({
+  required String title,
+  required Iterable<Widget> items,
+  List<Widget>? actions,
+  bool separated = true,
+}) {
+  final genItems = separated
+      ? items.separated(
+          const Divider(
+            height: 0,
+          ),
+        )
+      : items;
+  return [
+    if (items.isNotEmpty)
+      ListHeader(
+        title: title,
+        actions: actions,
+      ),
+    ...genItems,
+  ];
+}
+
+Widget generateListView(List<Widget> items) {
+  return ListView.builder(
+    itemCount: items.length,
+    itemBuilder: (_, index) => items[index],
+  );
+}

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,6 +53,12 @@ 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

@@ -88,6 +88,13 @@ class CommonScaffoldState extends State<CommonScaffold> {
     }
   }
 
+  @override
+  void dispose() {
+    _actions.dispose();
+    _floatingActionButton.dispose();
+    super.dispose();
+  }
+
   @override
   void didUpdateWidget(covariant CommonScaffold oldWidget) {
     super.didUpdateWidget(oldWidget);

lib/widgets/section.dart

@@ -1,37 +0,0 @@
-import 'package:flutter/material.dart';
-
-class Section extends StatelessWidget {
-  final String title;
-  final Widget child;
-
-  const Section({
-    super.key,
-    required this.title,
-    required this.child,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Flexible(
-          child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
-            child: Text(
-              title,
-              style: Theme.of(context).textTheme.labelLarge?.copyWith(
-                    color: Theme.of(context).colorScheme.primary,
-                  ),
-            ),
-          ),
-        ),
-        Expanded(
-          flex: 0,
-          child: child,
-        )
-      ],
-    );
-  }
-}

lib/widgets/widgets.dart

@@ -22,5 +22,4 @@ export 'tile_container.dart';
 export 'chip.dart';
 export 'fade_box.dart';
 export 'app_state_container.dart';
-export 'text.dart';
+export 'text.dart';
-export 'section.dart';

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.25
+version: 0.8.35+202407071
 environment:
   sdk: '>=3.1.0 <4.0.0'
 
@@ -16,7 +16,6 @@ dependencies:
   shared_preferences: ^2.2.0
   provider: ^6.0.5
   window_manager: ^0.3.8
-  ffi: ^2.1.0
   dynamic_color: ^1.7.0
   proxy:
     path: plugins/proxy
@@ -41,6 +40,9 @@ dependencies:
   country_flags: ^2.2.0
   re_editor: ^0.3.0
   re_highlight: ^0.0.3
+  win32: ^5.5.1
+  ffi: ^2.1.2
+  material_color_utilities: ^0.8.0
 dev_dependencies:
   flutter_test:
     sdk: flutter

test/command_test.dart

@@ -1,67 +1,10 @@
 // ignore_for_file: avoid_print
+import 'package:fl_clash/common/common.dart';
+
 void main() async {
-  String input = """
-您
-<details markdown=1><summary>All changes from v0.8.5 to the latest commit:</summary>
 
-
+  print("https://pqjc.site:10000/test.ymal".isUrl);
-(unreleased)
+  print("abcd".isUrl);
-------------
+  print("http://10.31.1.221:8848/cfa.yaml".isUrl);
-- Fix submit error. [chen08209]
-- Add WebDAV. [chen08209]
-
-  add Auto check updates
-
-  Optimize more details
-- Optimize delayTest. [chen08209]
-- Upgrade flutter version. [chen08209]
-- Update kernel Add import profile via QR code image. [chen08209]
-- Add compatibility mode and adapt clash scheme. [chen08209]
-- Update Version. [chen08209]
-- Reconstruction application proxy logic. [chen08209]
-- Fix Tab destroy error. [chen08209]
-- Optimize repeat healthcheck. [chen08209]
-- Optimize Direct mode ui. [chen08209]
-- Optimize Healthcheck. [chen08209]
-- Remove proxies position animation, improve performance Add Telegram
-  Link. [chen08209]
-- Update healthcheck policy. [chen08209]
-- New Check URLTest. [chen08209]
-- Fix the problem of invalid auto-selection. [chen08209]
-- New Async UpdateConfig. [chen08209]
-- Add changeProfileDebounce. [chen08209]
-- Update Workflow. [chen08209]
-- Fix ChangeProfile block. [chen08209]
-- Fix Release Message Error. [chen08209]
-- Update Selector 2. [chen08209]
-- Update Version. [chen08209]
-- Fix Proxies Select Error. [chen08209]
-- Fix the problem that the proxy group is empty in global mode.
-  [chen08209]
-- Fix the problem that the proxy group is empty in global mode.
-  [chen08209]
-- Add ProxyProvider2. [chen08209]
-- Add ProxyProvider. [chen08209]
-- Update Version. [chen08209]
-- Update ProxyGroup Sort. [chen08209]
-- Fix Android quickStart VpnService some problems. [chen08209]
-- Update version. [chen08209]
-- Set Android notification low importance. [chen08209]
-- Fix the issue that VpnService can't be closed correctly in special
-  cases. [chen08209]
-- Fix the problem that TileService is not destroyed correctly in some
-  cases. [chen08209]
-
-  Adjust tab animation defaults
-- Add Telegram in README_zh_CN.md. [chen08209]
-- Add Telegram. [chen08209]
-""";
-  const pattern = r'- (.+?)\. \[.+?\]';
-  final regex = RegExp(pattern);
-
-  for (final match in regex.allMatches(input)) {
-    final change = match.group(1);
-    print(change);
-  }
 }
 

windows/runner/CMakeLists.txt

@@ -17,6 +17,11 @@ add_executable(${BINARY_NAME} WIN32
   "Runner.rc"
   "runner.exe.manifest"
 )
+
+# add_executable(service
+#   "service.cpp"
+# )
+
 # Apply the standard set of build settings. This can be removed for applications
 # that need different build settings.
 apply_standard_settings(${BINARY_NAME})

windows/runner/service.cpp

@@ -0,0 +1,152 @@
+#include <windows.h>
+#include <tchar.h>
+#include <string>
+
+#define SERVICE_NAME _T("MyService")
+
+SERVICE_STATUS        g_ServiceStatus = {0};
+SERVICE_STATUS_HANDLE g_StatusHandle = NULL;
+HANDLE                g_ServiceStopEvent = INVALID_HANDLE_VALUE;
+
+VOID WINAPI ServiceMain(DWORD argc, LPTSTR *argv);
+VOID WINAPI ServiceCtrlHandler(DWORD);
+DWORD WINAPI ServiceWorkerThread(LPVOID lpParam);
+
+int _tmain(int argc, TCHAR *argv[])
+{
+    SERVICE_TABLE_ENTRY ServiceTable[] =
+    {
+        {SERVICE_NAME, (LPSERVICE_MAIN_FUNCTION) ServiceMain},
+        {NULL, NULL}
+    };
+
+    if (StartServiceCtrlDispatcher(ServiceTable) == FALSE)
+    {
+        return GetLastError();
+    }
+
+    return 0;
+}
+
+VOID WINAPI ServiceMain(DWORD argc, LPTSTR *argv)
+{
+    DWORD Status = E_FAIL;
+
+    g_StatusHandle = RegisterServiceCtrlHandler(SERVICE_NAME, ServiceCtrlHandler);
+
+    if (g_StatusHandle == NULL)
+    {
+        goto EXIT;
+    }
+
+    ZeroMemory(&g_ServiceStatus, sizeof(g_ServiceStatus));
+    g_ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
+    g_ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP;
+    g_ServiceStatus.dwCurrentState = SERVICE_START_PENDING;
+    g_ServiceStatus.dwWin32ExitCode = 0;
+    g_ServiceStatus.dwServiceSpecificExitCode = 0;
+    g_ServiceStatus.dwCheckPoint = 0;
+
+    if (SetServiceStatus(g_StatusHandle, &g_ServiceStatus) == FALSE)
+    {
+        OutputDebugString(_T("My Service: ServiceMain: SetServiceStatus returned error"));
+    }
+
+    g_ServiceStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+    if (g_ServiceStopEvent == NULL)
+    {
+        g_ServiceStatus.dwControlsAccepted = 0;
+        g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+        g_ServiceStatus.dwWin32ExitCode = GetLastError();
+        g_ServiceStatus.dwCheckPoint = 1;
+
+        if (SetServiceStatus(g_StatusHandle, &g_ServiceStatus) == FALSE)
+        {
+            OutputDebugString(_T("My Service: ServiceMain: SetServiceStatus returned error"));
+        }
+        goto EXIT;
+    }
+
+    g_ServiceStatus.dwCurrentState = SERVICE_RUNNING;
+    g_ServiceStatus.dwCheckPoint = 0;
+    g_ServiceStatus.dwWaitHint = 0;
+
+    if (SetServiceStatus(g_StatusHandle, &g_ServiceStatus) == FALSE)
+    {
+        OutputDebugString(_T("My Service: ServiceMain: SetServiceStatus returned error"));
+    }
+
+    HANDLE hThread = CreateThread(NULL, 0, ServiceWorkerThread, NULL, 0, NULL);
+
+    WaitForSingleObject(hThread, INFINITE);
+
+    CloseHandle(g_ServiceStopEvent);
+
+    g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+    g_ServiceStatus.dwCheckPoint = 3;
+
+    if (SetServiceStatus(g_StatusHandle, &g_ServiceStatus) == FALSE)
+    {
+        OutputDebugString(_T("My Service: ServiceMain: SetServiceStatus returned error"));
+    }
+
+EXIT:
+    return;
+}
+
+VOID WINAPI ServiceCtrlHandler(DWORD CtrlCode)
+{
+    switch(CtrlCode)
+    {
+        case SERVICE_CONTROL_STOP:
+            if (g_ServiceStatus.dwCurrentState != SERVICE_RUNNING)
+                break;
+
+            g_ServiceStatus.dwControlsAccepted = 0;
+            g_ServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
+            g_ServiceStatus.dwWin32ExitCode = 0;
+            g_ServiceStatus.dwCheckPoint = 4;
+
+            if (SetServiceStatus(g_StatusHandle, &g_ServiceStatus) == FALSE)
+            {
+                OutputDebugString(_T("My Service: ServiceCtrlHandler: SetServiceStatus returned error"));
+            }
+
+            SetEvent(g_ServiceStopEvent);
+            break;
+
+        default:
+            break;
+    }
+}
+
+DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
+{
+    while(WaitForSingleObject(g_ServiceStopEvent, 0) != WAIT_OBJECT_0)
+    {
+        STARTUPINFO si;
+        PROCESS_INFORMATION pi;
+
+        ZeroMemory(&si, sizeof(si));
+        si.cb = sizeof(si);
+        ZeroMemory(&pi, sizeof(pi));
+
+        // 启动 "C:\path\to\your\executable.exe"
+        if(!CreateProcess(NULL, _T("C:\\path\\to\\your\\executable.exe"), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
+        {
+            OutputDebugString(_T("CreateProcess failed"));
+        }
+
+        // 等待进程结束
+        WaitForSingleObject(pi.hProcess, INFINITE);
+
+        // 关闭进程和线程句柄
+        CloseHandle(pi.hProcess);
+        CloseHandle(pi.hThread);
+
+        // 每隔一段时间检查一次，这里设置为60秒
+        Sleep(60000);
+    }
+
+    return ERROR_SUCCESS;
+}