@onyx-p/imlib-web 1.5.2 → 1.5.4

package/index.esm.js

@@ -18934,26 +18934,61 @@ const decodeMessageContent = (dialogMessage, aesKey) => {
     if (dialogMessage.mediaConstructor === 0x60010012 || dialogMessage.mediaConstructor === 0x60020021) {
       mediaAttribute = transMsgIdNum64ToString(mediaAttribute);
     }
-    let mediaAttributeJson = {};
-    if (mediaAttribute?.length) {
-      mediaAttributeJson = JSON.parse(mediaAttribute);
-    }
-    if (dialogMessage.mediaConstructor == MessageTypes.TEXT && msgPostContent) {
-      mediaAttributeJson.content = msgPostContent;
-    }
-    return mediaAttributeJson;
+    return parseMediaAttributeJson(dialogMessage.mediaConstructor, mediaAttribute, msgPostContent);
   } catch (error) {
     logger.error('decode message content fail -> uid:', dialogMessage.msgId.toString());
     return null;
   }
 };
+const parseMediaAttributeJson = (mediaConstructor, mediaAttribute, msgPostContent) => {
+  let mediaAttributeJson = {};
+  if (mediaAttribute?.length) {
+    mediaAttributeJson = JSON.parse(mediaAttribute);
+  }
+  if (mediaConstructor == MessageTypes.TEXT && msgPostContent) {
+    mediaAttributeJson.content = msgPostContent;
+  }
+  return mediaAttributeJson;
+};
+const parseChatRecordMsgDetails$1 = (conversationOpt, msgDetails) => {
+  let contentList = [];
+  msgDetails.forEach(item => {
+    const mediaAttributeJson = parseMediaAttributeJson(item.mediaConstructor, item.mediaAttribute, item.msgPostContent);
+    if (!mediaAttributeJson) return;
+    const messageInstance = decodeMessage(item.mediaConstructor, mediaAttributeJson);
+    if (isDef(messageInstance)) {
+      const receivedMessage = {
+        ...conversationOpt,
+        senderUserId: item.srcId.toString(),
+        messageDirection: item.srcId == accountStore.uid ? MessageDirection.SEND : MessageDirection.RECEIVE,
+        isCounted: messageInstance.isCounted,
+        isMentioned: false,
+        content: messageInstance.content,
+        messageType: messageInstance.messageType,
+        isOffLineMessage: false,
+        isPersited: messageInstance.isPersited,
+        messageId: item.msgId + '',
+        messageUId: item.msgId + '',
+        sentTime: item.msgSendTime + '',
+        sentStatus: SentStatus.SENT,
+        receivedTime: item.msgSendTime + '',
+        isStatusMessage: messageInstance.isStatusMessage,
+        receivedStatus: ReceivedStatus.READ,
+        disableNotification: false
+      };
+      contentList.push(receivedMessage);
+    }
+  });
+  return contentList;
+};
 const transMsgIdNum64ToString = jsonString => {
   const reg = /("msgId")\s*:\s*(\d+)/g;
   return jsonString.replace(reg, (r1, r2, r3) => `${r2}:"${r3}"`);
 };
-var ServerMessageParser = {
+var serverMessageParser = {
   parse,
-  parseSingleDialogMessages
+  parseSingleDialogMessages,
+  parseChatRecordMsgDetails: parseChatRecordMsgDetails$1
 };
 
 function deepClone(obj) {
@@ -19564,6 +19599,31 @@ class ConversationManager {
     });
     return totalUnreadCount;
   }
+  getConversationState(conOpt) {
+    let val = this.get(conOpt);
+    if (val) {
+      let {
+        unreadMessageCount,
+        unreadMentionedCount,
+        notificationLevel,
+        notificationStatus,
+        isTop,
+        dialogTitle,
+        smallAvatarUrl
+      } = val;
+      return {
+        ...conOpt,
+        unreadCount: unreadMessageCount,
+        unreadMentionedCount: unreadMentionedCount ?? 0,
+        notificationLevel,
+        notificationStatus,
+        isTop,
+        dialogTitle,
+        smallAvatarUrl
+      };
+    }
+    return null;
+  }
   getAllConversationState() {
     const localConversations = this.store.getAll();
     return localConversations.map(({
@@ -19629,6 +19689,9 @@ const nullConversationManager = {
   getAllUnreadMentionedCount: function () {
     return 0;
   },
+  getConversationState(conOpt) {
+    return null;
+  },
   getAllConversationState: function () {
     return [];
   },
@@ -19741,7 +19804,7 @@ class MessageLoader {
       };
     });
     await ConversationManager$1.get().loadConvsationsIfNotExist(cons);
-    ServerMessageParser.parse(msg, (done, outputMsgs) => {
+    serverMessageParser.parse(msg, (done, outputMsgs) => {
       const messages = [];
       const conversations = [];
       const isOffLineMessage = !this.pullOfflineFinished;
@@ -19886,6 +19949,18 @@ class LibLoader {
     registerMessage(MessageTypes.AUDIO, VoiceMessage);
     registerMessage(MessageTypes.FILE, FileMessage);
     registerMessage(MessageTypes.VIDEO, VideoMessage);
+    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);
+    let InvitationMessage = registerMessageType$1(MessageTypes.GROUP_INVITATION, true, true, false);
+    let RedEnvelopeMessage = registerMessageType$1(MessageTypes.REDPACKET, true, true, false);
+    let TransferMessage = registerMessageType$1(MessageTypes.TRANSFER, true, true, false);
+    registerMessage(MessageTypes.LOCATION, LocationMessage);
+    registerMessage(MessageTypes.CHAT_RECORD, ChatRecordMessage);
+    registerMessage(MessageTypes.CONTACT, ContactMessage);
+    registerMessage(MessageTypes.GROUP_INVITATION, InvitationMessage);
+    registerMessage(MessageTypes.REDPACKET, RedEnvelopeMessage);
+    registerMessage(MessageTypes.TRANSFER, TransferMessage);
   }
   async connect() {
     if (this.connectionStatus === ConnectionStatus.CONNECTED) {
@@ -27367,7 +27442,7 @@ class IMClient extends EventEmitter {
           });
           return;
         }
-        ServerMessageParser.parse({
+        serverMessageParser.parse({
           [dialogId]: data.msg ?? {}
         }, (_, outputMsgs) => {
           const messageList = outputMsgs.get(dialogId) ?? [];
@@ -27481,6 +27556,9 @@ class IMClient extends EventEmitter {
     const totalUnreadCount = ConversationManager$1.get().getAllUnreadMentionedCount();
     return totalUnreadCount;
   }
+  getConversationState(conOpt) {
+    return ConversationManager$1.get().getConversationState(conOpt);
+  }
   getAllConversationState() {
     return ConversationManager$1.get().getAllConversationState();
   }
@@ -27552,7 +27630,7 @@ class IMClient extends EventEmitter {
       return;
     }
     if (isDef(msg)) {
-      const latestMessage = ServerMessageParser.parseSingleDialogMessages(dialogId.toString(), [msg], aesKey)[0];
+      const latestMessage = serverMessageParser.parseSingleDialogMessages(dialogId.toString(), [msg], aesKey)[0];
       conversationObj.latestMessage = latestMessage;
     }
     return conversationObj;
@@ -28535,6 +28613,19 @@ const getAllUnreadMentionedCount = () => {
     data: count
   });
 };
+const getConversationState = options => {
+  logger.debug('getConversationState');
+  const state = imClient.getConversationState(options);
+  if (state) {
+    return Promise.resolve({
+      code: ErrorCode.SUCCESS,
+      data: state
+    });
+  }
+  return Promise.resolve({
+    code: ErrorCode.UNKNOWN
+  });
+};
 const getAllConversationState = () => {
   logger.debug('getAllConversationState');
   const states = imClient.getAllConversationState();
@@ -28804,6 +28895,9 @@ const clearHistoryMessages = async (conversation, timestamp) => {
     code: ErrorCode.SUCCESS
   };
 };
+const parseChatRecordMsgDetails = (conversation, detailItems) => {
+  return serverMessageParser.parseChatRecordMsgDetails(conversation, detailItems);
+};
 const mockLogin = config => {
   return login(config);
 };
@@ -28818,4 +28912,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, getHistoryMessages, getRemoteHistoryMessages, getServerTime, getTextMessageDraft, getTopConversationList, getTotalUnreadCount, getUnreadCount, getUnreadMentionedCount, init, logOut, mockLogin, onceEventListener, 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, 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

@@ -18940,26 +18940,61 @@
       if (dialogMessage.mediaConstructor === 0x60010012 || dialogMessage.mediaConstructor === 0x60020021) {
         mediaAttribute = transMsgIdNum64ToString(mediaAttribute);
       }
-      let mediaAttributeJson = {};
-      if (mediaAttribute?.length) {
-        mediaAttributeJson = JSON.parse(mediaAttribute);
-      }
-      if (dialogMessage.mediaConstructor == MessageTypes.TEXT && msgPostContent) {
-        mediaAttributeJson.content = msgPostContent;
-      }
-      return mediaAttributeJson;
+      return parseMediaAttributeJson(dialogMessage.mediaConstructor, mediaAttribute, msgPostContent);
     } catch (error) {
       logger.error('decode message content fail -> uid:', dialogMessage.msgId.toString());
       return null;
     }
   };
+  const parseMediaAttributeJson = (mediaConstructor, mediaAttribute, msgPostContent) => {
+    let mediaAttributeJson = {};
+    if (mediaAttribute?.length) {
+      mediaAttributeJson = JSON.parse(mediaAttribute);
+    }
+    if (mediaConstructor == MessageTypes.TEXT && msgPostContent) {
+      mediaAttributeJson.content = msgPostContent;
+    }
+    return mediaAttributeJson;
+  };
+  const parseChatRecordMsgDetails$1 = (conversationOpt, msgDetails) => {
+    let contentList = [];
+    msgDetails.forEach(item => {
+      const mediaAttributeJson = parseMediaAttributeJson(item.mediaConstructor, item.mediaAttribute, item.msgPostContent);
+      if (!mediaAttributeJson) return;
+      const messageInstance = decodeMessage(item.mediaConstructor, mediaAttributeJson);
+      if (isDef(messageInstance)) {
+        const receivedMessage = {
+          ...conversationOpt,
+          senderUserId: item.srcId.toString(),
+          messageDirection: item.srcId == accountStore.uid ? exports.MessageDirection.SEND : exports.MessageDirection.RECEIVE,
+          isCounted: messageInstance.isCounted,
+          isMentioned: false,
+          content: messageInstance.content,
+          messageType: messageInstance.messageType,
+          isOffLineMessage: false,
+          isPersited: messageInstance.isPersited,
+          messageId: item.msgId + '',
+          messageUId: item.msgId + '',
+          sentTime: item.msgSendTime + '',
+          sentStatus: exports.SentStatus.SENT,
+          receivedTime: item.msgSendTime + '',
+          isStatusMessage: messageInstance.isStatusMessage,
+          receivedStatus: exports.ReceivedStatus.READ,
+          disableNotification: false
+        };
+        contentList.push(receivedMessage);
+      }
+    });
+    return contentList;
+  };
   const transMsgIdNum64ToString = jsonString => {
     const reg = /("msgId")\s*:\s*(\d+)/g;
     return jsonString.replace(reg, (r1, r2, r3) => `${r2}:"${r3}"`);
   };
-  var ServerMessageParser = {
+  var serverMessageParser = {
     parse,
-    parseSingleDialogMessages
+    parseSingleDialogMessages,
+    parseChatRecordMsgDetails: parseChatRecordMsgDetails$1
   };
 
   function deepClone(obj) {
@@ -19570,6 +19605,31 @@
       });
       return totalUnreadCount;
     }
+    getConversationState(conOpt) {
+      let val = this.get(conOpt);
+      if (val) {
+        let {
+          unreadMessageCount,
+          unreadMentionedCount,
+          notificationLevel,
+          notificationStatus,
+          isTop,
+          dialogTitle,
+          smallAvatarUrl
+        } = val;
+        return {
+          ...conOpt,
+          unreadCount: unreadMessageCount,
+          unreadMentionedCount: unreadMentionedCount ?? 0,
+          notificationLevel,
+          notificationStatus,
+          isTop,
+          dialogTitle,
+          smallAvatarUrl
+        };
+      }
+      return null;
+    }
     getAllConversationState() {
       const localConversations = this.store.getAll();
       return localConversations.map(({
@@ -19635,6 +19695,9 @@
     getAllUnreadMentionedCount: function () {
       return 0;
     },
+    getConversationState(conOpt) {
+      return null;
+    },
     getAllConversationState: function () {
       return [];
     },
@@ -19747,7 +19810,7 @@
         };
       });
       await ConversationManager$1.get().loadConvsationsIfNotExist(cons);
-      ServerMessageParser.parse(msg, (done, outputMsgs) => {
+      serverMessageParser.parse(msg, (done, outputMsgs) => {
         const messages = [];
         const conversations = [];
         const isOffLineMessage = !this.pullOfflineFinished;
@@ -19892,6 +19955,18 @@
       registerMessage(MessageTypes.AUDIO, VoiceMessage);
       registerMessage(MessageTypes.FILE, FileMessage);
       registerMessage(MessageTypes.VIDEO, VideoMessage);
+      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);
+      let InvitationMessage = registerMessageType$1(MessageTypes.GROUP_INVITATION, true, true, false);
+      let RedEnvelopeMessage = registerMessageType$1(MessageTypes.REDPACKET, true, true, false);
+      let TransferMessage = registerMessageType$1(MessageTypes.TRANSFER, true, true, false);
+      registerMessage(MessageTypes.LOCATION, LocationMessage);
+      registerMessage(MessageTypes.CHAT_RECORD, ChatRecordMessage);
+      registerMessage(MessageTypes.CONTACT, ContactMessage);
+      registerMessage(MessageTypes.GROUP_INVITATION, InvitationMessage);
+      registerMessage(MessageTypes.REDPACKET, RedEnvelopeMessage);
+      registerMessage(MessageTypes.TRANSFER, TransferMessage);
     }
     async connect() {
       if (this.connectionStatus === exports.ConnectionStatus.CONNECTED) {
@@ -27373,7 +27448,7 @@
             });
             return;
           }
-          ServerMessageParser.parse({
+          serverMessageParser.parse({
             [dialogId]: data.msg ?? {}
           }, (_, outputMsgs) => {
             const messageList = outputMsgs.get(dialogId) ?? [];
@@ -27487,6 +27562,9 @@
       const totalUnreadCount = ConversationManager$1.get().getAllUnreadMentionedCount();
       return totalUnreadCount;
     }
+    getConversationState(conOpt) {
+      return ConversationManager$1.get().getConversationState(conOpt);
+    }
     getAllConversationState() {
       return ConversationManager$1.get().getAllConversationState();
     }
@@ -27558,7 +27636,7 @@
         return;
       }
       if (isDef(msg)) {
-        const latestMessage = ServerMessageParser.parseSingleDialogMessages(dialogId.toString(), [msg], aesKey)[0];
+        const latestMessage = serverMessageParser.parseSingleDialogMessages(dialogId.toString(), [msg], aesKey)[0];
         conversationObj.latestMessage = latestMessage;
       }
       return conversationObj;
@@ -28541,6 +28619,19 @@
       data: count
     });
   };
+  const getConversationState = options => {
+    logger.debug('getConversationState');
+    const state = imClient.getConversationState(options);
+    if (state) {
+      return Promise.resolve({
+        code: exports.ErrorCode.SUCCESS,
+        data: state
+      });
+    }
+    return Promise.resolve({
+      code: exports.ErrorCode.UNKNOWN
+    });
+  };
   const getAllConversationState = () => {
     logger.debug('getAllConversationState');
     const states = imClient.getAllConversationState();
@@ -28810,6 +28901,9 @@
       code: exports.ErrorCode.SUCCESS
     };
   };
+  const parseChatRecordMsgDetails = (conversation, detailItems) => {
+    return serverMessageParser.parseChatRecordMsgDetails(conversation, detailItems);
+  };
   const mockLogin = config => {
     return login(config);
   };
@@ -28848,6 +28942,7 @@
   exports.getConversationList = getConversationList;
   exports.getConversationNotificationLevel = getConversationNotificationLevel;
   exports.getConversationNotificationStatus = getConversationNotificationStatus;
+  exports.getConversationState = getConversationState;
   exports.getHistoryMessages = getHistoryMessages;
   exports.getRemoteHistoryMessages = getRemoteHistoryMessages;
   exports.getServerTime = getServerTime;
@@ -28860,6 +28955,7 @@
   exports.logOut = logOut;
   exports.mockLogin = mockLogin;
   exports.onceEventListener = onceEventListener;
+  exports.parseChatRecordMsgDetails = parseChatRecordMsgDetails;
   exports.recallMessage = recallMessage;
   exports.registerMessageType = registerMessageType;
   exports.removeConversation = removeConversation;

package/package.json

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

package/types/index.d.ts

@@ -6,6 +6,7 @@ import IReceivedMessage from './model/iReceivedMessage';
 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 type { ITextMessageBody, IImageMessageBody, IGIFMessageBody, IFileMessageBody, IHQVoiceMessageBody, IRecallCommandMessageBody, IVideoMessageBody, ILocationMessageBody, IChatRecordMessageBody, IContactMessageBody, IInvitationMessageBody, IRedEnvelopeMessageBody, ITransferMessageBody } from './model/messages';
 export { MessageTypes } from './constants/messageTypes';
@@ -97,6 +98,10 @@ export declare const getUnreadMentionedCount: (options: IConversationOption) =>
  * 获取所有群会话 @ 消息未读数
  */
 export declare const getAllUnreadMentionedCount: () => IPromiseResult<number>;
+/**
+ * 获取本地单个会话的状态
+ */
+export declare const getConversationState: (options: IConversationOption) => IPromiseResult<IConversationState>;
 /**
  * 获取本地全部会话的状态
  * @description
@@ -222,6 +227,7 @@ export declare const deleteMessages: (conversation: IConversationOption, message
  * @param timestamp 清除时间点, 该时间之前的消息将被清除
  */
 export declare const clearHistoryMessages: (conversation: IConversationOption, timestamp: number) => IPromiseResult<void>;
+export declare const parseChatRecordMsgDetails: (conversation: IConversationOption, detailItems: IChatRecordMsgDetail[]) => IReceivedMessage[];
 export declare const mockLogin: (config: {
     langCode: string;
     phone: string;

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

@@ -18,6 +18,18 @@ export interface IChatRecordMessageBody {
     }>;
     encryptKey?: string;
 }
+export interface IChatRecordMsgDetail {
+    senderNickname: string;
+    senderAvatar?: string;
+    msgId: string;
+    srcId: string;
+    destId: string;
+    msgPreContent?: string;
+    msgPostContent?: string;
+    mediaConstructor: number;
+    mediaAttribute?: string;
+    msgSendTime: string;
+}
 export interface IContactMessageBody {
     uid: string;
     nickname: string;