npm - @onyx-p/imlib-web - Versions diffs - 1.7.7 → 1.7.8 - Mend

@onyx-p/imlib-web 1.7.7 → 1.7.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/index.esm.js CHANGED Viewed

@@ -20457,17 +20457,17 @@ class MessageReceiptManager {
       return acc;
     }, {})).map(([conversationId, messageIds]) => ({
       destId: Long.fromString(conversationId),
-      msgIds: messageIds
+      msgId: messageIds.map(id => Long.fromString(id))
     }));
     const groupReceiptMessages = groupMessages.reduce((acc, msg) => {
       const existingGroup = acc.find(g => g.groupId.equals(Long.fromString(msg.targetId)) && g.userId.equals(Long.fromString(msg.senderUserId)));
       if (existingGroup) {
-        existingGroup.msgIds.push(msg.messageUId);
+        existingGroup.msgId.push(Long.fromString(msg.messageUId));
       } else {
         acc.push({
           groupId: Long.fromString(msg.targetId),
           userId: Long.fromString(msg.senderUserId),
-          msgIds: [msg.messageUId]
+          msgId: [Long.fromString(msg.messageUId)]
         });
       }
       return acc;
@@ -20671,11 +20671,11 @@ class MessageLoader {
           this.watcher.onRecall?.(recallMessageUIds);
         }
       });
-      if (messages.length) {
-        let normalMessages = this.handleReceiptMessages(messages);
+      let normalMessages = this.handleReceiptMessages(messages);
+      if (normalMessages.length) {
         this.watcher.batchMessage?.(normalMessages);
+        MessageReceiptManager$1.get()?.sendArrivalReceipts(normalMessages);
       }
-      MessageReceiptManager$1.get()?.sendArrivalReceipts(messages);
       if (done) {
         if (seqno.ge(this.serverMsgSeqno)) {
           this.serverMsgSeqno = seqno;
@@ -20695,37 +20695,42 @@ class MessageLoader {
     });
   }
   handleReceiptMessages(messages) {
-    const normalMessages = [];
-    const receiptnotificationMessages = [];
-    messages.forEach(msg => {
-      if (msg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || msg.messageType === NotiMessageTypes.GROUP_READ_RECEIPT || msg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT || msg.messageType === NotiMessageTypes.PRIVATE_READ_RECEIPT) {
-        receiptnotificationMessages.push(msg);
-      } else {
-        normalMessages.push(msg);
-      }
-    });
-    const sentMessages = normalMessages.filter(m => m.messageDirection === MessageDirection.SEND);
-    receiptnotificationMessages.forEach(notiMsg => {
-      const notiContent = notiMsg.content;
-      const isArrivalReceipt = notiMsg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || notiMsg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT;
-      sentMessages.forEach(msg => {
-        if (notiContent.msgIdList.includes(msg.messageUId)) {
-          if (isArrivalReceipt) {
-            msg.receivedStatus = ReceivedStatus.RECEIVED;
-          } else {
-            msg.receivedStatus = ReceivedStatus.READ;
-          }
+    try {
+      const normalMessages = [];
+      const receiptnotificationMessages = [];
+      messages.forEach(msg => {
+        if (msg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || msg.messageType === NotiMessageTypes.GROUP_READ_RECEIPT || msg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT || msg.messageType === NotiMessageTypes.PRIVATE_READ_RECEIPT) {
+          receiptnotificationMessages.push(msg);
+        } else {
+          normalMessages.push(msg);
         }
       });
-      this.watcher.onReceiptReceived?.({
-        conversation: {
-          conversationType: notiMsg.conversationType,
-          targetId: notiMsg.targetId
-        },
-        messageUIdList: notiContent.msgIdList
-      }, notiMsg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || notiMsg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT ? 0 : 1);
-    });
-    return normalMessages;
+      const sentMessages = normalMessages.filter(m => m.messageDirection === MessageDirection.SEND);
+      receiptnotificationMessages.forEach(notiMsg => {
+        const notiContent = notiMsg.content;
+        const isArrivalReceipt = notiMsg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || notiMsg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT;
+        sentMessages.forEach(msg => {
+          if (notiContent.msgIdList.includes(msg.messageUId)) {
+            if (isArrivalReceipt) {
+              msg.receivedStatus = ReceivedStatus.RECEIVED;
+            } else {
+              msg.receivedStatus = ReceivedStatus.READ;
+            }
+          }
+        });
+        this.watcher.onReceiptReceived?.({
+          conversation: {
+            conversationType: notiMsg.conversationType,
+            targetId: notiMsg.targetId
+          },
+          messageUIdList: notiContent.msgIdList
+        }, notiMsg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || notiMsg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT ? 0 : 1);
+      });
+      return normalMessages;
+    } catch (error) {
+      logger.error('handleReceiptMessages error', error);
+      return [];
+    }
   }
   isExistPersistedMessage(messageList) {
     return messageList.some(m => m.isPersited);

package/index.umd.js CHANGED Viewed

@@ -20463,17 +20463,17 @@
         return acc;
       }, {})).map(([conversationId, messageIds]) => ({
         destId: Long.fromString(conversationId),
-        msgIds: messageIds
+        msgId: messageIds.map(id => Long.fromString(id))
       }));
       const groupReceiptMessages = groupMessages.reduce((acc, msg) => {
         const existingGroup = acc.find(g => g.groupId.equals(Long.fromString(msg.targetId)) && g.userId.equals(Long.fromString(msg.senderUserId)));
         if (existingGroup) {
-          existingGroup.msgIds.push(msg.messageUId);
+          existingGroup.msgId.push(Long.fromString(msg.messageUId));
         } else {
           acc.push({
             groupId: Long.fromString(msg.targetId),
             userId: Long.fromString(msg.senderUserId),
-            msgIds: [msg.messageUId]
+            msgId: [Long.fromString(msg.messageUId)]
           });
         }
         return acc;
@@ -20677,11 +20677,11 @@
             this.watcher.onRecall?.(recallMessageUIds);
           }
         });
-        if (messages.length) {
-          let normalMessages = this.handleReceiptMessages(messages);
+        let normalMessages = this.handleReceiptMessages(messages);
+        if (normalMessages.length) {
           this.watcher.batchMessage?.(normalMessages);
+          MessageReceiptManager$1.get()?.sendArrivalReceipts(normalMessages);
         }
-        MessageReceiptManager$1.get()?.sendArrivalReceipts(messages);
         if (done) {
           if (seqno.ge(this.serverMsgSeqno)) {
             this.serverMsgSeqno = seqno;
@@ -20701,37 +20701,42 @@
       });
     }
     handleReceiptMessages(messages) {
-      const normalMessages = [];
-      const receiptnotificationMessages = [];
-      messages.forEach(msg => {
-        if (msg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || msg.messageType === NotiMessageTypes.GROUP_READ_RECEIPT || msg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT || msg.messageType === NotiMessageTypes.PRIVATE_READ_RECEIPT) {
-          receiptnotificationMessages.push(msg);
-        } else {
-          normalMessages.push(msg);
-        }
-      });
-      const sentMessages = normalMessages.filter(m => m.messageDirection === exports.MessageDirection.SEND);
-      receiptnotificationMessages.forEach(notiMsg => {
-        const notiContent = notiMsg.content;
-        const isArrivalReceipt = notiMsg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || notiMsg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT;
-        sentMessages.forEach(msg => {
-          if (notiContent.msgIdList.includes(msg.messageUId)) {
-            if (isArrivalReceipt) {
-              msg.receivedStatus = exports.ReceivedStatus.RECEIVED;
-            } else {
-              msg.receivedStatus = exports.ReceivedStatus.READ;
-            }
+      try {
+        const normalMessages = [];
+        const receiptnotificationMessages = [];
+        messages.forEach(msg => {
+          if (msg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || msg.messageType === NotiMessageTypes.GROUP_READ_RECEIPT || msg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT || msg.messageType === NotiMessageTypes.PRIVATE_READ_RECEIPT) {
+            receiptnotificationMessages.push(msg);
+          } else {
+            normalMessages.push(msg);
           }
         });
-        this.watcher.onReceiptReceived?.({
-          conversation: {
-            conversationType: notiMsg.conversationType,
-            targetId: notiMsg.targetId
-          },
-          messageUIdList: notiContent.msgIdList
-        }, notiMsg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || notiMsg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT ? 0 : 1);
-      });
-      return normalMessages;
+        const sentMessages = normalMessages.filter(m => m.messageDirection === exports.MessageDirection.SEND);
+        receiptnotificationMessages.forEach(notiMsg => {
+          const notiContent = notiMsg.content;
+          const isArrivalReceipt = notiMsg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || notiMsg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT;
+          sentMessages.forEach(msg => {
+            if (notiContent.msgIdList.includes(msg.messageUId)) {
+              if (isArrivalReceipt) {
+                msg.receivedStatus = exports.ReceivedStatus.RECEIVED;
+              } else {
+                msg.receivedStatus = exports.ReceivedStatus.READ;
+              }
+            }
+          });
+          this.watcher.onReceiptReceived?.({
+            conversation: {
+              conversationType: notiMsg.conversationType,
+              targetId: notiMsg.targetId
+            },
+            messageUIdList: notiContent.msgIdList
+          }, notiMsg.messageType === NotiMessageTypes.GROUP_ARRIVAL_RECEIPT || notiMsg.messageType === NotiMessageTypes.PRIVATE_ARRIVAL_RECEIPT ? 0 : 1);
+        });
+        return normalMessages;
+      } catch (error) {
+        logger.error('handleReceiptMessages error', error);
+        return [];
+      }
     }
     isExistPersistedMessage(messageList) {
       return messageList.some(m => m.isPersited);

package/package.json CHANGED Viewed

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