@onyx-p/imlib-web 1.6.9 → 1.7.1

package/index.esm.js

@@ -19657,7 +19657,7 @@ const parseSingleDialogMessages = (dialogId, originalMessageList, aesKey) => {
         sendTime
       } = mediaAttributeJson;
       const recallContent = {
-        msgId: msgId
+        messageUId: msgId
       };
       mediaConstructor = MessageTypes.RECALL;
       mediaAttributeJson = recallContent;
@@ -19697,6 +19697,7 @@ const parseSingleDialogMessages = (dialogId, originalMessageList, aesKey) => {
 };
 const decodeMessageContent = (dialogMessage, aesKey) => {
   try {
+    debugger;
     let mediaAttribute;
     if (dialogMessage.mediaAttribute?.length) {
       mediaAttribute = aes256Decrypt(dialogMessage.mediaAttribute, aesKey);
@@ -19718,11 +19719,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;
 };
@@ -19999,6 +20001,7 @@ class LibLoader {
     registerMessage(MessageTypes.AUDIO, VoiceMessage);
     registerMessage(MessageTypes.FILE, FileMessage);
     registerMessage(MessageTypes.VIDEO, VideoMessage);
+    registerMessage(MessageTypes.RECALL, RecallCommandMessage);
     let LocationMessage = registerMessageType$1(MessageTypes.LOCATION, true, true, false);
     let ChatRecordMessage = registerMessageType$1(MessageTypes.CHAT_RECORD, true, true, false);
     let ContactMessage = registerMessageType$1(MessageTypes.CONTACT, true, true, false);
@@ -27186,7 +27189,7 @@ const sendRecallMessage = async (conversation, options) => {
     };
   }
   const recallCommandMessage = new RecallCommandMessage({
-    msgId: options.messageUId
+    messageUId: options.messageUId
   });
   const sentAttris = {
     conversation,
@@ -27335,6 +27338,7 @@ async function send(message, sentArgs) {
       ...baseParams,
       groupId: Long.fromString(dialogId)
     };
+    debugger;
     if (isDef(message.content.mentionedInfo)) {
       const mentionedInfo = message.content.mentionedInfo;
       if (mentionedInfo.type === MentionedType.ALL) ; else if (mentionedInfo.type === MentionedType.SINGAL && mentionedInfo.userIdList?.length) {
@@ -28844,7 +28848,6 @@ const sendSightMessage = async (conversation, msgBody, hooks, sendOptions) => {
 };
 const recallMessage = async (conversation, options) => {
   assert('options.messageUId', options.messageUId, AssertRules.STRING, true);
-  assert('options.sentTime', options.sentTime, AssertRules.NUMBER, true);
   assert('conversation', conversation, AssertRules.CONVERSATION, true);
   const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId + ',messageUId:' + options.messageUId;
   logger.debug('recall message ->' + paramsStr);
@@ -28944,4 +28947,4 @@ const _logSendError = (conversation, errorCode) => {
   }
 };
 
-export { ConnectionStatus, ConversationType, ErrorCode, ErrorDesc, Events, FileMessage, GIFMessage, VoiceMessage as HQVoiceMessage, ImageMessage, LogLevel, MentionedType, MessageDirection, MessageTypes, NotificationLevel, NotificationStatus, ReceivedStatus, SentStatus, TextMessage, VideoMessage, addEventListener, clearAllMessagesUnreadStatus, clearHistoryMessages, clearMessagesUnreadStatus, clearTextMessageDraft, connect, deleteMessages, disconnect, getAllConversationState, getAllUnreadMentionedCount, getBlockedConversationList, getConnectionStatus, getConversation, getConversationList, getConversationNotificationLevel, getConversationNotificationStatus, getConversationState, getHistoryMessages, getRemoteHistoryMessages, getServerTime, getTextMessageDraft, getTopConversationList, getTotalUnreadCount, getUnreadCount, getUnreadMentionedCount, init, logOut, mockLogin, onceEventListener, parseChatRecordMsgDetails, recallMessage, registerMessageType, removeConversation, removeEventListener, request, saveTextMessageDraft, sendFileMessage, sendGIFMessage, sendHQVoiceMessage, sendImageMessage, sendMessage, sendSightMessage, sendTextMessage, setConversationNotificationStatus, setConversationToTop, setUserLogged };
+export { ConnectionStatus, ConversationType, ErrorCode, ErrorDesc, Events, FileMessage, GIFMessage, VoiceMessage as HQVoiceMessage, ImageMessage, LogLevel, MentionedType, MessageDirection, MessageTypes, NotificationLevel, NotificationStatus, RecallCommandMessage, ReceivedStatus, SentStatus, TextMessage, VideoMessage, addEventListener, clearAllMessagesUnreadStatus, clearHistoryMessages, clearMessagesUnreadStatus, clearTextMessageDraft, connect, deleteMessages, disconnect, getAllConversationState, getAllUnreadMentionedCount, getBlockedConversationList, getConnectionStatus, getConversation, getConversationList, getConversationNotificationLevel, getConversationNotificationStatus, getConversationState, getHistoryMessages, getRemoteHistoryMessages, getServerTime, getTextMessageDraft, getTopConversationList, getTotalUnreadCount, getUnreadCount, getUnreadMentionedCount, init, logOut, mockLogin, onceEventListener, parseChatRecordMsgDetails, recallMessage, registerMessageType, removeConversation, removeEventListener, request, saveTextMessageDraft, sendFileMessage, sendGIFMessage, sendHQVoiceMessage, sendImageMessage, sendMessage, sendSightMessage, sendTextMessage, setConversationNotificationStatus, setConversationToTop, setUserLogged };

package/index.umd.js

@@ -19663,7 +19663,7 @@
           sendTime
         } = mediaAttributeJson;
         const recallContent = {
-          msgId: msgId
+          messageUId: msgId
         };
         mediaConstructor = MessageTypes.RECALL;
         mediaAttributeJson = recallContent;
@@ -19703,6 +19703,7 @@
   };
   const decodeMessageContent = (dialogMessage, aesKey) => {
     try {
+      debugger;
       let mediaAttribute;
       if (dialogMessage.mediaAttribute?.length) {
         mediaAttribute = aes256Decrypt(dialogMessage.mediaAttribute, aesKey);
@@ -19724,11 +19725,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;
   };
@@ -20005,6 +20007,7 @@
       registerMessage(MessageTypes.AUDIO, VoiceMessage);
       registerMessage(MessageTypes.FILE, FileMessage);
       registerMessage(MessageTypes.VIDEO, VideoMessage);
+      registerMessage(MessageTypes.RECALL, RecallCommandMessage);
       let LocationMessage = registerMessageType$1(MessageTypes.LOCATION, true, true, false);
       let ChatRecordMessage = registerMessageType$1(MessageTypes.CHAT_RECORD, true, true, false);
       let ContactMessage = registerMessageType$1(MessageTypes.CONTACT, true, true, false);
@@ -27192,7 +27195,7 @@
       };
     }
     const recallCommandMessage = new RecallCommandMessage({
-      msgId: options.messageUId
+      messageUId: options.messageUId
     });
     const sentAttris = {
       conversation,
@@ -27341,6 +27344,7 @@
         ...baseParams,
         groupId: Long.fromString(dialogId)
       };
+      debugger;
       if (isDef(message.content.mentionedInfo)) {
         const mentionedInfo = message.content.mentionedInfo;
         if (mentionedInfo.type === exports.MentionedType.ALL) ; else if (mentionedInfo.type === exports.MentionedType.SINGAL && mentionedInfo.userIdList?.length) {
@@ -28850,7 +28854,6 @@
   };
   const recallMessage = async (conversation, options) => {
     assert('options.messageUId', options.messageUId, AssertRules.STRING, true);
-    assert('options.sentTime', options.sentTime, AssertRules.NUMBER, true);
     assert('conversation', conversation, AssertRules.CONVERSATION, true);
     const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId + ',messageUId:' + options.messageUId;
     logger.debug('recall message ->' + paramsStr);
@@ -28956,6 +28959,7 @@
   exports.HQVoiceMessage = VoiceMessage;
   exports.ImageMessage = ImageMessage;
   exports.MessageTypes = MessageTypes;
+  exports.RecallCommandMessage = RecallCommandMessage;
   exports.TextMessage = TextMessage;
   exports.VideoMessage = VideoMessage;
   exports.addEventListener = addEventListener;

package/package.json

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

package/types/index.d.ts

@@ -7,7 +7,7 @@ import IReceivedConversation from './model/iReceivedConversation';
 import { CommonReqResult, PBCodec } from './net/connection/webSocketServer';
 import { BaseResp } from './net/pbs/rpc.base';
 import { IChatRecordMsgDetail } from './model/messages/otherMediaMessages';
-export { TextMessage, ImageMessage, HQVoiceMessage, GIFMessage, FileMessage, VideoMessage } from './model/messages';
+export { TextMessage, ImageMessage, HQVoiceMessage, GIFMessage, FileMessage, VideoMessage, RecallCommandMessage } from './model/messages';
 export type { ITextMessageBody, IImageMessageBody, IGIFMessageBody, IFileMessageBody, IHQVoiceMessageBody, IRecallCommandMessageBody, IVideoMessageBody, ILocationMessageBody, IChatRecordMessageBody, IContactMessageBody, IInvitationMessageBody, IRedEnvelopeMessageBody, ITransferMessageBody } from './model/messages';
 export { MessageTypes } from './constants/messageTypes';
 export type { IBaseMessageBody, IReceivedMessage, IReceivedConversation };

package/types/model/messages/recallCommandMessage.d.ts

@@ -3,7 +3,7 @@ import { IBaseMessageBody } from "../baseMessage";
  *  撤回通知消息（被撤回消息摘要）
  */
 export interface IRecallCommandMessageBody extends IBaseMessageBody {
-    msgId: string;
+    messageUId: string;
 }
 declare const RecallCommandMessage: new (content: IRecallCommandMessageBody) => import("../baseMessage").BaseMessage<IRecallCommandMessageBody>;
 export default RecallCommandMessage;

package/types/types.d.ts

@@ -1,6 +1,6 @@
 import { BaseMessage, IExtraData, IUserInfo } from './model/baseMessage';
 import IReceivedMessage from './model/iReceivedMessage';
-import { ConnectionStatus, ConversationType, ErrorCode, IUserProfile, MessageDirection, NotificationLevel, NotificationStatus } from './model/statusTypes';
+import { ConnectionStatus, ConversationType, ErrorCode, MessageDirection, NotificationLevel, NotificationStatus } from './model/statusTypes';
 import IReceivedConversation from './model/iReceivedConversation';
 export declare enum LogLevel {
     DEBUG = 0,
@@ -185,31 +185,9 @@ export interface IThumbnailConfig {
  */
 export interface IRecallMessageOptions {
     /**
-     * 消息的唯一id，客户端依赖此属性查找要撤回的消息
+     * 消息的唯一id，服务端依赖此属性删除要撤回的消息
      */
     messageUId: string;
-    /**
-     * 消息发送时间，服务端依赖此属性查找要撤回的消息
-     */
-    sentTime: string;
-    /**
-     * 撤回消息携带用户信息
-     */
-    user?: IUserProfile;
-    /**
-     * 是否发送静默消息
-     * @description
-     * 当值为 `true` 时，服务器将不会发送 Push 信息，移动端也不会弹出本地通知提醒
-     */
-    disableNotification?: boolean;
-    /**
-     * 撤回消息携带扩展信息
-     */
-    extra?: string;
-    /**
-     * 是否删除原始消息(在移动端会使用到)，为 true 时移动端会不显示小灰条提示
-     */
-    isDelete?: boolean;
 }
 /**
  * 获取远程消息 option 参数