fix(chat): real-time message delivery between users

- Filter out ack frames without message body in onMessage/onEditMessage
  to prevent Observable crash and silent subscription death
- Add currentChatId signal with type-safe string comparison to
  prevent cross-chat message leaks
- Guard mapChatMessage from null/undefined inputs

Author: Awakich

projects/social_platform/src/app/api/chat/facades/chat-direct-info.service.ts

@@ -70,7 +70,10 @@ export class ChatDirectInfoService {
     this.route.data
       .pipe(
         map(r => r["data"]),
-        tap(chat => this.chat.set(chat)),
+        tap(chat => {
+          this.chat.set(chat);
+          this.chatDirectUIInfoService.currentChatId.set(this.getChatId());
+        }),
         switchMap(() => this.fetchMessages(type)),
         takeUntil(this.destroy$)
       )

projects/social_platform/src/app/api/chat/facades/ui/chat-direct-ui-info.service.ts

@@ -30,6 +30,7 @@ export class ChatDirectUIInfoService {
 
   /** ID текущего пользователя */
   readonly currentUserId = signal<number | undefined>(undefined);
+  readonly currentChatId = signal<string | undefined>(undefined);
 
   /** Флаг процесса загрузки сообщений */
   readonly fetching = signal<boolean>(false);
@@ -79,8 +80,8 @@ export class ChatDirectUIInfoService {
   }
 
   applyMessageEvent(result: OnChatMessageDto): void {
-    // Бэк иногда шлёт ack-фрейм без поля message — игнорим, чтобы не пушить undefined в список.
     if (!result?.message) return;
+    if (String(result.chatId) !== this.currentChatId()) return;
     this.messages.update(list => [...list, result.message]);
   }
 

projects/social_platform/src/app/infrastructure/repository/chat/chat-realtime.repository.ts

@@ -12,7 +12,7 @@ import {
   TypingInChatEventDto,
 } from "@domain/chat/chat.model";
 import { plainToInstance } from "class-transformer";
-import { map } from "rxjs";
+import { filter, map } from "rxjs";
 import { WebsocketService } from "@core/public-api";
 import { SnackbarService } from "@ui/services/snackbar/snackbar.service";
 import { mapChatMessage } from "./chat.repository";
@@ -41,7 +41,7 @@ export class ChatRealtimeRepository implements ChatRealtimePort {
   }
 
   editMessage(message: Parameters<ChatRealtimePort["editMessage"]>[0]): void {
-    this.chatWsAdapter.editMessage(message);
+    this.chatWsAdapter.editMessage(message)
   }
 
   deleteMessage(message: Parameters<ChatRealtimePort["deleteMessage"]>[0]): void {
@@ -57,16 +57,18 @@ export class ChatRealtimeRepository implements ChatRealtimePort {
   }
 
   onMessage() {
-    return this.chatWsAdapter.onMessage().pipe(
-      map(message => plainToInstance(OnChatMessageDto, message)),
-      map(dto => ({ ...dto, message: mapChatMessage(dto.message) } as OnChatMessageDto))
-    );
-  }
+  return this.chatWsAdapter.onMessage().pipe(
+    map(message => plainToInstance(OnChatMessageDto, message)),
+    filter(dto => !!dto.message),
+    map(dto => ({ ...dto, message: mapChatMessage(dto.message)! } as OnChatMessageDto))
+  );
+}
 
   onEditMessage() {
     return this.chatWsAdapter.onEditMessage().pipe(
       map(message => plainToInstance(OnEditChatMessageDto, message)),
-      map(dto => ({ ...dto, message: mapChatMessage(dto.message) } as OnEditChatMessageDto))
+      filter(dto => !!dto.message),
+      map(dto => ({ ...dto, message: mapChatMessage(dto.message)! } as OnEditChatMessageDto))
     );
   }
 

projects/social_platform/src/app/infrastructure/repository/chat/chat.repository.ts

@@ -17,7 +17,7 @@ export class ChatRepository implements ChatRepositoryPort {
     return this.chatHttpAdapter.loadMessages(id, type, offset, limit).pipe(
       map(page => ({
         ...page,
-        results: page.results.map(mapChatMessage),
+        results: page.results.map(mapChatMessage).filter((message): message is ChatMessage => message !== null),
       }))
     );
   }
@@ -33,7 +33,8 @@ export class ChatRepository implements ChatRepositoryPort {
   }
 }
 
-export function mapChatMessage(message: ChatMessage): ChatMessage {
+export function mapChatMessage(message: ChatMessage | null | undefined): ChatMessage | null {
+  if (!message) return null;
   return {
     ...message,
     author: message.author ? userFromRaw(message.author) : message.author,