@onyx-p/imlib-web 1.7.0 → 1.7.3

package/index.esm.js

@@ -134,6 +134,7 @@ var Events;
   Events["PULL_OFFLINE_MESSAGE_FINISHED"] = "PULL_OFFLINE_MESSAGE_FINISHED";
   Events["CONVERSATION"] = "CONVERSATION";
   Events["PUSH"] = "PUSH";
+  Events["RECALL"] = "RECALL";
 })(Events || (Events = {}));
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -19019,7 +19020,7 @@ class ConversationStore {
     }
     if (messageType === MessageTypes.RECALL && conversationType === ConversationType.GROUP) {
       const recallContent = content;
-      const index = localMentionedUIdList.indexOf(recallContent.msgId.toString());
+      const index = localMentionedUIdList.indexOf(recallContent.messageUId.toString());
       if (index >= 0) {
         localMentionedUIdList.splice(index, 1);
       }
@@ -19644,7 +19645,6 @@ const parseSingleDialogMessages = (dialogId, originalMessageList, aesKey) => {
     return [];
   }
   const localConversation = ConversationManager$1.get().get(conversation);
-  const recallMessageUIds = new Set();
   let contentList = [];
   originalMessageList.forEach(item => {
     const dialogMessage = item;
@@ -19661,7 +19661,6 @@ const parseSingleDialogMessages = (dialogId, originalMessageList, aesKey) => {
       };
       mediaConstructor = MessageTypes.RECALL;
       mediaAttributeJson = recallContent;
-      recallMessageUIds.add(msgId);
     }
     const messageInstance = decodeMessage(mediaConstructor, mediaAttributeJson);
     if (isDef(messageInstance)) {
@@ -19690,9 +19689,6 @@ const parseSingleDialogMessages = (dialogId, originalMessageList, aesKey) => {
       contentList.push(receivedMessage);
     }
   });
-  if (recallMessageUIds.size) {
-    contentList = contentList.filter(e => !recallMessageUIds.has(e.messageUId));
-  }
   return contentList;
 };
 const decodeMessageContent = (dialogMessage, aesKey) => {
@@ -19718,11 +19714,12 @@ const decodeMessageContent = (dialogMessage, aesKey) => {
 };
 const parseMediaAttributeJson = (mediaConstructor, mediaAttribute, msgPostContent) => {
   let mediaAttributeJson = {};
-  if (mediaAttribute?.length) {
-    mediaAttributeJson = JSON.parse(mediaAttribute);
-  }
   if (mediaConstructor == MessageTypes.TEXT && msgPostContent) {
     mediaAttributeJson.content = msgPostContent;
+  } else {
+    if (mediaAttribute?.length) {
+      mediaAttributeJson = JSON.parse(mediaAttribute);
+    }
   }
   return mediaAttributeJson;
 };
@@ -19861,9 +19858,10 @@ class MessageLoader {
     await ConversationManager$1.get().loadConvsationsIfNotExist(cons);
     serverMessageParser.parse(msg, (done, outputMsgs) => {
       const messages = [];
+      const recallMessageIndexes = [];
       const isOffLineMessage = !this.pullOfflineFinished;
       outputMsgs.forEach((l, dialogId) => {
-        const messageList = [];
+        let messageList = [];
         l.forEach(m => {
           if (m.messageDirection === MessageDirection.SEND && m.messageId && SentMessageStore.has(m.messageId)) {
             SentMessageStore.remove(m.messageId);
@@ -19873,12 +19871,33 @@ class MessageLoader {
             m.isOffLineMessage = isOffLineMessage;
             ConversationManager$1.get().setConversationCacheByMessage(m);
             messageList.push(m);
+            if (m.messageType === MessageTypes.RECALL) {
+              recallMessageIndexes.push(messageList.length - 1);
+            }
           }
         });
+        let recallMessageUIds = [];
+        let deletedMessageIndexes = [];
+        for (let i = recallMessageIndexes.length - 1; i >= 0; i--) {
+          const index = recallMessageIndexes[i];
+          const recallMessage = messageList[index];
+          const recallContent = recallMessage.content;
+          const messageIndex = messageList.findIndex(m => m.messageUId === recallContent.messageUId);
+          if (messageIndex !== -1) {
+            deletedMessageIndexes.push(messageIndex);
+          } else {
+            recallMessageUIds.push(recallContent.messageUId);
+            deletedMessageIndexes.push(index);
+          }
+        }
+        messageList = messageList.filter((m, index) => !deletedMessageIndexes.includes(index));
         messages.push(...messageList);
         if (this.isExistPersistedMessage(messageList)) {
           splitFullDialog(dialogId);
         }
+        if (recallMessageUIds.length) {
+          this.watcher.onRecall?.(recallMessageUIds);
+        }
       });
       if (messages.length) {
         this.watcher.batchMessage?.(messages);
@@ -19973,7 +19992,8 @@ class LibLoader {
       pullFinished: undefined,
       batchMessage: undefined,
       conversationState: undefined,
-      onPush: undefined
+      onPush: undefined,
+      onRecall: undefined
     };
     webSocketServer.setServerInfo(this.getWebSocketUrl());
     webSocketServer.setCallback({
@@ -27438,6 +27458,11 @@ class IMClient extends EventEmitter {
           cmdId,
           body
         });
+      },
+      onRecall: messageUids => {
+        messageUids.forEach(messageUId => {
+          this.emit(Events.RECALL, messageUId);
+        });
       }
     });
   }

package/index.umd.js

@@ -140,6 +140,7 @@
     Events["PULL_OFFLINE_MESSAGE_FINISHED"] = "PULL_OFFLINE_MESSAGE_FINISHED";
     Events["CONVERSATION"] = "CONVERSATION";
     Events["PUSH"] = "PUSH";
+    Events["RECALL"] = "RECALL";
   })(exports.Events || (exports.Events = {}));
 
   var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -19025,7 +19026,7 @@
       }
       if (messageType === MessageTypes.RECALL && conversationType === exports.ConversationType.GROUP) {
         const recallContent = content;
-        const index = localMentionedUIdList.indexOf(recallContent.msgId.toString());
+        const index = localMentionedUIdList.indexOf(recallContent.messageUId.toString());
         if (index >= 0) {
           localMentionedUIdList.splice(index, 1);
         }
@@ -19650,7 +19651,6 @@
       return [];
     }
     const localConversation = ConversationManager$1.get().get(conversation);
-    const recallMessageUIds = new Set();
     let contentList = [];
     originalMessageList.forEach(item => {
       const dialogMessage = item;
@@ -19667,7 +19667,6 @@
         };
         mediaConstructor = MessageTypes.RECALL;
         mediaAttributeJson = recallContent;
-        recallMessageUIds.add(msgId);
       }
       const messageInstance = decodeMessage(mediaConstructor, mediaAttributeJson);
       if (isDef(messageInstance)) {
@@ -19696,9 +19695,6 @@
         contentList.push(receivedMessage);
       }
     });
-    if (recallMessageUIds.size) {
-      contentList = contentList.filter(e => !recallMessageUIds.has(e.messageUId));
-    }
     return contentList;
   };
   const decodeMessageContent = (dialogMessage, aesKey) => {
@@ -19724,11 +19720,12 @@
   };
   const parseMediaAttributeJson = (mediaConstructor, mediaAttribute, msgPostContent) => {
     let mediaAttributeJson = {};
-    if (mediaAttribute?.length) {
-      mediaAttributeJson = JSON.parse(mediaAttribute);
-    }
     if (mediaConstructor == MessageTypes.TEXT && msgPostContent) {
       mediaAttributeJson.content = msgPostContent;
+    } else {
+      if (mediaAttribute?.length) {
+        mediaAttributeJson = JSON.parse(mediaAttribute);
+      }
     }
     return mediaAttributeJson;
   };
@@ -19867,9 +19864,10 @@
       await ConversationManager$1.get().loadConvsationsIfNotExist(cons);
       serverMessageParser.parse(msg, (done, outputMsgs) => {
         const messages = [];
+        const recallMessageIndexes = [];
         const isOffLineMessage = !this.pullOfflineFinished;
         outputMsgs.forEach((l, dialogId) => {
-          const messageList = [];
+          let messageList = [];
           l.forEach(m => {
             if (m.messageDirection === exports.MessageDirection.SEND && m.messageId && SentMessageStore.has(m.messageId)) {
               SentMessageStore.remove(m.messageId);
@@ -19879,12 +19877,33 @@
               m.isOffLineMessage = isOffLineMessage;
               ConversationManager$1.get().setConversationCacheByMessage(m);
               messageList.push(m);
+              if (m.messageType === MessageTypes.RECALL) {
+                recallMessageIndexes.push(messageList.length - 1);
+              }
             }
           });
+          let recallMessageUIds = [];
+          let deletedMessageIndexes = [];
+          for (let i = recallMessageIndexes.length - 1; i >= 0; i--) {
+            const index = recallMessageIndexes[i];
+            const recallMessage = messageList[index];
+            const recallContent = recallMessage.content;
+            const messageIndex = messageList.findIndex(m => m.messageUId === recallContent.messageUId);
+            if (messageIndex !== -1) {
+              deletedMessageIndexes.push(messageIndex);
+            } else {
+              recallMessageUIds.push(recallContent.messageUId);
+              deletedMessageIndexes.push(index);
+            }
+          }
+          messageList = messageList.filter((m, index) => !deletedMessageIndexes.includes(index));
           messages.push(...messageList);
           if (this.isExistPersistedMessage(messageList)) {
             splitFullDialog(dialogId);
           }
+          if (recallMessageUIds.length) {
+            this.watcher.onRecall?.(recallMessageUIds);
+          }
         });
         if (messages.length) {
           this.watcher.batchMessage?.(messages);
@@ -19979,7 +19998,8 @@
         pullFinished: undefined,
         batchMessage: undefined,
         conversationState: undefined,
-        onPush: undefined
+        onPush: undefined,
+        onRecall: undefined
       };
       webSocketServer.setServerInfo(this.getWebSocketUrl());
       webSocketServer.setCallback({
@@ -27444,6 +27464,11 @@
             cmdId,
             body
           });
+        },
+        onRecall: messageUids => {
+          messageUids.forEach(messageUId => {
+            this.emit(exports.Events.RECALL, messageUId);
+          });
         }
       });
     }

package/package.json

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

package/types/types.d.ts

@@ -38,7 +38,8 @@ export declare enum Events {
     MESSAGES = "MESSAGES",
     PULL_OFFLINE_MESSAGE_FINISHED = "PULL_OFFLINE_MESSAGE_FINISHED",
     CONVERSATION = "CONVERSATION",
-    PUSH = "PUSH"
+    PUSH = "PUSH",
+    RECALL = "RECALL"
 }
 export type EventListeners = {
     [Events.CONNECTING]: () => void;
@@ -56,6 +57,7 @@ export type EventListeners = {
         cmdId: number;
         body: Uint8Array;
     }) => void;
+    [Events.RECALL]: (messageUId: string) => void;
 };
 export interface IBaseConversationInfo {
     conversationType: ConversationType;