Add ProxyProvider2

.github/workflows/build.yml

@@ -107,7 +107,7 @@ jobs:
           else
             current="${{ github.ref_name }}"
             echo -e "\n\n<details markdown=1><summary>All changes from $current to the latest commit:</summary>\n\n" >> release.md
-            gitchangelog "${prelease}.." >> release.md 2>&1 || echo "Error in gitchangelog"
+            gitchangelog "${prelease}" >> release.md 2>&1 || echo "Error in gitchangelog"
             echo -e "\n\n</details>" >> release.md
           fi
       - name: Release

core/hub.go

@@ -21,7 +21,7 @@ import (
 	"unsafe"
 )
 
-var currentConfig *config.RawConfig
+var currentConfig = config.DefaultRawConfig()
 
 var isInit = false
 
@@ -82,7 +82,7 @@ func updateConfig(s *C.char) bool {
 
 //export getProxies
 func getProxies() *C.char {
-	data, err := json.Marshal(tunnel.Proxies())
+	data, err := json.Marshal(tunnel.ProxiesWithProviders())
 	if err != nil {
 		return C.CString("")
 	}
@@ -98,7 +98,7 @@ func changeProxy(s *C.char) bool {
 		log.Infoln("Unmarshal ChangeProxyParams %v", err)
 		return false
 	}
-	proxies := tunnel.Proxies()
+	proxies := tunnel.ProxiesWithProviders()
 	proxy := proxies[*params.GroupName]
 	if proxy == nil {
 		return false
@@ -148,7 +148,7 @@ func asyncTestDelay(s *C.char) {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(params.Timeout))
 		defer cancel()
 
-		proxies := tunnel.Proxies()
+		proxies := tunnel.ProxiesWithProviders()
 		proxy := proxies[params.ProxyName]
 
 		delayData := &Delay{

lib/clash/core.dart

@@ -69,43 +69,30 @@ class ClashCore {
         1;
   }
 
-  List<Group> getProxiesGroups() {
+  Future<List<Group>> getProxiesGroups() {
     final proxiesRaw = clashFFI.getProxies();
-    final proxies = json.decode(proxiesRaw.cast<Utf8>().toDartString());
-    final groupsRaw = List.from(proxies.values).where((e) {
-      final excludeName = !UsedProxyExtension.valueList
-          .where((element) => element != UsedProxy.GLOBAL.name)
-          .contains(e['name']);
-      final validType = GroupTypeExtension.valueList.contains(e['type']);
-      return excludeName && validType;
-    }).map(
-          (e) {
-        e["all"] = ((e["all"] ?? []) as List)
+    final proxiesRawString = proxiesRaw.cast<Utf8>().toDartString();
+    return Isolate.run<List<Group>>(() {
+      final proxies = json.decode(proxiesRawString);
+      final groupsRaw = (proxies[UsedProxy.GLOBAL.name]["all"] as List)
+          .where((e) {
+        final proxy = proxies[e];
+        final excludeName = !UsedProxyExtension.valueList
+            .where((element) => element != UsedProxy.GLOBAL.name)
+            .contains(proxy['name']);
+        final validType = GroupTypeExtension.valueList.contains(proxy['type']);
+        return excludeName && validType;
+      }).map((groupName) {
+        final group = proxies[groupName];
+        group["all"] = ((group["all"] ?? []) as List)
             .map(
               (name) => proxies[name],
-        )
+            )
             .toList();
-        return e;
-      },
-    ).toList()
-      ..sort(
-            (a, b) {
-          final aIndex = GroupTypeExtension.getGroupType(a['type'])?.index;
-          final bIndex = GroupTypeExtension.getGroupType(b['type'])?.index;
-          if (a == null && b == null) {
-            return 0;
-          }
-          if (a == null) {
-            return 1;
-          }
-          if (b == null) {
-            return -1;
-          }
-          return aIndex! - bIndex!;
-        },
-      );
-    final groups = groupsRaw.map((e) => Group.fromJson(e)).toList();
-    return groups;
+        return group;
+      }).toList();
+      return groupsRaw.map((e) => Group.fromJson(e)).toList();
+    });
   }
 
   bool changeProxy(ChangeProxyParams changeProxyParams) {

lib/controller.dart

@@ -71,28 +71,10 @@ class AppController {
   }
 
   changeProxy() {
-    final currentGroupName =
-        appState.getCurrentGroupName(config.currentGroupName, clashConfig.mode);
-    final currentProxyName =
-        appState.getCurrentProxyName(config.currentProxyName, clashConfig.mode);
-    if (config.profiles.isEmpty || currentProxyName == null) {
-      updateSystemProxy(false);
-      return;
-    }
-    if (currentGroupName == null) return;
-    final groupIndex = appState.groups.indexWhere(
-      (element) => element.name == currentGroupName,
-    );
-    if (groupIndex == -1) return;
-    final proxyIndex = appState.groups[groupIndex].all.indexWhere(
-      (element) => element.name == currentProxyName,
-    );
-    if (proxyIndex == -1) return;
-    clashCore.changeProxy(
-      ChangeProxyParams(
-        groupName: currentGroupName,
-        proxyName: currentProxyName,
-      ),
+    globalState.changeProxy(
+      appState: appState,
+      config: config,
+      clashConfig: clashConfig,
     );
   }
 
@@ -145,7 +127,7 @@ class AppController {
     if (value == config.currentProfileId) return;
     config.currentProfileId = value;
     await updateClashConfig(isPatch: false);
-    updateGroups();
+    await updateGroups();
     changeProxy();
     appState.delayMap = {};
     saveConfigPreferences();
@@ -162,13 +144,13 @@ class AppController {
       if (isNotNeedUpdate == false) continue;
       final result = await profile.update();
       if (result.type == ResultType.error) continue;
-      updateGroups();
+      await updateGroups();
       changeProxy();
     }
   }
 
-  updateGroups() {
-    globalState.updateGroups(appState);
+  Future<void> updateGroups() async {
+    await globalState.updateGroups(appState);
   }
 
   updateSystemColorSchemes(SystemColorSchemes systemColorSchemes) {
@@ -226,7 +208,6 @@ class AppController {
 
   afterInit() async {
     if (appState.isInit) {
-      changeProxy();
       if (config.autoRun) {
         await updateSystemProxy(true);
       } else {

lib/enum/enum.dart

@@ -9,8 +9,7 @@ extension GroupTypeExtension on GroupType {
       )
       .toList();
 
-  static GroupType? getGroupType(String? value) {
-    if (value == null) return null;
+  static GroupType? getGroupType(String value) {
     final index = GroupTypeExtension.valueList.indexOf(value);
     if (index == -1) return null;
     return GroupType.values[index];

lib/fragments/proxies.dart

@@ -1,4 +1,3 @@
-import 'package:collection/collection.dart';
 import 'package:fl_clash/clash/clash.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
@@ -57,26 +56,6 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
     });
   }
 
-  _updateTabController(length) {
-    if (_tabController != null) {
-      _tabController!.dispose();
-      _tabController = null;
-    }
-    _tabController = TabController(
-      length: length,
-      vsync: this,
-    );
-  }
-
-  @override
-  void dispose() {
-    if (_tabController != null) {
-      _tabController!.dispose();
-      _tabController = null;
-    }
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return Selector<AppState, bool>(
@@ -87,14 +66,32 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
         }
         return child!;
       },
-      child: Selector2<AppState, ClashConfig, List<Group>>(
-        selector: (_, appState, clashConfig) =>
-            appState.getCurrentGroups(clashConfig.mode),
-        shouldRebuild: (prev, next) =>
-            !const ListEquality<Group>().equals(prev, next),
-        builder: (_, groups, __) {
+      child: Selector3<AppState, Config, ClashConfig, ProxiesSelectorState>(
+        selector: (_, appState, config, clashConfig) {
+          final currentGroups = appState.getCurrentGroups(clashConfig.mode);
+          final currentProxyName = appState.getCurrentGroupNameWithGroups(
+            currentGroups,
+            config.currentGroupName,
+            clashConfig.mode,
+          );
+          final currentIndex = currentGroups
+              .indexWhere((element) => element.name == currentProxyName);
+          return ProxiesSelectorState(
+            currentIndex: currentIndex != -1 ? currentIndex : 0,
+            groups: currentGroups,
+          );
+        },
+        builder: (_, state, __) {
+          if (_tabController != null) {
+            _tabController!.dispose();
+            _tabController = null;
+          }
+          _tabController = TabController(
+            length: state.groups.length,
+            vsync: this,
+            initialIndex: state.currentIndex,
+          );
           debugPrint("[Proxies] update===>");
-          _updateTabController(groups.length);
           return Column(
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -108,7 +105,7 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
                 overlayColor:
                     const MaterialStatePropertyAll(Colors.transparent),
                 tabs: [
-                  for (final group in groups)
+                  for (final group in state.groups)
                     Tab(
                       text: group.name,
                     ),
@@ -118,7 +115,7 @@ class _ProxiesFragmentState extends State<ProxiesFragment>
                 child: TabBarView(
                   controller: _tabController,
                   children: [
-                    for (final group in groups)
+                    for (final group in state.groups)
                       KeepContainer(
                         child: ProxiesTabView(
                           group: group,

lib/models/app.dart

@@ -165,19 +165,26 @@ class AppState with ChangeNotifier {
     }
   }
 
-  String? getCurrentGroupName(String? groupName, Mode mode) {
-    final currentGroups = getCurrentGroups(mode);
+  String? getCurrentGroupNameWithGroups(
+    List<Group> groups,
+    String? groupName,
+    Mode mode,
+  ) {
     switch (mode) {
       case Mode.direct:
         return null;
       case Mode.global:
         return UsedProxy.GLOBAL.name;
       case Mode.rule:
-        return groupName ??
-            (currentGroups.isNotEmpty ? currentGroups.first.name : null);
+        return groupName ?? (groups.isNotEmpty ? groups.first.name : null);
     }
   }
 
+  String? getCurrentGroupName(String? groupName, Mode mode) {
+    final currentGroups = getCurrentGroups(mode);
+    return getCurrentGroupNameWithGroups(currentGroups, groupName, mode);
+  }
+
   String? getCurrentProxyName(String? proxyName, Mode mode) {
     final currentGroups = getCurrentGroups(mode);
     switch (mode) {

lib/models/generated/selector.freezed.dart

@@ -1740,3 +1740,150 @@ abstract class _HomeNavigationSelectorState
   _$$HomeNavigationSelectorStateImplCopyWith<_$HomeNavigationSelectorStateImpl>
       get copyWith => throw _privateConstructorUsedError;
 }
+
+/// @nodoc
+mixin _$ProxiesSelectorState {
+  int get currentIndex => throw _privateConstructorUsedError;
+  List<Group> get groups => throw _privateConstructorUsedError;
+
+  @JsonKey(ignore: true)
+  $ProxiesSelectorStateCopyWith<ProxiesSelectorState> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $ProxiesSelectorStateCopyWith<$Res> {
+  factory $ProxiesSelectorStateCopyWith(ProxiesSelectorState value,
+          $Res Function(ProxiesSelectorState) then) =
+      _$ProxiesSelectorStateCopyWithImpl<$Res, ProxiesSelectorState>;
+  @useResult
+  $Res call({int currentIndex, List<Group> groups});
+}
+
+/// @nodoc
+class _$ProxiesSelectorStateCopyWithImpl<$Res,
+        $Val extends ProxiesSelectorState>
+    implements $ProxiesSelectorStateCopyWith<$Res> {
+  _$ProxiesSelectorStateCopyWithImpl(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? currentIndex = null,
+    Object? groups = null,
+  }) {
+    return _then(_value.copyWith(
+      currentIndex: null == currentIndex
+          ? _value.currentIndex
+          : currentIndex // ignore: cast_nullable_to_non_nullable
+              as int,
+      groups: null == groups
+          ? _value.groups
+          : groups // ignore: cast_nullable_to_non_nullable
+              as List<Group>,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$ProxiesSelectorStateImplCopyWith<$Res>
+    implements $ProxiesSelectorStateCopyWith<$Res> {
+  factory _$$ProxiesSelectorStateImplCopyWith(_$ProxiesSelectorStateImpl value,
+          $Res Function(_$ProxiesSelectorStateImpl) then) =
+      __$$ProxiesSelectorStateImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({int currentIndex, List<Group> groups});
+}
+
+/// @nodoc
+class __$$ProxiesSelectorStateImplCopyWithImpl<$Res>
+    extends _$ProxiesSelectorStateCopyWithImpl<$Res, _$ProxiesSelectorStateImpl>
+    implements _$$ProxiesSelectorStateImplCopyWith<$Res> {
+  __$$ProxiesSelectorStateImplCopyWithImpl(_$ProxiesSelectorStateImpl _value,
+      $Res Function(_$ProxiesSelectorStateImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? currentIndex = null,
+    Object? groups = null,
+  }) {
+    return _then(_$ProxiesSelectorStateImpl(
+      currentIndex: null == currentIndex
+          ? _value.currentIndex
+          : currentIndex // ignore: cast_nullable_to_non_nullable
+              as int,
+      groups: null == groups
+          ? _value._groups
+          : groups // ignore: cast_nullable_to_non_nullable
+              as List<Group>,
+    ));
+  }
+}
+
+/// @nodoc
+
+class _$ProxiesSelectorStateImpl implements _ProxiesSelectorState {
+  const _$ProxiesSelectorStateImpl(
+      {required this.currentIndex, required final List<Group> groups})
+      : _groups = groups;
+
+  @override
+  final int currentIndex;
+  final List<Group> _groups;
+  @override
+  List<Group> get groups {
+    if (_groups is EqualUnmodifiableListView) return _groups;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_groups);
+  }
+
+  @override
+  String toString() {
+    return 'ProxiesSelectorState(currentIndex: $currentIndex, groups: $groups)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$ProxiesSelectorStateImpl &&
+            (identical(other.currentIndex, currentIndex) ||
+                other.currentIndex == currentIndex) &&
+            const DeepCollectionEquality().equals(other._groups, _groups));
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      runtimeType, currentIndex, const DeepCollectionEquality().hash(_groups));
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$ProxiesSelectorStateImplCopyWith<_$ProxiesSelectorStateImpl>
+      get copyWith =>
+          __$$ProxiesSelectorStateImplCopyWithImpl<_$ProxiesSelectorStateImpl>(
+              this, _$identity);
+}
+
+abstract class _ProxiesSelectorState implements ProxiesSelectorState {
+  const factory _ProxiesSelectorState(
+      {required final int currentIndex,
+      required final List<Group> groups}) = _$ProxiesSelectorStateImpl;
+
+  @override
+  int get currentIndex;
+  @override
+  List<Group> get groups;
+  @override
+  @JsonKey(ignore: true)
+  _$$ProxiesSelectorStateImplCopyWith<_$ProxiesSelectorStateImpl>
+      get copyWith => throw _privateConstructorUsedError;
+}

lib/models/selector.dart

@@ -5,6 +5,7 @@ import 'config.dart';
 import 'navigation.dart';
 import 'package.dart';
 import 'profile.dart';
+import 'proxy.dart';
 
 part 'generated/selector.freezed.dart';
 
@@ -101,3 +102,12 @@ class HomeNavigationSelectorState with _$HomeNavigationSelectorState{
     required String? locale,
   }) = _HomeNavigationSelectorState;
 }
+
+@freezed
+class ProxiesSelectorState with _$ProxiesSelectorState{
+  const factory ProxiesSelectorState({
+    required int currentIndex,
+    required List<Group> groups,
+  }) = _ProxiesSelectorState;
+}
+

lib/state.dart

@@ -5,6 +5,7 @@ import 'dart:io';
 import 'package:animations/animations.dart';
 import 'package:fl_clash/clash/clash.dart';
 import 'package:fl_clash/enum/enum.dart';
+import 'package:fl_clash/models/clash_config.dart';
 import 'package:fl_clash/plugins/app.dart';
 import 'package:fl_clash/widgets/scaffold.dart';
 import 'package:flutter/material.dart';
@@ -107,6 +108,41 @@ class GlobalState {
     );
     updateGroups(appState);
     updateCoreVersionInfo(appState);
+    changeProxy(
+      appState: appState,
+      config: config,
+      clashConfig: clashConfig,
+    );
+  }
+
+  changeProxy({
+    required AppState appState,
+    required Config config,
+    required ClashConfig clashConfig,
+  }) {
+    final currentGroupName =
+        appState.getCurrentGroupName(config.currentGroupName, clashConfig.mode);
+    final currentProxyName =
+        appState.getCurrentProxyName(config.currentProxyName, clashConfig.mode);
+    if (config.profiles.isEmpty || currentProxyName == null) {
+      stopSystemProxy();
+      return;
+    }
+    if (currentGroupName == null) return;
+    final groupIndex = appState.groups.indexWhere(
+      (element) => element.name == currentGroupName,
+    );
+    if (groupIndex == -1) return;
+    final proxyIndex = appState.groups[groupIndex].all.indexWhere(
+      (element) => element.name == currentProxyName,
+    );
+    if (proxyIndex == -1) return;
+    clashCore.changeProxy(
+      ChangeProxyParams(
+        groupName: currentGroupName,
+        proxyName: currentProxyName,
+      ),
+    );
   }
 
   updatePackages(AppState appState) async {
@@ -130,8 +166,8 @@ class GlobalState {
     );
   }
 
-  updateGroups(AppState appState) {
-    appState.groups = clashCore.getProxiesGroups();
+  Future<void> updateGroups(AppState appState) async {
+    appState.groups =  await clashCore.getProxiesGroups();
   }
 
   showMessage({
@@ -198,7 +234,7 @@ class GlobalState {
     required Config config,
   }) {
     final traffic = clashCore.getTraffic();
-    if(appState != null){
+    if (appState != null) {
       appState.addTraffic(traffic);
     }
     if (Platform.isAndroid) {

pubspec.lock

@@ -258,10 +258,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_adaptive_scaffold
-      sha256: "600bbe237530a249f957f7d0f36273c20bd38d137e28e098c5231c30cadbe927"
+      sha256: "9a1d5e9f728815e27b7b612883db19107ba8a35a46a97c757ea00896cb027451"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.10+1"
+    version: "0.1.10+2"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -957,10 +957,10 @@ packages:
     dependency: "direct main"
     description:
       name: win32_registry
-      sha256: "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a"
+      sha256: "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.3"
   window_manager:
     dependency: "direct main"
     description:

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.7.1
+version: 0.7.4
 environment:
   sdk: '>=3.1.0 <4.0.0'