Fix windows tun issues

Optimize android get system dns

Optimize more details

lib/common/request.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
@@ -90,37 +91,37 @@ class Request {
     "https://ipinfo.io/json/": IpInfo.fromIpInfoIoJson,
   };
 
-  Future<IpInfo?> checkIp({CancelToken? cancelToken}) async {
-    for (final source in _ipInfoSources.entries) {
-      try {
-        final response = await Dio()
-            .get<Map<String, dynamic>>(
-              source.key,
-              cancelToken: cancelToken,
-              options: Options(
-                responseType: ResponseType.json,
-              ),
-            )
-            .timeout(
-              Duration(
-                seconds: 30,
-              ),
-            );
-        if (response.statusCode != 200 || response.data == null) {
-          continue;
+  Future<Result<IpInfo?>> checkIp({CancelToken? cancelToken}) async {
+    var failureCount = 0;
+    final futures = _ipInfoSources.entries.map((source) async {
+      final Completer<Result<IpInfo?>> completer = Completer();
+      final future = Dio().get<Map<String, dynamic>>(
+        source.key,
+        cancelToken: cancelToken,
+        options: Options(
+          responseType: ResponseType.json,
+        ),
+      );
+      future.then((res) {
+        if (res.statusCode == HttpStatus.ok && res.data != null) {
+          completer.complete(Result.success(source.value(res.data!)));
+        } else {
+          failureCount++;
+          if (failureCount == _ipInfoSources.length) {
+            completer.complete(Result.success(null));
+          }
         }
-        if (response.data == null) {
-          continue;
+      }).catchError((e) {
+        failureCount++;
+        if (e == DioExceptionType.cancel) {
+          completer.complete(Result.error("cancelled"));
         }
-        return source.value(response.data!);
-      } catch (e) {
-        commonPrint.log("checkIp error ===> $e");
-        if (e is DioException && e.type == DioExceptionType.cancel) {
-          throw "cancelled";
-        }
-      }
-    }
-    return null;
+      });
+      return completer.future;
+    });
+    final res = await Future.any(futures);
+    cancelToken?.cancel();
+    return res;
   }
 
   Future<bool> pingHelper() async {

lib/state.dart

@@ -501,6 +501,9 @@ class DetectionState {
     debouncer.call(
       FunctionTag.checkIp,
       _checkIp,
+      duration: Duration(
+        milliseconds: 1200,
+      ),
     );
   }
 
@@ -525,36 +528,35 @@ class DetectionState {
       cancelToken = null;
     }
     cancelToken = CancelToken();
-    try {
+    state.value = state.value.copyWith(
+      isTesting: true,
+    );
+    final res = await request.checkIp(cancelToken: cancelToken);
+    if (res.isError) {
       state.value = state.value.copyWith(
-        isTesting: true,
+        isLoading: true,
+        ipInfo: null,
       );
-      final ipInfo = await request.checkIp(cancelToken: cancelToken);
-      state.value = state.value.copyWith(
-        isTesting: false,
-      );
-      if (ipInfo != null) {
-        state.value = state.value.copyWith(
-          isLoading: false,
-          ipInfo: ipInfo,
-        );
-        return;
-      }
-      _clearSetTimeoutTimer();
-      _setTimeoutTimer = Timer(const Duration(milliseconds: 300), () {
-        state.value = state.value.copyWith(
-          isLoading: false,
-          ipInfo: null,
-        );
-      });
-    } catch (e) {
-      if (e.toString() == "cancelled") {
-        state.value = state.value.copyWith(
-          isLoading: true,
-          ipInfo: null,
-        );
-      }
+      return;
     }
+    final ipInfo = res.data;
+    state.value = state.value.copyWith(
+      isTesting: false,
+    );
+    if (ipInfo != null) {
+      state.value = state.value.copyWith(
+        isLoading: false,
+        ipInfo: ipInfo,
+      );
+      return;
+    }
+    _clearSetTimeoutTimer();
+    _setTimeoutTimer = Timer(const Duration(milliseconds: 300), () {
+      state.value = state.value.copyWith(
+        isLoading: false,
+        ipInfo: null,
+      );
+    });
   }
 
   _clearSetTimeoutTimer() {

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.86+202506141
+version: 0.8.86+202506142
 environment:
   sdk: '>=3.1.0 <4.0.0'