Add ua selector

Support modify test url

Optimize android proxy

Fix the error that async proxy provider could not selected the proxy

.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 "Arch: ${{ runner.arch }}"
-            gcc --version
+          echo "Running on ${{ matrix.os }}"
+          echo "Arch: ${{ runner.arch }}"
+          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/src/main/AndroidManifest.xml

@@ -22,8 +22,10 @@
     <application
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:extractNativeLibs="true"
-        android:label="FlClash">
+        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 {
-                    ActivityCompat.requestPermissions(
-                        it,
-                        arrayOf(Manifest.permission.POST_NOTIFICATIONS),
-                        NOTIFICATION_PERMISSION_REQUEST_CODE
-                    )
-                }
+                if (isBlockNotification) return
+                if (activity == null) return
+                ActivityCompat.requestPermissions(
+                    activity!!,
+                    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) {
-                startForeground()
+            isBlockNotification = true
+            if (grantResults.isNotEmpty()) {
+                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    startForeground()
+                }
             }
         }
-        return true;
+        return false;
     }
 
 

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"
@@ -59,11 +60,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"`
-	Config       *config.RawConfig `json:"config" `
-	IsPatch      *bool             `json:"is-patch"`
-	IsCompatible *bool             `json:"is-compatible"`
+	ProfilePath *string              `json:"profile-path"`
+	Config      config.RawConfig     `json:"config" `
+	Params      ConfigExtendedParams `json:"params"`
 }
 
 type ChangeProxyParams struct {
@@ -170,9 +177,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 +329,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 +347,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.Stack = patchConfig.Tun.Stack
+	targetConfig.Tun.DNSHijack = patchConfig.Tun.DNSHijack
+	targetConfig.Tun.Stack = patchConfig.Tun.Stack
 	targetConfig.GeodataLoader = patchConfig.GeodataLoader
 	targetConfig.Profile.StoreSelected = false
 	if targetConfig.DNS.Enable == false {
@@ -352,7 +359,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,16 +395,44 @@ 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)
+	}
+}
+
+func applyConfig() {
 	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 {
-		executor.Shutdown()
 		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)
+		configParams = params.Params
 		if err != nil {
 			bridge.SendToPort(i, err.Error())
 			return
 		}
-		prof := decorationConfig(params.ProfilePath, *params.Config, *params.IsCompatible)
+		prof := decorationConfig(params.ProfilePath, params.Config)
 		currentConfig = prof
-		if *params.IsPatch {
-			applyConfig(true)
-		} else {
-			applyConfig(false)
-		}
+		applyConfig()
 		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]
-		if proxy == nil {
+		group, ok := proxies[groupName]
+		if !ok {
 			return
 		}
-		log.Infoln("change proxy %s", proxy.Name())
-		adapterProxy := proxy.(*adapter.Proxy)
+		adapterProxy := group.(*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
@@ -211,8 +215,8 @@ func resetTraffic() {
 //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 {
@@ -296,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
@@ -307,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
@@ -360,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()
@@ -409,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{
@@ -430,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 {
-				tun.MarkSocket(int(fd))
-				time.Sleep(time.Millisecond * 100)
+			if tun == nil {
+				return
+			}
+
+			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

@@ -130,7 +130,6 @@ class ApplicationState extends State<Application> {
       httpTimeoutDuration,
       (timer) async {
         await globalState.appController.updateGroups();
-        globalState.appController.appState.sortNum++;
       },
     );
   }
@@ -165,7 +164,6 @@ class ApplicationState extends State<Application> {
                     themeMode: state.themeMode,
                     theme: ThemeData(
                       useMaterial3: true,
-                      fontFamily: '',
                       pageTransitionsTheme: _pageTransitionsTheme,
                       colorScheme: _getAppColorScheme(
                         brightness: Brightness.light,
@@ -175,7 +173,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(
-      homeDir.toNativeUtf8().cast(),
-    ) ==
-        1;
+    final homeDirChar = homeDir.toNativeUtf8().cast<Char>();
+    final isInit = clashFFI.initClash(homeDirChar) == 1;
+    malloc.free(homeDirChar);
+    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,20 +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>>(() {
-      if(proxiesRawString.isEmpty) return [];
-      final proxies = json.decode(proxiesRawString) as Map;
-      if(proxies.isEmpty) return [];
+      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) {
@@ -111,7 +116,8 @@ class ClashCore {
         group["all"] = ((group["all"] ?? []) as List)
             .map(
               (name) => proxies[name],
-        )
+            )
+            .where((proxy) => proxy != null)
             .toList();
         return group;
       }).toList();
@@ -122,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>)
-          .map(
-            (item) => ExternalProvider.fromJson(item),
-      )
-          .toList();
+          (json.decode(externalProvidersRawString) as List<dynamic>)
+              .map(
+                (item) => ExternalProvider.fromJson(item),
+              )
+              .toList();
       return externalProviders;
     });
   }
@@ -146,17 +153,23 @@ class ClashCore {
         receiver.close();
       }
     });
+    final providerNameChar = providerName.toNativeUtf8().cast<Char>();
+    final providerTypeChar = providerType.toNativeUtf8().cast<Char>();
     clashFFI.updateExternalProvider(
-      providerName.toNativeUtf8().cast(),
-      providerType.toNativeUtf8().cast(),
+      providerNameChar,
+      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) {
@@ -172,13 +185,16 @@ 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();
-      if(!completer.isCompleted){
+      if (!completer.isCompleted) {
         completer.complete(
           Delay(name: proxyName, value: -1),
         );
@@ -188,28 +204,33 @@ class ClashCore {
   }
 
   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(){
+  void resetTraffic() {
     clashFFI.resetTraffic();
   }
 
@@ -234,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() {
@@ -246,13 +274,16 @@ 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) {
-    clashFFI.closeConnection(id.toNativeUtf8().cast());
+    final idChar = id.toNativeUtf8().cast<Char>();
+    clashFFI.closeConnection(idChar);
+    malloc.free(idChar);
   }
 }
 

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,5 @@ export 'string.dart';
 export 'app_localizations.dart';
 export 'function.dart';
 export 'package.dart';
-export 'measure.dart';
+export 'measure.dart';
+export 'service.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/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;
-  Completer<PackageInfo> packageInfoCompleter = Completer();
-
-  AppPackage._internal() {
-     PackageInfo.fromPlatform().then(
-          (value) => packageInfoCompleter.complete(value),
-    );
-  }
-
-  factory AppPackage() {
-    _instance ??= AppPackage._internal();
-    return _instance!;
-  }
+extension PackageInfoExtension on PackageInfo {
+  String get ua => [
+        "$appName/v$version",
+        "clash-verge/v1.6.6",
+        "Platform/${Platform.operatingSystem}",
+      ].join(" ");
 }
-
-final appPackage = AppPackage();

lib/common/request.dart

@@ -12,17 +12,18 @@ class Request {
   bool _isStart = false;
 
   Request() {
-    _dio = Dio(
-      BaseOptions(
-        headers: {"User-Agent": coreName},
+    _dio = Dio();
+    _dio.options = BaseOptions(
+      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 = packageInfo.version;
+    final version = globalState.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,9 @@
 extension StringExtension on String {
   bool get isUrl {
-    try {
-      Uri.parse(this);
-      return true;
-    } catch (e) {
-      return false;
-    }
+    return RegExp(
+      r"^(http(s)?://)?(www\.)?[a-zA-Z0-9]+([\-.][a-zA-Z0-9]+)*\.[a-zA-Z]{2,5}(:[0-9]{1,5})?(/.*)?$",
+      caseSensitive: false,
+      multiLine: false,
+    ).hasMatch(this);
   }
 }

lib/common/text.dart

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

lib/controller.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:fl_clash/enum/enum.dart';
-import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/state.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -72,14 +71,6 @@ class AppController {
     );
   }
 
-  changeProxy() {
-    globalState.changeProxy(
-      appState: appState,
-      config: config,
-      clashConfig: clashConfig,
-    );
-  }
-
   addProfile(Profile profile) async {
     config.setProfile(profile);
     if (config.currentProfileId != null) return;
@@ -267,6 +258,7 @@ class AppController {
   }
 
   init() async {
+    updateLogStatus();
     if (!config.silentLaunch) {
       window?.show();
     }
@@ -290,14 +282,13 @@ class AppController {
   }
 
   afterInit() async {
-    if (config.autoRun) {
+    await proxyManager.updateStartTime();
+    if (proxyManager.isStart) {
       await updateSystemProxy(true);
     } else {
-      await proxyManager.updateStartTime();
-      await updateSystemProxy(proxyManager.isStart);
+      await updateSystemProxy(config.autoRun);
     }
     autoUpdateProfiles();
-    updateLogStatus();
     autoCheckUpdate();
   }
 
@@ -360,7 +351,9 @@ 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;
@@ -406,9 +399,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 }
 
@@ -65,7 +74,10 @@ enum RecoveryOption {
   onlyProfiles,
 }
 
-enum ChipType {
-  action,
-  delete,
-}
+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>(
-                        future: appPackage.packageInfoCompleter.future,
-                        builder: (_, package) {
-                          final version = package.data?.version;
-                          if (version == null) return Container();
-                          return Text(
-                            version,
-                            style: Theme.of(context).textTheme.labelLarge,
-                          );
-                        },
+                      Text(
+                        globalState.packageInfo.version,
+                        style: Theme.of(context).textTheme.labelLarge,
                       )
                     ],
                   )

lib/fragments/config.dart

@@ -39,6 +39,104 @@ class _ConfigFragmentState extends State<ConfigFragment> {
     }
   }
 
+  _showLogLevelDialog(LogLevel value) {
+    globalState.showCommonDialog(
+      child: AlertDialog(
+        title: Text(appLocalizations.logLevel),
+        contentPadding: const EdgeInsets.symmetric(
+          horizontal: 8,
+          vertical: 16,
+        ),
+        content: SizedBox(
+          width: 250,
+          child: Wrap(
+            children: [
+              for (final logLevel in LogLevel.values)
+                ListItem.radio(
+                  delegate: RadioDelegate<LogLevel>(
+                    value: logLevel,
+                    groupValue: value,
+                    onChanged: (LogLevel? value) {
+                      if (value == null) {
+                        return;
+                      }
+                      final appController = globalState.appController;
+                      appController.clashConfig.logLevel = value;
+                      appController.updateClashConfigDebounce();
+                      Navigator.of(context).pop();
+                    },
+                  ),
+                  title: Text(logLevel.name),
+                )
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  _showUaDialog(String? value) {
+    const uas = [
+      null,
+      "clash-verge/v1.6.6",
+      "ClashforWindows/0.19.23",
+    ];
+    globalState.showCommonDialog(
+      child: AlertDialog(
+        title: const Text("UA"),
+        contentPadding: const EdgeInsets.symmetric(
+          horizontal: 8,
+          vertical: 16,
+        ),
+        content: SizedBox(
+          width: 250,
+          child: Wrap(
+            children: [
+              for (final ua in uas)
+                ListItem.radio(
+                  delegate: RadioDelegate<String?>(
+                    value: ua,
+                    groupValue: value,
+                    onChanged: (String? value) {
+                      final appController = globalState.appController;
+                      appController.clashConfig.globalRealUa = value;
+                      appController.updateClashConfigDebounce();
+                      Navigator.of(context).pop();
+                    },
+                  ),
+                  title: Text(ua ?? appLocalizations.defaultText),
+                )
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  _modifyTestUrl(String testUrl) async {
+    final newTestUrl = await globalState.showCommonDialog<String>(
+      child: TestUrlFormDialog(
+        testUrl: testUrl,
+      ),
+    );
+    if (newTestUrl != null && newTestUrl != testUrl && mounted) {
+      try {
+        if (!newTestUrl.isUrl) {
+          throw "Invalid url";
+        }
+        globalState.appController.config.testUrl = newTestUrl;
+        globalState.appController.updateClashConfigDebounce();
+      } catch (e) {
+        globalState.showMessage(
+          title: appLocalizations.testUrl,
+          message: TextSpan(
+            text: e.toString(),
+          ),
+        );
+      }
+    }
+  }
+
   Widget _buildAppSection() {
     final items = [
       if (Platform.isAndroid)
@@ -89,9 +187,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
               onChanged: (bool value) async {
                 final appController = globalState.appController;
                 appController.config.isCompatible = value;
-                await appController.updateClashConfig(isPatch: false);
-                await appController.updateGroups();
-                appController.changeProxy();
+                await appController.applyProfile();
               },
             ),
           );
@@ -114,42 +210,6 @@ class _ConfigFragmentState extends State<ConfigFragment> {
     );
   }
 
-  _showLogLevelDialog(LogLevel value) {
-    globalState.showCommonDialog(
-      child: AlertDialog(
-        title: Text(appLocalizations.logLevel),
-        contentPadding: const EdgeInsets.symmetric(
-          horizontal: 8,
-          vertical: 16,
-        ),
-        content: SizedBox(
-          width: 250,
-          child: Wrap(
-            children: [
-              for (final logLevel in LogLevel.values)
-                ListItem.radio(
-                  delegate: RadioDelegate<LogLevel>(
-                    value: logLevel,
-                    groupValue: value,
-                    onChanged: (LogLevel? value) {
-                      if (value == null) {
-                        return;
-                      }
-                      final appController = globalState.appController;
-                      appController.clashConfig.logLevel = value;
-                      appController.updateClashConfigDebounce();
-                      Navigator.of(context).pop();
-                    },
-                  ),
-                  title: Text(logLevel.name),
-                )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
   Widget _buildGeneralSection() {
     final items = [
       Selector<ClashConfig, LogLevel>(
@@ -165,6 +225,32 @@ class _ConfigFragmentState extends State<ConfigFragment> {
           );
         },
       ),
+      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, __) {
@@ -191,7 +277,7 @@ class _ConfigFragmentState extends State<ConfigFragment> {
         builder: (_, ipv6, __) {
           return ListItem.switchItem(
             leading: const Icon(Icons.water_outlined),
-            title: const Text("Ipv6"),
+            title: const Text("IPv6"),
             subtitle: Text(appLocalizations.ipv6Desc),
             delegate: SwitchDelegate(
               value: ipv6,
@@ -337,14 +423,12 @@ class _ConfigFragmentState extends State<ConfigFragment> {
 
   Widget _buildMoreSection() {
     final items = [
-      if (false)
+      if (system.isDesktop)
         Selector<ClashConfig, bool>(
           selector: (_, clashConfig) => clashConfig.tun.enable,
           builder: (_, tunEnable, __) {
             return ListItem.switchItem(
-              leading: const Icon(
-                Icons.important_devices_outlined
-              ),
+              leading: const Icon(Icons.important_devices_outlined),
               title: Text(appLocalizations.tun),
               subtitle: Text(appLocalizations.tunDesc),
               delegate: SwitchDelegate(
@@ -359,9 +443,9 @@ class _ConfigFragmentState extends State<ConfigFragment> {
           },
         ),
     ];
-    if(items.isEmpty) return Container();
+    if (items.isEmpty) return Container();
     return Section(
-      title: appLocalizations.general,
+      title: appLocalizations.more,
       child: Column(
         children: [
           for (final item in items) ...[
@@ -414,7 +498,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 +524,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

@@ -198,7 +198,7 @@ class ConnectionItem extends StatelessWidget {
   }
 
   String _getRequestText(Metadata metadata) {
-    var text = "${metadata.network}:://";
+    var text = "${metadata.network}://";
     final ips = [
       metadata.host,
       metadata.destinationIP,

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

@@ -56,7 +56,7 @@ class _DashboardFragmentState extends State<DashboardFragment> {
                   ),
                   GridItem(
                     crossAxisCellCount: isDesktop ? 4 : 6,
-                    child: const IntranetIp(),
+                    child: const IntranetIP(),
                   ),
                 ],
               );

lib/fragments/dashboard/intranet_ip.dart

@@ -5,21 +5,21 @@ 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});
+class IntranetIP extends StatefulWidget {
+  const IntranetIP({super.key});
 
   @override
-  State<IntranetIp> createState() => _IntranetIpState();
+  State<IntranetIP> createState() => _IntranetIPState();
 }
 
-class _IntranetIpState extends State<IntranetIp> {
+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.type == InternetAddressType.IPv4 && !address.isLoopback) {
+        if (!address.isLoopback) {
           return address.address;
         }
       }
@@ -45,12 +45,15 @@ class _IntranetIpState extends State<IntranetIp> {
   Widget build(BuildContext context) {
     return CommonCard(
       info: Info(
-        label: appLocalizations.intranetIp,
+        label: appLocalizations.intranetIP,
         iconData: Icons.devices,
       ),
+      onPressed: (){
+
+      },
       child: Container(
         padding: const EdgeInsets.all(16).copyWith(top: 0),
-        height: globalState.appController.measure.titleLargeHeight + 16,
+        height: globalState.appController.measure.titleLargeHeight + 24 - 2,
         child: ValueListenableBuilder(
           valueListenable: ipNotifier,
           builder: (_, value, __) {
@@ -65,7 +68,7 @@ class _IntranetIpState extends State<IntranetIp> {
                           child: TooltipText(
                             text: Text(
                               value,
-                              style: context.textTheme.titleLarge?.toSoftBold(),
+                              style: context.textTheme.titleLarge?.toSoftBold.toMinus,
                               maxLines: 1,
                               overflow: TextOverflow.ellipsis,
                             ),
@@ -74,8 +77,11 @@ class _IntranetIpState extends State<IntranetIp> {
                       ],
                     )
                   : const Padding(
-                      padding: EdgeInsets.all(4),
-                      child: CircularProgressIndicator(),
+                      padding: EdgeInsets.all(2),
+                      child: AspectRatio(
+                        aspectRatio: 1,
+                        child: CircularProgressIndicator(),
+                      ),
                     ),
             );
           },

lib/fragments/dashboard/network_detection.dart

@@ -52,6 +52,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
           isInit: appState.isInit,
           selectedMap: appState.selectedMap,
           isStart: appState.isStart,
+          checkIpNum: appState.checkIpNum,
         );
       },
       builder: (_, state, __) {
@@ -78,6 +79,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
         valueListenable: ipInfoNotifier,
         builder: (_, ipInfo, __) {
           return CommonCard(
+            onPressed: () {},
             child: Column(
               children: [
                 Flexible(
@@ -134,8 +136,9 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                   ),
                 ),
                 Container(
-                  height:
-                      globalState.appController.measure.titleLargeHeight + 24,
+                  height: globalState.appController.measure.titleLargeHeight +
+                      24 -
+                      2,
                   alignment: Alignment.centerLeft,
                   padding: const EdgeInsets.all(16).copyWith(top: 0),
                   child: FadeBox(
@@ -150,7 +153,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                                   text: Text(
                                     ipInfo.ip,
                                     style: context.textTheme.titleLarge
-                                        ?.toSoftBold(),
+                                        ?.toSoftBold.toMinus,
                                     maxLines: 1,
                                     overflow: TextOverflow.ellipsis,
                                   ),
@@ -164,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();
-    final bodyMedium = Theme.of(context).textTheme.bodySmall?.toLight();
+        Theme.of(context).textTheme.titleLarge?.toSoftBold;
+    final bodyMedium = Theme.of(context).textTheme.bodySmall?.toLight;
     final valueText = Text(
       showValue,
       style: titleLargeSoftBold,
@@ -75,7 +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
-                          .of(context)
-                          .textTheme
-                          .titleMedium
-                          ?.toSoftBold(),
+                      style:
+                          Theme.of(context).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;
-    updateController();
-    updateSystemProxy();
+    final appController = globalState.appController;
+    if (isStart == appController.appState.isStart) {
+      isStart = !isStart;
+      updateController();
+      appController.updateSystemProxy(isStart);
+    }
   }
 
   updateController() {
@@ -48,11 +49,18 @@ class _StartButtonState extends State<StartButton>
     }
   }
 
-  updateSystemProxy() {
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      final appController = globalState.appController;
-      await appController.updateSystemProxy(isStart);
-    });
+  Widget _updateControllerContainer(Widget child) {
+    return Selector<AppState, bool>(
+      selector: (_, appState) => appState.isStart,
+      builder: (_, isStart, child) {
+        if(isStart != this.isStart){
+          this.isStart = isStart;
+          updateController();
+        }
+        return child!;
+      },
+      child: child,
+    );
   }
 
   @override
@@ -72,8 +80,7 @@ class _StartButtonState extends State<StartButton>
                     other.getTimeDifference(
                       DateTime.now(),
                     ),
-                    style:
-                        Theme.of(context).textTheme.titleMedium?.toSoftBold(),
+                    style: Theme.of(context).textTheme.titleMedium?.toSoftBold,
                   ),
                 )
                 .width +
@@ -119,24 +126,14 @@ class _StartButtonState extends State<StartButton>
           child: child,
         );
       },
-      child: Selector<AppState, bool>(
-        selector: (_, appState) => appState.runTime != null,
-        builder: (_, isRun, child) {
-          WidgetsBinding.instance.addPostFrameCallback((_) {
-            if (isStart != isRun) {
-              isStart = isRun;
-              updateController();
-            }
-          });
-          return child!;
-        },
-        child: Selector<AppState, int?>(
+      child: _updateControllerContainer(
+        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/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,7 +93,8 @@ class _URLFormDialogState extends State<URLFormDialog> {
           runSpacing: 16,
           children: [
             TextField(
-              maxLines: null,
+              maxLines: 5,
+              minLines: 1,
               controller: urlController,
               decoration: InputDecoration(
                 border: const OutlineInputBorder(),

lib/fragments/profiles/edit_profile.dart

@@ -94,7 +94,8 @@ class _EditProfileState extends State<EditProfile> {
         ListItem(
           title: TextFormField(
             controller: urlController,
-            maxLines: null,
+            maxLines: 5,
+            minLines: 1,
             decoration: InputDecoration(
               border: const OutlineInputBorder(),
               labelText: appLocalizations.url,

lib/fragments/profiles/profiles.dart

@@ -3,6 +3,7 @@ import 'package:fl_clash/fragments/profiles/edit_profile.dart';
 import 'package:fl_clash/fragments/profiles/view_profile.dart';
 import 'package:fl_clash/models/models.dart';
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/state.dart';
 import 'package:fl_clash/widgets/widgets.dart';
 import 'package:flutter/material.dart';
@@ -28,6 +29,7 @@ class ProfilesFragment extends StatefulWidget {
 
 class _ProfilesFragmentState extends State<ProfilesFragment> {
   final hasPadding = ValueNotifier<bool>(false);
+  Function? applyConfigDebounce;
 
   List<GlobalObjectKey<_ProfileItemState>> profileItemKeys = [];
 
@@ -55,7 +57,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
   _updateProfiles() async {
     final updateProfiles = profileItemKeys.map<Future>(
         (key) async => await key.currentState?.updateProfile(false));
-    final result = await Future.wait(updateProfiles);
+    await Future.wait(updateProfiles);
   }
 
   _initScaffoldState() {
@@ -86,12 +88,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>(
@@ -154,8 +174,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
                               key: profileItemKeys[i],
                               profile: state.profiles[i],
                               groupValue: state.currentProfileId,
-                              onChanged:
-                                  globalState.appController.changeProfile,
+                              onChanged: _changeProfile,
                             ),
                           ),
                       ],
@@ -253,7 +272,7 @@ class _ProfileItemState extends State<ProfileItem> {
               ),
               Text(
                 profile.lastUpdateDate?.lastUpdateTimeDesc ?? '',
-                style: textTheme.labelMedium?.toLight(),
+                style: textTheme.labelMedium?.toLight,
               ),
             ],
           ),
@@ -284,7 +303,7 @@ class _ProfileItemState extends State<ProfileItem> {
                 ),
                 Text(
                   "$useShow / $totalShow",
-                  style: textTheme.labelMedium?.toLight(),
+                  style: textTheme.labelMedium?.toLight,
                 ),
                 const SizedBox(
                   height: 2,
@@ -293,14 +312,14 @@ class _ProfileItemState extends State<ProfileItem> {
                   children: [
                     Text(
                       appLocalizations.expirationTime,
-                      style: textTheme.labelMedium?.toLighter(),
+                      style: textTheme.labelMedium?.toLighter,
                     ),
                     const SizedBox(
                       width: 4,
                     ),
                     Text(
                       expireShow,
-                      style: textTheme.labelMedium?.toLighter(),
+                      style: textTheme.labelMedium?.toLighter,
                     ),
                   ],
                 )
@@ -437,16 +456,16 @@ class _ProfileItemState extends State<ProfileItem> {
                                 label: appLocalizations.update,
                                 iconData: Icons.sync,
                               ),
+                            CommonPopupMenuItem(
+                              action: ProfileActions.view,
+                              label: appLocalizations.view,
+                              iconData: Icons.visibility,
+                            ),
                             CommonPopupMenuItem(
                               action: ProfileActions.delete,
                               label: appLocalizations.delete,
                               iconData: Icons.delete,
                             ),
-                            CommonPopupMenuItem(
-                              action: ProfileActions.view,
-                              label: "查看",
-                              iconData: Icons.visibility,
-                            ),
                           ],
                           onSelected: (ProfileActions? action) async {
                             switch (action) {

lib/fragments/requests.dart

@@ -193,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,

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,20 +161,19 @@
   "checking": "Checking...",
   "country": "Country",
   "checkError": "Check error",
-  "ipCheckTimeout": "Ip check timeout",
   "search": "Search",
   "allowBypass": "Allow applications to bypass VPN",
   "allowBypassDesc": "Some apps can bypass VPN when turned on",
   "externalController": "ExternalController",
-  "externalControllerDesc": "Once enabled, the clash kernel can be controlled on port 9090",
-  "ipv6Desc": "When turned on it will be able to receive ipv6 traffic",
+  "externalControllerDesc": "Once enabled, the Clash kernel can be controlled on port 9090",
+  "ipv6Desc": "When turned on it will be able to receive IPv6 traffic",
   "app": "App",
   "general": "General",
   "systemProxyDesc": "Attach HTTP proxy to VpnService",
   "unifiedDelay": "Unified delay",
   "unifiedDelayDesc": "Remove extra delays such as handshaking",
-  "tcpConcurrent": "Tcp concurrent",
-  "tcpConcurrentDesc": "Enabling it will allow tcp concurrency",
+  "tcpConcurrent": "TCP concurrent",
+  "tcpConcurrentDesc": "Enabling it will allow TCP concurrency",
   "geodataLoader": "Geo Low Memory Mode",
   "geodataLoaderDesc": "Enabling will use the Geo low memory loader",
   "requests": "Requests",
@@ -187,10 +186,11 @@
   "connections": "Connections",
   "connectionsDesc": "View current connection",
   "nullRequestsDesc": "No requests",
-  "nullConnectionsDesc": "No Connections",
-  "intranetIp": "Intranet IP",
+  "nullConnectionsDesc": "No connections",
+  "intranetIP": "Intranet IP",
   "view": "View",
   "cut": "Cut",
   "copy": "Copy",
-  "paste": "Paste"
+  "paste": "Paste",
+  "testUrl": "Test url"
 }

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,20 +161,19 @@
   "checking": "检测中...",
   "country": "区域",
   "checkError": "检测失败",
-  "ipCheckTimeout": "Ip检测超时",
   "search": "搜索",
-  "allowBypass": "允许应用绕过vpn",
+  "allowBypass": "允许应用绕过VPN",
   "allowBypassDesc": "开启后部分应用可绕过VPN",
   "externalController": "外部控制器",
-  "externalControllerDesc": "开启后将可以通过9090端口控制clash内核",
-  "ipv6Desc": "开启后将可以接收ipv6流量",
+  "externalControllerDesc": "开启后将可以通过9090端口控制Clash内核",
+  "ipv6Desc": "开启后将可以接收IPv6流量",
   "app": "应用",
   "general": "基础",
   "systemProxyDesc": "为VpnService附加HTTP代理",
   "unifiedDelay": "统一延迟",
   "unifiedDelayDesc": "去除握手等额外延迟",
   "tcpConcurrent": "TCP并发",
-  "tcpConcurrentDesc": "开启后允许tcp并发",
+  "tcpConcurrentDesc": "开启后允许TCP并发",
   "geodataLoader": "Geo低内存模式",
   "geodataLoaderDesc": "开启将使用Geo低内存加载器",
   "requests": "请求",
@@ -188,9 +187,10 @@
   "connectionsDesc": "查看当前连接",
   "nullRequestsDesc": "暂无请求",
   "nullConnectionsDesc": "暂无连接",
-  "intranetIp": "内网 IP",
+  "intranetIP": "内网 IP",
   "view": "查看",
   "cut": "剪切",
   "copy": "复制",
-  "paste": "粘贴"
+  "paste": "粘贴",
+  "testUrl": "测速链接"
 }

lib/l10n/intl/messages_en.dart

@@ -127,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"),
@@ -152,11 +152,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "infiniteTime":
             MessageLookupByLibrary.simpleMessage("Long term effective"),
         "init": MessageLookupByLibrary.simpleMessage("Init"),
-        "intranetIp": MessageLookupByLibrary.simpleMessage("Intranet IP"),
-        "ipCheckTimeout":
-            MessageLookupByLibrary.simpleMessage("Ip check timeout"),
+        "intranetIP": MessageLookupByLibrary.simpleMessage("Intranet IP"),
         "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"),
@@ -186,7 +184,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "notSelectedTip": MessageLookupByLibrary.simpleMessage(
             "The current proxy group cannot be selected."),
         "nullConnectionsDesc":
-            MessageLookupByLibrary.simpleMessage("No Connections"),
+            MessageLookupByLibrary.simpleMessage("No connections"),
         "nullCoreInfoDesc":
             MessageLookupByLibrary.simpleMessage("Unable to obtain core info"),
         "nullLogsDesc": MessageLookupByLibrary.simpleMessage("No logs"),
@@ -230,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"),
@@ -268,9 +266,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "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(
@@ -279,7 +278,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":

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("局域网代理"),
@@ -104,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("直接上传配置文件"),
@@ -123,9 +123,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
         "infiniteTime": MessageLookupByLibrary.simpleMessage("长期有效"),
         "init": MessageLookupByLibrary.simpleMessage("初始化"),
-        "intranetIp": MessageLookupByLibrary.simpleMessage("内网 IP"),
-        "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
-        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收ipv6流量"),
+        "intranetIP": MessageLookupByLibrary.simpleMessage("内网 IP"),
+        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收IPv6流量"),
         "just": MessageLookupByLibrary.simpleMessage("刚刚"),
         "language": MessageLookupByLibrary.simpleMessage("语言"),
         "light": MessageLookupByLibrary.simpleMessage("浅色"),
@@ -186,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("恢复"),
@@ -217,7 +216,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("设置深色模式，调整色彩"),
@@ -225,7 +225,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("无法更新当前配置文件"),

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: [],
@@ -1930,10 +1920,10 @@ class AppLocalizations {
     );
   }
 
-  /// `No Connections`
+  /// `No connections`
   String get nullConnectionsDesc {
     return Intl.message(
-      'No Connections',
+      'No connections',
       name: 'nullConnectionsDesc',
       desc: '',
       args: [],
@@ -1941,10 +1931,10 @@ class AppLocalizations {
   }
 
   /// `Intranet IP`
-  String get intranetIp {
+  String get intranetIP {
     return Intl.message(
       'Intranet IP',
-      name: 'intranetIp',
+      name: 'intranetIP',
       desc: '',
       args: [],
     );
@@ -1989,6 +1979,16 @@ class AppLocalizations {
       args: [],
     );
   }
+
+  /// `Test url`
+  String get testUrl {
+    return Intl.message(
+      'Test url',
+      name: 'testUrl',
+      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) {
-    proxyManager.setProtect(
-      int.parse(fd),
-    );
-  }));
+  clashMessage.addListener(
+    ClashMessageListenerWithVpn(
+      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,
@@ -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,
-  }) : _onTun = onTun;
+    required Function(Fd fd) 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)
-        ? selectedMap[proxyName]
-        : group.now);
+    return getRealProxyName((selectedMap.containsKey(proxyName)
+            ? selectedMap[proxyName]
+            : group.now)) ??
+        proxyName;
   }
 
   String? get showProxyName {
@@ -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();
@@ -150,6 +159,19 @@ class Config extends ChangeNotifier {
 
   String? get currentGroupName => currentProfile?.currentGroupName;
 
+  Set<String> get currentUnfoldSet => currentProfile?.unfoldSet ?? {};
+
+  updateCurrentUnfoldSet(Set<String> value) {
+    if (!const SetEquality<String>().equals(currentUnfoldSet, value)) {
+      _setProfile(
+        currentProfile!.copyWith(
+          unfoldSet: value,
+        ),
+      );
+      notifyListeners();
+    }
+  }
+
   updateCurrentGroupName(String groupName) {
     if (currentProfile != null &&
         currentProfile!.currentGroupName != groupName) {
@@ -364,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,
@@ -383,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;
@@ -395,6 +459,7 @@ class Config extends ChangeNotifier {
       _isAnimateToPage = config._isAnimateToPage;
       _autoCheckUpdate = config._autoCheckUpdate;
       _dav = config._dav;
+      _testUrl = config.testUrl;
     }
     notifyListeners();
   }

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,
-    @JsonKey(name: "is-compatible") required bool isCompatible,
+    required ConfigExtendedParams params,
   }) = _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/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")
-  bool get isPatch => throw _privateConstructorUsedError;
-  @JsonKey(name: "is-compatible")
-  bool get isCompatible => throw _privateConstructorUsedError;
+  ConfigExtendedParams get params => 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,
-      @JsonKey(name: "is-compatible") bool isCompatible});
+      ConfigExtendedParams params});
+
+  $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? isCompatible = null,
+    Object? params = 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
-          ? _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,
+      params: null == params
+          ? _value.params
+          : params // ignore: cast_nullable_to_non_nullable
+              as ConfigExtendedParams,
     ) 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,
-      @JsonKey(name: "is-compatible") bool isCompatible});
+      ConfigExtendedParams params});
+
+  @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? isCompatible = null,
+    Object? params = 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
-          ? _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,
+      params: null == params
+          ? _value.params
+          : params // ignore: cast_nullable_to_non_nullable
+              as ConfigExtendedParams,
     ));
   }
 }
@@ -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,
-      @JsonKey(name: "is-compatible") required this.isCompatible});
+      required this.params});
 
   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 bool isPatch;
-  @override
-  @JsonKey(name: "is-compatible")
-  final bool isCompatible;
+  final ConfigExtendedParams params;
 
   @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.isCompatible, isCompatible) ||
-                other.isCompatible == isCompatible));
+            (identical(other.params, params) || other.params == params));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode =>
-      Object.hash(runtimeType, profilePath, config, isPatch, isCompatible);
+  int get hashCode => Object.hash(runtimeType, profilePath, config, params);
 
   @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,
-          required final ClashConfig config,
-          @JsonKey(name: "is-patch") required final bool isPatch,
-          @JsonKey(name: "is-compatible") required final bool isCompatible}) =
-      _$UpdateConfigParamsImpl;
+      {@JsonKey(name: "profile-path") final String? profilePath,
+      required final ClashConfig config,
+      required final ConfigExtendedParams params}) = _$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")
-  bool get isPatch;
-  @override
-  @JsonKey(name: "is-compatible")
-  bool get isCompatible;
+  ConfigExtendedParams get params;
   @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,
-      isCompatible: json['is-compatible'] as bool,
+      params:
+          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,
-      'is-compatible': instance.isCompatible,
+      'params': instance.params,
     };
 
 _$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/profile.freezed.dart

@@ -222,6 +222,7 @@ mixin _$Profile {
   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)
@@ -242,7 +243,8 @@ abstract class $ProfileCopyWith<$Res> {
       Duration autoUpdateDuration,
       UserInfo? userInfo,
       bool autoUpdate,
-      Map<String, String> selectedMap});
+      Map<String, String> selectedMap,
+      Set<String> unfoldSet});
 
   $UserInfoCopyWith<$Res>? get userInfo;
 }
@@ -269,6 +271,7 @@ class _$ProfileCopyWithImpl<$Res, $Val extends Profile>
     Object? userInfo = freezed,
     Object? autoUpdate = null,
     Object? selectedMap = null,
+    Object? unfoldSet = null,
   }) {
     return _then(_value.copyWith(
       id: null == id
@@ -307,6 +310,10 @@ class _$ProfileCopyWithImpl<$Res, $Val extends Profile>
           ? _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);
   }
 
@@ -339,7 +346,8 @@ abstract class _$$ProfileImplCopyWith<$Res> implements $ProfileCopyWith<$Res> {
       Duration autoUpdateDuration,
       UserInfo? userInfo,
       bool autoUpdate,
-      Map<String, String> selectedMap});
+      Map<String, String> selectedMap,
+      Set<String> unfoldSet});
 
   @override
   $UserInfoCopyWith<$Res>? get userInfo;
@@ -365,6 +373,7 @@ class __$$ProfileImplCopyWithImpl<$Res>
     Object? userInfo = freezed,
     Object? autoUpdate = null,
     Object? selectedMap = null,
+    Object? unfoldSet = null,
   }) {
     return _then(_$ProfileImpl(
       id: null == id
@@ -403,6 +412,10 @@ class __$$ProfileImplCopyWithImpl<$Res>
           ? _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>,
     ));
   }
 }
@@ -419,8 +432,10 @@ class _$ProfileImpl implements _Profile {
       required this.autoUpdateDuration,
       this.userInfo,
       this.autoUpdate = true,
-      final Map<String, String> selectedMap = const {}})
-      : _selectedMap = selectedMap;
+      final Map<String, String> selectedMap = const {},
+      final Set<String> unfoldSet = const {}})
+      : _selectedMap = selectedMap,
+        _unfoldSet = unfoldSet;
 
   factory _$ProfileImpl.fromJson(Map<String, dynamic> json) =>
       _$$ProfileImplFromJson(json);
@@ -452,9 +467,18 @@ class _$ProfileImpl implements _Profile {
     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)';
+    return 'Profile(id: $id, label: $label, currentGroupName: $currentGroupName, url: $url, lastUpdateDate: $lastUpdateDate, autoUpdateDuration: $autoUpdateDuration, userInfo: $userInfo, autoUpdate: $autoUpdate, selectedMap: $selectedMap, unfoldSet: $unfoldSet)';
   }
 
   @override
@@ -476,7 +500,9 @@ class _$ProfileImpl implements _Profile {
             (identical(other.autoUpdate, autoUpdate) ||
                 other.autoUpdate == autoUpdate) &&
             const DeepCollectionEquality()
-                .equals(other._selectedMap, _selectedMap));
+                .equals(other._selectedMap, _selectedMap) &&
+            const DeepCollectionEquality()
+                .equals(other._unfoldSet, _unfoldSet));
   }
 
   @JsonKey(ignore: true)
@@ -491,7 +517,8 @@ class _$ProfileImpl implements _Profile {
       autoUpdateDuration,
       userInfo,
       autoUpdate,
-      const DeepCollectionEquality().hash(_selectedMap));
+      const DeepCollectionEquality().hash(_selectedMap),
+      const DeepCollectionEquality().hash(_unfoldSet));
 
   @JsonKey(ignore: true)
   @override
@@ -517,7 +544,8 @@ abstract class _Profile implements Profile {
       required final Duration autoUpdateDuration,
       final UserInfo? userInfo,
       final bool autoUpdate,
-      final Map<String, String> selectedMap}) = _$ProfileImpl;
+      final Map<String, String> selectedMap,
+      final Set<String> unfoldSet}) = _$ProfileImpl;
 
   factory _Profile.fromJson(Map<String, dynamic> json) = _$ProfileImpl.fromJson;
 
@@ -540,6 +568,8 @@ abstract class _Profile implements Profile {
   @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

@@ -41,6 +41,10 @@ _$ProfileImpl _$$ProfileImplFromJson(Map<String, dynamic> json) =>
             (k, e) => MapEntry(k, e as String),
           ) ??
           const {},
+      unfoldSet: (json['unfoldSet'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toSet() ??
+          const {},
     );
 
 Map<String, dynamic> _$$ProfileImplToJson(_$ProfileImpl instance) =>
@@ -54,4 +58,5 @@ Map<String, dynamic> _$$ProfileImplToJson(_$ProfileImpl instance) =>
       '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 isStart,
-          required final Map<String, String> selectedMap}) =
-      _$CheckIpSelectorStateImpl;
+      {required final bool isInit,
+      required final bool isStart,
+      required final Map<String, String> selectedMap,
+      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;
-  ViewMode get viewMode => throw _privateConstructorUsedError;
+  List<Proxy> get proxies => throw _privateConstructorUsedError;
+  int get columns => throw _privateConstructorUsedError;
 
   @JsonKey(ignore: true)
-  $ProxiesTabViewSelectorStateCopyWith<ProxiesTabViewSelectorState>
-      get copyWith => throw _privateConstructorUsedError;
+  $ProxyGroupSelectorStateCopyWith<ProxyGroupSelectorState> get copyWith =>
+      throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract class $ProxiesTabViewSelectorStateCopyWith<$Res> {
-  factory $ProxiesTabViewSelectorStateCopyWith(
-          ProxiesTabViewSelectorState value,
-          $Res Function(ProxiesTabViewSelectorState) then) =
-      _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
-          ProxiesTabViewSelectorState>;
+abstract class $ProxyGroupSelectorStateCopyWith<$Res> {
+  factory $ProxyGroupSelectorStateCopyWith(ProxyGroupSelectorState value,
+          $Res Function(ProxyGroupSelectorState) then) =
+      _$ProxyGroupSelectorStateCopyWithImpl<$Res, ProxyGroupSelectorState>;
   @useResult
   $Res call(
       {ProxiesSortType proxiesSortType,
+      ProxyCardType proxyCardType,
       num sortNum,
-      Group group,
-      ViewMode viewMode});
-
-  $GroupCopyWith<$Res> get group;
+      List<Proxy> proxies,
+      int columns});
 }
 
 /// @nodoc
-class _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
-        $Val extends ProxiesTabViewSelectorState>
-    implements $ProxiesTabViewSelectorStateCopyWith<$Res> {
-  _$ProxiesTabViewSelectorStateCopyWithImpl(this._value, this._then);
+class _$ProxyGroupSelectorStateCopyWithImpl<$Res,
+        $Val extends ProxyGroupSelectorState>
+    implements $ProxyGroupSelectorStateCopyWith<$Res> {
+  _$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? viewMode = null,
+    Object? proxies = 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
-          ? _value.group
-          : group // ignore: cast_nullable_to_non_nullable
-              as Group,
-      viewMode: null == viewMode
-          ? _value.viewMode
-          : viewMode // ignore: cast_nullable_to_non_nullable
-              as ViewMode,
+      proxies: null == proxies
+          ? _value.proxies
+          : proxies // ignore: cast_nullable_to_non_nullable
+              as List<Proxy>,
+      columns: null == columns
+          ? _value.columns
+          : columns // ignore: cast_nullable_to_non_nullable
+              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>
-    implements $ProxiesTabViewSelectorStateCopyWith<$Res> {
-  factory _$$ProxiesTabViewSelectorStateImplCopyWith(
-          _$ProxiesTabViewSelectorStateImpl value,
-          $Res Function(_$ProxiesTabViewSelectorStateImpl) then) =
-      __$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>;
+abstract class _$$ProxyGroupSelectorStateImplCopyWith<$Res>
+    implements $ProxyGroupSelectorStateCopyWith<$Res> {
+  factory _$$ProxyGroupSelectorStateImplCopyWith(
+          _$ProxyGroupSelectorStateImpl value,
+          $Res Function(_$ProxyGroupSelectorStateImpl) then) =
+      __$$ProxyGroupSelectorStateImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
       {ProxiesSortType proxiesSortType,
+      ProxyCardType proxyCardType,
       num sortNum,
-      Group group,
-      ViewMode viewMode});
-
-  @override
-  $GroupCopyWith<$Res> get group;
+      List<Proxy> proxies,
+      int columns});
 }
 
 /// @nodoc
-class __$$ProxiesTabViewSelectorStateImplCopyWithImpl<$Res>
-    extends _$ProxiesTabViewSelectorStateCopyWithImpl<$Res,
-        _$ProxiesTabViewSelectorStateImpl>
-    implements _$$ProxiesTabViewSelectorStateImplCopyWith<$Res> {
-  __$$ProxiesTabViewSelectorStateImplCopyWithImpl(
-      _$ProxiesTabViewSelectorStateImpl _value,
-      $Res Function(_$ProxiesTabViewSelectorStateImpl) _then)
+class __$$ProxyGroupSelectorStateImplCopyWithImpl<$Res>
+    extends _$ProxyGroupSelectorStateCopyWithImpl<$Res,
+        _$ProxyGroupSelectorStateImpl>
+    implements _$$ProxyGroupSelectorStateImplCopyWith<$Res> {
+  __$$ProxyGroupSelectorStateImplCopyWithImpl(
+      _$ProxyGroupSelectorStateImpl _value,
+      $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? viewMode = null,
+    Object? proxies = 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
-          ? _value.group
-          : group // ignore: cast_nullable_to_non_nullable
-              as Group,
-      viewMode: null == viewMode
-          ? _value.viewMode
-          : viewMode // ignore: cast_nullable_to_non_nullable
-              as ViewMode,
+      proxies: null == proxies
+          ? _value._proxies
+          : proxies // ignore: cast_nullable_to_non_nullable
+              as List<Proxy>,
+      columns: null == columns
+          ? _value.columns
+          : columns // ignore: cast_nullable_to_non_nullable
+              as int,
     ));
   }
 }
 
 /// @nodoc
 
-class _$ProxiesTabViewSelectorStateImpl
-    implements _ProxiesTabViewSelectorState {
-  const _$ProxiesTabViewSelectorStateImpl(
+class _$ProxyGroupSelectorStateImpl implements _ProxyGroupSelectorState {
+  const _$ProxyGroupSelectorStateImpl(
       {required this.proxiesSortType,
+      required this.proxyCardType,
       required this.sortNum,
-      required this.group,
-      required this.viewMode});
+      required final List<Proxy> proxies,
+      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) &&
-            (identical(other.viewMode, viewMode) ||
-                other.viewMode == viewMode));
+            const DeepCollectionEquality().equals(other._proxies, _proxies) &&
+            (identical(other.columns, columns) || other.columns == columns));
   }
 
   @override
-  int get hashCode =>
-      Object.hash(runtimeType, proxiesSortType, sortNum, group, viewMode);
+  int get hashCode => Object.hash(runtimeType, proxiesSortType, proxyCardType,
+      sortNum, const DeepCollectionEquality().hash(_proxies), columns);
 
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$ProxiesTabViewSelectorStateImplCopyWith<_$ProxiesTabViewSelectorStateImpl>
-      get copyWith => __$$ProxiesTabViewSelectorStateImplCopyWithImpl<
-          _$ProxiesTabViewSelectorStateImpl>(this, _$identity);
+  _$$ProxyGroupSelectorStateImplCopyWith<_$ProxyGroupSelectorStateImpl>
+      get copyWith => __$$ProxyGroupSelectorStateImplCopyWithImpl<
+          _$ProxyGroupSelectorStateImpl>(this, _$identity);
 }
 
-abstract class _ProxiesTabViewSelectorState
-    implements ProxiesTabViewSelectorState {
-  const factory _ProxiesTabViewSelectorState(
+abstract class _ProxyGroupSelectorState implements ProxyGroupSelectorState {
+  const factory _ProxyGroupSelectorState(
       {required final ProxiesSortType proxiesSortType,
+      required final ProxyCardType proxyCardType,
       required final num sortNum,
-      required final Group group,
-      required final ViewMode viewMode}) = _$ProxiesTabViewSelectorStateImpl;
+      required final List<Proxy> proxies,
+      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/profile.dart

@@ -54,6 +54,7 @@ class Profile with _$Profile {
     UserInfo? userInfo,
     @Default(true) bool autoUpdate,
     @Default({}) SelectedMap selectedMap,
+    @Default({}) Set<String> unfoldSet,
   }) = _Profile;
 
   factory Profile.fromJson(Map<String, Object?> json) =>

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 {
-  const factory ProxiesTabViewSelectorState({
+class ProxyGroupSelectorState with _$ProxyGroupSelectorState {
+  const factory ProxyGroupSelectorState({
     required ProxiesSortType proxiesSortType,
+    required ProxyCardType proxyCardType,
     required num sortNum,
-    required Group group,
-    required ViewMode viewMode,
-  }) = _ProxiesTabViewSelectorState;
+    required List<Proxy> proxies,
+    required int columns,
+  }) = _ProxyGroupSelectorState;
 }
 
 @freezed

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(UpdateConfigParams(
-      profilePath: profilePath,
-      config: clashConfig,
-      isPatch: isPatch,
-      isCompatible: config.isCompatible,
-    ));
+    final res = await clashCore.updateConfig(
+      UpdateConfigParams(
+        profilePath: profilePath,
+        config: clashConfig,
+        params: ConfigExtendedParams(
+          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.appState.checkIpNum++;
+    });
   }
 
   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) {
-      return colorScheme.secondaryContainer;
+    switch(type){
+      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: () {
-        if (onPressed != null) {
-          onPressed!();
-        }
-      },
+      onPressed: onPressed,
       child: Builder(
         builder: (_) {
           List<Widget> children = [];

lib/widgets/chip.dart

@@ -17,12 +17,17 @@ class CommonChip extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if(type == ChipType.delete){
+    if (type == ChipType.delete) {
       return Chip(
         avatar: avatar,
+        padding: const EdgeInsets.symmetric(
+          vertical: 0,
+          horizontal: 4,
+        ),
         materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
         onDeleted: onPressed ?? () {},
-        side: BorderSide(color: Theme.of(context).dividerColor.withOpacity(0.2)),
+        side:
+            BorderSide(color: Theme.of(context).dividerColor.withOpacity(0.2)),
         labelStyle: Theme.of(context).textTheme.bodyMedium,
         label: Text(label),
       );
@@ -30,6 +35,10 @@ class CommonChip extends StatelessWidget {
     return ActionChip(
       materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
       avatar: avatar,
+      padding: 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,

lib/widgets/clash_message_container.dart

@@ -51,8 +51,9 @@ class _ClashMessageContainerState extends State<ClashMessageContainer>
   }
 
   @override
-  void onTun(String fd) {
-    proxyManager.setProtect(int.parse(fd));
+  Future<void> onTun(Fd fd) async {
+    await proxyManager.setProtect(fd.value);
+    clashCore.setFdMap(fd.id);
     super.onTun(fd);
   }
 
@@ -75,8 +76,18 @@ class _ClashMessageContainerState extends State<ClashMessageContainer>
   }
 
   @override
-  void onRun(String runTime) async {
-    // proxy?.updateStartTime();
-    super.onRun(runTime);
+  void onLoaded(String groupName) {
+    final appController = globalState.appController;
+    final currentSelectedMap = appController.config.currentSelectedMap;
+    final proxyName = currentSelectedMap[groupName];
+    if (proxyName == null) return;
+    clashCore.changeProxy(
+      ChangeProxyParams(
+        groupName: groupName,
+        proxyName: proxyName,
+      ),
+    );
+    appController.appState.checkIpNum++;
+    super.onLoaded(proxyName);
   }
 }

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,
       ),
     );
   }

pubspec.lock

@@ -1162,7 +1162,7 @@ packages:
     source: hosted
     version: "1.2.2"
   win32:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: win32
       sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4

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.26
+version: 0.8.34+202407041
 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,8 @@ dependencies:
   country_flags: ^2.2.0
   re_editor: ^0.3.0
   re_highlight: ^0.0.3
+  win32: ^5.5.1
+  ffi: ^2.1.2
 dev_dependencies:
   flutter_test:
     sdk: flutter

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;
+}