@onyx-p/imlib-web 2.3.7 → 2.3.8

package/index.esm.js

@@ -7648,7 +7648,7 @@ function requireCryptoJs () {
 }
 
 var cryptoJsExports = requireCryptoJs();
-var CryptoJS$1 = /*@__PURE__*/getDefaultExportFromCjs(cryptoJsExports);
+var CryptoJS = /*@__PURE__*/getDefaultExportFromCjs(cryptoJsExports);
 
 function getType(value) {
   return Object.prototype.toString.call(value).slice(8, -1);
@@ -7735,8 +7735,8 @@ const throttle = (fn, delay = 200) => {
   };
 };
 
-const AesKey = CryptoJS$1.enc.Utf8.parse('skdjhfgc9829kslf');
-const AesIv = CryptoJS$1.enc.Utf8.parse('qwdkshjf9838jsdf');
+const AesKey = CryptoJS.enc.Utf8.parse('skdjhfgc9829kslf');
+const AesIv = CryptoJS.enc.Utf8.parse('qwdkshjf9838jsdf');
 const isElectron = () => {
   return typeof process !== 'undefined' && typeof process.versions !== 'undefined' && !!process.versions.electron;
 };
@@ -7795,12 +7795,12 @@ const SecureStorageService = {
       return null;
     }
     if (isDef(value)) {
-      const encryptedHexStr = CryptoJS$1.enc.Hex.parse(value);
-      const srcs = CryptoJS$1.enc.Base64.stringify(encryptedHexStr);
-      const decrypt = CryptoJS$1.AES.decrypt(srcs, AesKey, {
+      const encryptedHexStr = CryptoJS.enc.Hex.parse(value);
+      const srcs = CryptoJS.enc.Base64.stringify(encryptedHexStr);
+      const decrypt = CryptoJS.AES.decrypt(srcs, AesKey, {
         iv: AesIv
       });
-      value = decrypt.toString(CryptoJS$1.enc.Utf8);
+      value = decrypt.toString(CryptoJS.enc.Utf8);
     }
     if (!isDef(value)) {
       return value;
@@ -7817,7 +7817,7 @@ const SecureStorageService = {
       this.remove(key);
       return;
     }
-    const encryptedData = CryptoJS$1.AES.encrypt(JSON.stringify(value), AesKey, {
+    const encryptedData = CryptoJS.AES.encrypt(JSON.stringify(value), AesKey, {
       iv: AesIv
     });
     const encrytedStr = encryptedData.ciphertext.toString();
@@ -19554,18 +19554,18 @@ const aes256Encrypt = (message, secretKey) => {
   if (!notEmptyString(message)) {
     return '';
   }
-  const encryptedData = CryptoJS$1.AES.encrypt(message, CryptoJS$1.enc.Utf8.parse(secretKey.key), {
-    iv: isDef(secretKey.iv) ? CryptoJS$1.enc.Utf8.parse(secretKey.iv) : undefined
+  const encryptedData = CryptoJS.AES.encrypt(message, CryptoJS.enc.Utf8.parse(secretKey.key), {
+    iv: isDef(secretKey.iv) ? CryptoJS.enc.Utf8.parse(secretKey.iv) : undefined
   });
   return Array.from(wordToUInt8Array(encryptedData.ciphertext.words)).map(byte => byte.toString(16).padStart(2, '0')).join('');
 };
 const aes256Decrypt = (cipherHex, secretKey) => {
   const cipherData = new Uint8Array(cipherHex.match(/.{1,2}/g)?.map(byte => parseInt(byte, 16)) || []);
   const srcs = window.btoa(String.fromCharCode(...cipherData));
-  const decrypt = CryptoJS$1.AES.decrypt(srcs, CryptoJS$1.enc.Utf8.parse(secretKey.key), {
-    iv: isDef(secretKey.iv) ? CryptoJS$1.enc.Utf8.parse(secretKey.iv) : undefined
+  const decrypt = CryptoJS.AES.decrypt(srcs, CryptoJS.enc.Utf8.parse(secretKey.key), {
+    iv: isDef(secretKey.iv) ? CryptoJS.enc.Utf8.parse(secretKey.iv) : undefined
   });
-  return decrypt.toString(CryptoJS$1.enc.Utf8);
+  return decrypt.toString(CryptoJS.enc.Utf8);
 };
 const wordToUInt8Array = wordArray => {
   const array = [];
@@ -20744,14 +20744,14 @@ class MessageCache {
   }
   generateEncryptKey(appKey, userId) {
     const saltedInput = `${this.SALT_PREFIX}${appKey}_${userId}${this.SALT_SUFFIX}`;
-    const keyMaterial = CryptoJS$1.SHA256(saltedInput).toString();
+    const keyMaterial = CryptoJS.SHA256(saltedInput).toString();
     const iv = keyMaterial.substring(0, 16);
     const key = keyMaterial.substring(16, 48);
-    const additionalSalt = CryptoJS$1.SHA256(`${iv}:${this.SALT_PREFIX}:${userId}:${appKey}`).toString().substring(0, 8);
-    const finalKey = CryptoJS$1.PBKDF2(key, additionalSalt, {
+    const additionalSalt = CryptoJS.SHA256(`${iv}:${this.SALT_PREFIX}:${userId}:${appKey}`).toString().substring(0, 8);
+    const finalKey = CryptoJS.PBKDF2(key, additionalSalt, {
       keySize: 256 / 32,
       iterations: 1000,
-      hasher: CryptoJS$1.algo.SHA256
+      hasher: CryptoJS.algo.SHA256
     }).toString();
     this.encryptKey = {
       key: finalKey.substring(0, 32),
@@ -28942,13 +28942,21 @@ async function createSendFunction(fileType, conversation, msgBody, hooks, sendOp
   }
   message1.content.user = msgBody.user;
   message1.content.extra = msgBody.extra;
-  const encryptKey = generateEncryptKey();
+  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,
-    encryptKey: encryptKey,
-    task: (message2, toBeUploadedFiles) => {
+    uploadItems: mediaUploadParams,
+    task: (message2, uploadItems) => {
       return new Promise(resolve => {
-        imConfig.getUploader().upload(toBeUploadedFiles, encryptKey, {
+        uploader.upload(uploadItems, {
           onProgress: progress => hooks?.onProgress?.(progress),
           onError: () => {
             resolve({
@@ -28969,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, uploadOptions);
+  const checkResult = await beforeSend(conversation, message, options, uploadOptions?.uploadItems);
   if (checkResult.code !== ErrorCode.SUCCESS || !checkResult.message || !checkResult.sentArgs) {
     return {
       code: checkResult.code
@@ -28984,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);
@@ -29116,15 +29124,6 @@ async function saveSentMessage(receivedMessage, options) {
     logger.error('saveSentMessage -> ', error);
   }
 }
-function generateEncryptKey() {
-  const data = new Uint8Array(16);
-  for (let i = 0; i < 16; i++) {
-    data[i] = 65 + Math.floor(Math.random() * 26);
-  }
-  const key = String.fromCharCode(...data);
-  const md5Hash = CryptoJS.MD5(key).toString();
-  return md5Hash;
-}
 
 class IMClient extends EventEmitter {
   options;
@@ -30342,7 +30341,7 @@ const login = config => {
   return webSocketServer.request(0x30011011, {
     langCode: config.langCode,
     phoneNum: config.phone,
-    password: CryptoJS$1.SHA256(config.password).toString(),
+    password: CryptoJS.SHA256(config.password).toString(),
     deviceType: 7,
     imei: '59bc678b-fe6d-4e67-87c6-b0692205134b',
     brand: 'Chrome',

package/index.umd.js

@@ -7654,7 +7654,7 @@
   }
 
   var cryptoJsExports = requireCryptoJs();
-  var CryptoJS$1 = /*@__PURE__*/getDefaultExportFromCjs(cryptoJsExports);
+  var CryptoJS = /*@__PURE__*/getDefaultExportFromCjs(cryptoJsExports);
 
   function getType(value) {
     return Object.prototype.toString.call(value).slice(8, -1);
@@ -7741,8 +7741,8 @@
     };
   };
 
-  const AesKey = CryptoJS$1.enc.Utf8.parse('skdjhfgc9829kslf');
-  const AesIv = CryptoJS$1.enc.Utf8.parse('qwdkshjf9838jsdf');
+  const AesKey = CryptoJS.enc.Utf8.parse('skdjhfgc9829kslf');
+  const AesIv = CryptoJS.enc.Utf8.parse('qwdkshjf9838jsdf');
   const isElectron = () => {
     return typeof process !== 'undefined' && typeof process.versions !== 'undefined' && !!process.versions.electron;
   };
@@ -7801,12 +7801,12 @@
         return null;
       }
       if (isDef(value)) {
-        const encryptedHexStr = CryptoJS$1.enc.Hex.parse(value);
-        const srcs = CryptoJS$1.enc.Base64.stringify(encryptedHexStr);
-        const decrypt = CryptoJS$1.AES.decrypt(srcs, AesKey, {
+        const encryptedHexStr = CryptoJS.enc.Hex.parse(value);
+        const srcs = CryptoJS.enc.Base64.stringify(encryptedHexStr);
+        const decrypt = CryptoJS.AES.decrypt(srcs, AesKey, {
           iv: AesIv
         });
-        value = decrypt.toString(CryptoJS$1.enc.Utf8);
+        value = decrypt.toString(CryptoJS.enc.Utf8);
       }
       if (!isDef(value)) {
         return value;
@@ -7823,7 +7823,7 @@
         this.remove(key);
         return;
       }
-      const encryptedData = CryptoJS$1.AES.encrypt(JSON.stringify(value), AesKey, {
+      const encryptedData = CryptoJS.AES.encrypt(JSON.stringify(value), AesKey, {
         iv: AesIv
       });
       const encrytedStr = encryptedData.ciphertext.toString();
@@ -19560,18 +19560,18 @@
     if (!notEmptyString(message)) {
       return '';
     }
-    const encryptedData = CryptoJS$1.AES.encrypt(message, CryptoJS$1.enc.Utf8.parse(secretKey.key), {
-      iv: isDef(secretKey.iv) ? CryptoJS$1.enc.Utf8.parse(secretKey.iv) : undefined
+    const encryptedData = CryptoJS.AES.encrypt(message, CryptoJS.enc.Utf8.parse(secretKey.key), {
+      iv: isDef(secretKey.iv) ? CryptoJS.enc.Utf8.parse(secretKey.iv) : undefined
     });
     return Array.from(wordToUInt8Array(encryptedData.ciphertext.words)).map(byte => byte.toString(16).padStart(2, '0')).join('');
   };
   const aes256Decrypt = (cipherHex, secretKey) => {
     const cipherData = new Uint8Array(cipherHex.match(/.{1,2}/g)?.map(byte => parseInt(byte, 16)) || []);
     const srcs = window.btoa(String.fromCharCode(...cipherData));
-    const decrypt = CryptoJS$1.AES.decrypt(srcs, CryptoJS$1.enc.Utf8.parse(secretKey.key), {
-      iv: isDef(secretKey.iv) ? CryptoJS$1.enc.Utf8.parse(secretKey.iv) : undefined
+    const decrypt = CryptoJS.AES.decrypt(srcs, CryptoJS.enc.Utf8.parse(secretKey.key), {
+      iv: isDef(secretKey.iv) ? CryptoJS.enc.Utf8.parse(secretKey.iv) : undefined
     });
-    return decrypt.toString(CryptoJS$1.enc.Utf8);
+    return decrypt.toString(CryptoJS.enc.Utf8);
   };
   const wordToUInt8Array = wordArray => {
     const array = [];
@@ -20750,14 +20750,14 @@
     }
     generateEncryptKey(appKey, userId) {
       const saltedInput = `${this.SALT_PREFIX}${appKey}_${userId}${this.SALT_SUFFIX}`;
-      const keyMaterial = CryptoJS$1.SHA256(saltedInput).toString();
+      const keyMaterial = CryptoJS.SHA256(saltedInput).toString();
       const iv = keyMaterial.substring(0, 16);
       const key = keyMaterial.substring(16, 48);
-      const additionalSalt = CryptoJS$1.SHA256(`${iv}:${this.SALT_PREFIX}:${userId}:${appKey}`).toString().substring(0, 8);
-      const finalKey = CryptoJS$1.PBKDF2(key, additionalSalt, {
+      const additionalSalt = CryptoJS.SHA256(`${iv}:${this.SALT_PREFIX}:${userId}:${appKey}`).toString().substring(0, 8);
+      const finalKey = CryptoJS.PBKDF2(key, additionalSalt, {
         keySize: 256 / 32,
         iterations: 1000,
-        hasher: CryptoJS$1.algo.SHA256
+        hasher: CryptoJS.algo.SHA256
       }).toString();
       this.encryptKey = {
         key: finalKey.substring(0, 32),
@@ -28948,13 +28948,21 @@
     }
     message1.content.user = msgBody.user;
     message1.content.extra = msgBody.extra;
-    const encryptKey = generateEncryptKey();
+    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,
-      encryptKey: encryptKey,
-      task: (message2, toBeUploadedFiles) => {
+      uploadItems: mediaUploadParams,
+      task: (message2, uploadItems) => {
         return new Promise(resolve => {
-          imConfig.getUploader().upload(toBeUploadedFiles, encryptKey, {
+          uploader.upload(uploadItems, {
             onProgress: progress => hooks?.onProgress?.(progress),
             onError: () => {
               resolve({
@@ -28975,7 +28983,7 @@
     });
   }
   async function internal_sendMessage(conversation, message, options, uploadOptions) {
-    const checkResult = await beforeSend(conversation, message, options, uploadOptions);
+    const checkResult = await beforeSend(conversation, message, options, uploadOptions?.uploadItems);
     if (checkResult.code !== exports.ErrorCode.SUCCESS || !checkResult.message || !checkResult.sentArgs) {
       return {
         code: checkResult.code
@@ -28990,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);
@@ -29122,15 +29130,6 @@
       logger.error('saveSentMessage -> ', error);
     }
   }
-  function generateEncryptKey() {
-    const data = new Uint8Array(16);
-    for (let i = 0; i < 16; i++) {
-      data[i] = 65 + Math.floor(Math.random() * 26);
-    }
-    const key = String.fromCharCode(...data);
-    const md5Hash = CryptoJS.MD5(key).toString();
-    return md5Hash;
-  }
 
   class IMClient extends EventEmitter {
     options;
@@ -30348,7 +30347,7 @@
     return webSocketServer.request(0x30011011, {
       langCode: config.langCode,
       phoneNum: config.phone,
-      password: CryptoJS$1.SHA256(config.password).toString(),
+      password: CryptoJS.SHA256(config.password).toString(),
       deviceType: 7,
       imei: '59bc678b-fe6d-4e67-87c6-b0692205134b',
       brand: 'Chrome',

package/package.json

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

package/types/types.d.ts

@@ -130,10 +130,6 @@ export type IPushConfig = {
      */
     pushData?: string;
 };
-export interface IUploadMessageParams {
-    files: Blob[];
-    encryptKey: string;
-}
 /**
  * 发送消息时的可选项信息
  */
@@ -170,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;
@@ -182,8 +189,9 @@ export type IUploadCallback = {
     onError?: (reason: string) => void;
 };
 export interface IUploader {
-    upload(files: Blob[], encryptKey: string, callback: IUploadCallback): void;
+    upload(params: IUploadMessageParams, callback: IUploadCallback): void;
     cancel(): void;
+    prepare(files: Blob[]): Promise<IUploadPrepareResult>;
 }
 /**
  * 文件消息配置