@rexxhayanasi/elaina-baileys 1.2.0-rc.8 → 1.2.0

package/README.MD

@@ -77,7 +77,9 @@
 > ❄️ `elaina-baileys` is a refined version of the Baileys library with cleaner API usage, exclusive features like album messaging, newsletter controls, and full-size profile uploads — tailored for modern WhatsApp automation needs.
 
 > **Christmas Update** 🎁
-> All update information is now redirected to the WhatsApp channel check at the bottom of the "homepage"
+> All update information is now redirected to the WhatsApp channel check at the bottom of the "homepage".
+
+> Udpate changelog see on our WhatsApp channel
 
 ---
 

package/lib/Utils/messages-media.js

@@ -61,8 +61,6 @@ const Defaults_1 = require("../Defaults");
 const WABinary_1 = require("../WABinary");
 const crypto_1 = require("./crypto");
 const generics_1 = require("./generics");
-const toAsyncIterable_1 = require("./async-iterable");
-
 const getTmpFilesDirectory = () => (0, os_1.tmpdir)();
 const getImageProcessingLibrary = async () => {
     const [_jimp, sharp] = await Promise.all([
@@ -84,21 +82,11 @@ const getImageProcessingLibrary = async () => {
     }
     throw new boom_1.Boom('No image processing library available');
 };
-
 const hkdfInfoKey = (type) => {
-    if (type === 'sticker-pack') return 'WhatsApp Image Keys';
-    if (type === 'ptv') return 'WhatsApp Video Keys';
-    if (type === 'newsletter-image') return 'WhatsApp Image Keys';
-    if (type === 'newsletter-video') return 'WhatsApp Video Keys';
-
     const hkdfInfo = Defaults_1.MEDIA_HKDF_KEY_MAPPING[type];
-    if (!hkdfInfo) {
-        return 'WhatsApp Image Keys'; 
-    }
     return `WhatsApp ${hkdfInfo} Keys`;
 };
 exports.hkdfInfoKey = hkdfInfoKey;
-
 /** generates all the keys required to encrypt/decrypt & sign a media message */
 async function getMediaKeys(buffer, mediaType) {
     if (!buffer) {
@@ -115,7 +103,6 @@ async function getMediaKeys(buffer, mediaType) {
         macKey: expandedMediaKey.slice(48, 80),
     };
 }
-
 async function uploadFile(buffer, logger) {
     const { fromBuffer } = await Promise.resolve().then(() => __importStar(require('file-type')));
     const fileType = await fromBuffer(buffer);
@@ -220,7 +207,6 @@ async function uploadFile(buffer, logger) {
     }
     throw new Error("All upload services failed.");
 }
-
 async function vid2jpg(videoUrl) {
     try {
         const { data } = await axios_1.default.get(`https://ezgif.com/video-to-jpg?url=${encodeURIComponent(videoUrl)}`);
@@ -257,7 +243,6 @@ async function vid2jpg(videoUrl) {
         throw new Error("Failed to convert video to JPG: " + error.message);
     }
 }
-
 /**
  * Extracts video thumbnail using FFmpeg
  */
@@ -288,7 +273,6 @@ const extractVideoThumb = async (videoPath, time = '00:00:00', size = { width: 2
     });
 };
 exports.extractVideoThumb = extractVideoThumb;
-
 const extractImageThumb = async (bufferOrFilePath, width = 32) => {
     var _a, _b;
     if (bufferOrFilePath instanceof stream_1.Readable) {
@@ -331,13 +315,11 @@ const extractImageThumb = async (bufferOrFilePath, width = 32) => {
     }
 };
 exports.extractImageThumb = extractImageThumb;
-
 const encodeBase64EncodedStringForUpload = (b64) => (encodeURIComponent(b64
     .replace(/\+/g, '-')
     .replace(/\//g, '_')
     .replace(/\=+$/, '')));
 exports.encodeBase64EncodedStringForUpload = encodeBase64EncodedStringForUpload;
-
 const generateProfilePicture = async (mediaUpload) => {
     let bufferOrFilePath;
     let img;
@@ -360,14 +342,12 @@ const generateProfilePicture = async (mediaUpload) => {
     };
 };
 exports.generateProfilePicture = generateProfilePicture;
-
 /** gets the SHA256 of the given media message */
 const mediaMessageSHA256B64 = (message) => {
     const media = Object.values(message)[0];
     return (media === null || media === void 0 ? void 0 : media.fileSha256) && Buffer.from(media.fileSha256).toString('base64');
 };
 exports.mediaMessageSHA256B64 = mediaMessageSHA256B64;
-
 async function getAudioDuration(buffer) {
     const musicMetadata = await Promise.resolve().then(() => __importStar(require('music-metadata')));
     let metadata;
@@ -385,7 +365,6 @@ async function getAudioDuration(buffer) {
     }
     return metadata.format.duration;
 }
-
 async function getAudioWaveform(buffer, logger) {
     try {
         const { default: decoder } = await eval('import(\'audio-decode\')');
@@ -422,7 +401,6 @@ async function getAudioWaveform(buffer, logger) {
         logger === null || logger === void 0 ? void 0 : logger.debug('Failed to generate waveform: ' + e);
     }
 }
-
 const toReadable = (buffer) => {
     const readable = new stream_1.Readable({ read: () => { } });
     readable.push(buffer);
@@ -430,7 +408,6 @@ const toReadable = (buffer) => {
     return readable;
 };
 exports.toReadable = toReadable;
-
 const toBuffer = async (stream) => {
     const chunks = [];
     for await (const chunk of stream) {
@@ -440,7 +417,6 @@ const toBuffer = async (stream) => {
     return Buffer.concat(chunks);
 };
 exports.toBuffer = toBuffer;
-
 const getStream = async (item, opts) => {
     if (Buffer.isBuffer(item)) {
         return { stream: (0, exports.toReadable)(item), type: 'buffer' };
@@ -454,7 +430,6 @@ const getStream = async (item, opts) => {
     return { stream: (0, fs_1.createReadStream)(item.url), type: 'file' };
 };
 exports.getStream = getStream;
-
 /** generates a thumbnail for a given media, if required */
 async function generateThumbnail(file, mediaType, options) {
     var _a;
@@ -503,13 +478,11 @@ async function generateThumbnail(file, mediaType, options) {
         originalImageDimensions
     };
 }
-
 const getHttpStream = async (url, options = {}) => {
     const fetched = await axios_1.default.get(url.toString(), { ...options, responseType: 'stream' });
     return fetched.data;
 };
 exports.getHttpStream = getHttpStream;
-
 const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
     const { stream, type } = await (0, exports.getStream)(media, opts);
     logger === null || logger === void 0 ? void 0 : logger.debug('fetched media stream');
@@ -553,7 +526,6 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
     }
 };
 exports.prepareStream = prepareStream;
-
 const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
     const { stream, type } = await (0, exports.getStream)(media, opts);
     logger === null || logger === void 0 ? void 0 : logger.debug('fetched media stream');
@@ -640,7 +612,6 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
     }
 };
 exports.encryptedStream = encryptedStream;
-
 const DEF_HOST = 'mmg.whatsapp.net';
 const AES_CHUNK_SIZE = 16;
 const toSmallestChunkSize = (num) => {
@@ -648,7 +619,6 @@ const toSmallestChunkSize = (num) => {
 };
 const getUrlFromDirectPath = (directPath) => `https://${DEF_HOST}${directPath}`;
 exports.getUrlFromDirectPath = getUrlFromDirectPath;
-
 const downloadContentFromMessage = async ({ mediaKey, directPath, url }, type, opts = {}) => {
     const isValidMediaUrl = url === null || url === void 0 ? void 0 : url.startsWith('https://mmg.whatsapp.net/');
     const downloadUrl = isValidMediaUrl ? url : (0, exports.getUrlFromDirectPath)(directPath);
@@ -659,7 +629,6 @@ const downloadContentFromMessage = async ({ mediaKey, directPath, url }, type, o
     return (0, exports.downloadEncryptedContent)(downloadUrl, keys, opts);
 };
 exports.downloadContentFromMessage = downloadContentFromMessage;
-
 const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startByte, endByte, options } = {}) => {
     let bytesFetched = 0;
     let startChunk = 0;
@@ -740,7 +709,6 @@ const downloadEncryptedContent = async (downloadUrl, { cipherKey, iv }, { startB
     return fetched.pipe(output, { end: true });
 };
 exports.downloadEncryptedContent = downloadEncryptedContent;
-
 function extensionForMediaMessage(message) {
     const getExtension = (mimetype) => mimetype.split(';')[0].split('/')[1];
     const type = Object.keys(message)[0];
@@ -756,7 +724,6 @@ function extensionForMediaMessage(message) {
     }
     return extension;
 }
-
 const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
     return async (stream, { mediaType, fileEncSha256B64, newsletter, timeoutMs }) => {
         var _a, _b;
@@ -764,14 +731,6 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
         let urls;
         const hosts = [...customUploadHosts, ...uploadInfo.hosts];
         const chunks = [];
-        
-        try {
-            stream = toAsyncIterable_1.toAsyncIterable(stream);
-        } catch (error) {
-             throw new boom_1.Boom(error.message, { statusCode: 400 });
-        }
-        // --------------------------------------------------------
-
         if (!Buffer.isBuffer(stream)) {
             for await (const chunk of stream) {
                 chunks.push(chunk);
@@ -779,20 +738,10 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
         }
         const reqBody = Buffer.isBuffer(stream) ? stream : Buffer.concat(chunks);
         fileEncSha256B64 = (0, exports.encodeBase64EncodedStringForUpload)(fileEncSha256B64);
-        
         let media = Defaults_1.MEDIA_PATH_MAP[mediaType];
-        if (mediaType === 'sticker-pack') {
-            media = '/mms/image';
-        }
-        
         if (newsletter) {
-            if (media) {
-                media = media.replace('/mms/', '/newsletter/newsletter-');
-            } else {
-                media = '/newsletter/newsletter-image'; 
-            }
+            media = media === null || media === void 0 ? void 0 : media.replace('/mms/', '/newsletter/newsletter-');
         }
-
         for (const { hostname, maxContentLengthBytes } of hosts) {
             logger.debug(`uploading to "${hostname}"`);
             const auth = encodeURIComponent(uploadInfo.auth);
@@ -843,8 +792,7 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
         return urls;
     };
 };
-exports.getWAUploadToServer = getWAUploadToServer;                
-
+exports.getWAUploadToServer = getWAUploadToServer;
 const getMediaRetryKey = (mediaKey) => {
     return (0, crypto_1.hkdf)(mediaKey, 32, { info: 'WhatsApp Media Retry Notification' });
 };
@@ -883,7 +831,6 @@ const encryptMediaRetryRequest = async (key, mediaKey, meId) => {
     return req;
 };
 exports.encryptMediaRetryRequest = encryptMediaRetryRequest;
-
 const decodeMediaRetryNode = (node) => {
     const rmrNode = (0, WABinary_1.getBinaryNodeChild)(node, 'rmr');
     const event = {
@@ -913,20 +860,20 @@ const decodeMediaRetryNode = (node) => {
     return event;
 };
 exports.decodeMediaRetryNode = decodeMediaRetryNode;
-
 const decryptMediaRetryData = async ({ ciphertext, iv }, mediaKey, msgId) => {
     const retryKey = await getMediaRetryKey(mediaKey);
     const plaintext = (0, crypto_1.aesDecryptGCM)(ciphertext, retryKey, iv, Buffer.from(msgId));
     return WAProto_1.proto.MediaRetryNotification.decode(plaintext);
 };
 exports.decryptMediaRetryData = decryptMediaRetryData;
-
 const getStatusCodeForMediaRetry = (code) => MEDIA_RETRY_STATUS_MAP[code];
 exports.getStatusCodeForMediaRetry = getStatusCodeForMediaRetry;
-
 const MEDIA_RETRY_STATUS_MAP = {
     [WAProto_1.proto.MediaRetryNotification.ResultType.SUCCESS]: 200,
     [WAProto_1.proto.MediaRetryNotification.ResultType.DECRYPTION_ERROR]: 412,
     [WAProto_1.proto.MediaRetryNotification.ResultType.NOT_FOUND]: 404,
     [WAProto_1.proto.MediaRetryNotification.ResultType.GENERAL_ERROR]: 418,
 };
+function __importStar(arg0) {
+    throw new Error('Function not implemented.');
+}

package/lib/Utils/messages.js

@@ -2,29 +2,11 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-Object.defineProperty(exports, "__esModule", { value: true })
-const getImageProcessingLibrary = async () => {
-    const lib = {};
-    try {
-        lib.sharp = require('sharp');
-    } catch {}
-    try {
-        lib.jimp = require('jimp');
-    } catch {}
-    return lib;
-};
-const isWebPBuffer = (buffer) => {
-    return buffer.length >= 12 && buffer.toString('ascii', 8, 12) === 'WEBP';
-};
-const isAnimatedWebP = (buffer) => {
-    if (!isWebPBuffer(buffer)) return false;
-    return buffer.includes(Buffer.from("ANIM")); 
-};
-exports.prepareStickerPackMessage = exports.assertMediaContent = exports.downloadMediaMessage = exports.aggregateMessageKeysNotFromMe = exports.updateMessageWithPollUpdate = exports.updateMessageWithReaction = exports.updateMessageWithReceipt = exports.getDevice = exports.extractMessageContent = exports.normalizeMessageContent = exports.getContentType = exports.generateWAMessage = exports.generateWAMessageFromContent = exports.generateWAMessageContent = exports.generateForwardMessageContent = exports.prepareDisappearingMessageSettingContent = exports.prepareWAMessageMedia = exports.generateLinkPreviewIfRequired = exports.extractUrlFromText = void 0;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertMediaContent = exports.downloadMediaMessage = exports.aggregateMessageKeysNotFromMe = exports.updateMessageWithPollUpdate = exports.updateMessageWithReaction = exports.updateMessageWithReceipt = exports.getDevice = exports.extractMessageContent = exports.normalizeMessageContent = exports.getContentType = exports.generateWAMessage = exports.generateWAMessageFromContent = exports.generateWAMessageContent = exports.generateForwardMessageContent = exports.prepareDisappearingMessageSettingContent = exports.prepareWAMessageMedia = exports.generateLinkPreviewIfRequired = exports.extractUrlFromText = void 0;
 exports.getAggregateVotesInPollMessage = getAggregateVotesInPollMessage;
 const boom_1 = require("@hapi/boom");
 const axios_1 = __importDefault(require("axios"));
-const fflate_1 = require("fflate"); 
 const crypto_1 = require("crypto");
 const fs_1 = require("fs");
 const WAProto_1 = require("../../WAProto");
@@ -41,10 +23,6 @@ const MIMETYPE_MAP = {
     audio: 'audio/ogg; codecs=opus',
     sticker: 'image/webp',
     'product-catalog-image': 'image/jpeg',
-    'sticker-pack': 'application/x-zip-compressed',
-    "ptv": "video/mp4", 
-    "newsletter-image": "image/jpeg", 
-    "newsletter-video": "video/mp4" 
 };
 const MessageTypeProto = {
     'image': Types_1.WAProto.Message.ImageMessage,
@@ -88,53 +66,36 @@ const assertColor = async (color) => {
         return assertedColor;
     }
 };
- const prepareWAMessageMedia = async (message, options) => {
+const prepareWAMessageMedia = async (message, options) => {
     const logger = options.logger;
     let mediaType;
-
     for (const key of Defaults_1.MEDIA_KEYS) {
         if (key in message) {
             mediaType = key;
         }
     }
-
-    if (!mediaType && 'ptv' in message) {
-        mediaType = 'ptv';
-    }
-
     if (!mediaType) {
         throw new boom_1.Boom('Invalid media type', { statusCode: 400 });
     }
-
-    let isPtv = false;
-    if (mediaType === 'ptv') {
-        isPtv = true;
-        mediaType = 'video';
-    }
-
     const uploadData = {
         ...message,
-        media: message[mediaType] || message['ptv'] 
+        media: message[mediaType]
     };
-
-    if (!(mediaType === 'audio' && uploadData.ptt)) {
     delete uploadData[mediaType];
-}
-     delete uploadData['ptv']; 
-
+    // check if cacheable + generate cache key
     const cacheableKey = typeof uploadData.media === 'object' &&
         ('url' in uploadData.media) &&
         !!uploadData.media.url &&
         !!options.mediaCache && (
-            mediaType + ':' + uploadData.media.url.toString());
-
+    // 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 mediaBuff = options.mediaCache.get(cacheableKey);
         if (mediaBuff) {
@@ -145,91 +106,22 @@ const assertColor = async (color) => {
             return obj;
         }
     }
-
-    const isNewsletter = options.newsletter || (options.jid && (0, WABinary_1.isJidNewsletter)(options.jid));
-    if (isNewsletter) {
-        logger === null || logger === void 0 ? void 0 : logger.debug({ key: cacheableKey }, 'Preparing raw media for newsletter');
-
-
-        const { bodyPath, fileSha256, fileLength, didSaveToTmpPath, encWriteStream } = await (0, messages_media_1.prepareStream)(
-            uploadData.media,
-            options.mediaTypeOverride || mediaType,
-            { logger, opts: options.options }
-        );
-
-        const fileEncSha256B64 = fileSha256.toString('base64');
-        const streamToUpload = bodyPath || encWriteStream;
-
-        const { mediaUrl, directPath } = await options.upload(streamToUpload, {
-            fileEncSha256B64,
-            mediaType,
-            timeoutMs: options.mediaUploadTimeoutMs,
-            newsletter: true 
-        });
-
-        if (didSaveToTmpPath && bodyPath) {
-            try {
-                await fs_1.promises.unlink(bodyPath);
-            } 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: mediaUrl,
-                directPath,
-                fileSha256,
-                fileLength,
-                ...uploadData,
-                media: undefined
-            })
-        });
-
-        if (mediaType === 'audio' && uploadData.ptt) {
-    obj.audioMessage.ptt = true;
-        }
-
-        if (isPtv) {
-            obj.ptvMessage = obj.videoMessage;
-            delete obj.videoMessage;
-        }
-
-        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());
-        }
-
-        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 (0, messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
+    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
     });
-
-    const fileEncSha256B64 = (fileEncSha256 !== null && fileEncSha256 !== void 0 ? fileEncSha256 : fileSha256).toString('base64');
-
+    // 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,
-                newsletter: false 
-            });
+            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;
         })(),
@@ -241,16 +133,21 @@ const assertColor = async (color) => {
                     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) {
@@ -258,10 +155,11 @@ const assertColor = async (color) => {
             }
         })(),
     ])
-    .finally(async () => {
+        .finally(async () => {
         if (!Buffer.isBuffer(encWriteStream)) {
             encWriteStream.destroy();
         }
+        // remove tmp files
         if (didSaveToTmpPath && bodyPath) {
             try {
                 await fs_1.promises.access(bodyPath);
@@ -273,7 +171,6 @@ const assertColor = async (color) => {
             }
         }
     });
-
     const obj = Types_1.WAProto.Message.fromObject({
         [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
             url: handle ? undefined : mediaUrl,
@@ -287,20 +184,17 @@ const assertColor = async (color) => {
             media: undefined
         })
     });
-
-    if (isPtv) {
+    if (uploadData.ptv) {
         obj.ptvMessage = obj.videoMessage;
         delete obj.videoMessage;
     }
-
     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) => {
     ephemeralExpiration = ephemeralExpiration || 0;
     const content = {
@@ -484,11 +378,9 @@ const generateWAMessageContent = async (message, options) => {
                 break;
         }
     }
-            else if ('ptv' in message && message.ptv) {
-        const generated = await (0, exports.prepareWAMessageMedia)({ 
-            ptv: message.ptv 
-        }, options);
-        m.ptvMessage = generated.ptvMessage || generated.videoMessage;
+    else if ('ptv' in message && message.ptv) {
+        const { videoMessage } = await (0, exports.prepareWAMessageMedia)({ video: message.video }, options);
+        m.ptvMessage = videoMessage;
     }
     else if ('product' in message) {
         const { imageMessage } = await (0, exports.prepareWAMessageMedia)({ image: message.product.productImage }, options);
@@ -1145,170 +1037,3 @@ const getSenderLid = (message) => {
     return { jid: sender, lid };
 };
 exports.getSenderLid = getSenderLid;
-
-/**
-   STICKER PACK FUNCTION RECODE BY
-   @RexxHayanasi < Maintainer @rexxhayanasi/elaina-baileys >
-   **/
-   
-const prepareStickerPackMessage = async (stickerPack, options) => {
-    const { stickers, name, publisher, packId, description } = stickerPack;
-
-    if (stickers.length > 60) {
-        throw new boom_1.Boom('Sticker pack exceeds the maximum limit of 60 stickers', { statusCode: 400 });
-    }
-
-    if (stickers.length === 0) {
-        throw new boom_1.Boom('Sticker pack must contain at least one sticker', { statusCode: 400 });
-    }
-
-    const stickerPackIdValue = packId || (0, generics_1.generateMessageIDV2)();
-    const lib = await getImageProcessingLibrary();
-    const stickerData = {};
-
-    const stickerPromises = stickers.map(async (s, i) => {
-        const { stream } = await (0, messages_media_1.getStream)(s.data);
-        const buffer = await (0, generics_1.toBuffer)(stream);
-
-        let webpBuffer;
-        let isAnimated = false;
-        const isWebP = isWebPBuffer(buffer);
-
-        if (isWebP) {
-            webpBuffer = buffer;
-            isAnimated = isAnimatedWebP(buffer);
-        } else if (lib.sharp) {
-            webpBuffer = await lib.sharp(buffer).webp().toBuffer();
-            isAnimated = false;
-        } else {
-            throw new boom_1.Boom(
-                'No image processing library (sharp) available for converting sticker to WebP. Either install sharp or provide stickers in WebP format.'
-            );
-        }
-
-        if (webpBuffer.length > 1024 * 1024) {
-            throw new boom_1.Boom(`Sticker at index ${i} exceeds the 1MB size limit`, { statusCode: 400 });
-        }
-
-        const hash = (0, crypto_2.sha256)(webpBuffer).toString('base64').replace(/\//g, '-');
-        const fileName = `${hash}.webp`;
-        
-        stickerData[fileName] = [new Uint8Array(webpBuffer), { level: 0 }];
-        
-        return {
-            fileName,
-            mimetype: 'image/webp',
-            isAnimated,
-            emojis: s.emojis || [],
-            accessibilityLabel: s.accessibilityLabel
-        };
-    });
-
-    const stickerMetadata = await Promise.all(stickerPromises);
-
-    const trayIconFileName = `${stickerPackIdValue}.webp`;
-    const { stream: coverStream } = await (0, messages_media_1.getStream)(stickerPack.cover);
-    const coverBuffer = await (0, generics_1.toBuffer)(coverStream);
-
-    let coverWebpBuffer;
-    const isCoverWebP = isWebPBuffer(coverBuffer);
-
-    if (isCoverWebP) {
-        coverWebpBuffer = coverBuffer;
-    } else if (lib.sharp) {
-        coverWebpBuffer = await lib.sharp(coverBuffer).webp().toBuffer();
-    } else {
-        throw new boom_1.Boom(
-            'No image processing library (sharp) available for converting cover to WebP. Either install sharp or provide cover in WebP format.'
-        );
-    }
-
-    stickerData[trayIconFileName] = [new Uint8Array(coverWebpBuffer), { level: 0 }];
-
-    const zipBuffer = await new Promise((resolve, reject) => {
-        (0, fflate_1.zip)(stickerData, (err, data) => {
-            if (err) {
-                reject(err);
-            } else {
-                resolve(Buffer.from(data));
-            }
-        });
-    });
-
-    const stickerPackSize = zipBuffer.length;
-
-    const stickerPackUpload = await (0, messages_media_1.encryptedStream)(zipBuffer, 'sticker-pack', {
-        logger: options.logger,
-        opts: options.options
-    });
-
-    const stickerPackUploadResult = await options.upload(stickerPackUpload.encFilePath, {
-        fileEncSha256B64: stickerPackUpload.fileEncSha256.toString('base64'),
-        mediaType: 'sticker-pack',
-        timeoutMs: options.mediaUploadTimeoutMs
-    });
-
-    await fs_1.promises.unlink(stickerPackUpload.encFilePath);
-
-    const stickerPackMessage = {
-        name: name,
-        publisher: publisher,
-        stickerPackId: stickerPackIdValue,
-        packDescription: description,
-        stickerPackOrigin: WAProto_1.proto.Message.StickerPackMessage.StickerPackOrigin.USER_CREATED,
-        stickerPackSize: stickerPackSize,
-        stickers: stickerMetadata,
-        fileSha256: stickerPackUpload.fileSha256,
-        fileEncSha256: stickerPackUpload.fileEncSha256,
-        mediaKey: stickerPackUpload.mediaKey,
-        directPath: stickerPackUploadResult.directPath,
-        fileLength: stickerPackUpload.fileLength,
-        mediaKeyTimestamp: (0, generics_1.unixTimestampSeconds)(),
-        trayIconFileName: trayIconFileName
-    };
-
-    try {
-        let thumbnailBuffer;
-        if (lib.sharp) {
-            thumbnailBuffer = await lib.sharp(coverBuffer).resize(252, 252).jpeg().toBuffer();
-        } else if (lib.jimp) {
-            const jimpImage = await lib.jimp.read(coverBuffer);
-            thumbnailBuffer = await jimpImage.resize(252, 252).getBufferAsync(lib.jimp.MIME_JPEG);
-        } else {
-            throw new Error('No image processing library available for thumbnail generation');
-        }
-
-        if (!thumbnailBuffer || thumbnailBuffer.length === 0) {
-            throw new Error('Failed to generate thumbnail buffer');
-        }
-
-        const thumbUpload = await (0, messages_media_1.encryptedStream)(thumbnailBuffer, 'thumbnail-sticker-pack', {
-            logger: options.logger,
-            opts: options.options,
-            mediaKey: stickerPackUpload.mediaKey 
-        });
-
-        const thumbUploadResult = await options.upload(thumbUpload.encFilePath, {
-            fileEncSha256B64: thumbUpload.fileEncSha256.toString('base64'),
-            mediaType: 'thumbnail-sticker-pack',
-            timeoutMs: options.mediaUploadTimeoutMs
-        });
-
-        await fs_1.promises.unlink(thumbUpload.encFilePath);
-
-        Object.assign(stickerPackMessage, {
-            thumbnailDirectPath: thumbUploadResult.directPath,
-            thumbnailSha256: thumbUpload.fileSha256,
-            thumbnailEncSha256: thumbUpload.fileEncSha256,
-            thumbnailHeight: 252,
-            thumbnailWidth: 252,
-            imageDataHash: (0, crypto_2.sha256)(thumbnailBuffer).toString('base64')
-        });
-
-    } catch (e) {
-        options.logger === null || options.logger === void 0 ? void 0 : options.logger.warn(`Thumbnail generation failed: ${e}`);
-    }
-
-    return { stickerPackMessage };
-};
-exports.prepareStickerPackMessage = prepareStickerPackMessage;

package/lib/Utils/newslettermedia.js

@@ -1,11 +1,13 @@
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareWAMessageMediaNewsletter = exports.getRawMediaUploadDataNewsletter = void 0;
+exports.getWAUploadToServerNewsletter = exports.prepareWAMessageMediaNewsletter = exports.getRawMediaUploadDataNewsletter = void 0;
 
 const crypto_1 = require("crypto");
 const boom_1 = require("@hapi/boom");
 const WAProto_1 = require("../../WAProto");
+const axios_1 = require("axios");
+const Defaults_1 = require("../Defaults");
 
 function getRawMediaUploadDataNewsletter(buffer) {
     if (!Buffer.isBuffer(buffer)) {
@@ -20,6 +22,60 @@ function getRawMediaUploadDataNewsletter(buffer) {
 }
 exports.getRawMediaUploadDataNewsletter = getRawMediaUploadDataNewsletter;
 
+function getWAUploadToServerNewsletter({ customUploadHosts = [], fetchAgent, logger, options = {} }, refreshMediaConn) {
+    return async (buffer, { mediaType, fileEncSha256B64 }) => {
+        if (!Buffer.isBuffer(buffer)) {
+            throw new boom_1.Boom("Upload expects Buffer");
+        }
+        let uploadInfo = await refreshMediaConn(false);
+        const hosts = [...customUploadHosts, ...uploadInfo.hosts];
+        let urls;
+        for (const { hostname, maxContentLengthBytes } of hosts) {
+            const auth = encodeURIComponent(uploadInfo.auth);
+            let mediaPath = Defaults_1.MEDIA_PATH_MAP[mediaType];
+            if (!mediaPath) {
+                mediaPath = "/newsletter/newsletter-image";
+            } else {
+                mediaPath = mediaPath.replace("/mms/", "/newsletter/newsletter-");
+            }
+            const url = `https://${hostname}${mediaPath}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`;
+            try {
+                if (maxContentLengthBytes && buffer.length > maxContentLengthBytes) {
+                    throw new boom_1.Boom("Body too large", { statusCode: 413 });
+                }
+                const res = await axios_1.default.post(url, buffer, {
+                    ...options,
+                    headers: {
+                        "Content-Type": "application/octet-stream",
+                        Origin: Defaults_1.DEFAULT_ORIGIN,
+                        ...(options.headers || {})
+                    },
+                    httpsAgent: fetchAgent,
+                    responseType: "json",
+                    maxBodyLength: Infinity,
+                    maxContentLength: Infinity
+                });
+                const result = res.data;
+                if (result?.url || result?.direct_path) {
+                    urls = {
+                        mediaUrl: result.url,
+                        directPath: result.direct_path
+                    };
+                    break;
+                }
+                uploadInfo = await refreshMediaConn(true);
+            } catch (err) {
+                logger?.warn?.({ err }, `Newsletter upload failed on ${hostname}`);
+            }
+        }
+        if (!urls) {
+            throw new boom_1.Boom("Newsletter media upload failed", { statusCode: 500 });
+        }
+        return urls;
+    };
+}
+exports.getWAUploadToServerNewsletter = getWAUploadToServerNewsletter;
+
 async function prepareWAMessageMediaNewsletter(message, options) {
     if (!options || typeof options.upload !== "function") {
         throw new boom_1.Boom("upload function is required");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexxhayanasi/elaina-baileys",
-  "version": "1.2.0-rc.8",
+  "version": "1.2.0",
   "description": "Custom Baileys WhatsApp API",
   "keywords": [
     "baileys", 
@@ -18,7 +18,7 @@
   "homepage": "https://whatsapp.com/channel/0029Vb70uHbD8SE2w5Q9M107",
   "license": "MIT",
   "publishConfig": {
-    "tag": "experimental"
+    "tag": "latest"
   },
   "author": "RexxHayanasi",
   "main": "lib/index.js",