@onyx-p/imlib-web 2.3.9 → 2.4.1

package/index.esm.js

@@ -28648,16 +28648,24 @@ const DefaultThumbnailConfig = {
   scale: 2.4
 };
 class Img {
-  async create(file) {
+  async create(file, sendOptions) {
     try {
       const blobUrl = getBlobUrl(file);
       const image = await getImageObj(blobUrl);
       revokeBlobUrl(blobUrl);
-      const {
-        imageFile: sentImageFile,
-        compressWidth,
-        compressHeight
-      } = compress(image, 0.85, file.type);
+      let sentImageFile;
+      let compressWidth;
+      let compressHeight;
+      if (sendOptions?.full) {
+        sentImageFile = file;
+        compressWidth = image.width;
+        compressHeight = image.height;
+      } else {
+        const compressResult = compress(image, 0.85, file.type);
+        sentImageFile = compressResult.imageFile;
+        compressWidth = compressResult.compressWidth;
+        compressHeight = compressResult.compressHeight;
+      }
       const thumbnail = getThumbnail(image, DefaultThumbnailConfig);
       return {
         success: true,
@@ -28832,8 +28840,8 @@ class Sight {
       return {
         success: true,
         message: new VideoMessage({
-          videoObjectKey: "",
-          thumbnailObjectKey: "",
+          videoObjectKey: '',
+          thumbnailObjectKey: '',
           during: formatDurationSeconds(duration),
           width,
           height,
@@ -28934,7 +28942,7 @@ async function createSendFunction(fileType, conversation, msgBody, hooks, sendOp
     success,
     message: message1,
     files
-  } = await mediaMessageCreator.create(msgBody.file);
+  } = await mediaMessageCreator.create(msgBody.file, sendOptions);
   if (!success || !message1 || !files) {
     return {
       code: ErrorCode.MEDIA_EXCEPTION
@@ -28945,6 +28953,10 @@ async function createSendFunction(fileType, conversation, msgBody, hooks, sendOp
   const uploader = imConfig.getUploader();
   try {
     const prepareResult = await uploader.prepare(files);
+    message1.content = mediaMessageCreator.updateMessageRemoteUrlProperty(message1.content, {
+      urls: prepareResult.items.map(item => item.url),
+      encryptedKey: prepareResult.encryptKey
+    });
     return internal_sendMessage(conversation, message1, sendOptions, {
       uploadItems: prepareResult,
       task: (message2, uploadItems) => {
@@ -28958,7 +28970,6 @@ async function createSendFunction(fileType, conversation, msgBody, hooks, sendOp
               });
             },
             onCompleted: result => {
-              message2.content = mediaMessageCreator.updateMessageRemoteUrlProperty(message2.content, result);
               resolve({
                 finished: true,
                 message: hooks?.onComplete?.(result) ?? message2

package/index.umd.js

@@ -28654,16 +28654,24 @@
     scale: 2.4
   };
   class Img {
-    async create(file) {
+    async create(file, sendOptions) {
       try {
         const blobUrl = getBlobUrl(file);
         const image = await getImageObj(blobUrl);
         revokeBlobUrl(blobUrl);
-        const {
-          imageFile: sentImageFile,
-          compressWidth,
-          compressHeight
-        } = compress(image, 0.85, file.type);
+        let sentImageFile;
+        let compressWidth;
+        let compressHeight;
+        if (sendOptions?.full) {
+          sentImageFile = file;
+          compressWidth = image.width;
+          compressHeight = image.height;
+        } else {
+          const compressResult = compress(image, 0.85, file.type);
+          sentImageFile = compressResult.imageFile;
+          compressWidth = compressResult.compressWidth;
+          compressHeight = compressResult.compressHeight;
+        }
         const thumbnail = getThumbnail(image, DefaultThumbnailConfig);
         return {
           success: true,
@@ -28838,8 +28846,8 @@
         return {
           success: true,
           message: new VideoMessage({
-            videoObjectKey: "",
-            thumbnailObjectKey: "",
+            videoObjectKey: '',
+            thumbnailObjectKey: '',
             during: formatDurationSeconds(duration),
             width,
             height,
@@ -28940,7 +28948,7 @@
       success,
       message: message1,
       files
-    } = await mediaMessageCreator.create(msgBody.file);
+    } = await mediaMessageCreator.create(msgBody.file, sendOptions);
     if (!success || !message1 || !files) {
       return {
         code: exports.ErrorCode.MEDIA_EXCEPTION
@@ -28951,6 +28959,10 @@
     const uploader = imConfig.getUploader();
     try {
       const prepareResult = await uploader.prepare(files);
+      message1.content = mediaMessageCreator.updateMessageRemoteUrlProperty(message1.content, {
+        urls: prepareResult.items.map(item => item.url),
+        encryptedKey: prepareResult.encryptKey
+      });
       return internal_sendMessage(conversation, message1, sendOptions, {
         uploadItems: prepareResult,
         task: (message2, uploadItems) => {
@@ -28964,7 +28976,6 @@
                 });
               },
               onCompleted: result => {
-                message2.content = mediaMessageCreator.updateMessageRemoteUrlProperty(message2.content, result);
                 resolve({
                   finished: true,
                   message: hooks?.onComplete?.(result) ?? message2

package/package.json

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

package/types/types.d.ts

@@ -200,6 +200,7 @@ export interface IUploadMessageOption extends ISendMessageOptions {
  */
 export interface IImageMessageOption extends IUploadMessageOption {
     thumbnailConfig?: IThumbnailConfig;
+    full?: boolean;
 }
 /**
  * 缩略图配置