@onyx-p/imlib-web 2.0.8 → 2.0.9

package/index.esm.js

@@ -20940,9 +20940,31 @@ class MessageCache {
   DB_VERSION = 2;
   STORE_NAME = 'messages';
   DIALOG_STATE_STORE = 'dialogStates';
+  encryptKey = {
+    key: ''
+  };
+  SALT_PREFIX = 'im_message_cache_salt_prefix';
+  SALT_SUFFIX = 'im_message_cache_salt_suffix';
   constructor(appKey, userId) {
+    this.generateEncryptKey(appKey, userId);
     this.init(appKey, userId);
   }
+  generateEncryptKey(appKey, userId) {
+    const saltedInput = `${this.SALT_PREFIX}${appKey}_${userId}${this.SALT_SUFFIX}`;
+    const keyMaterial = CryptoJS.SHA256(saltedInput).toString();
+    const iv = keyMaterial.substring(0, 16);
+    const key = keyMaterial.substring(16, 48);
+    const additionalSalt = CryptoJS.SHA256(`${iv}:${this.SALT_PREFIX}:${userId}:${appKey}`).toString().substring(0, 8);
+    const finalKey = CryptoJS.PBKDF2(key, additionalSalt, {
+      keySize: 256 / 32,
+      iterations: 1000,
+      hasher: CryptoJS.algo.SHA256
+    }).toString();
+    this.encryptKey = {
+      key: finalKey.substring(0, 32),
+      iv: iv
+    };
+  }
   async init(appKey, userId) {
     this.currentAppKey = appKey;
     this.currentUserId = userId;
@@ -21080,6 +21102,28 @@ class MessageCache {
       };
     });
   }
+  encryptContent(content) {
+    if (!content) return '';
+    try {
+      const contentStr = JSON.stringify(content);
+      return aes256Encrypt(contentStr, this.encryptKey);
+    } catch (error) {
+      console.error('加密消息内容失败', error);
+      return '';
+    }
+  }
+  decryptContent(encryptedHex) {
+    if (!encryptedHex) {
+      return null;
+    }
+    try {
+      const decryptedStr = aes256Decrypt(encryptedHex, this.encryptKey);
+      return JSON.parse(decryptedStr);
+    } catch (error) {
+      console.error('解密消息内容失败', error);
+      return null;
+    }
+  }
   async addMessages(messages, toConversation, isEnd = undefined) {
     const dialogId = getFullDialogId(toConversation);
     if (isDef(isEnd)) {
@@ -21096,6 +21140,10 @@ class MessageCache {
           ...message,
           dialogId
         };
+        if (messageToStore.content) {
+          const encryptedContent = this.encryptContent(messageToStore.content);
+          messageToStore.content = encryptedContent;
+        }
         store.put(messageToStore);
       });
       transaction.oncomplete = () => {
@@ -21138,7 +21186,18 @@ class MessageCache {
           const cursor = event.target.result;
           if (cursor) {
             if (processedCount < count) {
-              messages.push(cursor.value);
+              const message = {
+                ...cursor.value
+              };
+              if (typeof message.content === 'string' && message.content) {
+                try {
+                  message.content = this.decryptContent(message.content);
+                } catch (error) {
+                  console.error('解密消息内容失败', error);
+                  message.content = null;
+                }
+              }
+              messages.push(message);
               processedCount++;
               cursor.continue();
             } else {
@@ -21149,13 +21208,13 @@ class MessageCache {
             finishQuery();
           }
         };
-        function finishQuery() {
+        const finishQuery = () => {
           messages.sort((a, b) => Long.fromString(a.sentTime).compare(Long.fromString(b.sentTime)));
           resolve({
             messages,
             hasMore: hasMoreMessages || totalCount > count || !isLoaded
           });
-        }
+        };
       };
       transaction.onerror = event => {
         console.error('获取消息事务失败', event);
@@ -21291,7 +21350,6 @@ class MessageCache {
     return new Promise((resolve, reject) => {
       const transaction = this.db.transaction(this.STORE_NAME, 'readwrite');
       const store = transaction.objectStore(this.STORE_NAME);
-      new Set(event.messageUIdList);
       let completed = 0;
       let hasError = false;
       event.messageUIdList.forEach(id => {
@@ -21457,6 +21515,7 @@ class MessageCache {
     }
     this.currentAppKey = appKey;
     this.currentUserId = userId;
+    this.generateEncryptKey(appKey, userId);
     await this.checkAndResetDatabase();
     await this.initDatabase();
   }

package/index.umd.js

@@ -20946,9 +20946,31 @@
     DB_VERSION = 2;
     STORE_NAME = 'messages';
     DIALOG_STATE_STORE = 'dialogStates';
+    encryptKey = {
+      key: ''
+    };
+    SALT_PREFIX = 'im_message_cache_salt_prefix';
+    SALT_SUFFIX = 'im_message_cache_salt_suffix';
     constructor(appKey, userId) {
+      this.generateEncryptKey(appKey, userId);
       this.init(appKey, userId);
     }
+    generateEncryptKey(appKey, userId) {
+      const saltedInput = `${this.SALT_PREFIX}${appKey}_${userId}${this.SALT_SUFFIX}`;
+      const keyMaterial = CryptoJS.SHA256(saltedInput).toString();
+      const iv = keyMaterial.substring(0, 16);
+      const key = keyMaterial.substring(16, 48);
+      const additionalSalt = CryptoJS.SHA256(`${iv}:${this.SALT_PREFIX}:${userId}:${appKey}`).toString().substring(0, 8);
+      const finalKey = CryptoJS.PBKDF2(key, additionalSalt, {
+        keySize: 256 / 32,
+        iterations: 1000,
+        hasher: CryptoJS.algo.SHA256
+      }).toString();
+      this.encryptKey = {
+        key: finalKey.substring(0, 32),
+        iv: iv
+      };
+    }
     async init(appKey, userId) {
       this.currentAppKey = appKey;
       this.currentUserId = userId;
@@ -21086,6 +21108,28 @@
         };
       });
     }
+    encryptContent(content) {
+      if (!content) return '';
+      try {
+        const contentStr = JSON.stringify(content);
+        return aes256Encrypt(contentStr, this.encryptKey);
+      } catch (error) {
+        console.error('加密消息内容失败', error);
+        return '';
+      }
+    }
+    decryptContent(encryptedHex) {
+      if (!encryptedHex) {
+        return null;
+      }
+      try {
+        const decryptedStr = aes256Decrypt(encryptedHex, this.encryptKey);
+        return JSON.parse(decryptedStr);
+      } catch (error) {
+        console.error('解密消息内容失败', error);
+        return null;
+      }
+    }
     async addMessages(messages, toConversation, isEnd = undefined) {
       const dialogId = getFullDialogId(toConversation);
       if (isDef(isEnd)) {
@@ -21102,6 +21146,10 @@
             ...message,
             dialogId
           };
+          if (messageToStore.content) {
+            const encryptedContent = this.encryptContent(messageToStore.content);
+            messageToStore.content = encryptedContent;
+          }
           store.put(messageToStore);
         });
         transaction.oncomplete = () => {
@@ -21144,7 +21192,18 @@
             const cursor = event.target.result;
             if (cursor) {
               if (processedCount < count) {
-                messages.push(cursor.value);
+                const message = {
+                  ...cursor.value
+                };
+                if (typeof message.content === 'string' && message.content) {
+                  try {
+                    message.content = this.decryptContent(message.content);
+                  } catch (error) {
+                    console.error('解密消息内容失败', error);
+                    message.content = null;
+                  }
+                }
+                messages.push(message);
                 processedCount++;
                 cursor.continue();
               } else {
@@ -21155,13 +21214,13 @@
               finishQuery();
             }
           };
-          function finishQuery() {
+          const finishQuery = () => {
             messages.sort((a, b) => Long.fromString(a.sentTime).compare(Long.fromString(b.sentTime)));
             resolve({
               messages,
               hasMore: hasMoreMessages || totalCount > count || !isLoaded
             });
-          }
+          };
         };
         transaction.onerror = event => {
           console.error('获取消息事务失败', event);
@@ -21297,7 +21356,6 @@
       return new Promise((resolve, reject) => {
         const transaction = this.db.transaction(this.STORE_NAME, 'readwrite');
         const store = transaction.objectStore(this.STORE_NAME);
-        new Set(event.messageUIdList);
         let completed = 0;
         let hasError = false;
         event.messageUIdList.forEach(id => {
@@ -21463,6 +21521,7 @@
       }
       this.currentAppKey = appKey;
       this.currentUserId = userId;
+      this.generateEncryptKey(appKey, userId);
       await this.checkAndResetDatabase();
       await this.initDatabase();
     }

package/package.json

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