@onyx-p/imlib-web 2.3.8 → 2.4.0

package/index.esm.js

@@ -28943,38 +28943,39 @@ 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, {
-    uploadItems: mediaUploadParams,
-    task: (message2, uploadItems) => {
-      return new Promise(resolve => {
-        uploader.upload(uploadItems, {
-          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
-            });
-          }
+  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) => {
+        return new Promise(resolve => {
+          uploader.upload(uploadItems, {
+            onProgress: progress => hooks?.onProgress?.(progress),
+            onError: () => {
+              resolve({
+                finished: false,
+                message: message2
+              });
+            },
+            onCompleted: result => {
+              resolve({
+                finished: true,
+                message: hooks?.onComplete?.(result) ?? message2
+              });
+            }
+          });
         });
-      });
-    }
-  });
+      }
+    });
+  } catch (error) {
+    return {
+      code: ErrorCode.UPLOAD_FILE_FAILED
+    };
+  }
 }
 async function internal_sendMessage(conversation, message, options, uploadOptions) {
   const checkResult = await beforeSend(conversation, message, options, uploadOptions?.uploadItems);

package/index.umd.js

@@ -28949,38 +28949,39 @@
     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, {
-      uploadItems: mediaUploadParams,
-      task: (message2, uploadItems) => {
-        return new Promise(resolve => {
-          uploader.upload(uploadItems, {
-            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
-              });
-            }
+    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) => {
+          return new Promise(resolve => {
+            uploader.upload(uploadItems, {
+              onProgress: progress => hooks?.onProgress?.(progress),
+              onError: () => {
+                resolve({
+                  finished: false,
+                  message: message2
+                });
+              },
+              onCompleted: result => {
+                resolve({
+                  finished: true,
+                  message: hooks?.onComplete?.(result) ?? message2
+                });
+              }
+            });
           });
-        });
-      }
-    });
+        }
+      });
+    } catch (error) {
+      return {
+        code: exports.ErrorCode.UPLOAD_FILE_FAILED
+      };
+    }
   }
   async function internal_sendMessage(conversation, message, options, uploadOptions) {
     const checkResult = await beforeSend(conversation, message, options, uploadOptions?.uploadItems);

package/package.json

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

package/types/types.d.ts

@@ -168,10 +168,6 @@ export interface IUploadHooks {
      */
     onComplete?: (result: IUploadCompletedResult) => void | BaseMessage;
 }
-export type IUploadPrepareResult = {
-    urls: string[];
-    encryptedKey: string;
-};
 export interface IUploadMessageParams {
     items: {
         url: string;
@@ -179,6 +175,7 @@ export interface IUploadMessageParams {
     }[];
     encryptKey: string;
 }
+export type IUploadPrepareResult = IUploadMessageParams;
 export type IUploadCompletedResult = {
     urls: string[];
     encryptedKey: string;