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

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/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);
@@ -87,18 +86,7 @@ abstract class CoreHandlerInterface with CoreInterface {
     Duration? timeout,
   }) async {
     await connected;
-    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');
-      },
-    );
+    return invoke(method: method, data: data, timeout: timeout);
   }
 
   Future<T?> invoke<T>({

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 {

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.89+2025092601
+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;