gifted-baileys 1.5.0 → 1.5.4

package/lib/Utils/generics.js

@@ -3,7 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bytesToCrockford = exports.trimUndefined = exports.isWABusinessPlatform = exports.getCodeFromWSError = exports.getCallStatusFromNode = exports.getErrorCodeFromStreamError = exports.getStatusFromReceiptType = exports.generateMdTagPrefix = exports.fetchLatestWaWebVersion = exports.fetchLatestBaileysVersion = exports.printQRIfNecessaryListener = exports.bindWaitForConnectionUpdate = exports.bindWaitForEvent = exports.generateMessageID = exports.promiseTimeout = exports.delayCancellable = exports.delay = exports.debouncedTimeout = exports.unixTimestampSeconds = exports.toNumber = exports.encodeBigEndian = exports.generateRegistrationId = exports.encodeWAMessage = exports.unpadRandomMax16 = exports.writeRandomPadMax16 = exports.getKeyAuthor = exports.BufferJSON = exports.Browsers = void 0;
+exports.isWABusinessPlatform = exports.getCodeFromWSError = exports.getCallStatusFromNode = exports.getErrorCodeFromStreamError = exports.getStatusFromReceiptType = exports.generateMdTagPrefix = exports.fetchLatestWaWebVersion = exports.fetchLatestBaileysVersion = exports.printQRIfNecessaryListener = exports.bindWaitForConnectionUpdate = exports.generateMessageID = exports.generateMessageIDV2 = exports.delayCancellable = exports.delay = exports.debouncedTimeout = exports.unixTimestampSeconds = exports.toNumber = exports.encodeBigEndian = exports.generateRegistrationId = exports.encodeWAMessage = exports.unpadRandomMax16 = exports.writeRandomPadMax16 = exports.getKeyAuthor = exports.BufferJSON = exports.getPlatformId = exports.Browsers = void 0;
+exports.promiseTimeout = promiseTimeout;
+exports.bindWaitForEvent = bindWaitForEvent;
+exports.trimUndefined = trimUndefined;
+exports.bytesToCrockford = bytesToCrockford;
 const boom_1 = require("@hapi/boom");
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = require("crypto");
@@ -12,20 +16,37 @@ const WAProto_1 = require("../../WAProto");
 const baileys_version_json_1 = require("../Defaults/baileys-version.json");
 const Types_1 = require("../Types");
 const WABinary_1 = require("../WABinary");
+const COMPANION_PLATFORM_MAP = {
+    'Chrome': '49',
+    'Edge': '50',
+    'Firefox': '51',
+    'Opera': '53',
+    'Safari': '54'
+};
 const PLATFORM_MAP = {
     'aix': 'AIX',
     'darwin': 'Mac OS',
     'win32': 'Windows',
-    'android': 'Android'
+    'android': 'Android',
+    'freebsd': 'FreeBSD',
+    'openbsd': 'OpenBSD',
+    'sunos': 'Solaris'
 };
 exports.Browsers = {
-    ubuntu: browser => ['Ubuntu', browser, '20.0.04'],
-    macOS: browser => ['Mac OS', browser, '10.15.7'],
-    baileys: browser => ['Baileys', browser, '4.0.0'],
-    windows: browser => ['Windows', browser, '10.0.22621'],
+    ubuntu: (browser) => ['Ubuntu', browser, '22.04.4'],
+    macOS: (browser) => ['Mac OS', browser, '14.4.1'],
+    baileys: (browser) => ['Baileys', browser, '6.5.0'],
+    windows: (browser) => ['Windows', browser, '10.0.22631'],
+    iOS: (browser) => ['iOS', browser, '18.2'],
+    linux: (browser) => ['Linux', browser, '6.12.6'],
     /** The appropriate browser based on your OS & release */
-    appropriate: browser => [PLATFORM_MAP[(0, os_1.platform)()] || 'Ubuntu', browser, (0, os_1.release)()]
+    appropriate: (browser) => [PLATFORM_MAP[(0, os_1.platform)()] || 'Ubuntu', browser, (0, os_1.release)()]
+};
+const getPlatformId = (browser) => {
+    const platformType = WAProto_1.proto.DeviceProps.PlatformType[browser.toUpperCase()];
+    return platformType ? platformType.toString().charCodeAt(0).toString() : '49'; //chrome
 };
+exports.getPlatformId = getPlatformId;
 exports.BufferJSON = {
     replacer: (k, value) => {
         if (Buffer.isBuffer(value) || value instanceof Uint8Array || (value === null || value === void 0 ? void 0 : value.type) === 'Buffer') {
@@ -146,9 +167,24 @@ async function promiseTimeout(ms, promise) {
         .finally(cancel);
     return p;
 }
-exports.promiseTimeout = promiseTimeout;
+const generateMessageIDV2 = (userId) => {
+    const data = Buffer.alloc(8 + 20 + 16);
+    data.writeBigUInt64BE(BigInt(Math.floor(Date.now() / 1000)));
+    if (userId) {
+        const id = (0, WABinary_1.jidDecode)(userId);
+        if (id === null || id === void 0 ? void 0 : id.user) {
+            data.write(id.user, 8);
+            data.write('@c.us', 8 + id.user.length);
+        }
+    }
+    const random = (0, crypto_1.randomBytes)(16);
+    random.copy(data, 28);
+    const hash = (0, crypto_1.createHash)('sha256').update(data).digest();
+    return 'FTG-' + hash.toString('hex').toUpperCase().substring(0, 18);
+};
+exports.generateMessageIDV2 = generateMessageIDV2;
 // generate a random ID to attach to a message
-const generateMessageID = () => (0, crypto_1.randomBytes)(16).toString('hex').toUpperCase();
+const generateMessageID = () => 'FTG-' + (0, crypto_1.randomBytes)(6).toString('hex').toUpperCase();
 exports.generateMessageID = generateMessageID;
 function bindWaitForEvent(ev, event) {
     return async (check, timeoutMs) => {
@@ -175,7 +211,6 @@ function bindWaitForEvent(ev, event) {
         }));
     };
 }
-exports.bindWaitForEvent = bindWaitForEvent;
 const bindWaitForConnectionUpdate = (ev) => bindWaitForEvent(ev, 'connection.update');
 exports.bindWaitForConnectionUpdate = bindWaitForConnectionUpdate;
 const printQRIfNecessaryListener = (ev, logger) => {
@@ -296,7 +331,8 @@ const getCallStatusFromNode = ({ tag, attrs }) => {
                 status = 'timeout';
             }
             else {
-                status = 'reject';
+                //fired when accepted/rejected/timeout/caller hangs up
+                status = 'terminate';
             }
             break;
         case 'reject':
@@ -345,7 +381,6 @@ function trimUndefined(obj) {
     }
     return obj;
 }
-exports.trimUndefined = trimUndefined;
 const CROCKFORD_CHARACTERS = '123456789ABCDEFGHJKLMNPQRSTVWXYZ';
 function bytesToCrockford(buffer) {
     let value = 0;
@@ -364,4 +399,3 @@ function bytesToCrockford(buffer) {
     }
     return crockford.join('');
 }
-exports.bytesToCrockford = bytesToCrockford;

package/lib/Utils/history.d.ts

@@ -1,15 +1,19 @@
 import { AxiosRequestConfig } from 'axios';
 import { proto } from '../../WAProto';
 import { Chat, Contact } from '../Types';
-export declare const downloadHistory: (msg: proto.Message.IHistorySyncNotification, options: AxiosRequestConfig<any>) => Promise<proto.HistorySync>;
+export declare const downloadHistory: (msg: proto.Message.IHistorySyncNotification, options: AxiosRequestConfig<{}>) => Promise<proto.HistorySync>;
 export declare const processHistoryMessage: (item: proto.IHistorySync) => {
     chats: Chat[];
     contacts: Contact[];
     messages: proto.IWebMessageInfo[];
+    syncType: proto.HistorySync.HistorySyncType;
+    progress: number | null | undefined;
 };
-export declare const downloadAndProcessHistorySyncNotification: (msg: proto.Message.IHistorySyncNotification, options: AxiosRequestConfig<any>) => Promise<{
+export declare const downloadAndProcessHistorySyncNotification: (msg: proto.Message.IHistorySyncNotification, options: AxiosRequestConfig<{}>) => Promise<{
     chats: Chat[];
     contacts: Contact[];
     messages: proto.IWebMessageInfo[];
+    syncType: proto.HistorySync.HistorySyncType;
+    progress: number | null | undefined;
 }>;
 export declare const getHistoryMsg: (message: proto.IMessage) => proto.Message.IHistorySyncNotification | null | undefined;

package/lib/Utils/history.js

@@ -32,6 +32,7 @@ const processHistoryMessage = (item) => {
         case WAProto_1.proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP:
         case WAProto_1.proto.HistorySync.HistorySyncType.RECENT:
         case WAProto_1.proto.HistorySync.HistorySyncType.FULL:
+        case WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND:
             for (const chat of item.conversations) {
                 contacts.push({ id: chat.id, name: chat.name || undefined });
                 const msgs = chat.messages || [];
@@ -74,6 +75,8 @@ const processHistoryMessage = (item) => {
         chats,
         contacts,
         messages,
+        syncType: item.syncType,
+        progress: item.progress
     };
 };
 exports.processHistoryMessage = processHistoryMessage;

package/lib/Utils/link-preview.js

@@ -32,7 +32,7 @@ const getUrlInfo = async (text, opts = {
         }
         const info = await getLinkPreview(previewLink, {
             ...opts.fetchOpts,
-            followRedirects: 'manual',
+            followRedirects: 'follow',
             handleRedirects: (baseURL, forwardedURL) => {
                 const urlObj = new URL(baseURL);
                 const forwardedURLObj = new URL(forwardedURL);

package/lib/Utils/logger.d.ts

@@ -1,4 +1,2 @@
-declare const _default: import("pino").Logger<{
-    timestamp: () => string;
-}>;
+declare const _default: any;
 export default _default;

package/lib/Utils/make-mutex.d.ts

@@ -1,7 +1,7 @@
 export declare const makeMutex: () => {
-    mutex<T>(code: () => T | Promise<T>): Promise<T>;
+    mutex<T>(code: () => Promise<T> | T): Promise<T>;
 };
 export type Mutex = ReturnType<typeof makeMutex>;
 export declare const makeKeyedMutex: () => {
-    mutex<T>(key: string, task: () => T | Promise<T>): Promise<T>;
+    mutex<T>(key: string, task: () => Promise<T> | T): Promise<T>;
 };

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

@@ -1,10 +1,7 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import { Boom } from '@hapi/boom';
 import { AxiosRequestConfig } from 'axios';
 import type { Logger } from 'pino';
-import { Readable, Transform } from 'stream';
+import { Readable } from 'stream';
 import { URL } from 'url';
 import { proto } from '../../WAProto';
 import { DownloadableMessage, MediaConnInfo, MediaDecryptionKeyInfo, MediaType, SocketConfig, WAMediaUpload, WAMediaUploadFunction, WAMessageContent } from '../Types';
@@ -13,10 +10,10 @@ export declare const hkdfInfoKey: (type: MediaType) => string;
 /** generates all the keys required to encrypt/decrypt & sign a media message */
 export declare function getMediaKeys(buffer: Uint8Array | string | null | undefined, mediaType: MediaType): MediaDecryptionKeyInfo;
 export declare const extractImageThumb: (bufferOrFilePath: Readable | Buffer | string, width?: number) => Promise<{
-    buffer: Buffer;
+    buffer: any;
     original: {
-        width: number | undefined;
-        height: number | undefined;
+        width: any;
+        height: any;
     };
 }>;
 export declare const encodeBase64EncodedStringForUpload: (b64: string) => string;
@@ -24,25 +21,25 @@ export declare const generateProfilePicture: (mediaUpload: WAMediaUpload) => Pro
     img: Buffer;
 }>;
 /** gets the SHA256 of the given media message */
-export declare const mediaMessageSHA256B64: (message: WAMessageContent) => string | null | undefined;
-export declare function getAudioDuration(buffer: Buffer | string | Readable): Promise<number | undefined>;
+export declare const mediaMessageSHA256B64: (message: WAMessageContent) => any;
+export declare function getAudioDuration(buffer: Buffer | string | Readable): Promise<any>;
 /**
   referenced from and modifying https://github.com/wppconnect-team/wa-js/blob/main/src/chat/functions/prepareAudioWaveform.ts
  */
-export declare function getAudioWaveform(buffer: Buffer | string | Readable, logger?: Logger): Promise<Uint8Array | undefined>;
-export declare const toReadable: (buffer: Buffer) => Readable;
-export declare const toBuffer: (stream: Readable) => Promise<Buffer>;
+export declare function getAudioWaveform(buffer: Buffer | string | Readable, logger?: Logger): Promise<Uint8Array<ArrayBuffer> | undefined>;
+export declare const toReadable: (buffer: Buffer) => any;
+export declare const toBuffer: (stream: Readable) => Promise<any>;
 export declare const getStream: (item: WAMediaUpload, opts?: AxiosRequestConfig) => Promise<{
-    readonly stream: Readable;
+    readonly stream: any;
     readonly type: "buffer";
 } | {
-    readonly stream: Readable;
+    readonly stream: any;
     readonly type: "readable";
 } | {
     readonly stream: Readable;
     readonly type: "remote";
 } | {
-    readonly stream: import("fs").ReadStream;
+    readonly stream: any;
     readonly type: "file";
 }>;
 /** generates a thumbnail for a given media, if required */
@@ -63,13 +60,22 @@ type EncryptedStreamOptions = {
     logger?: Logger;
     opts?: AxiosRequestConfig;
 };
+export declare const prepareStream: (media: WAMediaUpload, mediaType: MediaType, { logger, saveOriginalFileIfRequired, opts }?: EncryptedStreamOptions) => Promise<{
+    mediaKey: undefined;
+    encWriteStream: any;
+    fileLength: any;
+    fileSha256: any;
+    fileEncSha256: undefined;
+    bodyPath: string | undefined;
+    didSaveToTmpPath: boolean;
+}>;
 export declare const encryptedStream: (media: WAMediaUpload, mediaType: MediaType, { logger, saveOriginalFileIfRequired, opts }?: EncryptedStreamOptions) => Promise<{
-    mediaKey: Buffer;
-    encWriteStream: Readable;
+    mediaKey: any;
+    encWriteStream: any;
     bodyPath: string | undefined;
-    mac: Buffer;
-    fileEncSha256: Buffer;
-    fileSha256: Buffer;
+    mac: any;
+    fileEncSha256: any;
+    fileSha256: any;
     fileLength: number;
     didSaveToTmpPath: boolean;
 }>;
@@ -79,12 +85,12 @@ export type MediaDownloadOptions = {
     options?: AxiosRequestConfig<any>;
 };
 export declare const getUrlFromDirectPath: (directPath: string) => string;
-export declare const downloadContentFromMessage: ({ mediaKey, directPath, url }: DownloadableMessage, type: MediaType, opts?: MediaDownloadOptions) => Promise<Transform>;
+export declare const downloadContentFromMessage: ({ mediaKey, directPath, url }: DownloadableMessage, type: MediaType, opts?: MediaDownloadOptions) => Promise<any>;
 /**
  * Decrypts and downloads an AES256-CBC encrypted file given the keys.
  * Assumes the SHA256 of the plaintext is appended to the end of the ciphertext
  * */
-export declare const downloadEncryptedContent: (downloadUrl: string, { cipherKey, iv }: MediaDecryptionKeyInfo, { startByte, endByte, options }?: MediaDownloadOptions) => Promise<Transform>;
+export declare const downloadEncryptedContent: (downloadUrl: string, { cipherKey, iv }: MediaDecryptionKeyInfo, { startByte, endByte, options }?: MediaDownloadOptions) => Promise<any>;
 export declare function extensionForMediaMessage(message: WAMessageContent): string;
 export declare const getWAUploadToServer: ({ customUploadHosts, fetchAgent, logger, options }: SocketConfig, refreshMediaConn: (force: boolean) => Promise<MediaConnInfo>) => WAMediaUploadFunction;
 /**
@@ -92,12 +98,12 @@ export declare const getWAUploadToServer: ({ customUploadHosts, fetchAgent, logg
  */
 export declare const encryptMediaRetryRequest: (key: proto.IMessageKey, mediaKey: Buffer | Uint8Array, meId: string) => BinaryNode;
 export declare const decodeMediaRetryNode: (node: BinaryNode) => {
-    key: proto.IMessageKey;
+    key: import("../Types").WAMessageKey;
     media?: {
         ciphertext: Uint8Array;
         iv: Uint8Array;
-    } | undefined;
-    error?: Boom<any> | undefined;
+    };
+    error?: Boom;
 };
 export declare const decryptMediaRetryData: ({ ciphertext, iv }: {
     ciphertext: Uint8Array;

package/lib/Utils/messages-media.js

@@ -15,15 +15,30 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStatusCodeForMediaRetry = exports.decryptMediaRetryData = exports.decodeMediaRetryNode = exports.encryptMediaRetryRequest = exports.getWAUploadToServer = exports.extensionForMediaMessage = exports.downloadEncryptedContent = exports.downloadContentFromMessage = exports.getUrlFromDirectPath = exports.encryptedStream = exports.getHttpStream = exports.generateThumbnail = exports.getStream = exports.toBuffer = exports.toReadable = exports.getAudioWaveform = exports.getAudioDuration = exports.mediaMessageSHA256B64 = exports.generateProfilePicture = exports.encodeBase64EncodedStringForUpload = exports.extractImageThumb = exports.getMediaKeys = exports.hkdfInfoKey = void 0;
+exports.getStatusCodeForMediaRetry = exports.decryptMediaRetryData = exports.decodeMediaRetryNode = exports.encryptMediaRetryRequest = exports.getWAUploadToServer = exports.downloadEncryptedContent = exports.downloadContentFromMessage = exports.getUrlFromDirectPath = exports.encryptedStream = exports.prepareStream = exports.getHttpStream = exports.getStream = exports.toBuffer = exports.toReadable = exports.mediaMessageSHA256B64 = exports.generateProfilePicture = exports.encodeBase64EncodedStringForUpload = exports.extractImageThumb = exports.hkdfInfoKey = void 0;
+exports.getMediaKeys = getMediaKeys;
+exports.getAudioDuration = getAudioDuration;
+exports.getAudioWaveform = getAudioWaveform;
+exports.generateThumbnail = generateThumbnail;
+exports.extensionForMediaMessage = extensionForMediaMessage;
 const boom_1 = require("@hapi/boom");
 const child_process_1 = require("child_process");
 const Crypto = __importStar(require("crypto"));
@@ -81,7 +96,6 @@ function getMediaKeys(buffer, mediaType) {
         macKey: expandedMediaKey.slice(48, 80),
     };
 }
-exports.getMediaKeys = getMediaKeys;
 /** Extracts video thumb using FFMPEG */
 const extractVideoThumb = async (path, destPath, time, size) => new Promise((resolve, reject) => {
     const cmd = `ffmpeg -ss ${time} -i ${path} -y -vf scale=${size.width}:-1 -vframes 1 -f image2 ${destPath}`;
@@ -142,42 +156,23 @@ const encodeBase64EncodedStringForUpload = (b64) => (encodeURIComponent(b64
     .replace(/\=+$/, '')));
 exports.encodeBase64EncodedStringForUpload = encodeBase64EncodedStringForUpload;
 const generateProfilePicture = async (mediaUpload) => {
-    var _a, _b;
-    let bufferOrFilePath;
-    if (Buffer.isBuffer(mediaUpload)) {
-        bufferOrFilePath = mediaUpload;
-    }
-    else if ('url' in mediaUpload) {
-        bufferOrFilePath = mediaUpload.url.toString();
-    }
-    else {
-        bufferOrFilePath = await (0, exports.toBuffer)(mediaUpload.stream);
-    }
-    const lib = await getImageProcessingLibrary();
+    const bufferOrFilePath = Buffer.isBuffer(mediaUpload)
+        ? mediaUpload
+        : typeof mediaUpload === 'object' && 'url' in mediaUpload
+            ? mediaUpload.url.toString()
+            : await (0, exports.toBuffer)(mediaUpload.stream);
     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)
-            .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 {
-        throw new boom_1.Boom('No image processing library available');
-    }
+    const { read, MIME_JPEG, AUTO } = require('jimp');
+    const jimp = await read(bufferOrFilePath);
+    const min = jimp.getWidth();
+    const max = jimp.getHeight();
+    const cropped = jimp.crop(0, 0, min, max);
+    img = cropped
+        .quality(100)
+        .scaleToFit(720, 720, AUTO)
+        .getBufferAsync(MIME_JPEG);
     return {
-        img: await img,
+        img: await img
     };
 };
 exports.generateProfilePicture = generateProfilePicture;
@@ -207,7 +202,6 @@ async function getAudioDuration(buffer) {
     }
     return metadata.format.duration;
 }
-exports.getAudioDuration = getAudioDuration;
 /**
   referenced from and modifying https://github.com/wppconnect-team/wa-js/blob/main/src/chat/functions/prepareAudioWaveform.ts
  */
@@ -249,7 +243,6 @@ async function getAudioWaveform(buffer, logger) {
         logger === null || logger === void 0 ? void 0 : logger.debug('Failed to generate waveform: ' + e);
     }
 }
-exports.getAudioWaveform = getAudioWaveform;
 const toReadable = (buffer) => {
     const readable = new stream_1.Readable({ read: () => { } });
     readable.push(buffer);
@@ -311,13 +304,56 @@ async function generateThumbnail(file, mediaType, options) {
         originalImageDimensions
     };
 }
-exports.generateThumbnail = generateThumbnail;
 const getHttpStream = async (url, options = {}) => {
     const { default: axios } = await import('axios');
     const fetched = await axios.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');
+    let bodyPath;
+    let didSaveToTmpPath = false;
+    try {
+        const buffer = await (0, exports.toBuffer)(stream);
+        if (type === 'file') {
+            bodyPath = media.url;
+        }
+        else if (saveOriginalFileIfRequired) {
+            bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageID)());
+            (0, fs_1.writeFileSync)(bodyPath, buffer);
+            didSaveToTmpPath = true;
+        }
+        const fileLength = buffer.length;
+        const fileSha256 = Crypto.createHash('sha256').update(buffer).digest();
+        stream === null || stream === void 0 ? void 0 : stream.destroy();
+        logger === null || logger === void 0 ? void 0 : logger.debug('prepare stream data successfully');
+        return {
+            mediaKey: undefined,
+            encWriteStream: buffer,
+            fileLength,
+            fileSha256,
+            fileEncSha256: undefined,
+            bodyPath,
+            didSaveToTmpPath
+        };
+    }
+    catch (error) {
+        // destroy all streams with error
+        stream.destroy();
+        if (didSaveToTmpPath) {
+            try {
+                await fs_1.promises.unlink(bodyPath);
+            }
+            catch (err) {
+                logger === null || logger === void 0 ? void 0 : logger.error({ err }, 'failed to save to tmp path');
+            }
+        }
+        throw error;
+    }
+};
+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');
@@ -521,9 +557,8 @@ function extensionForMediaMessage(message) {
     }
     return extension;
 }
-exports.extensionForMediaMessage = extensionForMediaMessage;
 const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
-    return async (stream, { mediaType, fileEncSha256B64, timeoutMs }) => {
+    return async (stream, { mediaType, fileEncSha256B64, newsletter, timeoutMs }) => {
         var _a, _b;
         const { default: axios } = await import('axios');
         // send a query JSON to obtain the url & auth token to upload our media
@@ -531,15 +566,21 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
         let urls;
         const hosts = [...customUploadHosts, ...uploadInfo.hosts];
         const chunks = [];
-        for await (const chunk of stream) {
-            chunks.push(chunk);
+        if (!Buffer.isBuffer(stream)) {
+            for await (const chunk of stream) {
+                chunks.push(chunk);
+            }
         }
-        const reqBody = Buffer.concat(chunks);
+        const reqBody = Buffer.isBuffer(stream) ? stream : Buffer.concat(chunks);
         fileEncSha256B64 = (0, exports.encodeBase64EncodedStringForUpload)(fileEncSha256B64);
+        let media = Defaults_1.MEDIA_PATH_MAP[mediaType];
+        if (newsletter) {
+            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); // the auth token
-            const url = `https://${hostname}${Defaults_1.MEDIA_PATH_MAP[mediaType]}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`;
+            const url = `https://${hostname}${media}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`;
             let result;
             try {
                 if (maxContentLengthBytes && reqBody.length > maxContentLengthBytes) {
@@ -562,7 +603,8 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
                 if ((result === null || result === void 0 ? void 0 : result.url) || (result === null || result === void 0 ? void 0 : result.directPath)) {
                     urls = {
                         mediaUrl: result.url,
-                        directPath: result.direct_path
+                        directPath: result.direct_path,
+                        handle: result.handle
                     };
                     break;
                 }

package/lib/Utils/messages.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { Logger } from 'pino';
+import { type Transform } from 'stream';
 import { proto } from '../../WAProto';
 import { AnyMediaMessageContent, AnyMessageContent, MediaGenerationOptions, MessageContentGenerationOptions, MessageGenerationOptions, MessageGenerationOptionsFromContent, MessageUserReceipt, WAMessage, WAMessageContent, WAProto } from '../Types';
 import { MediaDownloadOptions } from './messages-media';
@@ -70,7 +71,7 @@ type DownloadMediaMessageContext = {
 /**
  * Downloads the given message. Throws an error if it's not a media message
  */
-export declare const downloadMediaMessage: (message: WAMessage, type: 'buffer' | 'stream', options: MediaDownloadOptions, ctx?: DownloadMediaMessageContext) => Promise<Buffer | import("stream").Transform>;
+export declare const downloadMediaMessage: <Type extends "stream" | "buffer">(message: WAMessage, type: Type, options: MediaDownloadOptions, ctx?: DownloadMediaMessageContext) => Promise<Type extends "buffer" ? Buffer : Transform>;
 /** Checks whether the given message is a media message; if it is returns the inner content */
 export declare const assertMediaContent: (content: proto.IMessage | null | undefined) => proto.Message.IVideoMessage | proto.Message.IImageMessage | proto.Message.IAudioMessage | proto.Message.IDocumentMessage | proto.Message.IStickerMessage;
 export {};