@onyx-p/imlib-web 1.4.1 → 1.4.3

package/index.esm.js

@@ -26527,6 +26527,17 @@ function requireProtobufjs () {
 var protobufjsExports = requireProtobufjs();
 var protobuf = /*@__PURE__*/getDefaultExportFromCjs(protobufjsExports);
 
+class IMConfig {
+  uploader = undefined;
+  getUploader() {
+    return this.uploader;
+  }
+  setUploader(uploader) {
+    this.uploader = uploader;
+  }
+}
+var imConfig = new IMConfig();
+
 const transSentAttrs2IReceivedMessage = (message, options, sentStatus = SentStatus.SENDING) => ({
   conversationType: options.conversation.conversationType,
   targetId: options.conversation.targetId,
@@ -26534,7 +26545,7 @@ const transSentAttrs2IReceivedMessage = (message, options, sentStatus = SentStat
   messageDirection: MessageDirection.SEND,
   isCounted: message.isCounted,
   isMentioned: false,
-  content: message.content,
+  content: deepClone(message.content),
   messageType: message.messageType,
   isOffLineMessage: false,
   isPersited: message.isPersited,
@@ -26558,10 +26569,381 @@ 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);
+    return dataURL2Blob(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({
+          thumbnailObjectKey: getBlobUrl(thumbnail),
+          originalObjectKey: getBlobUrl(sentImageFile),
+          width: compressWidth,
+          height: compressHeight
+        }),
+        files: [thumbnail, sentImageFile]
+      };
+    } catch (error) {
+      return {
+        success: false
+      };
+    }
+  }
+  updateMessageRemoteUrlProperty(msgContent, uploadedResult) {
+    let content = deepClone(msgContent);
+    const {
+      urls: [thumbObjectKey, originalObjectKey],
+      encryptedKey
+    } = uploadedResult;
+    content.originalObjectKey = originalObjectKey;
+    content.thumbnailObjectKey = thumbObjectKey;
+    content.encryptKey = encryptedKey;
+    return content;
+  }
+}
+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({
+          originalObjectKey: blobUrl,
+          extension: getBlobExtension(file),
+          width: image.width,
+          height: image.height
+        }),
+        files: [file]
+      };
+    } catch {
+      return {
+        success: false
+      };
+    }
+  }
+  updateMessageRemoteUrlProperty(messageContent, uploadedResult) {
+    let content = deepClone(messageContent);
+    const {
+      urls: [originalObjectKey],
+      encryptedKey
+    } = uploadedResult;
+    content.originalObjectKey = originalObjectKey;
+    content.encryptKey = encryptedKey;
+    return content;
+  }
+}
+let audioCtx;
+class Audio {
+  create(file) {
+    return blob2ArrayBuffer(file).then(this.getAudioInfo).then(info => {
+      return {
+        success: true,
+        message: new VoiceMessage({
+          audioObjectKey: getBlobUrl(file),
+          length: info.duration,
+          extension: getBlobExtension(file)
+        }),
+        files: [file]
+      };
+    }).catch(() => {
+      return {
+        success: false
+      };
+    });
+  }
+  updateMessageRemoteUrlProperty(messageContent, uploadedResult) {
+    let content = deepClone(messageContent);
+    const {
+      urls: [audioObjectKey],
+      encryptedKey
+    } = uploadedResult;
+    content.audioObjectKey = audioObjectKey;
+    content.encryptKey = encryptedKey;
+    return content;
+  }
+  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({
+        fileKey: '',
+        title: file.name,
+        extension: getBlobExtension(file),
+        size: file.size
+      }),
+      files: [file]
+    };
+  }
+  updateMessageRemoteUrlProperty(messageContent, uploadedResult) {
+    let content = deepClone(messageContent);
+    const {
+      urls: [fileKey],
+      encryptedKey
+    } = uploadedResult;
+    content.fileKey = fileKey;
+    content.encryptKey = encryptedKey;
+    return content;
+  }
+}
+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;
+};
+
 const MAX_MESSAGE_CONTENT_BYTES = 80 * 1024;
 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);
@@ -26587,6 +26969,47 @@ 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,
+    files
+  } = await mediaMessageCreator.create(msgBody.file);
+  if (!success || !message1 || !files) {
+    return {
+      code: ErrorCode.MEDIA_EXCEPTION
+    };
+  }
+  message1.content.user = msgBody.user;
+  message1.content.extra = msgBody.extra;
+  return internal_sendMessage(conversation, message1, sendOptions, {
+    files,
+    task: (message2, toBeUploadedFiles) => {
+      return new Promise(resolve => {
+        imConfig.getUploader().upload(toBeUploadedFiles, {
+          onProgress: progress => hooks?.onProgress?.(progress),
+          onError: () => {
+            resolve({
+              finished: false,
+              message: message2
+            });
+          },
+          onCompleted: result => {
+            message2.content = mediaMessageCreator.updateMessageRemoteUrlProperty(message2.content, result);
+            resolve({
+              finished: true,
+              message: hooks?.onComplete?.(result) ?? message2
+            });
+          }
+        });
+      });
+    }
+  });
+}
 async function internal_sendMessage(conversation, message, options, uploadOptions) {
   const checkResult = beforeSend(conversation, message, options);
   if (checkResult.code !== ErrorCode.SUCCESS || !checkResult.message || !checkResult.sentArgs) {
@@ -26599,7 +27022,7 @@ async function internal_sendMessage(conversation, message, options, uploadOption
     sentArgs
   } = checkResult;
   if (isDef(uploadOptions)) {
-    const uploadResult = await uploadOptions.task(sentMessage, uploadOptions.file);
+    const uploadResult = await uploadOptions.task(sentMessage, uploadOptions.files);
     sentMessage = uploadResult.message;
     if (!uploadResult.finished) {
       return {
@@ -26734,6 +27157,9 @@ class IMClient extends EventEmitter {
       logger.setLogStdout(options.logStdout);
     }
     logger.debug('IMClient.init -> ');
+    if (isDef(options.uploader)) {
+      imConfig.setUploader(options.uploader);
+    }
     this.libLoader = LibLoader.init(options);
     this.watch();
     IMClient.imClient = this;
@@ -26796,6 +27222,10 @@ 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);
@@ -28118,6 +28548,48 @@ 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('uploader', imConfig.getUploader(), AssertRules.OBJECT, 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('uploader', imConfig.getUploader(), AssertRules.OBJECT, 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('uploader', imConfig.getUploader(), AssertRules.OBJECT, 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('uploader', imConfig.getUploader(), AssertRules.OBJECT, 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);
@@ -28217,4 +28689,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, sendMessage, 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, getHistoryMessages, getRemoteHistoryMessages, getServerTime, getTextMessageDraft, getTopConversationList, getTotalUnreadCount, getUnreadCount, getUnreadMentionedCount, init, logOut, mockLogin, onceEventListener, recallMessage, registerMessageType, removeConversation, removeEventListener, request, saveTextMessageDraft, sendFileMessage, sendGIFMessage, sendHQVoiceMessage, sendImageMessage, sendMessage, sendTextMessage, setConversationNotificationStatus, setConversationToTop, setUserLogged };

package/index.umd.js

@@ -26533,6 +26533,17 @@
   var protobufjsExports = requireProtobufjs();
   var protobuf = /*@__PURE__*/getDefaultExportFromCjs(protobufjsExports);
 
+  class IMConfig {
+    uploader = undefined;
+    getUploader() {
+      return this.uploader;
+    }
+    setUploader(uploader) {
+      this.uploader = uploader;
+    }
+  }
+  var imConfig = new IMConfig();
+
   const transSentAttrs2IReceivedMessage = (message, options, sentStatus = exports.SentStatus.SENDING) => ({
     conversationType: options.conversation.conversationType,
     targetId: options.conversation.targetId,
@@ -26540,7 +26551,7 @@
     messageDirection: exports.MessageDirection.SEND,
     isCounted: message.isCounted,
     isMentioned: false,
-    content: message.content,
+    content: deepClone(message.content),
     messageType: message.messageType,
     isOffLineMessage: false,
     isPersited: message.isPersited,
@@ -26564,10 +26575,381 @@
     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);
+      return dataURL2Blob(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({
+            thumbnailObjectKey: getBlobUrl(thumbnail),
+            originalObjectKey: getBlobUrl(sentImageFile),
+            width: compressWidth,
+            height: compressHeight
+          }),
+          files: [thumbnail, sentImageFile]
+        };
+      } catch (error) {
+        return {
+          success: false
+        };
+      }
+    }
+    updateMessageRemoteUrlProperty(msgContent, uploadedResult) {
+      let content = deepClone(msgContent);
+      const {
+        urls: [thumbObjectKey, originalObjectKey],
+        encryptedKey
+      } = uploadedResult;
+      content.originalObjectKey = originalObjectKey;
+      content.thumbnailObjectKey = thumbObjectKey;
+      content.encryptKey = encryptedKey;
+      return content;
+    }
+  }
+  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({
+            originalObjectKey: blobUrl,
+            extension: getBlobExtension(file),
+            width: image.width,
+            height: image.height
+          }),
+          files: [file]
+        };
+      } catch {
+        return {
+          success: false
+        };
+      }
+    }
+    updateMessageRemoteUrlProperty(messageContent, uploadedResult) {
+      let content = deepClone(messageContent);
+      const {
+        urls: [originalObjectKey],
+        encryptedKey
+      } = uploadedResult;
+      content.originalObjectKey = originalObjectKey;
+      content.encryptKey = encryptedKey;
+      return content;
+    }
+  }
+  let audioCtx;
+  class Audio {
+    create(file) {
+      return blob2ArrayBuffer(file).then(this.getAudioInfo).then(info => {
+        return {
+          success: true,
+          message: new VoiceMessage({
+            audioObjectKey: getBlobUrl(file),
+            length: info.duration,
+            extension: getBlobExtension(file)
+          }),
+          files: [file]
+        };
+      }).catch(() => {
+        return {
+          success: false
+        };
+      });
+    }
+    updateMessageRemoteUrlProperty(messageContent, uploadedResult) {
+      let content = deepClone(messageContent);
+      const {
+        urls: [audioObjectKey],
+        encryptedKey
+      } = uploadedResult;
+      content.audioObjectKey = audioObjectKey;
+      content.encryptKey = encryptedKey;
+      return content;
+    }
+    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({
+          fileKey: '',
+          title: file.name,
+          extension: getBlobExtension(file),
+          size: file.size
+        }),
+        files: [file]
+      };
+    }
+    updateMessageRemoteUrlProperty(messageContent, uploadedResult) {
+      let content = deepClone(messageContent);
+      const {
+        urls: [fileKey],
+        encryptedKey
+      } = uploadedResult;
+      content.fileKey = fileKey;
+      content.encryptKey = encryptedKey;
+      return content;
+    }
+  }
+  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;
+  };
+
   const MAX_MESSAGE_CONTENT_BYTES = 80 * 1024;
   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);
@@ -26593,6 +26975,47 @@
       data: receivedMessage
     };
   };
+  async function createSendFunction(fileType, conversation, msgBody, hooks, sendOptions) {
+    const mediaMessageCreator = getMediaMessageCreator(fileType);
+    if (!mediaMessageCreator) return {
+      code: exports.ErrorCode.NOT_SUPPORT
+    };
+    const {
+      success,
+      message: message1,
+      files
+    } = await mediaMessageCreator.create(msgBody.file);
+    if (!success || !message1 || !files) {
+      return {
+        code: exports.ErrorCode.MEDIA_EXCEPTION
+      };
+    }
+    message1.content.user = msgBody.user;
+    message1.content.extra = msgBody.extra;
+    return internal_sendMessage(conversation, message1, sendOptions, {
+      files,
+      task: (message2, toBeUploadedFiles) => {
+        return new Promise(resolve => {
+          imConfig.getUploader().upload(toBeUploadedFiles, {
+            onProgress: progress => hooks?.onProgress?.(progress),
+            onError: () => {
+              resolve({
+                finished: false,
+                message: message2
+              });
+            },
+            onCompleted: result => {
+              message2.content = mediaMessageCreator.updateMessageRemoteUrlProperty(message2.content, result);
+              resolve({
+                finished: true,
+                message: hooks?.onComplete?.(result) ?? message2
+              });
+            }
+          });
+        });
+      }
+    });
+  }
   async function internal_sendMessage(conversation, message, options, uploadOptions) {
     const checkResult = beforeSend(conversation, message, options);
     if (checkResult.code !== exports.ErrorCode.SUCCESS || !checkResult.message || !checkResult.sentArgs) {
@@ -26605,7 +27028,7 @@
       sentArgs
     } = checkResult;
     if (isDef(uploadOptions)) {
-      const uploadResult = await uploadOptions.task(sentMessage, uploadOptions.file);
+      const uploadResult = await uploadOptions.task(sentMessage, uploadOptions.files);
       sentMessage = uploadResult.message;
       if (!uploadResult.finished) {
         return {
@@ -26740,6 +27163,9 @@
         logger.setLogStdout(options.logStdout);
       }
       logger.debug('IMClient.init -> ');
+      if (isDef(options.uploader)) {
+        imConfig.setUploader(options.uploader);
+      }
       this.libLoader = LibLoader.init(options);
       this.watch();
       IMClient.imClient = this;
@@ -26802,6 +27228,10 @@
     }
     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);
@@ -28124,6 +28554,48 @@
     const message = new TextMessage(messageBody);
     return sendMessage(conversation, message, options);
   };
+  const sendImageMessage = async (conversation, msgBody, hooks, sendOptions) => {
+    assert('conversation', conversation, AssertRules.CONVERSATION, true);
+    assert('uploader', imConfig.getUploader(), AssertRules.OBJECT, 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('uploader', imConfig.getUploader(), AssertRules.OBJECT, 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('uploader', imConfig.getUploader(), AssertRules.OBJECT, 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('uploader', imConfig.getUploader(), AssertRules.OBJECT, 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);
@@ -28265,6 +28737,10 @@
   exports.removeEventListener = removeEventListener;
   exports.request = request;
   exports.saveTextMessageDraft = saveTextMessageDraft;
+  exports.sendFileMessage = sendFileMessage;
+  exports.sendGIFMessage = sendGIFMessage;
+  exports.sendHQVoiceMessage = sendHQVoiceMessage;
+  exports.sendImageMessage = sendImageMessage;
   exports.sendMessage = sendMessage;
   exports.sendTextMessage = sendTextMessage;
   exports.setConversationNotificationStatus = setConversationNotificationStatus;

package/package.json

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

package/types/index.d.ts

@@ -1,5 +1,5 @@
 import { ConnectionStatus, ConversationType, NotificationLevel, NotificationStatus } from './model/statusTypes';
-import { EventListeners, Events, GetHistoryMessageOption, GetHistoryMessageResult, IBaseConversationInfo, IConversationOption, IConversationState, IDeleteMessageOptions, IGetConversationListOptions, IInitOption, IPromiseResult, IRecallMessageOptions, ISendMessageOptions, ProfileInfo } from './types';
+import { EventListeners, Events, GetHistoryMessageOption, GetHistoryMessageResult, IBaseConversationInfo, IConversationOption, IConversationState, IDeleteMessageOptions, IGetConversationListOptions, IImageMessageOption, IInitOption, IPromiseResult, IRecallMessageOptions, ISendBody, ISendMessageOptions, IUploadHooks, IUploadMessageOption, ProfileInfo } from './types';
 import { BaseMessage, IBaseMessageBody } from './model/baseMessage';
 import { ITextMessageBody } from './model/messages/textMessage';
 import IReceivedMessage from './model/iReceivedMessage';
@@ -182,15 +182,19 @@ export declare const sendTextMessage: (conversation: IConversationOption, messag
 /**
  * 发送图片消息
  */
+export declare const sendImageMessage: (conversation: IConversationOption, msgBody: ISendBody, hooks?: IUploadHooks, sendOptions?: IImageMessageOption) => IPromiseResult<IReceivedMessage>;
 /**
  * 发送GIF消息
  */
+export declare const sendGIFMessage: (conversation: IConversationOption, msgBody: ISendBody, hooks?: IUploadHooks, sendOptions?: IUploadMessageOption) => IPromiseResult<IReceivedMessage>;
 /**
  * 发送高清语音消息
  */
+export declare const sendHQVoiceMessage: (conversation: IConversationOption, msgBody: ISendBody, hooks?: IUploadHooks | undefined, sendOptions?: IUploadMessageOption | undefined) => IPromiseResult<IReceivedMessage>;
 /**
  * 发送文件消息
  */
+export declare const sendFileMessage: (conversation: IConversationOption, msgBody: ISendBody, hooks?: IUploadHooks, sendOptions?: IUploadMessageOption) => IPromiseResult<IReceivedMessage>;
 /**
  * 撤回消息
  * @param options

package/types/types.d.ts

@@ -21,6 +21,7 @@ export type IInitOption = {
      */
     logStdout?: (logLevel: LogLevel, content: string) => void;
     serverInfo?: string;
+    uploader?: IUploader;
 };
 export interface ProfileInfo {
     deviceId: string;
@@ -140,9 +141,20 @@ export interface IUploadHooks {
     /**
      * 文件上传完成回调，可通过修改返回值以修改待发布的消息内容，如实现自定义消息
      */
-    onComplete?: (fileInfo: {
-        url: string;
-    }) => void | BaseMessage;
+    onComplete?: (fileInfo: IUploadCompletedResult) => void | BaseMessage;
+}
+export type IUploadCompletedResult = {
+    urls: string[];
+    encryptedKey?: string;
+};
+export type IUploadCallback = {
+    onProgress?: (progress: number) => void;
+    onCompleted?: (result: IUploadCompletedResult) => void;
+    onError?: (reason: string) => void;
+};
+export interface IUploader {
+    upload(file: Blob[], callback: IUploadCallback): void;
+    cancel(): void;
 }
 /**
  * 文件消息配置