@jkt48connect-corp/baileys 7.2.7 → 7.2.9

package/lib/Utils/chat-utils.js

@@ -305,8 +305,7 @@ const decodePatches = async (name, syncds, initial, getAppStateSyncKey, options,
         indexValueMap: { ...initial.indexValueMap }
     };
     const mutationMap = {};
-    for (let i = 0; i < syncds.length; i++) {
-        const syncd = syncds[i];
+    for (const syncd of syncds) {
         const { version, keyId, snapshotMac } = syncd;
         if (syncd.externalMutations) {
             logger === null || logger === void 0 ? void 0 : logger.trace({ name, version }, 'downloading external patch');
@@ -418,25 +417,31 @@ 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) {
-        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
-            };
-        }
+        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
+        };
     }
     else if ('pin' in mod) {
         patch = {
@@ -491,6 +496,22 @@ 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: {

package/lib/Utils/crypto.js

@@ -15,22 +15,47 @@ 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;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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;
 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
@@ -77,7 +102,6 @@ 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
@@ -92,60 +116,48 @@ 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);
 }
-exports.hkdf = hkdf;
-function derivePairingCodeKey(pairingCode, salt) {
-    return (0, crypto_1.pbkdf2Sync)(pairingCode, salt, 2 << 16, 32, 'sha256');
+async function derivePairingCodeKey(pairingCode, salt) {
+    return await pbkdf2Promise(pairingCode, salt, 2 << 16, 32, 'sha256');
 }
-exports.derivePairingCodeKey = derivePairingCodeKey;

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

@@ -1,11 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decryptMessageNode = exports.decodeMessageNode = void 0;
+exports.decryptMessageNode = exports.NACK_REASONS = exports.MISSING_KEYS_ERROR_TEXT = exports.NO_MESSAGE_FOUND_ERROR_TEXT = void 0;
+exports.decodeMessageNode = decodeMessageNode;
 const boom_1 = require("@hapi/boom");
 const WAProto_1 = require("../../WAProto");
 const WABinary_1 = require("../WABinary");
 const generics_1 = require("./generics");
-const NO_MESSAGE_FOUND_ERROR_TEXT = 'Message absent from node';
+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
+};
 /**
  * Decode the received node as a message.
  * @note this will only parse the message, not decrypt it
@@ -103,7 +120,6 @@ 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 {
@@ -113,8 +129,11 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
         async decrypt() {
             var _a;
             let decryptables = 0;
-            async function processSenderKeyDistribution(msg) {
+            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);
                 if (msg.senderKeyDistributionMessage) {
+                    //eslint-disable-next-line max-depth
                     try {
                         await repository.processSenderKeyDistributionMessage({
                             authorJid: author,
@@ -122,14 +141,9 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                         });
                     }
                     catch (err) {
-                        logger.error({ key: fullMessage.key, err }, 'failed to process senderKeyDistribution');
+                        logger.error({ key: fullMessage.key, err }, 'failed to decrypt message');
                     }
                 }
-            }
-            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;
             }
@@ -140,7 +154,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') {
+                    if (tag !== 'enc' && tag !== 'plaintext') {
                         continue;
                     }
                     if (!(content instanceof Uint8Array)) {
@@ -149,7 +163,7 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
                     decryptables += 1;
                     let msgBuffer;
                     try {
-                        const e2eType = attrs.type;
+                        const e2eType = tag === 'plaintext' ? 'plaintext' : attrs.type;
                         switch (e2eType) {
                             case 'skmsg':
                                 msgBuffer = await repository.decryptGroupMessage({
@@ -167,12 +181,26 @@ 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((0, generics_1.unpadRandomMax16)(msgBuffer));
+                        let msg = WAProto_1.proto.Message.decode(e2eType !== 'plaintext' ? (0, generics_1.unpadRandomMax16)(msgBuffer) : msgBuffer);
                         msg = ((_a = msg.deviceSentMessage) === null || _a === void 0 ? void 0 : _a.message) || msg;
-                        await processSenderKeyDistribution(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');
+                            }
+                        }
                         if (fullMessage.message) {
                             Object.assign(fullMessage.message, msg);
                         }
@@ -190,7 +218,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 = [NO_MESSAGE_FOUND_ERROR_TEXT, JSON.stringify(stanza, generics_1.BufferJSON.replacer)];
+                fullMessage.messageStubParameters = [exports.NO_MESSAGE_FOUND_ERROR_TEXT];
             }
         }
     };

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.generateMessageIDV2 = 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,22 +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'],
-    iOS: browser => ['iOS', browser, '18.2'],
-    linux: browser => ['Linux', browser, '6.12.6'],
+    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') {
@@ -148,7 +167,6 @@ 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)));
@@ -162,11 +180,11 @@ const generateMessageIDV2 = (userId) => {
     const random = (0, crypto_1.randomBytes)(16);
     random.copy(data, 28);
     const hash = (0, crypto_1.createHash)('sha256').update(data).digest();
-    return 'ASS' + hash.toString('hex').toUpperCase().substring(0, 18);
+    return 'FizzxyTheGreat-' + hash.toString('hex').toUpperCase().substring(0, 18);
 };
 exports.generateMessageIDV2 = generateMessageIDV2;
 // generate a random ID to attach to a message
-const generateMessageID = () => 'SSA' + (0, crypto_1.randomBytes)(6).toString('hex').toUpperCase();
+const generateMessageID = () => 'FizzxyTheGreat-' + (0, crypto_1.randomBytes)(6).toString('hex').toUpperCase();
 exports.generateMessageID = generateMessageID;
 function bindWaitForEvent(ev, event) {
     return async (check, timeoutMs) => {
@@ -193,7 +211,6 @@ function bindWaitForEvent(ev, event) {
         }));
     };
 }
-exports.bindWaitForEvent = bindWaitForEvent;
 const bindWaitForConnectionUpdate = (ev) => bindWaitForEvent(ev, 'connection.update');
 exports.bindWaitForConnectionUpdate = bindWaitForConnectionUpdate;
 const printQRIfNecessaryListener = (ev, logger) => {
@@ -314,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':
@@ -363,7 +381,6 @@ function trimUndefined(obj) {
     }
     return obj;
 }
-exports.trimUndefined = trimUndefined;
 const CROCKFORD_CHARACTERS = '123456789ABCDEFGHJKLMNPQRSTVWXYZ';
 function bytesToCrockford(buffer) {
     let value = 0;
@@ -382,4 +399,3 @@ function bytesToCrockford(buffer) {
     }
     return crockford.join('');
 }
-exports.bytesToCrockford = bytesToCrockford;

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/index.js

@@ -28,7 +28,6 @@ __exportStar(require("./lt-hash"), exports);
 __exportStar(require("./auth-utils"), exports);
 __exportStar(require("./baileys-event-stream"), exports);
 __exportStar(require("./use-multi-file-auth-state"), exports);
-__exportStar(require("./use-single-file-auth-statev2"), exports);
 __exportStar(require("./link-preview"), exports);
 __exportStar(require("./event-buffer"), exports);
 __exportStar(require("./process-message"), exports);

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.prepareStream = 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,7 +304,6 @@ 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' });
@@ -565,7 +557,6 @@ function extensionForMediaMessage(message) {
     }
     return extension;
 }
-exports.extensionForMediaMessage = extensionForMediaMessage;
 const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
     return async (stream, { mediaType, fileEncSha256B64, newsletter, timeoutMs }) => {
         var _a, _b;