feat: refactor party management to session management

Author: 7reax

Launcher/lib/features/maxima/dialogs/maxima_friends_dialog.dart

@@ -8,7 +8,7 @@ import 'package:kyber_launcher/features/maxima/providers/maxima_cubit.dart';
 import 'package:kyber_launcher/features/maxima/providers/maxima_rtm_cubit.dart';
 import 'package:kyber_launcher/features/maxima/widgets/friend_list/maxima_friend_list.dart';
 import 'package:kyber_launcher/features/maxima/widgets/maxima_avatar.dart';
-import 'package:kyber_launcher/features/party/providers/party_cubit.dart';
+import 'package:kyber_launcher/features/session/providers/session_cubit.dart';
 import 'package:kyber_launcher/gen/assets.gen.dart';
 import 'package:kyber_launcher/gen/fonts.gen.dart';
 import 'package:kyber_launcher/shared/ui/buttons/button.dart';
@@ -76,7 +76,7 @@ class MaximaFriendsDialog extends StatelessWidget {
                               ),
                             ),
                             Expanded(
-                              child: BlocBuilder<PartyCubit, UserPartyState>(
+                              child: BlocBuilder<SessionCubit, SessionState>(
                                 builder: (context, state) {
                                   if (state is InParty) {
                                     return _buildPartyList(context);
@@ -221,7 +221,7 @@ class MaximaFriendsDialog extends StatelessWidget {
                                     child: MaximaFriendList(
                                       onFriendSelected: (value) async {
                                         final partyCubit = context
-                                            .read<PartyCubit>();
+                                            .read<SessionCubit>();
                                         await partyCubit.inviteToParty(
                                           value.id,
                                         );
@@ -260,7 +260,7 @@ class MaximaFriendsDialog extends StatelessWidget {
 
   Widget _buildPartyList(BuildContext context) {
     final party = context
-        .watch<PartyCubit>()
+        .watch<SessionCubit>()
         .state;
     final state = (party as InParty).party;
 

Launcher/lib/features/navigation_bar/services/app_initialization_service.dart

@@ -21,8 +21,8 @@ import 'package:kyber_launcher/features/mods/services/mod_service.dart';
 import 'package:kyber_launcher/features/navigation_bar/dialogs/disable_comp_mode_dialog.dart';
 import 'package:kyber_launcher/features/navigation_bar/helper/protocol_helper.dart';
 import 'package:kyber_launcher/features/nexusmods/widgets/graphql_provider.dart';
-import 'package:kyber_launcher/features/party/providers/party_cubit.dart';
 import 'package:kyber_launcher/features/server_moderation/providers/moderation_servers_cubit.dart';
+import 'package:kyber_launcher/features/session/providers/session_cubit.dart';
 import 'package:kyber_launcher/features/settings/dialogs/update_dialog.dart';
 import 'package:kyber_launcher/features/setup/dialogs/open_beta_dialog.dart';
 import 'package:kyber_launcher/features/setup/dialogs/rules_dialog.dart';
@@ -52,7 +52,7 @@ class AppInitializationService {
     if (!context.mounted) return;
 
     context.read<ModerationServersCubit>();
-    context.read<PartyCubit>();
+    context.read<SessionCubit>();
 
     unawaited(
       sl.isReady<ModService>().then((_) {

Launcher/lib/features/party/providers/party_state.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:math' as math;
+import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
 import 'package:equatable/equatable.dart';
@@ -11,18 +12,21 @@ import 'package:kyber_launcher/features/maxima/providers/maxima_cubit.dart';
 import 'package:kyber_launcher/injection_container.dart';
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
+import 'package:web_socket_channel/io.dart';
 
-part 'party_state.dart';
+part 'session_state.dart';
 
-class PartyCubit extends Cubit<UserPartyState> {
-  PartyCubit() : super(PartyInitial()) {
+class SessionCubit extends Cubit<SessionState> {
+  SessionCubit() : super(PartyInitial()) {
     _connectToStream();
   }
 
-  final _logger = Logger('party_cubit');
+  final _logger = Logger('session_cubit');
   late final KyberGRPCService _service = sl<KyberGRPCService>();
 
-  StreamSubscription<PartyEvent>? _subscription;
+  StreamSubscription<SessionEvent>? _subscription;
+  Timer? _keepAliveTimer;
+  IOWebSocketChannel? _channel;
   int _reconnectAttempts = 0;
 
   InParty? get _inParty => state is InParty ? state as InParty : null;
@@ -33,6 +37,7 @@ class PartyCubit extends Cubit<UserPartyState> {
   @override
   Future<void> close() async {
     await _subscription?.cancel();
+    _keepAliveTimer?.cancel();
     return super.close();
   }
 
@@ -61,15 +66,20 @@ class PartyCubit extends Cubit<UserPartyState> {
       );
     }
 
-    emit(InParty(party.rebuild((b) {
-      b.members
-        ..clear()
-        ..addAll(unique);
-    })));
+    emit(
+      InParty(
+        party.rebuild((b) {
+          b.members
+            ..clear()
+            ..addAll(unique);
+        }),
+      ),
+    );
     _sortPlayers();
   }
 
   void _sortPlayers() {
+    return;
     final party = _inParty?.party;
     final userId = _userId;
     if (party == null || userId == null) return;
@@ -81,11 +91,15 @@ class PartyCubit extends Cubit<UserPartyState> {
         return 0;
       });
 
-    emit(InParty(party.rebuild((b) {
-      b.members
-        ..clear()
-        ..addAll(sorted);
-    })));
+    emit(
+      InParty(
+        party.rebuild((b) {
+          b.members
+            ..clear()
+            ..addAll(sorted);
+        }),
+      ),
+    );
   }
 
   Future<void> _connectToStream() async {
@@ -116,24 +130,36 @@ class PartyCubit extends Cubit<UserPartyState> {
           _logger.warning('Failed to get current party', error);
         });
 
-    final keepAliveStream = Stream.periodic(
-      const Duration(seconds: 10),
-      (_) => Empty(),
+    _channel = IOWebSocketChannel.connect(
+      'wss://api.${Preferences.admin.apiEnv}.kyber.gg/ws/session',
+      headers: {
+        'Authorization': sl.get<KyberGRPCService>().token,
+      },
+      connectTimeout: const Duration(seconds: 10),
     );
 
-    _subscription = _service.partyServiceClient
-        .subscribe(keepAliveStream)
-        .listen(
-          _handlePartyEvent,
-          cancelOnError: true,
-          onError: (error) {
-            _logger.warning('Party stream error, reconnecting...', error);
-            _reconnect();
-          },
-          onDone: () {
-            _logger.info('Party stream closed');
-          },
-        );
+    await _channel?.ready;
+
+    _channel?.stream.listen(
+      (event) {
+        try {
+          final data = SessionEvent.fromBuffer(event as Uint8List);
+        } catch (e, s) {
+          _logger.severe('Error parsing event', e, s);
+        }
+      },
+      onDone: () {
+        _logger.info('Stream done');
+      },
+      onError: (dynamic e, StackTrace s) {
+        _logger.severe('Stream error', e, s);
+      },
+    );
+
+    _keepAliveTimer = Timer.periodic(
+      const Duration(seconds: 10),
+      (_) async => _channel?.sink.add(''),
+    );
 
     _reconnectAttempts = 0;
   }

…eatures/party/providers/party_cubit.dart …res/session/providers/session_cubit.dartLauncher/lib/features/party/providers/party_cubit.dart renamed to Launcher/lib/features/session/providers/session_cubit.dart Launcher/lib/features/party/providers/party_cubit.dart renamed to Launcher/lib/features/session/providers/session_cubit.dart

@@ -0,0 +1,18 @@
+part of 'session_cubit.dart';
+
+@immutable
+sealed class SessionState extends Equatable {}
+
+final class PartyInitial extends SessionState {
+  @override
+  List<Object?> get props => [];
+}
+
+final class InParty extends SessionState {
+  InParty(this.party);
+
+  final PartyState party;
+
+  @override
+  List<Object?> get props => [party];
+}

Launcher/lib/features/session/providers/session_state.dart

@@ -34,12 +34,12 @@ import 'package:kyber_launcher/features/mods/providers/mod_list_cubit.dart';
 import 'package:kyber_launcher/features/navigation_bar/helper/protocol_helper.dart';
 import 'package:kyber_launcher/features/navigation_bar/providers/status_cubit.dart';
 import 'package:kyber_launcher/features/nexusmods/widgets/graphql_provider.dart';
-import 'package:kyber_launcher/features/party/providers/party_cubit.dart';
 import 'package:kyber_launcher/features/server_browser/providers/ingame_view_cubit.dart';
 import 'package:kyber_launcher/features/server_browser/providers/server_browser_cubit.dart';
 import 'package:kyber_launcher/features/server_browser/providers/server_list_cubit.dart';
 import 'package:kyber_launcher/features/server_moderation/providers/moderation_cubit.dart';
 import 'package:kyber_launcher/features/server_moderation/providers/moderation_servers_cubit.dart';
+import 'package:kyber_launcher/features/session/providers/session_cubit.dart';
 import 'package:kyber_launcher/features/stats/providers/stats_cubit.dart';
 import 'package:kyber_launcher/features/tutorial/providers/tutorial_cubit.dart';
 import 'package:kyber_launcher/gen/assets.gen.dart';
@@ -327,7 +327,7 @@ class _AppState extends State<App> {
                       BlocProvider(create: (_) => KyberProxyCubit()),
                       BlocProvider(create: (_) => ModsListCubit()),
                       BlocProvider(create: (_) => StatsCubit()),
-                      BlocProvider(create: (_) => PartyCubit()),
+                      BlocProvider(create: (_) => SessionCubit()),
                       BlocProvider(create: (_) => IngameViewCubit()),
                       BlocProvider(create: (_) => DownloadCubit(), lazy: false),
                       BlocProvider(