Merge pull request #10 from oviron/byedpi-data-driven-strategies

feat(byedpi): data-driven strategies, drop ByeDpiPreset enum

Author: oviron

CHANGELOG.md

@@ -1,3 +1,49 @@
+## v0.13.8
+
+- Data-driven ByeDPI strategies: the `ByeDpiPreset` enum is gone; strategies live solely in `assets/data/byedpi-strategies.json`, loaded at runtime. Updating/adding one is a pure JSON edit (no Dart/codegen/l10n)
+
+- Strategy set is taken verbatim from upstream romanvht/ByeByeDPI `proxytest_strategies.list` (2026-05): `universal` is the maintainer's own default, the rest are the top usable entries (excluding `{sni}`/raw-blob lines we can't run) with neutral labels. No invented per-operator labeling
+
+- On-disk override (no force-install) seams in a future remote refresh of the strategy set without a release
+
+## v0.13.7
+
+- Maintenance release: version bump, no functional changes since v0.13.6
+
+## v0.13.6
+
+- Bump libmihomo-android 0.1.1 -> 0.1.2
+
+## v0.13.5
+
+- Fix: proxies tab FAB pings the visible group instead of the persisted one
+
+## v0.13.4
+
+- Drop China-specific leftovers from default config; add Android connectivity probe coverage; enable sniffer by default
+
+- Omit null override-destination in defaults
+
+## v0.13.3
+
+- Restore v0.12.0 DNS defaults; simplify IPv6 to a 2-state toggle
+
+- Remove the fallback-filter setting; move Reset to an AppBar icon
+
+- l10n cleanup (drop orphaned keys from the removed fallback-filter)
+
+## v0.13.2
+
+- Deep information-architecture restructure of settings, research-driven (settings audit PR1-PR5.9)
+
+- Flatten single-tile tool sections; move Diagnostics to the bottom
+
+- Strip desktop/dead code paths (ViewMode, NavigationItemMode, isMobile branches)
+
+- dart_code_linter sweep + CI gate; skip APK build on pull requests
+
+- Add 7 missing l10n entries
+
 ## v0.12.0
 
 - Audit sweep: 59 findings + 4 carry-overs

assets/data/byedpi-strategies.json

@@ -0,0 +1,62 @@
+[
+  {
+    "id": "universal",
+    "label": "Universal (default)",
+    "args": "-o1 -a1 -r-5+se"
+  },
+  {
+    "id": "strategy-01",
+    "label": "Strategy 1",
+    "args": "-f-200 -Qr -s3:5+sm -a1 -As -d1 -s4+sm -s8+sh -f-300 -d6+sh -a1 -At,r,s -o2 -f-30 -As -r5 -Mh -r6+sh -f-250 -s2:7+s -s3:6+sm -a1 -At,r,s -s3:5+sm -s6+s -s7:9+s -q30+sm -a1"
+  },
+  {
+    "id": "strategy-02",
+    "label": "Strategy 2",
+    "args": "-d1 -d3+s -s6+s -d9+s -s12+s -d15+s -s20+s -d25+s -s30+s -d35+s -r1+s -S -a1 -As -d1 -d3+s -s6+s -d9+s -s12+s -d15+s -s20+s -d25+s -s30+s -d35+s -S -a1"
+  },
+  {
+    "id": "strategy-03",
+    "label": "Strategy 3",
+    "args": "-q2 -s2 -s3+s -r3 -s4 -r4 -s5+s -r5+s -s6 -s7+s -r8 -s9+s -Qr -Mh,d,r -a1 -At,r -s2+s -r2 -d2 -s3 -r3 -r4 -s4 -d5+s -r5 -d6 -s7+s -d7 -a1"
+  },
+  {
+    "id": "strategy-04",
+    "label": "Strategy 4",
+    "args": "-o1 -d1 -a1 -At,r,s -s1 -d1 -s5+s -s10+s -s15+s -s20+s -r1+s -S -a1 -As -s1 -d1 -s5+s -s10+s -s15+s -s20+s -S -a1"
+  },
+  {
+    "id": "strategy-05",
+    "label": "Strategy 5",
+    "args": "-d1+s -s50+s -a1 -As -f20 -r2+s -a1 -At -d2 -s1+s -s5+s -s10+s -s15+s -s25+s -s35+s -s50+s -s60+s -a1"
+  },
+  {
+    "id": "strategy-06",
+    "label": "Strategy 6",
+    "args": "-d1 -s1 -q1 -Y -a1 -Ar -s5 -o1+s -d3+s -s6+s -d9+s -s12+s -d15+s -s20+s -d25+s -s30+s -d35+s -a1"
+  },
+  {
+    "id": "strategy-07",
+    "label": "Strategy 7",
+    "args": "-s1 -o1 -a1 -Y -Ar -s5 -o1+s -a1 -At -f-1 -r1+s -a1 -As -s1 -o1+s -s-1 -a1"
+  },
+  {
+    "id": "strategy-08",
+    "label": "Strategy 8",
+    "args": "-s1 -d1 -a1 -Y -Ar -d5 -o1+s -a1 -At -f-1 -r1+s -a1 -As -d1 -o1+s -s-1 -a1"
+  },
+  {
+    "id": "strategy-09",
+    "label": "Strategy 9",
+    "args": "-d1 -s1+s -d3+s -s6+s -d9+s -s12+s -d15+s -s20+s -d25+s -s30+s -d35+s -a1"
+  },
+  {
+    "id": "strategy-10",
+    "label": "Strategy 10",
+    "args": "-s1 -q1 -a1 -Y -Ar -a1 -s5 -o2 -At -f-1 -r1+s -a1 -As -s1 -o1+s -s-1 -a1"
+  },
+  {
+    "id": "strategy-11",
+    "label": "Strategy 11",
+    "args": "-s1 -q1 -a1 -Ar -s5 -o1+s -a1 -At -f-1 -d1+s -a1 -As -s1 -o1+s -s-1 -a1"
+  }
+]

lib/byedpi/generated/model.freezed.dart

@@ -1,57 +1,40 @@
-import 'package:fl_clash/common/app_localizations.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'generated/model.freezed.dart';
 part 'generated/model.g.dart';
 
 enum ByeDpiMode { manual, auto }
 
-enum ByeDpiPreset {
-  universal('--disorder 1 --auto=t,r,s --tlsrec 1+s'),
-  mrDrone(
-    '-Ku -a3 -An -Kt,h -s0 -o1 -d1 -r1+s -Ar -o1 -At -f-1 -r1+s -As -b+500',
-  ),
-  mtsAggressive(
-    '-Ku -a1 -An -Kt -V443 -H:googlevideo.com -n www.google.com -o1 -An -d0+sm -At -r1+s',
-  ),
-  megafon2ni(
-    '-Ku -a5 -An -Kt -V443 -H:googlevideo.com -n www.google.com -o1 -An -f-1 -T0.5 -Ars -d0+sm -At -r1+s',
-  ),
-  tele2('--disorder 1 --auto=t,r,s --fake 2'),
-  beelineRt(
-    '-o1 -d1 -a1 -At,r,s -s1 -d1 -s5+s -s10+s -s15+s -s20+s -r1+s -S -a1',
-  ),
-  antiGgc('--split 3 --oob 1 --disorder 3 --auto=t,r,s'),
-  cascade(
-    '-d1 -d3+s -s6+s -d9+s -s12+s -d15+s -s20+s -d25+s -s30+s -d35+s -r1+s -S -a1',
-  ),
-  tlsOnly('-Kt -r1+s -s1+s -d3+s -a1'),
-  ttlFixed(
-    '-g25 -H:"googlevideo.com youtube.com discord.com" -f-1 -n www.google.com -t4 -r1+s -An -d1 -s25+s -d30+s',
-  ),
-  custom('');
-
-  const ByeDpiPreset(this.args);
+// `custom` is not a JSON strategy: it surfaces the user's own cliArgs.
+const kByeDpiCustomId = 'custom';
+const kByeDpiDefaultId = 'universal';
+const kByeDpiDefaultArgs = '-o1 -a1 -r-5+se';
 
+class ByeDpiStrategy {
+  final String id;
+  final String label;
   final String args;
 
-  String get label => switch (this) {
-    ByeDpiPreset.universal => appLocalizations.byedpiPresetUniversal,
-    ByeDpiPreset.mrDrone => appLocalizations.byedpiPresetMrDrone,
-    ByeDpiPreset.mtsAggressive => appLocalizations.byedpiPresetMtsAggressive,
-    ByeDpiPreset.megafon2ni => appLocalizations.byedpiPresetMegafon2ni,
-    ByeDpiPreset.tele2 => appLocalizations.byedpiPresetTele2,
-    ByeDpiPreset.beelineRt => appLocalizations.byedpiPresetBeelineRt,
-    ByeDpiPreset.antiGgc => appLocalizations.byedpiPresetAntiGgc,
-    ByeDpiPreset.cascade => appLocalizations.byedpiPresetCascade,
-    ByeDpiPreset.tlsOnly => appLocalizations.byedpiPresetTlsOnly,
-    ByeDpiPreset.ttlFixed => appLocalizations.byedpiPresetTtlFixed,
-    ByeDpiPreset.custom => appLocalizations.byedpiPresetCustom,
-  };
+  const ByeDpiStrategy({
+    required this.id,
+    required this.label,
+    required this.args,
+  });
+
+  factory ByeDpiStrategy.fromJson(Map<String, dynamic> json) => ByeDpiStrategy(
+    id: json['id'] as String,
+    label: (json['label'] ?? json['id']) as String,
+    args: json['args'] as String? ?? '',
+  );
 }
 
-String effectiveByeDpiCliArgs(ByeDpiSettings s) =>
-    s.preset == ByeDpiPreset.custom ? s.cliArgs : s.preset.args;
+// Args resolve from the loaded strategy set (byedpi-strategies.json); `custom`
+// uses the user's cliArgs. Falls back to the default args if the id is absent
+// (e.g. asset failed to load).
+String effectiveByeDpiCliArgs(ByeDpiSettings s, Map<String, String> argsById) =>
+    s.preset == kByeDpiCustomId
+    ? s.cliArgs
+    : (argsById[s.preset] ?? kByeDpiDefaultArgs);
 
 @freezed
 abstract class ByeDpiSettings with _$ByeDpiSettings {
@@ -61,8 +44,8 @@ abstract class ByeDpiSettings with _$ByeDpiSettings {
     @Default(true) bool fallbackEnabled,
     @Default('') String fallbackGroup,
     @Default(1080) int port,
-    @Default(ByeDpiPreset.universal) ByeDpiPreset preset,
-    @Default('--disorder 1 --auto=t,r,s --tlsrec 1+s') String cliArgs,
+    @Default(kByeDpiDefaultId) String preset,
+    @Default(kByeDpiDefaultArgs) String cliArgs,
   }) = _ByeDpiSettings;
 
   factory ByeDpiSettings.fromJson(Map<String, Object?> json) =>

lib/byedpi/generated/model.g.dart

@@ -29,18 +29,13 @@ class ByeDpiSettingsStore {
         _legacyCliArgs.contains(storedCli);
 
     final preset = legacy
-        ? ByeDpiPreset.universal
-        : (storedPreset != null
-              ? ByeDpiPreset.values.firstWhere(
-                  (p) => p.name == storedPreset,
-                  orElse: () => ByeDpiPreset.universal,
-                )
-              : ByeDpiPreset.universal);
+        ? kByeDpiDefaultId
+        : (storedPreset ?? kByeDpiDefaultId);
 
-    // When migrating away from legacy cliArgs, surface the new universal
-    // defaults so a later switch to Custom doesn't show a stale string.
+    // When migrating away from legacy cliArgs, surface the new default args so
+    // a later switch to Custom doesn't show a stale string.
     final cliArgs = (legacy || storedCli == null)
-        ? ByeDpiPreset.universal.args
+        ? kByeDpiDefaultArgs
         : storedCli;
 
     return ByeDpiSettings(
@@ -62,7 +57,7 @@ class ByeDpiSettingsStore {
     await _prefs.setBool('byedpi.fallbackEnabled', s.fallbackEnabled);
     await _prefs.setString('byedpi.fallbackGroup', s.fallbackGroup);
     await _prefs.setInt('byedpi.port', s.port);
-    await _prefs.setString('byedpi.preset', s.preset.name);
+    await _prefs.setString('byedpi.preset', s.preset);
     await _prefs.setString('byedpi.cliArgs', s.cliArgs);
   }
 }