@banta/sdk 5.6.5 → 5.8.0

package/fesm2022/banta-sdk.mjs

@@ -7950,8 +7950,6 @@ class CommentViewComponent {
         // Load more from backend if needed
         // Note: Backend only supports fetching more content in one direction.
         let lastMessage = this.previousMessages[0] ?? this.messages[0];
-        if (!lastMessage)
-            this.hasMore = false;
         if (nextPageSize > 0 && this.newestLast && lastMessage) {
             this.isLoadingMore = true;
             let messages = await this.source.loadAfter(lastMessage, nextPageSize);
@@ -8018,8 +8016,6 @@ class CommentViewComponent {
             nextPageSize -= storedMessages.length;
         }
         const lastMessage = this.olderMessages[this.olderMessages.length - 1] ?? this.messages[this.messages.length - 1];
-        if (!lastMessage)
-            this.hasMore = false;
         if (nextPageSize > 0 && !this.newestLast && lastMessage) {
             // Load more from backend
             this.isLoadingMore = true;
@@ -8060,16 +8056,16 @@ class CommentViewComponent {
             nextPageSize -= storedMessages.length;
             this.hasMore = this.olderMessages.length > 0;
         }
-        if (nextPageSize > 0) {
+        let lastMessage;
+        if (this.newestLast) {
+            lastMessage = this.olderMessages[0] ?? this.messages[0];
+        }
+        else {
+            lastMessage = this.olderMessages[this.olderMessages.length - 1] ?? this.messages[this.messages.length - 1];
+        }
+        if (nextPageSize > 0 && lastMessage) {
             // Load more from backend
             this.isLoadingMore = true;
-            let lastMessage;
-            if (this.newestLast) {
-                lastMessage = this.olderMessages[0] ?? this.messages[0];
-            }
-            else {
-                lastMessage = this.olderMessages[this.olderMessages.length - 1] ?? this.messages[this.messages.length - 1];
-            }
             if (!lastMessage) {
                 this.isLoadingMore = false;
                 this.hasMore = false;
@@ -8094,15 +8090,17 @@ class CommentViewComponent {
             this.isLoadingMore = false;
         }
         // Extract the messages that do not fit in the maxVisibleMessages buffer.
-        let overflow;
-        if (this.newestLast)
-            overflow = this.messages.splice(this.maxVisibleMessages, this.messages.length);
-        else
-            overflow = this.messages.splice(0, this.maxVisibleMessages);
-        // Regardless of the order (newestLast), newMessages represents the direction that is being pushed, since it's definition
-        // depends on that order. Move overflowing messages into newMessages.
-        this.newMessages = overflow.concat(this.newMessages);
-        this.newMessages.splice(this.maxMessages - this.maxVisibleMessages, this.newMessages.length);
+        if (this.messages.length > this.maxVisibleMessages) {
+            let overflow = [];
+            if (this.newestLast)
+                overflow = this.messages.splice(this.maxVisibleMessages, this.messages.length);
+            else
+                overflow = this.messages.splice(0, this.messages.length - this.maxVisibleMessages);
+            // Regardless of the order (newestLast), newMessages represents the direction that is being pushed, since it's definition
+            // depends on that order. Move overflowing messages into newMessages.
+            this.newMessages = overflow.concat(this.newMessages);
+            this.newMessages.splice(this.maxMessages - this.maxVisibleMessages, this.newMessages.length);
+        }
     }
     addMessage(message) {
         if (!message.transientState)
@@ -9048,6 +9046,12 @@ class BantaCommentsComponent {
             return;
         setTimeout(async () => {
             console.log(`[Banta/Comments] Subscribing to topic source '${topicID}'`);
+            // If we are loading a shared comment, we must override the mode to be Newest/All
+            // to ensure we can find the comment.
+            if (this.sharedCommentID) {
+                this._sortOrder = CommentsOrder.NEWEST;
+                this._filterMode = FilterMode.ALL;
+            }
             this.source = await this.backend.getSourceForTopic(topicID, {
                 sortOrder: this.sortOrder,
                 filterMode: this.filterMode,
@@ -9318,16 +9322,21 @@ class BantaCommentsComponent {
             await this.waitForThreadView();
             await this.threadView.loadMessageInContext(message);
             message = await thread.get(message.id);
-            message.transientState ??= {};
-            message.transientState.highlighted = true;
-            console.dir(message);
-            await new Promise(resolve => setTimeout(() => resolve(), 500));
+            if (message) {
+                message.transientState ??= {};
+                message.transientState.highlighted = true;
+                console.dir(message);
+                await new Promise(r => setTimeout(r, 500));
+            }
         }
         else {
             // Make sure that this message is loaded and visible to the user
             await this.commentView.loadMessageInContext(message);
-            message.transientState ??= {};
-            message.transientState.highlighted = true;
+            message = await source.get(message.id);
+            if (message) {
+                message.transientState ??= {};
+                message.transientState.highlighted = true;
+            }
         }
         this.loadingSharedComment = false;
         await this.scrollToComment(id);
@@ -10688,6 +10697,32 @@ class ChatSource extends SocketRPC {
         }
         return message;
     }
+    /**
+     * Ask server for messages that have occurred since the message with the given ID.
+     * This is used during brief reconnects to avoid dropping messages, while also not
+     * causing mobbing as everyone reconnects after an issue. The backend can choose to
+     * not service this request, instead returning undefined. In that case, the client
+     * is expected to fetch the existing messages and start state anew.
+     *
+     * TODO: this is not yet used
+     *
+     * @param id
+     * @returns
+     */
+    async loadSince(id) {
+        try {
+            let messages = await this.idempotentPeer.loadSince(id);
+            if (messages) {
+                messages = this.mapOrUpdateMessages(messages);
+            }
+            return messages;
+        }
+        catch (e) {
+            console.error(`[Banta/${this.identifier}] Error occurred while trying to get existing messages:`);
+            console.error(e);
+            return [];
+        }
+    }
     async getExistingMessages() {
         try {
             let messages = await this.idempotentPeer.getExistingMessages(this.options.initialMessageCount ?? 20);
@@ -10788,7 +10823,10 @@ class ChatSource extends SocketRPC {
     async send(message) {
         await this.ensureConnection();
         message.id ??= v4();
-        return await this.idempotentPeer.sendMessage(message);
+        let finishedMessage = await this.idempotentPeer.sendMessage(message);
+        this.messageMap.set(finishedMessage.id, finishedMessage);
+        this._messageReceived.next(finishedMessage);
+        return finishedMessage;
     }
     async loadAfter(message, count) {
         if (!message)
@@ -10873,6 +10911,9 @@ class StaticChatSource {
         }
         this.backend.getSourceCountForTopic(this.identifier);
     }
+    async loadSince(id) {
+        return undefined;
+    }
     async getExistingMessages() {
         if (this.parentIdentifier) {
             return await this.backend.getReplies(this.parentIdentifier, this.sortOrder, this.filterMode, 0, this.initialMessageCount);
@@ -10909,12 +10950,22 @@ class ChatBackend extends ChatBackendBase {
         super(...arguments);
         this.options = inject(BANTA_SDK_OPTIONS);
         this.platformId = inject(PLATFORM_ID);
+        this.runId = v4();
     }
     get serviceUrl() {
         return `${this.options?.serviceUrl ?? 'http://localhost:3422'}`;
     }
     async connectToService() {
-        let socket = new DurableSocket(`${this.serviceUrl.replace(/^http/, 'ws')}/socket`);
+        let deviceId = v4();
+        if (typeof localStorage !== 'undefined') {
+            if (localStorage['banta-chat:deviceId']) {
+                deviceId = localStorage['banta-chat:deviceId'];
+            }
+            else {
+                localStorage['banta-chat:deviceId'] = deviceId;
+            }
+        }
+        let socket = new DurableSocket(`${this.serviceUrl.replace(/^http/, 'ws')}/socket`, undefined, `${deviceId},${this.runId}`);
         await new Promise((resolve, reject) => {
             socket.onopen = () => {
                 resolve();