@onyx-p/imlib-web 2.4.2 → 2.4.6

package/index.esm.js

@@ -19491,24 +19491,28 @@ class DialogSecretKey {
     if (!dialogIdList.length) {
       return new Map();
     }
-    const {
-      code,
-      data
-    } = await getDialogKey(dialogIdList.map(e => Long.fromString(e)));
-    if (code === ErrorCode.SUCCESS) {
-      const content = new Map();
-      for (const k in data.entry) {
-        const v = data.entry[k];
-        if (v.aesKey?.length && v.aesIV?.length) {
-          const keyItem = {
-            key: v.aesKey,
-            iv: v.aesIV
-          };
-          content.set(k, keyItem);
-          this.aesKeyRecord.set(k, keyItem);
+    try {
+      const {
+        code,
+        data
+      } = await getDialogKey(dialogIdList.map(e => Long.fromString(e)));
+      if (code === ErrorCode.SUCCESS) {
+        const content = new Map();
+        for (const k in data.entry) {
+          const v = data.entry[k];
+          if (v.aesKey?.length && v.aesIV?.length) {
+            const keyItem = {
+              key: v.aesKey,
+              iv: v.aesIV
+            };
+            content.set(k, keyItem);
+            this.aesKeyRecord.set(k, keyItem);
+          }
         }
+        return content;
       }
-      return content;
+    } catch (error) {
+      logger.error('getDialogAesKeyListFromRemote error', error);
     }
     return new Map();
   }
@@ -19739,7 +19743,7 @@ class ConversationStore {
       messageDirection,
       content
     } = message;
-    if (messageDirection === MessageDirection.SEND || !isMentioned && messageType !== MessageTypes.RECALL) {
+    if (!messageUId || messageDirection === MessageDirection.SEND || !isMentioned && messageType !== MessageTypes.RECALL) {
       return;
     }
     const key = this.getStoreKey({
@@ -19756,7 +19760,7 @@ class ConversationStore {
     }
     if (messageType === MessageTypes.RECALL && conversationType === ConversationType.GROUP) {
       const recallContent = content;
-      const index = localMentionedUIdList.indexOf(recallContent.messageUId.toString());
+      const index = localMentionedUIdList.indexOf(recallContent.messageUId?.toString() ?? '');
       if (index >= 0) {
         localMentionedUIdList.splice(index, 1);
       }
@@ -20435,15 +20439,22 @@ function parse(orginalMsgs, callback) {
   }
   const remainDialogIds = new Set([...msgs.keys()]);
   DialogSecretKey$1.getDialogAesKeyListInBatches([...msgs.keys()], (remote, aesKeys) => {
-    if (aesKeys.size) {
-      const dialogIds = [...aesKeys.keys()];
-      for (const k of dialogIds) {
-        remainDialogIds.delete(k);
+    try {
+      if (aesKeys.size) {
+        const dialogIds = [...aesKeys.keys()];
+        for (const k of dialogIds) {
+          remainDialogIds.delete(k);
+        }
+        callback(!remainDialogIds.size, parseDialogsMessages(dialogIds, msgs, aesKeys));
+      }
+      if (remainDialogIds.size && remote) {
+        callback(true, new Map());
+      }
+    } catch (error) {
+      logger.error('parseDialogsMessages error', error);
+      if (remainDialogIds.size && remote) {
+        callback(true, new Map());
       }
-      callback(!remainDialogIds.size, parseDialogsMessages(dialogIds, msgs, aesKeys));
-    }
-    if (remainDialogIds.size && remote) {
-      callback(true, new Map());
     }
   });
 }
@@ -20506,7 +20517,11 @@ const parseSingleDialogMessages = (dialogId, originalMessageList, aesKey) => {
       if (receivedMessage.isStatusMessage && Long.fromNumber(getServerTime$1()).subtract(receivedMessage.sentTime).greaterThan(STATUSMESSAGE_ALIVE_TIMEMS)) {
         return;
       }
-      contentList.push(receivedMessage);
+      if (notEmptyString(receivedMessage.messageUId)) {
+        contentList.push(receivedMessage);
+      } else {
+        logger.error('message is invalid', item);
+      }
     }
   });
   return contentList;
@@ -21428,86 +21443,108 @@ class MessageLoader {
     });
     await ConversationManager$1.get().loadConvsationsIfNotExist(cons);
     serverMessageParser.parse(msg, (done, outputMsgs) => {
-      const messages = [];
-      let recallMessageUIds = [];
+      try {
+        this.processMessages(outputMsgs, !this.pullOfflineFinished);
+      } catch (error) {
+        logger.error('processMessages error', error);
+      }
+      if (done) {
+        try {
+          let seqNo_long;
+          if (seqno) {
+            if (Long.isLong(seqno)) {
+              seqNo_long = seqno;
+            } else if (typeof seqno === 'string') {
+              seqNo_long = Long.fromString(seqno);
+            } else if (typeof seqno === 'number') {
+              seqNo_long = Long.fromNumber(seqno);
+            }
+          }
+          if (seqNo_long && Long.isLong(seqNo_long) && seqNo_long.ge(this.serverMsgSeqno)) {
+            this.serverMsgSeqno = seqNo_long;
+          }
+          const isFinished = this.serverMsgSeqno.lessThanOrEqual(offset);
+          logger.info(`pullMsg success -> syncTime: ${offset}, finished: ${isFinished}`);
+          this.letterbox?.setInboxOffset(offset);
+          this.pullingMsg = false;
+          if (isFinished && !this.pullOfflineFinished) {
+            this.pullOfflineFinished = true;
+            this.watcher.pullFinished && this.watcher.pullFinished();
+          }
+          if (!isFinished) {
+            this.pullMsg();
+          }
+        } catch (error) {
+          logger.error('setPullMsgDone error', error);
+          this.pullingMsg = false;
+        }
+      }
+    });
+  }
+  processMessages(outputMsgs, isOffLineMessage) {
+    const messages = [];
+    let recallMessageUIds = [];
+    outputMsgs.forEach((l, dialogId) => {
+      let messageList = [];
       const recallMessageIndexes = [];
-      const isOffLineMessage = !this.pullOfflineFinished;
-      outputMsgs.forEach((l, dialogId) => {
-        let messageList = [];
-        l.forEach(m => {
-          if (m.messageType === MessageTypes.RECALL && RecallMessageStore.has(m.content.messageUId)) {
+      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 {
-            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);
-            }
+            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);
           }
-        });
-        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);
-          }
-        }
-        messageList = messageList.filter((m, index) => !deletedMessageIndexes.includes(index));
-        messages.push(...messageList);
-        if (this.isExistPersistedMessage(messageList)) {
-          splitFullDialog(dialogId);
+        } else {
+          logger.error('message‘s messageUId is undefined', m);
         }
       });
-      let normalMessages = this.handleReceiptMessages(messages);
-      if (normalMessages.length) {
-        this.handleBatchMessages(normalMessages);
-        MessageReceiptManager$1.get()?.sendArrivalReceipts(normalMessages);
-      }
-      if (recallMessageUIds.length) {
-        MessageCache$1.get()?.convertToRecallMessages(recallMessageUIds);
-        this.watcher.onRecall?.(recallMessageUIds);
+      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);
+        }
       }
-      if (done) {
-        let seqNo_long;
-        if (seqno) {
-          if (Long.isLong(seqno)) {
-            seqNo_long = seqno;
-          } else if (typeof seqno === 'string') {
-            seqNo_long = Long.fromString(seqno);
-          } else if (typeof seqno === 'number') {
-            seqNo_long = Long.fromNumber(seqno);
+      if (deletedMessageIndexes.length) {
+        let messageList_tmp = [];
+        messageList.forEach((m, index) => {
+          if (!deletedMessageIndexes.includes(index)) {
+            messageList_tmp.push(m);
           }
-        }
-        if (seqNo_long && Long.isLong(seqNo_long) && seqNo_long.ge(this.serverMsgSeqno)) {
-          this.serverMsgSeqno = seqNo_long;
-        }
-        const isFinished = this.serverMsgSeqno.lessThanOrEqual(offset);
-        logger.info(`pullMsg success -> syncTime: ${offset}, finished: ${isFinished}`);
-        this.letterbox?.setInboxOffset(offset);
-        this.pullingMsg = false;
-        if (isFinished && !this.pullOfflineFinished) {
-          this.pullOfflineFinished = true;
-          this.watcher.pullFinished && this.watcher.pullFinished();
-        }
-        if (!isFinished) {
-          this.pullMsg();
-        }
+        });
+        messageList = messageList_tmp;
       }
+      messages.push(...messageList);
     });
+    let normalMessages = this.handleReceiptMessages(messages);
+    if (normalMessages.length) {
+      this.handleBatchMessages(normalMessages);
+      MessageReceiptManager$1.get()?.sendArrivalReceipts(normalMessages);
+    }
+    if (recallMessageUIds.length) {
+      MessageCache$1.get()?.convertToRecallMessages(recallMessageUIds);
+      this.watcher.onRecall?.(recallMessageUIds);
+    }
   }
   handleBurnAfterReadingMessage(message) {
     const content = message.content;
@@ -21591,9 +21628,6 @@ class MessageLoader {
       this.watcher.batchMessage?.(filteredMessages);
     }
   }
-  isExistPersistedMessage(messageList) {
-    return messageList.some(m => m.isPersited);
-  }
 }
 
 class BaseMessage {

package/index.umd.js

@@ -19497,24 +19497,28 @@
       if (!dialogIdList.length) {
         return new Map();
       }
-      const {
-        code,
-        data
-      } = await getDialogKey(dialogIdList.map(e => Long.fromString(e)));
-      if (code === exports.ErrorCode.SUCCESS) {
-        const content = new Map();
-        for (const k in data.entry) {
-          const v = data.entry[k];
-          if (v.aesKey?.length && v.aesIV?.length) {
-            const keyItem = {
-              key: v.aesKey,
-              iv: v.aesIV
-            };
-            content.set(k, keyItem);
-            this.aesKeyRecord.set(k, keyItem);
+      try {
+        const {
+          code,
+          data
+        } = await getDialogKey(dialogIdList.map(e => Long.fromString(e)));
+        if (code === exports.ErrorCode.SUCCESS) {
+          const content = new Map();
+          for (const k in data.entry) {
+            const v = data.entry[k];
+            if (v.aesKey?.length && v.aesIV?.length) {
+              const keyItem = {
+                key: v.aesKey,
+                iv: v.aesIV
+              };
+              content.set(k, keyItem);
+              this.aesKeyRecord.set(k, keyItem);
+            }
           }
+          return content;
         }
-        return content;
+      } catch (error) {
+        logger.error('getDialogAesKeyListFromRemote error', error);
       }
       return new Map();
     }
@@ -19745,7 +19749,7 @@
         messageDirection,
         content
       } = message;
-      if (messageDirection === exports.MessageDirection.SEND || !isMentioned && messageType !== MessageTypes.RECALL) {
+      if (!messageUId || messageDirection === exports.MessageDirection.SEND || !isMentioned && messageType !== MessageTypes.RECALL) {
         return;
       }
       const key = this.getStoreKey({
@@ -19762,7 +19766,7 @@
       }
       if (messageType === MessageTypes.RECALL && conversationType === exports.ConversationType.GROUP) {
         const recallContent = content;
-        const index = localMentionedUIdList.indexOf(recallContent.messageUId.toString());
+        const index = localMentionedUIdList.indexOf(recallContent.messageUId?.toString() ?? '');
         if (index >= 0) {
           localMentionedUIdList.splice(index, 1);
         }
@@ -20441,15 +20445,22 @@
     }
     const remainDialogIds = new Set([...msgs.keys()]);
     DialogSecretKey$1.getDialogAesKeyListInBatches([...msgs.keys()], (remote, aesKeys) => {
-      if (aesKeys.size) {
-        const dialogIds = [...aesKeys.keys()];
-        for (const k of dialogIds) {
-          remainDialogIds.delete(k);
+      try {
+        if (aesKeys.size) {
+          const dialogIds = [...aesKeys.keys()];
+          for (const k of dialogIds) {
+            remainDialogIds.delete(k);
+          }
+          callback(!remainDialogIds.size, parseDialogsMessages(dialogIds, msgs, aesKeys));
+        }
+        if (remainDialogIds.size && remote) {
+          callback(true, new Map());
+        }
+      } catch (error) {
+        logger.error('parseDialogsMessages error', error);
+        if (remainDialogIds.size && remote) {
+          callback(true, new Map());
         }
-        callback(!remainDialogIds.size, parseDialogsMessages(dialogIds, msgs, aesKeys));
-      }
-      if (remainDialogIds.size && remote) {
-        callback(true, new Map());
       }
     });
   }
@@ -20512,7 +20523,11 @@
         if (receivedMessage.isStatusMessage && Long.fromNumber(getServerTime$1()).subtract(receivedMessage.sentTime).greaterThan(STATUSMESSAGE_ALIVE_TIMEMS)) {
           return;
         }
-        contentList.push(receivedMessage);
+        if (notEmptyString(receivedMessage.messageUId)) {
+          contentList.push(receivedMessage);
+        } else {
+          logger.error('message is invalid', item);
+        }
       }
     });
     return contentList;
@@ -21434,86 +21449,108 @@
       });
       await ConversationManager$1.get().loadConvsationsIfNotExist(cons);
       serverMessageParser.parse(msg, (done, outputMsgs) => {
-        const messages = [];
-        let recallMessageUIds = [];
+        try {
+          this.processMessages(outputMsgs, !this.pullOfflineFinished);
+        } catch (error) {
+          logger.error('processMessages error', error);
+        }
+        if (done) {
+          try {
+            let seqNo_long;
+            if (seqno) {
+              if (Long.isLong(seqno)) {
+                seqNo_long = seqno;
+              } else if (typeof seqno === 'string') {
+                seqNo_long = Long.fromString(seqno);
+              } else if (typeof seqno === 'number') {
+                seqNo_long = Long.fromNumber(seqno);
+              }
+            }
+            if (seqNo_long && Long.isLong(seqNo_long) && seqNo_long.ge(this.serverMsgSeqno)) {
+              this.serverMsgSeqno = seqNo_long;
+            }
+            const isFinished = this.serverMsgSeqno.lessThanOrEqual(offset);
+            logger.info(`pullMsg success -> syncTime: ${offset}, finished: ${isFinished}`);
+            this.letterbox?.setInboxOffset(offset);
+            this.pullingMsg = false;
+            if (isFinished && !this.pullOfflineFinished) {
+              this.pullOfflineFinished = true;
+              this.watcher.pullFinished && this.watcher.pullFinished();
+            }
+            if (!isFinished) {
+              this.pullMsg();
+            }
+          } catch (error) {
+            logger.error('setPullMsgDone error', error);
+            this.pullingMsg = false;
+          }
+        }
+      });
+    }
+    processMessages(outputMsgs, isOffLineMessage) {
+      const messages = [];
+      let recallMessageUIds = [];
+      outputMsgs.forEach((l, dialogId) => {
+        let messageList = [];
         const recallMessageIndexes = [];
-        const isOffLineMessage = !this.pullOfflineFinished;
-        outputMsgs.forEach((l, dialogId) => {
-          let messageList = [];
-          l.forEach(m => {
-            if (m.messageType === MessageTypes.RECALL && RecallMessageStore.has(m.content.messageUId)) {
+        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 {
-              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);
-              }
+              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);
             }
-          });
-          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);
-            }
-          }
-          messageList = messageList.filter((m, index) => !deletedMessageIndexes.includes(index));
-          messages.push(...messageList);
-          if (this.isExistPersistedMessage(messageList)) {
-            splitFullDialog(dialogId);
+          } else {
+            logger.error('message‘s messageUId is undefined', m);
           }
         });
-        let normalMessages = this.handleReceiptMessages(messages);
-        if (normalMessages.length) {
-          this.handleBatchMessages(normalMessages);
-          MessageReceiptManager$1.get()?.sendArrivalReceipts(normalMessages);
-        }
-        if (recallMessageUIds.length) {
-          MessageCache$1.get()?.convertToRecallMessages(recallMessageUIds);
-          this.watcher.onRecall?.(recallMessageUIds);
+        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);
+          }
         }
-        if (done) {
-          let seqNo_long;
-          if (seqno) {
-            if (Long.isLong(seqno)) {
-              seqNo_long = seqno;
-            } else if (typeof seqno === 'string') {
-              seqNo_long = Long.fromString(seqno);
-            } else if (typeof seqno === 'number') {
-              seqNo_long = Long.fromNumber(seqno);
+        if (deletedMessageIndexes.length) {
+          let messageList_tmp = [];
+          messageList.forEach((m, index) => {
+            if (!deletedMessageIndexes.includes(index)) {
+              messageList_tmp.push(m);
             }
-          }
-          if (seqNo_long && Long.isLong(seqNo_long) && seqNo_long.ge(this.serverMsgSeqno)) {
-            this.serverMsgSeqno = seqNo_long;
-          }
-          const isFinished = this.serverMsgSeqno.lessThanOrEqual(offset);
-          logger.info(`pullMsg success -> syncTime: ${offset}, finished: ${isFinished}`);
-          this.letterbox?.setInboxOffset(offset);
-          this.pullingMsg = false;
-          if (isFinished && !this.pullOfflineFinished) {
-            this.pullOfflineFinished = true;
-            this.watcher.pullFinished && this.watcher.pullFinished();
-          }
-          if (!isFinished) {
-            this.pullMsg();
-          }
+          });
+          messageList = messageList_tmp;
         }
+        messages.push(...messageList);
       });
+      let normalMessages = this.handleReceiptMessages(messages);
+      if (normalMessages.length) {
+        this.handleBatchMessages(normalMessages);
+        MessageReceiptManager$1.get()?.sendArrivalReceipts(normalMessages);
+      }
+      if (recallMessageUIds.length) {
+        MessageCache$1.get()?.convertToRecallMessages(recallMessageUIds);
+        this.watcher.onRecall?.(recallMessageUIds);
+      }
     }
     handleBurnAfterReadingMessage(message) {
       const content = message.content;
@@ -21597,9 +21634,6 @@
         this.watcher.batchMessage?.(filteredMessages);
       }
     }
-    isExistPersistedMessage(messageList) {
-      return messageList.some(m => m.isPersited);
-    }
   }
 
   class BaseMessage {

package/package.json

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