@onyx-p/imlib-web 1.4.5 → 1.4.7

package/index.esm.js

@@ -19173,12 +19173,16 @@ const transBriefDialog2IReceivedConversation = dialog => {
   if (!conversation) {
     return;
   }
+  dialog.dialogTitle;
+  dialog.smallAvatarUrl;
   const conversationObj = {
     ...conversation,
     unreadMessageCount: 0,
     notificationStatus: dialog.muteFlag ? NotificationStatus.OPEN : NotificationStatus.CLOSE,
     notificationLevel: dialog.muteFlag ? NotificationLevel.NOT_MESSAGE_NOTIFICATION : NotificationLevel.ALL_MESSAGE,
     isTop: !!dialog.stickyFlag,
+    dialogTitle: dialog.dialogTitle,
+    smallAvatarUrl: dialog.smallAvatarUrl,
     lastUnreadTime: '0'
   };
   return conversationObj;
@@ -26754,6 +26758,24 @@ function calcPosition(width, height, thumbnailConfig) {
   return scale > thumbnailConfig.scale ? gtScale() : ltScale();
 }
 
+function formatDurationSeconds(timeSeconds) {
+  const seconds = Math.max(0, timeSeconds);
+  const secondsPart = seconds % 60;
+  const minutesPart = Math.floor(seconds / 60 % 60);
+  const hoursPart = Math.floor(seconds / 3600);
+  if (hoursPart > 0) {
+    return `${hoursPart}:${minutesPart.toString().padStart(2, '0')}:${secondsPart.toString().padStart(2, '0')}`;
+  } else {
+    return `${minutesPart}:${secondsPart.toString().padStart(2, '0')}`;
+  }
+}
+
+const DefaultThumbnailConfig = {
+  maxHeight: 500,
+  maxWidth: 500,
+  quality: 0.6,
+  scale: 2.4
+};
 class Img {
   async create(file) {
     try {
@@ -26765,13 +26787,7 @@ class Img {
         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);
+      const thumbnail = getThumbnail(image, DefaultThumbnailConfig);
       return {
         success: true,
         message: new ImageMessage({
@@ -26908,6 +26924,66 @@ class File {
     return content;
   }
 }
+class Sight {
+  async create(file) {
+    try {
+      if (file.size > 100 * 1024 * 1024) {
+        return {
+          success: false
+        };
+      }
+      const videoUrl = getBlobUrl(file);
+      const video = document.createElement('video');
+      video.src = videoUrl;
+      await new Promise((resolve, reject) => {
+        video.onloadedmetadata = resolve;
+        video.onerror = reject;
+      });
+      const duration = video.duration;
+      const width = video.videoWidth;
+      const height = video.videoHeight;
+      const scale = Math.min(DefaultThumbnailConfig.maxWidth / width, DefaultThumbnailConfig.maxHeight / height, DefaultThumbnailConfig.scale);
+      const thumbnailWidth = Math.floor(width * scale);
+      const thumbnailHeight = Math.floor(height * scale);
+      const canvas = document.createElement('canvas');
+      canvas.width = thumbnailWidth;
+      canvas.height = thumbnailHeight;
+      const ctx = canvas.getContext('2d');
+      ctx?.drawImage(video, 0, 0, thumbnailWidth, thumbnailHeight);
+      const thumbnailBlob = await new Promise(resolve => {
+        canvas.toBlob(blob => resolve(blob), 'image/jpeg', DefaultThumbnailConfig.quality);
+      });
+      revokeBlobUrl(videoUrl);
+      return {
+        success: true,
+        message: new VideoMessage({
+          videoObjectKey: "",
+          thumbnailObjectKey: "",
+          during: formatDurationSeconds(duration),
+          width,
+          height,
+          extension: getBlobExtension(file)
+        }),
+        files: [file, thumbnailBlob]
+      };
+    } catch (error) {
+      return {
+        success: false
+      };
+    }
+  }
+  updateMessageRemoteUrlProperty(messageContent, uploadedResult) {
+    let content = deepClone(messageContent);
+    const {
+      urls: [videoObjectKey, thumbnailObjectKey],
+      encryptedKey
+    } = uploadedResult;
+    content.videoObjectKey = videoObjectKey;
+    content.thumbnailObjectKey = thumbnailObjectKey;
+    content.encryptKey = encryptedKey;
+    return content;
+  }
+}
 var FileType;
 (function (FileType) {
   FileType[FileType["IMAGE"] = 1] = "IMAGE";
@@ -26932,6 +27008,9 @@ const getMediaMessageCreator = fileType => {
     case FileType.FILE:
       creator = new File();
       break;
+    case FileType.SIGHT:
+      creator = new Sight();
+      break;
   }
   return creator;
 };
@@ -26943,7 +27022,8 @@ async function sendMessage$1(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 sendSightMessage$1 = createSendFunction.bind(null, FileType.AUDIO);
+const sendFileMessage$1 = createSendFunction.bind(null, FileType.SIGHT);
 const sendRecallMessage = async (conversation, options) => {
   const dialogId = getFullDialogId(conversation);
   RecallMessageStore.addMessage(options.messageUId);
@@ -27089,7 +27169,7 @@ async function send(message, sentArgs) {
   SentMessageStore.addMessage(sentArgs.messageId);
   const baseParams = {
     localId: Long.fromString(sentArgs.messageId),
-    mediaFlag: false,
+    mediaFlag: message.messageType !== MessageTypes.TEXT,
     mediaConstructor: message.messageType,
     msgPreContent: '',
     msgPostContent: postEncryptedString,
@@ -27226,6 +27306,7 @@ class IMClient extends EventEmitter {
   sendGIFMessage = sendGIFMessage$1;
   sendHQVoiceMessage = sendHQVoiceMessage$1;
   sendFileMessage = sendFileMessage$1;
+  sendSightMessage = sendSightMessage$1;
   recallMsg = sendRecallMessage;
   async getRemoteHistoryMessages(conversation, options) {
     const dialogId = getFullDialogId(conversation);
@@ -28323,7 +28404,6 @@ const getConversationList = async options => {
     code,
     data
   } = await imClient.getConversationList(options?.count ?? 20, null, options?.startTime ?? 0, options?.order ?? 0);
-  debugger;
   if (code !== ErrorCode.SUCCESS) {
     logger.warn('get conversation list fail ->' + code + ':' + ErrorDesc(code));
   }
@@ -28590,6 +28670,15 @@ const sendFileMessage = async (conversation, msgBody, hooks, sendOptions) => {
   _logSendError(conversation, response.code);
   return response;
 };
+const sendSightMessage = 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 === 'video/mp4', true);
+  _logSendBefore(conversation);
+  const response = await imClient.sendSightMessage(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);
@@ -28689,4 +28778,4 @@ const _logSendError = (conversation, errorCode) => {
   }
 };
 
-export { ConnectionStatus, ConversationType, ErrorCode, ErrorDesc, Events, FileMessage, GIFMessage, VoiceMessage as HQVoiceMessage, ImageMessage, LogLevel, MentionedType, MessageDirection, MessageTypes, NotificationLevel, NotificationStatus, ReceivedStatus, SentStatus, TextMessage, VideoMessage, addEventListener, clearAllMessagesUnreadStatus, clearHistoryMessages, clearMessagesUnreadStatus, clearTextMessageDraft, connect, deleteMessages, disconnect, getAllConversationState, getAllUnreadMentionedCount, getBlockedConversationList, getConnectionStatus, getConversation, getConversationList, getConversationNotificationLevel, getConversationNotificationStatus, getHistoryMessages, getRemoteHistoryMessages, getServerTime, getTextMessageDraft, getTopConversationList, getTotalUnreadCount, getUnreadCount, getUnreadMentionedCount, init, logOut, mockLogin, onceEventListener, recallMessage, registerMessageType, removeConversation, removeEventListener, request, saveTextMessageDraft, sendFileMessage, sendGIFMessage, sendHQVoiceMessage, sendImageMessage, sendMessage, 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, sendSightMessage, sendTextMessage, setConversationNotificationStatus, setConversationToTop, setUserLogged };

package/index.umd.js

@@ -19179,12 +19179,16 @@
     if (!conversation) {
       return;
     }
+    dialog.dialogTitle;
+    dialog.smallAvatarUrl;
     const conversationObj = {
       ...conversation,
       unreadMessageCount: 0,
       notificationStatus: dialog.muteFlag ? exports.NotificationStatus.OPEN : exports.NotificationStatus.CLOSE,
       notificationLevel: dialog.muteFlag ? exports.NotificationLevel.NOT_MESSAGE_NOTIFICATION : exports.NotificationLevel.ALL_MESSAGE,
       isTop: !!dialog.stickyFlag,
+      dialogTitle: dialog.dialogTitle,
+      smallAvatarUrl: dialog.smallAvatarUrl,
       lastUnreadTime: '0'
     };
     return conversationObj;
@@ -26760,6 +26764,24 @@
     return scale > thumbnailConfig.scale ? gtScale() : ltScale();
   }
 
+  function formatDurationSeconds(timeSeconds) {
+    const seconds = Math.max(0, timeSeconds);
+    const secondsPart = seconds % 60;
+    const minutesPart = Math.floor(seconds / 60 % 60);
+    const hoursPart = Math.floor(seconds / 3600);
+    if (hoursPart > 0) {
+      return `${hoursPart}:${minutesPart.toString().padStart(2, '0')}:${secondsPart.toString().padStart(2, '0')}`;
+    } else {
+      return `${minutesPart}:${secondsPart.toString().padStart(2, '0')}`;
+    }
+  }
+
+  const DefaultThumbnailConfig = {
+    maxHeight: 500,
+    maxWidth: 500,
+    quality: 0.6,
+    scale: 2.4
+  };
   class Img {
     async create(file) {
       try {
@@ -26771,13 +26793,7 @@
           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);
+        const thumbnail = getThumbnail(image, DefaultThumbnailConfig);
         return {
           success: true,
           message: new ImageMessage({
@@ -26914,6 +26930,66 @@
       return content;
     }
   }
+  class Sight {
+    async create(file) {
+      try {
+        if (file.size > 100 * 1024 * 1024) {
+          return {
+            success: false
+          };
+        }
+        const videoUrl = getBlobUrl(file);
+        const video = document.createElement('video');
+        video.src = videoUrl;
+        await new Promise((resolve, reject) => {
+          video.onloadedmetadata = resolve;
+          video.onerror = reject;
+        });
+        const duration = video.duration;
+        const width = video.videoWidth;
+        const height = video.videoHeight;
+        const scale = Math.min(DefaultThumbnailConfig.maxWidth / width, DefaultThumbnailConfig.maxHeight / height, DefaultThumbnailConfig.scale);
+        const thumbnailWidth = Math.floor(width * scale);
+        const thumbnailHeight = Math.floor(height * scale);
+        const canvas = document.createElement('canvas');
+        canvas.width = thumbnailWidth;
+        canvas.height = thumbnailHeight;
+        const ctx = canvas.getContext('2d');
+        ctx?.drawImage(video, 0, 0, thumbnailWidth, thumbnailHeight);
+        const thumbnailBlob = await new Promise(resolve => {
+          canvas.toBlob(blob => resolve(blob), 'image/jpeg', DefaultThumbnailConfig.quality);
+        });
+        revokeBlobUrl(videoUrl);
+        return {
+          success: true,
+          message: new VideoMessage({
+            videoObjectKey: "",
+            thumbnailObjectKey: "",
+            during: formatDurationSeconds(duration),
+            width,
+            height,
+            extension: getBlobExtension(file)
+          }),
+          files: [file, thumbnailBlob]
+        };
+      } catch (error) {
+        return {
+          success: false
+        };
+      }
+    }
+    updateMessageRemoteUrlProperty(messageContent, uploadedResult) {
+      let content = deepClone(messageContent);
+      const {
+        urls: [videoObjectKey, thumbnailObjectKey],
+        encryptedKey
+      } = uploadedResult;
+      content.videoObjectKey = videoObjectKey;
+      content.thumbnailObjectKey = thumbnailObjectKey;
+      content.encryptKey = encryptedKey;
+      return content;
+    }
+  }
   var FileType;
   (function (FileType) {
     FileType[FileType["IMAGE"] = 1] = "IMAGE";
@@ -26938,6 +27014,9 @@
       case FileType.FILE:
         creator = new File();
         break;
+      case FileType.SIGHT:
+        creator = new Sight();
+        break;
     }
     return creator;
   };
@@ -26949,7 +27028,8 @@
   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 sendSightMessage$1 = createSendFunction.bind(null, FileType.AUDIO);
+  const sendFileMessage$1 = createSendFunction.bind(null, FileType.SIGHT);
   const sendRecallMessage = async (conversation, options) => {
     const dialogId = getFullDialogId(conversation);
     RecallMessageStore.addMessage(options.messageUId);
@@ -27095,7 +27175,7 @@
     SentMessageStore.addMessage(sentArgs.messageId);
     const baseParams = {
       localId: Long.fromString(sentArgs.messageId),
-      mediaFlag: false,
+      mediaFlag: message.messageType !== MessageTypes.TEXT,
       mediaConstructor: message.messageType,
       msgPreContent: '',
       msgPostContent: postEncryptedString,
@@ -27232,6 +27312,7 @@
     sendGIFMessage = sendGIFMessage$1;
     sendHQVoiceMessage = sendHQVoiceMessage$1;
     sendFileMessage = sendFileMessage$1;
+    sendSightMessage = sendSightMessage$1;
     recallMsg = sendRecallMessage;
     async getRemoteHistoryMessages(conversation, options) {
       const dialogId = getFullDialogId(conversation);
@@ -28329,7 +28410,6 @@
       code,
       data
     } = await imClient.getConversationList(options?.count ?? 20, null, options?.startTime ?? 0, options?.order ?? 0);
-    debugger;
     if (code !== exports.ErrorCode.SUCCESS) {
       logger.warn('get conversation list fail ->' + code + ':' + ErrorDesc(code));
     }
@@ -28596,6 +28676,15 @@
     _logSendError(conversation, response.code);
     return response;
   };
+  const sendSightMessage = 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 === 'video/mp4', true);
+    _logSendBefore(conversation);
+    const response = await imClient.sendSightMessage(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);
@@ -28742,6 +28831,7 @@
   exports.sendHQVoiceMessage = sendHQVoiceMessage;
   exports.sendImageMessage = sendImageMessage;
   exports.sendMessage = sendMessage;
+  exports.sendSightMessage = sendSightMessage;
   exports.sendTextMessage = sendTextMessage;
   exports.setConversationNotificationStatus = setConversationNotificationStatus;
   exports.setConversationToTop = setConversationToTop;

package/package.json

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

package/types/index.d.ts

@@ -195,6 +195,10 @@ export declare const sendHQVoiceMessage: (conversation: IConversationOption, msg
  * 发送文件消息
  */
 export declare const sendFileMessage: (conversation: IConversationOption, msgBody: ISendBody, hooks?: IUploadHooks, sendOptions?: IUploadMessageOption) => IPromiseResult<IReceivedMessage>;
+/**
+ * 发送短视频消息
+ */
+export declare const sendSightMessage: (conversation: IConversationOption, msgBody: ISendBody, hooks?: IUploadHooks, sendOptions?: IUploadMessageOption) => IPromiseResult<IReceivedMessage>;
 /**
  * 撤回消息
  * @param options

package/types/model/iReceivedConversation.d.ts

@@ -47,4 +47,12 @@ export default interface IReceivedConversation {
      * @ 消息未读数
      */
     unreadMentionedCount?: number;
+    /**
+     * 会话名称
+     */
+    dialogTitle?: string | null;
+    /**
+     * 会话头像
+     */
+    smallAvatarUrl?: string | null;
 }