@onyx-p/imlib-web 1.3.5 → 1.3.6

package/index.esm.js

@@ -17560,11 +17560,6 @@ const SendGroupChatMessageReq = $root.SendGroupChatMessageReq = (() => {
    * @property {number|null} [mediaConstructor] SendGroupChatMessageReq mediaConstructor
    * @property {string|null} [mediaAttribute] SendGroupChatMessageReq mediaAttribute
    * @property {Array.<Long>|null} [at] SendGroupChatMessageReq at
-   * @property {string|null} [extra] SendGroupChatMessageReq extra
-   * @property {string|null} [assign] SendGroupChatMessageReq assign
-   * @property {boolean|null} [atAll] SendGroupChatMessageReq atAll
-   * @property {Uint8Array|null} [msgContent] SendGroupChatMessageReq msgContent
-   * @property {string|null} [pushContent] SendGroupChatMessageReq pushContent
    */
 
   /**
@@ -17644,46 +17639,6 @@ const SendGroupChatMessageReq = $root.SendGroupChatMessageReq = (() => {
    */
   SendGroupChatMessageReq.prototype.at = $util.emptyArray;
 
-  /**
-   * SendGroupChatMessageReq extra.
-   * @member {string} extra
-   * @memberof SendGroupChatMessageReq
-   * @instance
-   */
-  SendGroupChatMessageReq.prototype.extra = "";
-
-  /**
-   * SendGroupChatMessageReq assign.
-   * @member {string} assign
-   * @memberof SendGroupChatMessageReq
-   * @instance
-   */
-  SendGroupChatMessageReq.prototype.assign = "";
-
-  /**
-   * SendGroupChatMessageReq atAll.
-   * @member {boolean} atAll
-   * @memberof SendGroupChatMessageReq
-   * @instance
-   */
-  SendGroupChatMessageReq.prototype.atAll = false;
-
-  /**
-   * SendGroupChatMessageReq msgContent.
-   * @member {Uint8Array} msgContent
-   * @memberof SendGroupChatMessageReq
-   * @instance
-   */
-  SendGroupChatMessageReq.prototype.msgContent = $util.newBuffer([]);
-
-  /**
-   * SendGroupChatMessageReq pushContent.
-   * @member {string} pushContent
-   * @memberof SendGroupChatMessageReq
-   * @instance
-   */
-  SendGroupChatMessageReq.prototype.pushContent = "";
-
   /**
    * Encodes the specified SendGroupChatMessageReq message. Does not implicitly {@link SendGroupChatMessageReq.verify|verify} messages.
    * @function encode
@@ -17707,11 +17662,6 @@ const SendGroupChatMessageReq = $root.SendGroupChatMessageReq = (() => {
       for (let i = 0; i < message.at.length; ++i) writer.int64(message.at[i]);
       writer.ldelim();
     }
-    if (message.extra != null && Object.hasOwnProperty.call(message, "extra")) writer.uint32(/* id 9, wireType 2 =*/74).string(message.extra);
-    if (message.assign != null && Object.hasOwnProperty.call(message, "assign")) writer.uint32(/* id 10, wireType 2 =*/82).string(message.assign);
-    if (message.atAll != null && Object.hasOwnProperty.call(message, "atAll")) writer.uint32(/* id 11, wireType 0 =*/88).bool(message.atAll);
-    if (message.msgContent != null && Object.hasOwnProperty.call(message, "msgContent")) writer.uint32(/* id 12, wireType 2 =*/98).bytes(message.msgContent);
-    if (message.pushContent != null && Object.hasOwnProperty.call(message, "pushContent")) writer.uint32(/* id 13, wireType 2 =*/106).string(message.pushContent);
     return writer;
   };
 
@@ -17777,31 +17727,6 @@ const SendGroupChatMessageReq = $root.SendGroupChatMessageReq = (() => {
             } else message.at.push(reader.int64());
             break;
           }
-        case 9:
-          {
-            message.extra = reader.string();
-            break;
-          }
-        case 10:
-          {
-            message.assign = reader.string();
-            break;
-          }
-        case 11:
-          {
-            message.atAll = reader.bool();
-            break;
-          }
-        case 12:
-          {
-            message.msgContent = reader.bytes();
-            break;
-          }
-        case 13:
-          {
-            message.pushContent = reader.string();
-            break;
-          }
         default:
           reader.skipType(tag & 7);
           break;
@@ -18716,6 +18641,24 @@ var RecallMessageStore = {
   }
 };
 
+const MessageStores = new Map();
+function registerMessage(messageType, messageConstructor) {
+  MessageStores.set(messageType, messageConstructor);
+}
+function decodeMessage(messageType, messageData) {
+  const MessageConstructor = MessageStores.get(messageType);
+  if (!MessageConstructor) {
+    console.warn(`No message constructor found for type: ${messageType}`);
+    return null;
+  }
+  try {
+    return new MessageConstructor(messageData);
+  } catch (error) {
+    console.error(`Failed to decode message type ${messageType}:`, error);
+    return null;
+  }
+}
+
 class DialogSecretKey {
   aesKeyRecord = new Map();
   async getDialogAesKey(dialogId) {
@@ -18780,7 +18723,7 @@ class DialogSecretKey {
     const {
       code,
       data
-    } = await getDialogKey(dialogIdList);
+    } = await getDialogKey(dialogIdList.map(e => Long.fromString(e)));
     if (code === ErrorCode.SUCCESS) {
       const content = new Map();
       for (const k in data.entry) {
@@ -18790,9 +18733,8 @@ class DialogSecretKey {
             key: v.aesKey,
             iv: v.aesIV
           };
-          let kLong = Long.fromString(k);
-          content.set(kLong, keyItem);
-          this.aesKeyRecord.set(kLong, keyItem);
+          content.set(k, keyItem);
+          this.aesKeyRecord.set(k, keyItem);
         }
       }
       return content;
@@ -18839,15 +18781,16 @@ class Letterbox {
 
 const aes256Encrypt = (message, secretKey) => {
   if (!notEmptyString(message)) {
-    return new Uint8Array();
+    return '';
   }
   const encryptedData = CryptoJS.AES.encrypt(message, CryptoJS.enc.Utf8.parse(secretKey.key), {
     iv: isDef(secretKey.iv) ? CryptoJS.enc.Utf8.parse(secretKey.iv) : undefined
   });
-  return wordToUInt8Array(encryptedData.ciphertext.words);
+  return Array.from(wordToUInt8Array(encryptedData.ciphertext.words)).map(byte => byte.toString(16).padStart(2, '0')).join('');
 };
-const aes256Decrypt = (cipherString, secretKey) => {
-  const srcs = cipherString;
+const aes256Decrypt = (cipherHex, secretKey) => {
+  const cipherData = new Uint8Array(cipherHex.match(/.{1,2}/g)?.map(byte => parseInt(byte, 16)) || []);
+  const srcs = window.btoa(String.fromCharCode(...cipherData));
   const decrypt = CryptoJS.AES.decrypt(srcs, CryptoJS.enc.Utf8.parse(secretKey.key), {
     iv: isDef(secretKey.iv) ? CryptoJS.enc.Utf8.parse(secretKey.iv) : undefined
   });
@@ -18865,13 +18808,6 @@ const wordToUInt8Array = wordArray => {
   return new Uint8Array(array);
 };
 
-const MessageSerializers = new Map();
-function decodeMessage(objectId, messageData) {
-  const decodeFunc = MessageSerializers.get(objectId);
-  const messageObject = decodeFunc ? decodeFunc(messageData) : null;
-  return messageObject;
-}
-
 const MessageTypes = {
   TEXT: 0x00000000,
   IMAGE: 0x10001000,
@@ -18892,7 +18828,7 @@ function parse(orginalMsgs, callback) {
   Object.keys(orginalMsgs).forEach(dialogId => {
     const arr = orginalMsgs[dialogId].dialogMessage?.filter(m => !m.sharingGroupFlag);
     if (arr?.length) {
-      msgs.set(Long.fromString(dialogId), arr);
+      msgs.set(dialogId, arr);
     }
   });
   if (!msgs.size) {
@@ -18956,7 +18892,7 @@ const parseSingleDialogMessages = (dialogId, originalMessageList, aesKey) => {
         isCounted: messageInstance.isCounted,
         isMentioned: dialogMessage.atFlag,
         content: messageInstance.content,
-        messageType: messageInstance.objectId,
+        messageType: messageInstance.messageType,
         isOffLineMessage: false,
         isPersited: messageInstance.isPersited,
         messageId: Long.isLong(dialogMessage.localId) ? dialogMessage.localId : undefined,
@@ -18982,11 +18918,15 @@ const parseSingleDialogMessages = (dialogId, originalMessageList, aesKey) => {
 const decodeMessageContent = (dialogMessage, aesKey) => {
   try {
     let mediaAttribute;
-    if (dialogMessage.msgPreContent?.length) {
+    if (dialogMessage.mediaAttribute?.length) {
       mediaAttribute = aes256Decrypt(dialogMessage.mediaAttribute, aesKey);
     } else {
       mediaAttribute = dialogMessage.msgPreContent ?? '';
     }
+    let msgPostContent;
+    if (dialogMessage.msgPostContent?.length) {
+      msgPostContent = aes256Decrypt(dialogMessage.msgPostContent, aesKey);
+    }
     if (dialogMessage.mediaConstructor === 0x60010012 || dialogMessage.mediaConstructor === 0x60020021) {
       mediaAttribute = transMsgIdNum64ToString(mediaAttribute);
     }
@@ -18994,6 +18934,9 @@ const decodeMessageContent = (dialogMessage, aesKey) => {
     if (mediaAttribute?.length) {
       mediaAttributeJson = JSON.parse(mediaAttribute);
     }
+    if (dialogMessage.mediaConstructor == MessageTypes.TEXT && msgPostContent) {
+      mediaAttributeJson.content = msgPostContent;
+    }
     return mediaAttributeJson;
   } catch (error) {
     logger.error('decode message content fail -> uid:', dialogMessage.msgId.toString());
@@ -19808,6 +19751,44 @@ class MessageLoader {
   }
 }
 
+class BaseMessage {
+  messageType;
+  content;
+  isPersited;
+  isCounted;
+  isStatusMessage;
+  constructor(messageType, content, isPersited = true, isCounted = true, isStatusMessage = false) {
+    this.messageType = messageType;
+    this.content = content;
+    if (isStatusMessage) {
+      this.isPersited = false;
+      this.isCounted = false;
+    } else {
+      this.isPersited = isPersited;
+      this.isCounted = isCounted;
+    }
+    this.isStatusMessage = isStatusMessage;
+  }
+}
+const registerMessageType$1 = (messageType, isPersited, isCounted, isStatusMessage) => {
+  const defined = function (content) {
+    return new BaseMessage(messageType, content, isPersited, isCounted, isStatusMessage);
+  };
+  return defined;
+};
+
+const TextMessage = registerMessageType$1(MessageTypes.TEXT, true, true, false);
+
+const ImageMessage = registerMessageType$1(MessageTypes.IMAGE, true, true, false);
+
+const GIFMessage = registerMessageType$1(MessageTypes.GIF, true, true, false);
+
+const VoiceMessage = registerMessageType$1(MessageTypes.AUDIO, true, true, false);
+
+const FileMessage = registerMessageType$1(MessageTypes.FILE, true, true, false);
+
+const RecallCommandMessage = registerMessageType$1(MessageTypes.RECALL, true, false, false);
+
 const DEFAULT_SOCKET_URI = 'wss://imweb.mp.net:6443';
 class LibLoader {
   options;
@@ -19854,7 +19835,13 @@ class LibLoader {
     }
     return DEFAULT_SOCKET_URI;
   }
-  registerMessage() {}
+  registerMessage() {
+    registerMessage(MessageTypes.TEXT, TextMessage);
+    registerMessage(MessageTypes.IMAGE, ImageMessage);
+    registerMessage(MessageTypes.GIF, GIFMessage);
+    registerMessage(MessageTypes.AUDIO, VoiceMessage);
+    registerMessage(MessageTypes.FILE, FileMessage);
+  }
   async connect() {
     if (this.connectionStatus === ConnectionStatus.CONNECTED) {
       return {
@@ -26534,56 +26521,6 @@ function requireProtobufjs () {
 var protobufjsExports = requireProtobufjs();
 var protobuf = /*@__PURE__*/getDefaultExportFromCjs(protobufjsExports);
 
-class BaseMessage {
-  messageType;
-  content;
-  isPersited;
-  isCounted;
-  isStatusMessage;
-  constructor(messageType, content, isPersited = true, isCounted = true, isStatusMessage = false) {
-    this.messageType = messageType;
-    this.content = content;
-    if (isStatusMessage) {
-      this.isPersited = false;
-      this.isCounted = false;
-    } else {
-      this.isPersited = isPersited;
-      this.isCounted = isCounted;
-    }
-    this.isStatusMessage = isStatusMessage;
-  }
-  get objectId() {
-    return this.constructor.getObjectId();
-  }
-  static getObjectId() {
-    throw new Error('Method not implemented.');
-  }
-  static decode(aDecoder) {
-    throw new Error('Method not implemented.');
-  }
-  encode() {
-    throw new Error('Method not implemented.');
-  }
-}
-const registerMessageType$1 = (messageType, isPersited, isCounted, isStatusMessage) => {
-  const defined = function (content) {
-    return new BaseMessage(messageType, content, isPersited, isCounted, isStatusMessage);
-  };
-  return defined;
-};
-
-const TextMessage = registerMessageType$1(MessageTypes.TEXT, true, true, false);
-
-const ImageMessage = registerMessageType$1(MessageTypes.IMAGE, true, true, false);
-
-const GIFMessage = registerMessageType$1(MessageTypes.GIF, true, true, false);
-
-const VoiceMessage = registerMessageType$1(MessageTypes.AUDIO, true, true, false);
-
-const FileMessage = registerMessageType$1(MessageTypes.FILE, true, true, false);
-
-const RecallCommandMessage = registerMessageType$1(MessageTypes.RECALL, true, false, false);
-
 const transSentAttrs2IReceivedMessage = (message, options, sentStatus = SentStatus.SENDING) => ({
   conversationType: options.conversation.conversationType,
   targetId: options.conversation.targetId,
@@ -26592,7 +26529,7 @@ const transSentAttrs2IReceivedMessage = (message, options, sentStatus = SentStat
   isCounted: message.isCounted,
   isMentioned: false,
   content: message.content,
-  messageType: message.objectId,
+  messageType: message.messageType,
   isOffLineMessage: false,
   isPersited: message.isPersited,
   messageId: options.messageId,
@@ -26617,7 +26554,11 @@ function generateMessageId() {
 
 const MAX_MESSAGE_CONTENT_BYTES = 80 * 1024;
 async function sendMessage$1(conversation, message, options) {
-  return internal_sendMessage(conversation, message, options);
+  let tmpConversation = conversation;
+  if (typeof tmpConversation.targetId === 'string') {
+    tmpConversation.targetId = Long.fromString(tmpConversation.targetId);
+  }
+  return internal_sendMessage(tmpConversation, message, options);
 }
 const sendRecallMessage = async (conversation, options) => {
   const dialogId = getFullDialogId(conversation);
@@ -26673,7 +26614,7 @@ function beforeSend(conversation, message, options) {
       code: ErrorCode.RC_NET_CHANNEL_INVALID
     };
   }
-  const mediaAttribute = JSON.stringify(filterNullProperty(message.encode()));
+  const mediaAttribute = JSON.stringify(filterNullProperty(message.content));
   if (getByteLength(mediaAttribute) > MAX_MESSAGE_CONTENT_BYTES) {
     return {
       code: ErrorCode.RC_MSG_CONTENT_EXCEED_LIMIT
@@ -26684,7 +26625,6 @@ function beforeSend(conversation, message, options) {
     senderUserId: accountStore.uid,
     messageId: options?.messageId ?? Long.fromNumber(generateMessageId()),
     sentTime: Long.fromNumber(getMessageSentTime()),
-    directionalUserIdList: options?.directionalUserIdList,
     pushConfig: options?.pushConfig
   };
   if (options?.onSendBefore) {
@@ -26701,7 +26641,7 @@ async function send(message, sentArgs) {
   const dialogId = getFullDialogId(sentArgs.conversation);
   const receivedMessage = transSentAttrs2IReceivedMessage(message, sentArgs);
   message.isPersited && ConversationManager$1.get().loadConvsationsIfNotExist([sentArgs.conversation]);
-  const secretKey = await DialogSecretKey$1.getDialogAesKey(dialogId);
+  const secretKey = await DialogSecretKey$1.getDialogAesKey(dialogId.toString());
   if (!secretKey) {
     receivedMessage.sentStatus = SentStatus.FAILED;
     return {
@@ -26709,19 +26649,26 @@ async function send(message, sentArgs) {
       data: receivedMessage
     };
   }
-  const mediaAttribute = JSON.stringify(filterNullProperty(message.encode()));
-  const encryptedData = aes256Encrypt(mediaAttribute, secretKey);
-  const pushConfig = encodePushConfig(sentArgs.pushConfig ?? {});
+  let postEncryptedString;
+  let mediaAttribute;
+  if (message.messageType === MessageTypes.TEXT) {
+    let content = message.content;
+    let textContent = message.content.content;
+    delete content.content;
+    postEncryptedString = aes256Encrypt(textContent, secretKey);
+    mediaAttribute = JSON.stringify(filterNullProperty(content));
+  } else {
+    mediaAttribute = JSON.stringify(filterNullProperty(message.content));
+  }
+  const mediaEncryptedString = aes256Encrypt(mediaAttribute, secretKey);
   SentMessageStore.addMessage(sentArgs.messageId);
   const baseParams = {
     localId: sentArgs.messageId,
     mediaFlag: false,
-    mediaConstructor: message.objectId,
-    mediaAttribute: '',
+    mediaConstructor: message.messageType,
     msgPreContent: '',
-    msgPostContent: '',
-    msgContent: encryptedData,
-    pushContent: pushConfig
+    msgPostContent: postEncryptedString,
+    mediaAttribute: mediaEncryptedString
   };
   let response;
   if (sentArgs.conversation.conversationType === ConversationType.GROUP) {
@@ -26729,14 +26676,9 @@ async function send(message, sentArgs) {
       ...baseParams,
       groupId: dialogId
     };
-    if (sentArgs?.directionalUserIdList?.length) {
-      groupParams.assign = sentArgs.directionalUserIdList.join(',');
-    }
     if (isDef(message.content.mentionedInfo)) {
       const mentionedInfo = message.content.mentionedInfo;
-      if (mentionedInfo.type === MentionedType.ALL) {
-        groupParams.atAll = true;
-      } else if (mentionedInfo.type === MentionedType.SINGAL && mentionedInfo.userIdList?.length) {
+      if (mentionedInfo.type === MentionedType.ALL) ; else if (mentionedInfo.type === MentionedType.SINGAL && mentionedInfo.userIdList?.length) {
         groupParams.at = mentionedInfo.userIdList.map(e => Long.fromString(e));
       }
     }
@@ -26770,25 +26712,6 @@ function getMessageSentTime() {
   }
   return UniqueSentTime;
 }
-function encodePushConfig(config) {
-  if (!isDef(config)) return null;
-  const obj = {};
-  if (notEmptyString(config.pushTitle)) {
-    obj.pushExt = {
-      title: config.pushTitle
-    };
-  }
-  if (notEmptyString(config.pushContent)) {
-    obj.pushContent = config.pushContent;
-  }
-  if (notEmptyString(config.pushData)) {
-    obj.pushData = config.pushData;
-  }
-  if (Object.keys(obj).length) {
-    return JSON.stringify(obj);
-  }
-  return null;
-}
 
 class IMClient extends EventEmitter {
   options;
@@ -26894,7 +26817,7 @@ class IMClient extends EventEmitter {
         ServerMessageParser.parse({
           [dialogId.toString()]: data.msg ?? {}
         }, (_, outputMsgs) => {
-          const messageList = outputMsgs.get(dialogId) ?? [];
+          const messageList = outputMsgs.get(dialogId.toString()) ?? [];
           messageList.sort((e1, e2) => e1.sentTime.lessThan(e2.sentTime) ? -1 : 1);
           resolve({
             code: ErrorCode.SUCCESS,
@@ -26930,7 +26853,7 @@ class IMClient extends EventEmitter {
       };
     }
     const dialogIdList = data.fullDialog.map(item => item.dialog?.destId).filter(isDef);
-    await DialogSecretKey$1.getDialogAesKeyList(dialogIdList);
+    await DialogSecretKey$1.getDialogAesKeyList(dialogIdList.map(e => e.toString()));
     const contentList = [];
     for (const dialogInfo of data.fullDialog) {
       const conversationObj = this.formatConversation(dialogInfo);
@@ -27071,11 +26994,11 @@ class IMClient extends EventEmitter {
     if (!conversationObj) {
       return;
     }
-    const aesKey = DialogSecretKey$1.getDialogAesKeyFromLocal(dialogId);
+    const aesKey = DialogSecretKey$1.getDialogAesKeyFromLocal(dialogId.toString());
     if (!aesKey) {
       return;
     }
-    const latestMessage = ServerMessageParser.parseSingleDialogMessages(dialogId, [msg], aesKey)[0];
+    const latestMessage = ServerMessageParser.parseSingleDialogMessages(dialogId.toString(), [msg], aesKey)[0];
     if (!latestMessage) {
       return;
     }
@@ -28172,7 +28095,9 @@ const registerMessageType = (messageType, isPersited, isCounted, isStatusMessage
   const defined = function (content) {
     return new BaseMessage(messageType, content, isPersited, isCounted, isStatusMessage);
   };
-  return defined;
+  let messageConstructor = defined;
+  registerMessage(messageType, messageConstructor);
+  return messageConstructor;
 };
 const sendMessage = async (conversation, message, options) => {
   if (message instanceof BaseMessage === false) {

package/index.umd.js

@@ -17566,11 +17566,6 @@
      * @property {number|null} [mediaConstructor] SendGroupChatMessageReq mediaConstructor
      * @property {string|null} [mediaAttribute] SendGroupChatMessageReq mediaAttribute
      * @property {Array.<Long>|null} [at] SendGroupChatMessageReq at
-     * @property {string|null} [extra] SendGroupChatMessageReq extra
-     * @property {string|null} [assign] SendGroupChatMessageReq assign
-     * @property {boolean|null} [atAll] SendGroupChatMessageReq atAll
-     * @property {Uint8Array|null} [msgContent] SendGroupChatMessageReq msgContent
-     * @property {string|null} [pushContent] SendGroupChatMessageReq pushContent
      */
 
     /**
@@ -17650,46 +17645,6 @@
      */
     SendGroupChatMessageReq.prototype.at = $util.emptyArray;
 
-    /**
-     * SendGroupChatMessageReq extra.
-     * @member {string} extra
-     * @memberof SendGroupChatMessageReq
-     * @instance
-     */
-    SendGroupChatMessageReq.prototype.extra = "";
-
-    /**
-     * SendGroupChatMessageReq assign.
-     * @member {string} assign
-     * @memberof SendGroupChatMessageReq
-     * @instance
-     */
-    SendGroupChatMessageReq.prototype.assign = "";
-
-    /**
-     * SendGroupChatMessageReq atAll.
-     * @member {boolean} atAll
-     * @memberof SendGroupChatMessageReq
-     * @instance
-     */
-    SendGroupChatMessageReq.prototype.atAll = false;
-
-    /**
-     * SendGroupChatMessageReq msgContent.
-     * @member {Uint8Array} msgContent
-     * @memberof SendGroupChatMessageReq
-     * @instance
-     */
-    SendGroupChatMessageReq.prototype.msgContent = $util.newBuffer([]);
-
-    /**
-     * SendGroupChatMessageReq pushContent.
-     * @member {string} pushContent
-     * @memberof SendGroupChatMessageReq
-     * @instance
-     */
-    SendGroupChatMessageReq.prototype.pushContent = "";
-
     /**
      * Encodes the specified SendGroupChatMessageReq message. Does not implicitly {@link SendGroupChatMessageReq.verify|verify} messages.
      * @function encode
@@ -17713,11 +17668,6 @@
         for (let i = 0; i < message.at.length; ++i) writer.int64(message.at[i]);
         writer.ldelim();
       }
-      if (message.extra != null && Object.hasOwnProperty.call(message, "extra")) writer.uint32(/* id 9, wireType 2 =*/74).string(message.extra);
-      if (message.assign != null && Object.hasOwnProperty.call(message, "assign")) writer.uint32(/* id 10, wireType 2 =*/82).string(message.assign);
-      if (message.atAll != null && Object.hasOwnProperty.call(message, "atAll")) writer.uint32(/* id 11, wireType 0 =*/88).bool(message.atAll);
-      if (message.msgContent != null && Object.hasOwnProperty.call(message, "msgContent")) writer.uint32(/* id 12, wireType 2 =*/98).bytes(message.msgContent);
-      if (message.pushContent != null && Object.hasOwnProperty.call(message, "pushContent")) writer.uint32(/* id 13, wireType 2 =*/106).string(message.pushContent);
       return writer;
     };
 
@@ -17783,31 +17733,6 @@
               } else message.at.push(reader.int64());
               break;
             }
-          case 9:
-            {
-              message.extra = reader.string();
-              break;
-            }
-          case 10:
-            {
-              message.assign = reader.string();
-              break;
-            }
-          case 11:
-            {
-              message.atAll = reader.bool();
-              break;
-            }
-          case 12:
-            {
-              message.msgContent = reader.bytes();
-              break;
-            }
-          case 13:
-            {
-              message.pushContent = reader.string();
-              break;
-            }
           default:
             reader.skipType(tag & 7);
             break;
@@ -18722,6 +18647,24 @@
     }
   };
 
+  const MessageStores = new Map();
+  function registerMessage(messageType, messageConstructor) {
+    MessageStores.set(messageType, messageConstructor);
+  }
+  function decodeMessage(messageType, messageData) {
+    const MessageConstructor = MessageStores.get(messageType);
+    if (!MessageConstructor) {
+      console.warn(`No message constructor found for type: ${messageType}`);
+      return null;
+    }
+    try {
+      return new MessageConstructor(messageData);
+    } catch (error) {
+      console.error(`Failed to decode message type ${messageType}:`, error);
+      return null;
+    }
+  }
+
   class DialogSecretKey {
     aesKeyRecord = new Map();
     async getDialogAesKey(dialogId) {
@@ -18786,7 +18729,7 @@
       const {
         code,
         data
-      } = await getDialogKey(dialogIdList);
+      } = await getDialogKey(dialogIdList.map(e => Long.fromString(e)));
       if (code === exports.ErrorCode.SUCCESS) {
         const content = new Map();
         for (const k in data.entry) {
@@ -18796,9 +18739,8 @@
               key: v.aesKey,
               iv: v.aesIV
             };
-            let kLong = Long.fromString(k);
-            content.set(kLong, keyItem);
-            this.aesKeyRecord.set(kLong, keyItem);
+            content.set(k, keyItem);
+            this.aesKeyRecord.set(k, keyItem);
           }
         }
         return content;
@@ -18845,15 +18787,16 @@
 
   const aes256Encrypt = (message, secretKey) => {
     if (!notEmptyString(message)) {
-      return new Uint8Array();
+      return '';
     }
     const encryptedData = CryptoJS.AES.encrypt(message, CryptoJS.enc.Utf8.parse(secretKey.key), {
       iv: isDef(secretKey.iv) ? CryptoJS.enc.Utf8.parse(secretKey.iv) : undefined
     });
-    return wordToUInt8Array(encryptedData.ciphertext.words);
+    return Array.from(wordToUInt8Array(encryptedData.ciphertext.words)).map(byte => byte.toString(16).padStart(2, '0')).join('');
   };
-  const aes256Decrypt = (cipherString, secretKey) => {
-    const srcs = cipherString;
+  const aes256Decrypt = (cipherHex, secretKey) => {
+    const cipherData = new Uint8Array(cipherHex.match(/.{1,2}/g)?.map(byte => parseInt(byte, 16)) || []);
+    const srcs = window.btoa(String.fromCharCode(...cipherData));
     const decrypt = CryptoJS.AES.decrypt(srcs, CryptoJS.enc.Utf8.parse(secretKey.key), {
       iv: isDef(secretKey.iv) ? CryptoJS.enc.Utf8.parse(secretKey.iv) : undefined
     });
@@ -18871,13 +18814,6 @@
     return new Uint8Array(array);
   };
 
-  const MessageSerializers = new Map();
-  function decodeMessage(objectId, messageData) {
-    const decodeFunc = MessageSerializers.get(objectId);
-    const messageObject = decodeFunc ? decodeFunc(messageData) : null;
-    return messageObject;
-  }
-
   const MessageTypes = {
     TEXT: 0x00000000,
     IMAGE: 0x10001000,
@@ -18898,7 +18834,7 @@
     Object.keys(orginalMsgs).forEach(dialogId => {
       const arr = orginalMsgs[dialogId].dialogMessage?.filter(m => !m.sharingGroupFlag);
       if (arr?.length) {
-        msgs.set(Long.fromString(dialogId), arr);
+        msgs.set(dialogId, arr);
       }
     });
     if (!msgs.size) {
@@ -18962,7 +18898,7 @@
           isCounted: messageInstance.isCounted,
           isMentioned: dialogMessage.atFlag,
           content: messageInstance.content,
-          messageType: messageInstance.objectId,
+          messageType: messageInstance.messageType,
           isOffLineMessage: false,
           isPersited: messageInstance.isPersited,
           messageId: Long.isLong(dialogMessage.localId) ? dialogMessage.localId : undefined,
@@ -18988,11 +18924,15 @@
   const decodeMessageContent = (dialogMessage, aesKey) => {
     try {
       let mediaAttribute;
-      if (dialogMessage.msgPreContent?.length) {
+      if (dialogMessage.mediaAttribute?.length) {
         mediaAttribute = aes256Decrypt(dialogMessage.mediaAttribute, aesKey);
       } else {
         mediaAttribute = dialogMessage.msgPreContent ?? '';
       }
+      let msgPostContent;
+      if (dialogMessage.msgPostContent?.length) {
+        msgPostContent = aes256Decrypt(dialogMessage.msgPostContent, aesKey);
+      }
       if (dialogMessage.mediaConstructor === 0x60010012 || dialogMessage.mediaConstructor === 0x60020021) {
         mediaAttribute = transMsgIdNum64ToString(mediaAttribute);
       }
@@ -19000,6 +18940,9 @@
       if (mediaAttribute?.length) {
         mediaAttributeJson = JSON.parse(mediaAttribute);
       }
+      if (dialogMessage.mediaConstructor == MessageTypes.TEXT && msgPostContent) {
+        mediaAttributeJson.content = msgPostContent;
+      }
       return mediaAttributeJson;
     } catch (error) {
       logger.error('decode message content fail -> uid:', dialogMessage.msgId.toString());
@@ -19814,6 +19757,44 @@
     }
   }
 
+  class BaseMessage {
+    messageType;
+    content;
+    isPersited;
+    isCounted;
+    isStatusMessage;
+    constructor(messageType, content, isPersited = true, isCounted = true, isStatusMessage = false) {
+      this.messageType = messageType;
+      this.content = content;
+      if (isStatusMessage) {
+        this.isPersited = false;
+        this.isCounted = false;
+      } else {
+        this.isPersited = isPersited;
+        this.isCounted = isCounted;
+      }
+      this.isStatusMessage = isStatusMessage;
+    }
+  }
+  const registerMessageType$1 = (messageType, isPersited, isCounted, isStatusMessage) => {
+    const defined = function (content) {
+      return new BaseMessage(messageType, content, isPersited, isCounted, isStatusMessage);
+    };
+    return defined;
+  };
+
+  const TextMessage = registerMessageType$1(MessageTypes.TEXT, true, true, false);
+
+  const ImageMessage = registerMessageType$1(MessageTypes.IMAGE, true, true, false);
+
+  const GIFMessage = registerMessageType$1(MessageTypes.GIF, true, true, false);
+
+  const VoiceMessage = registerMessageType$1(MessageTypes.AUDIO, true, true, false);
+
+  const FileMessage = registerMessageType$1(MessageTypes.FILE, true, true, false);
+
+  const RecallCommandMessage = registerMessageType$1(MessageTypes.RECALL, true, false, false);
+
   const DEFAULT_SOCKET_URI = 'wss://imweb.mp.net:6443';
   class LibLoader {
     options;
@@ -19860,7 +19841,13 @@
       }
       return DEFAULT_SOCKET_URI;
     }
-    registerMessage() {}
+    registerMessage() {
+      registerMessage(MessageTypes.TEXT, TextMessage);
+      registerMessage(MessageTypes.IMAGE, ImageMessage);
+      registerMessage(MessageTypes.GIF, GIFMessage);
+      registerMessage(MessageTypes.AUDIO, VoiceMessage);
+      registerMessage(MessageTypes.FILE, FileMessage);
+    }
     async connect() {
       if (this.connectionStatus === exports.ConnectionStatus.CONNECTED) {
         return {
@@ -26540,56 +26527,6 @@
   var protobufjsExports = requireProtobufjs();
   var protobuf = /*@__PURE__*/getDefaultExportFromCjs(protobufjsExports);
 
-  class BaseMessage {
-    messageType;
-    content;
-    isPersited;
-    isCounted;
-    isStatusMessage;
-    constructor(messageType, content, isPersited = true, isCounted = true, isStatusMessage = false) {
-      this.messageType = messageType;
-      this.content = content;
-      if (isStatusMessage) {
-        this.isPersited = false;
-        this.isCounted = false;
-      } else {
-        this.isPersited = isPersited;
-        this.isCounted = isCounted;
-      }
-      this.isStatusMessage = isStatusMessage;
-    }
-    get objectId() {
-      return this.constructor.getObjectId();
-    }
-    static getObjectId() {
-      throw new Error('Method not implemented.');
-    }
-    static decode(aDecoder) {
-      throw new Error('Method not implemented.');
-    }
-    encode() {
-      throw new Error('Method not implemented.');
-    }
-  }
-  const registerMessageType$1 = (messageType, isPersited, isCounted, isStatusMessage) => {
-    const defined = function (content) {
-      return new BaseMessage(messageType, content, isPersited, isCounted, isStatusMessage);
-    };
-    return defined;
-  };
-
-  const TextMessage = registerMessageType$1(MessageTypes.TEXT, true, true, false);
-
-  const ImageMessage = registerMessageType$1(MessageTypes.IMAGE, true, true, false);
-
-  const GIFMessage = registerMessageType$1(MessageTypes.GIF, true, true, false);
-
-  const VoiceMessage = registerMessageType$1(MessageTypes.AUDIO, true, true, false);
-
-  const FileMessage = registerMessageType$1(MessageTypes.FILE, true, true, false);
-
-  const RecallCommandMessage = registerMessageType$1(MessageTypes.RECALL, true, false, false);
-
   const transSentAttrs2IReceivedMessage = (message, options, sentStatus = exports.SentStatus.SENDING) => ({
     conversationType: options.conversation.conversationType,
     targetId: options.conversation.targetId,
@@ -26598,7 +26535,7 @@
     isCounted: message.isCounted,
     isMentioned: false,
     content: message.content,
-    messageType: message.objectId,
+    messageType: message.messageType,
     isOffLineMessage: false,
     isPersited: message.isPersited,
     messageId: options.messageId,
@@ -26623,7 +26560,11 @@
 
   const MAX_MESSAGE_CONTENT_BYTES = 80 * 1024;
   async function sendMessage$1(conversation, message, options) {
-    return internal_sendMessage(conversation, message, options);
+    let tmpConversation = conversation;
+    if (typeof tmpConversation.targetId === 'string') {
+      tmpConversation.targetId = Long.fromString(tmpConversation.targetId);
+    }
+    return internal_sendMessage(tmpConversation, message, options);
   }
   const sendRecallMessage = async (conversation, options) => {
     const dialogId = getFullDialogId(conversation);
@@ -26679,7 +26620,7 @@
         code: exports.ErrorCode.RC_NET_CHANNEL_INVALID
       };
     }
-    const mediaAttribute = JSON.stringify(filterNullProperty(message.encode()));
+    const mediaAttribute = JSON.stringify(filterNullProperty(message.content));
     if (getByteLength(mediaAttribute) > MAX_MESSAGE_CONTENT_BYTES) {
       return {
         code: exports.ErrorCode.RC_MSG_CONTENT_EXCEED_LIMIT
@@ -26690,7 +26631,6 @@
       senderUserId: accountStore.uid,
       messageId: options?.messageId ?? Long.fromNumber(generateMessageId()),
       sentTime: Long.fromNumber(getMessageSentTime()),
-      directionalUserIdList: options?.directionalUserIdList,
       pushConfig: options?.pushConfig
     };
     if (options?.onSendBefore) {
@@ -26707,7 +26647,7 @@
     const dialogId = getFullDialogId(sentArgs.conversation);
     const receivedMessage = transSentAttrs2IReceivedMessage(message, sentArgs);
     message.isPersited && ConversationManager$1.get().loadConvsationsIfNotExist([sentArgs.conversation]);
-    const secretKey = await DialogSecretKey$1.getDialogAesKey(dialogId);
+    const secretKey = await DialogSecretKey$1.getDialogAesKey(dialogId.toString());
     if (!secretKey) {
       receivedMessage.sentStatus = exports.SentStatus.FAILED;
       return {
@@ -26715,19 +26655,26 @@
         data: receivedMessage
       };
     }
-    const mediaAttribute = JSON.stringify(filterNullProperty(message.encode()));
-    const encryptedData = aes256Encrypt(mediaAttribute, secretKey);
-    const pushConfig = encodePushConfig(sentArgs.pushConfig ?? {});
+    let postEncryptedString;
+    let mediaAttribute;
+    if (message.messageType === MessageTypes.TEXT) {
+      let content = message.content;
+      let textContent = message.content.content;
+      delete content.content;
+      postEncryptedString = aes256Encrypt(textContent, secretKey);
+      mediaAttribute = JSON.stringify(filterNullProperty(content));
+    } else {
+      mediaAttribute = JSON.stringify(filterNullProperty(message.content));
+    }
+    const mediaEncryptedString = aes256Encrypt(mediaAttribute, secretKey);
     SentMessageStore.addMessage(sentArgs.messageId);
     const baseParams = {
       localId: sentArgs.messageId,
       mediaFlag: false,
-      mediaConstructor: message.objectId,
-      mediaAttribute: '',
+      mediaConstructor: message.messageType,
       msgPreContent: '',
-      msgPostContent: '',
-      msgContent: encryptedData,
-      pushContent: pushConfig
+      msgPostContent: postEncryptedString,
+      mediaAttribute: mediaEncryptedString
     };
     let response;
     if (sentArgs.conversation.conversationType === exports.ConversationType.GROUP) {
@@ -26735,14 +26682,9 @@
         ...baseParams,
         groupId: dialogId
       };
-      if (sentArgs?.directionalUserIdList?.length) {
-        groupParams.assign = sentArgs.directionalUserIdList.join(',');
-      }
       if (isDef(message.content.mentionedInfo)) {
         const mentionedInfo = message.content.mentionedInfo;
-        if (mentionedInfo.type === exports.MentionedType.ALL) {
-          groupParams.atAll = true;
-        } else if (mentionedInfo.type === exports.MentionedType.SINGAL && mentionedInfo.userIdList?.length) {
+        if (mentionedInfo.type === exports.MentionedType.ALL) ; else if (mentionedInfo.type === exports.MentionedType.SINGAL && mentionedInfo.userIdList?.length) {
           groupParams.at = mentionedInfo.userIdList.map(e => Long.fromString(e));
         }
       }
@@ -26776,25 +26718,6 @@
     }
     return UniqueSentTime;
   }
-  function encodePushConfig(config) {
-    if (!isDef(config)) return null;
-    const obj = {};
-    if (notEmptyString(config.pushTitle)) {
-      obj.pushExt = {
-        title: config.pushTitle
-      };
-    }
-    if (notEmptyString(config.pushContent)) {
-      obj.pushContent = config.pushContent;
-    }
-    if (notEmptyString(config.pushData)) {
-      obj.pushData = config.pushData;
-    }
-    if (Object.keys(obj).length) {
-      return JSON.stringify(obj);
-    }
-    return null;
-  }
 
   class IMClient extends EventEmitter {
     options;
@@ -26900,7 +26823,7 @@
           ServerMessageParser.parse({
             [dialogId.toString()]: data.msg ?? {}
           }, (_, outputMsgs) => {
-            const messageList = outputMsgs.get(dialogId) ?? [];
+            const messageList = outputMsgs.get(dialogId.toString()) ?? [];
             messageList.sort((e1, e2) => e1.sentTime.lessThan(e2.sentTime) ? -1 : 1);
             resolve({
               code: exports.ErrorCode.SUCCESS,
@@ -26936,7 +26859,7 @@
         };
       }
       const dialogIdList = data.fullDialog.map(item => item.dialog?.destId).filter(isDef);
-      await DialogSecretKey$1.getDialogAesKeyList(dialogIdList);
+      await DialogSecretKey$1.getDialogAesKeyList(dialogIdList.map(e => e.toString()));
       const contentList = [];
       for (const dialogInfo of data.fullDialog) {
         const conversationObj = this.formatConversation(dialogInfo);
@@ -27077,11 +27000,11 @@
       if (!conversationObj) {
         return;
       }
-      const aesKey = DialogSecretKey$1.getDialogAesKeyFromLocal(dialogId);
+      const aesKey = DialogSecretKey$1.getDialogAesKeyFromLocal(dialogId.toString());
       if (!aesKey) {
         return;
       }
-      const latestMessage = ServerMessageParser.parseSingleDialogMessages(dialogId, [msg], aesKey)[0];
+      const latestMessage = ServerMessageParser.parseSingleDialogMessages(dialogId.toString(), [msg], aesKey)[0];
       if (!latestMessage) {
         return;
       }
@@ -28178,7 +28101,9 @@
     const defined = function (content) {
       return new BaseMessage(messageType, content, isPersited, isCounted, isStatusMessage);
     };
-    return defined;
+    let messageConstructor = defined;
+    registerMessage(messageType, messageConstructor);
+    return messageConstructor;
   };
   const sendMessage = async (conversation, message, options) => {
     if (message instanceof BaseMessage === false) {

package/package.json

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

package/types/model/baseMessage.d.ts

@@ -44,9 +44,5 @@ export declare class BaseMessage<T extends IBaseMessageBody = any> {
     readonly isCounted: boolean;
     readonly isStatusMessage: boolean;
     constructor(messageType: number, content: T, isPersited?: boolean, isCounted?: boolean, isStatusMessage?: boolean);
-    get objectId(): number;
-    static getObjectId(): number;
-    static decode(aDecoder: MessageCodingData): BaseMessage<any>;
-    encode(): MessageCodingData;
 }
 export declare const registerMessageType: <T extends IBaseMessageBody>(messageType: number, isPersited: boolean, isCounted: boolean, isStatusMessage?: boolean) => new (content: T) => BaseMessage<T>;

package/types/types.d.ts

@@ -109,10 +109,6 @@ export type IPushConfig = {
  * 发送消息时的可选项信息
  */
 export interface ISendMessageOptions {
-    /**
-     * 用于发送群定向消息，只当 conversationType 值为 `ConversationType.GROUP` 时有效
-     */
-    directionalUserIdList?: string[];
     /**
      * 消息发送之前的回调
      */