@onyx-p/imlib-web 1.8.6 → 1.8.8

package/index.esm.js

@@ -20610,6 +20610,7 @@ let manager;
 var MessageReceiptManager$1 = {
   create(appkey, currentUserId) {
     manager = new MessageReceiptManager(appkey, currentUserId);
+    manager.cleanExpiredMessages();
   },
   get() {
     return manager;
@@ -28328,6 +28329,93 @@ function getMessageSentTime() {
   return UniqueSentTime;
 }
 
+class MessageCache {
+  static instance;
+  messageCache = new Map();
+  maxCacheCount = 100;
+  constructor() {}
+  static get() {
+    if (!MessageCache.instance) {
+      MessageCache.instance = new MessageCache();
+    }
+    return MessageCache.instance;
+  }
+  setMaxCacheCount(count) {
+    if (count > 0) {
+      this.maxCacheCount = count;
+    }
+  }
+  addMessages(messages) {
+    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);
+    });
+  }
+  getPreviousMessages(conversation, timestamp = "0", count = 20) {
+    const dialogId = getFullDialogId(conversation);
+    const cachedMessages = this.messageCache.get(dialogId) || [];
+    if (cachedMessages.length === 0) {
+      return [];
+    }
+    if (timestamp === "0") {
+      return cachedMessages.slice(-count);
+    }
+    const timestampLong = Long.fromString(timestamp);
+    let endIndex = cachedMessages.length - 1;
+    while (endIndex >= 0) {
+      if (Long.fromString(cachedMessages[endIndex].sentTime).lessThanOrEqual(timestampLong)) {
+        break;
+      }
+      endIndex--;
+    }
+    if (endIndex < 0) {
+      return [];
+    }
+    const startIndex = Math.max(0, endIndex - count + 1);
+    return cachedMessages.slice(startIndex, endIndex + 1);
+  }
+  clearConversationCache(conversation) {
+    const dialogId = getFullDialogId(conversation);
+    this.messageCache.delete(dialogId);
+  }
+  clearAllCache() {
+    this.messageCache.clear();
+  }
+  removeMessagesByUId(messageUIds) {
+    if (!messageUIds || messageUIds.length === 0) {
+      return;
+    }
+    const messageUIdSet = new Set(messageUIds);
+    this.messageCache.forEach((messages, dialogId) => {
+      const filteredMessages = messages.filter(msg => !messageUIdSet.has(msg.messageUId));
+      if (filteredMessages.length !== messages.length) {
+        this.messageCache.set(dialogId, filteredMessages);
+      }
+    });
+  }
+}
+
 class IMClient extends EventEmitter {
   options;
   static imClient;
@@ -28375,6 +28463,7 @@ class IMClient extends EventEmitter {
         this.emit(Events.SUSPEND, this.libLoader.getConnectionStatus());
       },
       batchMessage: messages => {
+        MessageCache.get().addMessages(messages);
         this.emit(Events.MESSAGES, {
           messages
         });
@@ -28394,6 +28483,7 @@ class IMClient extends EventEmitter {
         });
       },
       onRecall: messageUids => {
+        MessageCache.get().removeMessagesByUId(messageUids);
         messageUids.forEach(messageUId => {
           this.emit(Events.RECALL, messageUId);
         });
@@ -28436,7 +28526,7 @@ class IMClient extends EventEmitter {
     const dialogId = getFullDialogId(conversation);
     return getRemoteMessages({
       dialogId,
-      offset: options.timestamp ?? "0",
+      offset: options.timestamp ?? '0',
       count: options.count ?? 20,
       newToOld: options.order === 0
     }).then(({
@@ -28470,10 +28560,42 @@ 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]);
+    }
+    if (cachedMessages.length >= count) {
+      return {
+        code: ErrorCode.SUCCESS,
+        data: {
+          list: cachedMessages,
+          hasMore: true
+        }
+      };
+    }
+    const remotesResult = await this.getRemoteHistoryMessages(conversation, {
+      timestamp: cachedMessages[0].sentTime ?? timestamp,
+      count: count - cachedMessages.length,
+      order: 0
+    });
+    if (remotesResult.code !== ErrorCode.SUCCESS) {
+      return remotesResult;
+    }
+    return {
+      code: ErrorCode.SUCCESS,
+      data: {
+        list: [...remotesResult.data.list, ...cachedMessages],
+        hasMore: remotesResult.data.hasMore
+      }
+    };
+  }
   async deleteRemoteMessage(conversation, list) {
+    MessageCache.get().removeMessagesByUId(list.map(e => e.messageUId));
     return deleteMessages$1(getFullDialogId(conversation), list.map(e => e.messageUId)).then(result => result.code);
   }
   async deleteRemoteMessageByTimestamp(conversation, timestamp) {
+    MessageCache.get().clearConversationCache(conversation);
     ConversationManager$1.get().clearHistoryMessages(conversation);
     return clearHistoryMessage(getFullDialogId(conversation), timestamp === 0 ? Number.MAX_VALUE : timestamp).then(result => result.code);
   }
@@ -29851,7 +29973,6 @@ const getHistoryMessages = async (conversation, options) => {
   return response;
 };
 const getRemoteHistoryMessages = async (conversation, options) => {
-  assert('options.timestamp', options.timestamp ?? 0, AssertRules.NUMBER);
   assert('options.count', options.count ?? 0, AssertRules.NUMBER);
   assert('options.order', options.order ?? 0, value => {
     return value === 0 || value === 1;
@@ -29859,7 +29980,15 @@ const getRemoteHistoryMessages = async (conversation, options) => {
   assert('conversation', conversation, AssertRules.CONVERSATION, true);
   const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
   logger.debug('get remote history message ->' + paramsStr);
-  const response = await imClient.getRemoteHistoryMessages(conversation, options);
+  if (isDef(options.timestamp)) {
+    options.timestamp = options.timestamp.toString();
+  }
+  let response;
+  if (!options.order) {
+    response = await imClient.getPreviousHistoryMessages(conversation, options.timestamp, options.count);
+  } else {
+    response = await imClient.getRemoteHistoryMessages(conversation, options);
+  }
   if (response.code !== ErrorCode.SUCCESS) {
     logger.warn('get remote history message fail ->' + response.code + ':' + ErrorDesc(response.code) + ',' + paramsStr);
   }

package/index.umd.js

@@ -20616,6 +20616,7 @@
   var MessageReceiptManager$1 = {
     create(appkey, currentUserId) {
       manager = new MessageReceiptManager(appkey, currentUserId);
+      manager.cleanExpiredMessages();
     },
     get() {
       return manager;
@@ -28334,6 +28335,93 @@
     return UniqueSentTime;
   }
 
+  class MessageCache {
+    static instance;
+    messageCache = new Map();
+    maxCacheCount = 100;
+    constructor() {}
+    static get() {
+      if (!MessageCache.instance) {
+        MessageCache.instance = new MessageCache();
+      }
+      return MessageCache.instance;
+    }
+    setMaxCacheCount(count) {
+      if (count > 0) {
+        this.maxCacheCount = count;
+      }
+    }
+    addMessages(messages) {
+      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);
+      });
+    }
+    getPreviousMessages(conversation, timestamp = "0", count = 20) {
+      const dialogId = getFullDialogId(conversation);
+      const cachedMessages = this.messageCache.get(dialogId) || [];
+      if (cachedMessages.length === 0) {
+        return [];
+      }
+      if (timestamp === "0") {
+        return cachedMessages.slice(-count);
+      }
+      const timestampLong = Long.fromString(timestamp);
+      let endIndex = cachedMessages.length - 1;
+      while (endIndex >= 0) {
+        if (Long.fromString(cachedMessages[endIndex].sentTime).lessThanOrEqual(timestampLong)) {
+          break;
+        }
+        endIndex--;
+      }
+      if (endIndex < 0) {
+        return [];
+      }
+      const startIndex = Math.max(0, endIndex - count + 1);
+      return cachedMessages.slice(startIndex, endIndex + 1);
+    }
+    clearConversationCache(conversation) {
+      const dialogId = getFullDialogId(conversation);
+      this.messageCache.delete(dialogId);
+    }
+    clearAllCache() {
+      this.messageCache.clear();
+    }
+    removeMessagesByUId(messageUIds) {
+      if (!messageUIds || messageUIds.length === 0) {
+        return;
+      }
+      const messageUIdSet = new Set(messageUIds);
+      this.messageCache.forEach((messages, dialogId) => {
+        const filteredMessages = messages.filter(msg => !messageUIdSet.has(msg.messageUId));
+        if (filteredMessages.length !== messages.length) {
+          this.messageCache.set(dialogId, filteredMessages);
+        }
+      });
+    }
+  }
+
   class IMClient extends EventEmitter {
     options;
     static imClient;
@@ -28381,6 +28469,7 @@
           this.emit(exports.Events.SUSPEND, this.libLoader.getConnectionStatus());
         },
         batchMessage: messages => {
+          MessageCache.get().addMessages(messages);
           this.emit(exports.Events.MESSAGES, {
             messages
           });
@@ -28400,6 +28489,7 @@
           });
         },
         onRecall: messageUids => {
+          MessageCache.get().removeMessagesByUId(messageUids);
           messageUids.forEach(messageUId => {
             this.emit(exports.Events.RECALL, messageUId);
           });
@@ -28442,7 +28532,7 @@
       const dialogId = getFullDialogId(conversation);
       return getRemoteMessages({
         dialogId,
-        offset: options.timestamp ?? "0",
+        offset: options.timestamp ?? '0',
         count: options.count ?? 20,
         newToOld: options.order === 0
       }).then(({
@@ -28476,10 +28566,42 @@
         });
       });
     }
+    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]);
+      }
+      if (cachedMessages.length >= count) {
+        return {
+          code: exports.ErrorCode.SUCCESS,
+          data: {
+            list: cachedMessages,
+            hasMore: true
+          }
+        };
+      }
+      const remotesResult = await this.getRemoteHistoryMessages(conversation, {
+        timestamp: cachedMessages[0].sentTime ?? timestamp,
+        count: count - cachedMessages.length,
+        order: 0
+      });
+      if (remotesResult.code !== exports.ErrorCode.SUCCESS) {
+        return remotesResult;
+      }
+      return {
+        code: exports.ErrorCode.SUCCESS,
+        data: {
+          list: [...remotesResult.data.list, ...cachedMessages],
+          hasMore: remotesResult.data.hasMore
+        }
+      };
+    }
     async deleteRemoteMessage(conversation, list) {
+      MessageCache.get().removeMessagesByUId(list.map(e => e.messageUId));
       return deleteMessages$1(getFullDialogId(conversation), list.map(e => e.messageUId)).then(result => result.code);
     }
     async deleteRemoteMessageByTimestamp(conversation, timestamp) {
+      MessageCache.get().clearConversationCache(conversation);
       ConversationManager$1.get().clearHistoryMessages(conversation);
       return clearHistoryMessage(getFullDialogId(conversation), timestamp === 0 ? Number.MAX_VALUE : timestamp).then(result => result.code);
     }
@@ -29857,7 +29979,6 @@
     return response;
   };
   const getRemoteHistoryMessages = async (conversation, options) => {
-    assert('options.timestamp', options.timestamp ?? 0, AssertRules.NUMBER);
     assert('options.count', options.count ?? 0, AssertRules.NUMBER);
     assert('options.order', options.order ?? 0, value => {
       return value === 0 || value === 1;
@@ -29865,7 +29986,15 @@
     assert('conversation', conversation, AssertRules.CONVERSATION, true);
     const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
     logger.debug('get remote history message ->' + paramsStr);
-    const response = await imClient.getRemoteHistoryMessages(conversation, options);
+    if (isDef(options.timestamp)) {
+      options.timestamp = options.timestamp.toString();
+    }
+    let response;
+    if (!options.order) {
+      response = await imClient.getPreviousHistoryMessages(conversation, options.timestamp, options.count);
+    } else {
+      response = await imClient.getRemoteHistoryMessages(conversation, options);
+    }
     if (response.code !== exports.ErrorCode.SUCCESS) {
       logger.warn('get remote history message fail ->' + response.code + ':' + ErrorDesc(response.code) + ',' + paramsStr);
     }

package/package.json

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