Merge branch 'lacostej-fix/socket-listener-race-conditions'

Author: veloce

lib/src/model/broadcast/broadcast_analysis_controller.dart

@@ -87,8 +87,6 @@ class BroadcastAnalysisController extends AsyncNotifier<BroadcastAnalysisState>
 
     _subscription = _socketClient.stream.listen(_handleSocketEvent);
 
-    await _socketClient.firstConnection;
-
     _socketOpenSubscription = _socketClient.connectedStream.listen((_) {
       if (state.value?.isNewOrOngoing == true) {
         _syncDebouncer(() {
@@ -97,6 +95,8 @@ class BroadcastAnalysisController extends AsyncNotifier<BroadcastAnalysisState>
       }
     });
 
+    await _socketClient.firstConnection;
+
     _appLifecycleListener = AppLifecycleListener(
       onResume: () {
         if (state.value?.isNewOrOngoing == true) {

lib/src/model/broadcast/broadcast_round_controller.dart

@@ -62,8 +62,6 @@ class BroadcastRoundController extends AsyncNotifier<BroadcastRoundState> {
 
     _subscription = _socketClient.stream.listen(_handleSocketEvent);
 
-    await _socketClient.firstConnection;
-
     _socketOpenSubscription = _socketClient.connectedStream.listen((_) {
       if (ref.mounted && state.value?.round.status == RoundStatus.live) {
         _syncRoundDebouncer(() {
@@ -72,6 +70,8 @@ class BroadcastRoundController extends AsyncNotifier<BroadcastRoundState> {
       }
     });
 
+    await _socketClient.firstConnection;
+
     _appLifecycleListener = AppLifecycleListener(
       onResume: () {
         if (ref.mounted && state.value?.round.status == RoundStatus.live) {

lib/src/model/tv/live_tv_channels.dart

@@ -53,9 +53,6 @@ class LiveTvChannels extends AsyncNotifier<LiveTvChannelsState> {
 
     _socketClient = ref.read(socketPoolProvider).open(Uri(path: kDefaultSocketRoute));
 
-    await _socketClient.firstConnection;
-    _socketWatch(repoGames);
-
     _socketReadySubscription?.cancel();
     _socketReadySubscription = _socketClient.connectedStream.listen((_) async {
       final repoGames = await ref.read(tvRepositoryProvider).channels();
@@ -65,6 +62,9 @@ class LiveTvChannels extends AsyncNotifier<LiveTvChannelsState> {
     _socketSubscription?.cancel();
     _socketSubscription = _socketClient.stream.listen(_handleSocketEvent);
 
+    await _socketClient.firstConnection;
+    _socketWatch(repoGames);
+
     return repoGames.map((channel, game) {
       return MapEntry(
         channel,