Fix ipv6 error

Fix android udp direct error
Add ipv6 switch Add access all selected button Remove android low version splash
2024-06-12 19:07:54 +08:00 · 2024-06-12 18:29:58 +08:00 · 2024-06-10 19:11:04 +08:00 · 2024-06-10 19:09:58 +08:00
34 changed files with 545 additions and 128 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,10 +17,16 @@ jobs:
            os: windows-latest
          - platform: linux
            os: ubuntu-latest
-#          - platform: macos
-#            os: macos-13
+          - platform: macos
+            os: macos-13

    steps:
+      - name: Check Matrix
+        run: |
+            echo "Running on ${{ matrix.os }}"
+            echo "Arch: ${{ runner.arch }}"
+            gcc --version
+
      - name: Checkout
        uses: actions/checkout@v4
        with:
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,4 +5,4 @@
 [submodule "plugins/flutter_distributor"]
 	path = plugins/flutter_distributor
 	url = git@github.com:chen08209/flutter_distributor.git
-	branch = main
+	branch = FlClash
--- a/android/app/src/main/kotlin/com/follow/clash/models/AccessControl.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/models/AccessControl.kt
@@ -10,3 +10,8 @@ data class AccessControl(
    val acceptList: List<String>,
    val rejectList: List<String>,
 )
+
+data class Props (
+    val accessControl: AccessControl?,
+    val allowBypass: Boolean?,
+)
--- a/android/app/src/main/kotlin/com/follow/clash/plugins/ProxyPlugin.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/plugins/ProxyPlugin.kt
@@ -17,6 +17,7 @@ import androidx.core.content.ContextCompat
 import com.follow.clash.GlobalState
 import com.follow.clash.RunState
 import com.follow.clash.models.AccessControl
+import com.follow.clash.models.Props
 import com.follow.clash.services.FlClashVpnService
 import com.google.gson.Gson
 import io.flutter.embedding.android.FlutterActivity
@@ -41,7 +42,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
    private var flClashVpnService: FlClashVpnService? = null
    private var isBound = false
    private var port: Int? = null
-    private var accessControl: AccessControl? = null
+    private var props: Props? = null
    private lateinit var title: String
    private lateinit var content: String

@@ -73,8 +74,8 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar
        "StartProxy" -> {
            port = call.argument<Int>("port")
            val args = call.argument<String>("args")
-            accessControl =
-                if (args != null) Gson().fromJson(args, AccessControl::class.java) else null
+            props =
+                if (args != null) Gson().fromJson(args, Props::class.java) else null
            handleStartVpn()
            result.success(true)
        }
@@ -121,7 +122,7 @@ class ProxyPlugin : FlutterPlugin, MethodChannel.MethodCallHandler, ActivityAwar

    private fun startVpn(port: Int) {
        if (GlobalState.runState.value == RunState.START) return;
-        flClashVpnService?.start(port, accessControl)
+        flClashVpnService?.start(port, props)
        GlobalState.runState.value = RunState.START
        GlobalState.runTime = Date()
        startAfter()
--- a/android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt
+++ b/android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt
@@ -17,6 +17,7 @@ import com.follow.clash.MainActivity
 import com.follow.clash.R
 import com.follow.clash.models.AccessControl
 import com.follow.clash.models.AccessControlMode
+import com.follow.clash.models.Props


 class FlClashVpnService : VpnService() {
@@ -51,12 +52,12 @@ class FlClashVpnService : VpnService() {
        return START_STICKY
    }

-    fun start(port: Int, accessControl: AccessControl?) {
+    fun start(port: Int, props: Props?) {
        fd = with(Builder()) {
            addAddress("172.16.0.1", 30)
            setMtu(9000)
            addRoute("0.0.0.0", 0)
-            if (accessControl != null) {
+            props?.accessControl?.let { accessControl ->
                when (accessControl.mode) {
                    AccessControlMode.acceptSelected -> {
                        (accessControl.acceptList + packageName).forEach {
@@ -77,7 +78,9 @@ class FlClashVpnService : VpnService() {
            if (Build.VERSION.SDK_INT >= 29) {
                setMetered(false)
            }
-            allowBypass()
+            if (props?.allowBypass == true) {
+                allowBypass()
+            }
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                setHttpProxy(
                    ProxyInfo.buildDirectProxy(
@@ -144,8 +147,8 @@ class FlClashVpnService : VpnService() {
        val notification =
            notificationBuilder.setContentTitle(title).setContentText(content).build()
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            startForeground(notificationId, notification,  FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
-        }else{
+            startForeground(notificationId, notification, FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+        } else {
            startForeground(notificationId, notification)
        }
    }
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -4,7 +4,6 @@
    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
        <!-- Show a splash screen on the activity. Automatically removed when
             the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
    </style>
    <!-- Theme applied to the Android Window as soon as the process has started.
         This theme determines the color of the Android Window while your
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -4,7 +4,6 @@
    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
        <!-- Show a splash screen on the activity. Automatically removed when
             the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@mipmap/ic_launcher_foreground</item>
    </style>
    <!-- Theme applied to the Android Window as soon as the process has started.
         This theme determines the color of the Android Window while your
--- a/core/Clash.Meta
+++ b/core/Clash.Meta
--- a/core/common.go
+++ b/core/common.go
@@ -321,12 +321,12 @@ func generateProxyGroupAndRule(proxyGroup *[]map[string]any, rule *[]string) {
 }

 func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfig, compatible bool) {
-	targetConfig.ExternalController = ""
+	targetConfig.ExternalController = patchConfig.ExternalController
 	targetConfig.ExternalUI = ""
 	targetConfig.Interface = ""
 	targetConfig.ExternalUIURL = ""
 	targetConfig.GeodataMode = false
-	//targetConfig.IPv6 = patchConfig.IPv6
+	targetConfig.IPv6 = patchConfig.IPv6
 	targetConfig.LogLevel = patchConfig.LogLevel
 	targetConfig.Port = 0
 	targetConfig.SocksPort = 0
--- a/core/go.mod
+++ b/core/go.mod
@@ -1,6 +1,6 @@
 module core

-go 1.20
+go 1.21.0

 replace github.com/metacubex/mihomo => ./Clash.Meta

--- a/lib/application.dart
+++ b/lib/application.dart
@@ -82,7 +82,7 @@ class ApplicationState extends State<Application> {
    super.initState();
    globalState.appController = AppController(context);
    WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
-      globalState.appController.afterInit();
+      await globalState.appController.init();
      globalState.appController.initLink();
      _updateGroups();
    });
--- a/lib/common/constant.dart
+++ b/lib/common/constant.dart
@@ -18,6 +18,7 @@ const configKey = "config";
 const listItemPadding = EdgeInsets.symmetric(horizontal: 16);
 const double dialogCommonWidth = 300;
 const repository = "chen08209/FlClash";
+const defaultExternalController = "127.0.0.1:9090";
 const maxMobileWidth = 600;
 const maxLaptopWidth = 840;
 final filter = ImageFilter.blur(
--- a/lib/common/picker.dart
+++ b/lib/common/picker.dart
@@ -10,8 +10,7 @@ class Picker {
    if (Platform.isAndroid) {
      filePickerResult = await FilePicker.platform.pickFiles(
        withData: true,
-        type: FileType.custom,
-        allowedExtensions: ['txt', 'conf'],
+        allowMultiple: false,
      );
    } else {
      filePickerResult = await FilePicker.platform.pickFiles(
--- a/lib/controller.dart
+++ b/lib/controller.dart
@@ -256,6 +256,29 @@ class AppController {
    }
  }

+  init() async {
+    if (!config.silentLaunch) {
+      window?.show();
+    }
+    final commonScaffoldState = globalState.homeScaffoldKey.currentState;
+    if(commonScaffoldState?.mounted == true){
+      await commonScaffoldState?.loadingRun(() async {
+        await globalState.applyProfile(
+          appState: appState,
+          config: config,
+          clashConfig: clashConfig,
+        );
+      });
+    }else{
+      await globalState.applyProfile(
+        appState: appState,
+        config: config,
+        clashConfig: clashConfig,
+      );
+    }
+    await afterInit();
+  }
+
  afterInit() async {
    if (config.autoRun) {
      await updateSystemProxy(true);
@@ -265,9 +288,6 @@ class AppController {
    }
    autoUpdateProfiles();
    updateLogStatus();
-    if (!config.silentLaunch) {
-      window?.show();
-    }
    autoCheckUpdate();
  }

--- a/lib/fragments/access.dart
+++ b/lib/fragments/access.dart
@@ -105,49 +105,56 @@ class _AccessFragmentState extends State<AccessFragment> {
    );
  }

-  // Widget _buildSelectedAllButton({
-  //   required bool isSelectedAll,
-  //   required List<String> allValueList,
-  // }) {
-  //   return Builder(
-  //     builder: (context) {
-  //       final tooltip = isSelectedAll
-  //           ? appLocalizations.cancelSelectAll
-  //           : appLocalizations.selectAll;
-  //       return IconButton(
-  //         tooltip: tooltip,
-  //         onPressed: () {
-  //           final config = globalState.appController.config;
-  //           final isAccept =
-  //               config.accessControl.mode == AccessControlMode.acceptSelected;
-  //
-  //           if (isSelectedAll) {
-  //             config.accessControl = switch (isAccept) {
-  //               true => config.accessControl.copyWith(
-  //                   acceptList: [],
-  //                 ),
-  //               false => config.accessControl.copyWith(
-  //                   rejectList: [],
-  //                 ),
-  //             };
-  //           } else {
-  //             config.accessControl = switch (isAccept) {
-  //               true => config.accessControl.copyWith(
-  //                   acceptList: allValueList,
-  //                 ),
-  //               false => config.accessControl.copyWith(
-  //                   rejectList: allValueList,
-  //                 ),
-  //             };
-  //           }
-  //         },
-  //         icon: isSelectedAll
-  //             ? const Icon(Icons.deselect)
-  //             : const Icon(Icons.select_all),
-  //       );
-  //     },
-  //   );
-  // }
+  _buildSelectedAllButton({
+    required bool isAccessControl,
+    required bool isSelectedAll,
+    required List<String> allValueList,
+  }) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final tooltip = isSelectedAll
+          ? appLocalizations.cancelSelectAll
+          : appLocalizations.selectAll;
+      final commonScaffoldState =
+          context.findAncestorStateOfType<CommonScaffoldState>();
+      commonScaffoldState?.floatingActionButton = DisabledMask(
+        status: !isAccessControl,
+        child: AbsorbPointer(
+          absorbing: !isAccessControl,
+          child: FloatingActionButton (
+            tooltip: tooltip,
+            onPressed: () {
+              final config = globalState.appController.config;
+              final isAccept =
+                  config.accessControl.mode == AccessControlMode.acceptSelected;
+
+              if (isSelectedAll) {
+                config.accessControl = switch (isAccept) {
+                  true => config.accessControl.copyWith(
+                      acceptList: [],
+                    ),
+                  false => config.accessControl.copyWith(
+                      rejectList: [],
+                    ),
+                };
+              } else {
+                config.accessControl = switch (isAccept) {
+                  true => config.accessControl.copyWith(
+                      acceptList: allValueList,
+                    ),
+                  false => config.accessControl.copyWith(
+                      rejectList: allValueList,
+                    ),
+                };
+              }
+            },
+            child: isSelectedAll
+                ? const Icon(Icons.deselect)
+                : const Icon(Icons.select_all),
+          ),
+        ),
+      );
+    });
+  }

  Widget _buildPackageList() {
    return ValueListenableBuilder(
@@ -199,6 +206,11 @@ class _AccessFragmentState extends State<AccessFragment> {
                accessControlMode == AccessControlMode.acceptSelected
                    ? appLocalizations.accessControlAllowDesc
                    : appLocalizations.accessControlNotAllowDesc;
+            _buildSelectedAllButton(
+              isAccessControl: isAccessControl,
+              isSelectedAll: valueList.length == packageNameList.length,
+              allValueList: packageNameList,
+            );
            return DisabledMask(
              status: !isAccessControl,
              child: Column(
@@ -490,7 +502,8 @@ class AccessControlSearchDelegate extends SearchDelegate {
        final isAccessControl = state.isAccessControl;
        final accessControlMode = accessControl.mode;
        final currentList = accessControl.currentList;
-        final packageNameList = this.packages.map((e) => e.packageName).toList();
+        final packageNameList =
+            this.packages.map((e) => e.packageName).toList();
        final valueList = currentList.intersection(packageNameList);
        return DisabledMask(
          status: !isAccessControl,
@@ -530,12 +543,11 @@ class AccessControlSearchDelegate extends SearchDelegate {

  @override
  Widget buildResults(BuildContext context) {
-    return _packageList(packages);
+    return buildSuggestions(context);
  }

  @override
  Widget buildSuggestions(BuildContext context) {
-    final packages = _results;
-    return _packageList(packages);
+    return _packageList(_results);
  }
 }
--- a/lib/fragments/config.dart
+++ b/lib/fragments/config.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:fl_clash/common/common.dart';
 import 'package:fl_clash/enum/enum.dart';
 import 'package:fl_clash/models/models.dart';
@@ -54,8 +56,8 @@ class _ConfigFragmentState extends State<ConfigFragment> {
            onTab: () {
              _modifyMixedPort(mixedPort);
            },
-            padding: const EdgeInsets.symmetric(horizontal: 16,vertical: 4),
-            leading: const Icon(Icons.adjust),
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+            leading: const Icon(Icons.adjust_outlined),
            title: Text(appLocalizations.proxyPort),
            trailing: FilledButton.tonal(
              onPressed: () {
@@ -68,6 +70,24 @@ class _ConfigFragmentState extends State<ConfigFragment> {
          );
        },
      ),
+      Selector<ClashConfig, bool>(
+        selector: (_, clashConfig) => clashConfig.ipv6,
+        builder: (_, ipv6, __) {
+          return ListItem.switchItem(
+            leading: const Icon(Icons.water_outlined),
+            title: const Text("Ipv6"),
+            subtitle: Text(appLocalizations.ipv6Desc),
+            delegate: SwitchDelegate(
+              value: ipv6,
+              onChanged: (bool value) async {
+                final appController = globalState.appController;
+                appController.clashConfig.ipv6 = value;
+                appController.updateClashConfigDebounce();
+              },
+            ),
+          );
+        },
+      ),
      Selector<ClashConfig, bool>(
        selector: (_, clashConfig) => clashConfig.allowLan,
        builder: (_, allowLan, __) {
@@ -105,11 +125,29 @@ class _ConfigFragmentState extends State<ConfigFragment> {
      //       );
      //     },
      //   ),
+      if (Platform.isAndroid)
+        Selector<Config, bool>(
+          selector: (_, config) => config.allowBypass,
+          builder: (_, allowBypass, __) {
+            return ListItem.switchItem(
+              leading: const Icon(Icons.double_arrow),
+              title: Text(appLocalizations.allowBypass),
+              subtitle: Text(appLocalizations.allowBypassDesc),
+              delegate: SwitchDelegate(
+                value: allowBypass,
+                onChanged: (bool value) async {
+                  final appController = globalState.appController;
+                  appController.config.allowBypass = value;
+                },
+              ),
+            );
+          },
+        ),
      Selector<Config, bool>(
        selector: (_, config) => config.isCompatible,
        builder: (_, isCompatible, __) {
          return ListItem.switchItem(
-            leading: const Icon(Icons.expand),
+            leading: const Icon(Icons.expand_outlined),
            title: Text(appLocalizations.compatible),
            subtitle: Text(appLocalizations.compatibleDesc),
            delegate: SwitchDelegate(
@@ -125,25 +163,39 @@ class _ConfigFragmentState extends State<ConfigFragment> {
          );
        },
      ),
+      // Selector<ClashConfig, bool>(
+      //   selector: (_, clashConfig) => clashConfig.externalController.isNotEmpty,
+      //   builder: (_, hasExternalController, __) {
+      //     return ListItem.switchItem(
+      //       leading: const Icon(Icons.api_outlined),
+      //       title: Text(appLocalizations.externalController),
+      //       subtitle: Text(appLocalizations.externalControllerDesc),
+      //       delegate: SwitchDelegate(
+      //         value: hasExternalController,
+      //         onChanged: (bool value) async {
+      //           final appController = globalState.appController;
+      //           appController.clashConfig.externalController =
+      //               value ? defaultExternalController : '';
+      //           await appController.updateClashConfig(
+      //             isPatch: false,
+      //           );
+      //         },
+      //       ),
+      //     );
+      //   },
+      // ),
      Padding(
        padding: kMaterialListPadding,
        child: Selector<ClashConfig, LogLevel>(
          selector: (_, clashConfig) => clashConfig.logLevel,
          builder: (_, value, __) {
            return ListItem(
-              leading: const Icon(Icons.feedback),
+              leading: const Icon(Icons.info_outline),
              title: Text(appLocalizations.logLevel),
              trailing: SizedBox(
                height: 48,
                child: DropdownMenu<LogLevel>(
                  width: 124,
-                  inputDecorationTheme: const InputDecorationTheme(
-                    filled: true,
-                    contentPadding: EdgeInsets.symmetric(
-                      vertical: 5,
-                      horizontal: 16,
-                    ),
-                  ),
                  initialSelection: value,
                  dropdownMenuEntries: [
                    for (final logLevel in LogLevel.values)
--- a/lib/fragments/dashboard/network_detection.dart
+++ b/lib/fragments/dashboard/network_detection.dart
@@ -25,6 +25,7 @@ class _NetworkDetectionState extends State<NetworkDetection> {
    bool isStart,
  ) async {
    if (!isInit) return;
+    timeoutNotifier.value = false;
    if (_preIsStart == false && _preIsStart == isStart) return;
    if (cancelToken != null) {
      cancelToken!.cancel();
@@ -151,9 +152,10 @@ class _NetworkDetectionState extends State<NetworkDetection> {
                            builder: (_, timeout, __) {
                              if (timeout) {
                                return Text(
-                                  appLocalizations.ipCheckTimeout,
-                                  style: context.textTheme.titleLarge
-                                      ?.toSoftBold(),
+                                  "timeout",
+                                  style: context.textTheme.titleMedium
+                                      ?.copyWith(color: Colors.red)
+                                      .toSoftBold(),
                                  maxLines: 1,
                                  overflow: TextOverflow.ellipsis,
                                );
--- a/lib/fragments/profiles/profiles.dart
+++ b/lib/fragments/profiles/profiles.dart
@@ -62,7 +62,7 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
                },
              );
            },
-            icon: const Icon(Icons.download),
+            icon: const Icon(Icons.sync),
          ),
          const SizedBox(
            width: 8,
--- a/lib/l10n/arb/intl_en.arb
+++ b/lib/l10n/arb/intl_en.arb
@@ -161,5 +161,10 @@
  "country": "Country",
  "checkError": "Check error",
  "ipCheckTimeout": "Ip check timeout",
-  "search": "Search"
+  "search": "Search",
+  "allowBypass": "Allow applications to bypass VPN",
+  "allowBypassDesc": "Enabled to some applications can bypass VPN",
+  "externalController": "ExternalController",
+  "externalControllerDesc": "Enabled to control the clash on port 9090",
+  "ipv6Desc": "Enabled to will allow it to receive ipv6 traffic"
 }
--- a/lib/l10n/arb/intl_zh_CN.arb
+++ b/lib/l10n/arb/intl_zh_CN.arb
@@ -161,5 +161,10 @@
  "country": "区域",
  "checkError": "检测失败",
  "ipCheckTimeout": "Ip检测超时",
-  "search": "搜索"
+  "search": "搜索",
+  "allowBypass": "允许应用绕过vpn",
+  "allowBypassDesc": "开启后部分应用可绕过VPN",
+  "externalController": "外部控制器",
+  "externalControllerDesc": "开启后可通过9090端口控制clash内核",
+  "ipv6Desc": "开启后将可以接收ipv6流量"
 }
--- a/lib/l10n/intl/messages_en.dart
+++ b/lib/l10n/intl/messages_en.dart
@@ -40,6 +40,10 @@ class MessageLookup extends MessageLookupByLibrary {
        "addressTip": MessageLookupByLibrary.simpleMessage(
            "Please enter a valid WebDAV address"),
        "ago": MessageLookupByLibrary.simpleMessage(" Ago"),
+        "allowBypass": MessageLookupByLibrary.simpleMessage(
+            "Allow applications to bypass VPN"),
+        "allowBypassDesc": MessageLookupByLibrary.simpleMessage(
+            "Enabled to some applications can bypass VPN"),
        "allowLan": MessageLookupByLibrary.simpleMessage("AllowLan"),
        "allowLanDesc": MessageLookupByLibrary.simpleMessage(
            "Allow access proxy through the LAN"),
@@ -112,6 +116,10 @@ class MessageLookup extends MessageLookupByLibrary {
        "edit": MessageLookupByLibrary.simpleMessage("Edit"),
        "en": MessageLookupByLibrary.simpleMessage("English"),
        "exit": MessageLookupByLibrary.simpleMessage("Exit"),
+        "externalController":
+            MessageLookupByLibrary.simpleMessage("ExternalController"),
+        "externalControllerDesc": MessageLookupByLibrary.simpleMessage(
+            "Enabled to control the clash on port 9090"),
        "externalResources":
            MessageLookupByLibrary.simpleMessage("External resources"),
        "file": MessageLookupByLibrary.simpleMessage("File"),
@@ -127,6 +135,8 @@ class MessageLookup extends MessageLookupByLibrary {
            MessageLookupByLibrary.simpleMessage("Import from URL"),
        "ipCheckTimeout":
            MessageLookupByLibrary.simpleMessage("Ip check timeout"),
+        "ipv6Desc": MessageLookupByLibrary.simpleMessage(
+            "Enabled to will allow it to receive ipv6 traffic"),
        "just": MessageLookupByLibrary.simpleMessage("Just"),
        "language": MessageLookupByLibrary.simpleMessage("Language"),
        "light": MessageLookupByLibrary.simpleMessage("Light"),
--- a/lib/l10n/intl/messages_zh_CN.dart
+++ b/lib/l10n/intl/messages_zh_CN.dart
@@ -36,6 +36,9 @@ class MessageLookup extends MessageLookupByLibrary {
        "addressHelp": MessageLookupByLibrary.simpleMessage("WebDAV服务器地址"),
        "addressTip": MessageLookupByLibrary.simpleMessage("请输入有效的WebDAV地址"),
        "ago": MessageLookupByLibrary.simpleMessage("前"),
+        "allowBypass": MessageLookupByLibrary.simpleMessage("允许应用绕过vpn"),
+        "allowBypassDesc":
+            MessageLookupByLibrary.simpleMessage("开启后部分应用可绕过VPN"),
        "allowLan": MessageLookupByLibrary.simpleMessage("局域网代理"),
        "allowLanDesc": MessageLookupByLibrary.simpleMessage("允许通过局域网访问代理"),
        "appAccessControl": MessageLookupByLibrary.simpleMessage("应用访问控制"),
@@ -93,6 +96,9 @@ class MessageLookup extends MessageLookupByLibrary {
        "edit": MessageLookupByLibrary.simpleMessage("编辑"),
        "en": MessageLookupByLibrary.simpleMessage("英语"),
        "exit": MessageLookupByLibrary.simpleMessage("退出"),
+        "externalController": MessageLookupByLibrary.simpleMessage("外部控制器"),
+        "externalControllerDesc":
+            MessageLookupByLibrary.simpleMessage("开启后可通过9090端口控制clash内核"),
        "externalResources": MessageLookupByLibrary.simpleMessage("外部资源"),
        "file": MessageLookupByLibrary.simpleMessage("文件"),
        "fileDesc": MessageLookupByLibrary.simpleMessage("直接上传配置文件"),
@@ -103,6 +109,7 @@ class MessageLookup extends MessageLookupByLibrary {
        "hours": MessageLookupByLibrary.simpleMessage("小时"),
        "importFromURL": MessageLookupByLibrary.simpleMessage("从URL导入"),
        "ipCheckTimeout": MessageLookupByLibrary.simpleMessage("Ip检测超时"),
+        "ipv6Desc": MessageLookupByLibrary.simpleMessage("开启后将可以接收ipv6流量"),
        "just": MessageLookupByLibrary.simpleMessage("刚刚"),
        "language": MessageLookupByLibrary.simpleMessage("语言"),
        "light": MessageLookupByLibrary.simpleMessage("浅色"),
--- a/lib/l10n/l10n.dart
+++ b/lib/l10n/l10n.dart
@@ -1679,6 +1679,56 @@ class AppLocalizations {
      args: [],
    );
  }
+
+  /// `Allow applications to bypass VPN`
+  String get allowBypass {
+    return Intl.message(
+      'Allow applications to bypass VPN',
+      name: 'allowBypass',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Enabled to some applications can bypass VPN`
+  String get allowBypassDesc {
+    return Intl.message(
+      'Enabled to some applications can bypass VPN',
+      name: 'allowBypassDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `ExternalController`
+  String get externalController {
+    return Intl.message(
+      'ExternalController',
+      name: 'externalController',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Enabled to control the clash on port 9090`
+  String get externalControllerDesc {
+    return Intl.message(
+      'Enabled to control the clash on port 9090',
+      name: 'externalControllerDesc',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Enabled to will allow it to receive ipv6 traffic`
+  String get ipv6Desc {
+    return Intl.message(
+      'Enabled to will allow it to receive ipv6 traffic',
+      name: 'ipv6Desc',
+      desc: '',
+      args: [],
+    );
+  }
 }

 class AppLocalizationDelegate extends LocalizationsDelegate<AppLocalizations> {
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -22,16 +22,16 @@ Future<void> main() async {
    isCompatible: config.isCompatible,
    selectedMap: config.currentSelectedMap,
  );
+  appState.navigationItems = navigation.getItems(
+    openLogs: config.openLogs,
+    hasProxies: false,
+  );
  await globalState.init(
    appState: appState,
    config: config,
    clashConfig: clashConfig,
  );
-  globalState.updateNavigationItems(
-    appState: appState,
-    config: config,
-    clashConfig: clashConfig,
-  );
+
  runAppWithPreferences(
    const Application(),
    appState: appState,
@@ -61,6 +61,16 @@ Future<void> vpnService() async {
    clashConfig: clashConfig,
  );

+  if (appState.isInit) {
+    await globalState.applyProfile(
+      appState: appState,
+      config: config,
+      clashConfig: clashConfig,
+    );
+  } else {
+    exit(0);
+  }
+
  final appLocalizations = await AppLocalizations.load(
    other.getLocaleForString(config.locale) ??
        WidgetsBinding.instance.platformDispatcher.locale,
--- a/lib/models/clash_config.dart
+++ b/lib/models/clash_config.dart
@@ -108,6 +108,8 @@ class Dns {
 class ClashConfig extends ChangeNotifier {
  int _mixedPort;
  bool _allowLan;
+  bool _ipv6;
+  String _externalController;
  Mode _mode;
  LogLevel _logLevel;
  Tun _tun;
@@ -118,15 +120,19 @@ class ClashConfig extends ChangeNotifier {
    int? mixedPort,
    Mode? mode,
    bool? allowLan,
+    bool? ipv6,
    LogLevel? logLevel,
+    String? externalController,
    Tun? tun,
    Dns? dns,
    List<String>? rules,
  })  : _mixedPort = mixedPort ?? 7890,
        _mode = mode ?? Mode.rule,
+        _ipv6 = ipv6 ?? false,
        _allowLan = allowLan ?? false,
        _logLevel = logLevel ?? LogLevel.info,
        _tun = tun ?? const Tun(),
+        _externalController = externalController ?? '',
        _dns = dns ?? Dns(),
        _rules = rules ?? [];

@@ -169,6 +175,26 @@ class ClashConfig extends ChangeNotifier {
    }
  }

+  @JsonKey(name: "external-controller", defaultValue: '')
+  String get externalController => _externalController;
+
+  set externalController(String value) {
+    if (_externalController != value) {
+      _externalController = value;
+      notifyListeners();
+    }
+  }
+
+  @JsonKey(defaultValue: false)
+  bool get ipv6 => _ipv6;
+
+  set ipv6(bool value) {
+    if (_ipv6 != value) {
+      _ipv6 = value;
+      notifyListeners();
+    }
+  }
+
  Tun get tun => _tun;

  set tun(Tun value) {
--- a/lib/models/config.dart
+++ b/lib/models/config.dart
@@ -24,6 +24,17 @@ class AccessControl with _$AccessControl {
      _$AccessControlFromJson(json);
 }

+@freezed
+class Props with _$Props {
+  const factory Props({
+    AccessControl? accessControl,
+    bool? allowBypass,
+  }) = _Props;
+
+  factory Props.fromJson(Map<String, Object?> json) =>
+      _$PropsFromJson(json);
+}
+
@JsonSerializable()
 class Config extends ChangeNotifier {
  List<Profile> _profiles;
@@ -42,6 +53,7 @@ class Config extends ChangeNotifier {
  AccessControl _accessControl;
  bool _isAnimateToPage;
  bool _autoCheckUpdate;
+  bool _allowBypass;
  DAV? _dav;

  Config()
@@ -58,7 +70,8 @@ class Config extends ChangeNotifier {
        _isAccessControl = false,
        _autoCheckUpdate = true,
        _accessControl = const AccessControl(),
-        _isAnimateToPage = true;
+        _isAnimateToPage = true,
+        _allowBypass = true;

  deleteProfileById(String id) {
    _profiles = profiles.where((element) => element.id != id).toList();
@@ -306,8 +319,22 @@ class Config extends ChangeNotifier {
    }
  }

-  update(
-      [Config? config, RecoveryOption recoveryOptions = RecoveryOption.all]) {
+  @JsonKey(defaultValue: true)
+  bool get allowBypass {
+    return _allowBypass;
+  }
+
+  set allowBypass(bool value) {
+    if (_allowBypass != value) {
+      _allowBypass = value;
+      notifyListeners();
+    }
+  }
+
+  update([
+    Config? config,
+    RecoveryOption recoveryOptions = RecoveryOption.all,
+  ]) {
    if (config != null) {
      _profiles = config._profiles;
      for (final profile in config._profiles) {
@@ -326,6 +353,7 @@ class Config extends ChangeNotifier {
      _openLog = config._openLog;
      _themeMode = config._themeMode;
      _locale = config._locale;
+      _allowBypass = config._allowBypass;
      _primaryColor = config._primaryColor;
      _proxiesSortType = config._proxiesSortType;
      _isMinimizeOnExit = config._isMinimizeOnExit;
--- a/lib/models/generated/clash_config.g.dart
+++ b/lib/models/generated/clash_config.g.dart
@@ -40,6 +40,7 @@ ClashConfig _$ClashConfigFromJson(Map<String, dynamic> json) => ClashConfig(
      mode: $enumDecodeNullable(_$ModeEnumMap, json['mode']),
      allowLan: json['allow-lan'] as bool?,
      logLevel: $enumDecodeNullable(_$LogLevelEnumMap, json['log-level']),
+      externalController: json['external-controller'] as String? ?? '',
      tun: json['tun'] == null
          ? null
          : Tun.fromJson(json['tun'] as Map<String, dynamic>),
@@ -56,6 +57,7 @@ Map<String, dynamic> _$ClashConfigToJson(ClashConfig instance) =>
      'mode': _$ModeEnumMap[instance.mode]!,
      'allow-lan': instance.allowLan,
      'log-level': _$LogLevelEnumMap[instance.logLevel]!,
+      'external-controller': instance.externalController,
      'tun': instance.tun,
      'dns': instance.dns,
      'rules': instance.rules,
--- a/lib/models/generated/config.freezed.dart
+++ b/lib/models/generated/config.freezed.dart
@@ -239,3 +239,172 @@ abstract class _AccessControl implements AccessControl {
  _$$AccessControlImplCopyWith<_$AccessControlImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
+
+Props _$PropsFromJson(Map<String, dynamic> json) {
+  return _Props.fromJson(json);
+}
+
+/// @nodoc
+mixin _$Props {
+  AccessControl? get accessControl => throw _privateConstructorUsedError;
+  bool? get allowBypass => throw _privateConstructorUsedError;
+
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  @JsonKey(ignore: true)
+  $PropsCopyWith<Props> get copyWith => throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $PropsCopyWith<$Res> {
+  factory $PropsCopyWith(Props value, $Res Function(Props) then) =
+      _$PropsCopyWithImpl<$Res, Props>;
+  @useResult
+  $Res call({AccessControl? accessControl, bool? allowBypass});
+
+  $AccessControlCopyWith<$Res>? get accessControl;
+}
+
+/// @nodoc
+class _$PropsCopyWithImpl<$Res, $Val extends Props>
+    implements $PropsCopyWith<$Res> {
+  _$PropsCopyWithImpl(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? accessControl = freezed,
+    Object? allowBypass = freezed,
+  }) {
+    return _then(_value.copyWith(
+      accessControl: freezed == accessControl
+          ? _value.accessControl
+          : accessControl // ignore: cast_nullable_to_non_nullable
+              as AccessControl?,
+      allowBypass: freezed == allowBypass
+          ? _value.allowBypass
+          : allowBypass // ignore: cast_nullable_to_non_nullable
+              as bool?,
+    ) as $Val);
+  }
+
+  @override
+  @pragma('vm:prefer-inline')
+  $AccessControlCopyWith<$Res>? get accessControl {
+    if (_value.accessControl == null) {
+      return null;
+    }
+
+    return $AccessControlCopyWith<$Res>(_value.accessControl!, (value) {
+      return _then(_value.copyWith(accessControl: value) as $Val);
+    });
+  }
+}
+
+/// @nodoc
+abstract class _$$PropsImplCopyWith<$Res> implements $PropsCopyWith<$Res> {
+  factory _$$PropsImplCopyWith(
+          _$PropsImpl value, $Res Function(_$PropsImpl) then) =
+      __$$PropsImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({AccessControl? accessControl, bool? allowBypass});
+
+  @override
+  $AccessControlCopyWith<$Res>? get accessControl;
+}
+
+/// @nodoc
+class __$$PropsImplCopyWithImpl<$Res>
+    extends _$PropsCopyWithImpl<$Res, _$PropsImpl>
+    implements _$$PropsImplCopyWith<$Res> {
+  __$$PropsImplCopyWithImpl(
+      _$PropsImpl _value, $Res Function(_$PropsImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? accessControl = freezed,
+    Object? allowBypass = freezed,
+  }) {
+    return _then(_$PropsImpl(
+      accessControl: freezed == accessControl
+          ? _value.accessControl
+          : accessControl // ignore: cast_nullable_to_non_nullable
+              as AccessControl?,
+      allowBypass: freezed == allowBypass
+          ? _value.allowBypass
+          : allowBypass // ignore: cast_nullable_to_non_nullable
+              as bool?,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$PropsImpl implements _Props {
+  const _$PropsImpl({this.accessControl, this.allowBypass});
+
+  factory _$PropsImpl.fromJson(Map<String, dynamic> json) =>
+      _$$PropsImplFromJson(json);
+
+  @override
+  final AccessControl? accessControl;
+  @override
+  final bool? allowBypass;
+
+  @override
+  String toString() {
+    return 'Props(accessControl: $accessControl, allowBypass: $allowBypass)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$PropsImpl &&
+            (identical(other.accessControl, accessControl) ||
+                other.accessControl == accessControl) &&
+            (identical(other.allowBypass, allowBypass) ||
+                other.allowBypass == allowBypass));
+  }
+
+  @JsonKey(ignore: true)
+  @override
+  int get hashCode => Object.hash(runtimeType, accessControl, allowBypass);
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$PropsImplCopyWith<_$PropsImpl> get copyWith =>
+      __$$PropsImplCopyWithImpl<_$PropsImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$PropsImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _Props implements Props {
+  const factory _Props(
+      {final AccessControl? accessControl,
+      final bool? allowBypass}) = _$PropsImpl;
+
+  factory _Props.fromJson(Map<String, dynamic> json) = _$PropsImpl.fromJson;
+
+  @override
+  AccessControl? get accessControl;
+  @override
+  bool? get allowBypass;
+  @override
+  @JsonKey(ignore: true)
+  _$$PropsImplCopyWith<_$PropsImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
--- a/lib/models/generated/config.g.dart
+++ b/lib/models/generated/config.g.dart
@@ -32,7 +32,8 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
      : DAV.fromJson(json['dav'] as Map<String, dynamic>)
  ..isAnimateToPage = json['isAnimateToPage'] as bool? ?? true
  ..isCompatible = json['isCompatible'] as bool? ?? true
-  ..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true;
+  ..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true
+  ..allowBypass = json['allowBypass'] as bool? ?? true;

 Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
      'profiles': instance.profiles,
@@ -52,6 +53,7 @@ Map<String, dynamic> _$ConfigToJson(Config instance) => <String, dynamic>{
      'isAnimateToPage': instance.isAnimateToPage,
      'isCompatible': instance.isCompatible,
      'autoCheckUpdate': instance.autoCheckUpdate,
+      'allowBypass': instance.allowBypass,
    };

 const _$ThemeModeEnumMap = {
@@ -93,3 +95,17 @@ const _$AccessControlModeEnumMap = {
  AccessControlMode.acceptSelected: 'acceptSelected',
  AccessControlMode.rejectSelected: 'rejectSelected',
 };
+
+_$PropsImpl _$$PropsImplFromJson(Map<String, dynamic> json) => _$PropsImpl(
+      accessControl: json['accessControl'] == null
+          ? null
+          : AccessControl.fromJson(
+              json['accessControl'] as Map<String, dynamic>),
+      allowBypass: json['allowBypass'] as bool?,
+    );
+
+Map<String, dynamic> _$$PropsImplToJson(_$PropsImpl instance) =>
+    <String, dynamic>{
+      'accessControl': instance.accessControl,
+      'allowBypass': instance.allowBypass,
+    };
--- a/lib/pages/scan.dart
+++ b/lib/pages/scan.dart
@@ -107,6 +107,9 @@ class _ScanPageState extends State<ScanPage> with WidgetsBindingObserver {
                    case TorchState.unavailable:
                      icon = const Icon(Icons.flash_off);
                      backgroundColor = Colors.transparent;
+                    case TorchState.auto:
+                      icon = const Icon(Icons.flash_auto);
+                      backgroundColor = Colors.orange;
                  }
                  return Container(
                    margin: const EdgeInsets.symmetric(horizontal: 8),
--- a/lib/state.dart
+++ b/lib/state.dart
@@ -61,8 +61,14 @@ class GlobalState {
    required Config config,
    required ClashConfig clashConfig,
  }) async {
-    final args =
-        config.isAccessControl ? json.encode(config.accessControl) : null;
+    final args = config.isAccessControl
+        ? json.encode(
+            Props(
+              accessControl: config.accessControl,
+              allowBypass: config.allowBypass,
+            ),
+          )
+        : null;
    await proxyManager.startProxy(
      port: clashConfig.mixedPort,
      args: args,
@@ -105,12 +111,6 @@ class GlobalState {
        clashConfig: clashConfig,
      );
    }
-    if (!appState.isInit) return;
-    await applyProfile(
-      appState: appState,
-      config: config,
-      clashConfig: clashConfig,
-    );
    updateCoreVersionInfo(appState);
  }

@@ -133,19 +133,6 @@ class GlobalState {
    });
  }

-  updateNavigationItems({
-    required AppState appState,
-    required Config config,
-    required ClashConfig clashConfig,
-  }) {
-    final group = appState.currentGroups;
-    final hasProfile = config.profiles.isNotEmpty;
-    appState.navigationItems = navigation.getItems(
-      openLogs: config.openLogs,
-      hasProxies: group.isNotEmpty && hasProfile,
-    );
-  }
-
  Future<void> updateGroups(AppState appState) async {
    appState.groups = await clashCore.getProxiesGroups();
  }
--- a/plugins/flutter_distributor
+++ b/plugins/flutter_distributor
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -277,10 +277,10 @@ packages:
    dependency: "direct main"
    description:
      name: file_picker
-      sha256: "29c90806ac5f5fb896547720b73b17ee9aed9bba540dc5d91fe29f8c5745b10a"
+      sha256: "2ca051989f69d1b2ca012b2cf3ccf78c70d40144f0861ff2c063493f7c8c3d45"
      url: "https://pub.dev"
    source: hosted
-    version: "8.0.3"
+    version: "8.0.5"
  file_selector_linux:
    dependency: transitive
    description:
@@ -649,10 +649,10 @@ packages:
    dependency: "direct main"
    description:
      name: mobile_scanner
-      sha256: f34c83198d9381f6c100dfaec647c275630840cbcda5d6c5eb6ba264beb96be4
+      sha256: b8c0e9afcfd52534f85ec666f3d52156f560b5e6c25b1e3d4fe2087763607926
      url: "https://pub.dev"
    source: hosted
-    version: "5.0.1"
+    version: "5.1.1"
  nested:
    dependency: transitive
    description:
@@ -753,10 +753,10 @@ packages:
    dependency: transitive
    description:
      name: platform
-      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.4"
+    version: "3.1.5"
  plugin_platform_interface:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/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.18
+version: 0.8.20
 environment:
  sdk: '>=3.1.0 <4.0.0'

@@ -17,14 +17,14 @@ dependencies:
  provider: ^6.0.5
  window_manager: ^0.3.8
  ffi: ^2.1.0
-  dynamic_color: ^1.7.0
+  dynamic_color: ^1.6.0
  proxy:
    path: plugins/proxy
  launch_at_startup: ^0.2.2
  windows_single_instance: ^1.0.1
  json_annotation: ^4.9.0
  file_picker: ^8.0.3
-  mobile_scanner: 5.0.1
+  mobile_scanner: ^5.1.1
  app_links: ^3.5.0
  win32_registry: ^1.1.2
  tray_manager: ^0.2.1
Author	SHA1	Message	Date
chen08209	86572cc960	Fix ipv6 error	2024-06-12 19:07:54 +08:00
chen08209	ee22709d49	Fix android udp direct error Add ipv6 switch Add access all selected button Remove android low version splash	2024-06-12 18:29:58 +08:00
chen08209	0a2ad63f38	Update version	2024-06-10 19:11:04 +08:00
chen08209	2ec12c9363	Add allowBypass Fix Android only pick .text file issues	2024-06-10 19:09:58 +08:00