@periskope/baileys 6.7.18-alpha.4 → 6.7.18-alpha.5

package/lib/Utils/messages-media.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStatusCodeForMediaRetry = exports.decryptMediaRetryData = exports.decodeMediaRetryNode = exports.encryptMediaRetryRequest = exports.getWAUploadToServer = exports.downloadEncryptedContent = exports.downloadContentFromMessage = exports.getUrlFromDirectPath = exports.encryptedStream = exports.getHttpStream = exports.getStream = exports.toBuffer = exports.toReadable = exports.mediaMessageSHA256B64 = exports.generateProfilePicture = exports.encodeBase64EncodedStringForUpload = exports.extractImageThumb = exports.hkdfInfoKey = void 0;
+exports.getStatusCodeForMediaRetry = exports.decryptMediaRetryData = exports.decodeMediaRetryNode = exports.encryptMediaRetryRequest = exports.getWAUploadToServer = exports.downloadEncryptedContent = exports.downloadContentFromMessage = exports.getUrlFromDirectPath = exports.encryptedStream = exports.getHttpStream = exports.getStream = exports.toBuffer = exports.toReadable = exports.mediaMessageSHA256B64 = exports.generateProfilePicture = exports.encodeBase64EncodedStringForUpload = exports.extractImageThumb = exports.getRawMediaUploadData = exports.hkdfInfoKey = void 0;
 exports.processImage = processImage;
 exports.getMediaKeys = getMediaKeys;
 exports.getAudioDuration = getAudioDuration;
@@ -103,6 +103,45 @@ async function processImage(imageUrl) {
         return null;
     }
 }
+const getRawMediaUploadData = async (media, mediaType, logger) => {
+    const { stream } = await (0, exports.getStream)(media);
+    logger === null || logger === void 0 ? void 0 : logger.debug('got stream for raw upload');
+    const hasher = Crypto.createHash('sha256');
+    const filePath = (0, path_1.join)((0, os_1.tmpdir)(), mediaType + (0, generics_1.generateMessageIDV2)());
+    const fileWriteStream = (0, fs_1.createWriteStream)(filePath);
+    let fileLength = 0;
+    try {
+        for await (const data of stream) {
+            fileLength += data.length;
+            hasher.update(data);
+            if (!fileWriteStream.write(data)) {
+                await (0, events_1.once)(fileWriteStream, 'drain');
+            }
+        }
+        fileWriteStream.end();
+        await (0, events_1.once)(fileWriteStream, 'finish');
+        stream.destroy();
+        const fileSha256 = hasher.digest();
+        logger === null || logger === void 0 ? void 0 : logger.debug('hashed data for raw upload');
+        return {
+            filePath: filePath,
+            fileSha256,
+            fileLength
+        };
+    }
+    catch (error) {
+        fileWriteStream.destroy();
+        stream.destroy();
+        try {
+            await fs_1.promises.unlink(filePath);
+        }
+        catch (_a) {
+            //
+        }
+        throw error;
+    }
+};
+exports.getRawMediaUploadData = getRawMediaUploadData;
 /** generates all the keys required to encrypt/decrypt & sign a media message */
 async function getMediaKeys(buffer, mediaType) {
     if (!buffer) {
@@ -169,30 +208,25 @@ 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) => {
+const generateProfilePicture = async (mediaUpload, dimensions) => {
     var _a, _b;
-    let bufferOrFilePath;
+    let buffer;
+    const { width: w = 640, height: h = 640 } = dimensions || {};
     if (Buffer.isBuffer(mediaUpload)) {
-        bufferOrFilePath = mediaUpload;
-    }
-    else if ('url' in mediaUpload) {
-        const imageBuffer = await processImage(mediaUpload.url.toString());
-        if (imageBuffer) {
-            bufferOrFilePath = imageBuffer;
-        }
-        else {
-            bufferOrFilePath = mediaUpload.url.toString();
-        }
+        buffer = mediaUpload;
     }
     else {
-        bufferOrFilePath = await (0, exports.toBuffer)(mediaUpload.stream);
+        // Use getStream to handle all WAMediaUpload types (Buffer, Stream, URL)
+        const { stream } = await (0, exports.getStream)(mediaUpload);
+        // Convert the resulting stream to a buffer
+        buffer = await (0, exports.toBuffer)(stream);
     }
     const lib = await getImageProcessingLibrary();
     let img;
     if ('sharp' in lib && typeof ((_a = lib.sharp) === null || _a === void 0 ? void 0 : _a.default) === 'function') {
         img = lib.sharp
-            .default(bufferOrFilePath)
-            .resize(640, 640)
+            .default(buffer)
+            .resize(w, h)
             .jpeg({
             quality: 50
         })
@@ -200,10 +234,10 @@ const generateProfilePicture = async (mediaUpload) => {
     }
     else if ('jimp' in lib && typeof ((_b = lib.jimp) === null || _b === void 0 ? void 0 : _b.read) === 'function') {
         const { read, MIME_JPEG, RESIZE_BILINEAR } = lib.jimp;
-        const jimp = await read(bufferOrFilePath);
+        const jimp = await read(buffer);
         const min = Math.min(jimp.getWidth(), jimp.getHeight());
         const cropped = jimp.crop(0, 0, min, min);
-        img = cropped.quality(50).resize(640, 640, RESIZE_BILINEAR).getBufferAsync(MIME_JPEG);
+        img = cropped.quality(50).resize(w, h, RESIZE_BILINEAR).getBufferAsync(MIME_JPEG);
     }
     else {
         throw new boom_1.Boom('No image processing library available');
@@ -222,20 +256,17 @@ exports.mediaMessageSHA256B64 = mediaMessageSHA256B64;
 async function getAudioDuration(buffer) {
     const musicMetadata = await Promise.resolve().then(() => __importStar(require('music-metadata')));
     let metadata;
+    const options = {
+        duration: true
+    };
     if (Buffer.isBuffer(buffer)) {
-        metadata = await musicMetadata.parseBuffer(buffer, undefined, { duration: true });
+        metadata = await musicMetadata.parseBuffer(buffer, undefined, options);
     }
     else if (typeof buffer === 'string') {
-        const rStream = (0, fs_1.createReadStream)(buffer);
-        try {
-            metadata = await musicMetadata.parseStream(rStream, undefined, { duration: true });
-        }
-        finally {
-            rStream.destroy();
-        }
+        metadata = await musicMetadata.parseFile(buffer, options);
     }
     else {
-        metadata = await musicMetadata.parseStream(buffer, undefined, { duration: true });
+        metadata = await musicMetadata.parseStream(buffer, undefined, options);
     }
     return metadata.format.duration;
 }
@@ -436,7 +467,11 @@ const toSmallestChunkSize = (num) => {
 const getUrlFromDirectPath = (directPath) => `https://${DEF_HOST}${directPath}`;
 exports.getUrlFromDirectPath = getUrlFromDirectPath;
 const downloadContentFromMessage = async ({ mediaKey, directPath, url }, type, opts = {}) => {
-    const downloadUrl = url || (0, exports.getUrlFromDirectPath)(directPath);
+    const isValidMediaUrl = url === null || url === void 0 ? void 0 : url.startsWith('https://mmg.whatsapp.net/');
+    const downloadUrl = isValidMediaUrl ? url : (0, exports.getUrlFromDirectPath)(directPath);
+    if (!downloadUrl) {
+        throw new boom_1.Boom('No valid media URL or directPath present in message', { statusCode: 400 });
+    }
     const keys = await getMediaKeys(mediaKey, type);
     return (0, exports.downloadEncryptedContent)(downloadUrl, keys, opts);
 };

package/lib/Utils/messages.d.ts

@@ -1,6 +1,6 @@
 import { type Transform } from 'stream';
 import { proto } from '../../WAProto';
-import { AnyMediaMessageContent, AnyMessageContent, MediaGenerationOptions, MessageContentGenerationOptions, MessageGenerationOptions, MessageGenerationOptionsFromContent, MessageUserReceipt, WAMessage, WAMessageContent, WAProto } from '../Types';
+import { AnyMediaMessageContent, AnyMessageContent, MessageContentGenerationOptions, MessageGenerationOptions, MessageGenerationOptionsFromContent, MessageUserReceipt, WAMessage, WAMessageContent, WAProto } from '../Types';
 import { ILogger } from './logger';
 import { MediaDownloadOptions } from './messages-media';
 /**
@@ -10,7 +10,7 @@ import { MediaDownloadOptions } from './messages-media';
  */
 export declare const extractUrlFromText: (text: string) => string | undefined;
 export declare const generateLinkPreviewIfRequired: (text: string, getUrlInfo: MessageGenerationOptions["getUrlInfo"], logger: MessageGenerationOptions["logger"]) => Promise<import("../Types").WAUrlInfo | undefined>;
-export declare const prepareWAMessageMedia: (message: AnyMediaMessageContent, options: MediaGenerationOptions) => Promise<proto.Message>;
+export declare const prepareWAMessageMedia: (message: AnyMediaMessageContent, options: MessageContentGenerationOptions) => Promise<proto.Message>;
 export declare const prepareDisappearingMessageSettingContent: (ephemeralExpiration?: number) => proto.Message;
 /**
  * Generate forwarded message content like WA does

package/lib/Utils/messages.js

@@ -82,12 +82,10 @@ const prepareWAMessageMedia = async (message, options) => {
         media: message[mediaType]
     };
     delete uploadData[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';
@@ -95,7 +93,6 @@ const prepareWAMessageMedia = async (message, options) => {
     if (!uploadData.mimetype) {
         uploadData.mimetype = MIMETYPE_MAP[mediaType];
     }
-    // check for cache hit
     if (cacheableKey) {
         const mediaBuff = options.mediaCache.get(cacheableKey);
         if (mediaBuff) {
@@ -106,6 +103,37 @@ const prepareWAMessageMedia = async (message, options) => {
             return obj;
         }
     }
+    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');
+        const { filePath, fileSha256, fileLength } = await (0, messages_media_1.getRawMediaUploadData)(uploadData.media, options.mediaTypeOverride || mediaType, logger);
+        const fileSha256B64 = fileSha256.toString('base64');
+        const { mediaUrl, directPath } = await options.upload(filePath, {
+            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 (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;
@@ -116,7 +144,6 @@ const prepareWAMessageMedia = async (message, options) => {
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
         opts: options.options
     });
-    // url safe Base64 encode the SHA256 hash of the body
     const fileEncSha256B64 = fileEncSha256.toString('base64');
     const [{ mediaUrl, directPath }] = await Promise.all([
         (async () => {
@@ -399,12 +426,12 @@ const generateWAMessageContent = async (message, options) => {
             m.pollCreationMessageV2 = pollCreationMessage;
         }
         else {
-            if (message.poll.selectableCount > 0) {
+            if (message.poll.selectableCount === 1) {
                 //poll v3 is for single select polls
                 m.pollCreationMessageV3 = pollCreationMessage;
             }
             else {
-                // poll v3 for multiple choice polls
+                // poll for multiple choice polls
                 m.pollCreationMessage = pollCreationMessage;
             }
         }
@@ -456,7 +483,7 @@ const generateWAMessageFromContent = (jid, message, options) => {
     const key = (0, exports.getContentType)(innerMessage);
     const timestamp = (0, generics_1.unixTimestampSeconds)(options.timestamp);
     const { quoted, userJid } = options;
-    if (quoted) {
+    if (quoted && !(0, WABinary_1.isJidNewsletter)(jid)) {
         const participant = quoted.key.fromMe
             ? userJid
             : quoted.participant || quoted.key.participant || quoted.key.remoteJid;
@@ -487,7 +514,9 @@ const generateWAMessageFromContent = (jid, message, options) => {
         // and it's not a protocol message -- delete, toggle disappear message
         key !== 'protocolMessage' &&
         // already not converted to disappearing message
-        key !== 'ephemeralMessage') {
+        key !== 'ephemeralMessage' &&
+        // newsletters don't support ephemeral messages
+        !(0, WABinary_1.isJidNewsletter)(jid)) {
         innerMessage[key].contextInfo = {
             ...(innerMessage[key].contextInfo || {}),
             expiration: options.ephemeralExpiration || Defaults_1.WA_DEFAULT_EPHEMERAL
@@ -514,7 +543,8 @@ const generateWAMessage = async (jid, content, options) => {
     var _a;
     // ensure msg ID is with every log
     options.logger = (_a = options === null || options === void 0 ? void 0 : options.logger) === null || _a === void 0 ? void 0 : _a.child({ msgId: options.messageId });
-    return (0, exports.generateWAMessageFromContent)(jid, await (0, exports.generateWAMessageContent)(content, options), options);
+    // Pass jid in the options to generateWAMessageContent
+    return (0, exports.generateWAMessageFromContent)(jid, await (0, exports.generateWAMessageContent)(content, { ...options, jid }), options);
 };
 exports.generateWAMessage = generateWAMessage;
 /** Get the key to access the true type of content */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@periskope/baileys",
-  "version": "6.7.18-alpha.4",
+  "version": "6.7.18-alpha.5",
   "description": "WhatsApp API",  "keywords": [
     "whatsapp",
     "automation"
@@ -15,9 +15,7 @@
   "types": "lib/index.d.ts",
   "files": [
     "lib/*",
-    "WAProto/*.ts",
-    "WAProto/*.js",
-    "WASignalGroup/*.js",
+    "WAProto/*",
     "engine-requirements.js"
   ],
   "scripts": {