Add tcp concurrent switch

Add system proxy switch Add geodata loader switch Add external controller switch Add auto gc on trim memory Fix android notification error
2024-06-12 19:28:58 +08:00
parent 86572cc960
commit 35f7279fcb
27 changed files with 536 additions and 152 deletions
--- a/lib/models/clash_config.dart
+++ b/lib/models/clash_config.dart
@@ -109,9 +109,12 @@ class ClashConfig extends ChangeNotifier {
  int _mixedPort;
  bool _allowLan;
  bool _ipv6;
+  String _geodataLoader;
+  LogLevel _logLevel;
  String _externalController;
  Mode _mode;
-  LogLevel _logLevel;
+  bool _unifiedDelay;
+  bool _tcpConcurrent;
  Tun _tun;
  Dns _dns;
  List<String> _rules;
@@ -123,15 +126,21 @@ class ClashConfig extends ChangeNotifier {
    bool? ipv6,
    LogLevel? logLevel,
    String? externalController,
+    String? geodataLoader,
+    bool? unifiedDelay,
    Tun? tun,
    Dns? dns,
+    bool? tcpConcurrent,
    List<String>? rules,
  })  : _mixedPort = mixedPort ?? 7890,
        _mode = mode ?? Mode.rule,
        _ipv6 = ipv6 ?? false,
        _allowLan = allowLan ?? false,
+        _tcpConcurrent = tcpConcurrent ?? false,
        _logLevel = logLevel ?? LogLevel.info,
        _tun = tun ?? const Tun(),
+        _unifiedDelay = unifiedDelay ?? false,
+        _geodataLoader = geodataLoader ?? geodataLoaderMemconservative,
        _externalController = externalController ?? '',
        _dns = dns ?? Dns(),
        _rules = rules ?? [];
@@ -195,6 +204,36 @@ class ClashConfig extends ChangeNotifier {
    }
  }

+  @JsonKey(name: "geodata-loader", defaultValue: geodataLoaderMemconservative)
+  String get geodataLoader => _geodataLoader;
+
+  set geodataLoader(String value) {
+    if (_geodataLoader != value) {
+      _geodataLoader = value;
+      notifyListeners();
+    }
+  }
+
+  @JsonKey(name: "unified-delay", defaultValue: false)
+  bool get unifiedDelay => _unifiedDelay;
+
+  set unifiedDelay(bool value) {
+    if (_unifiedDelay != value) {
+      _unifiedDelay = value;
+      notifyListeners();
+    }
+  }
+
+  @JsonKey(name: "tcp-concurrent", defaultValue: false)
+  bool get tcpConcurrent => _tcpConcurrent;
+
+  set tcpConcurrent(bool value) {
+    if (_tcpConcurrent != value) {
+      _tcpConcurrent = value;
+      notifyListeners();
+    }
+  }
+
  Tun get tun => _tun;

  set tun(Tun value) {
--- a/lib/models/config.dart
+++ b/lib/models/config.dart
@@ -29,6 +29,7 @@ class Props with _$Props {
  const factory Props({
    AccessControl? accessControl,
    bool? allowBypass,
+    bool? systemProxy,
  }) = _Props;

  factory Props.fromJson(Map<String, Object?> json) =>
@@ -54,6 +55,7 @@ class Config extends ChangeNotifier {
  bool _isAnimateToPage;
  bool _autoCheckUpdate;
  bool _allowBypass;
+  bool _systemProxy;
  DAV? _dav;

  Config()
@@ -69,6 +71,7 @@ class Config extends ChangeNotifier {
        _isMinimizeOnExit = true,
        _isAccessControl = false,
        _autoCheckUpdate = true,
+        _systemProxy = false,
        _accessControl = const AccessControl(),
        _isAnimateToPage = true,
        _allowBypass = true;
@@ -331,6 +334,18 @@ class Config extends ChangeNotifier {
    }
  }

+  @JsonKey(defaultValue: true)
+  bool get systemProxy {
+    return _systemProxy;
+  }
+
+  set systemProxy(bool value) {
+    if (_systemProxy != value) {
+      _systemProxy = value;
+      notifyListeners();
+    }
+  }
+
  update([
    Config? config,
    RecoveryOption recoveryOptions = RecoveryOption.all,
--- a/lib/models/generated/clash_config.g.dart
+++ b/lib/models/generated/clash_config.g.dart
@@ -39,14 +39,18 @@ ClashConfig _$ClashConfigFromJson(Map<String, dynamic> json) => ClashConfig(
      mixedPort: (json['mixed-port'] as num?)?.toInt(),
      mode: $enumDecodeNullable(_$ModeEnumMap, json['mode']),
      allowLan: json['allow-lan'] as bool?,
+      ipv6: json['ipv6'] as bool? ?? false,
      logLevel: $enumDecodeNullable(_$LogLevelEnumMap, json['log-level']),
      externalController: json['external-controller'] as String? ?? '',
+      geodataLoader: json['geodata-loader'] as String? ?? 'memconservative',
+      unifiedDelay: json['unified-delay'] as bool? ?? false,
      tun: json['tun'] == null
          ? null
          : Tun.fromJson(json['tun'] as Map<String, dynamic>),
      dns: json['dns'] == null
          ? null
          : Dns.fromJson(json['dns'] as Map<String, dynamic>),
+      tcpConcurrent: json['tcp-concurrent'] as bool? ?? false,
      rules:
          (json['rules'] as List<dynamic>?)?.map((e) => e as String).toList(),
    );
@@ -58,6 +62,10 @@ Map<String, dynamic> _$ClashConfigToJson(ClashConfig instance) =>
      'allow-lan': instance.allowLan,
      'log-level': _$LogLevelEnumMap[instance.logLevel]!,
      'external-controller': instance.externalController,
+      'ipv6': instance.ipv6,
+      'geodata-loader': instance.geodataLoader,
+      'unified-delay': instance.unifiedDelay,
+      'tcp-concurrent': instance.tcpConcurrent,
      'tun': instance.tun,
      'dns': instance.dns,
      'rules': instance.rules,
--- a/lib/models/generated/config.freezed.dart
+++ b/lib/models/generated/config.freezed.dart
@@ -248,6 +248,7 @@ Props _$PropsFromJson(Map<String, dynamic> json) {
 mixin _$Props {
  AccessControl? get accessControl => throw _privateConstructorUsedError;
  bool? get allowBypass => throw _privateConstructorUsedError;
+  bool? get systemProxy => throw _privateConstructorUsedError;

  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
  @JsonKey(ignore: true)
@@ -259,7 +260,8 @@ abstract class $PropsCopyWith<$Res> {
  factory $PropsCopyWith(Props value, $Res Function(Props) then) =
      _$PropsCopyWithImpl<$Res, Props>;
  @useResult
-  $Res call({AccessControl? accessControl, bool? allowBypass});
+  $Res call(
+      {AccessControl? accessControl, bool? allowBypass, bool? systemProxy});

  $AccessControlCopyWith<$Res>? get accessControl;
 }
@@ -279,6 +281,7 @@ class _$PropsCopyWithImpl<$Res, $Val extends Props>
  $Res call({
    Object? accessControl = freezed,
    Object? allowBypass = freezed,
+    Object? systemProxy = freezed,
  }) {
    return _then(_value.copyWith(
      accessControl: freezed == accessControl
@@ -289,6 +292,10 @@ class _$PropsCopyWithImpl<$Res, $Val extends Props>
          ? _value.allowBypass
          : allowBypass // ignore: cast_nullable_to_non_nullable
              as bool?,
+      systemProxy: freezed == systemProxy
+          ? _value.systemProxy
+          : systemProxy // ignore: cast_nullable_to_non_nullable
+              as bool?,
    ) as $Val);
  }

@@ -312,7 +319,8 @@ abstract class _$$PropsImplCopyWith<$Res> implements $PropsCopyWith<$Res> {
      __$$PropsImplCopyWithImpl<$Res>;
  @override
  @useResult
-  $Res call({AccessControl? accessControl, bool? allowBypass});
+  $Res call(
+      {AccessControl? accessControl, bool? allowBypass, bool? systemProxy});

  @override
  $AccessControlCopyWith<$Res>? get accessControl;
@@ -331,6 +339,7 @@ class __$$PropsImplCopyWithImpl<$Res>
  $Res call({
    Object? accessControl = freezed,
    Object? allowBypass = freezed,
+    Object? systemProxy = freezed,
  }) {
    return _then(_$PropsImpl(
      accessControl: freezed == accessControl
@@ -341,6 +350,10 @@ class __$$PropsImplCopyWithImpl<$Res>
          ? _value.allowBypass
          : allowBypass // ignore: cast_nullable_to_non_nullable
              as bool?,
+      systemProxy: freezed == systemProxy
+          ? _value.systemProxy
+          : systemProxy // ignore: cast_nullable_to_non_nullable
+              as bool?,
    ));
  }
 }
@@ -348,7 +361,7 @@ class __$$PropsImplCopyWithImpl<$Res>
 /// @nodoc
@JsonSerializable()
 class _$PropsImpl implements _Props {
-  const _$PropsImpl({this.accessControl, this.allowBypass});
+  const _$PropsImpl({this.accessControl, this.allowBypass, this.systemProxy});

  factory _$PropsImpl.fromJson(Map<String, dynamic> json) =>
      _$$PropsImplFromJson(json);
@@ -357,10 +370,12 @@ class _$PropsImpl implements _Props {
  final AccessControl? accessControl;
  @override
  final bool? allowBypass;
+  @override
+  final bool? systemProxy;

  @override
  String toString() {
-    return 'Props(accessControl: $accessControl, allowBypass: $allowBypass)';
+    return 'Props(accessControl: $accessControl, allowBypass: $allowBypass, systemProxy: $systemProxy)';
  }

  @override
@@ -371,12 +386,15 @@ class _$PropsImpl implements _Props {
            (identical(other.accessControl, accessControl) ||
                other.accessControl == accessControl) &&
            (identical(other.allowBypass, allowBypass) ||
-                other.allowBypass == allowBypass));
+                other.allowBypass == allowBypass) &&
+            (identical(other.systemProxy, systemProxy) ||
+                other.systemProxy == systemProxy));
  }

  @JsonKey(ignore: true)
  @override
-  int get hashCode => Object.hash(runtimeType, accessControl, allowBypass);
+  int get hashCode =>
+      Object.hash(runtimeType, accessControl, allowBypass, systemProxy);

  @JsonKey(ignore: true)
  @override
@@ -395,7 +413,8 @@ class _$PropsImpl implements _Props {
 abstract class _Props implements Props {
  const factory _Props(
      {final AccessControl? accessControl,
-      final bool? allowBypass}) = _$PropsImpl;
+      final bool? allowBypass,
+      final bool? systemProxy}) = _$PropsImpl;

  factory _Props.fromJson(Map<String, dynamic> json) = _$PropsImpl.fromJson;

@@ -404,6 +423,8 @@ abstract class _Props implements Props {
  @override
  bool? get allowBypass;
  @override
+  bool? get systemProxy;
+  @override
  @JsonKey(ignore: true)
  _$$PropsImplCopyWith<_$PropsImpl> get copyWith =>
      throw _privateConstructorUsedError;
--- a/lib/models/generated/config.g.dart
+++ b/lib/models/generated/config.g.dart
@@ -33,7 +33,8 @@ Config _$ConfigFromJson(Map<String, dynamic> json) => Config()
  ..isAnimateToPage = json['isAnimateToPage'] as bool? ?? true
  ..isCompatible = json['isCompatible'] as bool? ?? true
  ..autoCheckUpdate = json['autoCheckUpdate'] as bool? ?? true
-  ..allowBypass = json['allowBypass'] as bool? ?? true;
+  ..allowBypass = json['allowBypass'] as bool? ?? true
+  ..systemProxy = json['systemProxy'] as bool? ?? true;

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

 const _$ThemeModeEnumMap = {
@@ -102,10 +104,12 @@ _$PropsImpl _$$PropsImplFromJson(Map<String, dynamic> json) => _$PropsImpl(
          : AccessControl.fromJson(
              json['accessControl'] as Map<String, dynamic>),
      allowBypass: json['allowBypass'] as bool?,
+      systemProxy: json['systemProxy'] as bool?,
    );

 Map<String, dynamic> _$$PropsImplToJson(_$PropsImpl instance) =>
    <String, dynamic>{
      'accessControl': instance.accessControl,
      'allowBypass': instance.allowBypass,
+      'systemProxy': instance.systemProxy,
    };