@onyx-p/imlib-web 2.3.2 → 2.3.4

package/index.esm.js

@@ -20722,302 +20722,13 @@ function getCurrentMessageId() {
   return lastMessageId;
 }
 
-class MessageLoader {
-  watcher;
-  pullingMsg = false;
-  letterbox;
-  serverMsgSeqno = Long.ZERO;
-  pullOfflineFinished = false;
-  intervalTimer;
-  retryTimer;
-  latestSyncTimestamp = 0;
-  started = false;
-  constructor(watcher, options) {
-    this.watcher = watcher;
-    this.letterbox = new Letterbox(options.appkey, accountStore.uid.toString());
-  }
-  start() {
-    this.started = true;
-    this.pullOfflineFinished = false;
-    this.startPullInterval();
-  }
-  stop() {
-    this.started = false;
-    this.stopPullInterval();
-    this.cancelRetryTask();
-  }
-  syncMsg(seqno) {
-    this.serverMsgSeqno = seqno;
-    this.pullMsg();
-  }
-  startPullInterval() {
-    this.stopPullInterval();
-    const d = 3 * 60 * 1000;
-    this.intervalTimer = setInterval(() => {
-      if (Date.now() - this.latestSyncTimestamp >= d) {
-        this.pullMsg();
-      }
-    }, 30000);
-    this.latestSyncTimestamp = Date.now();
-    this.pullMsg();
-  }
-  stopPullInterval() {
-    if (this.intervalTimer) {
-      clearInterval(this.intervalTimer);
-      this.intervalTimer = null;
-    }
-  }
-  try2RePullMsg() {
-    this.retryTimer = setTimeout(() => {
-      this.retryTimer = null;
-      this.pullMsg();
-    }, 1000);
-  }
-  cancelRetryTask() {
-    if (this.retryTimer) {
-      clearTimeout(this.retryTimer);
-      this.retryTimer = null;
-    }
-  }
-  async pullMsg() {
-    if (this.pullingMsg) {
-      return;
-    }
-    if (!this.started) {
-      return;
-    }
-    this.cancelRetryTask();
-    this.pullingMsg = true;
-    const inboxTime = this.letterbox.getInboxOffset();
-    logger.info(`pullMsg -> time: ${inboxTime}`);
-    this.latestSyncTimestamp = Date.now();
-    const {
-      code,
-      data
-    } = await getNewMessages(inboxTime, 60);
-    if (code !== ErrorCode.SUCCESS) {
-      logger.warn('pullMsg failed -> code:', code);
-      this.pullingMsg = false;
-      if (LibLoader.loader?.getConnectionStatus() == ConnectionStatus.CONNECTED) {
-        this.try2RePullMsg();
-      }
-      return;
-    }
-    const {
-      offset,
-      seqno,
-      msg
-    } = data;
-    const cons = Object.keys(msg).map(dialogId => {
-      const conversationType = extractConversationType(Long.fromString(dialogId));
-      return {
-        conversationType,
-        targetId: dialogId
-      };
-    });
-    await ConversationManager$1.get().loadConvsationsIfNotExist(cons);
-    serverMessageParser.parse(msg, (done, outputMsgs) => {
-      const messages = [];
-      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)) {
-            RecallMessageStore.remove(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);
-            }
-          }
-          if ([NotiMessageTypes.PRIVATE_OPEN_BURNAFTERREADING, NotiMessageTypes.GROUP_OPEN_BURNAFTERREADING, NotiMessageTypes.PRIVATE_CLOSE_BURNAFTERREADING, NotiMessageTypes.GROUP_CLOSE_BURNAFTERREADING].includes(m.messageType)) {
-            this.handleBurnAfterReadingMessage(m);
-          }
-        });
-        let 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);
-          }
-        }
-        messageList = messageList.filter((m, index) => !deletedMessageIndexes.includes(index));
-        messages.push(...messageList);
-        if (this.isExistPersistedMessage(messageList)) {
-          splitFullDialog(dialogId);
-        }
-        if (recallMessageUIds.length) {
-          this.watcher.onRecall?.(recallMessageUIds);
-        }
-      });
-      let normalMessages = this.handleReceiptMessages(messages);
-      if (normalMessages.length) {
-        this.watcher.batchMessage?.(normalMessages);
-        MessageReceiptManager$1.get()?.sendArrivalReceipts(normalMessages);
-      }
-      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 (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();
-        }
-      }
-    });
-  }
-  handleBurnAfterReadingMessage(message) {
-    const content = message.content;
-    const conversationType = message.conversationType;
-    const targetId = message.targetId;
-    const {
-      templateId,
-      burnAfterReadingTime
-    } = content;
-    const burnAfterReadingFlag = templateId === 60010010 || templateId === 60010011;
-    ConversationManager$1.get().addStatus({
-      conversationType,
-      targetId,
-      burnAfterReadingFlag: burnAfterReadingFlag,
-      burnAfterReadingTime: burnAfterReadingFlag ? burnAfterReadingTime : null
-    }, true);
-  }
-  handleReceiptMessages(messages) {
-    try {
-      const normalMessages = [];
-      const receiptnotificationMessages = [];
-      messages.forEach(msg => {
-        if (msg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || msg.messageType === NotiMessageTypes.GROUP_READ_RECEIPT || msg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT || msg.messageType === NotiMessageTypes.PRIVATE_READ_RECEIPT) {
-          receiptnotificationMessages.push(msg);
-        } else {
-          normalMessages.push(msg);
-        }
-      });
-      const sentMessages = normalMessages.filter(m => m.messageDirection === MessageDirection.SEND);
-      receiptnotificationMessages.forEach(notiMsg => {
-        const notiContent = notiMsg.content;
-        const isArrivalReceipt = notiMsg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || notiMsg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT;
-        sentMessages.forEach(msg => {
-          if (notiContent.msgIdList.includes(msg.messageUId)) {
-            if (isArrivalReceipt) {
-              msg.receivedStatus = ReceivedStatus.RECEIVED;
-            } else {
-              msg.receivedStatus = ReceivedStatus.READ;
-            }
-          }
-        });
-        this.watcher.onReceiptReceived?.({
-          conversation: {
-            conversationType: notiMsg.conversationType,
-            targetId: notiMsg.targetId
-          },
-          messageUIdList: notiContent.msgIdList.map(id => id.toString())
-        }, notiMsg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || notiMsg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT ? 0 : 1);
-      });
-      return normalMessages;
-    } catch (error) {
-      logger.error('handleReceiptMessages error', error);
-      return [];
-    }
-  }
-  isExistPersistedMessage(messageList) {
-    return messageList.some(m => m.isPersited);
-  }
-}
-
-class BaseMessage {
-  messageType;
-  content;
-  isPersited;
-  isCounted;
-  isStatusMessage;
-  constructor(messageType, content, isPersited = true, isCounted = true, isStatusMessage = false) {
-    this.messageType = messageType;
-    this.content = content;
-    if (isStatusMessage) {
-      this.isPersited = false;
-      this.isCounted = false;
-    } else {
-      this.isPersited = isPersited;
-      this.isCounted = isCounted;
-    }
-    this.isStatusMessage = isStatusMessage;
-  }
-}
-const registerMessageType$1 = (messageType, isPersited, isCounted, isStatusMessage) => {
-  const defined = function (content) {
-    return new BaseMessage(messageType, content, isPersited, isCounted, isStatusMessage);
-  };
-  return defined;
-};
-
-const TextMessage = registerMessageType$1(MessageTypes.TEXT, true, true, false);
-
-const ImageMessage = registerMessageType$1(MessageTypes.IMAGE, true, true, false);
-
-const GIFMessage = registerMessageType$1(MessageTypes.GIF, true, true, false);
-
-const VoiceMessage = registerMessageType$1(MessageTypes.AUDIO, true, true, false);
-
-const FileMessage = registerMessageType$1(MessageTypes.FILE, true, true, false);
-
-const VideoMessage = registerMessageType$1(MessageTypes.VIDEO, true, true, false);
-
-let LocationMessage = registerMessageType$1(MessageTypes.LOCATION, true, true, false);
-let ChatRecordMessage = registerMessageType$1(MessageTypes.CHAT_RECORD, true, true, false);
-let ContactMessage = registerMessageType$1(MessageTypes.CONTACT, true, true, false);
-let InvitationMessage = registerMessageType$1(MessageTypes.GROUP_INVITATION, true, true, false);
-let RedEnvelopeMessage = registerMessageType$1(MessageTypes.REDPACKET, true, true, false);
-let TransferMessage = registerMessageType$1(MessageTypes.TRANSFER, true, true, false);
-
-const GroupArrivalReceiptMessage = registerMessageType$1(NotiMessageTypes.GROUP_ARRIVAL_RECEIPT, false, false, true);
-const GroupReadReceiptMessage = registerMessageType$1(NotiMessageTypes.GROUP_READ_RECEIPT, false, false, true);
-const PrivateArrivalReceiptMessage = registerMessageType$1(NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT, false, false, true);
-const PrivateReadReceiptMessage = registerMessageType$1(NotiMessageTypes.PRIVATE_READ_RECEIPT, false, false, true);
-const PrivateOpenBurnAfterReadingMessage = registerMessageType$1(NotiMessageTypes.PRIVATE_OPEN_BURNAFTERREADING, false, false, true);
-const PrivateCloseBurnAfterReadingMessage = registerMessageType$1(NotiMessageTypes.PRIVATE_CLOSE_BURNAFTERREADING, false, false, true);
-const GroupOpenBurnAfterReadingMessage = registerMessageType$1(NotiMessageTypes.GROUP_OPEN_BURNAFTERREADING, false, false, true);
-const GroupCloseBurnAfterReadingMessage = registerMessageType$1(NotiMessageTypes.GROUP_CLOSE_BURNAFTERREADING, false, false, true);
-
-const RecallCommandMessage = registerMessageType$1(MessageTypes.RECALL, true, false, false);
-
 class MessageCache {
   loadedEndMap = new Map();
   db = null;
   currentAppKey = '';
   currentUserId = '';
   APP_INFO_KEY = 'im_app_info';
-  DB_NAME_PREFIX = 'im_message_cache_new';
+  DB_NAME_PREFIX = 'im_message_cache_1';
   DB_VERSION = 2;
   STORE_NAME = 'messages_new';
   DIALOG_STATE_STORE = 'dialogStates_new';
@@ -21080,11 +20791,11 @@ class MessageCache {
       const dbName = this.getDBName();
       const deleteRequest = indexedDB.deleteDatabase(dbName);
       deleteRequest.onsuccess = () => {
-        logger.info(`数据库 ${dbName} 已成功删除`);
+        logger.info(`Database ${dbName} successfully deleted`);
         resolve();
       };
       deleteRequest.onerror = event => {
-        logger.error(`删除数据库 ${dbName} 失败`, event);
+        logger.error(`Failed to delete database ${dbName}`, event);
         resolve();
       };
     });
@@ -21097,8 +20808,8 @@ class MessageCache {
       const dbName = this.getDBName();
       const request = indexedDB.open(dbName, this.DB_VERSION);
       request.onerror = event => {
-        logger.error('数据库打开失败', event);
-        reject(new Error('数据库打开失败'));
+        logger.error('Failed to open database', event);
+        reject(new Error('Failed to open database'));
       };
       request.onsuccess = event => {
         this.db = event.target.result;
@@ -21203,7 +20914,7 @@ class MessageCache {
       const decryptedStr = aes256Decrypt(encryptedHex, this.encryptKey);
       return JSON.parse(decryptedStr);
     } catch (error) {
-      logger.error('解密消息内容失败', error);
+      logger.error('Failed to decrypt message content', error);
       return null;
     }
   }
@@ -21233,8 +20944,8 @@ class MessageCache {
         resolve();
       };
       transaction.onerror = event => {
-        logger.error('添加消息事务失败', event);
-        reject(new Error('添加消息事务失败'));
+        logger.error('Add message transaction failed', event);
+        reject(new Error('Add message transaction failed'));
       };
     });
   }
@@ -21276,7 +20987,7 @@ class MessageCache {
                 try {
                   message.content = this.decryptContent(message.content);
                 } catch (error) {
-                  logger.error('解密消息内容失败', error);
+                  logger.error('Failed to decrypt message content', error);
                   message.content = null;
                 }
               }
@@ -21300,8 +21011,8 @@ class MessageCache {
         };
       };
       transaction.onerror = event => {
-        logger.error('获取消息事务失败', event);
-        reject(new Error('获取消息事务失败'));
+        logger.error('Get message transaction failed', event);
+        reject(new Error('Get message transaction failed'));
       };
     });
   }
@@ -21405,10 +21116,10 @@ class MessageCache {
           }
         };
         deleteRequest.onerror = event => {
-          logger.error('删除消息失败', id, event);
+          logger.error('Failed to delete message', id, event);
           if (!hasError) {
             hasError = true;
-            reject(new Error('删除消息失败'));
+            reject(new Error('Failed to delete message'));
           }
         };
       });
@@ -21418,7 +21129,7 @@ class MessageCache {
         }
       };
       transaction.onerror = event => {
-        reject(new Error('批量删除消息事务失败'));
+        reject(new Error('Batch delete message transaction failed'));
       };
     });
   }
@@ -21511,8 +21222,8 @@ class MessageCache {
         }
       };
       request.onerror = event => {
-        logger.error('清除过期消息失败', event);
-        reject(new Error('清除过期消息失败'));
+        logger.error('Failed to clear expired messages', event);
+        reject(new Error('Failed to clear expired messages'));
       };
     });
   }
@@ -21538,108 +21249,451 @@ class MessageCache {
             try {
               message.content = this.decryptContent(message.content);
             } catch (error) {
-              logger.error('解密消息内容失败', error);
+              logger.error('Failed to decrypt message content', error);
               message.content = null;
             }
           }
-          resolve(message);
-        } else {
-          resolve(null);
+          resolve(message);
+        } else {
+          resolve(null);
+        }
+      };
+      cursorRequest.onerror = event => {
+        logger.error('Failed to get latest message', event);
+        resolve(null);
+      };
+    });
+  }
+  async upsertMessage(message) {
+    this.addMessages([message], message);
+  }
+  async getMessageById(messageId) {
+    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 request = store.get(messageId);
+      request.onsuccess = () => {
+        const message = request.result;
+        if (message) {
+          const decryptedMessage = {
+            ...message
+          };
+          if (typeof decryptedMessage.content === 'string' && decryptedMessage.content) {
+            try {
+              decryptedMessage.content = this.decryptContent(decryptedMessage.content);
+            } catch (error) {
+              logger.error('解密消息内容失败', error);
+              decryptedMessage.content = null;
+            }
+          }
+          resolve(decryptedMessage);
+        } else {
+          resolve(null);
+        }
+      };
+      request.onerror = event => {
+        logger.error('查询消息失败', event);
+        resolve(null);
+      };
+    });
+  }
+  async getMessageIdRange() {
+    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);
+      let newest = null;
+      let oldest = null;
+      const oldestRequest = store.openCursor();
+      oldestRequest.onsuccess = event => {
+        const cursor = event.target.result;
+        if (cursor) {
+          oldest = cursor.value.messageId;
+          const newestRequest = store.openCursor(null, 'prev');
+          newestRequest.onsuccess = event => {
+            const cursor = event.target.result;
+            if (cursor) {
+              newest = cursor.value.messageId;
+              if (newest && oldest) {
+                resolve({
+                  newest,
+                  oldest
+                });
+              } else {
+                resolve(null);
+              }
+            } else {
+              resolve(null);
+            }
+          };
+        } else {
+          resolve(null);
+        }
+      };
+      transaction.onerror = event => {
+        resolve(null);
+      };
+    });
+  }
+  async convertToRecallMessages(messageUIds) {
+    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);
+        }
+      };
+    });
+  }
+}
+let cache;
+var MessageCache$1 = {
+  create(appkey, currentUserId) {
+    cache = new MessageCache(appkey, currentUserId);
+  },
+  get() {
+    return cache;
+  }
+};
+
+class MessageLoader {
+  watcher;
+  pullingMsg = false;
+  letterbox;
+  serverMsgSeqno = Long.ZERO;
+  pullOfflineFinished = false;
+  intervalTimer;
+  retryTimer;
+  latestSyncTimestamp = 0;
+  started = false;
+  constructor(watcher, options) {
+    this.watcher = watcher;
+    this.letterbox = new Letterbox(options.appkey, accountStore.uid.toString());
+  }
+  start() {
+    this.started = true;
+    this.pullOfflineFinished = false;
+    this.startPullInterval();
+  }
+  stop() {
+    this.started = false;
+    this.stopPullInterval();
+    this.cancelRetryTask();
+  }
+  syncMsg(seqno) {
+    this.serverMsgSeqno = seqno;
+    this.pullMsg();
+  }
+  startPullInterval() {
+    this.stopPullInterval();
+    const d = 3 * 60 * 1000;
+    this.intervalTimer = setInterval(() => {
+      if (Date.now() - this.latestSyncTimestamp >= d) {
+        this.pullMsg();
+      }
+    }, 30000);
+    this.latestSyncTimestamp = Date.now();
+    this.pullMsg();
+  }
+  stopPullInterval() {
+    if (this.intervalTimer) {
+      clearInterval(this.intervalTimer);
+      this.intervalTimer = null;
+    }
+  }
+  try2RePullMsg() {
+    this.retryTimer = setTimeout(() => {
+      this.retryTimer = null;
+      this.pullMsg();
+    }, 1000);
+  }
+  cancelRetryTask() {
+    if (this.retryTimer) {
+      clearTimeout(this.retryTimer);
+      this.retryTimer = null;
+    }
+  }
+  async pullMsg() {
+    if (this.pullingMsg) {
+      return;
+    }
+    if (!this.started) {
+      return;
+    }
+    this.cancelRetryTask();
+    this.pullingMsg = true;
+    const inboxTime = this.letterbox.getInboxOffset();
+    logger.info(`pullMsg -> time: ${inboxTime}`);
+    this.latestSyncTimestamp = Date.now();
+    const {
+      code,
+      data
+    } = await getNewMessages(inboxTime, 60);
+    if (code !== ErrorCode.SUCCESS) {
+      logger.warn('pullMsg failed -> code:', code);
+      this.pullingMsg = false;
+      if (LibLoader.loader?.getConnectionStatus() == ConnectionStatus.CONNECTED) {
+        this.try2RePullMsg();
+      }
+      return;
+    }
+    const {
+      offset,
+      seqno,
+      msg
+    } = data;
+    const cons = Object.keys(msg).map(dialogId => {
+      const conversationType = extractConversationType(Long.fromString(dialogId));
+      return {
+        conversationType,
+        targetId: dialogId
+      };
+    });
+    await ConversationManager$1.get().loadConvsationsIfNotExist(cons);
+    serverMessageParser.parse(msg, (done, outputMsgs) => {
+      const messages = [];
+      let recallMessageUIds = [];
+      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)) {
+            RecallMessageStore.remove(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);
+            }
+          }
+          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);
+          }
         }
-      };
-      cursorRequest.onerror = event => {
-        logger.error('获取最新消息失败', event);
-        resolve(null);
-      };
+        messageList = messageList.filter((m, index) => !deletedMessageIndexes.includes(index));
+        messages.push(...messageList);
+        if (this.isExistPersistedMessage(messageList)) {
+          splitFullDialog(dialogId);
+        }
+      });
+      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);
+      }
+      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 (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();
+        }
+      }
     });
   }
-  async upsertMessage(message) {
-    this.addMessages([message], message);
+  handleBurnAfterReadingMessage(message) {
+    const content = message.content;
+    const conversationType = message.conversationType;
+    const targetId = message.targetId;
+    const {
+      templateId,
+      burnAfterReadingTime
+    } = content;
+    const burnAfterReadingFlag = templateId === 60010010 || templateId === 60010011;
+    ConversationManager$1.get().addStatus({
+      conversationType,
+      targetId,
+      burnAfterReadingFlag: burnAfterReadingFlag,
+      burnAfterReadingTime: burnAfterReadingFlag ? burnAfterReadingTime : null
+    }, true);
   }
-  async getMessageById(messageId) {
-    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 request = store.get(messageId);
-      request.onsuccess = () => {
-        const message = request.result;
-        if (message) {
-          const decryptedMessage = {
-            ...message
-          };
-          if (typeof decryptedMessage.content === 'string' && decryptedMessage.content) {
-            try {
-              decryptedMessage.content = this.decryptContent(decryptedMessage.content);
-            } catch (error) {
-              logger.error('解密消息内容失败', error);
-              decryptedMessage.content = null;
-            }
-          }
-          resolve(decryptedMessage);
+  handleReceiptMessages(messages) {
+    try {
+      const normalMessages = [];
+      const receiptnotificationMessages = [];
+      messages.forEach(msg => {
+        if (msg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || msg.messageType === NotiMessageTypes.GROUP_READ_RECEIPT || msg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT || msg.messageType === NotiMessageTypes.PRIVATE_READ_RECEIPT) {
+          receiptnotificationMessages.push(msg);
         } else {
-          resolve(null);
+          normalMessages.push(msg);
         }
-      };
-      request.onerror = event => {
-        logger.error('查询消息失败', event);
-        resolve(null);
-      };
-    });
-  }
-  async getMessageIdRange() {
-    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);
-      let newest = null;
-      let oldest = null;
-      const oldestRequest = store.openCursor();
-      oldestRequest.onsuccess = event => {
-        const cursor = event.target.result;
-        if (cursor) {
-          oldest = cursor.value.messageId;
-          const newestRequest = store.openCursor(null, 'prev');
-          newestRequest.onsuccess = event => {
-            const cursor = event.target.result;
-            if (cursor) {
-              newest = cursor.value.messageId;
-              if (newest && oldest) {
-                resolve({
-                  newest,
-                  oldest
-                });
-              } else {
-                resolve(null);
-              }
+      });
+      const sentMessages = normalMessages.filter(m => m.messageDirection === MessageDirection.SEND);
+      receiptnotificationMessages.forEach(notiMsg => {
+        const notiContent = notiMsg.content;
+        const isArrivalReceipt = notiMsg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || notiMsg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT;
+        sentMessages.forEach(msg => {
+          if (notiContent.msgIdList.includes(msg.messageUId)) {
+            if (isArrivalReceipt) {
+              msg.receivedStatus = ReceivedStatus.RECEIVED;
             } else {
-              resolve(null);
+              msg.receivedStatus = ReceivedStatus.READ;
             }
-          };
-        } else {
-          resolve(null);
+          }
+        });
+        this.watcher.onReceiptReceived?.({
+          conversation: {
+            conversationType: notiMsg.conversationType,
+            targetId: notiMsg.targetId
+          },
+          messageUIdList: notiContent.msgIdList.map(id => id.toString())
+        }, notiMsg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || notiMsg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT ? 0 : 1);
+      });
+      return normalMessages;
+    } catch (error) {
+      logger.error('handleReceiptMessages error', error);
+      return [];
+    }
+  }
+  handleBatchMessages(messages) {
+    if (messages.length) {
+      const targetGroups = new Map();
+      messages.forEach(message => {
+        if (!targetGroups.has(message.targetId)) {
+          targetGroups.set(message.targetId, []);
         }
-      };
-      transaction.onerror = event => {
-        resolve(null);
-      };
+        targetGroups.get(message.targetId).push(message);
+      });
+      targetGroups.forEach((targetMessages, targetId) => {
+        const conversationType = targetMessages[0].conversationType;
+        MessageCache$1.get()?.addMessages(targetMessages, {
+          conversationType,
+          targetId
+        });
+      });
+    }
+    const filteredMessages = messages.filter(m => {
+      if (m.messageDirection === MessageDirection.SEND && m.messageId && SentMessageStore.has(m.messageId)) {
+        SentMessageStore.remove(m.messageId);
+        return false;
+      }
+      return true;
     });
+    if (filteredMessages.length) {
+      this.watcher.batchMessage?.(filteredMessages);
+    }
+  }
+  isExistPersistedMessage(messageList) {
+    return messageList.some(m => m.isPersited);
   }
 }
-let cache;
-var MessageCache$1 = {
-  create(appkey, currentUserId) {
-    cache = new MessageCache(appkey, currentUserId);
-  },
-  get() {
-    return cache;
+
+class BaseMessage {
+  messageType;
+  content;
+  isPersited;
+  isCounted;
+  isStatusMessage;
+  constructor(messageType, content, isPersited = true, isCounted = true, isStatusMessage = false) {
+    this.messageType = messageType;
+    this.content = content;
+    if (isStatusMessage) {
+      this.isPersited = false;
+      this.isCounted = false;
+    } else {
+      this.isPersited = isPersited;
+      this.isCounted = isCounted;
+    }
+    this.isStatusMessage = isStatusMessage;
   }
+}
+const registerMessageType$1 = (messageType, isPersited, isCounted, isStatusMessage) => {
+  const defined = function (content) {
+    return new BaseMessage(messageType, content, isPersited, isCounted, isStatusMessage);
+  };
+  return defined;
 };
 
+const TextMessage = registerMessageType$1(MessageTypes.TEXT, true, true, false);
+
+const ImageMessage = registerMessageType$1(MessageTypes.IMAGE, true, true, false);
+
+const GIFMessage = registerMessageType$1(MessageTypes.GIF, true, true, false);
+
+const VoiceMessage = registerMessageType$1(MessageTypes.AUDIO, true, true, false);
+
+const FileMessage = registerMessageType$1(MessageTypes.FILE, true, true, false);
+
+const VideoMessage = registerMessageType$1(MessageTypes.VIDEO, true, true, false);
+
+let LocationMessage = registerMessageType$1(MessageTypes.LOCATION, true, true, false);
+let ChatRecordMessage = registerMessageType$1(MessageTypes.CHAT_RECORD, true, true, false);
+let ContactMessage = registerMessageType$1(MessageTypes.CONTACT, true, true, false);
+let InvitationMessage = registerMessageType$1(MessageTypes.GROUP_INVITATION, true, true, false);
+let RedEnvelopeMessage = registerMessageType$1(MessageTypes.REDPACKET, true, true, false);
+let TransferMessage = registerMessageType$1(MessageTypes.TRANSFER, true, true, false);
+
+const GroupArrivalReceiptMessage = registerMessageType$1(NotiMessageTypes.GROUP_ARRIVAL_RECEIPT, false, false, true);
+const GroupReadReceiptMessage = registerMessageType$1(NotiMessageTypes.GROUP_READ_RECEIPT, false, false, true);
+const PrivateArrivalReceiptMessage = registerMessageType$1(NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT, false, false, true);
+const PrivateReadReceiptMessage = registerMessageType$1(NotiMessageTypes.PRIVATE_READ_RECEIPT, false, false, true);
+const PrivateOpenBurnAfterReadingMessage = registerMessageType$1(NotiMessageTypes.PRIVATE_OPEN_BURNAFTERREADING, false, false, true);
+const PrivateCloseBurnAfterReadingMessage = registerMessageType$1(NotiMessageTypes.PRIVATE_CLOSE_BURNAFTERREADING, false, false, true);
+const GroupOpenBurnAfterReadingMessage = registerMessageType$1(NotiMessageTypes.GROUP_OPEN_BURNAFTERREADING, false, false, true);
+const GroupCloseBurnAfterReadingMessage = registerMessageType$1(NotiMessageTypes.GROUP_CLOSE_BURNAFTERREADING, false, false, true);
+
+const RecallCommandMessage = registerMessageType$1(MessageTypes.RECALL, true, false, false);
+
 const DEFAULT_SOCKET_URI = 'wss://imweb.mp.net:6443';
 class LibLoader {
   options;
@@ -29150,34 +29204,9 @@ class IMClient extends EventEmitter {
         this.emit(Events.SUSPEND, this.libLoader.getConnectionStatus());
       },
       batchMessage: 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
-            });
-          });
-        }
-        const filteredMessages = messages.filter(m => {
-          if (m.messageDirection === MessageDirection.SEND && m.messageId && SentMessageStore.has(m.messageId)) {
-            SentMessageStore.remove(m.messageId);
-            return false;
-          }
-          return true;
+        this.emit(Events.MESSAGES, {
+          messages
         });
-        if (filteredMessages.length) {
-          this.emit(Events.MESSAGES, {
-            messages: filteredMessages
-          });
-        }
       },
       pullFinished: () => {
         this.emit(Events.PULL_OFFLINE_MESSAGE_FINISHED);
@@ -29194,7 +29223,6 @@ class IMClient extends EventEmitter {
         });
       },
       onRecall: messageUids => {
-        MessageCache$1.get()?.removeMessagesByUId(messageUids);
         messageUids.forEach(messageUId => {
           this.emit(Events.RECALL, messageUId);
         });