@onyx-p/imlib-web 1.3.3 → 1.3.4

package/index.esm.js

@@ -13513,13 +13513,13 @@ class WebSocketServer {
       return;
     }
     const messageSeq = Long.isLong(networkResponse.messageSeq) ? networkResponse.messageSeq.toNumber() : 0;
-    logger.reqInfo(`websocket recv ack -> messageSeq: ${messageSeq}`);
+    logger.info(`websocket recv ack -> messageSeq: ${messageSeq}`);
     const resolve = this.responseCallbacks.get(messageSeq);
     if (isDef(resolve)) {
       resolve(networkResponse.body);
       this.responseCallbacks.delete(messageSeq);
     } else {
-      logger.reqInfo(`websocket recv -> cmd: 0x${networkResponse.cmdId.toString(16)}, messageSeq: ${messageSeq}`);
+      logger.info(`websocket recv -> cmd: 0x${networkResponse.cmdId.toString(16)}, messageSeq: ${messageSeq}`);
       this.watcher?.message(networkResponse.cmdId, networkResponse.body);
     }
   }
@@ -18712,331 +18712,6 @@ var RecallMessageStore = {
   }
 };
 
-const MessageSerializers = new Map();
-function registerMessageSerializer(aSerializer) {
-  MessageSerializers.set(aSerializer.getObjectId(), aSerializer.decode.bind(aSerializer));
-}
-function decodeMessage(objectId, messageData) {
-  const decodeFunc = MessageSerializers.get(objectId);
-  const messageObject = decodeFunc ? decodeFunc(messageData) : null;
-  return messageObject;
-}
-
-class BaseMessage {
-  content;
-  isPersited;
-  isCounted;
-  isStatusMessage;
-  constructor(content, isPersited = true, isCounted = true, isStatusMessage = false) {
-    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 MessageObjectIds = {
-  TEXT: 0x00000000,
-  IMAGE: 0x10001000,
-  GIF: 0x1000100b,
-  FILE: 0x1000100a,
-  AUDIO: 0x10001001,
-  CUST_COMMAND: 0x1000101d,
-  CUST_STORAGE: 0x1000102d,
-  CUST_NORMAL: 0x1000103d,
-  CUST_STATUS: 0x1000104d,
-  RECALL: 0x6001001d,
-  CMD: 0x1000105d
-};
-
-class TextMessage extends BaseMessage {
-  constructor(content) {
-    super(content);
-  }
-  static getObjectId() {
-    return MessageObjectIds.TEXT;
-  }
-  static decode(aDecoder) {
-    const {
-      user,
-      extra,
-      content
-    } = aDecoder;
-    return new TextMessage({
-      user,
-      extra,
-      content
-    });
-  }
-  encode() {
-    const {
-      user,
-      extra,
-      content
-    } = this.content;
-    return {
-      user,
-      extra,
-      content
-    };
-  }
-}
-
-class IMConfig {
-  _token = '';
-  _uploadUrl = '';
-  _downloadUrl = '';
-  _cert = '';
-  set imInitToken(val) {
-    this._token = val;
-  }
-  get imInitToken() {
-    return this._token;
-  }
-  get fileUploadUrl() {
-    return this._uploadUrl;
-  }
-  get cert() {
-    return this._cert;
-  }
-  get fileDownloadUrl() {
-    return this._downloadUrl;
-  }
-  setFileServerInfo(uploadUrl, downloadUrl, cert) {
-    this._uploadUrl = uploadUrl;
-    this._downloadUrl = downloadUrl;
-    this._cert = cert;
-  }
-  getFileAbsoluteUri(u) {
-    if (!notEmptyString(u)) {
-      return u;
-    }
-    if (u.startsWith('http')) {
-      return u;
-    }
-    return this.fileDownloadUrl + u;
-  }
-  try2ExtractFileRelativeUri(u) {
-    if (!notEmptyString(u)) {
-      return u;
-    }
-    if (!u.startsWith(this.fileDownloadUrl)) {
-      return u;
-    }
-    return u.substring(this.fileDownloadUrl.length);
-  }
-}
-var imConfig = new IMConfig();
-
-class ImageMessage extends BaseMessage {
-  constructor(content) {
-    super(content);
-  }
-  static getObjectId() {
-    return MessageObjectIds.IMAGE;
-  }
-  static decode(aDecoder) {
-    const {
-      user,
-      extra,
-      thumbnailObjectKey,
-      originalObjectKey,
-      width,
-      height
-    } = aDecoder;
-    return new ImageMessage({
-      user,
-      extra,
-      content: thumbnailObjectKey,
-      imageUri: imConfig.getFileAbsoluteUri(originalObjectKey),
-      width,
-      height
-    });
-  }
-  encode() {
-    const {
-      user,
-      extra,
-      content,
-      imageUri,
-      width,
-      height
-    } = this.content;
-    return {
-      user,
-      extra,
-      thumbnailObjectKey: content,
-      originalObjectKey: imConfig.try2ExtractFileRelativeUri(imageUri),
-      width: width && Math.floor(width),
-      height: height && Math.floor(height)
-    };
-  }
-}
-
-class GIFMessage extends BaseMessage {
-  constructor(content) {
-    super(content);
-  }
-  static getObjectId() {
-    return MessageObjectIds.GIF;
-  }
-  static decode(aDecoder) {
-    const {
-      user,
-      extra,
-      size,
-      originalObjectKey,
-      width,
-      height
-    } = aDecoder;
-    return new GIFMessage({
-      user,
-      extra,
-      gifDataSize: size,
-      remoteUrl: imConfig.getFileAbsoluteUri(originalObjectKey),
-      width,
-      height
-    });
-  }
-  encode() {
-    const {
-      user,
-      extra,
-      gifDataSize,
-      remoteUrl,
-      width,
-      height
-    } = this.content;
-    return {
-      user,
-      extra,
-      size: gifDataSize,
-      originalObjectKey: imConfig.try2ExtractFileRelativeUri(remoteUrl),
-      width: width && Math.floor(width),
-      height: height && Math.floor(height),
-      extension: 'gif'
-    };
-  }
-}
-
-class HQVoiceMessage extends BaseMessage {
-  constructor(content) {
-    super(content);
-  }
-  static getObjectId() {
-    return MessageObjectIds.AUDIO;
-  }
-  static decode(aDecoder) {
-    const {
-      user,
-      extra,
-      length,
-      audioObjectKey,
-      extension
-    } = aDecoder;
-    return new HQVoiceMessage({
-      user,
-      extra,
-      remoteUrl: imConfig.getFileAbsoluteUri(audioObjectKey),
-      duration: length,
-      type: extension
-    });
-  }
-  encode() {
-    const {
-      user,
-      extra,
-      remoteUrl,
-      duration,
-      type
-    } = this.content;
-    return {
-      user,
-      extra,
-      length: duration,
-      audioObjectKey: imConfig.try2ExtractFileRelativeUri(remoteUrl),
-      extension: type
-    };
-  }
-}
-
-class FileMessage extends BaseMessage {
-  constructor(content) {
-    super(content);
-  }
-  static getObjectId() {
-    return MessageObjectIds.FILE;
-  }
-  static decode(aDecoder) {
-    const {
-      user,
-      extra,
-      title,
-      extension,
-      size,
-      originalObjectKey
-    } = aDecoder;
-    return new FileMessage({
-      user,
-      extra,
-      name: title,
-      size,
-      type: extension,
-      fileUrl: imConfig.getFileAbsoluteUri(originalObjectKey)
-    });
-  }
-  encode() {
-    const {
-      user,
-      extra,
-      name,
-      size,
-      type,
-      fileUrl
-    } = this.content;
-    return {
-      user,
-      extra,
-      title: name,
-      originalObjectKey: imConfig.try2ExtractFileRelativeUri(fileUrl),
-      extension: type,
-      size
-    };
-  }
-}
-
-class RecallCommandMessage extends BaseMessage {
-  constructor(content) {
-    super(content, true, false, false);
-  }
-  static getObjectId() {
-    return MessageObjectIds.RECALL;
-  }
-  static decode(aDecoder) {
-    return new RecallCommandMessage(aDecoder);
-  }
-  encode() {
-    return this.content;
-  }
-}
-
 class DialogSecretKey {
   aesKeyRecord = new Map();
   async getDialogAesKey(dialogId) {
@@ -19186,6 +18861,27 @@ 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,
+  GIF: 0x1000100b,
+  FILE: 0x1000100a,
+  AUDIO: 0x10001001,
+  CUST_COMMAND: 0x1000101d,
+  CUST_STORAGE: 0x1000102d,
+  CUST_NORMAL: 0x1000103d,
+  CUST_STATUS: 0x1000104d,
+  RECALL: 0x6001001d,
+  CMD: 0x1000105d
+};
+
 const STATUSMESSAGE_ALIVE_TIMEMS = 6000;
 function parse(orginalMsgs, callback) {
   const msgs = new Map();
@@ -19241,12 +18937,9 @@ const parseSingleDialogMessages = (dialogId, originalMessageList, aesKey) => {
         sendTime
       } = mediaAttributeJson;
       const recallContent = {
-        sentTime: sendTime,
-        messageUId: msgId,
-        conversationType: conversation.conversationType,
-        targetId: dialogMessage.isOut ? conversation.targetId : accountStore.uid
+        msgId: msgId
       };
-      mediaConstructor = MessageObjectIds.RECALL;
+      mediaConstructor = MessageTypes.RECALL;
       mediaAttributeJson = recallContent;
       recallMessageUIds.add(msgId);
     }
@@ -19392,7 +19085,7 @@ class ConversationStore {
       messageDirection
     } = message;
     const isSelfSend = messageDirection === MessageDirection.SEND;
-    const isRecall = messageType === MessageObjectIds.RECALL;
+    const isRecall = messageType === MessageTypes.RECALL;
     const hasContent = isObject(content);
     const key = {
       conversationType,
@@ -19426,7 +19119,7 @@ class ConversationStore {
       messageDirection,
       content
     } = message;
-    if (messageDirection === MessageDirection.SEND || !isMentioned && messageType !== MessageObjectIds.RECALL) {
+    if (messageDirection === MessageDirection.SEND || !isMentioned && messageType !== MessageTypes.RECALL) {
       return;
     }
     const key = this.getStoreKey({
@@ -19441,9 +19134,9 @@ class ConversationStore {
         localMentionedUIdList.push(messageUId.toString());
       }
     }
-    if (messageType === MessageObjectIds.RECALL && conversationType === ConversationType.GROUP) {
+    if (messageType === MessageTypes.RECALL && conversationType === ConversationType.GROUP) {
       const recallContent = content;
-      const index = localMentionedUIdList.indexOf(recallContent.messageUId.toString());
+      const index = localMentionedUIdList.indexOf(recallContent.msgId.toString());
       if (index >= 0) {
         localMentionedUIdList.splice(index, 1);
       }
@@ -20069,7 +19762,7 @@ class MessageLoader {
         l.forEach(m => {
           if (m.messageDirection === MessageDirection.SEND && m.messageId && SentMessageStore.has(m.messageId)) {
             SentMessageStore.remove(m.messageId);
-          } else if (m.messageType === MessageObjectIds.RECALL && RecallMessageStore.has(m.content.messageUId)) {
+          } else if (m.messageType === MessageTypes.RECALL && RecallMessageStore.has(m.content.messageUId)) {
             RecallMessageStore.remove(m.content.messageUId);
           } else {
             m.isOffLineMessage = isOffLineMessage;
@@ -20157,14 +19850,7 @@ class LibLoader {
     }
     return DEFAULT_SOCKET_URI;
   }
-  registerMessage() {
-    registerMessageSerializer(TextMessage);
-    registerMessageSerializer(ImageMessage);
-    registerMessageSerializer(GIFMessage);
-    registerMessageSerializer(HQVoiceMessage);
-    registerMessageSerializer(RecallCommandMessage);
-    registerMessageSerializer(FileMessage);
-  }
+  registerMessage() {}
   async connect() {
     if (this.connectionStatus === ConnectionStatus.CONNECTED) {
       return {
@@ -20274,6 +19960,7 @@ class LibLoader {
     }, 2000);
   }
   messageListener(cmdId, body) {
+    logger.info(`libLoader messageListener -> cmdId: ${cmdId}, body: ${body}`);
     if (cmdId === CmdIds$1.NewMessagePush) {
       const newMsgNotiResp = NewMessageNotificationResp.decode(body);
       this.messageLoader?.syncMsg(newMsgNotiResp.seqno);
@@ -26844,6 +26531,56 @@ 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,
@@ -26875,411 +26612,10 @@ function generateMessageId() {
   return 230000000000000 + UniqueLocalId;
 }
 
-const getBlobUrl = blob => {
-  const URL = window.URL || window.webkitURL;
-  return URL ? URL.createObjectURL(blob) : '';
-};
-const getBlobExtension = blob => {
-  const name = blob.name;
-  if (notEmptyString(name)) {
-    return name.substring(name.lastIndexOf('.') + 1);
-  }
-  return blob.type.indexOf('/') > 0 ? blob.type.substring(blob.type.lastIndexOf('/') + 1) : '';
-};
-const blob2ArrayBuffer = blob => {
-  if (isPromise(blob.arrayBuffer)) {
-    return blob.arrayBuffer();
-  }
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.addEventListener('load', event => {
-      if (event.target) {
-        resolve(event.target.result);
-      } else {
-        reject('null');
-      }
-    });
-    reader.addEventListener('error', error => reject(error));
-    reader.readAsArrayBuffer(blob);
-  });
-};
-const revokeBlobUrl = url => {
-  const URL = window.URL || window.webkitURL;
-  URL.revokeObjectURL(url);
-};
-const dataURL2Blob = url => {
-  const type = url.match(/data:([^;]+)/)[1];
-  const base64 = url.replace(/^[^,]+,/, '');
-  const bstr = window.atob(base64);
-  let n = bstr.length;
-  const u8arr = new Uint8Array(bstr.length);
-  while (n--) {
-    u8arr[n] = bstr.charCodeAt(n);
-  }
-  return new Blob([u8arr], {
-    type
-  });
-};
-
-const COMPRESS_LENGTH_MAX = 1680;
-const COMPRESS_LENGTH_MIN = 160;
-const getImageObj = link => {
-  return new Promise((resolve, reject) => {
-    const handle = image => {
-      if (image.width !== 0 || image.height !== 0) {
-        resolve(image);
-      } else {
-        reject();
-      }
-    };
-    const image = new Image();
-    image.addEventListener('load', event => handle(event.target));
-    image.addEventListener('error', reject);
-    image.src = link;
-    if (image.complete) {
-      handle(image);
-      return;
-    }
-    const intervalId = setInterval(() => {
-      if (image.complete) {
-        handle(image);
-        clearInterval(intervalId);
-      }
-    }, 40);
-  });
-};
-const compress = (image, quality = 1, mineType = 'image/jpeg') => {
-  quality = Math.min(1, quality);
-  const width = image.width;
-  const height = image.height;
-  let compressWidth = width;
-  let compressHeight = height;
-  if (quality < 1) {
-    const isheight = width < height;
-    const zoom = isheight ? height / COMPRESS_LENGTH_MAX : width / COMPRESS_LENGTH_MAX;
-    if (width > COMPRESS_LENGTH_MAX && height > COMPRESS_LENGTH_MAX) {
-      if (isheight) {
-        compressHeight = COMPRESS_LENGTH_MAX;
-        compressWidth = compressWidth / zoom;
-      } else {
-        compressWidth = COMPRESS_LENGTH_MAX;
-        compressHeight = compressHeight / zoom;
-      }
-    } else if (width > COMPRESS_LENGTH_MAX && height > COMPRESS_LENGTH_MIN) {
-      compressWidth = COMPRESS_LENGTH_MAX;
-      compressHeight = compressHeight / zoom;
-      if (compressHeight < COMPRESS_LENGTH_MIN) {
-        compressHeight = COMPRESS_LENGTH_MIN;
-        compressWidth = width / (height / COMPRESS_LENGTH_MIN);
-      }
-    } else if (height > COMPRESS_LENGTH_MAX && width > COMPRESS_LENGTH_MIN) {
-      compressHeight = COMPRESS_LENGTH_MAX;
-      compressWidth = compressWidth / zoom;
-      if (compressWidth < COMPRESS_LENGTH_MIN) {
-        compressWidth = COMPRESS_LENGTH_MIN;
-        compressHeight = height / (width / COMPRESS_LENGTH_MIN);
-      }
-    }
-  }
-  compressWidth = Math.floor(compressWidth);
-  compressHeight = Math.floor(compressHeight);
-  const canvas = document.createElement('canvas');
-  canvas.width = compressWidth;
-  canvas.height = compressHeight;
-  const ctx = canvas.getContext('2d');
-  ctx.fillStyle = '#FFF';
-  ctx.fillRect(0, 0, compressWidth, compressHeight);
-  ctx.drawImage(image, 0, 0, width, height, 0, 0, compressWidth, compressHeight);
-  if (!mineType || mineType == 'image/png') {
-    mineType = 'image/jpeg';
-  }
-  return {
-    imageFile: dataURL2Blob(canvas.toDataURL(mineType, Math.min(0.92, quality))),
-    compressWidth,
-    compressHeight
-  };
-};
-const getThumbnail = (img, thumbnailConfig) => {
-  const canvas = document.createElement('canvas');
-  const context = canvas.getContext('2d');
-  const pos = calcPosition(img.width, img.height, thumbnailConfig);
-  canvas.width = pos.w > thumbnailConfig.maxWidth ? thumbnailConfig.maxWidth : pos.w;
-  canvas.height = pos.h > thumbnailConfig.maxHeight ? thumbnailConfig.maxHeight : pos.h;
-  context?.drawImage(img, pos.x, pos.y, pos.w, pos.h);
-  try {
-    let base64 = canvas.toDataURL('image/jpeg', thumbnailConfig.quality);
-    const reg = new RegExp('^data:image/[^;]+;base64,');
-    base64 = base64.replace(reg, '');
-    return base64;
-  } catch (e) {
-    throw new Error(e);
-  }
-};
-function calcPosition(width, height, thumbnailConfig) {
-  const isheight = width < height;
-  const scale = isheight ? height / width : width / height;
-  let zoom;
-  let x = 0;
-  let y = 0;
-  let w;
-  let h;
-  const gtScale = function () {
-    if (isheight) {
-      zoom = width / 100;
-      w = 100;
-      h = height / zoom;
-      y = (h - thumbnailConfig.maxHeight) / 2;
-    } else {
-      zoom = height / 100;
-      h = 100;
-      w = width / zoom;
-      x = (w - thumbnailConfig.maxWidth) / 2;
-    }
-    return {
-      w: w,
-      h: h,
-      x: -x,
-      y: -y
-    };
-  };
-  const ltScale = function () {
-    if (isheight) {
-      zoom = height / thumbnailConfig.maxHeight;
-      h = thumbnailConfig.maxHeight;
-      w = width / zoom;
-    } else {
-      zoom = width / thumbnailConfig.maxWidth;
-      w = thumbnailConfig.maxWidth;
-      h = height / zoom;
-    }
-    return {
-      w: w,
-      h: h,
-      x: -x,
-      y: -y
-    };
-  };
-  return scale > thumbnailConfig.scale ? gtScale() : ltScale();
-}
-
-class Img {
-  async create(file) {
-    try {
-      const blobUrl = getBlobUrl(file);
-      const image = await getImageObj(blobUrl);
-      revokeBlobUrl(blobUrl);
-      const {
-        imageFile: sentImageFile,
-        compressWidth,
-        compressHeight
-      } = compress(image, 0.85, file.type);
-      const config = {
-        maxHeight: 160,
-        maxWidth: 160,
-        quality: 0.6,
-        scale: 2.4
-      };
-      const thumbnail = getThumbnail(image, config);
-      return {
-        success: true,
-        message: new ImageMessage({
-          content: thumbnail,
-          imageUri: getBlobUrl(sentImageFile),
-          width: compressWidth,
-          height: compressHeight
-        }),
-        file: sentImageFile
-      };
-    } catch (error) {
-      return {
-        success: false
-      };
-    }
-  }
-  updateMessageRemoteUrlProperty(msg, remoteUrl) {
-    msg.content.imageUri = remoteUrl;
-  }
-}
-class GIF {
-  async create(file) {
-    if (file.size > 2 * 1024 * 1024) {
-      return {
-        success: false
-      };
-    }
-    try {
-      const blobUrl = getBlobUrl(file);
-      const image = await getImageObj(blobUrl);
-      return {
-        success: true,
-        message: new GIFMessage({
-          gifDataSize: file.size,
-          remoteUrl: blobUrl,
-          width: image.width,
-          height: image.height
-        }),
-        file: file
-      };
-    } catch {
-      return {
-        success: false
-      };
-    }
-  }
-  updateMessageRemoteUrlProperty(message, remoteUrl) {
-    message.content.remoteUrl = remoteUrl;
-  }
-}
-let audioCtx;
-class Audio {
-  create(file) {
-    return blob2ArrayBuffer(file).then(this.getAudioInfo).then(info => {
-      return {
-        success: true,
-        message: new HQVoiceMessage({
-          remoteUrl: '',
-          duration: info.duration,
-          type: getBlobExtension(file)
-        }),
-        file
-      };
-    }).catch(() => {
-      return {
-        success: false
-      };
-    });
-  }
-  updateMessageRemoteUrlProperty(message, remoteUrl) {
-    message.content.remoteUrl = remoteUrl;
-  }
-  getAudioInfo(buffer) {
-    const ctx = audioCtx || new AudioContext();
-    audioCtx = ctx;
-    return new Promise((resolve, reject) => {
-      ctx.decodeAudioData(buffer, function (audioBuffer) {
-        resolve({
-          duration: audioBuffer.duration,
-          length: audioBuffer.length
-        });
-      }, reject);
-    });
-  }
-}
-class File {
-  async create(file) {
-    if (file.size > 100 * 1024 * 1024) {
-      return {
-        success: false
-      };
-    }
-    return {
-      success: true,
-      message: new FileMessage({
-        fileUrl: '',
-        name: file.name,
-        type: getBlobExtension(file),
-        size: file.size
-      }),
-      file
-    };
-  }
-  updateMessageRemoteUrlProperty(message, remoteUrl) {
-    message.content.fileUrl = remoteUrl;
-  }
-}
-var FileType;
-(function (FileType) {
-  FileType[FileType["IMAGE"] = 1] = "IMAGE";
-  FileType[FileType["GIF"] = 2] = "GIF";
-  FileType[FileType["AUDIO"] = 3] = "AUDIO";
-  FileType[FileType["VIDEO"] = 4] = "VIDEO";
-  FileType[FileType["FILE"] = 5] = "FILE";
-  FileType[FileType["SIGHT"] = 6] = "SIGHT";
-})(FileType || (FileType = {}));
-const getMediaMessageCreator = fileType => {
-  let creator;
-  switch (fileType) {
-    case FileType.IMAGE:
-      creator = new Img();
-      break;
-    case FileType.AUDIO:
-      creator = new Audio();
-      break;
-    case FileType.GIF:
-      creator = new GIF();
-      break;
-    case FileType.FILE:
-      creator = new File();
-      break;
-  }
-  return creator;
-};
-
-class Upload {
-  options;
-  xhr;
-  constructor(options) {
-    this.options = options;
-  }
-  upload(file, callback) {
-    const xhr = new XMLHttpRequest();
-    xhr.timeout = (30 + file.size / 1024 / 512) * 1000;
-    xhr.upload.onprogress = event => {
-      callback.onProgress?.(event.loaded, event.total);
-    };
-    xhr.onreadystatechange = () => {
-      if (xhr.readyState === 4) {
-        const responseText = xhr.responseText || '{}';
-        const responseData = JSON.parse(responseText);
-        if (xhr.status === 200 && responseData.code === 200) {
-          let result = {
-            url: responseData.url
-          };
-          if (this.options.transformer) {
-            result = this.options.transformer(result);
-          }
-          callback.onCompleted?.(result);
-        } else {
-          callback.onError?.('upload fail');
-        }
-      }
-    };
-    xhr.open('POST', this.options.uploadUrl, true);
-    xhr.setRequestHeader('device', '7');
-    xhr.setRequestHeader('cert', this.options.cert ?? '');
-    const type = getBlobExtension(file);
-    const fileName = genUId() + (type.length ? `.${type}` : '');
-    const formData = new FormData();
-    formData.append('file', file);
-    formData.append('name', 'file');
-    formData.append('fileName', fileName);
-    formData.append('token', this.options.token);
-    xhr.send(formData);
-    this.xhr = xhr;
-  }
-  cancel() {
-    this.xhr?.abort();
-  }
-}
-function genUId() {
-  let date = new Date().getTime();
-  const uuid = 'xxxxxx4xxxyxxxxxxx'.replace(/[xy]/g, function (c) {
-    const r = (date + Math.random() * 16) % 16 | 0;
-    date = Math.floor(date / 16);
-    return (c === 'x' ? r : r & 0x3 | 0x8).toString(16);
-  });
-  return uuid;
-}
-
 const MAX_MESSAGE_CONTENT_BYTES = 80 * 1024;
-const MEDIA_MESSAGES = [MessageObjectIds.IMAGE, MessageObjectIds.AUDIO, MessageObjectIds.GIF, MessageObjectIds.FILE];
 async function sendMessage$1(conversation, message, options) {
   return internal_sendMessage(conversation, message, options);
 }
-const sendImageMessage$1 = createSendFunction.bind(null, FileType.IMAGE);
-const sendGIFMessage$1 = createSendFunction.bind(null, FileType.GIF);
-const sendHQVoiceMessage$1 = createSendFunction.bind(null, FileType.AUDIO);
-const sendFileMessage$1 = createSendFunction.bind(null, FileType.FILE);
 const sendRecallMessage = async (conversation, options) => {
   const dialogId = getFullDialogId(conversation);
   RecallMessageStore.addMessage(options.messageUId);
@@ -27290,9 +26626,7 @@ const sendRecallMessage = async (conversation, options) => {
     };
   }
   const recallCommandMessage = new RecallCommandMessage({
-    sentTime: options.sentTime,
-    messageUId: options.messageUId,
-    ...conversation
+    msgId: options.messageUId
   });
   const sentAttris = {
     conversation,
@@ -27307,58 +26641,6 @@ const sendRecallMessage = async (conversation, options) => {
     data: receivedMessage
   };
 };
-async function createSendFunction(fileType, conversation, msgBody, hooks, sendOptions) {
-  const mediaMessageCreator = getMediaMessageCreator(fileType);
-  if (!mediaMessageCreator) return {
-    code: ErrorCode.NOT_SUPPORT
-  };
-  const {
-    success,
-    message: message1,
-    file
-  } = await mediaMessageCreator.create(msgBody.file);
-  if (!success || !message1 || !file) {
-    return {
-      code: ErrorCode.MEDIA_EXCEPTION
-    };
-  }
-  message1.content.user = msgBody.user;
-  message1.content.extra = msgBody.extra;
-  return internal_sendMessage(conversation, message1, sendOptions, {
-    file,
-    task: (message2, toBeUploadedFile) => {
-      return new Promise(resolve => {
-        const uploader = new Upload({
-          token: imConfig.imInitToken,
-          uploadUrl: imConfig.fileUploadUrl,
-          cert: imConfig.cert,
-          transformer: result => ({
-            ...result,
-            url: imConfig.getFileAbsoluteUri(result.url)
-          })
-        });
-        uploader.upload(toBeUploadedFile, {
-          onProgress: (loaded, total) => hooks?.onProgress?.(Math.floor(loaded / total * 100)),
-          onError: () => {
-            resolve({
-              finished: false,
-              message: message2
-            });
-          },
-          onCompleted: result => {
-            mediaMessageCreator.updateMessageRemoteUrlProperty(message2, result.url);
-            resolve({
-              finished: true,
-              message: hooks?.onComplete?.({
-                url: result.url
-              }) ?? message2
-            });
-          }
-        });
-      });
-    }
-  });
-}
 async function internal_sendMessage(conversation, message, options, uploadOptions) {
   const checkResult = beforeSend(conversation, message, options);
   if (checkResult.code !== ErrorCode.SUCCESS || !checkResult.message || !checkResult.sentArgs) {
@@ -27430,7 +26712,7 @@ async function send(message, sentArgs) {
   SentMessageStore.addMessage(sentArgs.messageId);
   const baseParams = {
     localId: sentArgs.messageId,
-    mediaFlag: MEDIA_MESSAGES.includes(message.objectId),
+    mediaFlag: false,
     mediaConstructor: message.objectId,
     mediaAttribute: '',
     msgPreContent: '',
@@ -27560,6 +26842,7 @@ class IMClient extends EventEmitter {
         });
       },
       onPush: (cmdId, body) => {
+        logger.info(`client onPush -> cmdId: ${cmdId}, body: ${body}`);
         this.emit(Events.PUSH, {
           cmdId,
           body
@@ -27586,10 +26869,6 @@ class IMClient extends EventEmitter {
   }
   getServerTime = getServerTime$1;
   sendMessage = sendMessage$1;
-  sendImageMessage = sendImageMessage$1;
-  sendGIFMessage = sendGIFMessage$1;
-  sendHQVoiceMessage = sendHQVoiceMessage$1;
-  sendFileMessage = sendFileMessage$1;
   recallMsg = sendRecallMessage;
   async getRemoteHistoryMessages(conversation, options) {
     const dialogId = getFullDialogId(conversation);
@@ -28887,6 +28166,12 @@ const setConversationToTop = async (options, isTop = true) => {
 const getTopConversationList = () => {
   return imClient.getTopConversationList();
 };
+const registerMessageType = (messageType, isPersited, isCounted, isStatusMessage) => {
+  const defined = function (content) {
+    return new BaseMessage(messageType, content, isPersited, isCounted, isStatusMessage);
+  };
+  return defined;
+};
 const sendMessage = async (conversation, message, options) => {
   if (message instanceof BaseMessage === false) {
     logger.warn('send message fail -> message parameter is not an instance of BaseMessage');
@@ -28904,44 +28189,6 @@ const sendTextMessage = (conversation, messageBody, options) => {
   const message = new TextMessage(messageBody);
   return sendMessage(conversation, message, options);
 };
-const sendImageMessage = async (conversation, msgBody, hooks, sendOptions) => {
-  assert('conversation', conversation, AssertRules.CONVERSATION, true);
-  assert('msgBody.file', msgBody.file, file => file instanceof Blob && file.type.startsWith('image/'), true);
-  const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
-  logger.debug('send message  ->' + paramsStr);
-  _logSendBefore(conversation);
-  const response = await imClient.sendImageMessage(conversation, msgBody, hooks, sendOptions);
-  _logSendError(conversation, response.code);
-  return response;
-};
-const sendGIFMessage = async (conversation, msgBody, hooks, sendOptions) => {
-  assert('conversation', conversation, AssertRules.CONVERSATION, true);
-  assert('msgBody.file', msgBody.file, file => file instanceof Blob && file.type.endsWith('image/gif'), true);
-  const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
-  logger.debug('send message  ->' + paramsStr);
-  _logSendBefore(conversation);
-  const response = await imClient.sendGIFMessage(conversation, msgBody, hooks, sendOptions);
-  _logSendError(conversation, response.code);
-  return response;
-};
-const sendHQVoiceMessage = async (conversation, msgBody, hooks, sendOptions) => {
-  assert('conversation', conversation, AssertRules.CONVERSATION, true);
-  assert('msgBody.file', msgBody.file, file => file instanceof Blob, true);
-  _logSendBefore(conversation);
-  const response = await imClient.sendHQVoiceMessage(conversation, msgBody, hooks, sendOptions);
-  _logSendError(conversation, response.code);
-  return response;
-};
-const sendFileMessage = async (conversation, msgBody, hooks, sendOptions) => {
-  assert('conversation', conversation, AssertRules.CONVERSATION, true);
-  assert('msgBody.file', msgBody.file, file => file instanceof Blob, true);
-  const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
-  logger.debug('send message  ->' + paramsStr);
-  _logSendBefore(conversation);
-  const response = await imClient.sendFileMessage(conversation, msgBody, hooks, sendOptions);
-  _logSendError(conversation, response.code);
-  return response;
-};
 const recallMessage = async (conversation, options) => {
   assert('options.messageUId', options.messageUId, AssertRules.STRING, true);
   assert('options.sentTime', options.sentTime, AssertRules.NUMBER, true);
@@ -29041,4 +28288,4 @@ const _logSendError = (conversation, errorCode) => {
   }
 };
 
-export { ConnectionStatus, ConversationType, ErrorCode, ErrorDesc, Events, FileMessage, GIFMessage, HQVoiceMessage, ImageMessage, LogLevel, MentionedType, MessageDirection, NotificationLevel, NotificationStatus, ReceivedStatus, SentStatus, TextMessage, 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, removeConversation, removeEventListener, request, saveTextMessageDraft, sendFileMessage, sendGIFMessage, sendHQVoiceMessage, sendImageMessage, sendMessage, sendTextMessage, setConversationNotificationStatus, setConversationToTop, setUserLogged };
+export { ConnectionStatus, ConversationType, ErrorCode, ErrorDesc, Events, FileMessage, GIFMessage, VoiceMessage as HQVoiceMessage, ImageMessage, LogLevel, MentionedType, MessageDirection, NotificationLevel, NotificationStatus, ReceivedStatus, SentStatus, TextMessage, 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, sendMessage, sendTextMessage, setConversationNotificationStatus, setConversationToTop, setUserLogged };