@onyx-p/imlib-web 2.4.6 → 2.4.8

package/index.esm.js

@@ -20136,14 +20136,6 @@ class ConversationManager {
         val: newLocalConversation.unreadMentionedCount
       };
     }
-    if (isPersited) {
-      updateConOptions.conversation.updateTime = parseInt(message.sentTime);
-      updateConOptions.conversation.latestMessage = message;
-      updateConOptions.updatedItems.latestMessage = {
-        time: parseInt(message.sentTime),
-        val: message
-      };
-    }
     if (Object.keys(updateConOptions.updatedItems).length) {
       this.setUpdatedConversation(updateConOptions);
     }
@@ -21316,29 +21308,59 @@ class MessageCache {
     if (!messageUIds || messageUIds.length === 0 || !this.db) {
       return;
     }
-    const transaction = this.db.transaction(this.STORE_NAME, 'readwrite');
-    const store = transaction.objectStore(this.STORE_NAME);
-    const index = store.index('messageUId');
-    messageUIds.forEach(messageUId => {
-      const request = index.get(messageUId);
-      request.onsuccess = () => {
-        const message = request.result;
-        if (message) {
-          const recallContent = {
-            messageUId: messageUId
-          };
-          const updatedMessage = {
-            ...message,
-            messageType: MessageTypes.RECALL,
-            content: this.encryptContent(recallContent)
-          };
-          store.put(updatedMessage);
+    return new Promise(resolve => {
+      const transaction = this.db.transaction(this.STORE_NAME, 'readwrite');
+      const store = transaction.objectStore(this.STORE_NAME);
+      const index = store.index('messageUId');
+      let pendingRequests = messageUIds.length;
+      for (const messageUId of messageUIds) {
+        const request = index.get(messageUId);
+        request.onsuccess = () => {
+          const message = request.result;
+          if (message) {
+            const recallContent = {
+              messageUId: messageUId
+            };
+            const updatedMessage = {
+              ...message,
+              messageType: MessageTypes.RECALL,
+              content: this.encryptContent(recallContent),
+              isPersited: true,
+              isCounted: false,
+              isMentioned: false,
+              disableNotification: true
+            };
+            const putRequest = store.put(updatedMessage);
+            putRequest.onerror = () => {
+              checkComplete();
+            };
+            putRequest.onsuccess = () => {
+              checkComplete();
+            };
+          } else {
+            checkComplete();
+          }
+        };
+        request.onerror = () => {
+          checkComplete();
+        };
+      }
+      function checkComplete() {
+        pendingRequests--;
+        if (pendingRequests === 0) {
+          resolve();
         }
+      }
+      transaction.oncomplete = () => {
+        resolve();
+      };
+      transaction.onerror = () => {
+        resolve();
       };
     });
   }
 }
-let cache;
+let cache = null;
 var MessageCache$1 = {
   create(appkey, currentUserId) {
     cache = new MessageCache(appkey, currentUserId);
@@ -21442,9 +21464,14 @@ class MessageLoader {
       };
     });
     await ConversationManager$1.get().loadConvsationsIfNotExist(cons);
-    serverMessageParser.parse(msg, (done, outputMsgs) => {
+    serverMessageParser.parse(msg, async (done, outputMsgs) => {
       try {
-        this.processMessages(outputMsgs, !this.pullOfflineFinished);
+        for (const [dialogId, l] of outputMsgs.entries()) {
+          if (l.length === 0) {
+            return;
+          }
+          await this.processMessages(l, !this.pullOfflineFinished);
+        }
       } catch (error) {
         logger.error('processMessages error', error);
       }
@@ -21481,70 +21508,81 @@ class MessageLoader {
       }
     });
   }
-  processMessages(outputMsgs, isOffLineMessage) {
-    const messages = [];
+  async processMessages(l, isOffLineMessage) {
+    const conversation = {
+      conversationType: l[0].conversationType,
+      targetId: l[0].targetId
+    };
+    let messageList = [];
+    const recallMessageIndexes = [];
     let recallMessageUIds = [];
-    outputMsgs.forEach((l, dialogId) => {
-      let messageList = [];
-      const recallMessageIndexes = [];
-      l.forEach(m => {
-        if (m.messageType === MessageTypes.RECALL && RecallMessageStore.has(m.content.messageUId)) {
-          if (m.content.messageUId) {
-            RecallMessageStore.remove(m.content.messageUId);
-            recallMessageUIds.push(m.content.messageUId);
-          } else {
-            logger.error('recallMessage’s messageUId is undefined', m);
-          }
-        } else if (m.messageUId) {
-          m.isOffLineMessage = isOffLineMessage;
-          if (!m.messageId || m.messageId > getCurrentMessageId()) {
-            m.messageId = generateNewMessageId();
-          }
-          ConversationManager$1.get().setConversationCacheByMessage(m);
-          messageList.push(m);
-          if (m.messageType === MessageTypes.RECALL) {
-            recallMessageIndexes.push(messageList.length - 1);
-          }
-          if ([NotiMessageTypes.PRIVATE_OPEN_BURNAFTERREADING, NotiMessageTypes.GROUP_OPEN_BURNAFTERREADING, NotiMessageTypes.PRIVATE_CLOSE_BURNAFTERREADING, NotiMessageTypes.GROUP_CLOSE_BURNAFTERREADING].includes(m.messageType)) {
-            this.handleBurnAfterReadingMessage(m);
-          }
+    l.forEach(m => {
+      if (m.messageType === MessageTypes.RECALL && RecallMessageStore.has(m.content.messageUId)) {
+        if (m.content.messageUId) {
+          RecallMessageStore.remove(m.content.messageUId);
+          recallMessageUIds.push(m.content.messageUId);
         } else {
-          logger.error('message‘s messageUId is undefined', m);
+          logger.error('recallMessage’s messageUId is undefined', m);
         }
-      });
-      let deletedMessageIndexes = [];
-      for (let i = recallMessageIndexes.length - 1; i >= 0; i--) {
-        const index = recallMessageIndexes[i];
-        const recallMessage = messageList[index];
-        const recallContent = recallMessage.content;
-        const messageIndex = messageList.findIndex(m => m.messageUId === recallContent.messageUId);
-        if (messageIndex !== -1) {
-          deletedMessageIndexes.push(messageIndex);
-        } else {
-          recallMessageUIds.push(recallContent.messageUId);
-          deletedMessageIndexes.push(index);
+      } else if (m.messageUId) {
+        m.isOffLineMessage = isOffLineMessage;
+        if (!m.messageId || m.messageId > getCurrentMessageId()) {
+          m.messageId = generateNewMessageId();
         }
+        ConversationManager$1.get().setConversationCacheByMessage(m);
+        messageList.push(m);
+        if (m.messageType === MessageTypes.RECALL) {
+          recallMessageIndexes.push(messageList.length - 1);
+        }
+        if ([NotiMessageTypes.PRIVATE_OPEN_BURNAFTERREADING, NotiMessageTypes.GROUP_OPEN_BURNAFTERREADING, NotiMessageTypes.PRIVATE_CLOSE_BURNAFTERREADING, NotiMessageTypes.GROUP_CLOSE_BURNAFTERREADING].includes(m.messageType)) {
+          this.handleBurnAfterReadingMessage(m);
+        }
+      } else {
+        logger.error('message‘s messageUId is undefined', m);
       }
-      if (deletedMessageIndexes.length) {
-        let messageList_tmp = [];
-        messageList.forEach((m, index) => {
-          if (!deletedMessageIndexes.includes(index)) {
-            messageList_tmp.push(m);
-          }
-        });
-        messageList = messageList_tmp;
-      }
-      messages.push(...messageList);
     });
-    let normalMessages = this.handleReceiptMessages(messages);
+    let deletedMessageIndexes = [];
+    for (let i = recallMessageIndexes.length - 1; i >= 0; i--) {
+      const index = recallMessageIndexes[i];
+      const recallMessage = messageList[index];
+      const recallContent = recallMessage.content;
+      const messageIndex = messageList.findIndex(m => m.messageUId === recallContent.messageUId);
+      if (messageIndex !== -1) {
+        const targetMessage = messageList[messageIndex];
+        recallMessage.messageId = targetMessage.messageId;
+        recallMessage.sentTime = targetMessage.sentTime;
+        messageList[messageIndex] = recallMessage;
+        messageList[index] = targetMessage;
+        deletedMessageIndexes.push(index);
+      } else {
+        recallMessageUIds.push(recallContent.messageUId);
+        deletedMessageIndexes.push(index);
+      }
+    }
+    if (deletedMessageIndexes.length) {
+      let messageList_tmp = [];
+      messageList.forEach((m, index) => {
+        if (!deletedMessageIndexes.includes(index)) {
+          messageList_tmp.push(m);
+        }
+      });
+      messageList = messageList_tmp;
+    }
+    let normalMessages = this.handleReceiptMessages(messageList);
     if (normalMessages.length) {
+      await MessageCache$1.get()?.addMessages(normalMessages, {
+        conversationType: normalMessages[0].conversationType,
+        targetId: normalMessages[0].targetId
+      });
       this.handleBatchMessages(normalMessages);
       MessageReceiptManager$1.get()?.sendArrivalReceipts(normalMessages);
     }
     if (recallMessageUIds.length) {
-      MessageCache$1.get()?.convertToRecallMessages(recallMessageUIds);
+      await MessageCache$1.get()?.convertToRecallMessages(recallMessageUIds);
       this.watcher.onRecall?.(recallMessageUIds);
     }
+    const latestMessage = await MessageCache$1.get()?.getLatestMessage(conversation);
+    ConversationManager$1.get().updateLatestMessage(conversation, latestMessage);
   }
   handleBurnAfterReadingMessage(message) {
     const content = message.content;
@@ -21600,23 +21638,7 @@ class MessageLoader {
       return [];
     }
   }
-  handleBatchMessages(messages) {
-    if (messages.length) {
-      const targetGroups = new Map();
-      messages.forEach(message => {
-        if (!targetGroups.has(message.targetId)) {
-          targetGroups.set(message.targetId, []);
-        }
-        targetGroups.get(message.targetId).push(message);
-      });
-      targetGroups.forEach((targetMessages, targetId) => {
-        const conversationType = targetMessages[0].conversationType;
-        MessageCache$1.get()?.addMessages(targetMessages, {
-          conversationType,
-          targetId
-        });
-      });
-    }
+  async handleBatchMessages(messages) {
     const filteredMessages = messages.filter(m => {
       if (m.messageDirection === MessageDirection.SEND && m.messageId && SentMessageStore.has(m.messageId)) {
         SentMessageStore.remove(m.messageId);

package/index.umd.js

@@ -20142,14 +20142,6 @@
           val: newLocalConversation.unreadMentionedCount
         };
       }
-      if (isPersited) {
-        updateConOptions.conversation.updateTime = parseInt(message.sentTime);
-        updateConOptions.conversation.latestMessage = message;
-        updateConOptions.updatedItems.latestMessage = {
-          time: parseInt(message.sentTime),
-          val: message
-        };
-      }
       if (Object.keys(updateConOptions.updatedItems).length) {
         this.setUpdatedConversation(updateConOptions);
       }
@@ -21322,29 +21314,59 @@
       if (!messageUIds || messageUIds.length === 0 || !this.db) {
         return;
       }
-      const transaction = this.db.transaction(this.STORE_NAME, 'readwrite');
-      const store = transaction.objectStore(this.STORE_NAME);
-      const index = store.index('messageUId');
-      messageUIds.forEach(messageUId => {
-        const request = index.get(messageUId);
-        request.onsuccess = () => {
-          const message = request.result;
-          if (message) {
-            const recallContent = {
-              messageUId: messageUId
-            };
-            const updatedMessage = {
-              ...message,
-              messageType: MessageTypes.RECALL,
-              content: this.encryptContent(recallContent)
-            };
-            store.put(updatedMessage);
+      return new Promise(resolve => {
+        const transaction = this.db.transaction(this.STORE_NAME, 'readwrite');
+        const store = transaction.objectStore(this.STORE_NAME);
+        const index = store.index('messageUId');
+        let pendingRequests = messageUIds.length;
+        for (const messageUId of messageUIds) {
+          const request = index.get(messageUId);
+          request.onsuccess = () => {
+            const message = request.result;
+            if (message) {
+              const recallContent = {
+                messageUId: messageUId
+              };
+              const updatedMessage = {
+                ...message,
+                messageType: MessageTypes.RECALL,
+                content: this.encryptContent(recallContent),
+                isPersited: true,
+                isCounted: false,
+                isMentioned: false,
+                disableNotification: true
+              };
+              const putRequest = store.put(updatedMessage);
+              putRequest.onerror = () => {
+                checkComplete();
+              };
+              putRequest.onsuccess = () => {
+                checkComplete();
+              };
+            } else {
+              checkComplete();
+            }
+          };
+          request.onerror = () => {
+            checkComplete();
+          };
+        }
+        function checkComplete() {
+          pendingRequests--;
+          if (pendingRequests === 0) {
+            resolve();
           }
+        }
+        transaction.oncomplete = () => {
+          resolve();
+        };
+        transaction.onerror = () => {
+          resolve();
         };
       });
     }
   }
-  let cache;
+  let cache = null;
   var MessageCache$1 = {
     create(appkey, currentUserId) {
       cache = new MessageCache(appkey, currentUserId);
@@ -21448,9 +21470,14 @@
         };
       });
       await ConversationManager$1.get().loadConvsationsIfNotExist(cons);
-      serverMessageParser.parse(msg, (done, outputMsgs) => {
+      serverMessageParser.parse(msg, async (done, outputMsgs) => {
         try {
-          this.processMessages(outputMsgs, !this.pullOfflineFinished);
+          for (const [dialogId, l] of outputMsgs.entries()) {
+            if (l.length === 0) {
+              return;
+            }
+            await this.processMessages(l, !this.pullOfflineFinished);
+          }
         } catch (error) {
           logger.error('processMessages error', error);
         }
@@ -21487,70 +21514,81 @@
         }
       });
     }
-    processMessages(outputMsgs, isOffLineMessage) {
-      const messages = [];
+    async processMessages(l, isOffLineMessage) {
+      const conversation = {
+        conversationType: l[0].conversationType,
+        targetId: l[0].targetId
+      };
+      let messageList = [];
+      const recallMessageIndexes = [];
       let recallMessageUIds = [];
-      outputMsgs.forEach((l, dialogId) => {
-        let messageList = [];
-        const recallMessageIndexes = [];
-        l.forEach(m => {
-          if (m.messageType === MessageTypes.RECALL && RecallMessageStore.has(m.content.messageUId)) {
-            if (m.content.messageUId) {
-              RecallMessageStore.remove(m.content.messageUId);
-              recallMessageUIds.push(m.content.messageUId);
-            } else {
-              logger.error('recallMessage’s messageUId is undefined', m);
-            }
-          } else if (m.messageUId) {
-            m.isOffLineMessage = isOffLineMessage;
-            if (!m.messageId || m.messageId > getCurrentMessageId()) {
-              m.messageId = generateNewMessageId();
-            }
-            ConversationManager$1.get().setConversationCacheByMessage(m);
-            messageList.push(m);
-            if (m.messageType === MessageTypes.RECALL) {
-              recallMessageIndexes.push(messageList.length - 1);
-            }
-            if ([NotiMessageTypes.PRIVATE_OPEN_BURNAFTERREADING, NotiMessageTypes.GROUP_OPEN_BURNAFTERREADING, NotiMessageTypes.PRIVATE_CLOSE_BURNAFTERREADING, NotiMessageTypes.GROUP_CLOSE_BURNAFTERREADING].includes(m.messageType)) {
-              this.handleBurnAfterReadingMessage(m);
-            }
+      l.forEach(m => {
+        if (m.messageType === MessageTypes.RECALL && RecallMessageStore.has(m.content.messageUId)) {
+          if (m.content.messageUId) {
+            RecallMessageStore.remove(m.content.messageUId);
+            recallMessageUIds.push(m.content.messageUId);
           } else {
-            logger.error('message‘s messageUId is undefined', m);
+            logger.error('recallMessage’s messageUId is undefined', m);
           }
-        });
-        let deletedMessageIndexes = [];
-        for (let i = recallMessageIndexes.length - 1; i >= 0; i--) {
-          const index = recallMessageIndexes[i];
-          const recallMessage = messageList[index];
-          const recallContent = recallMessage.content;
-          const messageIndex = messageList.findIndex(m => m.messageUId === recallContent.messageUId);
-          if (messageIndex !== -1) {
-            deletedMessageIndexes.push(messageIndex);
-          } else {
-            recallMessageUIds.push(recallContent.messageUId);
-            deletedMessageIndexes.push(index);
+        } else if (m.messageUId) {
+          m.isOffLineMessage = isOffLineMessage;
+          if (!m.messageId || m.messageId > getCurrentMessageId()) {
+            m.messageId = generateNewMessageId();
           }
+          ConversationManager$1.get().setConversationCacheByMessage(m);
+          messageList.push(m);
+          if (m.messageType === MessageTypes.RECALL) {
+            recallMessageIndexes.push(messageList.length - 1);
+          }
+          if ([NotiMessageTypes.PRIVATE_OPEN_BURNAFTERREADING, NotiMessageTypes.GROUP_OPEN_BURNAFTERREADING, NotiMessageTypes.PRIVATE_CLOSE_BURNAFTERREADING, NotiMessageTypes.GROUP_CLOSE_BURNAFTERREADING].includes(m.messageType)) {
+            this.handleBurnAfterReadingMessage(m);
+          }
+        } else {
+          logger.error('message‘s messageUId is undefined', m);
         }
-        if (deletedMessageIndexes.length) {
-          let messageList_tmp = [];
-          messageList.forEach((m, index) => {
-            if (!deletedMessageIndexes.includes(index)) {
-              messageList_tmp.push(m);
-            }
-          });
-          messageList = messageList_tmp;
-        }
-        messages.push(...messageList);
       });
-      let normalMessages = this.handleReceiptMessages(messages);
+      let deletedMessageIndexes = [];
+      for (let i = recallMessageIndexes.length - 1; i >= 0; i--) {
+        const index = recallMessageIndexes[i];
+        const recallMessage = messageList[index];
+        const recallContent = recallMessage.content;
+        const messageIndex = messageList.findIndex(m => m.messageUId === recallContent.messageUId);
+        if (messageIndex !== -1) {
+          const targetMessage = messageList[messageIndex];
+          recallMessage.messageId = targetMessage.messageId;
+          recallMessage.sentTime = targetMessage.sentTime;
+          messageList[messageIndex] = recallMessage;
+          messageList[index] = targetMessage;
+          deletedMessageIndexes.push(index);
+        } else {
+          recallMessageUIds.push(recallContent.messageUId);
+          deletedMessageIndexes.push(index);
+        }
+      }
+      if (deletedMessageIndexes.length) {
+        let messageList_tmp = [];
+        messageList.forEach((m, index) => {
+          if (!deletedMessageIndexes.includes(index)) {
+            messageList_tmp.push(m);
+          }
+        });
+        messageList = messageList_tmp;
+      }
+      let normalMessages = this.handleReceiptMessages(messageList);
       if (normalMessages.length) {
+        await MessageCache$1.get()?.addMessages(normalMessages, {
+          conversationType: normalMessages[0].conversationType,
+          targetId: normalMessages[0].targetId
+        });
         this.handleBatchMessages(normalMessages);
         MessageReceiptManager$1.get()?.sendArrivalReceipts(normalMessages);
       }
       if (recallMessageUIds.length) {
-        MessageCache$1.get()?.convertToRecallMessages(recallMessageUIds);
+        await MessageCache$1.get()?.convertToRecallMessages(recallMessageUIds);
         this.watcher.onRecall?.(recallMessageUIds);
       }
+      const latestMessage = await MessageCache$1.get()?.getLatestMessage(conversation);
+      ConversationManager$1.get().updateLatestMessage(conversation, latestMessage);
     }
     handleBurnAfterReadingMessage(message) {
       const content = message.content;
@@ -21606,23 +21644,7 @@
         return [];
       }
     }
-    handleBatchMessages(messages) {
-      if (messages.length) {
-        const targetGroups = new Map();
-        messages.forEach(message => {
-          if (!targetGroups.has(message.targetId)) {
-            targetGroups.set(message.targetId, []);
-          }
-          targetGroups.get(message.targetId).push(message);
-        });
-        targetGroups.forEach((targetMessages, targetId) => {
-          const conversationType = targetMessages[0].conversationType;
-          MessageCache$1.get()?.addMessages(targetMessages, {
-            conversationType,
-            targetId
-          });
-        });
-      }
+    async handleBatchMessages(messages) {
       const filteredMessages = messages.filter(m => {
         if (m.messageDirection === exports.MessageDirection.SEND && m.messageId && SentMessageStore.has(m.messageId)) {
           SentMessageStore.remove(m.messageId);

package/package.json

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