socket fixed

lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart

@@ -2,13 +2,9 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:audioplayers/audioplayers.dart';
-import 'package:dart_pusher_channels/dart_pusher_channels.dart';
 import 'package:easy_debounce/easy_debounce.dart';
-import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/image_compressing/image_compress_utility.dart';
-import 'package:eatvio_app/core/initialization_cubit/initialization_cubit.dart';
-import 'package:eatvio_app/core/initialization_cubit/initialization_state.dart';
-import 'package:eatvio_app/core/token_storage.dart';
+import 'package:eatvio_app/core/initialization_cubit/ws_manager.dart';
 import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart';
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
@@ -16,41 +12,42 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 
 class ChatRoomCubit extends Cubit<ChatRoomState> {
   final ChatRepository chatRepository;
-  final InitializationCubit initializationCubit;
+  final WsManager wsManager;
 
   int currentPage = 1;
   late final int lastPage;
   bool isLoading = false;
 
-  late final PusherChannelsClient client;
-  late final PrivateChannel privateChatChannel;
-
   ChatRoomCubit({
     required this.chatRepository,
-    required this.initializationCubit,
+    required this.wsManager,
   }) : super(ChatRoomState.loading());
 
   loadNextPage(String chatId) async {
     if (currentPage < lastPage && !isLoading) {
       isLoading = true;
 
-      emit(ChatRoomState.loaded(
-        chatRoom: (state as ChatRoomStateLoaded).chatRoom,
-        chatMessages: (state as ChatRoomStateLoaded).chatMessages,
-        isTyping: (state as ChatRoomStateLoaded).isTyping,
-        isLoading: isLoading,
-      ),);
+      emit(
+        ChatRoomState.loaded(
+          chatRoom: (state as ChatRoomStateLoaded).chatRoom,
+          chatMessages: (state as ChatRoomStateLoaded).chatMessages,
+          isTyping: (state as ChatRoomStateLoaded).isTyping,
+          isLoading: isLoading,
+        ),
+      );
 
       try {
         final chatMessages = await chatRepository.getChatMessages(chatId, currentPage + 1);
 
         isLoading = false;
-        emit(ChatRoomState.loaded(
-          chatRoom: (state as ChatRoomStateLoaded).chatRoom,
-          chatMessages: [...(state as ChatRoomStateLoaded).chatMessages, ...chatMessages.messagesList],
-          isTyping: (state as ChatRoomStateLoaded).isTyping,
-          isLoading: isLoading,
-        ),);
+        emit(
+          ChatRoomState.loaded(
+            chatRoom: (state as ChatRoomStateLoaded).chatRoom,
+            chatMessages: [...(state as ChatRoomStateLoaded).chatMessages, ...chatMessages.messagesList],
+            isTyping: (state as ChatRoomStateLoaded).isTyping,
+            isLoading: isLoading,
+          ),
+        );
 
         currentPage++;
       } catch (e) {
@@ -66,38 +63,29 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
       final chatMessages = await chatRepository.getChatMessages(chatId, currentPage);
       lastPage = chatMessages.meta.lastPage;
 
-      await _subscribeToChatChannel(initCubit: initializationCubit, chatId: chatId);
+      await _subscribeToChatChannel(chatId: chatId);
 
-      emit(ChatRoomState.loaded(
-        chatRoom: chatRoom,
-        chatMessages: chatMessages.messagesList,
-        isTyping: false,
-        isLoading: isLoading,
-      ),);
+      emit(
+        ChatRoomState.loaded(
+          chatRoom: chatRoom,
+          chatMessages: chatMessages.messagesList,
+          isTyping: false,
+          isLoading: isLoading,
+        ),
+      );
     } catch (e) {
       emit(ChatRoomState.error(errorMessage: 'Ошибка получеия данных'));
     }
   }
 
   Future<void> _subscribeToChatChannel({
-    required InitializationCubit initCubit,
     required String chatId,
   }) async {
-    client = (initCubit.state as InitializationStateSuccess).client;
-
-    privateChatChannel = await client.privateChannel(
-      'private-direct-chat.$chatId',
-      authorizationDelegate: EndpointAuthorizableChannelTokenAuthorizationDelegate.forPrivateChannel(
-        authorizationEndpoint: Uri.parse(baseUrl + '/broadcasting/auth'),
-        headers: {
-          'Authorization': 'Bearer ${await TokenStorage.getTokenFromStorage()}',
-        },
-      ),
-    );
-
-    privateChatChannel.subscribe();
-
-    privateChatChannel.bind('App\\Events\\ChatMessageUpdated').listen((event) {
+    final client = wsManager.client;
+    if (client == null) return;
+    await wsManager.initPrivateDirectChatChannel(chatId);
+    wsManager.subscribeDirectChatChannel();
+    wsManager.directChatStream?.listen((event) {
       AudioPlayer().play((AssetSource('audio/recive_message.wav')));
       List<ChatMessageModel> messagesList = [
         ChatMessageModel.fromJson(jsonDecode(event.data)['message']),
@@ -113,7 +101,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
       );
     });
 
-    privateChatChannel.bind('client-typing').listen((event) {
+    wsManager.clientTypingStream?.listen((event) {
       emit(
         ChatRoomState.loaded(
           chatRoom: (state as ChatRoomStateLoaded).chatRoom,
@@ -152,7 +140,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
 
   @override
   Future<void> close() async {
-    privateChatChannel.unsubscribe();
+    wsManager.unsubscribeDirectChatChannel();
     super.close();
   }
 }