@d0v3riz/baileys 6.7.20 → 6.7.22

package/lib/Utils/decode-wa-message.js

@@ -91,7 +91,8 @@ function decodeMessageNode(stanza, meId, meLid) {
         senderPn: (_c = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _c === void 0 ? void 0 : _c.sender_pn,
         participant,
         participantPn: (_d = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _d === void 0 ? void 0 : _d.participant_pn,
-        participantLid: (_e = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _e === void 0 ? void 0 : _e.participant_lid
+        participantLid: (_e = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _e === void 0 ? void 0 : _e.participant_lid,
+        ...(msgType === 'newsletter' && stanza.attrs.server_id ? { server_id: stanza.attrs.server_id } : {})
     };
     const fullMessage = {
         key,
@@ -124,6 +125,9 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                         const details = WAProto_1.proto.VerifiedNameCertificate.Details.decode(cert.details);
                         fullMessage.verifiedBizName = details.verifiedName;
                     }
+                    if (tag === 'unavailable' && attrs.type === 'view_once') {
+                        fullMessage.key.isViewOnce = true;
+                    }
                     if (tag !== 'enc' && tag !== 'plaintext') {
                         continue;
                     }

package/lib/Utils/generics.d.ts

@@ -88,3 +88,4 @@ export declare function trimUndefined(obj: {
     [_: string]: any;
 };
 export declare function bytesToCrockford(buffer: Buffer): string;
+export declare function encodeNewsletterMessage(message: proto.IMessage): Uint8Array;

package/lib/Utils/generics.js

@@ -8,6 +8,7 @@ exports.promiseTimeout = promiseTimeout;
 exports.bindWaitForEvent = bindWaitForEvent;
 exports.trimUndefined = trimUndefined;
 exports.bytesToCrockford = bytesToCrockford;
+exports.encodeNewsletterMessage = encodeNewsletterMessage;
 const boom_1 = require("@hapi/boom");
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = require("crypto");
@@ -394,3 +395,6 @@ function bytesToCrockford(buffer) {
     }
     return crockford.join('');
 }
+function encodeNewsletterMessage(message) {
+    return WAProto_1.proto.Message.encode(message).finish();
+}

package/lib/Utils/history.js

@@ -42,9 +42,6 @@ const processHistoryMessage = (item) => {
                 });
                 const msgs = chat.messages || [];
                 delete chat.messages;
-                delete chat.archived;
-                delete chat.muteEndTime;
-                delete chat.pinned;
                 for (const item of msgs) {
                     const message = item.message;
                     messages.push(message);
@@ -64,9 +61,6 @@ const processHistoryMessage = (item) => {
                         });
                     }
                 }
-                if ((0, WABinary_1.isJidUser)(chat.id) && chat.readOnly && chat.archived) {
-                    delete chat.readOnly;
-                }
                 chats.push({ ...chat });
             }
             break;

package/lib/Utils/messages-media.d.ts

@@ -7,17 +7,25 @@ import { DownloadableMessage, MediaConnInfo, MediaDecryptionKeyInfo, MediaType,
 import { BinaryNode } from '../WABinary';
 import { ILogger } from './logger';
 export declare const hkdfInfoKey: (type: MediaType) => string;
+export declare const getRawMediaUploadData: (media: WAMediaUpload, mediaType: MediaType, logger?: ILogger) => Promise<{
+    filePath: string;
+    fileSha256: Buffer<ArrayBufferLike>;
+    fileLength: number;
+}>;
 /** generates all the keys required to encrypt/decrypt & sign a media message */
 export declare function getMediaKeys(buffer: Uint8Array | string | null | undefined, mediaType: MediaType): Promise<MediaDecryptionKeyInfo>;
 export declare const extractImageThumb: (bufferOrFilePath: Readable | Buffer | string, width?: number) => Promise<{
     buffer: Buffer<ArrayBufferLike>;
     original: {
-        width: number | undefined;
-        height: number | undefined;
+        width: number;
+        height: number;
     };
 }>;
 export declare const encodeBase64EncodedStringForUpload: (b64: string) => string;
-export declare const generateProfilePicture: (mediaUpload: WAMediaUpload) => Promise<{
+export declare const generateProfilePicture: (mediaUpload: WAMediaUpload, dimensions?: {
+    width: number;
+    height: number;
+}) => Promise<{
     img: Buffer<ArrayBufferLike>;
 }>;
 /** gets the SHA256 of the given media message */

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.getMediaKeys = getMediaKeys;
 exports.getAudioDuration = getAudioDuration;
 exports.getAudioWaveform = getAudioWaveform;
@@ -58,20 +58,10 @@ const crypto_1 = require("./crypto");
 const generics_1 = require("./generics");
 const getTmpFilesDirectory = () => (0, os_1.tmpdir)();
 const getImageProcessingLibrary = async () => {
-    const [_jimp, sharp] = await Promise.all([
-        (async () => {
-            const jimp = await Promise.resolve().then(() => __importStar(require('jimp'))).catch(() => { });
-            return jimp;
-        })(),
-        (async () => {
-            const sharp = await Promise.resolve().then(() => __importStar(require('sharp'))).catch(() => { });
-            return sharp;
-        })()
-    ]);
+    const [jimp, sharp] = await Promise.all([Promise.resolve().then(() => __importStar(require('jimp'))).catch(() => { }), Promise.resolve().then(() => __importStar(require('sharp'))).catch(() => { })]);
     if (sharp) {
         return { sharp };
     }
-    const jimp = (_jimp === null || _jimp === void 0 ? void 0 : _jimp.default) || _jimp;
     if (jimp) {
         return { jimp };
     }
@@ -82,6 +72,45 @@ const hkdfInfoKey = (type) => {
     return `WhatsApp ${hkdfInfo} Keys`;
 };
 exports.hkdfInfoKey = hkdfInfoKey;
+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) {
@@ -128,14 +157,15 @@ const extractImageThumb = async (bufferOrFilePath, width = 32) => {
             }
         };
     }
-    else if ('jimp' in lib && typeof ((_b = lib.jimp) === null || _b === void 0 ? void 0 : _b.read) === 'function') {
-        const { read, MIME_JPEG, RESIZE_BILINEAR, AUTO } = lib.jimp;
-        const jimp = await read(bufferOrFilePath);
+    else if ('jimp' in lib && typeof ((_b = lib.jimp) === null || _b === void 0 ? void 0 : _b.Jimp) === 'object') {
+        const jimp = await lib.jimp.default.Jimp.read(bufferOrFilePath);
         const dimensions = {
-            width: jimp.getWidth(),
-            height: jimp.getHeight()
+            width: jimp.width,
+            height: jimp.height
         };
-        const buffer = await jimp.quality(50).resize(width, AUTO, RESIZE_BILINEAR).getBufferAsync(MIME_JPEG);
+        const buffer = await jimp
+            .resize({ w: width, mode: lib.jimp.ResizeStrategy.BILINEAR })
+            .getBuffer('image/jpeg', { quality: 50 });
         return {
             buffer,
             original: dimensions
@@ -148,35 +178,35 @@ 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) {
-        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
         })
             .toBuffer();
     }
-    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 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);
+    else if ('jimp' in lib && typeof ((_b = lib.jimp) === null || _b === void 0 ? void 0 : _b.Jimp) === 'object') {
+        const jimp = await lib.jimp.default.Jimp.read(buffer);
+        const min = Math.min(jimp.width, jimp.height);
+        const cropped = jimp.crop({ x: 0, y: 0, w: min, h: min });
+        img = cropped.resize({ w, h, mode: lib.jimp.ResizeStrategy.BILINEAR }).getBuffer('image/jpeg', { quality: 50 });
     }
     else {
         throw new boom_1.Boom('No image processing library available');
@@ -273,7 +303,12 @@ const getStream = async (item, opts) => {
     if ('stream' in item) {
         return { stream: item.stream, type: 'readable' };
     }
-    if (item.url.toString().startsWith('http://') || item.url.toString().startsWith('https://')) {
+    const urlStr = item.url.toString();
+    if (urlStr.startsWith('data:')) {
+        const buffer = Buffer.from(urlStr.split(',')[1], 'base64');
+        return { stream: (0, exports.toReadable)(buffer), type: 'buffer' };
+    }
+    if (urlStr.startsWith('http://') || urlStr.startsWith('https://')) {
         return { stream: await (0, exports.getHttpStream)(item.url, opts), type: 'remote' };
     }
     return { stream: (0, fs_1.createReadStream)(item.url), type: 'file' };
@@ -406,7 +441,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, contextInfo } = options;
-    if (quoted) {
+    if (quoted && !(0, WABinary_1.isJidNewsletter)(jid)) {
         const participant = quoted.key.fromMe
             ? userJid
             : quoted.participant || quoted.key.participant || quoted.key.remoteJid;
@@ -491,7 +518,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
@@ -518,7 +547,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/lib/WAUSync/Protocols/USyncDisappearingModeProtocol.js

@@ -16,7 +16,7 @@ class USyncDisappearingModeProtocol {
         return null;
     }
     parser(node) {
-        if (node.tag === 'status') {
+        if (node.tag === 'disappearing_mode') {
             (0, WABinary_1.assertNodeErrorFree)(node);
             const duration = +(node === null || node === void 0 ? void 0 : node.attrs.duration);
             const setAt = new Date(+((node === null || node === void 0 ? void 0 : node.attrs.t) || 0) * 1000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d0v3riz/baileys",
-  "version": "6.7.20",
+  "version": "6.7.22",
   "description": "A WebSockets library for interacting with WhatsApp Web",
   "keywords": [
     "whatsapp",
@@ -62,14 +62,14 @@
     "eslint-config-prettier": "^10.1.2",
     "eslint-plugin-prettier": "^5.4.0",
     "jest": "^29.7.0",
-    "jimp": "^0.16.1",
+    "jimp": "^1.6.0",
     "json": "^11.0.0",
     "link-preview-js": "^3.0.0",
     "open": "^8.4.2",
     "prettier": "^3.5.3",
     "protobufjs-cli": "^1.1.3",
     "release-it": "^15.10.3",
-    "sharp": "^0.32.6",
+    "sharp": "^0.34.2",
     "ts-jest": "^29.3.2",
     "ts-node": "^10.8.1",
     "typedoc": "^0.27.9",
@@ -78,9 +78,9 @@
   },
   "peerDependencies": {
     "audio-decode": "^2.1.3",
-    "jimp": "^0.16.1",
+    "jimp": "^1.6.0",
     "link-preview-js": "^3.0.0",
-    "sharp": "^0.32.6"
+    "sharp": "^0.34.2"
   },
   "peerDependenciesMeta": {
     "audio-decode": {