@onyx-p/imlib-web 2.2.3 → 2.2.5

package/index.esm.js

@@ -20492,7 +20492,7 @@ const parseSingleDialogMessages = (dialogId, originalMessageList, aesKey) => {
         messageType: messageInstance.messageType,
         isOffLineMessage: false,
         isPersited: messageInstance.isPersited,
-        messageId: Long.isLong(dialogMessage.localId) ? dialogMessage.localId.toString() : undefined,
+        messageId: Long.isLong(dialogMessage.localId) ? dialogMessage.localId.toNumber : 0,
         messageUId: dialogMessage.msgId.toString(),
         sentTime: dialogMessage.seqno.toString(),
         sentStatus: SentStatus.SENT,
@@ -20562,7 +20562,7 @@ const parseChatRecordMsgDetails$1 = (conversationOpt, msgDetails) => {
         messageType: messageInstance.messageType,
         isOffLineMessage: false,
         isPersited: messageInstance.isPersited,
-        messageId: item.msgId + '',
+        messageId: 0,
         messageUId: item.msgId + '',
         sentTime: item.msgSendTime + '',
         sentStatus: SentStatus.SENT,
@@ -20704,6 +20704,21 @@ var MessageReceiptManager$1 = {
   }
 };
 
+let oldestMessageId = 0;
+let lastMessageId = 0;
+function setInitialMessageId(oldestMessageId_tmp, lastMessageId_tmp) {
+  oldestMessageId = oldestMessageId_tmp;
+  lastMessageId = lastMessageId_tmp;
+}
+function generateNewMessageId() {
+  lastMessageId++;
+  return lastMessageId;
+}
+function generateOldMessageId() {
+  oldestMessageId--;
+  return oldestMessageId;
+}
+
 class MessageLoader {
   watcher;
   pullingMsg = false;
@@ -20807,6 +20822,9 @@ class MessageLoader {
             RecallMessageStore.remove(m.content.messageUId);
           } else {
             m.isOffLineMessage = isOffLineMessage;
+            if (!m.messageId) {
+              m.messageId = generateNewMessageId();
+            }
             ConversationManager$1.get().setConversationCacheByMessage(m);
             messageList.push(m);
             if (m.messageType === MessageTypes.RECALL) {
@@ -20994,10 +21012,10 @@ class MessageCache {
   currentAppKey = '';
   currentUserId = '';
   APP_INFO_KEY = 'im_app_info';
-  DB_NAME_PREFIX = 'im_message_cache';
+  DB_NAME_PREFIX = 'im_message_cache_new';
   DB_VERSION = 2;
-  STORE_NAME = 'messages';
-  DIALOG_STATE_STORE = 'dialogStates';
+  STORE_NAME = 'messages_new';
+  DIALOG_STATE_STORE = 'dialogStates_new';
   encryptKey = {
     key: ''
   };
@@ -21005,7 +21023,8 @@ class MessageCache {
   SALT_SUFFIX = 'im_message_cache_salt_suffix';
   constructor(appKey, userId) {
     this.generateEncryptKey(appKey, userId);
-    this.init(appKey, userId);
+    this.currentAppKey = appKey;
+    this.currentUserId = userId;
   }
   generateEncryptKey(appKey, userId) {
     const saltedInput = `${this.SALT_PREFIX}${appKey}_${userId}${this.SALT_SUFFIX}`;
@@ -21023,9 +21042,7 @@ class MessageCache {
       iv: iv
     };
   }
-  async init(appKey, userId) {
-    this.currentAppKey = appKey;
-    this.currentUserId = userId;
+  async initDB() {
     await this.checkAndResetDatabase();
     await this.initDatabase();
   }
@@ -21038,7 +21055,7 @@ class MessageCache {
           await this.deleteDatabase();
         }
       } catch (error) {
-        console.error('解析存储的AppKey和UserId出错', error);
+        logger.error('解析存储的AppKey和UserId出错', error);
         await this.deleteDatabase();
       }
     }
@@ -21058,11 +21075,11 @@ class MessageCache {
       const dbName = this.getDBName();
       const deleteRequest = indexedDB.deleteDatabase(dbName);
       deleteRequest.onsuccess = () => {
-        console.log(`数据库 ${dbName} 已成功删除`);
+        logger.info(`数据库 ${dbName} 已成功删除`);
         resolve();
       };
       deleteRequest.onerror = event => {
-        console.error(`删除数据库 ${dbName} 失败`, event);
+        logger.error(`删除数据库 ${dbName} 失败`, event);
         resolve();
       };
     });
@@ -21075,7 +21092,7 @@ class MessageCache {
       const dbName = this.getDBName();
       const request = indexedDB.open(dbName, this.DB_VERSION);
       request.onerror = event => {
-        console.error('数据库打开失败', event);
+        logger.error('数据库打开失败', event);
         reject(new Error('数据库打开失败'));
       };
       request.onsuccess = event => {
@@ -21083,7 +21100,7 @@ class MessageCache {
         this.loadAllDialogStates().then(() => {
           resolve();
         }).catch(err => {
-          console.error('加载会话状态失败', err);
+          logger.error('加载会话状态失败', err);
           resolve();
         });
       };
@@ -21091,7 +21108,10 @@ class MessageCache {
         const db = event.target.result;
         if (!db.objectStoreNames.contains(this.STORE_NAME)) {
           const store = db.createObjectStore(this.STORE_NAME, {
-            keyPath: 'messageUId'
+            keyPath: 'messageId'
+          });
+          store.createIndex('messageUId', 'messageUId', {
+            unique: true
           });
           store.createIndex('dialogId', 'dialogId', {
             unique: false
@@ -21155,7 +21175,7 @@ class MessageCache {
         resolve();
       };
       request.onerror = event => {
-        console.error('更新会话状态失败', event);
+        logger.error('更新会话状态失败', event);
         reject(new Error('更新会话状态失败'));
       };
     });
@@ -21166,7 +21186,7 @@ class MessageCache {
       const contentStr = JSON.stringify(content);
       return aes256Encrypt(contentStr, this.encryptKey);
     } catch (error) {
-      console.error('加密消息内容失败', error);
+      logger.error('加密消息内容失败', error);
       return '';
     }
   }
@@ -21178,7 +21198,7 @@ class MessageCache {
       const decryptedStr = aes256Decrypt(encryptedHex, this.encryptKey);
       return JSON.parse(decryptedStr);
     } catch (error) {
-      console.error('解密消息内容失败', error);
+      logger.error('解密消息内容失败', error);
       return null;
     }
   }
@@ -21208,7 +21228,7 @@ class MessageCache {
         resolve();
       };
       transaction.onerror = event => {
-        console.error('添加消息事务失败', event);
+        logger.error('添加消息事务失败', event);
         reject(new Error('添加消息事务失败'));
       };
     });
@@ -21251,7 +21271,7 @@ class MessageCache {
                 try {
                   message.content = this.decryptContent(message.content);
                 } catch (error) {
-                  console.error('解密消息内容失败', error);
+                  logger.error('解密消息内容失败', error);
                   message.content = null;
                 }
               }
@@ -21275,7 +21295,7 @@ class MessageCache {
         };
       };
       transaction.onerror = event => {
-        console.error('获取消息事务失败', event);
+        logger.error('获取消息事务失败', event);
         reject(new Error('获取消息事务失败'));
       };
     });
@@ -21380,7 +21400,7 @@ class MessageCache {
           }
         };
         deleteRequest.onerror = event => {
-          console.error('删除消息失败', id, event);
+          logger.error('删除消息失败', id, event);
           if (!hasError) {
             hasError = true;
             reject(new Error('删除消息失败'));
@@ -21486,131 +21506,142 @@ class MessageCache {
         }
       };
       request.onerror = event => {
-        console.error('清除过期消息失败', event);
+        logger.error('清除过期消息失败', event);
         reject(new Error('清除过期消息失败'));
       };
     });
   }
-  async getMessagesByPage(dialogId, pageSize = 20, cursorPosition = null) {
+  async getLatestMessage(conversation) {
+    const dialogId = getFullDialogId(conversation);
     if (!this.db) {
-      return {
-        messages: [],
-        nextCursor: null
-      };
+      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, cursorPosition || ''], [dialogId, '\uffff']);
-      const messages = [];
-      let nextCursor = null;
-      let count = 0;
-      const cursorRequest = index.openCursor(range);
+      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 && count < pageSize) {
-          messages.push(cursor.value);
-          count++;
-          cursor.continue();
-        } else if (cursor) {
-          nextCursor = cursor.value.sentTime;
+        if (cursor) {
+          const message = {
+            ...cursor.value
+          };
+          if (typeof message.content === 'string' && message.content) {
+            try {
+              message.content = this.decryptContent(message.content);
+            } catch (error) {
+              logger.error('解密消息内容失败', error);
+              message.content = null;
+            }
+          }
+          resolve(message);
         } else {
-          nextCursor = null;
-        }
-        if (!cursor || count >= pageSize) {
-          resolve({
-            messages,
-            nextCursor
-          });
+          resolve(null);
         }
       };
       cursorRequest.onerror = event => {
-        reject(new Error('获取分页消息失败'));
+        logger.error('获取最新消息失败', event);
+        resolve(null);
       };
     });
   }
-  async updateMessagesStatus(messageUIds, newStatus) {
-    if (!this.db || messageUIds.length === 0) {
-      return;
+  async upsertMessage(message) {
+    if (!this.db) {
+      throw new Error('数据库未初始化');
     }
     return new Promise((resolve, reject) => {
       const transaction = this.db.transaction(this.STORE_NAME, 'readwrite');
       const store = transaction.objectStore(this.STORE_NAME);
-      let completed = 0;
-      let hasError = false;
-      messageUIds.forEach(id => {
-        const getRequest = store.get(id);
-        getRequest.onsuccess = () => {
-          const message = getRequest.result;
-          if (message) {
-            message.receivedStatus = newStatus;
-            store.put(message);
-          }
-          completed++;
-          if (completed === messageUIds.length && !hasError) {
-            resolve();
-          }
-        };
-        getRequest.onerror = event => {
-          if (!hasError) {
-            hasError = true;
-            reject(new Error('更新消息状态失败'));
-          }
-        };
-      });
-      transaction.oncomplete = () => {
+      const messageToStore = {
+        ...message
+      };
+      if (messageToStore.content) {
+        const encryptedContent = this.encryptContent(messageToStore.content);
+        messageToStore.content = encryptedContent;
+      }
+      const request = store.put(messageToStore);
+      request.onsuccess = () => {
         resolve();
       };
-      transaction.onerror = event => {
-        reject(new Error('批量更新事务失败'));
+      request.onerror = event => {
+        logger.error('更新/插入消息失败', event);
+        reject(new Error('更新/插入消息失败'));
       };
     });
   }
-  async changeUser(appKey, userId) {
-    if (this.currentAppKey === appKey && this.currentUserId === userId) {
-      return;
-    }
-    this.currentAppKey = appKey;
-    this.currentUserId = userId;
-    this.generateEncryptKey(appKey, userId);
-    await this.checkAndResetDatabase();
-    await this.initDatabase();
-  }
-  async getLatestMessage(conversation) {
-    const dialogId = getFullDialogId(conversation);
+  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 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
+      const request = store.get(messageId);
+      request.onsuccess = () => {
+        const message = request.result;
+        if (message) {
+          const decryptedMessage = {
+            ...message
           };
-          if (typeof message.content === 'string' && message.content) {
+          if (typeof decryptedMessage.content === 'string' && decryptedMessage.content) {
             try {
-              message.content = this.decryptContent(message.content);
+              decryptedMessage.content = this.decryptContent(decryptedMessage.content);
             } catch (error) {
-              console.error('解密消息内容失败', error);
-              message.content = null;
+              logger.error('解密消息内容失败', error);
+              decryptedMessage.content = null;
             }
           }
-          resolve(message);
+          resolve(decryptedMessage);
         } else {
           resolve(null);
         }
       };
-      cursorRequest.onerror = event => {
-        console.error('获取最新消息失败', event);
-        reject(new Error('获取最新消息失败'));
+      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);
       };
     });
   }
@@ -21727,16 +21758,29 @@ class LibLoader {
     webSocketServer.close();
     return Promise.resolve();
   }
-  setUserLogged() {
+  async setUserLogged() {
     ConversationManager$1.get().destroyed();
     ConversationManager$1.create(this.options.appkey, accountStore.uid.toString(), this.watcher.conversationState);
     MessageReceiptManager$1.create(this.options.appkey, accountStore.uid.toString());
-    MessageCache$1.create(this.options.appkey, accountStore.uid.toString());
     this.messageLoader?.stop();
     this.messageLoader = new MessageLoader(this.watcher, this.options);
     SentMessageStore.reset();
     RecallMessageStore.reset();
     DialogSecretKey$1.reset();
+    MessageCache$1.create(this.options.appkey, accountStore.uid.toString());
+    MessageCache$1.get().initDB().then(() => {
+      return MessageCache$1.get().getMessageIdRange();
+    }).then(result => {
+      if (result) {
+        const {
+          oldest,
+          newest
+        } = result;
+        setInitialMessageId(oldest, newest);
+      } else {
+        setInitialMessageId(10000, 10000);
+      }
+    });
     if (this.getConnectionStatus() === ConnectionStatus.CONNECTED) {
       this.handleUserConnected();
     }
@@ -28380,37 +28424,31 @@ function requireProtobufjs () {
 var protobufjsExports = requireProtobufjs();
 var protobuf = /*@__PURE__*/getDefaultExportFromCjs(protobufjsExports);
 
-const transSentAttrs2IReceivedMessage = (message, options, sentStatus = SentStatus.SENDING) => ({
-  conversationType: options.conversation.conversationType,
-  targetId: options.conversation.targetId,
-  senderUserId: options.senderUserId,
-  messageDirection: MessageDirection.SEND,
-  isCounted: message.isCounted,
-  isMentioned: false,
-  content: deepClone(message.content),
-  messageType: message.messageType,
-  isOffLineMessage: false,
-  isPersited: message.isPersited,
-  messageId: options.messageId,
-  messageUId: '0',
-  sentTime: options.sentTime,
-  sentStatus,
-  receivedTime: '0',
-  isStatusMessage: message.isStatusMessage,
-  receivedStatus: ReceivedStatus.IDLE,
-  disableNotification: true,
-  burnAfterReadingFlag: false
-});
-
-let UniqueLocalId = 0;
-function generateMessageId() {
-  UniqueLocalId++;
-  const time = getServerTime$1();
-  if (UniqueLocalId < time) {
-    UniqueLocalId = time;
-  }
-  return 230000000000000 + UniqueLocalId;
-}
+const transSentAttrs2IReceivedMessage = (message, options, sentStatus = SentStatus.SENDING) => {
+  const conversation = ConversationManager$1.get().get(options.conversation);
+  return {
+    conversationType: options.conversation.conversationType,
+    targetId: options.conversation.targetId,
+    senderUserId: options.senderUserId,
+    messageDirection: MessageDirection.SEND,
+    isCounted: message.isCounted,
+    isMentioned: false,
+    content: deepClone(message.content),
+    messageType: message.messageType,
+    isOffLineMessage: false,
+    isPersited: message.isPersited,
+    messageId: options.messageId,
+    messageUId: "local" + options.sentTime,
+    sentTime: options.sentTime,
+    sentStatus,
+    receivedTime: options.sentTime,
+    isStatusMessage: message.isStatusMessage,
+    receivedStatus: ReceivedStatus.IDLE,
+    disableNotification: true,
+    burnAfterReadingFlag: conversation?.burnAfterReadingFlag ?? false,
+    burnAfterReadingTime: conversation?.burnAfterReadingTime ?? 0
+  };
+};
 
 const getBlobUrl = blob => {
   const URL = window.URL || window.webkitURL;
@@ -28881,10 +28919,12 @@ const sendRecallMessage = async (conversation, options) => {
   const sentAttris = {
     conversation,
     senderUserId: accountStore.uid,
-    messageId: '0',
+    messageId: 0,
     sentTime: getServerTime$1().toString()
   };
   const receivedMessage = transSentAttrs2IReceivedMessage(recallCommandMessage, sentAttris, SentStatus.SENT);
+  receivedMessage.burnAfterReadingFlag = false;
+  receivedMessage.burnAfterReadingTime = 0;
   ConversationManager$1.get().setConversationCacheByMessage(receivedMessage);
   return {
     code: ErrorCode.SUCCESS,
@@ -28933,12 +28973,16 @@ async function createSendFunction(fileType, conversation, msgBody, hooks, sendOp
   });
 }
 async function internal_sendMessage(conversation, message, options, uploadOptions) {
-  const checkResult = beforeSend(conversation, message, options);
+  const checkResult = await beforeSend(conversation, message, options);
   if (checkResult.code !== ErrorCode.SUCCESS || !checkResult.message || !checkResult.sentArgs) {
     return {
       code: checkResult.code
     };
   }
+  {
+    const receivedMessage = transSentAttrs2IReceivedMessage(checkResult.message, checkResult.sentArgs);
+    await saveSentMessage(receivedMessage, checkResult.sentArgs);
+  }
   let {
     message: sentMessage,
     sentArgs
@@ -28947,30 +28991,30 @@ async function internal_sendMessage(conversation, message, options, uploadOption
     const uploadResult = await uploadOptions.task(sentMessage, uploadOptions.files);
     sentMessage = uploadResult.message;
     if (!uploadResult.finished) {
+      const receivedMessage = transSentAttrs2IReceivedMessage(checkResult.message, checkResult.sentArgs, SentStatus.FAILED);
+      await saveSentMessage(receivedMessage, sentArgs);
       return {
         code: ErrorCode.UPLOAD_FILE_FAILED,
-        data: transSentAttrs2IReceivedMessage(sentMessage, sentArgs, SentStatus.FAILED)
+        data: receivedMessage
       };
     }
   }
   return send(sentMessage, sentArgs);
 }
-function beforeSend(conversation, message, options) {
-  if (!LibLoader.loader || LibLoader.loader.getConnectionStatus() !== ConnectionStatus.CONNECTED) {
-    return {
-      code: ErrorCode.RC_NET_CHANNEL_INVALID
-    };
-  }
+async function beforeSend(conversation, message, options) {
   const mediaAttribute = JSON.stringify(filterNullProperty(message.content));
   if (getByteLength(mediaAttribute) > MAX_MESSAGE_CONTENT_BYTES) {
     return {
       code: ErrorCode.RC_MSG_CONTENT_EXCEED_LIMIT
     };
   }
+  if (message.isPersited) {
+    await ConversationManager$1.get().loadConvsationsIfNotExist([conversation]);
+  }
   const sentArgs = {
     conversation: conversation,
     senderUserId: accountStore.uid,
-    messageId: options?.messageId ?? generateMessageId().toString(),
+    messageId: generateNewMessageId(),
     sentTime: getMessageSentTime().toString(),
     pushConfig: options?.pushConfig
   };
@@ -28987,12 +29031,6 @@ function beforeSend(conversation, message, options) {
 async function send(message, sentArgs) {
   const dialogId = getFullDialogId(sentArgs.conversation);
   const receivedMessage = transSentAttrs2IReceivedMessage(message, sentArgs);
-  if (message.isPersited) {
-    await ConversationManager$1.get().loadConvsationsIfNotExist([sentArgs.conversation]);
-  }
-  const conversation = ConversationManager$1.get().get(sentArgs.conversation);
-  receivedMessage.burnAfterReadingFlag = conversation?.burnAfterReadingFlag ?? false;
-  receivedMessage.burnAfterReadingTime = conversation?.burnAfterReadingTime ?? 0;
   const secretKey = await DialogSecretKey$1.getDialogAesKey(dialogId.toString());
   if (!secretKey) {
     receivedMessage.sentStatus = SentStatus.FAILED;
@@ -29015,7 +29053,7 @@ async function send(message, sentArgs) {
   const mediaEncryptedString = aes256Encrypt(mediaAttribute, secretKey);
   SentMessageStore.addMessage(sentArgs.messageId);
   const baseParams = {
-    localId: Long.fromString(sentArgs.messageId),
+    localId: Long.fromNumber(sentArgs.messageId),
     mediaFlag: message.messageType !== MessageTypes.TEXT,
     mediaConstructor: message.messageType,
     msgPreContent: '',
@@ -29046,9 +29084,10 @@ async function send(message, sentArgs) {
     receivedMessage.sentTime = response.data.msgSendTime.toString();
     receivedMessage.messageUId = response.data.msgId.toString();
     receivedMessage.sentStatus = SentStatus.SENT;
-    ConversationManager$1.get().setConversationCacheByMessage(receivedMessage);
+    await saveSentMessage(receivedMessage, sentArgs);
   } else {
     receivedMessage.sentStatus = SentStatus.FAILED;
+    await saveSentMessage(receivedMessage, sentArgs);
   }
   return {
     code: response.code,
@@ -29064,6 +29103,18 @@ function getMessageSentTime() {
   }
   return UniqueSentTime;
 }
+async function saveSentMessage(receivedMessage, options) {
+  try {
+    const cache = MessageCache$1.get();
+    if (receivedMessage.isPersited && cache) {
+      await cache.upsertMessage(receivedMessage);
+      const latestMessage = await cache.getLatestMessage(options.conversation);
+      ConversationManager$1.get().updateLatestMessage(options.conversation, latestMessage);
+    }
+  } catch (error) {
+    logger.error('saveSentMessage -> ', error);
+  }
+}
 
 class IMClient extends EventEmitter {
   options;
@@ -29240,7 +29291,6 @@ 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().updateLatestMessage(conversation, cachedResult.messages[cachedResult.messages.length - 1]);
@@ -29264,8 +29314,13 @@ class IMClient extends EventEmitter {
       return remotesResult;
     }
     const remotesMessages = remotesResult.data.list;
+    for (let i = remotesMessages.length - 1; i >= 0; i--) {
+      const message = remotesMessages[i];
+      if (!message.messageId) {
+        message.messageId = generateOldMessageId();
+      }
+    }
     if (!remotesTimestamp || remotesTimestamp == '0') {
-      debugger;
       ConversationManager$1.get().updateLatestMessage(conversation, remotesMessages[remotesMessages.length - 1]);
     }
     MessageCache$1.get().addMessages(remotesMessages, conversation, !remotesResult.data.hasMore);

package/index.umd.js

@@ -20498,7 +20498,7 @@
           messageType: messageInstance.messageType,
           isOffLineMessage: false,
           isPersited: messageInstance.isPersited,
-          messageId: Long.isLong(dialogMessage.localId) ? dialogMessage.localId.toString() : undefined,
+          messageId: Long.isLong(dialogMessage.localId) ? dialogMessage.localId.toNumber : 0,
           messageUId: dialogMessage.msgId.toString(),
           sentTime: dialogMessage.seqno.toString(),
           sentStatus: exports.SentStatus.SENT,
@@ -20568,7 +20568,7 @@
           messageType: messageInstance.messageType,
           isOffLineMessage: false,
           isPersited: messageInstance.isPersited,
-          messageId: item.msgId + '',
+          messageId: 0,
           messageUId: item.msgId + '',
           sentTime: item.msgSendTime + '',
           sentStatus: exports.SentStatus.SENT,
@@ -20710,6 +20710,21 @@
     }
   };
 
+  let oldestMessageId = 0;
+  let lastMessageId = 0;
+  function setInitialMessageId(oldestMessageId_tmp, lastMessageId_tmp) {
+    oldestMessageId = oldestMessageId_tmp;
+    lastMessageId = lastMessageId_tmp;
+  }
+  function generateNewMessageId() {
+    lastMessageId++;
+    return lastMessageId;
+  }
+  function generateOldMessageId() {
+    oldestMessageId--;
+    return oldestMessageId;
+  }
+
   class MessageLoader {
     watcher;
     pullingMsg = false;
@@ -20813,6 +20828,9 @@
               RecallMessageStore.remove(m.content.messageUId);
             } else {
               m.isOffLineMessage = isOffLineMessage;
+              if (!m.messageId) {
+                m.messageId = generateNewMessageId();
+              }
               ConversationManager$1.get().setConversationCacheByMessage(m);
               messageList.push(m);
               if (m.messageType === MessageTypes.RECALL) {
@@ -21000,10 +21018,10 @@
     currentAppKey = '';
     currentUserId = '';
     APP_INFO_KEY = 'im_app_info';
-    DB_NAME_PREFIX = 'im_message_cache';
+    DB_NAME_PREFIX = 'im_message_cache_new';
     DB_VERSION = 2;
-    STORE_NAME = 'messages';
-    DIALOG_STATE_STORE = 'dialogStates';
+    STORE_NAME = 'messages_new';
+    DIALOG_STATE_STORE = 'dialogStates_new';
     encryptKey = {
       key: ''
     };
@@ -21011,7 +21029,8 @@
     SALT_SUFFIX = 'im_message_cache_salt_suffix';
     constructor(appKey, userId) {
       this.generateEncryptKey(appKey, userId);
-      this.init(appKey, userId);
+      this.currentAppKey = appKey;
+      this.currentUserId = userId;
     }
     generateEncryptKey(appKey, userId) {
       const saltedInput = `${this.SALT_PREFIX}${appKey}_${userId}${this.SALT_SUFFIX}`;
@@ -21029,9 +21048,7 @@
         iv: iv
       };
     }
-    async init(appKey, userId) {
-      this.currentAppKey = appKey;
-      this.currentUserId = userId;
+    async initDB() {
       await this.checkAndResetDatabase();
       await this.initDatabase();
     }
@@ -21044,7 +21061,7 @@
             await this.deleteDatabase();
           }
         } catch (error) {
-          console.error('解析存储的AppKey和UserId出错', error);
+          logger.error('解析存储的AppKey和UserId出错', error);
           await this.deleteDatabase();
         }
       }
@@ -21064,11 +21081,11 @@
         const dbName = this.getDBName();
         const deleteRequest = indexedDB.deleteDatabase(dbName);
         deleteRequest.onsuccess = () => {
-          console.log(`数据库 ${dbName} 已成功删除`);
+          logger.info(`数据库 ${dbName} 已成功删除`);
           resolve();
         };
         deleteRequest.onerror = event => {
-          console.error(`删除数据库 ${dbName} 失败`, event);
+          logger.error(`删除数据库 ${dbName} 失败`, event);
           resolve();
         };
       });
@@ -21081,7 +21098,7 @@
         const dbName = this.getDBName();
         const request = indexedDB.open(dbName, this.DB_VERSION);
         request.onerror = event => {
-          console.error('数据库打开失败', event);
+          logger.error('数据库打开失败', event);
           reject(new Error('数据库打开失败'));
         };
         request.onsuccess = event => {
@@ -21089,7 +21106,7 @@
           this.loadAllDialogStates().then(() => {
             resolve();
           }).catch(err => {
-            console.error('加载会话状态失败', err);
+            logger.error('加载会话状态失败', err);
             resolve();
           });
         };
@@ -21097,7 +21114,10 @@
           const db = event.target.result;
           if (!db.objectStoreNames.contains(this.STORE_NAME)) {
             const store = db.createObjectStore(this.STORE_NAME, {
-              keyPath: 'messageUId'
+              keyPath: 'messageId'
+            });
+            store.createIndex('messageUId', 'messageUId', {
+              unique: true
             });
             store.createIndex('dialogId', 'dialogId', {
               unique: false
@@ -21161,7 +21181,7 @@
           resolve();
         };
         request.onerror = event => {
-          console.error('更新会话状态失败', event);
+          logger.error('更新会话状态失败', event);
           reject(new Error('更新会话状态失败'));
         };
       });
@@ -21172,7 +21192,7 @@
         const contentStr = JSON.stringify(content);
         return aes256Encrypt(contentStr, this.encryptKey);
       } catch (error) {
-        console.error('加密消息内容失败', error);
+        logger.error('加密消息内容失败', error);
         return '';
       }
     }
@@ -21184,7 +21204,7 @@
         const decryptedStr = aes256Decrypt(encryptedHex, this.encryptKey);
         return JSON.parse(decryptedStr);
       } catch (error) {
-        console.error('解密消息内容失败', error);
+        logger.error('解密消息内容失败', error);
         return null;
       }
     }
@@ -21214,7 +21234,7 @@
           resolve();
         };
         transaction.onerror = event => {
-          console.error('添加消息事务失败', event);
+          logger.error('添加消息事务失败', event);
           reject(new Error('添加消息事务失败'));
         };
       });
@@ -21257,7 +21277,7 @@
                   try {
                     message.content = this.decryptContent(message.content);
                   } catch (error) {
-                    console.error('解密消息内容失败', error);
+                    logger.error('解密消息内容失败', error);
                     message.content = null;
                   }
                 }
@@ -21281,7 +21301,7 @@
           };
         };
         transaction.onerror = event => {
-          console.error('获取消息事务失败', event);
+          logger.error('获取消息事务失败', event);
           reject(new Error('获取消息事务失败'));
         };
       });
@@ -21386,7 +21406,7 @@
             }
           };
           deleteRequest.onerror = event => {
-            console.error('删除消息失败', id, event);
+            logger.error('删除消息失败', id, event);
             if (!hasError) {
               hasError = true;
               reject(new Error('删除消息失败'));
@@ -21492,131 +21512,142 @@
           }
         };
         request.onerror = event => {
-          console.error('清除过期消息失败', event);
+          logger.error('清除过期消息失败', event);
           reject(new Error('清除过期消息失败'));
         };
       });
     }
-    async getMessagesByPage(dialogId, pageSize = 20, cursorPosition = null) {
+    async getLatestMessage(conversation) {
+      const dialogId = getFullDialogId(conversation);
       if (!this.db) {
-        return {
-          messages: [],
-          nextCursor: null
-        };
+        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, cursorPosition || ''], [dialogId, '\uffff']);
-        const messages = [];
-        let nextCursor = null;
-        let count = 0;
-        const cursorRequest = index.openCursor(range);
+        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 && count < pageSize) {
-            messages.push(cursor.value);
-            count++;
-            cursor.continue();
-          } else if (cursor) {
-            nextCursor = cursor.value.sentTime;
+          if (cursor) {
+            const message = {
+              ...cursor.value
+            };
+            if (typeof message.content === 'string' && message.content) {
+              try {
+                message.content = this.decryptContent(message.content);
+              } catch (error) {
+                logger.error('解密消息内容失败', error);
+                message.content = null;
+              }
+            }
+            resolve(message);
           } else {
-            nextCursor = null;
-          }
-          if (!cursor || count >= pageSize) {
-            resolve({
-              messages,
-              nextCursor
-            });
+            resolve(null);
           }
         };
         cursorRequest.onerror = event => {
-          reject(new Error('获取分页消息失败'));
+          logger.error('获取最新消息失败', event);
+          resolve(null);
         };
       });
     }
-    async updateMessagesStatus(messageUIds, newStatus) {
-      if (!this.db || messageUIds.length === 0) {
-        return;
+    async upsertMessage(message) {
+      if (!this.db) {
+        throw new Error('数据库未初始化');
       }
       return new Promise((resolve, reject) => {
         const transaction = this.db.transaction(this.STORE_NAME, 'readwrite');
         const store = transaction.objectStore(this.STORE_NAME);
-        let completed = 0;
-        let hasError = false;
-        messageUIds.forEach(id => {
-          const getRequest = store.get(id);
-          getRequest.onsuccess = () => {
-            const message = getRequest.result;
-            if (message) {
-              message.receivedStatus = newStatus;
-              store.put(message);
-            }
-            completed++;
-            if (completed === messageUIds.length && !hasError) {
-              resolve();
-            }
-          };
-          getRequest.onerror = event => {
-            if (!hasError) {
-              hasError = true;
-              reject(new Error('更新消息状态失败'));
-            }
-          };
-        });
-        transaction.oncomplete = () => {
+        const messageToStore = {
+          ...message
+        };
+        if (messageToStore.content) {
+          const encryptedContent = this.encryptContent(messageToStore.content);
+          messageToStore.content = encryptedContent;
+        }
+        const request = store.put(messageToStore);
+        request.onsuccess = () => {
           resolve();
         };
-        transaction.onerror = event => {
-          reject(new Error('批量更新事务失败'));
+        request.onerror = event => {
+          logger.error('更新/插入消息失败', event);
+          reject(new Error('更新/插入消息失败'));
         };
       });
     }
-    async changeUser(appKey, userId) {
-      if (this.currentAppKey === appKey && this.currentUserId === userId) {
-        return;
-      }
-      this.currentAppKey = appKey;
-      this.currentUserId = userId;
-      this.generateEncryptKey(appKey, userId);
-      await this.checkAndResetDatabase();
-      await this.initDatabase();
-    }
-    async getLatestMessage(conversation) {
-      const dialogId = getFullDialogId(conversation);
+    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 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
+        const request = store.get(messageId);
+        request.onsuccess = () => {
+          const message = request.result;
+          if (message) {
+            const decryptedMessage = {
+              ...message
             };
-            if (typeof message.content === 'string' && message.content) {
+            if (typeof decryptedMessage.content === 'string' && decryptedMessage.content) {
               try {
-                message.content = this.decryptContent(message.content);
+                decryptedMessage.content = this.decryptContent(decryptedMessage.content);
               } catch (error) {
-                console.error('解密消息内容失败', error);
-                message.content = null;
+                logger.error('解密消息内容失败', error);
+                decryptedMessage.content = null;
               }
             }
-            resolve(message);
+            resolve(decryptedMessage);
           } else {
             resolve(null);
           }
         };
-        cursorRequest.onerror = event => {
-          console.error('获取最新消息失败', event);
-          reject(new Error('获取最新消息失败'));
+        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);
         };
       });
     }
@@ -21733,16 +21764,29 @@
       webSocketServer.close();
       return Promise.resolve();
     }
-    setUserLogged() {
+    async setUserLogged() {
       ConversationManager$1.get().destroyed();
       ConversationManager$1.create(this.options.appkey, accountStore.uid.toString(), this.watcher.conversationState);
       MessageReceiptManager$1.create(this.options.appkey, accountStore.uid.toString());
-      MessageCache$1.create(this.options.appkey, accountStore.uid.toString());
       this.messageLoader?.stop();
       this.messageLoader = new MessageLoader(this.watcher, this.options);
       SentMessageStore.reset();
       RecallMessageStore.reset();
       DialogSecretKey$1.reset();
+      MessageCache$1.create(this.options.appkey, accountStore.uid.toString());
+      MessageCache$1.get().initDB().then(() => {
+        return MessageCache$1.get().getMessageIdRange();
+      }).then(result => {
+        if (result) {
+          const {
+            oldest,
+            newest
+          } = result;
+          setInitialMessageId(oldest, newest);
+        } else {
+          setInitialMessageId(10000, 10000);
+        }
+      });
       if (this.getConnectionStatus() === exports.ConnectionStatus.CONNECTED) {
         this.handleUserConnected();
       }
@@ -28386,37 +28430,31 @@
   var protobufjsExports = requireProtobufjs();
   var protobuf = /*@__PURE__*/getDefaultExportFromCjs(protobufjsExports);
 
-  const transSentAttrs2IReceivedMessage = (message, options, sentStatus = exports.SentStatus.SENDING) => ({
-    conversationType: options.conversation.conversationType,
-    targetId: options.conversation.targetId,
-    senderUserId: options.senderUserId,
-    messageDirection: exports.MessageDirection.SEND,
-    isCounted: message.isCounted,
-    isMentioned: false,
-    content: deepClone(message.content),
-    messageType: message.messageType,
-    isOffLineMessage: false,
-    isPersited: message.isPersited,
-    messageId: options.messageId,
-    messageUId: '0',
-    sentTime: options.sentTime,
-    sentStatus,
-    receivedTime: '0',
-    isStatusMessage: message.isStatusMessage,
-    receivedStatus: exports.ReceivedStatus.IDLE,
-    disableNotification: true,
-    burnAfterReadingFlag: false
-  });
-
-  let UniqueLocalId = 0;
-  function generateMessageId() {
-    UniqueLocalId++;
-    const time = getServerTime$1();
-    if (UniqueLocalId < time) {
-      UniqueLocalId = time;
-    }
-    return 230000000000000 + UniqueLocalId;
-  }
+  const transSentAttrs2IReceivedMessage = (message, options, sentStatus = exports.SentStatus.SENDING) => {
+    const conversation = ConversationManager$1.get().get(options.conversation);
+    return {
+      conversationType: options.conversation.conversationType,
+      targetId: options.conversation.targetId,
+      senderUserId: options.senderUserId,
+      messageDirection: exports.MessageDirection.SEND,
+      isCounted: message.isCounted,
+      isMentioned: false,
+      content: deepClone(message.content),
+      messageType: message.messageType,
+      isOffLineMessage: false,
+      isPersited: message.isPersited,
+      messageId: options.messageId,
+      messageUId: "local" + options.sentTime,
+      sentTime: options.sentTime,
+      sentStatus,
+      receivedTime: options.sentTime,
+      isStatusMessage: message.isStatusMessage,
+      receivedStatus: exports.ReceivedStatus.IDLE,
+      disableNotification: true,
+      burnAfterReadingFlag: conversation?.burnAfterReadingFlag ?? false,
+      burnAfterReadingTime: conversation?.burnAfterReadingTime ?? 0
+    };
+  };
 
   const getBlobUrl = blob => {
     const URL = window.URL || window.webkitURL;
@@ -28887,10 +28925,12 @@
     const sentAttris = {
       conversation,
       senderUserId: accountStore.uid,
-      messageId: '0',
+      messageId: 0,
       sentTime: getServerTime$1().toString()
     };
     const receivedMessage = transSentAttrs2IReceivedMessage(recallCommandMessage, sentAttris, exports.SentStatus.SENT);
+    receivedMessage.burnAfterReadingFlag = false;
+    receivedMessage.burnAfterReadingTime = 0;
     ConversationManager$1.get().setConversationCacheByMessage(receivedMessage);
     return {
       code: exports.ErrorCode.SUCCESS,
@@ -28939,12 +28979,16 @@
     });
   }
   async function internal_sendMessage(conversation, message, options, uploadOptions) {
-    const checkResult = beforeSend(conversation, message, options);
+    const checkResult = await beforeSend(conversation, message, options);
     if (checkResult.code !== exports.ErrorCode.SUCCESS || !checkResult.message || !checkResult.sentArgs) {
       return {
         code: checkResult.code
       };
     }
+    {
+      const receivedMessage = transSentAttrs2IReceivedMessage(checkResult.message, checkResult.sentArgs);
+      await saveSentMessage(receivedMessage, checkResult.sentArgs);
+    }
     let {
       message: sentMessage,
       sentArgs
@@ -28953,30 +28997,30 @@
       const uploadResult = await uploadOptions.task(sentMessage, uploadOptions.files);
       sentMessage = uploadResult.message;
       if (!uploadResult.finished) {
+        const receivedMessage = transSentAttrs2IReceivedMessage(checkResult.message, checkResult.sentArgs, exports.SentStatus.FAILED);
+        await saveSentMessage(receivedMessage, sentArgs);
         return {
           code: exports.ErrorCode.UPLOAD_FILE_FAILED,
-          data: transSentAttrs2IReceivedMessage(sentMessage, sentArgs, exports.SentStatus.FAILED)
+          data: receivedMessage
         };
       }
     }
     return send(sentMessage, sentArgs);
   }
-  function beforeSend(conversation, message, options) {
-    if (!LibLoader.loader || LibLoader.loader.getConnectionStatus() !== exports.ConnectionStatus.CONNECTED) {
-      return {
-        code: exports.ErrorCode.RC_NET_CHANNEL_INVALID
-      };
-    }
+  async function beforeSend(conversation, message, options) {
     const mediaAttribute = JSON.stringify(filterNullProperty(message.content));
     if (getByteLength(mediaAttribute) > MAX_MESSAGE_CONTENT_BYTES) {
       return {
         code: exports.ErrorCode.RC_MSG_CONTENT_EXCEED_LIMIT
       };
     }
+    if (message.isPersited) {
+      await ConversationManager$1.get().loadConvsationsIfNotExist([conversation]);
+    }
     const sentArgs = {
       conversation: conversation,
       senderUserId: accountStore.uid,
-      messageId: options?.messageId ?? generateMessageId().toString(),
+      messageId: generateNewMessageId(),
       sentTime: getMessageSentTime().toString(),
       pushConfig: options?.pushConfig
     };
@@ -28993,12 +29037,6 @@
   async function send(message, sentArgs) {
     const dialogId = getFullDialogId(sentArgs.conversation);
     const receivedMessage = transSentAttrs2IReceivedMessage(message, sentArgs);
-    if (message.isPersited) {
-      await ConversationManager$1.get().loadConvsationsIfNotExist([sentArgs.conversation]);
-    }
-    const conversation = ConversationManager$1.get().get(sentArgs.conversation);
-    receivedMessage.burnAfterReadingFlag = conversation?.burnAfterReadingFlag ?? false;
-    receivedMessage.burnAfterReadingTime = conversation?.burnAfterReadingTime ?? 0;
     const secretKey = await DialogSecretKey$1.getDialogAesKey(dialogId.toString());
     if (!secretKey) {
       receivedMessage.sentStatus = exports.SentStatus.FAILED;
@@ -29021,7 +29059,7 @@
     const mediaEncryptedString = aes256Encrypt(mediaAttribute, secretKey);
     SentMessageStore.addMessage(sentArgs.messageId);
     const baseParams = {
-      localId: Long.fromString(sentArgs.messageId),
+      localId: Long.fromNumber(sentArgs.messageId),
       mediaFlag: message.messageType !== MessageTypes.TEXT,
       mediaConstructor: message.messageType,
       msgPreContent: '',
@@ -29052,9 +29090,10 @@
       receivedMessage.sentTime = response.data.msgSendTime.toString();
       receivedMessage.messageUId = response.data.msgId.toString();
       receivedMessage.sentStatus = exports.SentStatus.SENT;
-      ConversationManager$1.get().setConversationCacheByMessage(receivedMessage);
+      await saveSentMessage(receivedMessage, sentArgs);
     } else {
       receivedMessage.sentStatus = exports.SentStatus.FAILED;
+      await saveSentMessage(receivedMessage, sentArgs);
     }
     return {
       code: response.code,
@@ -29070,6 +29109,18 @@
     }
     return UniqueSentTime;
   }
+  async function saveSentMessage(receivedMessage, options) {
+    try {
+      const cache = MessageCache$1.get();
+      if (receivedMessage.isPersited && cache) {
+        await cache.upsertMessage(receivedMessage);
+        const latestMessage = await cache.getLatestMessage(options.conversation);
+        ConversationManager$1.get().updateLatestMessage(options.conversation, latestMessage);
+      }
+    } catch (error) {
+      logger.error('saveSentMessage -> ', error);
+    }
+  }
 
   class IMClient extends EventEmitter {
     options;
@@ -29246,7 +29297,6 @@
       });
     }
     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().updateLatestMessage(conversation, cachedResult.messages[cachedResult.messages.length - 1]);
@@ -29270,8 +29320,13 @@
         return remotesResult;
       }
       const remotesMessages = remotesResult.data.list;
+      for (let i = remotesMessages.length - 1; i >= 0; i--) {
+        const message = remotesMessages[i];
+        if (!message.messageId) {
+          message.messageId = generateOldMessageId();
+        }
+      }
       if (!remotesTimestamp || remotesTimestamp == '0') {
-        debugger;
         ConversationManager$1.get().updateLatestMessage(conversation, remotesMessages[remotesMessages.length - 1]);
       }
       MessageCache$1.get().addMessages(remotesMessages, conversation, !remotesResult.data.hasMore);

package/package.json

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

package/types/model/iReceivedMessage.d.ts

@@ -75,7 +75,7 @@ export default interface IReceivedMessage {
     /**
      * CPP 独有字段 消息本地 ID
      */
-    messageId?: string;
+    messageId: number;
     /**
      * 消息发送状态
      */