Providers refactoring

veloce · veloce · commit bcae51a390be · 2025-12-24T10:55:30.000+01:00
diff --git a/lib/src/model/account/account_repository.dart b/lib/src/model/account/account_repository.dart
@@ -24,8 +24,8 @@ final kidModeProvider = FutureProvider.autoDispose<bool>((ref) async {
 
 /// A provider for the [AccountRepository].
 final accountRepositoryProvider = Provider<AccountRepository>((ref) {
-  final client = ref.read(lichessClientProvider);
-  final aggregator = ref.read(aggregatorProvider);
+  final client = ref.watch(lichessClientProvider);
+  final aggregator = ref.watch(aggregatorProvider);
   return AccountRepository(client, aggregator);
 }, name: 'AccountRepositoryProvider');
 
diff --git a/lib/src/model/blog/blog_repository.dart b/lib/src/model/blog/blog_repository.dart
@@ -9,8 +9,8 @@ final blogCarouselProvider = FutureProvider.autoDispose<IList<BlogPost>>((ref) {
 }, name: 'BlogCarouselProvider');
 
 final blogRepositoryProvider = Provider<BlogRepository>((ref) {
-  final client = ref.read(lichessClientProvider);
-  final aggregator = ref.read(aggregatorProvider);
+  final client = ref.watch(lichessClientProvider);
+  final aggregator = ref.watch(aggregatorProvider);
   return BlogRepository(client, aggregator);
 }, name: 'BlogRepositoryProvider');
 
diff --git a/lib/src/model/broadcast/broadcast_repository.dart b/lib/src/model/broadcast/broadcast_repository.dart
@@ -12,8 +12,8 @@ import 'package:lichess_mobile/src/utils/json.dart';
 
 /// A provider for the [BroadcastRepository].
 final broadcastRepositoryProvider = Provider<BroadcastRepository>((ref) {
-  final client = ref.read(lichessClientProvider);
-  final aggregator = ref.read(aggregatorProvider);
+  final client = ref.watch(lichessClientProvider);
+  final aggregator = ref.watch(aggregatorProvider);
   return BroadcastRepository(client, aggregator);
 }, name: 'BroadcastRepositoryProvider');
 
diff --git a/lib/src/model/challenge/challenge_repository.dart b/lib/src/model/challenge/challenge_repository.dart
@@ -10,7 +10,7 @@ import 'package:lichess_mobile/src/network/http.dart';
 
 /// A provider for [ChallengeRepository].
 final challengeRepositoryProvider = Provider<ChallengeRepository>((Ref ref) {
-  return ChallengeRepository(ref.read(lichessClientProvider), ref.read(aggregatorProvider));
+  return ChallengeRepository(ref.watch(lichessClientProvider), ref.watch(aggregatorProvider));
 }, name: 'ChallengeRepositoryProvider');
 
 typedef ChallengesList = ({IList<Challenge> inward, IList<Challenge> outward});
diff --git a/lib/src/model/game/game_repository.dart b/lib/src/model/game/game_repository.dart
@@ -12,8 +12,8 @@ import 'package:lichess_mobile/src/network/http.dart';
 
 /// A provider for the [GameRepository].
 final gameRepositoryProvider = Provider<GameRepository>((ref) {
-  final client = ref.read(lichessClientProvider);
-  final aggregator = ref.read(aggregatorProvider);
+  final client = ref.watch(lichessClientProvider);
+  final aggregator = ref.watch(aggregatorProvider);
   return GameRepository(client, aggregator);
 }, name: 'GameRepositoryProvider');
 
diff --git a/lib/src/model/message/message_repository.dart b/lib/src/model/message/message_repository.dart
@@ -7,12 +7,12 @@ import 'package:lichess_mobile/src/network/http.dart';
 
 /// A provider that gets the conversation data for the current user.
 final contactsProvider = FutureProvider.autoDispose<Contacts>((ref) {
-  return ref.read(messageRepositoryProvider).loadContacts();
+  return ref.watch(messageRepositoryProvider).loadContacts();
 }, name: 'ContactsProvider');
 
 /// A provider for [MessageRepository].
 final messageRepositoryProvider = Provider<MessageRepository>((ref) {
-  return MessageRepository(ref.read(lichessClientProvider), ref.read(aggregatorProvider));
+  return MessageRepository(ref.watch(lichessClientProvider), ref.watch(aggregatorProvider));
 }, name: 'MessageRepositoryProvider');
 
 /// A provider that gets the unread messages count for the current user.
diff --git a/lib/src/model/puzzle/puzzle_activity.dart b/lib/src/model/puzzle/puzzle_activity.dart
@@ -6,7 +6,6 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:lichess_mobile/src/model/puzzle/puzzle.dart';
 import 'package:lichess_mobile/src/model/puzzle/puzzle_providers.dart';
 import 'package:lichess_mobile/src/model/puzzle/puzzle_repository.dart';
-import 'package:lichess_mobile/src/network/http.dart';
 import 'package:lichess_mobile/src/utils/riverpod.dart';
 
 part 'puzzle_activity.freezed.dart';
@@ -67,9 +66,9 @@ class PuzzleActivity extends AsyncNotifier<PuzzleActivityState> {
     if (currentVal.hasMore && _list.length < _maxPuzzles) {
       state = AsyncData(currentVal.copyWith(isLoading: true));
       try {
-        final value = await ref.withClient(
-          (client) => PuzzleRepository(client).puzzleActivity(_nbPerPage, before: _list.last.date),
-        );
+        final value = await ref
+            .read(puzzleRepositoryProvider)
+            .puzzleActivity(_nbPerPage, before: _list.last.date);
         if (value.isEmpty) {
           state = AsyncData(currentVal.copyWith(hasMore: false, isLoading: false));
           return;
diff --git a/lib/src/model/puzzle/puzzle_controller.dart b/lib/src/model/puzzle/puzzle_controller.dart
@@ -60,11 +60,11 @@ class PuzzleController extends Notifier<PuzzleState> {
     return _loadNewContext(initialContext);
   }
 
-  PuzzleRepository _repository(LichessClient client) => PuzzleRepository(client);
+  PuzzleRepository get _repository => ref.read(puzzleRepositoryProvider);
 
   Future<void> _updateUserRating() async {
     try {
-      final data = await ref.withClient((client) => _repository(client).selectBatch(nb: 0));
+      final data = await _repository.selectBatch(nb: 0);
       final glicko = data.glicko;
       if (glicko != null) {
         state = state.copyWith(glicko: glicko);
diff --git a/lib/src/model/puzzle/puzzle_providers.dart b/lib/src/model/puzzle/puzzle_providers.dart
@@ -32,7 +32,7 @@ final nextPuzzleProvider = FutureProvider.autoDispose.family<PuzzleContext?, Puz
 
 /// Fetches a storm of puzzles.
 final stormProvider = FutureProvider.autoDispose<PuzzleStormResponse>((Ref ref) {
-  return ref.withClient((client) => PuzzleRepository(client).storm());
+  return ref.read(puzzleRepositoryProvider).storm();
 }, name: 'StormProvider');
 
 /// Fetches a puzzle from the local storage if available, otherwise fetches it from the server.
@@ -43,7 +43,7 @@ final puzzleProvider = FutureProvider.autoDispose.family<Puzzle, PuzzleId>((
   final puzzleStorage = await ref.watch(puzzleStorageProvider.future);
   final puzzle = await puzzleStorage.fetch(puzzleId: id);
   if (puzzle != null) return puzzle;
-  return ref.withClient((client) => PuzzleRepository(client).fetch(id));
+  return ref.read(puzzleRepositoryProvider).fetch(id);
 }, name: 'PuzzleProvider');
 
 /// Fetches the daily puzzle.
@@ -107,7 +107,7 @@ final stormDashboardProvider = FutureProvider.autoDispose.family<StormDashboard?
   Ref ref,
   UserId id,
 ) {
-  return ref.withClient((client) => PuzzleRepository(client).stormDashboard(id));
+  return ref.read(puzzleRepositoryProvider).stormDashboard(id);
 }, name: 'StormDashboardProvider');
 
 /// Fetches available puzzle themes.
diff --git a/lib/src/model/puzzle/puzzle_repository.dart b/lib/src/model/puzzle/puzzle_repository.dart
@@ -4,6 +4,7 @@ import 'package:collection/collection.dart';
 import 'package:dartchess/dartchess.dart';
 import 'package:deep_pick/deep_pick.dart';
 import 'package:fast_immutable_collections/fast_immutable_collections.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:intl/intl.dart';
 import 'package:lichess_mobile/src/model/common/chess.dart';
@@ -21,6 +22,12 @@ import 'package:lichess_mobile/src/utils/json.dart';
 
 part 'puzzle_repository.freezed.dart';
 
+/// A provider for the [PuzzleRepository].
+final puzzleRepositoryProvider = Provider<PuzzleRepository>((ref) {
+  final client = ref.watch(lichessClientProvider);
+  return PuzzleRepository(client);
+}, name: 'PuzzleRepositoryProvider');
+
 class PuzzleRepository {
   PuzzleRepository(this.client);
 
diff --git a/lib/src/model/puzzle/puzzle_streak.dart b/lib/src/model/puzzle/puzzle_streak.dart
@@ -7,7 +7,6 @@ import 'package:lichess_mobile/src/model/common/service/sound_service.dart';
 import 'package:lichess_mobile/src/model/puzzle/puzzle.dart';
 import 'package:lichess_mobile/src/model/puzzle/puzzle_repository.dart';
 import 'package:lichess_mobile/src/model/puzzle/streak_storage.dart';
-import 'package:lichess_mobile/src/network/http.dart';
 import 'package:lichess_mobile/src/tab_scaffold.dart' show currentNavigatorKeyProvider;
 import 'package:lichess_mobile/src/widgets/feedback.dart';
 
@@ -48,24 +47,21 @@ class PuzzleStreakController extends AsyncNotifier<StreakState> {
     final authUser = ref.watch(authControllerProvider);
     final streakStorage = ref.watch(streakStorageProvider(authUser?.user.id));
     final activeStreak = await streakStorage.loadActiveStreak();
+    final repository = ref.read(puzzleRepositoryProvider);
     if (activeStreak != null) {
       final [puzzle, nextPuzzle] = await Future.wait([
-        ref.withClient(
-          (client) => PuzzleRepository(client).fetch(activeStreak.streak[activeStreak.index]),
-        ),
+        repository.fetch(activeStreak.streak[activeStreak.index]),
         if (activeStreak.nextId != null)
-          ref.withClient((client) => PuzzleRepository(client).fetch(activeStreak.nextId!))
+          repository.fetch(activeStreak.nextId!)
         else
           Future.value(null),
       ]);
 
       return (streak: activeStreak, puzzle: puzzle!, nextPuzzle: nextPuzzle);
     }
 
-    final newStreak = await ref.withClient((client) => PuzzleRepository(client).streak());
-    final nextPuzzle = await ref.withClient(
-      (client) => PuzzleRepository(client).fetch(newStreak.streak[1]),
-    );
+    final newStreak = await repository.streak();
+    final nextPuzzle = await repository.fetch(newStreak.streak[1]);
 
     return (
       streak: PuzzleStreak(
@@ -106,15 +102,15 @@ class PuzzleStreakController extends AsyncNotifier<StreakState> {
     final nextId = state.requireValue.streak.nextId;
     if (nextId != null) {
       ref
-          .withClient(
-            (client) => PuzzleRepository(client).fetch(nextId).then((puzzle) {
-              state = AsyncData((
-                streak: state.requireValue.streak,
-                puzzle: state.requireValue.puzzle,
-                nextPuzzle: puzzle,
-              ));
-            }),
-          )
+          .read(puzzleRepositoryProvider)
+          .fetch(nextId)
+          .then((puzzle) {
+            state = AsyncData((
+              streak: state.requireValue.streak,
+              puzzle: state.requireValue.puzzle,
+              nextPuzzle: puzzle,
+            ));
+          })
           .catchError((_) {
             final currentContext = ref.read(currentNavigatorKeyProvider).currentContext;
             if (currentContext != null && currentContext.mounted) {
@@ -143,7 +139,7 @@ class PuzzleStreakController extends AsyncNotifier<StreakState> {
     if (userId != null) {
       final streak = state.requireValue.streak.index;
       if (streak > 0) {
-        await ref.withClient((client) => PuzzleRepository(client).postStreakRun(streak));
+        await ref.read(puzzleRepositoryProvider).postStreakRun(streak);
       }
     }
   }
diff --git a/lib/src/model/puzzle/storm_controller.dart b/lib/src/model/puzzle/storm_controller.dart
@@ -15,7 +15,6 @@ import 'package:lichess_mobile/src/model/common/service/sound_service.dart';
 import 'package:lichess_mobile/src/model/puzzle/puzzle.dart';
 import 'package:lichess_mobile/src/model/puzzle/puzzle_repository.dart';
 import 'package:lichess_mobile/src/model/puzzle/storm.dart';
-import 'package:lichess_mobile/src/network/http.dart';
 import 'package:result_extensions/result_extensions.dart';
 
 part 'storm_controller.freezed.dart';
@@ -153,10 +152,8 @@ class StormController extends Notifier<StormState> {
 
     final authUser = ref.read(authControllerProvider);
     if (authUser != null) {
-      final res = await ref.withClient(
-        (client) => Result.capture(
-          PuzzleRepository(client).postStormRun(stats).timeout(const Duration(seconds: 2)),
-        ),
+      final res = await Result.capture(
+        ref.read(puzzleRepositoryProvider).postStormRun(stats).timeout(const Duration(seconds: 2)),
       );
 
       final newState = state.copyWith(stats: stats, mode: StormMode.ended);
diff --git a/lib/src/model/study/study_repository.dart b/lib/src/model/study/study_repository.dart
@@ -12,7 +12,7 @@ import 'package:lichess_mobile/src/network/http.dart';
 
 /// A provider for [StudyRepository].
 final studyRepositoryProvider = Provider<StudyRepository>((Ref ref) {
-  return StudyRepository(ref, ref.read(lichessClientProvider));
+  return StudyRepository(ref, ref.watch(lichessClientProvider));
 }, name: 'StudyRepositoryProvider');
 
 class StudyRepository {
diff --git a/lib/src/model/tournament/tournament_repository.dart b/lib/src/model/tournament/tournament_repository.dart
@@ -11,7 +11,7 @@ import 'package:lichess_mobile/src/network/http.dart';
 
 /// A provider for [TournamentRepository].
 final tournamentRepositoryProvider = Provider<TournamentRepository>((Ref ref) {
-  return TournamentRepository(ref.read(lichessClientProvider), ref.read(aggregatorProvider), ref);
+  return TournamentRepository(ref.watch(lichessClientProvider), ref.watch(aggregatorProvider), ref);
 }, name: 'TournamentRepositoryProvider');
 
 class TournamentRepository {
diff --git a/lib/src/model/tv/tv_repository.dart b/lib/src/model/tv/tv_repository.dart
@@ -13,8 +13,8 @@ typedef TvChannels = IMap<TvChannel, TvGame>;
 
 /// A provider for the [TvRepository].
 final tvRepositoryProvider = Provider<TvRepository>((ref) {
-  final client = ref.read(lichessClientProvider);
-  final aggregator = ref.read(aggregatorProvider);
+  final client = ref.watch(lichessClientProvider);
+  final aggregator = ref.watch(aggregatorProvider);
   return TvRepository(client, aggregator);
 }, name: 'TvRepositoryProvider');
 
diff --git a/lib/src/model/user/user_repository.dart b/lib/src/model/user/user_repository.dart
@@ -15,8 +15,8 @@ import 'package:lichess_mobile/src/utils/json.dart';
 
 /// A provider for the [UserRepository].
 final userRepositoryProvider = Provider<UserRepository>((ref) {
-  final client = ref.read(lichessClientProvider);
-  final aggregator = ref.read(aggregatorProvider);
+  final client = ref.watch(lichessClientProvider);
+  final aggregator = ref.watch(aggregatorProvider);
   return UserRepository(client, aggregator);
 }, name: 'UserRepositoryProvider');
 
diff --git a/lib/src/network/aggregator.dart b/lib/src/network/aggregator.dart
@@ -34,7 +34,7 @@ typedef CachedAggregatorRequest = ({Uri targetGroupUri, Future<Map<String, dynam
 
 /// A provider for the [Aggregator] service.
 final aggregatorProvider = Provider<Aggregator>((ref) {
-  return Aggregator(ref.read(lichessClientProvider));
+  return Aggregator(ref.watch(lichessClientProvider));
 }, name: 'AggregatorProvider');
 
 /// Aggregator is used to group multiple requests to the same endpoint.
diff --git a/test/test_provider_scope.dart b/test/test_provider_scope.dart
@@ -200,7 +200,7 @@ Future<Widget> makeTestProviderScope(
     }),
     aggregatorProvider: aggregatorProvider.overrideWith((ref) {
       // Use a zero aggregation interval to disable aggregation for tests.
-      return Aggregator(ref.read(lichessClientProvider), aggregationInterval: Duration.zero);
+      return Aggregator(ref.watch(lichessClientProvider), aggregationInterval: Duration.zero);
     }),
     webSocketChannelFactoryProvider: webSocketChannelFactoryProvider.overrideWith((ref) {
       return defaultFakeWebSocketChannelFactory;
