@rexxhayanasi/elaina-baileys 1.1.9 → 1.2.0-rc.2

package/lib/Socket/index.js

@@ -1,36 +1,10 @@
-"use strict"
-
-Object.defineProperty(exports, "__esModule", { value: true })
-
-const { DEFAULT_CONNECTION_CONFIG } = require("../Defaults")
-const { makeBusinessSocket } = require("./business")
-
-let __ACTIVE_SOCKET__ = null
-
-const makeWASocket = (config) => {
-  try {
-    if (__ACTIVE_SOCKET__) {
-      try {
-        __ACTIVE_SOCKET__.ev?.removeAllListeners?.()
-        __ACTIVE_SOCKET__.ws?.removeAllListeners?.()
-        __ACTIVE_SOCKET__.ws?.terminate?.()
-        __ACTIVE_SOCKET__.ws?.close?.()
-      } catch {}
-
-      try {
-        __ACTIVE_SOCKET__ = null
-      } catch {}
-    }
-  } catch {}
-
-  const sock = makeBusinessSocket({
-    ...DEFAULT_CONNECTION_CONFIG,
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Defaults_1 = require("../Defaults");
+const business_1 = require("./business");
+// export the last socket layer
+const makeWASocket = (config) => ((0, business_1.makeBusinessSocket)({
+    ...Defaults_1.DEFAULT_CONNECTION_CONFIG,
     ...config
-  })
-
-  __ACTIVE_SOCKET__ = sock
-
-  return sock
-}
-
-exports.default = makeWASocket
+}));
+exports.default = makeWASocket;

package/lib/Utils/async-iterable.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toAsyncIterable = void 0;
+
+/**
+ * Helper by @rexxhayanasi to convert various media inputs into an Async Iterable
+ * Compatible with Baileys buffer/stream handling
+ */
+function toAsyncIterable(input) {
+    if (!input) {
+        throw new Error("Invalid media stream (undefined/null)");
+    }
+
+    if (input[Symbol.asyncIterator]) {
+        return input;
+    }
+
+
+    if (Buffer.isBuffer(input)) {
+        return (async function* () {
+            yield input;
+        })();
+    }
+
+    if (typeof input === "string") {
+        const fs = require("fs");
+        return fs.createReadStream(input);
+    }
+
+    if (typeof input.on === "function") {
+        return (async function* () {
+            for await (const chunk of input) {
+                yield chunk;
+            }
+        })();
+    }
+
+    throw new Error("Unsupported media stream type");
+}
+
+exports.toAsyncIterable = toAsyncIterable;

package/lib/Utils/messages-media.js

@@ -61,6 +61,8 @@ 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([
@@ -82,13 +84,26 @@ 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';
+    
+    // Support Newsletter keys explicitly or fallback
+    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];
+    
+    // Fallback if type not found to prevent undefined key error
+    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) {
@@ -105,6 +120,7 @@ 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);
@@ -209,6 +225,7 @@ 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)}`);
@@ -245,6 +262,7 @@ async function vid2jpg(videoUrl) {
         throw new Error("Failed to convert video to JPG: " + error.message);
     }
 }
+
 /**
  * Extracts video thumbnail using FFmpeg
  */
@@ -275,6 +293,7 @@ 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) {
@@ -317,11 +336,13 @@ 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;
@@ -344,12 +365,14 @@ 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;
@@ -367,6 +390,7 @@ async function getAudioDuration(buffer) {
     }
     return metadata.format.duration;
 }
+
 async function getAudioWaveform(buffer, logger) {
     try {
         const { default: decoder } = await eval('import(\'audio-decode\')');
@@ -403,6 +427,7 @@ 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);
@@ -410,6 +435,7 @@ const toReadable = (buffer) => {
     return readable;
 };
 exports.toReadable = toReadable;
+
 const toBuffer = async (stream) => {
     const chunks = [];
     for await (const chunk of stream) {
@@ -419,6 +445,7 @@ 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' };
@@ -432,6 +459,7 @@ 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;
@@ -480,11 +508,13 @@ 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');
@@ -528,6 +558,7 @@ 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');
@@ -614,6 +645,7 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
     }
 };
 exports.encryptedStream = encryptedStream;
+
 const DEF_HOST = 'mmg.whatsapp.net';
 const AES_CHUNK_SIZE = 16;
 const toSmallestChunkSize = (num) => {
@@ -621,6 +653,7 @@ 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);
@@ -631,6 +664,7 @@ 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;
@@ -711,6 +745,7 @@ 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];
@@ -726,13 +761,24 @@ function extensionForMediaMessage(message) {
     }
     return extension;
 }
-    const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
+
+const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
     return async (stream, { mediaType, fileEncSha256B64, newsletter, timeoutMs }) => {
         var _a, _b;
         let uploadInfo = await refreshMediaConn(false);
         let urls;
         const hosts = [...customUploadHosts, ...uploadInfo.hosts];
         const chunks = [];
+        
+        // --- MODIFIKASI: Panggil via objek toAsyncIterable_1 ---
+        try {
+            // Kita akses properti .toAsyncIterable karena diimpor sebagai objek
+            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);
@@ -745,8 +791,13 @@ function extensionForMediaMessage(message) {
         if (mediaType === 'sticker-pack') {
             media = '/mms/image';
         }
+        
         if (newsletter) {
-            media = media === null || media === void 0 ? void 0 : media.replace('/mms/', '/newsletter/newsletter-');
+            if (media) {
+                media = media.replace('/mms/', '/newsletter/newsletter-');
+            } else {
+                media = '/newsletter/newsletter-image'; 
+            }
         }
 
         for (const { hostname, maxContentLengthBytes } of hosts) {
@@ -800,6 +851,7 @@ function extensionForMediaMessage(message) {
     };
 };
 exports.getWAUploadToServer = getWAUploadToServer;                
+
 const getMediaRetryKey = (mediaKey) => {
     return (0, crypto_1.hkdf)(mediaKey, 32, { info: 'WhatsApp Media Retry Notification' });
 };
@@ -838,6 +890,7 @@ const encryptMediaRetryRequest = async (key, mediaKey, meId) => {
     return req;
 };
 exports.encryptMediaRetryRequest = encryptMediaRetryRequest;
+
 const decodeMediaRetryNode = (node) => {
     const rmrNode = (0, WABinary_1.getBinaryNodeChild)(node, 'rmr');
     const event = {
@@ -867,20 +920,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

@@ -41,7 +41,10 @@ const MIMETYPE_MAP = {
     audio: 'audio/ogg; codecs=opus',
     sticker: 'image/webp',
     'product-catalog-image': 'image/jpeg',
-    'sticker-pack': 'application/x-zip-compressed'
+    '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,
@@ -85,36 +88,51 @@ 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]
+        media: message[mediaType] || message['ptv'] 
     };
+
     delete uploadData[mediaType];
-    
+    delete uploadData['ptv'];
+
     const cacheableKey = typeof uploadData.media === 'object' &&
         ('url' in uploadData.media) &&
         !!uploadData.media.url &&
         !!options.mediaCache && (
             mediaType + ':' + uploadData.media.url.toString());
-            
+
     if (mediaType === 'document' && !uploadData.fileName) {
         uploadData.fileName = 'file';
     }
     if (!uploadData.mimetype) {
         uploadData.mimetype = MIMETYPE_MAP[mediaType];
     }
-    
+
     if (cacheableKey) {
         const mediaBuff = options.mediaCache.get(cacheableKey);
         if (mediaBuff) {
@@ -130,20 +148,20 @@ const prepareWAMessageMedia = async (message, options) => {
 
     if (isNewsletter) {
         logger === null || logger === void 0 ? void 0 : logger.debug({ key: cacheableKey }, 'Preparing raw media for newsletter');
-        
+
         const { bodyPath, fileSha256, fileLength, didSaveToTmpPath } = await (0, messages_media_1.prepareStream)(
-            uploadData.media, 
-            options.mediaTypeOverride || mediaType, 
+            uploadData.media,
+            options.mediaTypeOverride || mediaType,
             { logger, opts: options.options }
         );
 
         const fileEncSha256B64 = fileSha256.toString('base64');
-        
-        const { mediaUrl, directPath } = await options.upload(bodyPath, { 
-            fileEncSha256B64, 
-            mediaType, 
+
+        const { mediaUrl, directPath } = await options.upload(bodyPath, {
+            fileEncSha256B64,
+            mediaType,
             timeoutMs: options.mediaUploadTimeoutMs,
-            newsletter: true
+            newsletter: true 
         });
 
         if (didSaveToTmpPath && bodyPath) {
@@ -165,7 +183,7 @@ const prepareWAMessageMedia = async (message, options) => {
             })
         });
 
-        if (uploadData.ptv) {
+        if (isPtv) {
             obj.ptvMessage = obj.videoMessage;
             delete obj.videoMessage;
         }
@@ -188,18 +206,23 @@ const prepareWAMessageMedia = async (message, options) => {
     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, {
         logger,
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
         opts: options.options
     });
-    
+
     const fileEncSha256B64 = (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 });
+            const result = await options.upload(encWriteStream, { 
+                fileEncSha256B64, 
+                mediaType, 
+                timeoutMs: options.mediaUploadTimeoutMs,
+                newsletter: false 
+            });
             logger === null || logger === void 0 ? void 0 : logger.debug({ mediaType, cacheableKey }, 'uploaded media');
             return result;
         })(),
@@ -258,7 +281,7 @@ const prepareWAMessageMedia = async (message, options) => {
         })
     });
 
-    if (uploadData.ptv) {
+    if (isPtv) {
         obj.ptvMessage = obj.videoMessage;
         delete obj.videoMessage;
     }
@@ -270,6 +293,7 @@ const prepareWAMessageMedia = async (message, options) => {
 };
 exports.prepareWAMessageMedia = prepareWAMessageMedia;
 
+
 const prepareDisappearingMessageSettingContent = (ephemeralExpiration) => {
     ephemeralExpiration = ephemeralExpiration || 0;
     const content = {
@@ -453,12 +477,11 @@ const generateWAMessageContent = async (message, options) => {
                 break;
         }
     }
-        else if ('ptv' in message && message.ptv) {
-        const { ptvMessage } = await (0, exports.prepareWAMessageMedia)({ 
-            video: message.ptv, 
-            ptv: true 
+            else if ('ptv' in message && message.ptv) {
+        const generated = await (0, exports.prepareWAMessageMedia)({ 
+            ptv: message.ptv 
         }, options);
-        m.ptvMessage = ptvMessage;
+        m.ptvMessage = generated.ptvMessage || generated.videoMessage;
     }
     else if ('product' in message) {
         const { imageMessage } = await (0, exports.prepareWAMessageMedia)({ image: message.product.productImage }, options);
@@ -1281,4 +1304,4 @@ const prepareStickerPackMessage = async (stickerPack, options) => {
 
     return { stickerPackMessage };
 };
-exports.prepareStickerPackMessage = prepareStickerPackMessage;
+exports.prepareStickerPackMessage = prepareStickerPackMessage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexxhayanasi/elaina-baileys",
-  "version": "1.1.9",
+  "version": "1.2.0-rc.2",
   "description": "Custom Baileys WhatsApp API",
   "keywords": [
     "baileys",