@hbmodsofc/baileys 3.0.0 → 3.2.0

package/lib/Utils/messages.js

@@ -67,46 +67,132 @@ const assertColor = async (color) => {
     }
 };
 const prepareWAMessageMedia = async (message, options) => {
-    let mediaType = MEDIA_KEYS.find(key => key in message);
-    if (!mediaType) throw new Boom('Invalid media type', { statusCode: 400 });
-
-    const uploadData = { ...message, media: message[mediaType] };
+    const logger = options.logger;
+    let mediaType;
+    for (const key of Defaults_1.MEDIA_KEYS) {
+        if (key in message) {
+            mediaType = key;
+        }
+    }
+    if (!mediaType) {
+        throw new boom_1.Boom('Invalid media type', { statusCode: 400 });
+    }
+    const uploadData = {
+        ...message,
+        media: message[mediaType]
+    };
     delete uploadData[mediaType];
-
-    const cacheableKey = typeof uploadData.media === 'object' && 'url' in uploadData.media && uploadData.media.url && options.mediaCache
-        ? `${mediaType}:${uploadData.media.url.toString()}` : null;
-
-    if (mediaType === 'document' && !uploadData.fileName) uploadData.fileName = 'file';
-    if (!uploadData.mimetype) uploadData.mimetype = MIMETYPE_MAP[mediaType];
-
+    // check if cacheable + generate cache key
+    const cacheableKey = typeof uploadData.media === 'object' &&
+        ('url' in uploadData.media) &&
+        !!uploadData.media.url &&
+        !!options.mediaCache && (
+    // generate the key
+    mediaType + ':' + uploadData.media.url.toString());
+    if (mediaType === 'document' && !uploadData.fileName) {
+        uploadData.fileName = 'file';
+    }
+    if (!uploadData.mimetype) {
+        uploadData.mimetype = MIMETYPE_MAP[mediaType];
+    }
+    // check for cache hit
     if (cacheableKey) {
-        const cached = await options.mediaCache?.get(cacheableKey);
-        if (cached) {
-            const obj = proto.Message.decode(cached);
-            Object.assign(obj[`${mediaType}Message`], { ...uploadData, media: undefined });
+        const mediaBuff = options.mediaCache.get(cacheableKey);
+        if (mediaBuff) {
+            logger === null || logger === void 0 ? void 0 : logger.debug({ cacheableKey }, 'got media cache hit');
+            const obj = Types_1.WAProto.Message.decode(mediaBuff);
+            const key = `${mediaType}Message`;
+            Object.assign(obj[key], { ...uploadData, media: undefined });
             return obj;
         }
     }
-
-    if (isJidNewsletter(options.jid)) {
-        const { filePath, fileSha256, fileLength } = await getRawMediaUploadData(uploadData.media, options.mediaTypeOverride || mediaType, options.logger);
-        const { mediaUrl, directPath } = await options.upload(filePath, {
-            fileEncSha256B64: fileSha256.toString('base64'),
-            mediaType, timeoutMs: options.mediaUploadTimeoutMs
-        });
-        await fs.unlink(filePath);
-        const obj = 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 (cacheableKey) await options.mediaCache?.set(cacheableKey, WAProto.Message.encode(obj).finish());
-        return obj;
+    const requiresDurationComputation = mediaType === 'audio' && typeof uploadData.seconds === 'undefined';
+    const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') &&
+        (typeof uploadData['jpegThumbnail'] === 'undefined');
+    const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true;
+    const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
+    const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation;
+    const { mediaKey, encWriteStream, bodyPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath, } = await (options.newsletter ? messages_media_1.prepareStream : messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
+        logger,
+        saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
+        opts: options.options
+    });
+    // url safe Base64 encode the SHA256 hash of the body
+    const fileEncSha256B64 = (options.newsletter ? fileSha256 : fileEncSha256 !== null && fileEncSha256 !== void 0 ? fileEncSha256 : fileSha256).toString('base64');
+    const [{ mediaUrl, directPath, handle }] = await Promise.all([
+        (async () => {
+            const result = await options.upload(encWriteStream, { fileEncSha256B64, mediaType, timeoutMs: options.mediaUploadTimeoutMs });
+            logger === null || logger === void 0 ? void 0 : logger.debug({ mediaType, cacheableKey }, 'uploaded media');
+            return result;
+        })(),
+        (async () => {
+            try {
+                if (requiresThumbnailComputation) {
+                    const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(bodyPath, mediaType, options);
+                    uploadData.jpegThumbnail = thumbnail;
+                    if (!uploadData.width && originalImageDimensions) {
+                        uploadData.width = originalImageDimensions.width;
+                        uploadData.height = originalImageDimensions.height;
+                        logger === null || logger === void 0 ? void 0 : logger.debug('set dimensions');
+                    }
+                    logger === null || logger === void 0 ? void 0 : logger.debug('generated thumbnail');
+                }
+                if (requiresDurationComputation) {
+                    uploadData.seconds = await (0, messages_media_1.getAudioDuration)(bodyPath);
+                    logger === null || logger === void 0 ? void 0 : logger.debug('computed audio duration');
+                }
+                if (requiresWaveformProcessing) {
+                    uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(bodyPath, logger);
+                    logger === null || logger === void 0 ? void 0 : logger.debug('processed waveform');
+                }
+                if (requiresAudioBackground) {
+                    uploadData.backgroundArgb = await assertColor(options.backgroundColor);
+                    logger === null || logger === void 0 ? void 0 : logger.debug('computed backgroundColor audio status');
+                }
+            }
+            catch (error) {
+                logger === null || logger === void 0 ? void 0 : logger.warn({ trace: error.stack }, 'failed to obtain extra info');
+            }
+        })(),
+    ])
+        .finally(async () => {
+        if (!Buffer.isBuffer(encWriteStream)) {
+            encWriteStream.destroy();
+        }
+        // remove tmp files
+        if (didSaveToTmpPath && bodyPath) {
+            try {
+                await fs_1.promises.access(bodyPath);
+                await fs_1.promises.unlink(bodyPath);
+                logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp file');
+            }
+            catch (error) {
+                logger === null || logger === void 0 ? void 0 : logger.warn('failed to remove tmp file');
+            }
+        }
+    });
+    const obj = Types_1.WAProto.Message.fromObject({
+        [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
+            url: handle ? undefined : mediaUrl,
+            directPath,
+            mediaKey: mediaKey,
+            fileEncSha256: fileEncSha256,
+            fileSha256,
+            fileLength,
+            mediaKeyTimestamp: handle ? undefined : (0, generics_1.unixTimestampSeconds)(),
+            ...uploadData,
+            media: undefined
+        })
+    });
+    if (uploadData.ptv) {
+        obj.ptvMessage = obj.videoMessage;
+        delete obj.videoMessage;
     }
-
-    return createMediaMessage(uploadData, mediaType, options, cacheableKey);
+    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;
 };
 exports.prepareWAMessageMedia = prepareWAMessageMedia;
 const prepareDisappearingMessageSettingContent = (ephemeralExpiration) => {

package/lib/index.js

@@ -80,6 +80,5 @@ __exportStar(require("./Defaults"), exports);
 __exportStar(require("./WABinary"), exports);
 __exportStar(require("./WAM"), exports);
 __exportStar(require("./WAUSync"), exports);
-__exportStar(require("./Api"), exports);
 
 exports.default = Socket_1.default;

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@hbmodsofc/baileys",
-   "version": "3.0.0",
+   "version": "3.2.0",
    "description": "HBMods-OFC modified Baileys WhatsApp API for custom bots and personal projects",
    "keywords": [
       "HBWABot",