@onyx-p/imlib-web 1.8.5 → 1.8.7

package/index.esm.js

@@ -20059,6 +20059,7 @@ class ConversationManager {
       };
     }
     if (isPersited) {
+      updateConOptions.conversation.updateTime = parseInt(message.sentTime);
       updateConOptions.conversation.latestMessage = message;
       updateConOptions.updatedItems.latestMessage = {
         time: message.sentTime,
@@ -20498,16 +20499,26 @@ const UNREADMESSAGEUIDS_KEY = 'unreadMessageUids';
 class MessageReceiptManager {
   localStore;
   constructor(appkey, currentUserId) {
-    const suffix = `receipt-${appkey}-${currentUserId}`;
+    const suffix = `receipt-v2-${appkey}-${currentUserId}`;
     this.localStore = new AppStorage(suffix);
   }
   storeUnreadMessageUids(messageList) {
     const validMessages = messageList.filter(m => m.isCounted && m.messageDirection !== MessageDirection.SEND);
-    const messageUids = validMessages.map(m => m.messageUId);
-    const existingUids = this.localStore.get(UNREADMESSAGEUIDS_KEY) || [];
-    const updatedUids = [...new Set([...existingUids, ...messageUids])];
+    const messageUidsWithTimestamp = validMessages.map(m => ({
+      uid: m.messageUId,
+      timestamp: Date.now()
+    }));
+    const existingUidsWithTimestamp = this.localStore.get(UNREADMESSAGEUIDS_KEY) || [];
+    const updatedUids = [...existingUidsWithTimestamp, ...messageUidsWithTimestamp];
     this.localStore.set(UNREADMESSAGEUIDS_KEY, updatedUids);
   }
+  cleanExpiredMessages() {
+    const storedMessages = this.localStore.get(UNREADMESSAGEUIDS_KEY) || [];
+    const twoDaysInMs = 2 * 24 * 60 * 60 * 1000;
+    const currentTime = Date.now();
+    const filteredMessages = storedMessages.filter(item => currentTime - item.timestamp <= twoDaysInMs);
+    this.localStore.set(UNREADMESSAGEUIDS_KEY, filteredMessages);
+  }
   formatReceiptMessages(messages) {
     const privateMessages = [];
     const groupMessages = [];
@@ -20569,7 +20580,7 @@ class MessageReceiptManager {
   }
   async sendReadReceipts(messageList) {
     const storedUnreadUids = this.localStore.get(UNREADMESSAGEUIDS_KEY) || [];
-    const validMessages = this.filterValidMessages(messageList).filter(m => storedUnreadUids.includes(m.messageUId));
+    const validMessages = this.filterValidMessages(messageList).filter(m => storedUnreadUids.some(item => item.uid === m.messageUId));
     try {
       const {
         privateReceiptMessages,
@@ -20587,7 +20598,7 @@ class MessageReceiptManager {
       }
       const latestUnreadUids = this.localStore.get(UNREADMESSAGEUIDS_KEY) || [];
       const sentMessageUids = validMessages.map(m => m.messageUId);
-      const remainingUids = latestUnreadUids.filter(uid => !sentMessageUids.includes(uid));
+      const remainingUids = latestUnreadUids.filter(item => !sentMessageUids.includes(item.uid));
       this.localStore.set(UNREADMESSAGEUIDS_KEY, remainingUids);
     } catch (error) {
       console.error('发送已读回执失败:', error);
@@ -20599,6 +20610,7 @@ let manager;
 var MessageReceiptManager$1 = {
   create(appkey, currentUserId) {
     manager = new MessageReceiptManager(appkey, currentUserId);
+    manager.cleanExpiredMessages();
   },
   get() {
     return manager;
@@ -28317,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;
@@ -28364,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
         });
@@ -28383,6 +28483,7 @@ class IMClient extends EventEmitter {
         });
       },
       onRecall: messageUids => {
+        MessageCache.get().removeMessagesByUId(messageUids);
         messageUids.forEach(messageUId => {
           this.emit(Events.RECALL, messageUId);
         });
@@ -28425,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(({
@@ -28459,10 +28560,42 @@ class IMClient extends EventEmitter {
       });
     });
   }
+  async getPreviousHistoryMessages(conversation, timestamp, count = 20) {
+    const cachedMessages = MessageCache.get().getPreviousMessages(conversation, timestamp, count);
+    if (!timestamp) {
+      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);
   }
@@ -28492,6 +28625,11 @@ class IMClient extends EventEmitter {
           conversationType: conversationObj.conversationType,
           targetId: conversationObj.targetId
         };
+        if (isDef(conversationObj.latestMessage)) {
+          conversationObj.updateTime = parseInt(conversationObj.latestMessage.sentTime);
+        } else {
+          conversationObj.updateTime = (contentList[contentList.length - 1].updateTime ?? 0) + 1;
+        }
         ConversationManager$1.get().addLocalConversation(conversationObj);
         const localConversation = ConversationManager$1.get().get(conOpt);
         Object.assign(conversationObj, localConversation);
@@ -28540,6 +28678,7 @@ class IMClient extends EventEmitter {
     const conversation = {
       ...conOpt,
       ...localConversation,
+      updateTime: isDef(latestMessage?.sentTime) ? parseInt(latestMessage.sentTime) : undefined,
       latestMessage: latestMessage
     };
     return {
@@ -29842,7 +29981,12 @@ 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);
+  let response;
+  if (options.order === 0) {
+    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

@@ -20065,6 +20065,7 @@
         };
       }
       if (isPersited) {
+        updateConOptions.conversation.updateTime = parseInt(message.sentTime);
         updateConOptions.conversation.latestMessage = message;
         updateConOptions.updatedItems.latestMessage = {
           time: message.sentTime,
@@ -20504,16 +20505,26 @@
   class MessageReceiptManager {
     localStore;
     constructor(appkey, currentUserId) {
-      const suffix = `receipt-${appkey}-${currentUserId}`;
+      const suffix = `receipt-v2-${appkey}-${currentUserId}`;
       this.localStore = new AppStorage(suffix);
     }
     storeUnreadMessageUids(messageList) {
       const validMessages = messageList.filter(m => m.isCounted && m.messageDirection !== exports.MessageDirection.SEND);
-      const messageUids = validMessages.map(m => m.messageUId);
-      const existingUids = this.localStore.get(UNREADMESSAGEUIDS_KEY) || [];
-      const updatedUids = [...new Set([...existingUids, ...messageUids])];
+      const messageUidsWithTimestamp = validMessages.map(m => ({
+        uid: m.messageUId,
+        timestamp: Date.now()
+      }));
+      const existingUidsWithTimestamp = this.localStore.get(UNREADMESSAGEUIDS_KEY) || [];
+      const updatedUids = [...existingUidsWithTimestamp, ...messageUidsWithTimestamp];
       this.localStore.set(UNREADMESSAGEUIDS_KEY, updatedUids);
     }
+    cleanExpiredMessages() {
+      const storedMessages = this.localStore.get(UNREADMESSAGEUIDS_KEY) || [];
+      const twoDaysInMs = 2 * 24 * 60 * 60 * 1000;
+      const currentTime = Date.now();
+      const filteredMessages = storedMessages.filter(item => currentTime - item.timestamp <= twoDaysInMs);
+      this.localStore.set(UNREADMESSAGEUIDS_KEY, filteredMessages);
+    }
     formatReceiptMessages(messages) {
       const privateMessages = [];
       const groupMessages = [];
@@ -20575,7 +20586,7 @@
     }
     async sendReadReceipts(messageList) {
       const storedUnreadUids = this.localStore.get(UNREADMESSAGEUIDS_KEY) || [];
-      const validMessages = this.filterValidMessages(messageList).filter(m => storedUnreadUids.includes(m.messageUId));
+      const validMessages = this.filterValidMessages(messageList).filter(m => storedUnreadUids.some(item => item.uid === m.messageUId));
       try {
         const {
           privateReceiptMessages,
@@ -20593,7 +20604,7 @@
         }
         const latestUnreadUids = this.localStore.get(UNREADMESSAGEUIDS_KEY) || [];
         const sentMessageUids = validMessages.map(m => m.messageUId);
-        const remainingUids = latestUnreadUids.filter(uid => !sentMessageUids.includes(uid));
+        const remainingUids = latestUnreadUids.filter(item => !sentMessageUids.includes(item.uid));
         this.localStore.set(UNREADMESSAGEUIDS_KEY, remainingUids);
       } catch (error) {
         console.error('发送已读回执失败:', error);
@@ -20605,6 +20616,7 @@
   var MessageReceiptManager$1 = {
     create(appkey, currentUserId) {
       manager = new MessageReceiptManager(appkey, currentUserId);
+      manager.cleanExpiredMessages();
     },
     get() {
       return manager;
@@ -28323,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;
@@ -28370,6 +28469,7 @@
           this.emit(exports.Events.SUSPEND, this.libLoader.getConnectionStatus());
         },
         batchMessage: messages => {
+          MessageCache.get().addMessages(messages);
           this.emit(exports.Events.MESSAGES, {
             messages
           });
@@ -28389,6 +28489,7 @@
           });
         },
         onRecall: messageUids => {
+          MessageCache.get().removeMessagesByUId(messageUids);
           messageUids.forEach(messageUId => {
             this.emit(exports.Events.RECALL, messageUId);
           });
@@ -28431,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(({
@@ -28465,10 +28566,42 @@
         });
       });
     }
+    async getPreviousHistoryMessages(conversation, timestamp, count = 20) {
+      const cachedMessages = MessageCache.get().getPreviousMessages(conversation, timestamp, count);
+      if (!timestamp) {
+        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);
     }
@@ -28498,6 +28631,11 @@
             conversationType: conversationObj.conversationType,
             targetId: conversationObj.targetId
           };
+          if (isDef(conversationObj.latestMessage)) {
+            conversationObj.updateTime = parseInt(conversationObj.latestMessage.sentTime);
+          } else {
+            conversationObj.updateTime = (contentList[contentList.length - 1].updateTime ?? 0) + 1;
+          }
           ConversationManager$1.get().addLocalConversation(conversationObj);
           const localConversation = ConversationManager$1.get().get(conOpt);
           Object.assign(conversationObj, localConversation);
@@ -28546,6 +28684,7 @@
       const conversation = {
         ...conOpt,
         ...localConversation,
+        updateTime: isDef(latestMessage?.sentTime) ? parseInt(latestMessage.sentTime) : undefined,
         latestMessage: latestMessage
       };
       return {
@@ -29848,7 +29987,12 @@
     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);
+    let response;
+    if (options.order === 0) {
+      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.5",
+  "version": "1.8.7",
   "main": "index.umd.js",
   "module": "index.esm.js",
   "types": "types/index.d.ts",

package/types/model/iReceivedConversation.d.ts

@@ -63,4 +63,8 @@ export default interface IReceivedConversation {
      * 阅后即焚的时长
      */
     burnAfterReadingTime?: number | null;
+    /**
+     * 会话更新时间，根据这个排序
+     */
+    updateTime?: number | null;
 }