@gqb333/based 2.7.80 → 2.7.81

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

@@ -1,207 +1,261 @@
 "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;
-const boom_1 = require("@hapi/boom");
+
+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
-};
-/**
- * Decode the received node as a message.
- * @note this will only parse the message, not decrypt it
- */
-function decodeMessageNode(stanza, meId, meLid) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    let msgType;
-    let chatId;
-    let author;
-    const msgId = stanza.attrs.id;
-    const from = stanza.attrs.from;
-    const senderPn = (_a = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _a === void 0 ? void 0 : _a.sender_pn;
-    const senderLid = (_b = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _b === void 0 ? void 0 : _b.sender_lid;
-    const participant = stanza.attrs.participant;
-    const participantLid = (_c = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _c === void 0 ? void 0 : _c.participant_lid;
-    const recipient = stanza.attrs.recipient;
-    const isMe = (jid) => (0, WABinary_1.areJidsSameUser)(jid, meId);
+exports.MISSING_KEYS_ERROR_TEXT     = 'Key used already or never filled';
+
+exports.NACK_REASONS = Object.freeze({
+    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
+});
+
+
+
+
+function attr(stanza, key) {
+    return stanza?.attrs?.[key];
+}
+
+
+function makeIdentityCheckers(meId, meLid) {
+    const isMe    = (jid) => (0, WABinary_1.areJidsSameUser)(jid, meId);
     const isMeLid = (jid) => (0, WABinary_1.areJidsSameUser)(jid, meLid);
+    return { isMe, isMeLid };
+}
+
+
+
+function decodeMessageNode(stanza, meId, meLid) {
+    const { isMe, isMeLid } = makeIdentityCheckers(meId, meLid);
+
+    const msgId         = stanza.attrs.id;
+    const from          = stanza.attrs.from;
+    const participant   = stanza.attrs.participant;
+    const recipient     = stanza.attrs.recipient;
+    const senderPn      = attr(stanza, 'sender_pn');
+    const senderLid     = attr(stanza, 'sender_lid');
+    const participantLid = attr(stanza, 'participant_lid');
+
+    let msgType, chatId, author;
+
+
     if ((0, WABinary_1.isJidUser)(from) || (0, WABinary_1.isLidUser)(from)) {
         if (recipient && !(0, WABinary_1.isJidMetaAi)(recipient)) {
             if (!isMe(from) && !isMeLid(from)) {
-                throw new boom_1.Boom('receipient present, but msg not from me', { data: stanza });
+                throw new boom_1.Boom('recipient present, but msg not from me', { data: stanza });
             }
             chatId = recipient;
-        }
-        else {
+        } else {
             chatId = from;
         }
         msgType = 'chat';
-        author = from;
-    }
-    else if ((0, WABinary_1.isJidGroup)(from)) {
-        if (!participant) {
-            throw new boom_1.Boom('No participant in group message');
-        }
+        author  = from;
+
+    } else if ((0, WABinary_1.isJidGroup)(from)) {
+        if (!participant) throw new boom_1.Boom('No participant in group message');
         msgType = 'group';
-        author = participant;
-        chatId = from;
-    }
-    else if ((0, WABinary_1.isJidNewsletter)(from)) {
+        author  = participant;
+        chatId  = from;
+
+    } else if ((0, WABinary_1.isJidNewsletter)(from)) {
         msgType = 'newsletter';
-        author = from;
-        chatId = from;
-    }
-    else if ((0, WABinary_1.isJidBroadcast)(from)) {
-        if (!participant) {
-            throw new boom_1.Boom('No participant in group message');
-        }
+        author  = from;
+        chatId  = from;
+
+    } else if ((0, WABinary_1.isJidBroadcast)(from)) {
+        if (!participant) throw new boom_1.Boom('No participant in broadcast message');
         const isParticipantMe = isMe(participant);
         if ((0, WABinary_1.isJidStatusBroadcast)(from)) {
             msgType = isParticipantMe ? 'direct_peer_status' : 'other_status';
-        }
-        else {
+        } else {
             msgType = isParticipantMe ? 'peer_broadcast' : 'other_broadcast';
         }
         chatId = from;
         author = participant;
-    }
-    else {
+
+    } else {
         throw new boom_1.Boom('Unknown message type', { data: stanza });
     }
-    const fromMe = (0, WABinary_1.isJidNewsletter)(from) ? !!((_d = stanza.attrs) === null || _d === void 0 ? void 0 : _d.is_sender) || false : ((0, WABinary_1.isLidUser)(from) ? isMeLid : isMe)(stanza.attrs.participant || stanza.attrs.from);
-    const pushname = (_e = stanza === null || stanza === void 0 ? void 0 : stanza.attrs) === null || _e === void 0 ? void 0 : _e.notify;
+
+   
+    const fromMe = (0, WABinary_1.isJidNewsletter)(from)
+        ? !!(stanza.attrs?.is_sender) || false
+        : ((0, WABinary_1.isLidUser)(from) ? isMeLid : isMe)(participant || from);
+
+    
     const key = {
-        remoteJid: chatId,
+        remoteJid:    chatId,
         fromMe,
-        id: msgId,
+        id:           msgId,
         senderPn,
         senderLid,
         participant,
         participantLid,
-        'server_id': (_f = stanza.attrs) === null || _f === void 0 ? void 0 : _f.server_id
+        server_id:    attr(stanza, 'server_id')
     };
+
     const fullMessage = {
         key,
         messageTimestamp: +stanza.attrs.t,
-        pushName: pushname,
-        broadcast: (0, WABinary_1.isJidBroadcast)(from)
+        pushName:         attr(stanza, 'notify'),
+        broadcast:        (0, WABinary_1.isJidBroadcast)(from)
     };
+
     if (msgType === 'newsletter') {
-        fullMessage.newsletterServerId = +((_g = stanza.attrs) === null || _g === void 0 ? void 0 : _g.server_id);
+        fullMessage.newsletterServerId = +(attr(stanza, 'server_id'));
     }
+
     if (key.fromMe) {
         fullMessage.status = WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK;
     }
+
     return {
         fullMessage,
         author,
         sender: msgType === 'chat' ? author : chatId
     };
 }
+
+
+
 const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
     const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid);
+
     return {
         fullMessage,
         category: stanza.attrs.category,
         author,
+
         async decrypt() {
-            var _a;
             let decryptables = 0;
-            if (Array.isArray(stanza.content)) {
-                for (const { tag, attrs, content } of stanza.content) {
-                    if (tag === 'verified_name' && content instanceof Uint8Array) {
-                        const cert = WAProto_1.proto.VerifiedNameCertificate.decode(content);
-                        const details = WAProto_1.proto.VerifiedNameCertificate.Details.decode(cert.details);
-                        fullMessage.verifiedBizName = details.verifiedName;
-                    }
-                    if (tag === 'unavailable' && attrs.type === 'view_once') {
-                        fullMessage.key.isViewOnce = true;
-                    }
-                    if (tag !== 'enc' && tag !== 'plaintext') {
-                        continue;
-                    }
-                    if (!(content instanceof Uint8Array)) {
-                        continue;
-                    }
-                    decryptables += 1;
-                    let msgBuffer;
-                    try {
-                        const e2eType = tag === 'plaintext' ? 'plaintext' : attrs.type;
-                        switch (e2eType) {
-                            case 'skmsg':
-                                msgBuffer = await repository.decryptGroupMessage({
-                                    group: sender,
-                                    authorJid: author,
-                                    msg: content
-                                });
-                                break;
-                            case 'pkmsg':
-                            case 'msg':
-                                const user = (0, WABinary_1.isJidUser)(sender) ? sender : author;
-                                msgBuffer = await repository.decryptMessage({
-                                    jid: user,
-                                    type: e2eType,
-                                    ciphertext: content
-                                });
-                                break;
-                            case 'plaintext':
-                                msgBuffer = content;
-                                break;
-                            case undefined:
-                                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);
-                        msg = ((_a = msg === null || msg === void 0 ? void 0 : msg.deviceSentMessage) === null || _a === void 0 ? void 0 : _a.message) || msg;
-                        if (msg.senderKeyDistributionMessage) {
-                            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);
-                        }
-                        else {
-                            fullMessage.message = msg;
+
+            if (!Array.isArray(stanza.content)) {
+                fullMessage.messageStubType       = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
+                fullMessage.messageStubParameters = [exports.NO_MESSAGE_FOUND_ERROR_TEXT];
+                return;
+            }
+
+            for (const { tag, attrs, content } of stanza.content) {
+
+                
+                
+                if (tag === 'verified_name' && content instanceof Uint8Array) {
+                    const cert    = WAProto_1.proto.VerifiedNameCertificate.decode(content);
+                    const details = WAProto_1.proto.VerifiedNameCertificate.Details.decode(cert.details);
+                    fullMessage.verifiedBizName = details.verifiedName;
+                    continue;
+                }
+
+                if (tag === 'unavailable' && attrs.type === 'view_once') {
+                    fullMessage.key.isViewOnce = true;
+                    continue;
+                }
+
+                if ((tag !== 'enc' && tag !== 'plaintext') || !(content instanceof Uint8Array)) {
+                    continue;
+                }
+
+                decryptables++;
+
+                try {
+                    const msgBuffer = await decryptContent(tag, attrs, content, sender, author, repository);
+
+                    let msg = WAProto_1.proto.Message.decode(
+                        tag !== 'plaintext' ? (0, generics_1.unpadRandomMax16)(msgBuffer) : msgBuffer
+                    );
+
+                    // Unwrap device-sent message
+                    msg = msg?.deviceSentMessage?.message || msg;
+
+                    // Processa sender key distribution
+                    if (msg.senderKeyDistributionMessage) {
+                        try {
+                            await repository.processSenderKeyDistributionMessage({
+                                authorJid: author,
+                                item: msg.senderKeyDistributionMessage
+                            });
+                        } catch (err) {
+                            logger.error({ key: fullMessage.key, err }, 'failed to process senderKeyDistribution');
                         }
                     }
-                    catch (err) {
-                        logger.error({ key: fullMessage.key, err }, 'failed to decrypt message');
-                        fullMessage.messageStubType = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
-                        fullMessage.messageStubParameters = [err.message];
+
+                    // Merge nel messaggio completo
+                    if (fullMessage.message) {
+                        Object.assign(fullMessage.message, msg);
+                    } else {
+                        fullMessage.message = msg;
                     }
+
+                } catch (err) {
+                    logger.error({ key: fullMessage.key, err }, 'failed to decrypt message');
+                    fullMessage.messageStubType       = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
+                    fullMessage.messageStubParameters = [err.message];
                 }
             }
-            // if nothing was found to decrypt
+
+            // Nessun contenuto decifrable trovato
             if (!decryptables) {
-                fullMessage.messageStubType = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
+                fullMessage.messageStubType       = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
                 fullMessage.messageStubParameters = [exports.NO_MESSAGE_FOUND_ERROR_TEXT];
             }
         }
     };
 };
-exports.decryptMessageNode = decryptMessageNode;
+exports.decryptMessageNode = decryptMessageNode;
+
+
+
+/**
+ * Decifra il contenuto di un nodo enc/plaintext.
+ * Estratto per leggibilità e testabilità.
+ */
+async function decryptContent(tag, attrs, content, sender, author, repository) {
+    const e2eType = tag === 'plaintext' ? 'plaintext' : attrs.type;
+
+    switch (e2eType) {
+        case 'skmsg':
+            return repository.decryptGroupMessage({
+                group:     sender,
+                authorJid: author,
+                msg:       content
+            });
+
+        case 'pkmsg':
+        case 'msg': {
+            const user = (0, WABinary_1.isJidUser)(sender) ? sender : author;
+            return repository.decryptMessage({
+                jid:        user,
+                type:       e2eType,
+                ciphertext: content
+            });
+        }
+
+        case 'plaintext':
+        case undefined:
+            return content;
+
+        default:
+            throw new Error(`Tipo e2e non riconosciuto: ${e2eType}`);
+    }
+}

package/lib/Utils/generics.js

@@ -1,9 +1,10 @@
 "use strict";
+
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
     if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
+        desc = { enumerable: true, get: function() { return m[k]; } };
     }
     Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
@@ -35,94 +36,108 @@ var __importStar = (this && this.__importStar) || (function () {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+
 Object.defineProperty(exports, "__esModule", { value: true });
 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.encodeNewsletterMessage = 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");
-const os_1 = require("os");
+
+const boom_1    = require("@hapi/boom");
+const axios_1   = __importDefault(require("axios"));
+const crypto_1  = require("crypto");
+const os_1      = require("os");
 const WAProto_1 = require("../../WAProto");
 const baileys_version_json_1 = require("../Defaults/baileys-version.json");
-const Types_1 = require("../Types");
+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',
-    'freebsd': 'FreeBSD',
-    'openbsd': 'OpenBSD',
-    'sunos': 'Solaris'
-};
+
+const COMPANION_PLATFORM_MAP = Object.freeze({
+    Chrome:  '49',
+    Edge:    '50',
+    Firefox: '51',
+    Opera:   '53',
+    Safari:  '54'
+});
+
+const PLATFORM_MAP = Object.freeze({
+    aix:     'AIX',
+    darwin:  'Mac OS',
+    win32:   'Windows',
+    android: 'Android',
+    freebsd: 'FreeBSD',
+    openbsd: 'OpenBSD',
+    sunos:   'Solaris'
+});
+
 exports.Browsers = {
-    ubuntu: (browser) => ['Ubuntu', browser, '24.04.1'],
-    macOS: (browser) => ['Mac OS', browser, '15.2.0'],
-    baileys: (browser) => ['Baileys', browser, '6.7.9'],
-    windows: (browser) => ['Windows', browser, '10.0.26100'],
+    ubuntu:      (browser) => ['Ubuntu',   browser, '24.04.1'],
+    macOS:       (browser) => ['Mac OS',   browser, '15.2.0'],
+    baileys:     (browser) => ['Baileys',  browser, '6.7.9'],
+    windows:     (browser) => ['Windows',  browser, '10.0.26100'],
     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() : '49'; //chrome
+    return platformType ? platformType.toString() : '49';
 };
 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') {
-            return { type: 'Buffer', data: Buffer.from((value === null || value === void 0 ? void 0 : value.data) || value).toString('base64') };
+        if (Buffer.isBuffer(value) || value instanceof Uint8Array || value?.type === 'Buffer') {
+            return { type: 'Buffer', data: Buffer.from(value?.data || value).toString('base64') };
         }
         return value;
     },
     reviver: (_, value) => {
-        if (typeof value === 'object' && !!value && (value.buffer === true || value.type === 'Buffer')) {
+        if (typeof value === 'object' && value && (value.buffer === true || value.type === 'Buffer')) {
             const val = value.data || value.value;
             return typeof val === 'string' ? Buffer.from(val, 'base64') : Buffer.from(val || []);
         }
         return value;
     }
 };
-const getKeyAuthor = (key, meId = 'me') => (((key === null || key === void 0 ? void 0 : key.fromMe) ? meId : (key === null || key === void 0 ? void 0 : key.participant) || (key === null || key === void 0 ? void 0 : key.remoteJid)) || '');
+
+const getKeyAuthor = (key, meId = 'me') => (
+    (key?.fromMe ? meId : key?.participant || key?.remoteJid) || ''
+);
 exports.getKeyAuthor = getKeyAuthor;
+
 const writeRandomPadMax16 = (msg) => {
     const pad = (0, crypto_1.randomBytes)(1);
     pad[0] &= 0xf;
-    if (!pad[0]) {
-        pad[0] = 0xf;
-    }
+    if (!pad[0]) pad[0] = 0xf;
     return Buffer.concat([msg, Buffer.alloc(pad[0], pad[0])]);
 };
 exports.writeRandomPadMax16 = writeRandomPadMax16;
+
 const unpadRandomMax16 = (e) => {
     const t = new Uint8Array(e);
-    if (0 === t.length) {
-        throw new Error('unpadPkcs7 given empty bytes');
-    }
-    var r = t[t.length - 1];
-    if (r > t.length) {
-        throw new Error(`unpad given ${t.length} bytes, but pad is ${r}`);
-    }
+    if (t.length === 0) throw new Error('unpadPkcs7 given empty bytes');
+    const r = t[t.length - 1];
+    if (r > t.length) throw new Error(`unpad given ${t.length} bytes, but pad is ${r}`);
     return new Uint8Array(t.buffer, t.byteOffset, t.length - r);
 };
 exports.unpadRandomMax16 = unpadRandomMax16;
-const encodeWAMessage = (message) => ((0, exports.writeRandomPadMax16)(WAProto_1.proto.Message.encode(message).finish()));
+
+const encodeWAMessage = (message) => (
+    (0, exports.writeRandomPadMax16)(WAProto_1.proto.Message.encode(message).finish())
+);
 exports.encodeWAMessage = encodeWAMessage;
-const encodeNewsletterMessage = (message) => (WAProto_1.proto.Message.encode(message).finish());
+
+const encodeNewsletterMessage = (message) => (
+    WAProto_1.proto.Message.encode(message).finish()
+);
 exports.encodeNewsletterMessage = encodeNewsletterMessage;
-const generateRegistrationId = () => {
-    return Uint16Array.from((0, crypto_1.randomBytes)(2))[0] & 16383;
-};
+
+const generateRegistrationId = () => (
+    Uint16Array.from((0, crypto_1.randomBytes)(2))[0] & 16383
+);
 exports.generateRegistrationId = generateRegistrationId;
+
 const encodeBigEndian = (e, t = 4) => {
     let r = e;
     const a = new Uint8Array(t);
@@ -133,78 +148,70 @@ const encodeBigEndian = (e, t = 4) => {
     return a;
 };
 exports.encodeBigEndian = encodeBigEndian;
-const toNumber = (t) => ((typeof t === 'object' && t) ? ('toNumber' in t ? t.toNumber() : t.low) : t || 0);
+
+const toNumber = (t) => (
+    (typeof t === 'object' && t) ? ('toNumber' in t ? t.toNumber() : t.low) : t || 0
+);
 exports.toNumber = toNumber;
-/** unix timestamp of a date in seconds */
+
 const unixTimestampSeconds = (date = new Date()) => Math.floor(date.getTime() / 1000);
 exports.unixTimestampSeconds = unixTimestampSeconds;
+
 const debouncedTimeout = (intervalMs = 1000, task) => {
     let timeout;
     return {
         start: (newIntervalMs, newTask) => {
             task = newTask || task;
             intervalMs = newIntervalMs || intervalMs;
-            timeout && clearTimeout(timeout);
-            timeout = setTimeout(() => task === null || task === void 0 ? void 0 : task(), intervalMs);
+            if (timeout) clearTimeout(timeout);
+            timeout = setTimeout(() => task?.(), intervalMs);
         },
         cancel: () => {
-            timeout && clearTimeout(timeout);
+            if (timeout) clearTimeout(timeout);
             timeout = undefined;
         },
-        setTask: (newTask) => task = newTask,
+        setTask:     (newTask)     => task = newTask,
         setInterval: (newInterval) => intervalMs = newInterval
     };
 };
 exports.debouncedTimeout = debouncedTimeout;
+
 const delay = (ms) => (0, exports.delayCancellable)(ms).delay;
 exports.delay = delay;
+
 const delayCancellable = (ms) => {
     const stack = new Error().stack;
-    let timeout;
-    let reject;
+    let timeout, reject;
     const delay = new Promise((resolve, _reject) => {
         timeout = setTimeout(resolve, ms);
-        reject = _reject;
+        reject  = _reject;
     });
     const cancel = () => {
         clearTimeout(timeout);
-        reject(new boom_1.Boom('Cancelled', {
-            statusCode: 500,
-            data: {
-                stack
-            }
-        }));
+        reject(new boom_1.Boom('Cancelled', { statusCode: 500, data: { stack } }));
     };
     return { delay, cancel };
 };
 exports.delayCancellable = delayCancellable;
+
 async function promiseTimeout(ms, promise) {
-    if (!ms) {
-        return new Promise(promise);
-    }
+    if (!ms) return new Promise(promise);
     const stack = new Error().stack;
-    // Create a promise that rejects in <ms> milliseconds
     const { delay, cancel } = (0, exports.delayCancellable)(ms);
-    const p = new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
         delay
-            .then(() => reject(new boom_1.Boom('Timed Out', {
-            statusCode: Types_1.DisconnectReason.timedOut,
-            data: {
-                stack
-            }
-        })))
+            .then(() => reject(new boom_1.Boom('Timed Out', { statusCode: Types_1.DisconnectReason.timedOut, data: { stack } })))
             .catch(err => reject(err));
         promise(resolve, reject);
-    })
-        .finally(cancel);
-    return p;
+    }).finally(cancel);
 }
+
 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) {
+        if (id?.user) {
             data.write(id.user, 8);
             data.write('@c.us', 8 + id.user.length);
         }
@@ -215,215 +222,144 @@ const generateMessageIDV2 = (userId) => {
     return '3EB0' + hash.toString('hex').toUpperCase().substring(0, 18);
 };
 exports.generateMessageIDV2 = generateMessageIDV2;
-// generate a random ID to attach to a message
+
 const generateMessageID = () => '3EB0' + (0, crypto_1.randomBytes)(18).toString('hex').toUpperCase();
 exports.generateMessageID = generateMessageID;
+
 function bindWaitForEvent(ev, event) {
     return async (check, timeoutMs) => {
-        let listener;
-        let closeListener;
-        await (promiseTimeout(timeoutMs, (resolve, reject) => {
+        let listener, closeListener;
+        await promiseTimeout(timeoutMs, (resolve, reject) => {
             closeListener = ({ connection, lastDisconnect }) => {
                 if (connection === 'close') {
-                    reject((lastDisconnect === null || lastDisconnect === void 0 ? void 0 : lastDisconnect.error)
-                        || new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed }));
+                    reject(lastDisconnect?.error || new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed }));
                 }
             };
             ev.on('connection.update', closeListener);
             listener = async (update) => {
-                if (await check(update)) {
-                    resolve();
-                }
+                if (await check(update)) resolve();
             };
             ev.on(event, listener);
-        })
-            .finally(() => {
+        }).finally(() => {
             ev.off(event, listener);
             ev.off('connection.update', closeListener);
-        }));
+        });
     };
 }
+
 const bindWaitForConnectionUpdate = (ev) => bindWaitForEvent(ev, 'connection.update');
 exports.bindWaitForConnectionUpdate = bindWaitForConnectionUpdate;
+
 const printQRIfNecessaryListener = (ev, logger) => {
     ev.on('connection.update', async ({ qr }) => {
         if (qr) {
-            const QR = await Promise.resolve().then(() => __importStar(require('qrcode-terminal'))).then(m => m.default || m)
-                .catch(() => {
-                logger.error('QR code terminal not added as dependency');
-            });
-            QR === null || QR === void 0 ? void 0 : QR.generate(qr, { small: true });
+            const QR = await Promise.resolve()
+                .then(() => __importStar(require('qrcode-terminal')))
+                .then(m => m.default || m)
+                .catch(() => { logger.error('QR code terminal not added as dependency'); });
+            QR?.generate(qr, { small: true });
         }
     });
 };
 exports.printQRIfNecessaryListener = printQRIfNecessaryListener;
+
 const fetchLatestBaileysVersion = async (options = {}) => {
     const URL = 'https://github.com/GabWT333/based/lib/Defaults/baileys-version.json';
     try {
-        const result = await axios_1.default.get(URL, {
-            ...options,
-            responseType: 'json'
-        });
-        return {
-            version: result.data.version,
-            isLatest: true
-        };
-    }
-    catch (error) {
-        return {
-            version: baileys_version_json_1.version,
-            isLatest: false,
-            error
-        };
+        const result = await axios_1.default.get(URL, { ...options, responseType: 'json' });
+        return { version: result.data.version, isLatest: true };
+    } catch (error) {
+        return { version: baileys_version_json_1.version, isLatest: false, error };
     }
 };
 exports.fetchLatestBaileysVersion = fetchLatestBaileysVersion;
-/**
- * A utility that fetches the latest web version of whatsapp.
- * Use to ensure your WA connection is always on the latest version
- */
+
 const fetchLatestWaWebVersion = async (options) => {
     try {
-        const { data } = await axios_1.default.get('https://web.whatsapp.com/sw.js', {
-            ...options,
-            responseType: 'json'
-        });
-        const regex = /\\?"client_revision\\?":\s*(\d+)/;
-        const match = data.match(regex);
-        if (!(match === null || match === void 0 ? void 0 : match[1])) {
-            return {
-                version: baileys_version_json_1.version,
-                isLatest: false,
-                error: {
-                    message: 'Could not find client revision in the fetched content'
-                }
-            };
+        const { data } = await axios_1.default.get('https://web.whatsapp.com/sw.js', { ...options, responseType: 'json' });
+        const match = data.match(/\\?"client_revision\\?":\s*(\d+)/);
+        if (!match?.[1]) {
+            return { version: baileys_version_json_1.version, isLatest: false, error: { message: 'Could not find client revision in the fetched content' } };
         }
-        const clientRevision = match[1];
-        return {
-            version: [2, 3000, +clientRevision],
-            isLatest: true
-        };
-    }
-    catch (error) {
-        return {
-            version: baileys_version_json_1.version,
-            isLatest: false,
-            error
-        };
+        return { version: [2, 3000, +match[1]], isLatest: true };
+    } catch (error) {
+        return { version: baileys_version_json_1.version, isLatest: false, error };
     }
 };
 exports.fetchLatestWaWebVersion = fetchLatestWaWebVersion;
-/** unique message tag prefix for MD clients */
+
 const generateMdTagPrefix = () => {
     const bytes = (0, crypto_1.randomBytes)(4);
     return `${bytes.readUInt16BE()}.${bytes.readUInt16BE(2)}-`;
 };
 exports.generateMdTagPrefix = generateMdTagPrefix;
-const STATUS_MAP = {
-    'sender': WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK,
-    'played': WAProto_1.proto.WebMessageInfo.Status.PLAYED,
-    'read': WAProto_1.proto.WebMessageInfo.Status.READ,
+
+const STATUS_MAP = Object.freeze({
+    sender:      WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK,
+    played:      WAProto_1.proto.WebMessageInfo.Status.PLAYED,
+    read:        WAProto_1.proto.WebMessageInfo.Status.READ,
     'read-self': WAProto_1.proto.WebMessageInfo.Status.READ
-};
-/**
- * Given a type of receipt, returns what the new status of the message should be
- * @param type type from receipt
- */
+});
+
 const getStatusFromReceiptType = (type) => {
-    const status = STATUS_MAP[type];
-    if (typeof type === 'undefined') {
-        return WAProto_1.proto.WebMessageInfo.Status.DELIVERY_ACK;
-    }
-    return status;
+    if (typeof type === 'undefined') return WAProto_1.proto.WebMessageInfo.Status.DELIVERY_ACK;
+    return STATUS_MAP[type];
 };
 exports.getStatusFromReceiptType = getStatusFromReceiptType;
-const CODE_MAP = {
+
+const CODE_MAP = Object.freeze({
     conflict: Types_1.DisconnectReason.connectionReplaced
-};
-/**
- * Stream errors generally provide a reason, map that to a baileys DisconnectReason
- * @param reason the string reason given, eg. "conflict"
- */
+});
+
 const getErrorCodeFromStreamError = (node) => {
     const [reasonNode] = (0, WABinary_1.getAllBinaryNodeChildren)(node);
-    let reason = (reasonNode === null || reasonNode === void 0 ? void 0 : reasonNode.tag) || 'unknown';
+    let reason = reasonNode?.tag || 'unknown';
     const statusCode = +(node.attrs.code || CODE_MAP[reason] || Types_1.DisconnectReason.badSession);
-    if (statusCode === Types_1.DisconnectReason.restartRequired) {
-        reason = 'restart required';
-    }
-    return {
-        reason,
-        statusCode
-    };
+    if (statusCode === Types_1.DisconnectReason.restartRequired) reason = 'restart required';
+    return { reason, statusCode };
 };
 exports.getErrorCodeFromStreamError = getErrorCodeFromStreamError;
+
 const getCallStatusFromNode = ({ tag, attrs }) => {
-    let status;
     switch (tag) {
         case 'offer':
-        case 'offer_notice':
-            status = 'offer';
-            break;
-        case 'terminate':
-            if (attrs.reason === 'timeout') {
-                status = 'timeout';
-            }
-            else {
-                // fired when accepted/rejected/timeout/caller hangs up
-                status = 'terminate';
-            }
-            break;
-        case 'reject':
-            status = 'reject';
-            break;
-        case 'accept':
-            status = 'accept';
-            break;
-        default:
-            status = 'ringing';
-            break;
+        case 'offer_notice': return 'offer';
+        case 'terminate':    return attrs.reason === 'timeout' ? 'timeout' : 'terminate';
+        case 'reject':       return 'reject';
+        case 'accept':       return 'accept';
+        default:             return 'ringing';
     }
-    return status;
 };
 exports.getCallStatusFromNode = getCallStatusFromNode;
+
 const UNEXPECTED_SERVER_CODE_TEXT = 'Unexpected server response: ';
+
 const getCodeFromWSError = (error) => {
-    var _a, _b, _c;
     let statusCode = 500;
-    if ((_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes(UNEXPECTED_SERVER_CODE_TEXT)) {
-        const code = +(error === null || error === void 0 ? void 0 : error.message.slice(UNEXPECTED_SERVER_CODE_TEXT.length));
-        if (!Number.isNaN(code) && code >= 400) {
-            statusCode = code;
-        }
-    }
-    else if (((_b = error === null || error === void 0 ? void 0 : error.code) === null || _b === void 0 ? void 0 : _b.startsWith('E'))
-        || ((_c = error === null || error === void 0 ? void 0 : error.message) === null || _c === void 0 ? void 0 : _c.includes('timed out'))) { // handle ETIMEOUT, ENOTFOUND etc
+    if (error?.message?.includes(UNEXPECTED_SERVER_CODE_TEXT)) {
+        const code = +(error.message.slice(UNEXPECTED_SERVER_CODE_TEXT.length));
+        if (!Number.isNaN(code) && code >= 400) statusCode = code;
+    } else if (error?.code?.startsWith('E') || error?.message?.includes('timed out')) {
         statusCode = 408;
     }
     return statusCode;
 };
 exports.getCodeFromWSError = getCodeFromWSError;
-/**
- * Is the given platform WA business
- * @param platform AuthenticationCreds.platform
- */
-const isWABusinessPlatform = (platform) => {
-    return platform === 'smbi' || platform === 'smba';
-};
+
+const isWABusinessPlatform = (platform) => platform === 'smbi' || platform === 'smba';
 exports.isWABusinessPlatform = isWABusinessPlatform;
+
 function trimUndefined(obj) {
     for (const key in obj) {
-        if (typeof obj[key] === 'undefined') {
-            delete obj[key];
-        }
+        if (typeof obj[key] === 'undefined') delete obj[key];
     }
     return obj;
 }
+
 const CROCKFORD_CHARACTERS = '123456789ABCDEFGHJKLMNPQRSTVWXYZ';
+
 function bytesToCrockford(buffer) {
-    let value = 0;
-    let bitCount = 0;
+    let value = 0, bitCount = 0;
     const crockford = [];
     for (let i = 0; i < buffer.length; i++) {
         value = (value << 8) | (buffer[i] & 0xff);
@@ -433,8 +369,6 @@ function bytesToCrockford(buffer) {
             bitCount -= 5;
         }
     }
-    if (bitCount > 0) {
-        crockford.push(CROCKFORD_CHARACTERS.charAt((value << (5 - bitCount)) & 31));
-    }
+    if (bitCount > 0) crockford.push(CROCKFORD_CHARACTERS.charAt((value << (5 - bitCount)) & 31));
     return crockford.join('');
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gqb333/based",
-  "version": "2.7.80",
+  "version": "2.7.81",
   "description": "Whatsapp api by GabWT333",
   "keywords": [
     "baileys",