@onyx-p/imlib-web 2.3.6 → 2.3.8

package/index.esm.js

@@ -28942,11 +28942,21 @@ async function createSendFunction(fileType, conversation, msgBody, hooks, sendOp
   }
   message1.content.user = msgBody.user;
   message1.content.extra = msgBody.extra;
+  const uploader = imConfig.getUploader();
+  const prepareResult = await uploader.prepare(files);
+  const uploadItems = files.map((file, i) => ({
+    url: prepareResult.urls[i],
+    file: file
+  }));
+  const mediaUploadParams = {
+    encryptKey: prepareResult.encryptedKey,
+    items: uploadItems
+  };
   return internal_sendMessage(conversation, message1, sendOptions, {
-    files,
-    task: (message2, toBeUploadedFiles) => {
+    uploadItems: mediaUploadParams,
+    task: (message2, uploadItems) => {
       return new Promise(resolve => {
-        imConfig.getUploader().upload(toBeUploadedFiles, {
+        uploader.upload(uploadItems, {
           onProgress: progress => hooks?.onProgress?.(progress),
           onError: () => {
             resolve({
@@ -28967,7 +28977,7 @@ async function createSendFunction(fileType, conversation, msgBody, hooks, sendOp
   });
 }
 async function internal_sendMessage(conversation, message, options, uploadOptions) {
-  const checkResult = await beforeSend(conversation, message, options);
+  const checkResult = await beforeSend(conversation, message, options, uploadOptions?.uploadItems);
   if (checkResult.code !== ErrorCode.SUCCESS || !checkResult.message || !checkResult.sentArgs) {
     return {
       code: checkResult.code
@@ -28982,7 +28992,7 @@ async function internal_sendMessage(conversation, message, options, uploadOption
     sentArgs
   } = checkResult;
   if (isDef(uploadOptions)) {
-    const uploadResult = await uploadOptions.task(sentMessage, uploadOptions.files);
+    const uploadResult = await uploadOptions.task(sentMessage, uploadOptions.uploadItems);
     sentMessage = uploadResult.message;
     if (!uploadResult.finished) {
       const receivedMessage = transSentAttrs2IReceivedMessage(checkResult.message, checkResult.sentArgs, SentStatus.FAILED);
@@ -28995,7 +29005,7 @@ async function internal_sendMessage(conversation, message, options, uploadOption
   }
   return send(sentMessage, sentArgs);
 }
-async function beforeSend(conversation, message, options) {
+async function beforeSend(conversation, message, options, uploadOptions) {
   const mediaAttribute = JSON.stringify(filterNullProperty(message.content));
   if (getByteLength(mediaAttribute) > MAX_MESSAGE_CONTENT_BYTES) {
     return {
@@ -29014,7 +29024,7 @@ async function beforeSend(conversation, message, options) {
   };
   if (options?.onSendBefore) {
     const receivedMessage = transSentAttrs2IReceivedMessage(message, sentArgs);
-    options.onSendBefore(receivedMessage);
+    options.onSendBefore(receivedMessage, uploadOptions);
   }
   return {
     code: ErrorCode.SUCCESS,

package/index.umd.js

@@ -28948,11 +28948,21 @@
     }
     message1.content.user = msgBody.user;
     message1.content.extra = msgBody.extra;
+    const uploader = imConfig.getUploader();
+    const prepareResult = await uploader.prepare(files);
+    const uploadItems = files.map((file, i) => ({
+      url: prepareResult.urls[i],
+      file: file
+    }));
+    const mediaUploadParams = {
+      encryptKey: prepareResult.encryptedKey,
+      items: uploadItems
+    };
     return internal_sendMessage(conversation, message1, sendOptions, {
-      files,
-      task: (message2, toBeUploadedFiles) => {
+      uploadItems: mediaUploadParams,
+      task: (message2, uploadItems) => {
         return new Promise(resolve => {
-          imConfig.getUploader().upload(toBeUploadedFiles, {
+          uploader.upload(uploadItems, {
             onProgress: progress => hooks?.onProgress?.(progress),
             onError: () => {
               resolve({
@@ -28973,7 +28983,7 @@
     });
   }
   async function internal_sendMessage(conversation, message, options, uploadOptions) {
-    const checkResult = await beforeSend(conversation, message, options);
+    const checkResult = await beforeSend(conversation, message, options, uploadOptions?.uploadItems);
     if (checkResult.code !== exports.ErrorCode.SUCCESS || !checkResult.message || !checkResult.sentArgs) {
       return {
         code: checkResult.code
@@ -28988,7 +28998,7 @@
       sentArgs
     } = checkResult;
     if (isDef(uploadOptions)) {
-      const uploadResult = await uploadOptions.task(sentMessage, uploadOptions.files);
+      const uploadResult = await uploadOptions.task(sentMessage, uploadOptions.uploadItems);
       sentMessage = uploadResult.message;
       if (!uploadResult.finished) {
         const receivedMessage = transSentAttrs2IReceivedMessage(checkResult.message, checkResult.sentArgs, exports.SentStatus.FAILED);
@@ -29001,7 +29011,7 @@
     }
     return send(sentMessage, sentArgs);
   }
-  async function beforeSend(conversation, message, options) {
+  async function beforeSend(conversation, message, options, uploadOptions) {
     const mediaAttribute = JSON.stringify(filterNullProperty(message.content));
     if (getByteLength(mediaAttribute) > MAX_MESSAGE_CONTENT_BYTES) {
       return {
@@ -29020,7 +29030,7 @@
     };
     if (options?.onSendBefore) {
       const receivedMessage = transSentAttrs2IReceivedMessage(message, sentArgs);
-      options.onSendBefore(receivedMessage);
+      options.onSendBefore(receivedMessage, uploadOptions);
     }
     return {
       code: exports.ErrorCode.SUCCESS,

package/package.json

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

package/types/types.d.ts

@@ -137,7 +137,7 @@ export interface ISendMessageOptions {
     /**
      * 消息发送之前的回调
      */
-    onSendBefore?: (message: IReceivedMessage) => void;
+    onSendBefore?: (message: IReceivedMessage, uploadOptions?: IUploadMessageParams) => void;
     /**
      * 重发消息时用到，重发消息的 messageId。
      * 当要重发消息时所有参数需与原始消息参数一致，messageId 必须存在。
@@ -166,11 +166,22 @@ export interface IUploadHooks {
     /**
      * 文件上传完成回调，可通过修改返回值以修改待发布的消息内容，如实现自定义消息
      */
-    onComplete?: (fileInfo: IUploadCompletedResult) => void | BaseMessage;
+    onComplete?: (result: IUploadCompletedResult) => void | BaseMessage;
+}
+export type IUploadPrepareResult = {
+    urls: string[];
+    encryptedKey: string;
+};
+export interface IUploadMessageParams {
+    items: {
+        url: string;
+        file: Blob;
+    }[];
+    encryptKey: string;
 }
 export type IUploadCompletedResult = {
     urls: string[];
-    encryptedKey?: string;
+    encryptedKey: string;
 };
 export type IUploadCallback = {
     onProgress?: (progress: number) => void;
@@ -178,8 +189,9 @@ export type IUploadCallback = {
     onError?: (reason: string) => void;
 };
 export interface IUploader {
-    upload(files: Blob[], callback: IUploadCallback): void;
+    upload(params: IUploadMessageParams, callback: IUploadCallback): void;
     cancel(): void;
+    prepare(files: Blob[]): Promise<IUploadPrepareResult>;
 }
 /**
  * 文件消息配置