@onyx-p/imlib-web 2.2.8 → 2.3.0

package/index.esm.js

@@ -20798,7 +20798,9 @@ class MessageLoader {
     if (code !== ErrorCode.SUCCESS) {
       logger.warn('pullMsg failed -> code:', code);
       this.pullingMsg = false;
-      this.try2RePullMsg();
+      if (LibLoader.loader?.getConnectionStatus() == ConnectionStatus.CONNECTED) {
+        this.try2RePullMsg();
+      }
       return;
     }
     const {
@@ -21187,7 +21189,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 '';
@@ -21198,7 +21200,7 @@ class MessageCache {
       return null;
     }
     try {
-      const decryptedStr = aes256Decrypt(encryptedHex, this.encryptKey);
+      const decryptedStr = encryptedHex;
       return JSON.parse(decryptedStr);
     } catch (error) {
       logger.error('解密消息内容失败', error);
@@ -21552,28 +21554,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) {
@@ -21809,24 +21790,22 @@ class LibLoader {
   }
   async connectionStatusListener(status) {
     this.connectionStatus = status;
-    setTimeout(() => {
-      switch (status) {
-        case ConnectionStatus.BLOCKED:
-        case ConnectionStatus.KICKED_OFFLINE_BY_OTHER_CLIENT:
-        case ConnectionStatus.DISCONNECT_BY_SERVER:
-          this.handleDisconnect();
-          break;
-        case ConnectionStatus.CONNECTING:
-          this.handleConnecting();
-          break;
-        case ConnectionStatus.CONNECTED:
-          this.handleConnected();
-          break;
-        case ConnectionStatus.DISCONNECTED:
-          this.handleDisconnect();
-          break;
-      }
-    }, 0);
+    switch (status) {
+      case ConnectionStatus.BLOCKED:
+      case ConnectionStatus.KICKED_OFFLINE_BY_OTHER_CLIENT:
+      case ConnectionStatus.DISCONNECT_BY_SERVER:
+        this.handleDisconnect();
+        break;
+      case ConnectionStatus.CONNECTING:
+        this.handleConnecting();
+        break;
+      case ConnectionStatus.CONNECTED:
+        this.handleConnected();
+        break;
+      case ConnectionStatus.DISCONNECTED:
+        this.handleDisconnect();
+        break;
+    }
   }
   handleConnecting() {
     this.watcher.onConnecting?.();
@@ -29037,6 +29016,7 @@ async function send(message, sentArgs) {
   const secretKey = await DialogSecretKey$1.getDialogAesKey(dialogId.toString());
   if (!secretKey) {
     receivedMessage.sentStatus = SentStatus.FAILED;
+    await saveSentMessage(receivedMessage, sentArgs);
     return {
       code: ErrorCode.MSG_ENCRYPT_ERROR,
       data: receivedMessage

package/index.umd.js

@@ -20804,7 +20804,9 @@
       if (code !== exports.ErrorCode.SUCCESS) {
         logger.warn('pullMsg failed -> code:', code);
         this.pullingMsg = false;
-        this.try2RePullMsg();
+        if (LibLoader.loader?.getConnectionStatus() == exports.ConnectionStatus.CONNECTED) {
+          this.try2RePullMsg();
+        }
         return;
       }
       const {
@@ -21193,7 +21195,7 @@
       if (!content) return '';
       try {
         const contentStr = JSON.stringify(content);
-        return aes256Encrypt(contentStr, this.encryptKey);
+        return contentStr;
       } catch (error) {
         logger.error('加密消息内容失败', error);
         return '';
@@ -21204,7 +21206,7 @@
         return null;
       }
       try {
-        const decryptedStr = aes256Decrypt(encryptedHex, this.encryptKey);
+        const decryptedStr = encryptedHex;
         return JSON.parse(decryptedStr);
       } catch (error) {
         logger.error('解密消息内容失败', error);
@@ -21558,28 +21560,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) {
@@ -21815,24 +21796,22 @@
     }
     async connectionStatusListener(status) {
       this.connectionStatus = status;
-      setTimeout(() => {
-        switch (status) {
-          case exports.ConnectionStatus.BLOCKED:
-          case exports.ConnectionStatus.KICKED_OFFLINE_BY_OTHER_CLIENT:
-          case exports.ConnectionStatus.DISCONNECT_BY_SERVER:
-            this.handleDisconnect();
-            break;
-          case exports.ConnectionStatus.CONNECTING:
-            this.handleConnecting();
-            break;
-          case exports.ConnectionStatus.CONNECTED:
-            this.handleConnected();
-            break;
-          case exports.ConnectionStatus.DISCONNECTED:
-            this.handleDisconnect();
-            break;
-        }
-      }, 0);
+      switch (status) {
+        case exports.ConnectionStatus.BLOCKED:
+        case exports.ConnectionStatus.KICKED_OFFLINE_BY_OTHER_CLIENT:
+        case exports.ConnectionStatus.DISCONNECT_BY_SERVER:
+          this.handleDisconnect();
+          break;
+        case exports.ConnectionStatus.CONNECTING:
+          this.handleConnecting();
+          break;
+        case exports.ConnectionStatus.CONNECTED:
+          this.handleConnected();
+          break;
+        case exports.ConnectionStatus.DISCONNECTED:
+          this.handleDisconnect();
+          break;
+      }
     }
     handleConnecting() {
       this.watcher.onConnecting?.();
@@ -29043,6 +29022,7 @@
     const secretKey = await DialogSecretKey$1.getDialogAesKey(dialogId.toString());
     if (!secretKey) {
       receivedMessage.sentStatus = exports.SentStatus.FAILED;
+      await saveSentMessage(receivedMessage, sentArgs);
       return {
         code: exports.ErrorCode.MSG_ENCRYPT_ERROR,
         data: receivedMessage

package/package.json

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