@onyx-p/imlib-web 2.2.7 → 2.2.9

package/index.esm.js

@@ -20718,6 +20718,9 @@ function generateOldMessageId() {
   oldestMessageId--;
   return oldestMessageId;
 }
+function getCurrentMessageId() {
+  return lastMessageId;
+}
 
 class MessageLoader {
   watcher;
@@ -20822,7 +20825,7 @@ class MessageLoader {
             RecallMessageStore.remove(m.content.messageUId);
           } else {
             m.isOffLineMessage = isOffLineMessage;
-            if (!m.messageId) {
+            if (!m.messageId || m.messageId > getCurrentMessageId()) {
               m.messageId = generateNewMessageId();
             }
             ConversationManager$1.get().setConversationCacheByMessage(m);
@@ -21184,7 +21187,7 @@ class MessageCache {
     if (!content) return '';
     try {
       const contentStr = JSON.stringify(content);
-      return aes256Encrypt(contentStr, this.encryptKey);
+      return contentStr;
     } catch (error) {
       logger.error('加密消息内容失败', error);
       return '';
@@ -21195,7 +21198,7 @@ class MessageCache {
       return null;
     }
     try {
-      const decryptedStr = aes256Decrypt(encryptedHex, this.encryptKey);
+      const decryptedStr = encryptedHex;
       return JSON.parse(decryptedStr);
     } catch (error) {
       logger.error('解密消息内容失败', error);
@@ -21549,28 +21552,7 @@ class MessageCache {
     });
   }
   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);
-      const messageToStore = {
-        ...message
-      };
-      if (messageToStore.content) {
-        const encryptedContent = this.encryptContent(messageToStore.content);
-        messageToStore.content = encryptedContent;
-      }
-      const request = store.put(messageToStore);
-      request.onsuccess = () => {
-        resolve();
-      };
-      request.onerror = event => {
-        logger.error('更新/插入消息失败', event);
-        reject(new Error('更新/插入消息失败'));
-      };
-    });
+    this.addMessages([message], message);
   }
   async getMessageById(messageId) {
     if (!this.db) {
@@ -29322,7 +29304,7 @@ class IMClient extends EventEmitter {
     const remotesMessages = remotesResult.data.list;
     for (let i = remotesMessages.length - 1; i >= 0; i--) {
       const message = remotesMessages[i];
-      if (!message.messageId) {
+      if (!message.messageId || message.messageId > getCurrentMessageId()) {
         message.messageId = generateOldMessageId();
       }
     }

package/index.umd.js

@@ -20724,6 +20724,9 @@
     oldestMessageId--;
     return oldestMessageId;
   }
+  function getCurrentMessageId() {
+    return lastMessageId;
+  }
 
   class MessageLoader {
     watcher;
@@ -20828,7 +20831,7 @@
               RecallMessageStore.remove(m.content.messageUId);
             } else {
               m.isOffLineMessage = isOffLineMessage;
-              if (!m.messageId) {
+              if (!m.messageId || m.messageId > getCurrentMessageId()) {
                 m.messageId = generateNewMessageId();
               }
               ConversationManager$1.get().setConversationCacheByMessage(m);
@@ -21190,7 +21193,7 @@
       if (!content) return '';
       try {
         const contentStr = JSON.stringify(content);
-        return aes256Encrypt(contentStr, this.encryptKey);
+        return contentStr;
       } catch (error) {
         logger.error('加密消息内容失败', error);
         return '';
@@ -21201,7 +21204,7 @@
         return null;
       }
       try {
-        const decryptedStr = aes256Decrypt(encryptedHex, this.encryptKey);
+        const decryptedStr = encryptedHex;
         return JSON.parse(decryptedStr);
       } catch (error) {
         logger.error('解密消息内容失败', error);
@@ -21555,28 +21558,7 @@
       });
     }
     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);
-        const messageToStore = {
-          ...message
-        };
-        if (messageToStore.content) {
-          const encryptedContent = this.encryptContent(messageToStore.content);
-          messageToStore.content = encryptedContent;
-        }
-        const request = store.put(messageToStore);
-        request.onsuccess = () => {
-          resolve();
-        };
-        request.onerror = event => {
-          logger.error('更新/插入消息失败', event);
-          reject(new Error('更新/插入消息失败'));
-        };
-      });
+      this.addMessages([message], message);
     }
     async getMessageById(messageId) {
       if (!this.db) {
@@ -29328,7 +29310,7 @@
       const remotesMessages = remotesResult.data.list;
       for (let i = remotesMessages.length - 1; i >= 0; i--) {
         const message = remotesMessages[i];
-        if (!message.messageId) {
+        if (!message.messageId || message.messageId > getCurrentMessageId()) {
           message.messageId = generateOldMessageId();
         }
       }

package/package.json

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