@rexxhayanasi/elaina-baileys 1.2.1-rc.2 → 1.2.1-rc.4

package/lib/Utils/messages-media.js

@@ -573,7 +573,10 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
     }
 };
 exports.prepareStream = prepareStream;
-const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
+const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts, isNewsletter } = {}) => {
+    if (isNewsletter) {
+        throw new Error('encryptedStream must not be used for newsletter media');
+    }
     const { stream, type } = await (0, exports.getStream)(media, opts);
     logger === null || logger === void 0 ? void 0 : logger.debug('fetched media stream');
     const mediaKey = Crypto.randomBytes(32);

package/lib/Utils/messages.js

@@ -107,80 +107,55 @@ const prepareWAMessageMedia = async (message, options) => {
         }
     }
 
-const isNewsletter = !!options.jid && (0, WABinary_1.isJidNewsletter)(options.jid);
+    const isNewsletter = !!options.jid && (0, WABinary_1.isJidNewsletter)(options.jid);
 
-if (isNewsletter) {
-    logger === null || logger === void 0 ? void 0 : logger.info({ key: cacheableKey }, 'Preparing raw media for newsletter');
+    if (isNewsletter) {
+        logger === null || logger === void 0 ? void 0 : logger.info({ key: cacheableKey }, 'Preparing raw media for newsletter');
+        
+        const { filePath, fileSha256, fileLength } = await (0, messages_media_1.getRawMediaUploadData)(
+            uploadData.media,
+            options.mediaTypeOverride || mediaType,
+            logger
+        );
 
-    const { filePath, fileSha256, fileLength } = await (0, messages_media_1.getRawMediaUploadData)(
-        uploadData.media,
-        options.mediaTypeOverride || mediaType,
-        logger
-    );
+        const fileSha256B64 = fileSha256.toString('base64');
+const uploadInput = filePath;
 
-    const fileSha256B64 = fileSha256.toString('base64');
+const { mediaUrl, directPath } = await options.upload(uploadInput, {
+    fileEncSha256B64: fileSha256B64,
+    mediaType
+});
 
-    try {
-        if (mediaType === 'video' || mediaType === 'image') {
-            const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(filePath, mediaType, options);
-            uploadData.jpegThumbnail = thumbnail;
+await fs_1.promises.unlink(filePath);
 
-            if (!uploadData.width && originalImageDimensions) {
-                uploadData.width = originalImageDimensions.width;
-                uploadData.height = originalImageDimensions.height;
-            }
-        }
-
-        if (mediaType === 'audio' || mediaType === 'video') {
-            if (typeof uploadData.seconds === 'undefined') {
-                uploadData.seconds = await (0, messages_media_1.getAudioDuration)(filePath);
-            }
-        }
+        const obj = Types_1.WAProto.Message.fromObject({
+            [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
+                url: mediaUrl,
+                directPath,
+                fileSha256,
+                fileLength,
+                ...uploadData,
+                media: undefined
+            })
+        });
 
-        if (mediaType === 'audio' && uploadData.ptt === true) {
-            uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(filePath, logger);
+        if (uploadData.ptv) {
+            obj.ptvMessage = obj.videoMessage;
+            delete obj.videoMessage;
         }
-    } catch (err) {
-        logger === null || logger === void 0 ? void 0 : logger.warn({ trace: err.stack }, 'Failed to generate metadata for newsletter media');
-    }
-
-    const streamToUpload = (0, fs_1.createReadStream)(filePath);
 
-    const { mediaUrl, directPath } = await options.upload(streamToUpload, {
-        fileEncSha256B64: fileSha256B64,
-        mediaType: mediaType,
-        timeoutMs: options.mediaUploadTimeoutMs
-    });
-
-    await fs_1.promises.unlink(filePath);
-
-    const obj = Types_1.WAProto.Message.fromObject({
-        [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
-            url: mediaUrl,
-            directPath,
-            fileSha256,
-            fileLength,
-            ...uploadData,
-            media: undefined
-        })
-    });
 
-    if (uploadData.ptv) {
-        obj.ptvMessage = obj.videoMessage;
-        delete obj.videoMessage;
-    }
+        if (obj.stickerMessage) {
+            obj.stickerMessage.stickerSentTs = Date.now();
+        }
 
-    if (obj.stickerMessage) {
-        obj.stickerMessage.stickerSentTs = Date.now();
-    }
+        if (cacheableKey) {
+            logger === null || logger === void 0 ? void 0 : logger.debug({ cacheableKey }, 'set cache');
+            options.mediaCache.set(cacheableKey, Types_1.WAProto.Message.encode(obj).finish());
+        }
 
-    if (cacheableKey) {
-        logger === null || logger === void 0 ? void 0 : logger.debug({ cacheableKey }, 'set cache');
-        options.mediaCache.set(cacheableKey, Types_1.WAProto.Message.encode(obj).finish());
+        return obj;
     }
-
-    return obj;
-}
     const requiresDurationComputation = mediaType === 'audio' && typeof uploadData.seconds === 'undefined';
     const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') &&
         (typeof uploadData['jpegThumbnail'] === 'undefined');
@@ -188,6 +163,7 @@ if (isNewsletter) {
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation;
     
+    // Enkripsi standar
     const { mediaKey, encWriteStream, bodyPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath, } = await (0, messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
         logger,
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
@@ -236,7 +212,7 @@ if (isNewsletter) {
         if (!Buffer.isBuffer(encWriteStream)) {
             encWriteStream.destroy();
         }
-        
+        // remove tmp files
         if (didSaveToTmpPath && bodyPath) {
             try {
                 await fs_1.promises.access(bodyPath);
@@ -275,6 +251,7 @@ if (isNewsletter) {
     return obj;
 };
 exports.prepareWAMessageMedia = prepareWAMessageMedia;
+
 const prepareDisappearingMessageSettingContent = (ephemeralExpiration) => {
     ephemeralExpiration = ephemeralExpiration || 0;
     const content = {
@@ -301,7 +278,7 @@ const generateForwardMessageContent = (message, forceForward) => {
     if (!content) {
         throw new boom_1.Boom('no content in message', { statusCode: 400 });
     }
-    
+    // hacky copy
     content = (0, exports.normalizeMessageContent)(content);
     content = WAProto_1.proto.Message.decode(WAProto_1.proto.Message.encode(content).finish());
     let key = Object.keys(content)[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexxhayanasi/elaina-baileys",
-  "version": "1.2.1-rc.2",
+  "version": "1.2.1-rc.4",
   "description": "Custom Baileys WhatsApp API",
   "keywords": [
     "baileys", 
@@ -53,7 +53,6 @@
     "audio-decode": "^2.1.3",
     "axios": "^1.6.0",
     "chalk": "^4.1.2",
-    "fflate": "^0.8.2",
     "gradient-string": "^2.0.2",
     "cache-manager": "^5.7.6",
     "cheerio": "^1.0.0-rc.12",