Fix windows tun issues

Optimize android get system dns

Author: chen08209

android/app/src/main/kotlin/com/follow/clash/extensions/Ext.kt

@@ -104,7 +104,7 @@ fun ConnectivityManager.resolveDns(network: Network?): List<String> {
 fun InetAddress.asSocketAddressText(port: Int): String {
     return when (this) {
         is Inet6Address ->
-            "[${numericToTextFormat(this.address)}]:$port"
+            "[${numericToTextFormat(this)}]:$port"
 
         is Inet4Address ->
             "${this.hostAddress}:$port"
@@ -141,7 +141,8 @@ fun Context.getActionPendingIntent(action: String): PendingIntent {
     }
 }
 
-private fun numericToTextFormat(src: ByteArray): String {
+private fun numericToTextFormat(address: Inet6Address): String {
+    val src = address.address
     val sb = StringBuilder(39)
     for (i in 0 until 8) {
         sb.append(
@@ -154,6 +155,10 @@ private fun numericToTextFormat(src: ByteArray): String {
             sb.append(":")
         }
     }
+    if (address.scopeId > 0) {
+        sb.append("%")
+        sb.append(address.scopeId)
+    }
     return sb.toString()
 }
 

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

@@ -100,6 +100,7 @@ data object VpnPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
     }
 
     fun handleStart(options: VpnOptions): Boolean {
+        onUpdateNetwork();
         if (options.enable != this.options?.enable) {
             this.flClashService = null
         }

lib/main.dart

@@ -62,6 +62,7 @@ Future<void> _service(List<String> flags) async {
   vpn?.addListener(
     _VpnListenerWithService(
       onDnsChanged: (String dns) {
+        print("handle dns $dns");
         clashLibHandler.updateDns(dns);
       },
     ),

lib/models/clash_config.dart

@@ -200,6 +200,24 @@ class Tun with _$Tun {
   }
 }
 
+extension TunExt on Tun {
+  Tun getRealTun(RouteMode routeMode) {
+    final mRouteAddress = routeMode == RouteMode.bypassPrivate
+        ? defaultBypassPrivateRouteAddress
+        : routeAddress;
+    return switch (system.isDesktop) {
+      true => copyWith(
+          autoRoute: true,
+          routeAddress: [],
+        ),
+      false => copyWith(
+          autoRoute: mRouteAddress.isEmpty ? true : false,
+          routeAddress: mRouteAddress,
+        ),
+    };
+  }
+}
+
 @freezed
 class FallbackFilter with _$FallbackFilter {
   const factory FallbackFilter({

lib/providers/generated/state.g.dart

@@ -105,10 +105,15 @@ CoreState coreState(Ref ref) {
 
 @riverpod
 UpdateParams updateParams(Ref ref) {
+  final routeMode = ref.watch(
+    networkSettingProvider.select(
+      (state) => state.routeMode,
+    ),
+  );
   return ref.watch(
     patchClashConfigProvider.select(
       (state) => UpdateParams(
-        tun: state.tun,
+        tun: state.tun.getRealTun(routeMode),
         allowLan: state.allowLan,
         findProcessMode: state.findProcessMode,
         mode: state.mode,
@@ -153,9 +158,11 @@ TrayState trayState(Ref ref) {
   final appSetting = ref.watch(
     appSettingProvider,
   );
-  final groups = ref.watch(
-    groupsProvider,
-  );
+  final groups = ref
+      .watch(
+        currentGroupsStateProvider,
+      )
+      .value;
   final brightness = ref.watch(
     appBrightnessProvider,
   );

lib/providers/state.dart

@@ -315,19 +315,9 @@ class GlobalState {
     final profileId = profile.id;
     final configMap = await getProfileConfig(profileId);
     final rawConfig = await handleEvaluate(configMap);
-    final routeAddress =
-        config.networkProps.routeMode == RouteMode.bypassPrivate
-            ? defaultBypassPrivateRouteAddress
-            : patchConfig.tun.routeAddress;
-    final realPatchConfig = !system.isDesktop
-        ? patchConfig.copyWith.tun(
-            autoRoute: routeAddress.isEmpty ? true : false,
-            routeAddress: routeAddress,
-          )
-        : patchConfig.copyWith.tun(
-            autoRoute: true,
-            routeAddress: [],
-          );
+    final realPatchConfig = patchConfig.copyWith(
+      tun: patchConfig.tun.getRealTun(config.networkProps.routeMode),
+    );
     rawConfig["external-controller"] = realPatchConfig.externalController.value;
     rawConfig["external-ui"] = "";
     rawConfig["interface-name"] = "";
@@ -411,21 +401,23 @@ class GlobalState {
     for (final host in realPatchConfig.hosts.entries) {
       rawConfig["hosts"][host.key] = host.value.splitByMultipleSeparators;
     }
+    if (rawConfig["dns"] == null) {
+      rawConfig["dns"] = {};
+    }
+    final isEnableDns = rawConfig["dns"]["enable"] == true;
     final overrideDns = globalState.config.overrideDns;
-    if (overrideDns) {
-      rawConfig["dns"] = realPatchConfig.dns.toJson();
+    if (overrideDns || !isEnableDns) {
+      final dns = switch (!isEnableDns) {
+        true => realPatchConfig.dns.copyWith(
+            nameserver: [...realPatchConfig.dns.nameserver, "system://"]),
+        false => realPatchConfig.dns,
+      };
+      rawConfig["dns"] = dns.toJson();
       rawConfig["dns"]["nameserver-policy"] = {};
-      for (final entry in realPatchConfig.dns.nameserverPolicy.entries) {
+      for (final entry in dns.nameserverPolicy.entries) {
         rawConfig["dns"]["nameserver-policy"][entry.key] =
             entry.value.splitByMultipleSeparators;
       }
-    } else {
-      if (rawConfig["dns"] == null) {
-        rawConfig["dns"] = {};
-      }
-      if (rawConfig["dns"]["enable"] != false) {
-        rawConfig["dns"]["enable"] = true;
-      }
     }
     var rules = [];
     if (rawConfig["rules"] != null) {

lib/state.dart

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