@onyx-p/imlib-web 2.1.1 → 2.1.3

package/index.esm.js

@@ -19665,6 +19665,10 @@ const ConversationKey2StorageKey = {
   burnAfterReadingTime: {
     keyName: 'brt',
     defaultVal: 0
+  },
+  updateTime: {
+    keyName: 'ut',
+    defaultVal: 0
   }
 };
 class ConversationStore {
@@ -19771,6 +19775,12 @@ class ConversationStore {
       this.localStore.remove(key);
     }
   }
+  updateUpdateTime(conOpt, updateTime) {
+    const key = this.getStoreKey(conOpt);
+    const local = this.localStore.get(key) || {};
+    local[ConversationKey2StorageKey.updateTime.keyName] = updateTime;
+    this.localStore.set(key, local);
+  }
   set(conOpt, conversation) {
     const key = this.getStoreKey(conOpt);
     const local = this.localStore.get(key) || {};
@@ -19992,7 +20002,8 @@ class ConversationManager {
       dialogTitle,
       smallAvatarUrl,
       burnAfterReadingFlag,
-      burnAfterReadingTime
+      burnAfterReadingTime,
+      updateTime
     } = conversation;
     this.localConversationSet.add(this.getConversationKey(conversation));
     this.addStatus({
@@ -20004,7 +20015,8 @@ class ConversationManager {
       dialogTitle,
       smallAvatarUrl,
       burnAfterReadingFlag,
-      burnAfterReadingTime
+      burnAfterReadingTime,
+      updateTime
     }, false);
   }
   addStatus(statusItem, shouldNotify = false) {
@@ -20017,13 +20029,14 @@ class ConversationManager {
       dialogTitle,
       smallAvatarUrl,
       burnAfterReadingFlag,
-      burnAfterReadingTime
+      burnAfterReadingTime,
+      updateTime
     } = statusItem;
     const conOpt = {
       conversationType,
       targetId
     };
-    const updatedTime = getServerTime$1().toString();
+    const updatedTime = getServerTime$1();
     const storageConversation = this.store.get(conOpt);
     const updatedItems = {};
     if (isDef(notificationLevel) && storageConversation.notificationLevel !== notificationLevel) {
@@ -20075,7 +20088,8 @@ class ConversationManager {
       dialogTitle,
       smallAvatarUrl,
       burnAfterReadingFlag,
-      burnAfterReadingTime
+      burnAfterReadingTime,
+      updateTime
     });
     if (Object.keys(updatedItems).length && shouldNotify) {
       this.setUpdatedConversation({
@@ -20101,22 +20115,23 @@ class ConversationManager {
     const oldLocalConversation = deepClone(this.get(conOpt));
     this.store.updateUnreadCount(message);
     this.store.updateMentionedData(message);
+    this.store.updateUpdateTime(conOpt, parseInt(message.sentTime));
     const newLocalConversation = this.get(conOpt);
     if (oldLocalConversation.unreadMessageCount !== newLocalConversation.unreadMessageCount) {
       updateConOptions.updatedItems.unreadMessageCount = {
-        time: message.sentTime,
+        time: parseInt(message.sentTime),
         val: newLocalConversation.unreadMessageCount
       };
     }
     if (oldLocalConversation.hasMentioned !== newLocalConversation.hasMentioned) {
       updateConOptions.updatedItems.hasMentioned = {
-        time: message.sentTime,
+        time: parseInt(message.sentTime),
         val: newLocalConversation.hasMentioned
       };
     }
     if (oldLocalConversation.unreadMentionedCount !== newLocalConversation.unreadMentionedCount) {
       updateConOptions.updatedItems.unreadMentionedCount = {
-        time: message.sentTime,
+        time: parseInt(message.sentTime),
         val: newLocalConversation.unreadMentionedCount
       };
     }
@@ -20124,7 +20139,7 @@ class ConversationManager {
       updateConOptions.conversation.updateTime = parseInt(message.sentTime);
       updateConOptions.conversation.latestMessage = message;
       updateConOptions.updatedItems.latestMessage = {
-        time: message.sentTime,
+        time: parseInt(message.sentTime),
         val: message
       };
     }
@@ -20261,7 +20276,8 @@ class ConversationManager {
         notificationStatus,
         isTop,
         dialogTitle,
-        smallAvatarUrl
+        smallAvatarUrl,
+        updateTime
       } = val;
       return {
         ...conOpt,
@@ -20271,7 +20287,8 @@ class ConversationManager {
         notificationStatus,
         isTop,
         dialogTitle,
-        smallAvatarUrl
+        smallAvatarUrl,
+        updateTime: updateTime
       };
     }
     return null;
@@ -20287,7 +20304,8 @@ class ConversationManager {
       notificationStatus,
       isTop,
       dialogTitle,
-      smallAvatarUrl
+      smallAvatarUrl,
+      updateTime
     }) => ({
       conversationType,
       targetId,
@@ -20297,7 +20315,8 @@ class ConversationManager {
       notificationStatus,
       isTop,
       dialogTitle,
-      smallAvatarUrl
+      smallAvatarUrl,
+      updateTime: updateTime
     }));
   }
   remove(conOpt) {
@@ -20313,19 +20332,27 @@ class ConversationManager {
     updateConOptions.conversation.latestMessage = undefined;
     updateConOptions.updatedItems.latestMessage = {
       val: null,
-      time: getServerTime$1().toString()
+      time: getServerTime$1()
     };
     this.setUpdatedConversation(updateConOptions);
   }
-  refreshLatestMessage(conOpt, message) {
+  updateLatestMessage(conOpt, message) {
+    if (isDef(message)) {
+      this.store.set(conOpt, {
+        updateTime: parseInt(message.sentTime)
+      });
+    }
     const updateConOptions = {
       conversation: conOpt,
       updatedItems: {}
     };
+    if (isDef(message)) {
+      updateConOptions.conversation.updateTime = parseInt(message.sentTime);
+    }
     updateConOptions.conversation.latestMessage = message;
     updateConOptions.updatedItems.latestMessage = {
       val: message,
-      time: message?.sentTime ?? getServerTime$1().toString()
+      time: getServerTime$1()
     };
     this.setUpdatedConversation(updateConOptions);
   }
@@ -20336,6 +20363,7 @@ class ConversationManager {
 const nullConversationManager = {
   addStatus: function (statusItem, shouldNotify) {},
   setConversationCacheByMessage: function (message) {},
+  updateLatestMessage: function (conOpt, message) {},
   get: function (conOpt) {
     return null;
   },
@@ -20383,8 +20411,7 @@ const nullConversationManager = {
   destroyed() {},
   syncConversationStatus: function () {},
   remove: function (conOpt) {},
-  clearHistoryMessages: function (conOpt) {},
-  refreshLatestMessage: function (conOpt, message) {}
+  clearHistoryMessages: function (conOpt) {}
 };
 let manager$1;
 var ConversationManager$1 = {
@@ -21544,6 +21571,43 @@ class MessageCache {
     await this.checkAndResetDatabase();
     await this.initDatabase();
   }
+  async getLatestMessage(conversation) {
+    const dialogId = getFullDialogId(conversation);
+    if (!this.db) {
+      return null;
+    }
+    return new Promise((resolve, reject) => {
+      const transaction = this.db.transaction(this.STORE_NAME, 'readonly');
+      const store = transaction.objectStore(this.STORE_NAME);
+      const index = store.index('dialogId_sentTime');
+      const range = IDBKeyRange.bound([dialogId, ''], [dialogId, '\uffff']);
+      const direction = 'prev';
+      const cursorRequest = index.openCursor(range, direction);
+      cursorRequest.onsuccess = event => {
+        const cursor = event.target.result;
+        if (cursor) {
+          const message = {
+            ...cursor.value
+          };
+          if (typeof message.content === 'string' && message.content) {
+            try {
+              message.content = this.decryptContent(message.content);
+            } catch (error) {
+              console.error('解密消息内容失败', error);
+              message.content = null;
+            }
+          }
+          resolve(message);
+        } else {
+          resolve(null);
+        }
+      };
+      cursorRequest.onerror = event => {
+        console.error('获取最新消息失败', event);
+        reject(new Error('获取最新消息失败'));
+      };
+    });
+  }
 }
 let cache;
 var MessageCache$1 = {
@@ -29155,10 +29219,9 @@ class IMClient extends EventEmitter {
     });
   }
   async getPreviousHistoryMessages(conversation, timestamp, count = 20) {
-    debugger;
     const cachedResult = await MessageCache$1.get().getPreviousMessages(conversation, timestamp ?? '0', count);
     if (!timestamp && cachedResult.messages.length) {
-      ConversationManager$1.get().refreshLatestMessage(conversation, cachedResult.messages[cachedResult.messages.length - 1]);
+      ConversationManager$1.get().updateLatestMessage(conversation, cachedResult.messages[cachedResult.messages.length - 1]);
     }
     if (cachedResult.messages.length >= count || !cachedResult.hasMore) {
       return {
@@ -29180,7 +29243,7 @@ class IMClient extends EventEmitter {
     }
     const remotesMessages = remotesResult.data.list;
     if (!remotesTimestamp) {
-      ConversationManager$1.get().refreshLatestMessage(conversation, remotesMessages[remotesMessages.length - 1]);
+      ConversationManager$1.get().updateLatestMessage(conversation, remotesMessages[remotesMessages.length - 1]);
     }
     MessageCache$1.get().addMessages(remotesMessages, conversation, !remotesResult.data.hasMore);
     return {
@@ -29192,10 +29255,19 @@ class IMClient extends EventEmitter {
     };
   }
   async deleteRemoteMessage(conversation, list) {
-    MessageCache$1.get()?.removeMessagesByUId(list.map(e => e.messageUId));
-    return deleteMessages$1(getFullDialogId(conversation), list.map(e => e.messageUId)).then(result => result.code);
+    debugger;
+    const result = await deleteMessages$1(getFullDialogId(conversation), list.map(e => e.messageUId)).then(result => result.code);
+    if (result === ErrorCode.SUCCESS) {
+      const latestMessage = await MessageCache$1.get()?.getLatestMessage(conversation);
+      await MessageCache$1.get()?.removeMessagesByUId(list.map(e => e.messageUId));
+      if (latestMessage && list.some(e => e.messageUId === latestMessage.messageUId)) {
+        const latestMessage2 = await MessageCache$1.get()?.getLatestMessage(conversation);
+        ConversationManager$1.get().updateLatestMessage(conversation, latestMessage2);
+      }
+    }
+    return result;
   }
-  async deleteRemoteMessageByTimestamp(conversation) {
+  async deleteHistoryMessages(conversation) {
     MessageCache$1.get()?.clearConversationCache(conversation);
     ConversationManager$1.get().clearHistoryMessages(conversation);
     return clearHistoryMessage(getFullDialogId(conversation)).then(result => result.code);
@@ -29221,22 +29293,30 @@ class IMClient extends EventEmitter {
     const contentList = [];
     for (const dialogInfo of data.fullDialog) {
       const conversationObj = this.formatConversation(dialogInfo);
-      if (conversationObj) {
-        const conOpt = {
-          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);
-        contentList.push(conversationObj);
+      if (!conversationObj) {
+        continue;
+      }
+      const conOpt = {
+        conversationType: conversationObj.conversationType,
+        targetId: conversationObj.targetId
+      };
+      if (!conversationObj.latestMessage) {
+        conversationObj.latestMessage = await MessageCache$1.get()?.getLatestMessage(conOpt);
       }
+      ConversationManager$1.get().addLocalConversation(conversationObj);
+      const localConversation = ConversationManager$1.get().get(conOpt);
+      Object.assign(conversationObj, localConversation);
+      if (isDef(conversationObj.latestMessage) && !conversationObj.updateTime) {
+        conversationObj.updateTime = parseInt(conversationObj.latestMessage.sentTime);
+      }
+      if (!conversationObj.updateTime) {
+        conversationObj.updateTime = 10000;
+      }
+      contentList.push(conversationObj);
     }
+    contentList.sort((a, b) => {
+      return (a.updateTime ?? 0) - (b.updateTime ?? 0);
+    });
     return {
       code: ErrorCode.SUCCESS,
       data: contentList
@@ -29263,19 +29343,7 @@ class IMClient extends EventEmitter {
         code: ErrorCode.CONVER_GET_ERROR
       };
     }
-    const {
-      code,
-      data
-    } = await this.getRemoteHistoryMessages(conOpt, {
-      count: 1,
-      order: 0
-    });
-    if (code !== ErrorCode.SUCCESS) {
-      return {
-        code: ErrorCode.CONVER_GET_ERROR
-      };
-    }
-    const latestMessage = data?.list[0];
+    const latestMessage = await MessageCache$1.get()?.getLatestMessage(conOpt);
     const conversation = {
       ...conOpt,
       ...localConversation,
@@ -29381,8 +29449,18 @@ class IMClient extends EventEmitter {
     }
     return conversationObj;
   }
-  clearBurnAfterReadingExpiredMessages(conversation) {
-    return MessageCache$1.get()?.clearBurnAfterReadingExpiredMessages(conversation) ?? Promise.resolve([]);
+  async clearBurnAfterReadingExpiredMessages(conversation) {
+    const cache = MessageCache$1.get();
+    if (!cache) {
+      return Promise.resolve([]);
+    }
+    const latestMessage = await cache.getLatestMessage(conversation);
+    const removedMsgUids = await cache.clearBurnAfterReadingExpiredMessages(conversation);
+    if (latestMessage && removedMsgUids.includes(latestMessage.messageUId)) {
+      const latestMessage2 = await cache.getLatestMessage(conversation);
+      ConversationManager$1.get().updateLatestMessage(conversation, latestMessage2);
+    }
+    return removedMsgUids;
   }
 }
 
@@ -30602,7 +30680,7 @@ const clearHistoryMessages = async conversation => {
   assert('conversation', conversation, AssertRules.CONVERSATION);
   const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
   logger.debug('clear message ->' + paramsStr);
-  const code = await imClient.deleteRemoteMessageByTimestamp(conversation);
+  const code = await imClient.deleteHistoryMessages(conversation);
   if (code !== ErrorCode.SUCCESS) {
     logger.warn('clear message ->' + code + ':' + ErrorDesc(code) + ',' + paramsStr);
     return {

package/index.umd.js

@@ -19671,6 +19671,10 @@
     burnAfterReadingTime: {
       keyName: 'brt',
       defaultVal: 0
+    },
+    updateTime: {
+      keyName: 'ut',
+      defaultVal: 0
     }
   };
   class ConversationStore {
@@ -19777,6 +19781,12 @@
         this.localStore.remove(key);
       }
     }
+    updateUpdateTime(conOpt, updateTime) {
+      const key = this.getStoreKey(conOpt);
+      const local = this.localStore.get(key) || {};
+      local[ConversationKey2StorageKey.updateTime.keyName] = updateTime;
+      this.localStore.set(key, local);
+    }
     set(conOpt, conversation) {
       const key = this.getStoreKey(conOpt);
       const local = this.localStore.get(key) || {};
@@ -19998,7 +20008,8 @@
         dialogTitle,
         smallAvatarUrl,
         burnAfterReadingFlag,
-        burnAfterReadingTime
+        burnAfterReadingTime,
+        updateTime
       } = conversation;
       this.localConversationSet.add(this.getConversationKey(conversation));
       this.addStatus({
@@ -20010,7 +20021,8 @@
         dialogTitle,
         smallAvatarUrl,
         burnAfterReadingFlag,
-        burnAfterReadingTime
+        burnAfterReadingTime,
+        updateTime
       }, false);
     }
     addStatus(statusItem, shouldNotify = false) {
@@ -20023,13 +20035,14 @@
         dialogTitle,
         smallAvatarUrl,
         burnAfterReadingFlag,
-        burnAfterReadingTime
+        burnAfterReadingTime,
+        updateTime
       } = statusItem;
       const conOpt = {
         conversationType,
         targetId
       };
-      const updatedTime = getServerTime$1().toString();
+      const updatedTime = getServerTime$1();
       const storageConversation = this.store.get(conOpt);
       const updatedItems = {};
       if (isDef(notificationLevel) && storageConversation.notificationLevel !== notificationLevel) {
@@ -20081,7 +20094,8 @@
         dialogTitle,
         smallAvatarUrl,
         burnAfterReadingFlag,
-        burnAfterReadingTime
+        burnAfterReadingTime,
+        updateTime
       });
       if (Object.keys(updatedItems).length && shouldNotify) {
         this.setUpdatedConversation({
@@ -20107,22 +20121,23 @@
       const oldLocalConversation = deepClone(this.get(conOpt));
       this.store.updateUnreadCount(message);
       this.store.updateMentionedData(message);
+      this.store.updateUpdateTime(conOpt, parseInt(message.sentTime));
       const newLocalConversation = this.get(conOpt);
       if (oldLocalConversation.unreadMessageCount !== newLocalConversation.unreadMessageCount) {
         updateConOptions.updatedItems.unreadMessageCount = {
-          time: message.sentTime,
+          time: parseInt(message.sentTime),
           val: newLocalConversation.unreadMessageCount
         };
       }
       if (oldLocalConversation.hasMentioned !== newLocalConversation.hasMentioned) {
         updateConOptions.updatedItems.hasMentioned = {
-          time: message.sentTime,
+          time: parseInt(message.sentTime),
           val: newLocalConversation.hasMentioned
         };
       }
       if (oldLocalConversation.unreadMentionedCount !== newLocalConversation.unreadMentionedCount) {
         updateConOptions.updatedItems.unreadMentionedCount = {
-          time: message.sentTime,
+          time: parseInt(message.sentTime),
           val: newLocalConversation.unreadMentionedCount
         };
       }
@@ -20130,7 +20145,7 @@
         updateConOptions.conversation.updateTime = parseInt(message.sentTime);
         updateConOptions.conversation.latestMessage = message;
         updateConOptions.updatedItems.latestMessage = {
-          time: message.sentTime,
+          time: parseInt(message.sentTime),
           val: message
         };
       }
@@ -20267,7 +20282,8 @@
           notificationStatus,
           isTop,
           dialogTitle,
-          smallAvatarUrl
+          smallAvatarUrl,
+          updateTime
         } = val;
         return {
           ...conOpt,
@@ -20277,7 +20293,8 @@
           notificationStatus,
           isTop,
           dialogTitle,
-          smallAvatarUrl
+          smallAvatarUrl,
+          updateTime: updateTime
         };
       }
       return null;
@@ -20293,7 +20310,8 @@
         notificationStatus,
         isTop,
         dialogTitle,
-        smallAvatarUrl
+        smallAvatarUrl,
+        updateTime
       }) => ({
         conversationType,
         targetId,
@@ -20303,7 +20321,8 @@
         notificationStatus,
         isTop,
         dialogTitle,
-        smallAvatarUrl
+        smallAvatarUrl,
+        updateTime: updateTime
       }));
     }
     remove(conOpt) {
@@ -20319,19 +20338,27 @@
       updateConOptions.conversation.latestMessage = undefined;
       updateConOptions.updatedItems.latestMessage = {
         val: null,
-        time: getServerTime$1().toString()
+        time: getServerTime$1()
       };
       this.setUpdatedConversation(updateConOptions);
     }
-    refreshLatestMessage(conOpt, message) {
+    updateLatestMessage(conOpt, message) {
+      if (isDef(message)) {
+        this.store.set(conOpt, {
+          updateTime: parseInt(message.sentTime)
+        });
+      }
       const updateConOptions = {
         conversation: conOpt,
         updatedItems: {}
       };
+      if (isDef(message)) {
+        updateConOptions.conversation.updateTime = parseInt(message.sentTime);
+      }
       updateConOptions.conversation.latestMessage = message;
       updateConOptions.updatedItems.latestMessage = {
         val: message,
-        time: message?.sentTime ?? getServerTime$1().toString()
+        time: getServerTime$1()
       };
       this.setUpdatedConversation(updateConOptions);
     }
@@ -20342,6 +20369,7 @@
   const nullConversationManager = {
     addStatus: function (statusItem, shouldNotify) {},
     setConversationCacheByMessage: function (message) {},
+    updateLatestMessage: function (conOpt, message) {},
     get: function (conOpt) {
       return null;
     },
@@ -20389,8 +20417,7 @@
     destroyed() {},
     syncConversationStatus: function () {},
     remove: function (conOpt) {},
-    clearHistoryMessages: function (conOpt) {},
-    refreshLatestMessage: function (conOpt, message) {}
+    clearHistoryMessages: function (conOpt) {}
   };
   let manager$1;
   var ConversationManager$1 = {
@@ -21550,6 +21577,43 @@
       await this.checkAndResetDatabase();
       await this.initDatabase();
     }
+    async getLatestMessage(conversation) {
+      const dialogId = getFullDialogId(conversation);
+      if (!this.db) {
+        return null;
+      }
+      return new Promise((resolve, reject) => {
+        const transaction = this.db.transaction(this.STORE_NAME, 'readonly');
+        const store = transaction.objectStore(this.STORE_NAME);
+        const index = store.index('dialogId_sentTime');
+        const range = IDBKeyRange.bound([dialogId, ''], [dialogId, '\uffff']);
+        const direction = 'prev';
+        const cursorRequest = index.openCursor(range, direction);
+        cursorRequest.onsuccess = event => {
+          const cursor = event.target.result;
+          if (cursor) {
+            const message = {
+              ...cursor.value
+            };
+            if (typeof message.content === 'string' && message.content) {
+              try {
+                message.content = this.decryptContent(message.content);
+              } catch (error) {
+                console.error('解密消息内容失败', error);
+                message.content = null;
+              }
+            }
+            resolve(message);
+          } else {
+            resolve(null);
+          }
+        };
+        cursorRequest.onerror = event => {
+          console.error('获取最新消息失败', event);
+          reject(new Error('获取最新消息失败'));
+        };
+      });
+    }
   }
   let cache;
   var MessageCache$1 = {
@@ -29161,10 +29225,9 @@
       });
     }
     async getPreviousHistoryMessages(conversation, timestamp, count = 20) {
-      debugger;
       const cachedResult = await MessageCache$1.get().getPreviousMessages(conversation, timestamp ?? '0', count);
       if (!timestamp && cachedResult.messages.length) {
-        ConversationManager$1.get().refreshLatestMessage(conversation, cachedResult.messages[cachedResult.messages.length - 1]);
+        ConversationManager$1.get().updateLatestMessage(conversation, cachedResult.messages[cachedResult.messages.length - 1]);
       }
       if (cachedResult.messages.length >= count || !cachedResult.hasMore) {
         return {
@@ -29186,7 +29249,7 @@
       }
       const remotesMessages = remotesResult.data.list;
       if (!remotesTimestamp) {
-        ConversationManager$1.get().refreshLatestMessage(conversation, remotesMessages[remotesMessages.length - 1]);
+        ConversationManager$1.get().updateLatestMessage(conversation, remotesMessages[remotesMessages.length - 1]);
       }
       MessageCache$1.get().addMessages(remotesMessages, conversation, !remotesResult.data.hasMore);
       return {
@@ -29198,10 +29261,19 @@
       };
     }
     async deleteRemoteMessage(conversation, list) {
-      MessageCache$1.get()?.removeMessagesByUId(list.map(e => e.messageUId));
-      return deleteMessages$1(getFullDialogId(conversation), list.map(e => e.messageUId)).then(result => result.code);
+      debugger;
+      const result = await deleteMessages$1(getFullDialogId(conversation), list.map(e => e.messageUId)).then(result => result.code);
+      if (result === exports.ErrorCode.SUCCESS) {
+        const latestMessage = await MessageCache$1.get()?.getLatestMessage(conversation);
+        await MessageCache$1.get()?.removeMessagesByUId(list.map(e => e.messageUId));
+        if (latestMessage && list.some(e => e.messageUId === latestMessage.messageUId)) {
+          const latestMessage2 = await MessageCache$1.get()?.getLatestMessage(conversation);
+          ConversationManager$1.get().updateLatestMessage(conversation, latestMessage2);
+        }
+      }
+      return result;
     }
-    async deleteRemoteMessageByTimestamp(conversation) {
+    async deleteHistoryMessages(conversation) {
       MessageCache$1.get()?.clearConversationCache(conversation);
       ConversationManager$1.get().clearHistoryMessages(conversation);
       return clearHistoryMessage(getFullDialogId(conversation)).then(result => result.code);
@@ -29227,22 +29299,30 @@
       const contentList = [];
       for (const dialogInfo of data.fullDialog) {
         const conversationObj = this.formatConversation(dialogInfo);
-        if (conversationObj) {
-          const conOpt = {
-            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);
-          contentList.push(conversationObj);
+        if (!conversationObj) {
+          continue;
+        }
+        const conOpt = {
+          conversationType: conversationObj.conversationType,
+          targetId: conversationObj.targetId
+        };
+        if (!conversationObj.latestMessage) {
+          conversationObj.latestMessage = await MessageCache$1.get()?.getLatestMessage(conOpt);
         }
+        ConversationManager$1.get().addLocalConversation(conversationObj);
+        const localConversation = ConversationManager$1.get().get(conOpt);
+        Object.assign(conversationObj, localConversation);
+        if (isDef(conversationObj.latestMessage) && !conversationObj.updateTime) {
+          conversationObj.updateTime = parseInt(conversationObj.latestMessage.sentTime);
+        }
+        if (!conversationObj.updateTime) {
+          conversationObj.updateTime = 10000;
+        }
+        contentList.push(conversationObj);
       }
+      contentList.sort((a, b) => {
+        return (a.updateTime ?? 0) - (b.updateTime ?? 0);
+      });
       return {
         code: exports.ErrorCode.SUCCESS,
         data: contentList
@@ -29269,19 +29349,7 @@
           code: exports.ErrorCode.CONVER_GET_ERROR
         };
       }
-      const {
-        code,
-        data
-      } = await this.getRemoteHistoryMessages(conOpt, {
-        count: 1,
-        order: 0
-      });
-      if (code !== exports.ErrorCode.SUCCESS) {
-        return {
-          code: exports.ErrorCode.CONVER_GET_ERROR
-        };
-      }
-      const latestMessage = data?.list[0];
+      const latestMessage = await MessageCache$1.get()?.getLatestMessage(conOpt);
       const conversation = {
         ...conOpt,
         ...localConversation,
@@ -29387,8 +29455,18 @@
       }
       return conversationObj;
     }
-    clearBurnAfterReadingExpiredMessages(conversation) {
-      return MessageCache$1.get()?.clearBurnAfterReadingExpiredMessages(conversation) ?? Promise.resolve([]);
+    async clearBurnAfterReadingExpiredMessages(conversation) {
+      const cache = MessageCache$1.get();
+      if (!cache) {
+        return Promise.resolve([]);
+      }
+      const latestMessage = await cache.getLatestMessage(conversation);
+      const removedMsgUids = await cache.clearBurnAfterReadingExpiredMessages(conversation);
+      if (latestMessage && removedMsgUids.includes(latestMessage.messageUId)) {
+        const latestMessage2 = await cache.getLatestMessage(conversation);
+        ConversationManager$1.get().updateLatestMessage(conversation, latestMessage2);
+      }
+      return removedMsgUids;
     }
   }
 
@@ -30608,7 +30686,7 @@
     assert('conversation', conversation, AssertRules.CONVERSATION);
     const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
     logger.debug('clear message ->' + paramsStr);
-    const code = await imClient.deleteRemoteMessageByTimestamp(conversation);
+    const code = await imClient.deleteHistoryMessages(conversation);
     if (code !== exports.ErrorCode.SUCCESS) {
       logger.warn('clear message ->' + code + ':' + ErrorDesc(code) + ',' + paramsStr);
       return {

package/package.json

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

package/types/model/iReceivedConversation.d.ts

@@ -22,7 +22,7 @@ export default interface IReceivedConversation {
     /**
      * 会话中的最后一条消息
      */
-    latestMessage?: IReceivedMessage;
+    latestMessage?: IReceivedMessage | null;
     /**
      * 是否包含 @ 自己的消息，此数据仅在 `conversationType` 为 `ConversationType.GROUP` 时有效
      */

package/types/types.d.ts

@@ -89,6 +89,7 @@ export interface IConversationState extends IBaseConversationInfo {
     isTop: boolean;
     dialogTitle: string | null | undefined;
     smallAvatarUrl: string | null | undefined;
+    updateTime: number | null | undefined;
 }
 /**
  * 会话信息
@@ -96,7 +97,7 @@ export interface IConversationState extends IBaseConversationInfo {
 export type IConversationOption = IBaseConversationInfo;
 export type IUpdatedConversationItemKeys = Extract<keyof IReceivedConversation, 'isTop' | 'notificationStatus' | 'notificationLevel' | 'unreadMessageCount' | 'hasMentioned' | 'unreadMentionedCount' | 'dialogTitle' | 'smallAvatarUrl' | 'latestMessage' | 'burnAfterReadingFlag' | 'burnAfterReadingTime'>;
 export type IUpdatedConversationItem = Partial<Record<IUpdatedConversationItemKeys, {
-    time: string;
+    time: number;
     val: any;
 }>>;
 /**