@d0v3riz/baileys 6.3.1 → 6.4.1

package/lib/Utils/messages-media.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (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.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.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;
 const boom_1 = require("@hapi/boom");
 const child_process_1 = require("child_process");
 const Crypto = __importStar(require("crypto"));
@@ -41,11 +41,13 @@ 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(() => { }));
+            const jimp = await (import('jimp')
+                .catch(() => { }));
             return jimp;
         })(),
         (async () => {
-            const sharp = await (Promise.resolve().then(() => __importStar(require('sharp'))).catch(() => { }));
+            const sharp = await (import('sharp')
+                .catch(() => { }));
             return sharp;
         })()
     ]);
@@ -186,7 +188,7 @@ const mediaMessageSHA256B64 = (message) => {
 };
 exports.mediaMessageSHA256B64 = mediaMessageSHA256B64;
 async function getAudioDuration(buffer) {
-    const musicMetadata = await Promise.resolve().then(() => __importStar(require('music-metadata')));
+    const musicMetadata = await import('music-metadata');
     let metadata;
     if (Buffer.isBuffer(buffer)) {
         metadata = await musicMetadata.parseBuffer(buffer, undefined, { duration: true });
@@ -206,6 +208,48 @@ 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
+ */
+async function getAudioWaveform(buffer, logger) {
+    try {
+        const audioDecode = (...args) => import('audio-decode').then(({ default: audioDecode }) => audioDecode(...args));
+        let audioData;
+        if (Buffer.isBuffer(buffer)) {
+            audioData = buffer;
+        }
+        else if (typeof buffer === 'string') {
+            const rStream = (0, fs_1.createReadStream)(buffer);
+            audioData = await (0, exports.toBuffer)(rStream);
+        }
+        else {
+            audioData = await (0, exports.toBuffer)(buffer);
+        }
+        const audioBuffer = await audioDecode(audioData);
+        const rawData = audioBuffer.getChannelData(0); // We only need to work with one channel of data
+        const samples = 64; // Number of samples we want to have in our final data set
+        const blockSize = Math.floor(rawData.length / samples); // the number of samples in each subdivision
+        const filteredData = [];
+        for (let i = 0; i < samples; i++) {
+            const blockStart = blockSize * i; // the location of the first sample in the block
+            let sum = 0;
+            for (let j = 0; j < blockSize; j++) {
+                sum = sum + Math.abs(rawData[blockStart + j]); // find the sum of all the samples in the block
+            }
+            filteredData.push(sum / blockSize); // divide the sum by the block size to get the average
+        }
+        // This guarantees that the largest data point will be set to 1, and the rest of the data will scale proportionally.
+        const multiplier = Math.pow(Math.max(...filteredData), -1);
+        const normalizedData = filteredData.map((n) => n * multiplier);
+        // Generate waveform like WhatsApp
+        const waveform = new Uint8Array(normalizedData.map((n) => Math.floor(100 * n)));
+        return waveform;
+    }
+    catch (e) {
+        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);
@@ -269,7 +313,7 @@ async function generateThumbnail(file, mediaType, options) {
 }
 exports.generateThumbnail = generateThumbnail;
 const getHttpStream = async (url, options = {}) => {
-    const { default: axios } = await Promise.resolve().then(() => __importStar(require('axios')));
+    const { default: axios } = await import('axios');
     const fetched = await axios.get(url.toString(), { ...options, responseType: 'stream' });
     return fetched.data;
 };
@@ -481,7 +525,7 @@ exports.extensionForMediaMessage = extensionForMediaMessage;
 const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
     return async (stream, { mediaType, fileEncSha256B64, timeoutMs }) => {
         var _a, _b;
-        const { default: axios } = await Promise.resolve().then(() => __importStar(require('axios')));
+        const { default: axios } = await import('axios');
         // send a query JSON to obtain the url & auth token to upload our media
         let uploadInfo = await refreshMediaConn(false);
         let urls;
@@ -630,3 +674,7 @@ const MEDIA_RETRY_STATUS_MAP = {
     [WAProto_1.proto.MediaRetryNotification.ResultType.NOT_FOUND]: 404,
     [WAProto_1.proto.MediaRetryNotification.ResultType.GENERAL_ERROR]: 418,
 };
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function __importStar(arg0) {
+    throw new Error('Function not implemented.');
+}

package/lib/Utils/messages.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Logger } from 'pino';
 import { proto } from '../../WAProto';
 import { AnyMediaMessageContent, AnyMessageContent, MediaGenerationOptions, MessageContentGenerationOptions, MessageGenerationOptions, MessageGenerationOptionsFromContent, MessageUserReceipt, WAMessage, WAMessageContent, WAProto } from '../Types';
@@ -11,13 +12,13 @@ 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 prepareDisappearingMessageSettingContent: (ephemeralExpiration?: number | undefined) => proto.Message;
+export declare const prepareDisappearingMessageSettingContent: (ephemeralExpiration?: number) => proto.Message;
 /**
  * Generate forwarded message content like WA does
  * @param message the message to forward
  * @param options.forceForward will show the message as forwarded even if it is from you
  */
-export declare const generateForwardMessageContent: (message: WAMessage, forceForward?: boolean | undefined) => proto.IMessage;
+export declare const generateForwardMessageContent: (message: WAMessage, forceForward?: boolean) => proto.IMessage;
 export declare const generateWAMessageContent: (message: AnyMessageContent, options: MessageContentGenerationOptions) => Promise<proto.Message>;
 export declare const generateWAMessageFromContent: (jid: string, message: WAMessageContent, options: MessageGenerationOptionsFromContent) => proto.WebMessageInfo;
 export declare const generateWAMessage: (jid: string, content: AnyMessageContent, options: MessageGenerationOptions) => Promise<proto.WebMessageInfo>;
@@ -45,7 +46,7 @@ export declare const updateMessageWithReceipt: (msg: Pick<WAMessage, 'userReceip
 export declare const updateMessageWithReaction: (msg: Pick<WAMessage, 'reactions'>, reaction: proto.IReaction) => void;
 /** Update the message with a new poll update */
 export declare const updateMessageWithPollUpdate: (msg: Pick<WAMessage, 'pollUpdates'>, update: proto.IPollUpdate) => void;
-declare type VoteAggregation = {
+type VoteAggregation = {
     name: string;
     voters: string[];
 };
@@ -62,14 +63,14 @@ export declare const aggregateMessageKeysNotFromMe: (keys: proto.IMessageKey[])
     participant: string | undefined;
     messageIds: string[];
 }[];
-declare type DownloadMediaMessageContext = {
+type DownloadMediaMessageContext = {
     reuploadRequest: (msg: WAMessage) => Promise<WAMessage>;
     logger: Logger;
 };
 /**
  * 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 | undefined) => Promise<Buffer | import("stream").Transform>;
+export declare const downloadMediaMessage: (message: WAMessage, type: 'buffer' | 'stream', options: MediaDownloadOptions, ctx?: DownloadMediaMessageContext) => Promise<Buffer | import("stream").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 {};

package/lib/Utils/messages.js

@@ -54,6 +54,20 @@ const generateLinkPreviewIfRequired = async (text, getUrlInfo, logger) => {
     }
 };
 exports.generateLinkPreviewIfRequired = generateLinkPreviewIfRequired;
+const assertColor = async (color) => {
+    let assertedColor;
+    if (typeof color === 'number') {
+        assertedColor = color > 0 ? color : 0xffffffff + Number(color) + 1;
+    }
+    else {
+        let hex = color.trim().replace('#', '');
+        if (hex.length <= 6) {
+            hex = 'FF' + hex.padStart(6, '0');
+        }
+        assertedColor = parseInt(hex, 16);
+        return assertedColor;
+    }
+};
 const prepareWAMessageMedia = async (message, options) => {
     const logger = options.logger;
     let mediaType;
@@ -97,6 +111,8 @@ const prepareWAMessageMedia = async (message, options) => {
     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' || true;
+    const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === 'true' || 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,
@@ -127,6 +143,18 @@ const prepareWAMessageMedia = async (message, options) => {
                     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 (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) {
                 logger === null || logger === void 0 ? void 0 : logger.warn({ trace: error.stack }, 'failed to obtain extra info');
@@ -235,6 +263,12 @@ const generateWAMessageContent = async (message, options) => {
                 extContent.thumbnailEncSha256 = img.fileEncSha256;
             }
         }
+        if (options.backgroundColor) {
+            extContent.backgroundArgb = await assertColor(options.backgroundColor);
+        }
+        if (options.font) {
+            extContent.font = options.font;
+        }
         m.extendedTextMessage = extContent;
     }
     else if ('contacts' in message) {
@@ -466,7 +500,7 @@ const generateWAMessageFromContent = (jid, message, options) => {
         message: message,
         messageTimestamp: timestamp,
         messageStubParameters: [],
-        participant: (0, WABinary_1.isJidGroup)(jid) ? userJid : undefined,
+        participant: (0, WABinary_1.isJidGroup)(jid) || (0, WABinary_1.isJidStatusBroadcast)(jid) ? userJid : undefined,
         status: Types_1.WAMessageStatus.PENDING
     };
     return Types_1.WAProto.WebMessageInfo.fromObject(messageJSON);

package/lib/Utils/process-message.d.ts

@@ -2,7 +2,7 @@ import { AxiosRequestConfig } from 'axios';
 import type { Logger } from 'pino';
 import { proto } from '../../WAProto';
 import { AuthenticationCreds, BaileysEventEmitter, SignalKeyStoreWithTransaction, SocketConfig } from '../Types';
-declare type ProcessMessageContext = {
+type ProcessMessageContext = {
     shouldProcessHistoryMsg: boolean;
     creds: AuthenticationCreds;
     keyStore: SignalKeyStoreWithTransaction;
@@ -20,7 +20,7 @@ export declare const shouldIncrementChatUnread: (message: proto.IWebMessageInfo)
  * Typically -- that'll be the remoteJid, but for broadcasts, it'll be the participant
  */
 export declare const getChatId: ({ remoteJid, participant, fromMe }: proto.IMessageKey) => string;
-declare type PollContext = {
+type PollContext = {
     /** normalised jid of the person that created the poll */
     pollCreatorJid: string;
     /** ID of the poll creation message */

package/lib/Utils/validate-connection.js

@@ -180,9 +180,8 @@ const encodeSignedDeviceIdentity = (account, includeSignatureKey) => {
     if (!includeSignatureKey || !((_a = account.accountSignatureKey) === null || _a === void 0 ? void 0 : _a.length)) {
         account.accountSignatureKey = null;
     }
-    const accountEnc = WAProto_1.proto.ADVSignedDeviceIdentity
+    return WAProto_1.proto.ADVSignedDeviceIdentity
         .encode(account)
         .finish();
-    return accountEnc;
 };
 exports.encodeSignedDeviceIdentity = encodeSignedDeviceIdentity;

package/lib/WABinary/jid-utils.d.ts

@@ -3,16 +3,16 @@ export declare const OFFICIAL_BIZ_JID = "16505361212@c.us";
 export declare const SERVER_JID = "server@c.us";
 export declare const PSA_WID = "0@c.us";
 export declare const STORIES_JID = "status@broadcast";
-export declare type JidServer = 'c.us' | 'g.us' | 'broadcast' | 's.whatsapp.net' | 'call';
-export declare type JidWithDevice = {
+export type JidServer = 'c.us' | 'g.us' | 'broadcast' | 's.whatsapp.net' | 'call';
+export type JidWithDevice = {
     user: string;
     device?: number;
 };
-export declare type FullJid = JidWithDevice & {
+export type FullJid = JidWithDevice & {
     server: JidServer | string;
     agent?: number;
 };
-export declare const jidEncode: (user: string | number | null, server: JidServer, device?: number | undefined, agent?: number | undefined) => string;
+export declare const jidEncode: (user: string | number | null, server: JidServer, device?: number, agent?: number) => string;
 export declare const jidDecode: (jid: string | undefined) => FullJid | undefined;
 /** is the jid a user */
 export declare const areJidsSameUser: (jid1: string | undefined, jid2: string | undefined) => boolean;

package/lib/WABinary/types.d.ts

@@ -6,13 +6,13 @@ import * as constants from './constants';
  * This is done for easy serialization, to prevent running into issues with prototypes &
  * to maintain functional code structure
  * */
-export declare type BinaryNode = {
+export type BinaryNode = {
     tag: string;
     attrs: {
         [key: string]: string;
     };
     content?: BinaryNode[] | string | Uint8Array;
 };
-export declare type BinaryNodeAttributes = BinaryNode['attrs'];
-export declare type BinaryNodeData = BinaryNode['content'];
-export declare type BinaryNodeCodingOptions = typeof constants;
+export type BinaryNodeAttributes = BinaryNode['attrs'];
+export type BinaryNodeData = BinaryNode['content'];
+export type BinaryNodeCodingOptions = typeof constants;

package/lib/index.d.ts

@@ -5,6 +5,6 @@ export * from './Types';
 export * from './Store';
 export * from './Defaults';
 export * from './WABinary';
-export declare type WASocket = ReturnType<typeof makeWASocket>;
+export type WASocket = ReturnType<typeof makeWASocket>;
 export { makeWASocket };
 export default makeWASocket;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d0v3riz/baileys",
-  "version": "6.3.1",
+  "version": "6.4.1",
   "description": "WhatsApp API",
   "keywords": [
     "whatsapp",
@@ -34,8 +34,8 @@
     "changelog:update": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
     "example": "node --inspect -r ts-node/register Example/example.ts",
     "gen:protobuf": "sh WAProto/GenerateStatics.sh",
-    "lint": "eslint . --ext .js,.ts,.jsx,.tsx",
-    "lint:fix": "eslint . --fix --ext .js,.ts,.jsx,.tsx",
+    "lint": "eslint src --ext .js,.ts,.jsx,.tsx",
+    "lint:fix": "eslint src --fix --ext .js,.ts,.jsx,.tsx",
     "prepack": "tsc",
     "prepare": "tsc",
     "release": "release-it",
@@ -43,7 +43,9 @@
   },
   "dependencies": {
     "@adiwajshing/keyed-db": "^0.2.4",
+    "@d0v3riz/ws": "^8.13.0",
     "@hapi/boom": "^9.1.3",
+    "audio-decode": "^2.1.3",
     "axios": "^1.3.3",
     "cache-manager": "^5.2.2",
     "futoin-hkdf": "^1.5.1",
@@ -57,7 +59,7 @@
     "ws": "^8.13.0"
   },
   "devDependencies": {
-    "@adiwajshing/eslint-config": "https://github.com/adiwajshing/eslint-config.git",
+    "@adiwajshing/eslint-config": "github:adiwajshing/eslint-config",
     "@types/got": "^9.6.11",
     "@types/jest": "^27.5.1",
     "@types/node": "^16.0.0",
@@ -74,7 +76,7 @@
     "ts-jest": "^27.0.3",
     "ts-node": "^10.8.1",
     "typedoc": "^0.24.7",
-    "typescript": "^4.0.0"
+    "typescript": "^4.6.4"
   },
   "peerDependencies": {
     "jimp": "^0.16.1",
@@ -97,4 +99,4 @@
     }
   },
   "packageManager": "yarn@1.22.19"
-}
+}