naya-flore 4.7.2 → 4.7.3

package/lib/Utils/auth-utils.js

@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initAuthCreds = exports.addTransactionCapability = void 0;
-exports.makeCacheableSignalKeyStore = makeCacheableSignalKeyStore;
+exports.initAuthCreds = exports.addTransactionCapability = exports.makeCacheableSignalKeyStore = void 0;
 const crypto_1 = require("crypto");
 const node_cache_1 = __importDefault(require("node-cache"));
 const uuid_1 = require("uuid");
@@ -19,7 +18,7 @@ const generics_1 = require("./generics");
  */
 function makeCacheableSignalKeyStore(store, logger, _cache) {
     const cache = _cache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.SIGNAL_STORE, // 5 minutes
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.SIGNAL_STORE,
         useClones: false,
         deleteOnExpire: true,
     });
@@ -70,6 +69,7 @@ function makeCacheableSignalKeyStore(store, logger, _cache) {
         }
     };
 }
+exports.makeCacheableSignalKeyStore = makeCacheableSignalKeyStore;
 /**
  * Adds DB like transaction capability (https://en.wikipedia.org/wiki/Database_transaction) to the SignalKeyStore,
  * this allows batch read & write operations & improves the performance of the lib

package/lib/Utils/business.d.ts

@@ -2,7 +2,7 @@ import { CatalogCollection, OrderDetails, Product, ProductCreate, ProductUpdate,
 import { BinaryNode } from '../WABinary';
 export declare const parseCatalogNode: (node: BinaryNode) => {
     products: Product[];
-    nextPageCursor: any;
+    nextPageCursor: string | undefined;
 };
 export declare const parseCollectionsNode: (node: BinaryNode) => {
     collections: CatalogCollection[];

package/lib/Utils/business.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadingNecessaryImages = exports.parseProductNode = exports.toProductNode = exports.parseOrderDetailsNode = exports.parseCollectionsNode = exports.parseCatalogNode = void 0;
-exports.uploadingNecessaryImagesOfProduct = uploadingNecessaryImagesOfProduct;
+exports.uploadingNecessaryImages = exports.uploadingNecessaryImagesOfProduct = exports.parseProductNode = exports.toProductNode = exports.parseOrderDetailsNode = exports.parseCollectionsNode = exports.parseCatalogNode = void 0;
 const boom_1 = require("@hapi/boom");
 const crypto_1 = require("crypto");
 const WABinary_1 = require("../WABinary");
@@ -189,6 +188,7 @@ async function uploadingNecessaryImagesOfProduct(product, waUploadToServer, time
     };
     return product;
 }
+exports.uploadingNecessaryImagesOfProduct = uploadingNecessaryImagesOfProduct;
 /**
  * Uploads images not already uploaded to WA's servers
  */

package/lib/Utils/chat-utils.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { AxiosRequestConfig } from 'axios';
 import type { Logger } from 'pino';
 import { proto } from '../../WAProto';
@@ -13,7 +14,7 @@ export declare const encodeSyncdPatch: ({ type, index, syncAction, apiVersion, o
     state: LTHashState;
 }>;
 export declare const decodeSyncdMutations: (msgMutations: (proto.ISyncdMutation | proto.ISyncdRecord)[], initialState: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey, onMutation: (mutation: ChatMutation) => void, validateMacs: boolean) => Promise<{
-    hash: any;
+    hash: Buffer;
     indexValueMap: {
         [indexMacBase64: string]: {
             valueMac: Uint8Array | Buffer;
@@ -21,47 +22,47 @@ export declare const decodeSyncdMutations: (msgMutations: (proto.ISyncdMutation
     };
 }>;
 export declare const decodeSyncdPatch: (msg: proto.ISyncdPatch, name: WAPatchName, initialState: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey, onMutation: (mutation: ChatMutation) => void, validateMacs: boolean) => Promise<{
-    hash: any;
+    hash: Buffer;
     indexValueMap: {
         [indexMacBase64: string]: {
             valueMac: Uint8Array | Buffer;
         };
     };
 }>;
-export declare const extractSyncdPatches: (result: BinaryNode, options: AxiosRequestConfig<{}>) => Promise<{
+export declare const extractSyncdPatches: (result: BinaryNode, options: AxiosRequestConfig<any>) => Promise<{
     critical_block: {
         patches: proto.ISyncdPatch[];
         hasMorePatches: boolean;
-        snapshot?: proto.ISyncdSnapshot;
+        snapshot?: proto.ISyncdSnapshot | undefined;
     };
     critical_unblock_low: {
         patches: proto.ISyncdPatch[];
         hasMorePatches: boolean;
-        snapshot?: proto.ISyncdSnapshot;
+        snapshot?: proto.ISyncdSnapshot | undefined;
     };
     regular_high: {
         patches: proto.ISyncdPatch[];
         hasMorePatches: boolean;
-        snapshot?: proto.ISyncdSnapshot;
+        snapshot?: proto.ISyncdSnapshot | undefined;
     };
     regular_low: {
         patches: proto.ISyncdPatch[];
         hasMorePatches: boolean;
-        snapshot?: proto.ISyncdSnapshot;
+        snapshot?: proto.ISyncdSnapshot | undefined;
     };
     regular: {
         patches: proto.ISyncdPatch[];
         hasMorePatches: boolean;
-        snapshot?: proto.ISyncdSnapshot;
+        snapshot?: proto.ISyncdSnapshot | undefined;
     };
 }>;
-export declare const downloadExternalBlob: (blob: proto.IExternalBlobReference, options: AxiosRequestConfig<{}>) => Promise<any>;
-export declare const downloadExternalPatch: (blob: proto.IExternalBlobReference, options: AxiosRequestConfig<{}>) => Promise<proto.SyncdMutations>;
+export declare const downloadExternalBlob: (blob: proto.IExternalBlobReference, options: AxiosRequestConfig<any>) => Promise<Buffer>;
+export declare const downloadExternalPatch: (blob: proto.IExternalBlobReference, options: AxiosRequestConfig<any>) => Promise<proto.SyncdMutations>;
 export declare const decodeSyncdSnapshot: (name: WAPatchName, snapshot: proto.ISyncdSnapshot, getAppStateSyncKey: FetchAppStateSyncKey, minimumVersionNumber: number | undefined, validateMacs?: boolean) => Promise<{
     state: LTHashState;
     mutationMap: ChatMutationMap;
 }>;
-export declare const decodePatches: (name: WAPatchName, syncds: proto.ISyncdPatch[], initial: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey, options: AxiosRequestConfig<{}>, minimumVersionNumber?: number, logger?: Logger, validateMacs?: boolean) => Promise<{
+export declare const decodePatches: (name: WAPatchName, syncds: proto.ISyncdPatch[], initial: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey, options: AxiosRequestConfig<any>, minimumVersionNumber?: number, logger?: Logger, validateMacs?: boolean) => Promise<{
     state: LTHashState;
     mutationMap: ChatMutationMap;
 }>;

package/lib/Utils/chat-utils.js

@@ -305,7 +305,8 @@ const decodePatches = async (name, syncds, initial, getAppStateSyncKey, options,
         indexValueMap: { ...initial.indexValueMap }
     };
     const mutationMap = {};
-    for (const syncd of syncds) {
+    for (let i = 0; i < syncds.length; i++) {
+        const syncd = syncds[i];
         const { version, keyId, snapshotMac } = syncd;
         if (syncd.externalMutations) {
             logger === null || logger === void 0 ? void 0 : logger.trace({ name, version }, 'downloading external patch');
@@ -417,31 +418,25 @@ const chatModificationToAppPatch = (mod, jid) => {
             operation: OP.SET
         };
     }
-    else if ('deleteForMe' in mod) {
-        const { timestamp, key, deleteMedia } = mod.deleteForMe;
-        patch = {
-            syncAction: {
-                deleteMessageForMeAction: {
-                    deleteMedia,
-                    messageTimestamp: timestamp
-                }
-            },
-            index: ['deleteMessageForMe', jid, key.id, key.fromMe ? '1' : '0', '0'],
-            type: 'regular_high',
-            apiVersion: 3,
-            operation: OP.SET
-        };
-    }
     else if ('clear' in mod) {
-        patch = {
-            syncAction: {
-                clearChatAction: {} // add message range later
-            },
-            index: ['clearChat', jid, '1' /*the option here is 0 when keep starred messages is enabled*/, '0'],
-            type: 'regular_high',
-            apiVersion: 6,
-            operation: OP.SET
-        };
+        if (mod.clear === 'all') {
+            throw new boom_1.Boom('not supported');
+        }
+        else {
+            const key = mod.clear.messages[0];
+            patch = {
+                syncAction: {
+                    deleteMessageForMeAction: {
+                        deleteMedia: false,
+                        messageTimestamp: key.timestamp
+                    }
+                },
+                index: ['deleteMessageForMe', jid, key.id, key.fromMe ? '1' : '0', '0'],
+                type: 'regular_high',
+                apiVersion: 3,
+                operation: OP.SET
+            };
+        }
     }
     else if ('pin' in mod) {
         patch = {
@@ -496,22 +491,6 @@ const chatModificationToAppPatch = (mod, jid) => {
             operation: OP.SET,
         };
     }
-    else if ('addLabel' in mod) {
-        patch = {
-            syncAction: {
-                labelEditAction: {
-                    name: mod.addLabel.name,
-                    color: mod.addLabel.color,
-                    predefinedId: mod.addLabel.predefinedId,
-                    deleted: mod.addLabel.deleted
-                }
-            },
-            index: ['label_edit', mod.addLabel.id],
-            type: 'regular',
-            apiVersion: 3,
-            operation: OP.SET,
-        };
-    }
     else if ('addChatLabel' in mod) {
         patch = {
             syncAction: {
@@ -654,7 +633,12 @@ const processSyncAction = (syncAction, ev, me, initialSyncOpts, logger) => {
         });
     }
     else if (action === null || action === void 0 ? void 0 : action.contactAction) {
-        ev.emit('contacts.upsert', [{ id, name: action.contactAction.fullName }]);
+        ev.emit('contacts.upsert', [{ 
+            id: id,
+            name: action.contactAction.fullName,
+            lid: action.contactAction.lidJid || undefined,
+            jid: (0, WABinary_1.isJidUser)(id) ? id : undefined
+        }]);
     }
     else if (action === null || action === void 0 ? void 0 : action.pushNameSetting) {
         const name = (_b = action === null || action === void 0 ? void 0 : action.pushNameSetting) === null || _b === void 0 ? void 0 : _b.name;

package/lib/Utils/crypto.d.ts

@@ -1,9 +1,10 @@
+/// <reference types="node" />
 import { KeyPair } from '../Types';
 /** prefix version byte to the pub keys, required for some curve crypto functions */
-export declare const generateSignalPubKey: (pubKey: Uint8Array | Buffer) => any;
+export declare const generateSignalPubKey: (pubKey: Uint8Array | Buffer) => Uint8Array | Buffer;
 export declare const Curve: {
     generateKeyPair: () => KeyPair;
-    sharedKey: (privateKey: Uint8Array, publicKey: Uint8Array) => any;
+    sharedKey: (privateKey: Uint8Array, publicKey: Uint8Array) => Buffer;
     sign: (privateKey: Uint8Array, buf: Uint8Array) => any;
     verify: (pubKey: Uint8Array, message: Uint8Array, signature: Uint8Array) => boolean;
 };
@@ -16,25 +17,25 @@ export declare const signedKeyPair: (identityKeyPair: KeyPair, keyId: number) =>
  * encrypt AES 256 GCM;
  * where the tag tag is suffixed to the ciphertext
  * */
-export declare function aesEncryptGCM(plaintext: Uint8Array, key: Uint8Array, iv: Uint8Array, additionalData: Uint8Array): any;
+export declare function aesEncryptGCM(plaintext: Uint8Array, key: Uint8Array, iv: Uint8Array, additionalData: Uint8Array): Buffer;
 /**
  * decrypt AES 256 GCM;
  * where the auth tag is suffixed to the ciphertext
  * */
-export declare function aesDecryptGCM(ciphertext: Uint8Array, key: Uint8Array, iv: Uint8Array, additionalData: Uint8Array): any;
-export declare function aesEncryptCTR(plaintext: Uint8Array, key: Uint8Array, iv: Uint8Array): any;
-export declare function aesDecryptCTR(ciphertext: Uint8Array, key: Uint8Array, iv: Uint8Array): any;
+export declare function aesDecryptGCM(ciphertext: Uint8Array, key: Uint8Array, iv: Uint8Array, additionalData: Uint8Array): Buffer;
+export declare function aesEncryptCTR(plaintext: Uint8Array, key: Uint8Array, iv: Uint8Array): Buffer;
+export declare function aesDecryptCTR(ciphertext: Uint8Array, key: Uint8Array, iv: Uint8Array): Buffer;
 /** decrypt AES 256 CBC; where the IV is prefixed to the buffer */
-export declare function aesDecrypt(buffer: Buffer, key: Buffer): any;
+export declare function aesDecrypt(buffer: Buffer, key: Buffer): Buffer;
 /** decrypt AES 256 CBC */
-export declare function aesDecryptWithIV(buffer: Buffer, key: Buffer, IV: Buffer): any;
-export declare function aesEncrypt(buffer: Buffer | Uint8Array, key: Buffer): any;
-export declare function aesEncrypWithIV(buffer: Buffer, key: Buffer, IV: Buffer): any;
-export declare function hmacSign(buffer: Buffer | Uint8Array, key: Buffer | Uint8Array, variant?: 'sha256' | 'sha512'): any;
-export declare function sha256(buffer: Buffer): any;
-export declare function md5(buffer: Buffer): any;
+export declare function aesDecryptWithIV(buffer: Buffer, key: Buffer, IV: Buffer): Buffer;
+export declare function aesEncrypt(buffer: Buffer | Uint8Array, key: Buffer): Buffer;
+export declare function aesEncrypWithIV(buffer: Buffer, key: Buffer, IV: Buffer): Buffer;
+export declare function hmacSign(buffer: Buffer | Uint8Array, key: Buffer | Uint8Array, variant?: 'sha256' | 'sha512'): Buffer;
+export declare function sha256(buffer: Buffer): Buffer;
+export declare function md5(buffer: Buffer): Buffer;
 export declare function hkdf(buffer: Uint8Array | Buffer, expandedLength: number, info: {
     salt?: Buffer;
     info?: string;
-}): any;
-export declare function derivePairingCodeKey(pairingCode: string, salt: Buffer): Promise<any>;
+}): Buffer;
+export declare function derivePairingCodeKey(pairingCode: string, salt: Buffer): Buffer;

package/lib/Utils/crypto.js

@@ -15,47 +15,22 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-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;
-    };
-})();
+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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.signedKeyPair = exports.Curve = exports.generateSignalPubKey = void 0;
-exports.aesEncryptGCM = aesEncryptGCM;
-exports.aesDecryptGCM = aesDecryptGCM;
-exports.aesEncryptCTR = aesEncryptCTR;
-exports.aesDecryptCTR = aesDecryptCTR;
-exports.aesDecrypt = aesDecrypt;
-exports.aesDecryptWithIV = aesDecryptWithIV;
-exports.aesEncrypt = aesEncrypt;
-exports.aesEncrypWithIV = aesEncrypWithIV;
-exports.hmacSign = hmacSign;
-exports.sha256 = sha256;
-exports.md5 = md5;
-exports.hkdf = hkdf;
-exports.derivePairingCodeKey = derivePairingCodeKey;
+exports.derivePairingCodeKey = exports.hkdf = exports.md5 = exports.sha256 = exports.hmacSign = exports.aesEncrypWithIV = exports.aesEncrypt = exports.aesDecryptWithIV = exports.aesDecrypt = exports.aesDecryptCTR = exports.aesEncryptCTR = exports.aesDecryptGCM = exports.aesEncryptGCM = exports.signedKeyPair = exports.Curve = exports.generateSignalPubKey = void 0;
 const crypto_1 = require("crypto");
 const futoin_hkdf_1 = __importDefault(require("futoin-hkdf"));
 const libsignal = __importStar(require("libsignal"));
-const util_1 = require("util");
 const Defaults_1 = require("../Defaults");
-const pbkdf2Promise = (0, util_1.promisify)(crypto_1.pbkdf2);
 /** prefix version byte to the pub keys, required for some curve crypto functions */
 const generateSignalPubKey = (pubKey) => (pubKey.length === 33
     ? pubKey
@@ -102,6 +77,7 @@ function aesEncryptGCM(plaintext, key, iv, additionalData) {
     cipher.setAAD(additionalData);
     return Buffer.concat([cipher.update(plaintext), cipher.final(), cipher.getAuthTag()]);
 }
+exports.aesEncryptGCM = aesEncryptGCM;
 /**
  * decrypt AES 256 GCM;
  * where the auth tag is suffixed to the ciphertext
@@ -116,48 +92,60 @@ function aesDecryptGCM(ciphertext, key, iv, additionalData) {
     decipher.setAuthTag(tag);
     return Buffer.concat([decipher.update(enc), decipher.final()]);
 }
+exports.aesDecryptGCM = aesDecryptGCM;
 function aesEncryptCTR(plaintext, key, iv) {
     const cipher = (0, crypto_1.createCipheriv)('aes-256-ctr', key, iv);
     return Buffer.concat([cipher.update(plaintext), cipher.final()]);
 }
+exports.aesEncryptCTR = aesEncryptCTR;
 function aesDecryptCTR(ciphertext, key, iv) {
     const decipher = (0, crypto_1.createDecipheriv)('aes-256-ctr', key, iv);
     return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
 }
+exports.aesDecryptCTR = aesDecryptCTR;
 /** decrypt AES 256 CBC; where the IV is prefixed to the buffer */
 function aesDecrypt(buffer, key) {
     return aesDecryptWithIV(buffer.slice(16, buffer.length), key, buffer.slice(0, 16));
 }
+exports.aesDecrypt = aesDecrypt;
 /** decrypt AES 256 CBC */
 function aesDecryptWithIV(buffer, key, IV) {
     const aes = (0, crypto_1.createDecipheriv)('aes-256-cbc', key, IV);
     return Buffer.concat([aes.update(buffer), aes.final()]);
 }
+exports.aesDecryptWithIV = aesDecryptWithIV;
 // encrypt AES 256 CBC; where a random IV is prefixed to the buffer
 function aesEncrypt(buffer, key) {
     const IV = (0, crypto_1.randomBytes)(16);
     const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, IV);
     return Buffer.concat([IV, aes.update(buffer), aes.final()]); // prefix IV to the buffer
 }
+exports.aesEncrypt = aesEncrypt;
 // encrypt AES 256 CBC with a given IV
 function aesEncrypWithIV(buffer, key, IV) {
     const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, IV);
     return Buffer.concat([aes.update(buffer), aes.final()]); // prefix IV to the buffer
 }
+exports.aesEncrypWithIV = aesEncrypWithIV;
 // sign HMAC using SHA 256
 function hmacSign(buffer, key, variant = 'sha256') {
     return (0, crypto_1.createHmac)(variant, key).update(buffer).digest();
 }
+exports.hmacSign = hmacSign;
 function sha256(buffer) {
     return (0, crypto_1.createHash)('sha256').update(buffer).digest();
 }
+exports.sha256 = sha256;
 function md5(buffer) {
     return (0, crypto_1.createHash)('md5').update(buffer).digest();
 }
+exports.md5 = md5;
 // HKDF key expansion
 function hkdf(buffer, expandedLength, info) {
     return (0, futoin_hkdf_1.default)(!Buffer.isBuffer(buffer) ? Buffer.from(buffer) : buffer, expandedLength, info);
 }
-async function derivePairingCodeKey(pairingCode, salt) {
-    return await pbkdf2Promise(pairingCode, salt, 2 << 16, 32, 'sha256');
+exports.hkdf = hkdf;
+function derivePairingCodeKey(pairingCode, salt) {
+    return (0, crypto_1.pbkdf2Sync)(pairingCode, salt, 2 << 16, 32, 'sha256');
 }
+exports.derivePairingCodeKey = derivePairingCodeKey;

package/lib/Utils/decode-wa-message.d.ts

@@ -2,23 +2,6 @@ import { Logger } from 'pino';
 import { proto } from '../../WAProto';
 import { SignalRepository } from '../Types';
 import { BinaryNode } from '../WABinary';
-export declare const NO_MESSAGE_FOUND_ERROR_TEXT = "Message absent from node";
-export declare const MISSING_KEYS_ERROR_TEXT = "Key used already or never filled";
-export declare const NACK_REASONS: {
-    ParsingError: number;
-    UnrecognizedStanza: number;
-    UnrecognizedStanzaClass: number;
-    UnrecognizedStanzaType: number;
-    InvalidProtobuf: number;
-    InvalidHostedCompanionStanza: number;
-    MissingMessageSecret: number;
-    SignalErrorOldCounter: number;
-    MessageDeletedOnPeer: number;
-    UnhandledError: number;
-    UnsupportedAdminRevoke: number;
-    UnsupportedLIDGroup: number;
-    DBOperationFailed: number;
-};
 /**
  * Decode the received node as a message.
  * @note this will only parse the message, not decrypt it

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

@@ -1,28 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decryptMessageNode = exports.NACK_REASONS = exports.MISSING_KEYS_ERROR_TEXT = exports.NO_MESSAGE_FOUND_ERROR_TEXT = void 0;
-exports.decodeMessageNode = decodeMessageNode;
+exports.decryptMessageNode = exports.decodeMessageNode = void 0;
 const boom_1 = require("@hapi/boom");
 const WAProto_1 = require("../../WAProto");
 const WABinary_1 = require("../WABinary");
 const generics_1 = require("./generics");
-exports.NO_MESSAGE_FOUND_ERROR_TEXT = 'Message absent from node';
-exports.MISSING_KEYS_ERROR_TEXT = 'Key used already or never filled';
-exports.NACK_REASONS = {
-    ParsingError: 487,
-    UnrecognizedStanza: 488,
-    UnrecognizedStanzaClass: 489,
-    UnrecognizedStanzaType: 490,
-    InvalidProtobuf: 491,
-    InvalidHostedCompanionStanza: 493,
-    MissingMessageSecret: 495,
-    SignalErrorOldCounter: 496,
-    MessageDeletedOnPeer: 499,
-    UnhandledError: 500,
-    UnsupportedAdminRevoke: 550,
-    UnsupportedLIDGroup: 551,
-    DBOperationFailed: 552
-};
+const NO_MESSAGE_FOUND_ERROR_TEXT = 'Message absent from node';
 /**
  * Decode the received node as a message.
  * @note this will only parse the message, not decrypt it
@@ -120,6 +103,7 @@ function decodeMessageNode(stanza, meId, meLid) {
         sender: msgType === 'chat' ? author : chatId
     };
 }
+exports.decodeMessageNode = decodeMessageNode;
 const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
     const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid);
     return {
@@ -129,11 +113,8 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
         async decrypt() {
             var _a;
             let decryptables = 0;
-            if ((0, WABinary_1.isJidNewsLetter)(fullMessage.key.remoteJid)) {
-                const node = (0, WABinary_1.getBinaryNodeChild)(stanza, 'plaintext');
-                const msg = WAProto_1.proto.Message.decode(node === null || node === void 0 ? void 0 : node.content);
+            async function processSenderKeyDistribution(msg) {
                 if (msg.senderKeyDistributionMessage) {
-                    //eslint-disable-next-line max-depth
                     try {
                         await repository.processSenderKeyDistributionMessage({
                             authorJid: author,
@@ -141,9 +122,14 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                         });
                     }
                     catch (err) {
-                        logger.error({ key: fullMessage.key, err }, 'failed to decrypt message');
+                        logger.error({ key: fullMessage.key, err }, 'failed to process senderKeyDistribution');
                     }
                 }
+            }
+            if ((0, WABinary_1.isJidNewsLetter)(fullMessage.key.remoteJid)) {
+                const node = (0, WABinary_1.getBinaryNodeChild)(stanza, 'plaintext');
+                const msg = WAProto_1.proto.Message.decode(node === null || node === void 0 ? void 0 : node.content);
+                await processSenderKeyDistribution(msg);
                 fullMessage.message = msg;
                 decryptables += 1;
             }
@@ -154,7 +140,7 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                         const details = WAProto_1.proto.VerifiedNameCertificate.Details.decode(cert.details);
                         fullMessage.verifiedBizName = details.verifiedName;
                     }
-                    if (tag !== 'enc' && tag !== 'plaintext') {
+                    if (tag !== 'enc') {
                         continue;
                     }
                     if (!(content instanceof Uint8Array)) {
@@ -163,7 +149,7 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                     decryptables += 1;
                     let msgBuffer;
                     try {
-                        const e2eType = tag === 'plaintext' ? 'plaintext' : attrs.type;
+                        const e2eType = attrs.type;
                         switch (e2eType) {
                             case 'skmsg':
                                 msgBuffer = await repository.decryptGroupMessage({
@@ -181,26 +167,12 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                                     ciphertext: content
                                 });
                                 break;
-                            case 'plaintext':
-                                msgBuffer = content;
-                                break;
                             default:
                                 throw new Error(`Unknown e2e type: ${e2eType}`);
                         }
-                        let msg = WAProto_1.proto.Message.decode(e2eType !== 'plaintext' ? (0, generics_1.unpadRandomMax16)(msgBuffer) : msgBuffer);
+                        let msg = WAProto_1.proto.Message.decode((0, generics_1.unpadRandomMax16)(msgBuffer));
                         msg = ((_a = msg.deviceSentMessage) === null || _a === void 0 ? void 0 : _a.message) || msg;
-                        if (msg.senderKeyDistributionMessage) {
-                            //eslint-disable-next-line max-depth
-                            try {
-                                await repository.processSenderKeyDistributionMessage({
-                                    authorJid: author,
-                                    item: msg.senderKeyDistributionMessage
-                                });
-                            }
-                            catch (err) {
-                                logger.error({ key: fullMessage.key, err }, 'failed to decrypt message');
-                            }
-                        }
+                        await processSenderKeyDistribution(msg);
                         if (fullMessage.message) {
                             Object.assign(fullMessage.message, msg);
                         }
@@ -218,7 +190,7 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
             // if nothing was found to decrypt
             if (!decryptables) {
                 fullMessage.messageStubType = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
-                fullMessage.messageStubParameters = [exports.NO_MESSAGE_FOUND_ERROR_TEXT];
+                fullMessage.messageStubParameters = [NO_MESSAGE_FOUND_ERROR_TEXT, JSON.stringify(stanza, generics_1.BufferJSON.replacer)];
             }
         }
     };

package/lib/Utils/generics.d.ts

@@ -1,20 +1,24 @@
+/// <reference types="node" />
 import { AxiosRequestConfig } from 'axios';
 import { Logger } from 'pino';
 import { proto } from '../../WAProto';
-import { BaileysEventEmitter, BaileysEventMap, BrowsersMap, ConnectionState, WACallUpdateType, WAVersion } from '../Types';
+import { BaileysEventEmitter, BaileysEventMap, WACallUpdateType, WAVersion } from '../Types';
 import { BinaryNode } from '../WABinary';
-export declare const Browsers: BrowsersMap;
-export declare const getPlatformId: (browser: string) => any;
-export declare const BufferJSON: {
-    replacer: (k: any, value: any) => any;
-    reviver: (_: any, value: any) => any;
+export declare const Browsers: {
+    ubuntu: (browser: any) => [string, string, string];
+    macOS: (browser: any) => [string, string, string];
+    baileys: (browser: any) => [string, string, string];
+    windows: (browser: any) => [string, string, string];
+    /** The appropriate browser based on your OS & release */
+    appropriate: (browser: any) => [string, string, string];
 };
+export declare const getPlatformId: (browser: string) => any;
 export declare const getKeyAuthor: (key: proto.IMessageKey | undefined | null, meId?: string) => string;
-export declare const writeRandomPadMax16: (msg: Uint8Array) => any;
-export declare const unpadRandomMax16: (e: Uint8Array | Buffer) => Uint8Array<any>;
-export declare const encodeWAMessage: (message: proto.IMessage) => any;
+export declare const writeRandomPadMax16: (msg: Uint8Array) => Buffer;
+export declare const unpadRandomMax16: (e: Uint8Array | Buffer) => Uint8Array;
+export declare const encodeWAMessage: (message: proto.IMessage) => Buffer;
 export declare const generateRegistrationId: () => number;
-export declare const encodeBigEndian: (e: number, t?: number) => Uint8Array<ArrayBuffer>;
+export declare const encodeBigEndian: (e: number, t?: number) => Uint8Array;
 export declare const toNumber: (t: Long | number | null | undefined) => number;
 /** unix timestamp of a date in seconds */
 export declare const unixTimestampSeconds: (date?: Date) => number;
@@ -34,14 +38,14 @@ export declare function promiseTimeout<T>(ms: number | undefined, promise: (reso
 export declare const generateMessageIDV2: (userId?: string) => string;
 export declare const generateMessageID: () => string;
 export declare function bindWaitForEvent<T extends keyof BaileysEventMap>(ev: BaileysEventEmitter, event: T): (check: (u: BaileysEventMap[T]) => boolean | undefined, timeoutMs?: number) => Promise<void>;
-export declare const bindWaitForConnectionUpdate: (ev: BaileysEventEmitter) => (check: (u: Partial<ConnectionState>) => boolean | undefined, timeoutMs?: number) => Promise<void>;
+export declare const bindWaitForConnectionUpdate: (ev: BaileysEventEmitter) => (check: (u: Partial<import("../Types").ConnectionState>) => boolean | undefined, timeoutMs?: number) => Promise<void>;
 export declare const printQRIfNecessaryListener: (ev: BaileysEventEmitter, logger: Logger) => void;
 /**
  * utility that fetches latest baileys version from the master branch.
  * Use to ensure your WA connection is always on the latest version
  */
 export declare const fetchLatestBaileysVersion: (options?: AxiosRequestConfig<any>) => Promise<{
-    version: any;
+    version: WAVersion;
     isLatest: boolean;
     error?: undefined;
 } | {
@@ -83,6 +87,6 @@ export declare const getCodeFromWSError: (error: Error) => number;
  * Is the given platform WA business
  * @param platform AuthenticationCreds.platform
  */
-export declare const isWABusinessPlatform: (platform: string) => platform is "smbi" | "smba";
+export declare const isWABusinessPlatform: (platform: string) => boolean;
 export declare function trimUndefined(obj: any): any;
 export declare function bytesToCrockford(buffer: Buffer): string;