@onyx-p/imlib-web 2.3.4 → 2.3.5

package/index.esm.js

@@ -21102,87 +21102,44 @@ class MessageCache {
     if (!messageUIds || messageUIds.length === 0 || !this.db) {
       return;
     }
-    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 deleteRequest = store.delete(id);
-        deleteRequest.onsuccess = () => {
-          completed++;
-          if (completed === messageUIds.length && !hasError) {
-            resolve();
-          }
-        };
-        deleteRequest.onerror = event => {
-          logger.error('Failed to delete message', id, event);
-          if (!hasError) {
-            hasError = true;
-            reject(new Error('Failed to delete message'));
-          }
-        };
-      });
-      transaction.oncomplete = () => {
-        if (!hasError) {
-          resolve();
+    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 getRequest = index.get(messageUId);
+      getRequest.onsuccess = () => {
+        const message = getRequest.result;
+        if (message) {
+          store.delete(message.messageId);
         }
       };
-      transaction.onerror = event => {
-        reject(new Error('Batch delete message transaction failed'));
-      };
     });
   }
   async updateMessageReceiptStatus(event, type) {
     if (!event || !event.messageUIdList || event.messageUIdList.length === 0 || !this.db) {
       return;
     }
-    const {
-      conversation
-    } = event;
-    getFullDialogId(conversation);
-    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;
-      event.messageUIdList.forEach(id => {
-        const getRequest = store.get(id);
-        getRequest.onsuccess = () => {
-          const message = getRequest.result;
-          if (message) {
-            let needUpdate = false;
-            if (type === 0 && message.receivedStatus < ReceivedStatus.RECEIVED) {
-              message.receivedStatus = ReceivedStatus.RECEIVED;
-              needUpdate = true;
-            } else if (type === 1 && message.receivedStatus < ReceivedStatus.READ) {
-              message.receivedStatus = ReceivedStatus.READ;
-              needUpdate = true;
-            }
-            if (needUpdate) {
-              store.put(message);
-            }
-          }
-          completed++;
-          if (completed === event.messageUIdList.length && !hasError) {
-            resolve();
+    const transaction = this.db.transaction(this.STORE_NAME, 'readwrite');
+    const store = transaction.objectStore(this.STORE_NAME);
+    const index = store.index('messageUId');
+    event.messageUIdList.forEach(messageUId => {
+      const getRequest = index.get(messageUId);
+      getRequest.onsuccess = () => {
+        const message = getRequest.result;
+        if (message) {
+          let needUpdate = false;
+          if (type === 0 && message.receivedStatus < ReceivedStatus.RECEIVED) {
+            message.receivedStatus = ReceivedStatus.RECEIVED;
+            needUpdate = true;
+          } else if (type === 1 && message.receivedStatus < ReceivedStatus.READ) {
+            message.receivedStatus = ReceivedStatus.READ;
+            needUpdate = true;
           }
-        };
-        getRequest.onerror = event => {
-          if (!hasError) {
-            hasError = true;
-            reject(new Error('更新消息状态失败'));
+          if (needUpdate) {
+            store.put(message);
           }
-        };
-      });
-      transaction.oncomplete = () => {
-        if (!hasError) {
-          resolve();
         }
       };
-      transaction.onerror = event => {
-        reject(new Error('更新消息状态事务失败'));
-      };
     });
   }
   async clearBurnAfterReadingExpiredMessages(conversation) {
@@ -21480,6 +21437,7 @@ class MessageLoader {
         l.forEach(m => {
           if (m.messageType === MessageTypes.RECALL && RecallMessageStore.has(m.content.messageUId)) {
             RecallMessageStore.remove(m.content.messageUId);
+            recallMessageUIds.push(m.content.messageUId);
           } else {
             m.isOffLineMessage = isOffLineMessage;
             if (!m.messageId || m.messageId > getCurrentMessageId()) {

package/index.umd.js

@@ -21108,87 +21108,44 @@
       if (!messageUIds || messageUIds.length === 0 || !this.db) {
         return;
       }
-      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 deleteRequest = store.delete(id);
-          deleteRequest.onsuccess = () => {
-            completed++;
-            if (completed === messageUIds.length && !hasError) {
-              resolve();
-            }
-          };
-          deleteRequest.onerror = event => {
-            logger.error('Failed to delete message', id, event);
-            if (!hasError) {
-              hasError = true;
-              reject(new Error('Failed to delete message'));
-            }
-          };
-        });
-        transaction.oncomplete = () => {
-          if (!hasError) {
-            resolve();
+      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 getRequest = index.get(messageUId);
+        getRequest.onsuccess = () => {
+          const message = getRequest.result;
+          if (message) {
+            store.delete(message.messageId);
           }
         };
-        transaction.onerror = event => {
-          reject(new Error('Batch delete message transaction failed'));
-        };
       });
     }
     async updateMessageReceiptStatus(event, type) {
       if (!event || !event.messageUIdList || event.messageUIdList.length === 0 || !this.db) {
         return;
       }
-      const {
-        conversation
-      } = event;
-      getFullDialogId(conversation);
-      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;
-        event.messageUIdList.forEach(id => {
-          const getRequest = store.get(id);
-          getRequest.onsuccess = () => {
-            const message = getRequest.result;
-            if (message) {
-              let needUpdate = false;
-              if (type === 0 && message.receivedStatus < exports.ReceivedStatus.RECEIVED) {
-                message.receivedStatus = exports.ReceivedStatus.RECEIVED;
-                needUpdate = true;
-              } else if (type === 1 && message.receivedStatus < exports.ReceivedStatus.READ) {
-                message.receivedStatus = exports.ReceivedStatus.READ;
-                needUpdate = true;
-              }
-              if (needUpdate) {
-                store.put(message);
-              }
-            }
-            completed++;
-            if (completed === event.messageUIdList.length && !hasError) {
-              resolve();
+      const transaction = this.db.transaction(this.STORE_NAME, 'readwrite');
+      const store = transaction.objectStore(this.STORE_NAME);
+      const index = store.index('messageUId');
+      event.messageUIdList.forEach(messageUId => {
+        const getRequest = index.get(messageUId);
+        getRequest.onsuccess = () => {
+          const message = getRequest.result;
+          if (message) {
+            let needUpdate = false;
+            if (type === 0 && message.receivedStatus < exports.ReceivedStatus.RECEIVED) {
+              message.receivedStatus = exports.ReceivedStatus.RECEIVED;
+              needUpdate = true;
+            } else if (type === 1 && message.receivedStatus < exports.ReceivedStatus.READ) {
+              message.receivedStatus = exports.ReceivedStatus.READ;
+              needUpdate = true;
             }
-          };
-          getRequest.onerror = event => {
-            if (!hasError) {
-              hasError = true;
-              reject(new Error('更新消息状态失败'));
+            if (needUpdate) {
+              store.put(message);
             }
-          };
-        });
-        transaction.oncomplete = () => {
-          if (!hasError) {
-            resolve();
           }
         };
-        transaction.onerror = event => {
-          reject(new Error('更新消息状态事务失败'));
-        };
       });
     }
     async clearBurnAfterReadingExpiredMessages(conversation) {
@@ -21486,6 +21443,7 @@
           l.forEach(m => {
             if (m.messageType === MessageTypes.RECALL && RecallMessageStore.has(m.content.messageUId)) {
               RecallMessageStore.remove(m.content.messageUId);
+              recallMessageUIds.push(m.content.messageUId);
             } else {
               m.isOffLineMessage = isOffLineMessage;
               if (!m.messageId || m.messageId > getCurrentMessageId()) {

package/package.json

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