Fix some issues

Update core

.github/workflows/build.yaml

@@ -27,9 +27,9 @@ jobs:
           - platform: macos
             os: macos-latest
             arch: arm64
-          #          - platform: windows
-          #            os: windows-11-arm
-          #            arch: arm64
+          - platform: windows
+            os: windows-11-arm
+            arch: arm64
           - platform: linux
             os: ubuntu-24.04-arm
             arch: arm64

.gitignore

@@ -45,19 +45,11 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
-/android/**/.cxx
-/android/**/build
-/android/common/**/.**/
-/android/common/local.*
-/android/core/**/includes/
-/android/core/**/cmake-build-*/
-/android/core/**/jniLibs/
 
 
-#FlClash
+
+#libclash
 /libclash/
-/android/app/src/main/jniLibs/
-/services/helper/target
-/macos/**/Package.resolved
-devtools_options.yaml
 
+#jniLibs
+/android/app/src/main/jniLibs/

CHANGELOG.md

@@ -1,13 +1,3 @@
-## v0.8.89
-
-- Fix some issues
-
-- Optimize Windows service mode
-
-- Update core
-
-- Update changelog
-
 ## v0.8.88
 
 - Add android separates the core process

android/app/src/main/AndroidManifest.xml

@@ -66,7 +66,6 @@
 
         <activity
             android:name=".TempActivity"
-            android:excludeFromRecents="true"
             android:exported="true"
             android:theme="@style/TransparentTheme">
             <intent-filter>

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

@@ -20,9 +20,7 @@ class BroadcastReceiver : BroadcastReceiver() {
 
             BroadcastAction.SERVICE_DESTROYED.action -> {
                 GlobalState.log("Receiver service destroyed")
-                GlobalState.launch {
-                    State.handleStopServiceAction()
-                }
+                State.handleStopServiceAction()
             }
         }
     }

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

@@ -65,30 +65,19 @@ object State {
     }
 
     suspend fun handleStartServiceAction() {
-        runLock.withLock {
-            if (runStateFlow.value != RunState.STOP) {
-                return
-            }
-            tilePlugin?.handleStart()
-            if (flutterEngine != null) {
-                return
-            }
-            startServiceWithEngine()
+        tilePlugin?.handleStart()
+        if (flutterEngine != null) {
+            return
         }
-
+        startServiceWithEngine()
     }
 
-    suspend fun handleStopServiceAction() {
-        runLock.withLock {
-            if (runStateFlow.value != RunState.START) {
-                return
-            }
-            tilePlugin?.handleStop()
-            if (flutterEngine != null || serviceFlutterEngine != null) {
-                return
-            }
-            handleStopService()
+    fun handleStopServiceAction() {
+        tilePlugin?.handleStop()
+        if (flutterEngine != null || serviceFlutterEngine != null) {
+            return
         }
+        handleStopService()
     }
 
     fun handleStartService() {
@@ -101,23 +90,8 @@ object State {
         startService()
     }
 
-    fun handleStopService() {
-        GlobalState.launch {
-            runLock.withLock {
-                if (runStateFlow.value != RunState.START) {
-                    return@launch
-                }
-                runStateFlow.tryEmit(RunState.PENDING)
-                runTime = Service.stopService()
-                runStateFlow.tryEmit(RunState.STOP)
-            }
-            destroyServiceEngine()
-        }
-    }
-
     suspend fun destroyServiceEngine() {
         runLock.withLock {
-            GlobalState.log("Destroy service engine")
             withContext(Dispatchers.Main) {
                 runCatching {
                     serviceFlutterEngine?.destroy()
@@ -127,24 +101,20 @@ object State {
         }
     }
 
-    private fun startServiceWithEngine() {
-        GlobalState.launch {
-            runLock.withLock {
-                if (runStateFlow.value != RunState.STOP) {
-                    return@launch
-                }
-                GlobalState.log("Create service engine")
-                withContext(Dispatchers.Main) {
-                    serviceFlutterEngine?.destroy()
-                    serviceFlutterEngine = FlutterEngine(GlobalState.application)
-                    serviceFlutterEngine?.plugins?.add(ServicePlugin())
-                    serviceFlutterEngine?.plugins?.add(AppPlugin())
-                    serviceFlutterEngine?.plugins?.add(TilePlugin())
-                    val dartEntrypoint = DartExecutor.DartEntrypoint(
-                        FlutterInjector.instance().flutterLoader().findAppBundlePath(), "_service"
-                    )
-                    serviceFlutterEngine?.dartExecutor?.executeDartEntrypoint(dartEntrypoint)
-                }
+    suspend fun startServiceWithEngine() {
+        runLock.withLock {
+            if (serviceFlutterEngine != null || runStateFlow.value == RunState.PENDING || runStateFlow.value == RunState.START) {
+                return
+            }
+            withContext(Dispatchers.Main) {
+                serviceFlutterEngine = FlutterEngine(GlobalState.application)
+                serviceFlutterEngine?.plugins?.add(ServicePlugin())
+                serviceFlutterEngine?.plugins?.add(AppPlugin())
+                serviceFlutterEngine?.plugins?.add(TilePlugin())
+                val dartEntrypoint = DartExecutor.DartEntrypoint(
+                    FlutterInjector.instance().flutterLoader().findAppBundlePath(), "_service"
+                )
+                serviceFlutterEngine?.dartExecutor?.executeDartEntrypoint(dartEntrypoint)
             }
         }
     }
@@ -152,7 +122,7 @@ object State {
     private fun startService() {
         GlobalState.launch {
             runLock.withLock {
-                if (runStateFlow.value != RunState.STOP) {
+                if (runStateFlow.value == RunState.PENDING || runStateFlow.value == RunState.START) {
                     return@launch
                 }
                 runStateFlow.tryEmit(RunState.PENDING)
@@ -171,6 +141,20 @@ object State {
         }
 
     }
+
+    fun handleStopService() {
+        GlobalState.launch {
+            runLock.withLock {
+                if (runStateFlow.value == RunState.PENDING || runStateFlow.value == RunState.STOP) {
+                    return@launch
+                }
+                runStateFlow.tryEmit(RunState.PENDING)
+                runTime = Service.stopService()
+                runStateFlow.tryEmit(RunState.STOP)
+            }
+            destroyServiceEngine()
+        }
+    }
 }
 
 

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

@@ -21,9 +21,7 @@ class TempActivity : Activity(),
             }
 
             QuickAction.STOP.action -> {
-                launch {
-                    State.handleStopServiceAction()
-                }
+                State.handleStopServiceAction()
             }
 
             QuickAction.TOGGLE.action -> {
@@ -32,6 +30,6 @@ class TempActivity : Activity(),
                 }
             }
         }
-        finish()
+        finishAndRemoveTask()
     }
 }

core/go.mod

@@ -1,6 +1,6 @@
 module core
 
-go 1.20
+go 1.25
 
 replace github.com/metacubex/mihomo => ./Clash.Meta
 

core/go.sum

@@ -1,6 +1,7 @@
 github.com/RyuaNerin/go-krypto v1.3.0 h1:smavTzSMAx8iuVlGb4pEwl9MD2qicqMzuXR2QWp2/Pg=
 github.com/RyuaNerin/go-krypto v1.3.0/go.mod h1:9R9TU936laAIqAmjcHo/LsaXYOZlymudOAxjaBf62UM=
 github.com/RyuaNerin/testingutil v0.1.0 h1:IYT6JL57RV3U2ml3dLHZsVtPOP6yNK7WUVdzzlpNrss=
+github.com/RyuaNerin/testingutil v0.1.0/go.mod h1:yTqj6Ta/ycHMPJHRyO12Mz3VrvTloWOsy23WOZH19AA=
 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4q90ylaVAbnYyx0JYqK4YcGok=
 github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344/go.mod h1:9pIqrY6SXNL8vjRQE5Hd/OL5GyK/9MrGUWs87z/eFfk=
 github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
@@ -31,6 +32,7 @@ github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358/go.mod h1:hkIF
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
 github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391/go.mod h1:K2R7GhgxrlJzHw2qiPWsCZXf/kXEJN9PLnQK73Ll0po=
 github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c h1:RUzBDdZ+e/HEe2Nh8lYsduiPAZygUfVXJn0Ncj5sHMg=
+github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c/go.mod h1:ETASDWf/FmEb6Ysrtd1QhjNedUU/ZQxBCRLh60bQ/UI=
 github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 h1:tlDMEdcPRQKBEz5nGDMvswiajqh7k8ogWRlhRwKy5mY=
 github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1/go.mod h1:4RfsapbGx2j/vU5xC/5/9qB3kn9Awp1YDiEnN43QrJ4=
 github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 h1:fuGucgPk5dN6wzfnxl3D0D3rVLw4v2SbBT9jb4VnxzA=
@@ -44,6 +46,7 @@ github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hH
 github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
 github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
+github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
@@ -58,6 +61,7 @@ github.com/gofrs/uuid/v5 v5.3.2 h1:2jfO8j3XgSwlz/wHqemAEugfnTlikAYHhnqQ8Xh4fE0=
 github.com/gofrs/uuid/v5 v5.3.2/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
 github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
@@ -67,6 +71,7 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
+github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7spovjlY=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905 h1:q3OEI9RaN/wwcx+qgGo6ZaoJkCiDYe/gjDLfq7lQQF4=
 github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905/go.mod h1:VvGYjkZoJyKqlmT1yzakUs4mfKMNB0XdODP0+rdml6k=
@@ -152,6 +157,7 @@ github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7/go.mod h1:U
 github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
 github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
 github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
+github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
 github.com/openacid/errors v0.8.1/go.mod h1:GUQEJJOJE3W9skHm8E8Y4phdl2LLEN8iD7c5gcGgdx0=
 github.com/openacid/low v0.1.21 h1:Tr2GNu4N/+rGRYdOsEHOE89cxUIaDViZbVmKz29uKGo=
 github.com/openacid/low v0.1.21/go.mod h1:q+MsKI6Pz2xsCkzV4BLj7NR5M4EX0sGz5AqotpZDVh0=
@@ -192,6 +198,7 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 h1:tHNk7XK9GkmKUR6Gh8gVBKXc2MVSZ4G/NnWLtzw4gNA=
 github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
@@ -206,6 +213,7 @@ github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
 github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae h1:J0GxkO96kL4WF+AIT3M4mfUVinOCPgf2uUWYFUzN0sM=
+github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod h1:gXtu8J62kEgmN++bm9BVICuT/e8yiLI2KFobd/TRFsE=
 gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 h1:UNrDfkQqiEYzdMlNsVvBYOAJWZjdktqFE9tQh5BT2+4=
 gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7/go.mod h1:E+rxHvJG9H6PUdzq9NRG6csuLN3XUx98BfGOVWNYnXs=
 gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec h1:FpfFs4EhNehiVfzQttTuxanPIT43FtkkCFypIod8LHo=
@@ -246,6 +254,7 @@ golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
 golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=

core/hub.go

@@ -33,8 +33,6 @@ var (
 )
 
 func handleInitClash(paramsString string) bool {
-	runLock.Lock()
-	defer runLock.Unlock()
 	var params = InitParams{}
 	err := json.Unmarshal([]byte(paramsString), &params)
 	if err != nil {

core/lib.go

@@ -37,8 +37,6 @@ type TunHandler struct {
 }
 
 func (th *TunHandler) start(fd int, stack, address, dns string) {
-	runLock.Lock()
-	defer runLock.Unlock()
 	_ = th.limit.Acquire(context.TODO(), 4)
 	defer th.limit.Release(4)
 	th.initHook()

lib/common/function.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 
 class Debouncer {
@@ -69,7 +68,7 @@ Future<T> retry<T>({
   required Future<T> Function() task,
   int maxAttempts = 3,
   required bool Function(T res) retryIf,
-  Duration delay = midDuration,
+  Duration delay = Duration.zero,
 }) async {
   int attempts = 0;
   while (attempts < maxAttempts) {
@@ -79,7 +78,7 @@ Future<T> retry<T>({
     }
     attempts++;
   }
-  throw 'retry error';
+  throw 'unknown error';
 }
 
 final debouncer = Debouncer();

lib/common/system.dart

@@ -186,26 +186,26 @@ class Windows {
       logLevel: LogLevel.warning,
     );
 
-    if (result <= 32) {
+    if (result < 42) {
       return false;
     }
     return true;
   }
 
-  // Future<void> _killProcess(int port) async {
-  //   final result = await Process.run('netstat', ['-ano']);
-  //   final lines = result.stdout.toString().trim().split('\n');
-  //   for (final line in lines) {
-  //     if (!line.contains(':$port') || !line.contains('LISTENING')) {
-  //       continue;
-  //     }
-  //     final parts = line.trim().split(RegExp(r'\s+'));
-  //     final pid = int.tryParse(parts.last);
-  //     if (pid != null) {
-  //      await Process.run('taskkill', ['/PID', pid.toString(), '/F']);
-  //     }
-  //   }
-  // }
+  Future<void> _killProcess(int port) async {
+    final result = await Process.run('netstat', ['-ano']);
+    final lines = result.stdout.toString().trim().split('\n');
+    for (final line in lines) {
+      if (!line.contains(':$port') || !line.contains('LISTENING')) {
+        continue;
+      }
+      final parts = line.trim().split(RegExp(r'\s+'));
+      final pid = int.tryParse(parts.last);
+      if (pid != null) {
+        await Process.run('taskkill', ['/PID', pid.toString(), '/F']);
+      }
+    }
+  }
 
   Future<WindowsHelperServiceStatus> checkService() async {
     // final qcResult = await Process.run('sc', ['qc', appHelperService]);
@@ -231,18 +231,16 @@ class Windows {
       return true;
     }
 
+    await _killProcess(helperPort);
+
     final command = [
       '/c',
       if (status == WindowsHelperServiceStatus.presence) ...[
-        'taskkill',
-        '/F',
-        '/IM',
-        '$appHelperService.exe'
-            ' & '
-            'sc',
+        'sc',
         'delete',
         appHelperService,
-        '&',
+        '/force',
+        '&&',
       ],
       'sc',
       'create',
@@ -258,12 +256,8 @@ class Windows {
     final res = runas('cmd.exe', command);
 
     await Future.delayed(Duration(milliseconds: 300));
-    final retryStatus = await retry(
-      task: checkService,
-      retryIf: (status) => status == WindowsHelperServiceStatus.running,
-      delay: commonDuration,
-    );
-    return res && retryStatus == WindowsHelperServiceStatus.running;
+
+    return res;
   }
 
   Future<bool> registerTask(String appName) async {

lib/common/utils.dart

@@ -322,15 +322,12 @@ class Utils {
     return SingleActivator(trigger, control: control, meta: !control);
   }
 
-  FutureOr<T> handleWatch<T>({
-    required Function function,
-    required void Function(T data, int elapsedMilliseconds) onWatch,
-  }) async {
+  FutureOr<T> handleWatch<T>(Function function) async {
     if (kDebugMode) {
       final stopwatch = Stopwatch()..start();
       final res = await function();
       stopwatch.stop();
-      onWatch(res, stopwatch.elapsedMilliseconds);
+      commonPrint.log('耗时：${stopwatch.elapsedMilliseconds} ms');
       return res;
     }
     return await function();

lib/controller.dart

@@ -82,22 +82,8 @@ class AppController {
     }
   }
 
-  Future<void> tryStartCore() async {
-    if (coreController.isCompleted) {
-      return;
-    }
-    globalState.isUserDisconnected = true;
-    await _connectCore();
-    await _initCore();
-    _ref.read(initProvider.notifier).value = true;
-    if (_ref.read(isStartProvider)) {
-      await globalState.handleStart();
-    }
-  }
-
   Future<void> updateStatus(bool isStart) async {
     if (isStart) {
-      await globalState.appController.tryStartCore();
       await globalState.handleStart([updateRunTime, updateTraffic]);
       final currentLastModified = await _ref
           .read(currentProfileProvider)
@@ -480,6 +466,9 @@ class AppController {
     Map<String, dynamic>? data,
     bool handleError = false,
   }) async {
+    if (globalState.isPre) {
+      return;
+    }
     if (data != null) {
       final tagName = data['tag_name'];
       final body = data['body'];
@@ -568,6 +557,7 @@ class AppController {
       if (!globalState.isService) Future.delayed(Duration(milliseconds: 300)),
     ]);
     final String message = result[0];
+    await Future.delayed(commonDuration);
     if (message.isNotEmpty) {
       _ref.read(coreStatusProvider.notifier).value = CoreStatus.disconnected;
       if (context.mounted) {
@@ -972,7 +962,7 @@ class AppController {
       final res = await futureFunction();
       return res;
     } catch (e) {
-      commonPrint.log('$title===> $e', logLevel: LogLevel.warning);
+      commonPrint.log('$futureFunction ===> $e', logLevel: LogLevel.warning);
       if (realSilence) {
         globalState.showNotifier(e.toString());
       } else {

lib/core/controller.dart

@@ -29,8 +29,6 @@ class CoreController {
     return _instance!;
   }
 
-  bool get isCompleted => _interface.completer.isCompleted;
-
   Future<String> preload() {
     return _interface.preload();
   }
@@ -93,17 +91,10 @@ class CoreController {
     return await _interface.updateConfig(updateParams);
   }
 
-  Future<String> setupConfig(
-    ClashConfig clashConfig, {
-    VoidCallback? preloadInvoke,
-  }) async {
+  Future<String> setupConfig(ClashConfig clashConfig) async {
     await globalState.genConfigFile(clashConfig);
     final params = await globalState.getSetupParams();
-    final res = _interface.setupConfig(params);
-    if (preloadInvoke != null) {
-      preloadInvoke();
-    }
-    return res;
+    return await _interface.setupConfig(params);
   }
 
   Future<List<Group>> getProxiesGroups({

lib/core/interface.dart

@@ -5,7 +5,6 @@ import 'dart:isolate';
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
-import 'package:flutter/foundation.dart';
 
 mixin CoreInterface {
   Future<bool> init(InitParams params);
@@ -77,7 +76,7 @@ mixin CoreInterface {
 }
 
 abstract class CoreHandlerInterface with CoreInterface {
-  Completer get completer;
+  Future get connected;
 
   FutureOr<bool> destroy();
 
@@ -86,19 +85,8 @@ abstract class CoreHandlerInterface with CoreInterface {
     dynamic data,
     Duration? timeout,
   }) async {
-    await completer.future;
-    if (kDebugMode) {
-      commonPrint.log('Invoke ${method.name} ${DateTime.now()} $data');
-    }
-
-    return utils.handleWatch(
-      function: () async {
-        return await invoke(method: method, data: data, timeout: timeout);
-      },
-      onWatch: (data, elapsedMilliseconds) {
-        commonPrint.log('Invoke ${method.name} ${elapsedMilliseconds}ms');
-      },
-    );
+    await connected;
+    return invoke(method: method, data: data, timeout: timeout);
   }
 
   Future<T?> invoke<T>({
@@ -157,7 +145,7 @@ abstract class CoreHandlerInterface with CoreInterface {
   @override
   Future<Result> getConfig(String path) async {
     return await _invoke<Result>(method: ActionMethod.getConfig, data: path) ??
-        Result.success({});
+        Result<Map<String, dynamic>>.success({});
   }
 
   @override

lib/core/lib.dart

@@ -62,7 +62,7 @@ class CoreLib extends CoreHandlerInterface {
   }
 
   @override
-  Completer get completer => _connectedCompleter;
+  Future get connected => _connectedCompleter.future;
 }
 
 CoreLib? get coreLib => system.isAndroid ? CoreLib() : null;

lib/core/service.dart

@@ -38,29 +38,23 @@ class CoreService extends CoreHandlerInterface {
     completer?.complete(data);
   }
 
-  Future<void> _initServer() async {
-    final server = await retry(
-      task: () async {
-        try {
-          final address = !system.isWindows
-              ? InternetAddress(unixSocketPath, type: InternetAddressType.unix)
-              : InternetAddress(localhost, type: InternetAddressType.IPv4);
-          await _deleteSocketFile();
-          final server = await ServerSocket.bind(address, 0, shared: true);
-          server.listen((socket) async {
-            await _attachSocket(socket);
-          });
-          return server;
-        } catch (_) {
-          return null;
+  void _initServer() {
+    runZonedGuarded(
+      () async {
+        final address = !system.isWindows
+            ? InternetAddress(unixSocketPath, type: InternetAddressType.unix)
+            : InternetAddress(localhost, type: InternetAddressType.IPv4);
+        await _deleteSocketFile();
+        final server = await ServerSocket.bind(address, 0, shared: true);
+        _serverCompleter.complete(server);
+        await for (final socket in server) {
+          await _attachSocket(socket);
         }
       },
-      retryIf: (server) => server == null,
+      (error, stack) async {
+        commonPrint.log('Service error: $error', logLevel: LogLevel.warning);
+      },
     );
-    if (server == null) {
-      exit(0);
-    }
-    _serverCompleter.complete(server);
   }
 
   Future<void> _attachSocket(Socket socket) async {
@@ -186,7 +180,9 @@ class CoreService extends CoreHandlerInterface {
   }
 
   @override
-  Completer get completer => _socketCompleter;
+  Future get connected {
+    return _socketCompleter.future;
+  }
 }
 
 final coreService = system.isDesktop ? CoreService() : null;

lib/main.dart

@@ -33,18 +33,16 @@ Future<void> _service(List<String> flags) async {
       },
     ),
   );
-  app?.tip(appLocalizations.startVpn);
-  final version = await system.version;
-  await coreController.init(version);
-  final clashConfig = globalState.config.patchClashConfig.copyWith.tun(
-    enable: false,
-  );
-  coreController.setupConfig(
-    clashConfig,
-    preloadInvoke: () {
-      globalState.handleStart();
-    },
-  );
+  Future(() async {
+    app?.tip(appLocalizations.startVpn);
+    final version = await system.version;
+    await coreController.init(version);
+    final clashConfig = globalState.config.patchClashConfig.copyWith.tun(
+      enable: false,
+    );
+    await globalState.handleStart();
+    await coreController.setupConfig(clashConfig);
+  });
 }
 
 @immutable

lib/manager/app_manager.dart

@@ -71,16 +71,16 @@ class _AppStateManagerState extends ConsumerState<AppStateManager>
   @override
   Future<void> didChangeAppLifecycleState(AppLifecycleState state) async {
     commonPrint.log('$state');
-    if (state == AppLifecycleState.resumed) {
+    if (state == AppLifecycleState.paused ||
+        state == AppLifecycleState.inactive) {
+      globalState.appController.savePreferences();
+    } else {
       render?.resume();
     }
-    if (state == AppLifecycleState.resumed) {
+    if (state == AppLifecycleState.inactive) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         detectionState.tryStartCheck();
       });
-      if (system.isAndroid) {
-        globalState.appController.tryStartCore();
-      }
     }
   }
 

lib/manager/core_manager.dart

@@ -93,8 +93,7 @@ class _CoreContainerState extends ConsumerState<CoreManager>
 
   @override
   Future<void> onCrash(String message) async {
-    if (!globalState.isUserDisconnected &&
-        WidgetsBinding.instance.lifecycleState == AppLifecycleState.resumed) {
+    if (!globalState.isUserDisconnected) {
       context.showNotifier(message);
     }
     globalState.isUserDisconnected = false;

lib/manager/tile_manager.dart

@@ -19,7 +19,7 @@ class _TileContainerState extends State<TileManager> with TileListener {
   }
 
   @override
-  Future<void> onStart() async {
+  void onStart() {
     if (globalState.appState.isStart) {
       return;
     }

lib/models/core.dart

@@ -192,7 +192,7 @@ extension ActionResultExt on ActionResult {
     if (code == ResultType.success) {
       return Result.success(data);
     } else {
-      return Result.error('$data');
+      return Result.error(data);
     }
   }
 }

lib/state.dart

@@ -304,13 +304,7 @@ class GlobalState {
 
   Future<void> genConfigFile(ClashConfig pathConfig) async {
     final configFilePath = await appPath.configFilePath;
-    var config = {};
-    try {
-      config = await patchRawConfig(patchConfig: pathConfig);
-    } catch (e) {
-      globalState.showNotifier(e.toString());
-      config = {};
-    }
+    final config = await patchRawConfig(patchConfig: pathConfig);
     final res = await Isolate.run<String>(() async {
       try {
         final res = json.encode(config);

lib/views/dashboard/dashboard.dart

@@ -53,6 +53,7 @@ class _DashboardViewState extends ConsumerState<DashboardView> {
     if (res != true) {
       return;
     }
+    await Future.delayed(commonDuration);
     globalState.appController.restartCore();
   }
 

lib/views/dashboard/widgets/memory_info.dart

@@ -34,11 +34,7 @@ class _MemoryInfoState extends State<MemoryInfo> {
   Future<void> _updateMemory() async {
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       final rss = ProcessInfo.currentRss;
-      if (coreController.isCompleted) {
-        _memoryStateNotifier.value = await coreController.getMemory() + rss;
-      } else {
-        _memoryStateNotifier.value = rss;
-      }
+      _memoryStateNotifier.value = await coreController.getMemory() + rss;
       timer = Timer(Duration(seconds: 2), () async {
         _updateMemory();
       });

lib/views/developer.dart

@@ -40,7 +40,6 @@ class DeveloperView extends ConsumerWidget {
           title: Text(appLocalizations.crashTest),
           minVerticalPadding: 14,
           onTap: () {
-            // coreController.crash();
             if (kDebugMode) {
               coreController.crash();
             }

lib/views/proxies/list.dart

@@ -488,7 +488,7 @@ class _ListHeaderState extends State<ListHeader> {
     return CommonCard(
       enterAnimated: widget.enterAnimated,
       key: widget.key,
-      radius: 18.ap,
+      radius: 16.ap,
       type: CommonCardType.filled,
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),

lib/views/proxies/providers.dart

@@ -147,8 +147,7 @@ class ProviderItem extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           const SizedBox(height: 4),
-          if (provider.updateAt.microsecondsSinceEpoch > 0)
-            Text(_buildProviderDesc()),
+          Text(_buildProviderDesc()),
           const SizedBox(height: 4),
           if (provider.subscriptionInfo != null)
             SubscriptionInfoView(subscriptionInfo: provider.subscriptionInfo),

lib/widgets/card.dart

@@ -79,7 +79,7 @@ class CommonCard extends StatelessWidget {
     this.type = CommonCardType.plain,
     this.onPressed,
     this.selectWidget,
-    this.radius = 14,
+    this.radius = 12,
     required this.child,
     this.padding,
     this.enterAnimated = false,

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.90+2025100601
+version: 0.8.89+2025092402
 environment:
   sdk: '>=3.8.0 <4.0.0'
 

windows/packaging/exe/inno_setup.iss

@@ -15,8 +15,8 @@ SolidCompression=yes
 SetupIconFile={{SETUP_ICON_FILE}}
 WizardStyle=modern
 PrivilegesRequired={{PRIVILEGES_REQUIRED}}
-ArchitecturesAllowed=x64 arm64
-ArchitecturesInstallIn64BitMode=x64 arm64
+ArchitecturesAllowed={{ARCH}}
+ArchitecturesInstallIn64BitMode={{ARCH}}
 
 [Code]
 procedure KillProcesses;