@onyx-p/imlib-web 1.9.9 → 2.0.1

package/index.esm.js

@@ -28376,7 +28376,8 @@ function getMessageSentTime() {
 class MessageCache {
   static instance;
   messageCache = new Map();
-  maxCacheCount = 100;
+  loadedEndMap = new Map();
+  maxCacheCount = 1000;
   constructor() {}
   static get() {
     if (!MessageCache.instance) {
@@ -28389,41 +28390,41 @@ class MessageCache {
       this.maxCacheCount = count;
     }
   }
-  addMessages(messages) {
+  addMessages(messages, toConversation, isEnd = undefined) {
     if (!messages || messages.length === 0) {
       return;
     }
-    const messagesByDialog = new Map();
-    messages.forEach(message => {
-      const dialogId = getFullDialogId({
-        conversationType: message.conversationType,
-        targetId: message.targetId
-      });
-      if (!messagesByDialog.has(dialogId)) {
-        messagesByDialog.set(dialogId, []);
-      }
-      messagesByDialog.get(dialogId)?.push(message);
-    });
-    messagesByDialog.forEach((dialogMessages, dialogId) => {
-      if (!this.messageCache.has(dialogId)) {
-        this.messageCache.set(dialogId, []);
-      }
-      const cachedMessages = this.messageCache.get(dialogId) || [];
-      const allMessages = [...cachedMessages, ...dialogMessages];
-      if (allMessages.length > this.maxCacheCount) {
-        allMessages.splice(0, allMessages.length - this.maxCacheCount);
-      }
-      this.messageCache.set(dialogId, allMessages);
-    });
+    const dialogId = getFullDialogId(toConversation);
+    if (isEnd !== undefined) {
+      this.loadedEndMap.set(dialogId, isEnd);
+    }
+    if (!this.messageCache.has(dialogId)) {
+      this.messageCache.set(dialogId, []);
+    }
+    const cachedMessages = this.messageCache.get(dialogId) || [];
+    const existingMessageIds = new Set(cachedMessages.map(msg => msg.messageUId));
+    const newMessages = messages.filter(msg => !existingMessageIds.has(msg.messageUId));
+    const allMessages = [...cachedMessages, ...newMessages].sort((a, b) => Long.fromString(a.sentTime).compare(Long.fromString(b.sentTime)));
+    if (allMessages.length > this.maxCacheCount) {
+      allMessages.splice(0, allMessages.length - this.maxCacheCount);
+    }
+    this.messageCache.set(dialogId, allMessages);
   }
   getPreviousMessages(conversation, timestamp = "0", count = 20) {
     const dialogId = getFullDialogId(conversation);
     const cachedMessages = this.messageCache.get(dialogId) || [];
     if (cachedMessages.length === 0) {
-      return [];
+      return {
+        messages: [],
+        hasMore: !this.loadedEndMap.get(dialogId)
+      };
     }
     if (timestamp === "0") {
-      return cachedMessages.slice(-count);
+      const messages = cachedMessages.slice(-count);
+      return {
+        messages,
+        hasMore: cachedMessages.length > count || !this.loadedEndMap.get(dialogId)
+      };
     }
     const timestampLong = Long.fromString(timestamp);
     let endIndex = cachedMessages.length - 1;
@@ -28434,17 +28435,25 @@ class MessageCache {
       endIndex--;
     }
     if (endIndex < 0) {
-      return [];
+      return {
+        messages: [],
+        hasMore: !this.loadedEndMap.get(dialogId)
+      };
     }
     const startIndex = Math.max(0, endIndex - count + 1);
-    return cachedMessages.slice(startIndex, endIndex + 1);
+    return {
+      messages: cachedMessages.slice(startIndex, endIndex + 1),
+      hasMore: startIndex > 0 || !this.loadedEndMap.get(dialogId)
+    };
   }
   clearConversationCache(conversation) {
     const dialogId = getFullDialogId(conversation);
     this.messageCache.delete(dialogId);
+    this.loadedEndMap.set(dialogId, true);
   }
   clearAllCache() {
     this.messageCache.clear();
+    this.loadedEndMap.clear();
   }
   removeMessagesByUId(messageUIds) {
     if (!messageUIds || messageUIds.length === 0) {
@@ -28579,7 +28588,12 @@ class IMClient extends EventEmitter {
         this.emit(Events.SUSPEND, this.libLoader.getConnectionStatus());
       },
       batchMessage: messages => {
-        MessageCache.get().addMessages(messages);
+        if (messages.length) {
+          MessageCache.get().addMessages(messages, {
+            conversationType: messages[0].content,
+            targetId: messages[0].targetId
+          });
+        }
         const filteredMessages = messages.filter(m => {
           if (m.messageDirection === MessageDirection.SEND && m.messageId && SentMessageStore.has(m.messageId)) {
             SentMessageStore.remove(m.messageId);
@@ -28653,11 +28667,13 @@ class IMClient extends EventEmitter {
     return result;
   }
   async getRemoteHistoryMessages(conversation, options) {
+    const timestamp = options.timestamp ?? '0';
+    const count = options.count ?? 20;
     const dialogId = getFullDialogId(conversation);
     return getRemoteMessages({
       dialogId,
-      offset: options.timestamp ?? '0',
-      count: options.count ?? 20,
+      offset: timestamp,
+      count,
       newToOld: options.order === 0
     }).then(({
       code,
@@ -28676,9 +28692,6 @@ class IMClient extends EventEmitter {
         }, (_, outputMsgs) => {
           const messageList = outputMsgs.get(dialogId) ?? [];
           messageList.sort((e1, e2) => Long.fromString(e1.sentTime).lessThan(Long.fromString(e2.sentTime)) ? -1 : 1);
-          if (options.order === 0 && !options.timestamp) {
-            ConversationManager$1.get().refreshLatestMessage(conversation, messageList[messageList.length - 1]);
-          }
           resolve({
             code: ErrorCode.SUCCESS,
             data: {
@@ -28691,31 +28704,36 @@ class IMClient extends EventEmitter {
     });
   }
   async getPreviousHistoryMessages(conversation, timestamp, count = 20) {
-    const cachedMessages = MessageCache.get().getPreviousMessages(conversation, timestamp ?? "0", count);
-    if (!timestamp && cachedMessages.length) {
-      ConversationManager$1.get().refreshLatestMessage(conversation, cachedMessages[cachedMessages.length - 1]);
+    const cachedResult = MessageCache.get().getPreviousMessages(conversation, timestamp ?? '0', count);
+    if (!timestamp && cachedResult.messages.length) {
+      ConversationManager$1.get().refreshLatestMessage(conversation, cachedResult.messages[cachedResult.messages.length - 1]);
     }
-    if (cachedMessages.length >= count) {
+    if (cachedResult.messages.length >= count || !cachedResult.hasMore) {
       return {
         code: ErrorCode.SUCCESS,
         data: {
-          list: cachedMessages,
-          hasMore: true
+          list: cachedResult.messages,
+          hasMore: cachedResult.hasMore
         }
       };
     }
     const remotesResult = await this.getRemoteHistoryMessages(conversation, {
-      timestamp: cachedMessages[0]?.sentTime ?? timestamp,
-      count: count - cachedMessages.length,
+      timestamp: cachedResult.messages[0]?.sentTime ?? timestamp,
+      count: count - cachedResult.messages.length,
       order: 0
     });
     if (remotesResult.code !== ErrorCode.SUCCESS) {
       return remotesResult;
     }
+    const remotesMessages = remotesResult.data.list;
+    if (!timestamp && remotesMessages.length) {
+      ConversationManager$1.get().refreshLatestMessage(conversation, remotesMessages[remotesMessages.length - 1]);
+    }
+    MessageCache.get().addMessages(remotesMessages, conversation, !remotesResult.data.hasMore);
     return {
       code: ErrorCode.SUCCESS,
       data: {
-        list: [...remotesResult.data.list, ...cachedMessages],
+        list: [...remotesResult.data.list, ...cachedResult.messages],
         hasMore: remotesResult.data.hasMore
       }
     };
@@ -28758,7 +28776,7 @@ class IMClient extends EventEmitter {
         if (isDef(conversationObj.latestMessage)) {
           conversationObj.updateTime = parseInt(conversationObj.latestMessage.sentTime);
         } else {
-          conversationObj.updateTime = (contentList[contentList.length - 1].updateTime ?? 0) + 1;
+          conversationObj.updateTime = (contentList[contentList.length - 1]?.updateTime ?? 0) + 1;
         }
         ConversationManager$1.get().addLocalConversation(conversationObj);
         const localConversation = ConversationManager$1.get().get(conOpt);

package/index.umd.js

@@ -28382,7 +28382,8 @@
   class MessageCache {
     static instance;
     messageCache = new Map();
-    maxCacheCount = 100;
+    loadedEndMap = new Map();
+    maxCacheCount = 1000;
     constructor() {}
     static get() {
       if (!MessageCache.instance) {
@@ -28395,41 +28396,41 @@
         this.maxCacheCount = count;
       }
     }
-    addMessages(messages) {
+    addMessages(messages, toConversation, isEnd = undefined) {
       if (!messages || messages.length === 0) {
         return;
       }
-      const messagesByDialog = new Map();
-      messages.forEach(message => {
-        const dialogId = getFullDialogId({
-          conversationType: message.conversationType,
-          targetId: message.targetId
-        });
-        if (!messagesByDialog.has(dialogId)) {
-          messagesByDialog.set(dialogId, []);
-        }
-        messagesByDialog.get(dialogId)?.push(message);
-      });
-      messagesByDialog.forEach((dialogMessages, dialogId) => {
-        if (!this.messageCache.has(dialogId)) {
-          this.messageCache.set(dialogId, []);
-        }
-        const cachedMessages = this.messageCache.get(dialogId) || [];
-        const allMessages = [...cachedMessages, ...dialogMessages];
-        if (allMessages.length > this.maxCacheCount) {
-          allMessages.splice(0, allMessages.length - this.maxCacheCount);
-        }
-        this.messageCache.set(dialogId, allMessages);
-      });
+      const dialogId = getFullDialogId(toConversation);
+      if (isEnd !== undefined) {
+        this.loadedEndMap.set(dialogId, isEnd);
+      }
+      if (!this.messageCache.has(dialogId)) {
+        this.messageCache.set(dialogId, []);
+      }
+      const cachedMessages = this.messageCache.get(dialogId) || [];
+      const existingMessageIds = new Set(cachedMessages.map(msg => msg.messageUId));
+      const newMessages = messages.filter(msg => !existingMessageIds.has(msg.messageUId));
+      const allMessages = [...cachedMessages, ...newMessages].sort((a, b) => Long.fromString(a.sentTime).compare(Long.fromString(b.sentTime)));
+      if (allMessages.length > this.maxCacheCount) {
+        allMessages.splice(0, allMessages.length - this.maxCacheCount);
+      }
+      this.messageCache.set(dialogId, allMessages);
     }
     getPreviousMessages(conversation, timestamp = "0", count = 20) {
       const dialogId = getFullDialogId(conversation);
       const cachedMessages = this.messageCache.get(dialogId) || [];
       if (cachedMessages.length === 0) {
-        return [];
+        return {
+          messages: [],
+          hasMore: !this.loadedEndMap.get(dialogId)
+        };
       }
       if (timestamp === "0") {
-        return cachedMessages.slice(-count);
+        const messages = cachedMessages.slice(-count);
+        return {
+          messages,
+          hasMore: cachedMessages.length > count || !this.loadedEndMap.get(dialogId)
+        };
       }
       const timestampLong = Long.fromString(timestamp);
       let endIndex = cachedMessages.length - 1;
@@ -28440,17 +28441,25 @@
         endIndex--;
       }
       if (endIndex < 0) {
-        return [];
+        return {
+          messages: [],
+          hasMore: !this.loadedEndMap.get(dialogId)
+        };
       }
       const startIndex = Math.max(0, endIndex - count + 1);
-      return cachedMessages.slice(startIndex, endIndex + 1);
+      return {
+        messages: cachedMessages.slice(startIndex, endIndex + 1),
+        hasMore: startIndex > 0 || !this.loadedEndMap.get(dialogId)
+      };
     }
     clearConversationCache(conversation) {
       const dialogId = getFullDialogId(conversation);
       this.messageCache.delete(dialogId);
+      this.loadedEndMap.set(dialogId, true);
     }
     clearAllCache() {
       this.messageCache.clear();
+      this.loadedEndMap.clear();
     }
     removeMessagesByUId(messageUIds) {
       if (!messageUIds || messageUIds.length === 0) {
@@ -28585,7 +28594,12 @@
           this.emit(exports.Events.SUSPEND, this.libLoader.getConnectionStatus());
         },
         batchMessage: messages => {
-          MessageCache.get().addMessages(messages);
+          if (messages.length) {
+            MessageCache.get().addMessages(messages, {
+              conversationType: messages[0].content,
+              targetId: messages[0].targetId
+            });
+          }
           const filteredMessages = messages.filter(m => {
             if (m.messageDirection === exports.MessageDirection.SEND && m.messageId && SentMessageStore.has(m.messageId)) {
               SentMessageStore.remove(m.messageId);
@@ -28659,11 +28673,13 @@
       return result;
     }
     async getRemoteHistoryMessages(conversation, options) {
+      const timestamp = options.timestamp ?? '0';
+      const count = options.count ?? 20;
       const dialogId = getFullDialogId(conversation);
       return getRemoteMessages({
         dialogId,
-        offset: options.timestamp ?? '0',
-        count: options.count ?? 20,
+        offset: timestamp,
+        count,
         newToOld: options.order === 0
       }).then(({
         code,
@@ -28682,9 +28698,6 @@
           }, (_, outputMsgs) => {
             const messageList = outputMsgs.get(dialogId) ?? [];
             messageList.sort((e1, e2) => Long.fromString(e1.sentTime).lessThan(Long.fromString(e2.sentTime)) ? -1 : 1);
-            if (options.order === 0 && !options.timestamp) {
-              ConversationManager$1.get().refreshLatestMessage(conversation, messageList[messageList.length - 1]);
-            }
             resolve({
               code: exports.ErrorCode.SUCCESS,
               data: {
@@ -28697,31 +28710,36 @@
       });
     }
     async getPreviousHistoryMessages(conversation, timestamp, count = 20) {
-      const cachedMessages = MessageCache.get().getPreviousMessages(conversation, timestamp ?? "0", count);
-      if (!timestamp && cachedMessages.length) {
-        ConversationManager$1.get().refreshLatestMessage(conversation, cachedMessages[cachedMessages.length - 1]);
+      const cachedResult = MessageCache.get().getPreviousMessages(conversation, timestamp ?? '0', count);
+      if (!timestamp && cachedResult.messages.length) {
+        ConversationManager$1.get().refreshLatestMessage(conversation, cachedResult.messages[cachedResult.messages.length - 1]);
       }
-      if (cachedMessages.length >= count) {
+      if (cachedResult.messages.length >= count || !cachedResult.hasMore) {
         return {
           code: exports.ErrorCode.SUCCESS,
           data: {
-            list: cachedMessages,
-            hasMore: true
+            list: cachedResult.messages,
+            hasMore: cachedResult.hasMore
           }
         };
       }
       const remotesResult = await this.getRemoteHistoryMessages(conversation, {
-        timestamp: cachedMessages[0]?.sentTime ?? timestamp,
-        count: count - cachedMessages.length,
+        timestamp: cachedResult.messages[0]?.sentTime ?? timestamp,
+        count: count - cachedResult.messages.length,
         order: 0
       });
       if (remotesResult.code !== exports.ErrorCode.SUCCESS) {
         return remotesResult;
       }
+      const remotesMessages = remotesResult.data.list;
+      if (!timestamp && remotesMessages.length) {
+        ConversationManager$1.get().refreshLatestMessage(conversation, remotesMessages[remotesMessages.length - 1]);
+      }
+      MessageCache.get().addMessages(remotesMessages, conversation, !remotesResult.data.hasMore);
       return {
         code: exports.ErrorCode.SUCCESS,
         data: {
-          list: [...remotesResult.data.list, ...cachedMessages],
+          list: [...remotesResult.data.list, ...cachedResult.messages],
           hasMore: remotesResult.data.hasMore
         }
       };
@@ -28764,7 +28782,7 @@
           if (isDef(conversationObj.latestMessage)) {
             conversationObj.updateTime = parseInt(conversationObj.latestMessage.sentTime);
           } else {
-            conversationObj.updateTime = (contentList[contentList.length - 1].updateTime ?? 0) + 1;
+            conversationObj.updateTime = (contentList[contentList.length - 1]?.updateTime ?? 0) + 1;
           }
           ConversationManager$1.get().addLocalConversation(conversationObj);
           const localConversation = ConversationManager$1.get().get(conOpt);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onyx-p/imlib-web",
-  "version": "1.9.9",
+  "version": "2.0.1",
   "main": "index.umd.js",
   "module": "index.esm.js",
   "types": "types/index.d.ts",