@acorex/components 20.8.29 → 20.8.30

package/fesm2022/acorex-components-conversation2.mjs

@@ -2253,7 +2253,8 @@ function validateLongitude(longitude) {
  * Plain class — not DI-registered; instantiated by `AXConversationService`.
  */
 function withNormalizedPayload(message) {
-    return { ...message, payload: normalizeMessagePayload(message.payload) };
+    const timestamp = message.timestamp instanceof Date ? message.timestamp : new Date(message.timestamp);
+    return { ...message, timestamp, payload: normalizeMessagePayload(message.payload) };
 }
 class ConversationState {
     constructor(config) {
@@ -15201,6 +15202,18 @@ class AXConversationService {
             .subscribe((conversation) => {
             this.handleConversationUpdate(conversation);
         });
+        // Global message stream — backs message list even when the backend only pushes
+        // conversation.lastMessage updates or when per-conversation subscribe races loadMessages.
+        this.realtimeApi
+            .subscribeToMessages('')
+            .pipe(takeUntil(this.destroy$), catchError((error) => {
+            this.errorHandler.handle(error, 'subscribeToMessages');
+            return EMPTY;
+        }))
+            .subscribe((message) => {
+            this.handleNewMessage(message);
+            this._messageReceived$.next(message);
+        });
     }
     /**
      * Load conversations from server
@@ -15274,19 +15287,6 @@ class AXConversationService {
             finally {
                 this._loadingActiveMessages.set(false);
             }
-            // Subscribe to new messages with error handling (only if realtime is available)
-            if (this.realtimeApi) {
-                this.realtimeApi
-                    .subscribeToMessages(conversationId)
-                    .pipe(takeUntil(this._conversationSwitch$), takeUntil(this.destroy$), catchError((error) => {
-                    this.errorHandler.handle(error, 'subscribeToMessages', { conversationId });
-                    return EMPTY;
-                }))
-                    .subscribe((message) => {
-                    this.handleNewMessage(message);
-                    this._messageReceived$.next(message);
-                });
-            }
         }
         catch (error) {
             this.errorHandler.handle(error, 'selectConversation', { conversationId });
@@ -15685,11 +15685,15 @@ class AXConversationService {
      * Handle new message received
      */
     handleNewMessage(message) {
+        if (this.state.getMessage(message.id)) {
+            return;
+        }
         this.state.addMessage(message);
         this.state.updateLastMessage(message);
         const currentId = this._currentUser()?.id ?? 'current-user';
         const isFromOtherUser = message.senderId !== currentId;
-        if (isFromOtherUser) {
+        const isActiveConversation = message.conversationId === this._activeConversationId();
+        if (isFromOtherUser && !isActiveConversation) {
             this.state.incrementUnreadCount(message.conversationId);
         }
     }
@@ -15697,6 +15701,13 @@ class AXConversationService {
      * Handle message update
      */
     handleMessageUpdate(message) {
+        const existing = this.state.getMessage(message.id);
+        if (!existing) {
+            if (message.conversationId === this._activeConversationId()) {
+                this.handleNewMessage(message);
+            }
+            return;
+        }
         this.state.updateMessage(message.id, message);
     }
     /**
@@ -15745,6 +15756,12 @@ class AXConversationService {
      * Updates conversation metadata including unread count, last message, etc.
      */
     handleConversationUpdate(conversation) {
+        const lastMessage = conversation.lastMessage;
+        if (lastMessage &&
+            conversation.id === this._activeConversationId() &&
+            !this.state.getMessage(lastMessage.id)) {
+            this.state.addMessage(lastMessage);
+        }
         this.state.setConversation(conversation);
     }
     /**