violetics 7.0.1-alpha → 7.0.2-alpha

package/lib/Utils/process-message.js

@@ -1,33 +1,38 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decryptPollVote = exports.getChatId = exports.shouldIncrementChatUnread = exports.isRealMessage = exports.cleanMessage = void 0;
-const WAProto_1 = require("../../WAProto");
-const Types_1 = require("../Types");
-const messages_1 = require("../Utils/messages");
-const WABinary_1 = require("../WABinary");
-const crypto_1 = require("./crypto");
-const generics_1 = require("./generics");
-const history_1 = require("./history");
+import { proto } from '../../WAProto/index.js';
+import { WAMessageStubType } from '../Types/index.js';
+import { getContentType, normalizeMessageContent } from '../Utils/messages.js';
+import { areJidsSameUser, isHostedLidUser, isHostedPnUser, isJidBroadcast, isJidStatusBroadcast, isLidUser, jidDecode, jidEncode, jidNormalizedUser } from '../WABinary/index.js';
+import { aesDecryptGCM, hmacSign } from './crypto.js';
+import { getKeyAuthor, toNumber } from './generics.js';
+import { downloadAndProcessHistorySyncNotification } from './history.js';
 const REAL_MSG_STUB_TYPES = new Set([
-    Types_1.WAMessageStubType.CALL_MISSED_GROUP_VIDEO,
-    Types_1.WAMessageStubType.CALL_MISSED_GROUP_VOICE,
-    Types_1.WAMessageStubType.CALL_MISSED_VIDEO,
-    Types_1.WAMessageStubType.CALL_MISSED_VOICE
-]);
-const REAL_MSG_REQ_ME_STUB_TYPES = new Set([
-    Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD
+    WAMessageStubType.CALL_MISSED_GROUP_VIDEO,
+    WAMessageStubType.CALL_MISSED_GROUP_VOICE,
+    WAMessageStubType.CALL_MISSED_VIDEO,
+    WAMessageStubType.CALL_MISSED_VOICE
 ]);
+const REAL_MSG_REQ_ME_STUB_TYPES = new Set([WAMessageStubType.GROUP_PARTICIPANT_ADD]);
 /** Cleans a received message to further processing */
-const cleanMessage = (message, meId) => {
+export const cleanMessage = (message, meId, meLid) => {
     // ensure remoteJid and participant doesn't have device or agent in it
-    message.key.remoteJid = (0, WABinary_1.jidNormalizedUser)(message.key.remoteJid);
-    message.key.participant = message.key.participant ? (0, WABinary_1.jidNormalizedUser)(message.key.participant) : undefined;
-    const content = (0, messages_1.normalizeMessageContent)(message.message);
+    if (isHostedPnUser(message.key.remoteJid) || isHostedLidUser(message.key.remoteJid)) {
+        message.key.remoteJid = jidEncode(jidDecode(message.key?.remoteJid)?.user, isHostedPnUser(message.key.remoteJid) ? 's.whatsapp.net' : 'lid');
+    }
+    else {
+        message.key.remoteJid = jidNormalizedUser(message.key.remoteJid);
+    }
+    if (isHostedPnUser(message.key.participant) || isHostedLidUser(message.key.participant)) {
+        message.key.participant = jidEncode(jidDecode(message.key.participant)?.user, isHostedPnUser(message.key.participant) ? 's.whatsapp.net' : 'lid');
+    }
+    else {
+        message.key.participant = jidNormalizedUser(message.key.participant);
+    }
+    const content = normalizeMessageContent(message.message);
     // if the message has a reaction, ensure fromMe & remoteJid are from our perspective
-    if (content === null || content === void 0 ? void 0 : content.reactionMessage) {
+    if (content?.reactionMessage) {
         normaliseKey(content.reactionMessage.key);
     }
-    if (content === null || content === void 0 ? void 0 : content.pollUpdateMessage) {
+    if (content?.pollUpdateMessage) {
         normaliseKey(content.pollUpdateMessage.pollCreationMessageKey);
     }
     function normaliseKey(msgKey) {
@@ -37,54 +42,49 @@ const cleanMessage = (message, meId) => {
             // if the sender believed the message being reacted to is not from them
             // we've to correct the key to be from them, or some other participant
             msgKey.fromMe = !msgKey.fromMe
-                ? (0, WABinary_1.areJidsSameUser)(msgKey.participant || msgKey.remoteJid, meId)
-                // if the message being reacted to, was from them
-                // fromMe automatically becomes false
-                : false;
+                ? areJidsSameUser(msgKey.participant || msgKey.remoteJid, meId) ||
+                    areJidsSameUser(msgKey.participant || msgKey.remoteJid, meLid)
+                : // if the message being reacted to, was from them
+                    // fromMe automatically becomes false
+                    false;
             // set the remoteJid to being the same as the chat the message came from
+            // TODO: investigate inconsistencies
             msgKey.remoteJid = message.key.remoteJid;
             // set participant of the message
             msgKey.participant = msgKey.participant || message.key.participant;
         }
     }
 };
-exports.cleanMessage = cleanMessage;
-const isRealMessage = (message, meId) => {
-    var _a;
-    const normalizedContent = (0, messages_1.normalizeMessageContent)(message.message);
-    const hasSomeContent = !!(0, messages_1.getContentType)(normalizedContent);
-    return (!!normalizedContent
-        || REAL_MSG_STUB_TYPES.has(message.messageStubType)
-        || (REAL_MSG_REQ_ME_STUB_TYPES.has(message.messageStubType)
-            && ((_a = message.messageStubParameters) === null || _a === void 0 ? void 0 : _a.some(p => (0, WABinary_1.areJidsSameUser)(meId, p)))))
-        && hasSomeContent
-        && !(normalizedContent === null || normalizedContent === void 0 ? void 0 : normalizedContent.protocolMessage)
-        && !(normalizedContent === null || normalizedContent === void 0 ? void 0 : normalizedContent.reactionMessage)
-        && !(normalizedContent === null || normalizedContent === void 0 ? void 0 : normalizedContent.pollUpdateMessage);
+// TODO: target:audit AUDIT THIS FUNCTION AGAIN
+export const isRealMessage = (message) => {
+    const normalizedContent = normalizeMessageContent(message.message);
+    const hasSomeContent = !!getContentType(normalizedContent);
+    return ((!!normalizedContent ||
+        REAL_MSG_STUB_TYPES.has(message.messageStubType) ||
+        REAL_MSG_REQ_ME_STUB_TYPES.has(message.messageStubType)) &&
+        hasSomeContent &&
+        !normalizedContent?.protocolMessage &&
+        !normalizedContent?.reactionMessage &&
+        !normalizedContent?.pollUpdateMessage);
 };
-exports.isRealMessage = isRealMessage;
-const shouldIncrementChatUnread = (message) => (!message.key.fromMe && !message.messageStubType);
-exports.shouldIncrementChatUnread = shouldIncrementChatUnread;
+export const shouldIncrementChatUnread = (message) => !message.key.fromMe && !message.messageStubType;
 /**
  * Get the ID of the chat from the given key.
  * Typically -- that'll be the remoteJid, but for broadcasts, it'll be the participant
  */
-const getChatId = ({ remoteJid, participant, fromMe }) => {
-    if ((0, WABinary_1.isJidBroadcast)(remoteJid)
-        && !(0, WABinary_1.isJidStatusBroadcast)(remoteJid)
-        && !fromMe) {
+export const getChatId = ({ remoteJid, participant, fromMe }) => {
+    if (isJidBroadcast(remoteJid) && !isJidStatusBroadcast(remoteJid) && !fromMe) {
         return participant;
     }
     return remoteJid;
 };
-exports.getChatId = getChatId;
 /**
  * Decrypt a poll vote
  * @param vote encrypted vote
  * @param ctx additional info about the poll required for decryption
  * @returns list of SHA256 options
  */
-function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pollEncKey, voterJid, }) {
+export function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pollEncKey, voterJid }) {
     const sign = Buffer.concat([
         toBinary(pollMsgId),
         toBinary(pollCreatorJid),
@@ -92,64 +92,98 @@ function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pol
         toBinary('Poll Vote'),
         new Uint8Array([1])
     ]);
-    const key0 = (0, crypto_1.hmacSign)(pollEncKey, new Uint8Array(32), 'sha256');
-    const decKey = (0, crypto_1.hmacSign)(sign, key0, 'sha256');
+    const key0 = hmacSign(pollEncKey, new Uint8Array(32), 'sha256');
+    const decKey = hmacSign(sign, key0, 'sha256');
     const aad = toBinary(`${pollMsgId}\u0000${voterJid}`);
-    const decrypted = (0, crypto_1.aesDecryptGCM)(encPayload, decKey, encIv, aad);
-    return WAProto_1.proto.Message.PollVoteMessage.decode(decrypted);
+    const decrypted = aesDecryptGCM(encPayload, decKey, encIv, aad);
+    return proto.Message.PollVoteMessage.decode(decrypted);
+    function toBinary(txt) {
+        return Buffer.from(txt);
+    }
+}
+/**
+ * Decrypt an event response
+ * @param response encrypted event response
+ * @param ctx additional info about the event required for decryption
+ * @returns event response message
+ */
+export function decryptEventResponse({ encPayload, encIv }, { eventCreatorJid, eventMsgId, eventEncKey, responderJid }) {
+    const sign = Buffer.concat([
+        toBinary(eventMsgId),
+        toBinary(eventCreatorJid),
+        toBinary(responderJid),
+        toBinary('Event Response'),
+        new Uint8Array([1])
+    ]);
+    const key0 = hmacSign(eventEncKey, new Uint8Array(32), 'sha256');
+    const decKey = hmacSign(sign, key0, 'sha256');
+    const aad = toBinary(`${eventMsgId}\u0000${responderJid}`);
+    const decrypted = aesDecryptGCM(encPayload, decKey, encIv, aad);
+    return proto.Message.EventResponseMessage.decode(decrypted);
     function toBinary(txt) {
         return Buffer.from(txt);
     }
 }
-exports.decryptPollVote = decryptPollVote;
-const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, keyStore, logger, options, getMessage }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+const processMessage = async (message, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, signalRepository, keyStore, logger, options, getMessage }) => {
     const meId = creds.me.id;
     const { accountSettings } = creds;
-    const chat = { id: (0, WABinary_1.jidNormalizedUser)((0, exports.getChatId)(message.key)) };
-    const isRealMsg = (0, exports.isRealMessage)(message, meId);
+    const chat = { id: jidNormalizedUser(getChatId(message.key)) };
+    const isRealMsg = isRealMessage(message);
     if (isRealMsg) {
-        chat.conversationTimestamp = (0, generics_1.toNumber)(message.messageTimestamp);
+        chat.messages = [{ message }];
+        chat.conversationTimestamp = toNumber(message.messageTimestamp);
         // only increment unread count if not CIPHERTEXT and from another person
-        if ((0, exports.shouldIncrementChatUnread)(message)) {
+        if (shouldIncrementChatUnread(message)) {
             chat.unreadCount = (chat.unreadCount || 0) + 1;
         }
     }
-    const content = (0, messages_1.normalizeMessageContent)(message.message);
+    const content = normalizeMessageContent(message.message);
     // unarchive chat if it's a real message, or someone reacted to our message
     // and we've the unarchive chats setting on
-    if ((isRealMsg || ((_b = (_a = content === null || content === void 0 ? void 0 : content.reactionMessage) === null || _a === void 0 ? void 0 : _a.key) === null || _b === void 0 ? void 0 : _b.fromMe))
-        && (accountSettings === null || accountSettings === void 0 ? void 0 : accountSettings.unarchiveChats)) {
+    if ((isRealMsg || content?.reactionMessage?.key?.fromMe) && accountSettings?.unarchiveChats) {
         chat.archived = false;
         chat.readOnly = false;
     }
-    const protocolMsg = content === null || content === void 0 ? void 0 : content.protocolMessage;
+    const protocolMsg = content?.protocolMessage;
     if (protocolMsg) {
         switch (protocolMsg.type) {
-            case WAProto_1.proto.Message.ProtocolMessage.Type.HISTORY_SYNC_NOTIFICATION:
+            case proto.Message.ProtocolMessage.Type.HISTORY_SYNC_NOTIFICATION:
                 const histNotification = protocolMsg.historySyncNotification;
                 const process = shouldProcessHistoryMsg;
-                const isLatest = !((_c = creds.processedHistoryMessages) === null || _c === void 0 ? void 0 : _c.length);
-                logger === null || logger === void 0 ? void 0 : logger.info({
+                const isLatest = !creds.processedHistoryMessages?.length;
+                logger?.info({
                     histNotification,
                     process,
                     id: message.key.id,
-                    isLatest,
+                    isLatest
                 }, 'got history notification');
                 if (process) {
-                    ev.emit('creds.update', {
-                        processedHistoryMessages: [
-                            ...(creds.processedHistoryMessages || []),
-                            { key: message.key, messageTimestamp: message.messageTimestamp }
-                        ]
+                    // TODO: investigate
+                    if (histNotification.syncType !== proto.HistorySync.HistorySyncType.ON_DEMAND) {
+                        ev.emit('creds.update', {
+                            processedHistoryMessages: [
+                                ...(creds.processedHistoryMessages || []),
+                                { key: message.key, messageTimestamp: message.messageTimestamp }
+                            ]
+                        });
+                    }
+                    const data = await downloadAndProcessHistorySyncNotification(histNotification, options, logger);
+                    if (data.lidPnMappings?.length) {
+                        logger?.debug({ count: data.lidPnMappings.length }, 'processing LID-PN mappings from history sync');
+                        await signalRepository.lidMapping
+                            .storeLIDPNMappings(data.lidPnMappings)
+                            .catch(err => logger?.warn({ err }, 'failed to store LID-PN mappings from history sync'));
+                    }
+                    ev.emit('messaging-history.set', {
+                        ...data,
+                        isLatest: histNotification.syncType !== proto.HistorySync.HistorySyncType.ON_DEMAND ? isLatest : undefined,
+                        peerDataRequestSessionId: histNotification.peerDataRequestSessionId
                     });
-                    const data = await (0, history_1.downloadAndProcessHistorySyncNotification)(histNotification, options);
-                    ev.emit('messaging-history.set', { ...data, isLatest });
                 }
                 break;
-            case WAProto_1.proto.Message.ProtocolMessage.Type.APP_STATE_SYNC_KEY_SHARE:
+            case proto.Message.ProtocolMessage.Type.APP_STATE_SYNC_KEY_SHARE:
                 const keys = protocolMsg.appStateSyncKeyShare.keys;
-                if (keys === null || keys === void 0 ? void 0 : keys.length) {
+                if (keys?.length) {
                     let newAppStateSyncKeyId = '';
                     await keyStore.transaction(async () => {
                         const newKeys = [];
@@ -159,138 +193,306 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
                             await keyStore.set({ 'app-state-sync-key': { [strKeyId]: keyData } });
                             newAppStateSyncKeyId = strKeyId;
                         }
-                        logger === null || logger === void 0 ? void 0 : logger.info({ newAppStateSyncKeyId, newKeys }, 'injecting new app state sync keys');
-                    });
+                        logger?.info({ newAppStateSyncKeyId, newKeys }, 'injecting new app state sync keys');
+                    }, meId);
                     ev.emit('creds.update', { myAppStateKeyId: newAppStateSyncKeyId });
                 }
                 else {
-                    logger === null || logger === void 0 ? void 0 : logger.info({ protocolMsg }, 'recv app state sync with 0 keys');
+                    logger?.info({ protocolMsg }, 'recv app state sync with 0 keys');
                 }
                 break;
-            case WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE:
+            case proto.Message.ProtocolMessage.Type.REVOKE:
                 ev.emit('messages.update', [
                     {
                         key: {
                             ...message.key,
                             id: protocolMsg.key.id
                         },
-                        update: { message: null, messageStubType: Types_1.WAMessageStubType.REVOKE, key: message.key }
+                        update: { message: null, messageStubType: WAMessageStubType.REVOKE, key: message.key }
                     }
                 ]);
                 break;
-            case WAProto_1.proto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING:
+            case proto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING:
                 Object.assign(chat, {
-                    ephemeralSettingTimestamp: (0, generics_1.toNumber)(message.messageTimestamp),
+                    ephemeralSettingTimestamp: toNumber(message.messageTimestamp),
                     ephemeralExpiration: protocolMsg.ephemeralExpiration || null
                 });
                 break;
-            case WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE:
+            case proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE:
                 const response = protocolMsg.peerDataOperationRequestResponseMessage;
                 if (response) {
-                    const { peerDataOperationResult } = response;
+                    // TODO: IMPLEMENT HISTORY SYNC ETC (sticker uploads etc.).
+                    const peerDataOperationResult = response.peerDataOperationResult || [];
                     for (const result of peerDataOperationResult) {
-                        const { placeholderMessageResendResponse: retryResponse } = result;
-                        if (retryResponse) {
-                            const webMessageInfo = WAProto_1.proto.WebMessageInfo.decode(retryResponse.webMessageInfoBytes);
-                            ev.emit('messages.update', [
-                                { key: webMessageInfo.key, update: { message: webMessageInfo.message } }
-                            ]);
+                        const retryResponse = result?.placeholderMessageResendResponse;
+                        //eslint-disable-next-line max-depth
+                        if (!retryResponse?.webMessageInfoBytes) {
+                            continue;
+                        }
+                        //eslint-disable-next-line max-depth
+                        try {
+                            const webMessageInfo = proto.WebMessageInfo.decode(retryResponse.webMessageInfoBytes);
+                            const msgId = webMessageInfo.key?.id;
+                            // Retrieve cached original message data (preserves LID details,
+                            // timestamps, etc. that the phone may omit in its PDO response)
+                            const cachedData = msgId ? await placeholderResendCache?.get(msgId) : undefined;
+                            //eslint-disable-next-line max-depth
+                            if (msgId) {
+                                await placeholderResendCache?.del(msgId);
+                            }
+                            let finalMsg;
+                            //eslint-disable-next-line max-depth
+                            if (cachedData && typeof cachedData === 'object') {
+                                // Apply decoded message content onto cached metadata (preserves LID etc.)
+                                cachedData.message = webMessageInfo.message;
+                                //eslint-disable-next-line max-depth
+                                if (webMessageInfo.messageTimestamp) {
+                                    cachedData.messageTimestamp = webMessageInfo.messageTimestamp;
+                                }
+                                finalMsg = cachedData;
+                            }
+                            else {
+                                finalMsg = webMessageInfo;
+                            }
+                            logger?.debug({ msgId, requestId: response.stanzaId }, 'received placeholder resend');
+                            ev.emit('messages.upsert', {
+                                messages: [finalMsg],
+                                type: 'notify',
+                                requestId: response.stanzaId
+                            });
+                        }
+                        catch (err) {
+                            logger?.warn({ err, stanzaId: response.stanzaId }, 'failed to decode placeholder resend response');
+                        }
+                    }
+                }
+                break;
+            case proto.Message.ProtocolMessage.Type.MESSAGE_EDIT:
+                ev.emit('messages.update', [
+                    {
+                        // flip the sender / fromMe properties because they're in the perspective of the sender
+                        key: { ...message.key, id: protocolMsg.key?.id },
+                        update: {
+                            message: {
+                                editedMessage: {
+                                    message: protocolMsg.editedMessage
+                                }
+                            },
+                            messageTimestamp: protocolMsg.timestampMs
+                                ? Math.floor(toNumber(protocolMsg.timestampMs) / 1000)
+                                : message.messageTimestamp
                         }
                     }
+                ]);
+                break;
+            case proto.Message.ProtocolMessage.Type.GROUP_MEMBER_LABEL_CHANGE:
+                const labelAssociationMsg = protocolMsg.memberLabel;
+                if (labelAssociationMsg?.label) {
+                    ev.emit('group.member-tag.update', {
+                        groupId: chat.id,
+                        label: labelAssociationMsg.label,
+                        participant: message.key.participant,
+                        participantAlt: message.key.participantAlt,
+                        messageTimestamp: Number(message.messageTimestamp)
+                    });
                 }
                 break;
+            case proto.Message.ProtocolMessage.Type.LID_MIGRATION_MAPPING_SYNC:
+                const encodedPayload = protocolMsg.lidMigrationMappingSyncMessage?.encodedMappingPayload;
+                const { pnToLidMappings, chatDbMigrationTimestamp } = proto.LIDMigrationMappingSyncPayload.decode(encodedPayload);
+                logger?.debug({ pnToLidMappings, chatDbMigrationTimestamp }, 'got lid mappings and chat db migration timestamp');
+                const pairs = [];
+                for (const { pn, latestLid, assignedLid } of pnToLidMappings) {
+                    const lid = latestLid || assignedLid;
+                    pairs.push({ lid: `${lid}@lid`, pn: `${pn}@s.whatsapp.net` });
+                }
+                await signalRepository.lidMapping.storeLIDPNMappings(pairs);
+                if (pairs.length) {
+                    for (const { pn, lid } of pairs) {
+                        await signalRepository.migrateSession(pn, lid);
+                    }
+                }
         }
     }
-    else if (content === null || content === void 0 ? void 0 : content.reactionMessage) {
+    else if (content?.reactionMessage) {
         const reaction = {
             ...content.reactionMessage,
-            key: message.key,
+            key: message.key
         };
-        ev.emit('messages.reaction', [{
+        ev.emit('messages.reaction', [
+            {
                 reaction,
-                key: content.reactionMessage.key,
-            }]);
+                key: content.reactionMessage?.key
+            }
+        ]);
+    }
+    else if (content?.encEventResponseMessage) {
+        const encEventResponse = content.encEventResponseMessage;
+        const creationMsgKey = encEventResponse.eventCreationMessageKey;
+        // we need to fetch the event creation message to get the event enc key
+        const eventMsg = await getMessage(creationMsgKey);
+        if (eventMsg) {
+            try {
+                const meIdNormalised = jidNormalizedUser(meId);
+                // all jids need to be PN
+                const eventCreatorKey = creationMsgKey.participant || creationMsgKey.remoteJid;
+                const eventCreatorPn = isLidUser(eventCreatorKey)
+                    ? await signalRepository.lidMapping.getPNForLID(eventCreatorKey)
+                    : eventCreatorKey;
+                const eventCreatorJid = getKeyAuthor({ remoteJid: jidNormalizedUser(eventCreatorPn), fromMe: meIdNormalised === eventCreatorPn }, meIdNormalised);
+                const responderJid = getKeyAuthor(message.key, meIdNormalised);
+                const eventEncKey = eventMsg?.messageContextInfo?.messageSecret;
+                if (!eventEncKey) {
+                    logger?.warn({ creationMsgKey }, 'event response: missing messageSecret for decryption');
+                }
+                else {
+                    const responseMsg = decryptEventResponse(encEventResponse, {
+                        eventEncKey,
+                        eventCreatorJid,
+                        eventMsgId: creationMsgKey.id,
+                        responderJid
+                    });
+                    const eventResponse = {
+                        eventResponseMessageKey: message.key,
+                        senderTimestampMs: responseMsg.timestampMs,
+                        response: responseMsg
+                    };
+                    ev.emit('messages.update', [
+                        {
+                            key: creationMsgKey,
+                            update: {
+                                eventResponses: [eventResponse]
+                            }
+                        }
+                    ]);
+                }
+            }
+            catch (err) {
+                logger?.warn({ err, creationMsgKey }, 'failed to decrypt event response');
+            }
+        }
+        else {
+            logger?.warn({ creationMsgKey }, 'event creation message not found, cannot decrypt response');
+        }
     }
     else if (message.messageStubType) {
-        const jid = message.key.remoteJid;
+        const jid = message.key?.remoteJid;
         //let actor = whatsappID (message.participant)
         let participants;
-        const emitParticipantsUpdate = (action) => (ev.emit('group-participants.update', { id: jid, author: message.participant, participants, action }));
+        const emitParticipantsUpdate = (action) => ev.emit('group-participants.update', {
+            id: jid,
+            author: message.key.participant,
+            authorPn: message.key.participantAlt,
+            participants,
+            action
+        });
         const emitGroupUpdate = (update) => {
-            var _a;
-            ev.emit('groups.update', [{ id: jid, ...update, author: (_a = message.participant) !== null && _a !== void 0 ? _a : undefined }]);
+            ev.emit('groups.update', [
+                { id: jid, ...update, author: message.key.participant ?? undefined, authorPn: message.key.participantAlt }
+            ]);
+        };
+        const emitGroupRequestJoin = (participant, action, method) => {
+            ev.emit('group.join-request', {
+                id: jid,
+                author: message.key.participant,
+                authorPn: message.key.participantAlt,
+                participant: participant.lid,
+                participantPn: participant.pn,
+                action,
+                method: method
+            });
         };
-        const participantsIncludesMe = () => participants.find(jid => (0, WABinary_1.areJidsSameUser)(meId, jid));
+        const participantsIncludesMe = () => participants.find(jid => areJidsSameUser(meId, jid.phoneNumber)); // ADD SUPPORT FOR LID
         switch (message.messageStubType) {
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE:
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_REMOVE:
-                participants = message.messageStubParameters || [];
+            case WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER:
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || [];
+                emitParticipantsUpdate('modify');
+                break;
+            case WAMessageStubType.GROUP_PARTICIPANT_LEAVE:
+            case WAMessageStubType.GROUP_PARTICIPANT_REMOVE:
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || [];
                 emitParticipantsUpdate('remove');
                 // mark the chat read only if you left the group
                 if (participantsIncludesMe()) {
                     chat.readOnly = true;
                 }
                 break;
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD:
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_INVITE:
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD_REQUEST_JOIN:
-                participants = message.messageStubParameters || [];
+            case WAMessageStubType.GROUP_PARTICIPANT_ADD:
+            case WAMessageStubType.GROUP_PARTICIPANT_INVITE:
+            case WAMessageStubType.GROUP_PARTICIPANT_ADD_REQUEST_JOIN:
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || [];
                 if (participantsIncludesMe()) {
                     chat.readOnly = false;
                 }
                 emitParticipantsUpdate('add');
                 break;
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_DEMOTE:
-                participants = message.messageStubParameters || [];
+            case WAMessageStubType.GROUP_PARTICIPANT_DEMOTE:
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || [];
                 emitParticipantsUpdate('demote');
                 break;
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_PROMOTE:
-                participants = message.messageStubParameters || [];
+            case WAMessageStubType.GROUP_PARTICIPANT_PROMOTE:
+                participants = message.messageStubParameters.map((a) => JSON.parse(a)) || [];
                 emitParticipantsUpdate('promote');
                 break;
-            case Types_1.WAMessageStubType.GROUP_CHANGE_ANNOUNCE:
-                const announceValue = (_d = message.messageStubParameters) === null || _d === void 0 ? void 0 : _d[0];
+            case WAMessageStubType.GROUP_CHANGE_ANNOUNCE:
+                const announceValue = message.messageStubParameters?.[0];
                 emitGroupUpdate({ announce: announceValue === 'true' || announceValue === 'on' });
                 break;
-            case Types_1.WAMessageStubType.GROUP_CHANGE_RESTRICT:
-                const restrictValue = (_e = message.messageStubParameters) === null || _e === void 0 ? void 0 : _e[0];
+            case WAMessageStubType.GROUP_CHANGE_RESTRICT:
+                const restrictValue = message.messageStubParameters?.[0];
                 emitGroupUpdate({ restrict: restrictValue === 'true' || restrictValue === 'on' });
                 break;
-            case Types_1.WAMessageStubType.GROUP_CHANGE_SUBJECT:
-                const name = (_f = message.messageStubParameters) === null || _f === void 0 ? void 0 : _f[0];
+            case WAMessageStubType.GROUP_CHANGE_SUBJECT:
+                const name = message.messageStubParameters?.[0];
                 chat.name = name;
                 emitGroupUpdate({ subject: name });
                 break;
-            case Types_1.WAMessageStubType.GROUP_CHANGE_INVITE_LINK:
-                const code = (_g = message.messageStubParameters) === null || _g === void 0 ? void 0 : _g[0];
+            case WAMessageStubType.GROUP_CHANGE_DESCRIPTION:
+                const description = message.messageStubParameters?.[0];
+                chat.description = description;
+                emitGroupUpdate({ desc: description });
+                break;
+            case WAMessageStubType.GROUP_CHANGE_INVITE_LINK:
+                const code = message.messageStubParameters?.[0];
                 emitGroupUpdate({ inviteCode: code });
                 break;
-            case Types_1.WAMessageStubType.GROUP_MEMBER_ADD_MODE:
-                const memberAddValue = (_h = message.messageStubParameters) === null || _h === void 0 ? void 0 : _h[0];
+            case WAMessageStubType.GROUP_MEMBER_ADD_MODE:
+                const memberAddValue = message.messageStubParameters?.[0];
                 emitGroupUpdate({ memberAddMode: memberAddValue === 'all_member_add' });
                 break;
-            case Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE:
-                const approvalMode = (_j = message.messageStubParameters) === null || _j === void 0 ? void 0 : _j[0];
+            case WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE:
+                const approvalMode = message.messageStubParameters?.[0];
                 emitGroupUpdate({ joinApprovalMode: approvalMode === 'on' });
                 break;
+            case WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD: // TODO: Add other events
+                const participant = JSON.parse(message.messageStubParameters?.[0]);
+                const action = message.messageStubParameters?.[1];
+                const method = message.messageStubParameters?.[2];
+                emitGroupRequestJoin(participant, action, method);
+                break;
         }
-    }
-    else if (content === null || content === void 0 ? void 0 : content.pollUpdateMessage) {
-        const creationMsgKey = content.pollUpdateMessage.pollCreationMessageKey;
+    } /*  else if(content?.pollUpdateMessage) {
+        const creationMsgKey = content.pollUpdateMessage.pollCreationMessageKey!
         // we need to fetch the poll creation message to get the poll enc key
-        const pollMsg = await getMessage(creationMsgKey);
-        if (pollMsg) {
-            const meIdNormalised = (0, WABinary_1.jidNormalizedUser)(meId);
-            const pollCreatorJid = (0, generics_1.getKeyAuthor)(creationMsgKey, meIdNormalised);
-            const voterJid = (0, generics_1.getKeyAuthor)(message.key, meIdNormalised);
-            const pollEncKey = (_k = pollMsg.messageContextInfo) === null || _k === void 0 ? void 0 : _k.messageSecret;
+        // TODO: make standalone, remove getMessage reference
+        // TODO: Remove entirely
+        const pollMsg = await getMessage(creationMsgKey)
+        if(pollMsg) {
+            const meIdNormalised = jidNormalizedUser(meId)
+            const pollCreatorJid = getKeyAuthor(creationMsgKey, meIdNormalised)
+            const voterJid = getKeyAuthor(message.key, meIdNormalised)
+            const pollEncKey = pollMsg.messageContextInfo?.messageSecret!
+
             try {
-                const voteMsg = decryptPollVote(content.pollUpdateMessage.vote, {
-                    pollEncKey,
-                    pollCreatorJid,
-                    pollMsgId: creationMsgKey.id,
-                    voterJid,
-                });
+                const voteMsg = decryptPollVote(
+                    content.pollUpdateMessage.vote!,
+                    {
+                        pollEncKey,
+                        pollCreatorJid,
+                        pollMsgId: creationMsgKey.id!,
+                        voterJid,
+                    }
+                )
                 ev.emit('messages.update', [
                     {
                         key: creationMsgKey,
@@ -299,23 +501,27 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
                                 {
                                     pollUpdateMessageKey: message.key,
                                     vote: voteMsg,
-                                    senderTimestampMs: content.pollUpdateMessage.senderTimestampMs.toNumber(),
+                                    senderTimestampMs: (content.pollUpdateMessage.senderTimestampMs! as Long).toNumber(),
                                 }
                             ]
                         }
                     }
-                ]);
-            }
-            catch (err) {
-                logger === null || logger === void 0 ? void 0 : logger.warn({ err, creationMsgKey }, 'failed to decrypt poll vote');
+                ])
+            } catch(err) {
+                logger?.warn(
+                    { err, creationMsgKey },
+                    'failed to decrypt poll vote'
+                )
             }
+        } else {
+            logger?.warn(
+                { creationMsgKey },
+                'poll creation message not found, cannot decrypt update'
+            )
         }
-        else {
-            logger === null || logger === void 0 ? void 0 : logger.warn({ creationMsgKey }, 'poll creation message not found, cannot decrypt update');
-        }
-    }
+        } */
     if (Object.keys(chat).length > 1) {
         ev.emit('chats.update', [chat]);
     }
 };
-exports.default = processMessage;
+export default processMessage;