vialeys 0.0.1 → 0.0.2

package/lib/Utils/process-message.js

@@ -2,31 +2,46 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-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")
+const { proto } = require("../../WAProto")
+const { WAMessageStubType } = require("../Types")
+const {
+  getDevice, 
+  getContentType,
+  normalizeMessageContent 
+} = require("../Utils")
+const {
+  areJidsSameUser,
+  isJidBroadcast,
+  isJidStatusBroadcast,
+  jidNormalizedUser 
+} = require("../WABinary")
+const { 
+  aesDecryptGCM,
+  hmacSign 
+} = require("./crypto")
+const {
+  getKeyAuthor, 
+  toNumber 
+} = require("./generics")
+const { downloadAndProcessHistorySyncNotification } = require("./history")
 
 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
+    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([
-    Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD
+    WAMessageStubType.GROUP_PARTICIPANT_ADD
 ])
 
 /** Cleans a received message to further processing */
 const cleanMessage = (message, meId) => {
     // ensure remoteJid and participant doesn't have device or agent in it
-    message.key.remoteJid = WABinary_1.jidNormalizedUser(message.key.remoteJid)
-    message.key.participant = message.key.participant ? WABinary_1.jidNormalizedUser(message.key.participant) : undefined
-    const content = messages_1.normalizeMessageContent(message.message)
+    message.key.remoteJid = jidNormalizedUser(message.key.remoteJid)
+    message.key.participant = message.key.participant ? jidNormalizedUser(message.key.participant) : undefined
+    const content = normalizeMessageContent(message.message)
     // if the message has a reaction, ensure fromMe & remoteJid are from our perspective
     if (content?.reactionMessage) {
         normaliseKey(content.reactionMessage.key)
@@ -41,7 +56,7 @@ 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
-                ? WABinary_1.areJidsSameUser(msgKey.participant || msgKey.remoteJid, meId)
+                ? areJidsSameUser(msgKey.participant || msgKey.remoteJid, meId)
                 // if the message being reacted to, was from them
                 // fromMe automatically becomes false
                 : false
@@ -54,14 +69,14 @@ const cleanMessage = (message, meId) => {
 }
 
 const isRealMessage = (message, meId) => {
-    const normalizedContent = messages_1.normalizeMessageContent(message.message)
-    const hasSomeContent = !!messages_1.getContentType(normalizedContent)
+    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) &&
-            message.messageStubParameters?.some(p => WABinary_1.areJidsSameUser(meId, p))
+            message.messageStubParameters?.some(p => areJidsSameUser(meId, p))
         )
     ) &&
     hasSomeContent &&
@@ -77,8 +92,8 @@ const shouldIncrementChatUnread = (message) => (!message.key.fromMe && !message.
  * Typically -- that'll be the remoteJid, but for broadcasts, it'll be the participant
  */
 const getChatId = ({ remoteJid, participant, fromMe }) => {
-    if (WABinary_1.isJidBroadcast(remoteJid)
-        && !WABinary_1.isJidStatusBroadcast(remoteJid)
+    if (isJidBroadcast(remoteJid)
+        && !isJidStatusBroadcast(remoteJid)
         && !fromMe) {
         return participant
     }
@@ -99,12 +114,37 @@ function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pol
         toBinary('Poll Vote'),
         new Uint8Array([1])
     ])
-    const key0 = crypto_1.hmacSign(pollEncKey, new Uint8Array(32), 'sha256')
-    const decKey = 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 = crypto_1.aesDecryptGCM(encPayload, decKey, encIv, aad)
+    const decrypted = aesDecryptGCM(encPayload, decKey, encIv, aad)
     
-    return WAProto_1.proto.Message.PollVoteMessage.decode(decrypted)
+    return proto.Message.PollVoteMessage.decode(decrypted)
+    
+    function toBinary(txt) {
+        return Buffer.from(txt)
+    }
+}
+
+/**
+ * Decrypt an event edit
+ * @param edit encrypted event edit
+ * @returns message
+ */
+function decryptEventEdit({ encPayload, encIv }, { eventCreatorJid, eventMsgId, eventEncKey, responderJid }) {
+    const sign = Buffer.concat([
+        toBinary(eventMsgId),
+        toBinary(eventCreatorJid),
+        toBinary(responderJid),
+        toBinary('Event Edit'),
+        new Uint8Array([1])
+    ])
+    
+    const key0 = hmacSign(eventEncKey, new Uint8Array(32), 'sha256')
+    const decKey = hmacSign(sign, key0, 'sha256')
+    const decrypted = aesDecryptGCM(encPayload, decKey, encIv, null)
+    
+    return proto.Message.decode(decrypted)
     
     function toBinary(txt) {
         return Buffer.from(txt)
@@ -126,12 +166,62 @@ function decryptEventResponse({ encPayload, encIv }, { eventCreatorJid, eventMsg
         new Uint8Array([1])
     ])
     
-    const key0 = crypto_1.hmacSign(eventEncKey, new Uint8Array(32), 'sha256')
-    const decKey = crypto_1.hmacSign(sign, key0, 'sha256')
+    const key0 = hmacSign(eventEncKey, new Uint8Array(32), 'sha256')
+    const decKey = hmacSign(sign, key0, 'sha256')
     const aad = toBinary(`${eventMsgId}\u0000${responderJid}`)
-    const decrypted = crypto_1.aesDecryptGCM(encPayload, decKey, encIv, aad)
+    const decrypted = aesDecryptGCM(encPayload, decKey, encIv, aad)
+    
+    return proto.Message.EventResponseMessage.decode(decrypted)
+    
+    function toBinary(txt) {
+        return Buffer.from(txt)
+    }
+}
+
+/**
+ * Decrypt an comment message 
+ * @param comment encrypted comment message
+ * @returns message
+ */
+function decryptComment({ encPayload, encIv }, { commentCreatorJid, commentMsgId, commentEncKey, commentJid }) {
+    const sign = Buffer.concat([
+        toBinary(commentMsgId),
+        toBinary(commentCreatorJid),
+        toBinary(commentJid),
+        toBinary('Enc Comment'),
+        new Uint8Array([1])
+    ])
+    
+    const key0 = hmacSign(commentEncKey, new Uint8Array(32), 'sha256')
+    const decKey = hmacSign(sign, key0, 'sha256')
+    const decrypted = aesDecryptGCM(encPayload, decKey, encIv, null)
     
-    return WAProto_1.proto.Message.EventResponseMessage.decode(decrypted)
+    return proto.Message.decode(decrypted)
+    
+    function toBinary(txt) {
+        return Buffer.from(txt)
+    }
+}
+
+/**
+ * Decrypt an reaction 
+ * @param reaction encrypted reaction
+ * @returns reaction message
+ */
+function decryptReaction({ encPayload, encIv }, { reactionCreatorJid, reactionMsgId, reactionEncKey, reactionJid }) {
+    const sign = Buffer.concat([
+        toBinary(reactionMsgId),
+        toBinary(reactionCreatorJid),
+        toBinary(reactionJid),
+        toBinary('Enc Reaction'),
+        new Uint8Array([1])
+    ])
+    
+    const key0 = hmacSign(reactionEncKey, new Uint8Array(32), 'sha256')
+    const decKey = hmacSign(sign, key0, 'sha256')
+    const decrypted = aesDecryptGCM(encPayload, decKey, encIv, null)
+    
+    return proto.Message.ReactionMessage.decode(decrypted)
     
     function toBinary(txt) {
         return Buffer.from(txt)
@@ -142,17 +232,17 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
     const meId = creds.me.id
     const meLid = creds.me.lid
     const { accountSettings } = creds
-    const chat = { id: WABinary_1.jidNormalizedUser(getChatId(message.key)) }
+    const chat = { id: jidNormalizedUser(getChatId(message.key)) }
     const isRealMsg = isRealMessage(message, meId)
     if (isRealMsg) {
         chat.messages = [{ message }]
-        chat.conversationTimestamp = generics_1.toNumber(message.messageTimestamp)
+        chat.conversationTimestamp = toNumber(message.messageTimestamp)
         // only increment unread count if not CIPHERTEXT and from another person
         if (shouldIncrementChatUnread(message)) {
             chat.unreadCount = (chat.unreadCount || 0) + 1
         }
     }
-    const content = 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 || content?.reactionMessage?.key?.fromMe
@@ -163,7 +253,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
     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 = !creds.processedHistoryMessages?.length
@@ -174,7 +264,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                     isLatest,
                 }, 'got history notification')
                 if (process) {
-                    if (histNotification.syncType !== WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND) {
+                    if (histNotification.syncType !== proto.HistorySync.HistorySyncType.ON_DEMAND) {
                         ev.emit('creds.update', {
                             processedHistoryMessages: [
                                 ...(creds.processedHistoryMessages || []),
@@ -182,17 +272,17 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                             ]
                         })
                     }
-                    const data = await history_1.downloadAndProcessHistorySyncNotification(histNotification, options)
+                    const data = await downloadAndProcessHistorySyncNotification(histNotification, options)
                     ev.emit('messaging-history.set', {
                         ...data,
-                        isLatest: histNotification.syncType !== WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND
+                        isLatest: histNotification.syncType !== proto.HistorySync.HistorySyncType.ON_DEMAND
                             ? isLatest
                             : undefined,
                         peerDataRequestSessionId: histNotification.peerDataRequestSessionId
                     })
                 }
                 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?.length) {
                     let newAppStateSyncKeyId = ''
@@ -212,24 +302,24 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                     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: 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) {
                     await laceholderResendCache?.del(response.stanzaId)
@@ -239,7 +329,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                         const { placeholderMessageResendResponse: retryResponse } = result
                         //eslint-disable-next-line max-depth
                         if (retryResponse) {
-                            const webMessageInfo = WAProto_1.proto.WebMessageInfo.decode(retryResponse.webMessageInfoBytes)
+                            const webMessageInfo = proto.WebMessageInfo.decode(retryResponse.webMessageInfoBytes)
                             // wait till another upsert event is available, don't want it to be part of the PDO response message
                             setTimeout(() => {
                                 ev.emit('messages.upsert', {
@@ -252,7 +342,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                     }
                 }
                 break
-            case WAProto_1.proto.Message.ProtocolMessage.Type.MESSAGE_EDIT:
+            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
@@ -264,15 +354,15 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                                 }
                             },
                             messageTimestamp: protocolMsg.timestampMs
-                                ? Math.floor(generics_1.toNumber(protocolMsg.timestampMs) / 1000)
+                                ? Math.floor(toNumber(protocolMsg.timestampMs) / 1000)
                                 : message.messageTimestamp
                         }
                     }
                 ])
                 break
-            case WAProto_1.proto.Message.ProtocolMessage.Type.LID_MIGRATION_MAPPING_SYNC:
+            case proto.Message.ProtocolMessage.Type.LID_MIGRATION_MAPPING_SYNC:
                 const encodedPayload = protocolMsg.lidMigrationMappingSyncMessage?.encodedMappingPayload
-                const { pnToLidMappings, chatDbMigrationTimestamp } = WAProto_1.proto.LIDMigrationMappingSyncPayload.decode(encodedPayload)
+                const { pnToLidMappings, chatDbMigrationTimestamp } = proto.LIDMigrationMappingSyncPayload.decode(encodedPayload)
                 
                 logger?.debug({ pnToLidMappings, chatDbMigrationTimestamp }, 'got lid mappings and chat db migration timestamp')
                 
@@ -285,10 +375,10 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                 
                 await signalRepository.lidMapping.storeLIDPNMappings(pairs)
                 break
-            case WAProto_1.proto.Message.ProtocolMessage.Type.LIMIT_SHARING:
+            case proto.Message.ProtocolMessage.Type.LIMIT_SHARING:
                 ev.emit('limit-sharing.update', {
                 	id: message.key.remoteJid, 
-                    author: WABinary_1.areJidsSameUser(message.key.remoteJid, protocolMsg.key.remoteJid) ? WABinary_1.jidNormalizedUser(meId) : message.key.remoteJid, 
+                    author: areJidsSameUser(message.key.remoteJid, protocolMsg.key.remoteJid) ? jidNormalizedUser(meId) : message.key.remoteJid, 
                     action: `${protocolMsg.limitSharing.sharingLimited ? 'on' : 'off'}`, 
                     trigger: protocolMsg.limitSharing.trigger, 
                     update_time: protocolMsg.limitSharing.limitSharingSettingTimestamp
@@ -317,13 +407,13 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
         const emitGroupRequestJoin = (participant, action, method) => {
             ev.emit('group.join-request', { id: jid, author: message.participant, participant, action, method: method })
         }
-        const participantsIncludesMe = () => participants.find(jid => WABinary_1.areJidsSameUser(meId, jid))
+        const participantsIncludesMe = () => participants.find(jid => areJidsSameUser(meId, jid))
         switch (message.messageStubType) {
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER:
+            case WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER:
                 participants = message.messageStubParameters || []
                 emitParticipantsUpdate('modify')
                 break
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE:
+            case WAMessageStubType.GROUP_PARTICIPANT_LEAVE:
               participants = message.messageStubParameters || [];
               emitParticipantsUpdate('leave');
               // mark the chat read only if you left the group
@@ -331,7 +421,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                 chat.readOnly = true;
               }
               break;
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_REMOVE:
+            case WAMessageStubType.GROUP_PARTICIPANT_REMOVE:
                 participants = message.messageStubParameters || []
                 emitParticipantsUpdate('remove')
                 // mark the chat read only if you left the group
@@ -339,62 +429,62 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                     chat.readOnly = true
                 }
                 break
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD:
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_INVITE:
+            case WAMessageStubType.GROUP_PARTICIPANT_ADD:
+            case WAMessageStubType.GROUP_PARTICIPANT_INVITE:
               let actionGp = 'invite'
               participants = message.messageStubParameters || []
               if (participantsIncludesMe()) chat.readOnly = false;
               if (message?.key?.participant && !participants.includes(message?.key?.participant)) {
                 actionGp = 'approval-invite'
               }
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD_REQUEST_JOIN:
+            case WAMessageStubType.GROUP_PARTICIPANT_ADD_REQUEST_JOIN:
                 participants = message.messageStubParameters || []
                 if (participantsIncludesMe()) {
                     chat.readOnly = false
                 }
                 emitParticipantsUpdate('add')
                 break
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_DEMOTE:
-            case Types_1.WAMessageStubType.COMMUNITY_PARTICIPANT_DEMOTE:
+            case WAMessageStubType.GROUP_PARTICIPANT_DEMOTE:
+            case WAMessageStubType.COMMUNITY_PARTICIPANT_DEMOTE:
                 participants = message.messageStubParameters || []
                 emitParticipantsUpdate('demote')
                 break
-            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_PROMOTE:
-            case Types_1.WAMessageStubType.COMMUNITY_PARTICIPANT_PROMOTE:
+            case WAMessageStubType.GROUP_PARTICIPANT_PROMOTE:
+            case WAMessageStubType.COMMUNITY_PARTICIPANT_PROMOTE:
                 participants = message.messageStubParameters || []
                 emitParticipantsUpdate('promote')
                 break
-            case Types_1.WAMessageStubType.GROUP_CHANGE_ANNOUNCE:
+            case WAMessageStubType.GROUP_CHANGE_ANNOUNCE:
                 const announceValue = message.messageStubParameters?.[0]
                 emitGroupUpdate({ announce: announceValue === 'true' || announceValue === 'on' })
                 break
-            case Types_1.WAMessageStubType.GROUP_CHANGE_RESTRICT:
+            case WAMessageStubType.GROUP_CHANGE_RESTRICT:
                 const restrictValue = message.messageStubParameters?.[0]
                 emitGroupUpdate({ restrict: restrictValue === 'true' || restrictValue === 'on' })
                 break
-            case Types_1.WAMessageStubType.GROUP_CHANGE_SUBJECT:
+            case WAMessageStubType.GROUP_CHANGE_SUBJECT:
                 const name = message.messageStubParameters?.[0]
                 chat.name = name
                 emitGroupUpdate({ subject: name })
                 break
-            case Types_1.WAMessageStubType.GROUP_CHANGE_DESCRIPTION:
+            case WAMessageStubType.GROUP_CHANGE_DESCRIPTION:
                 const description = message.messageStubParameters?.[0]
                 chat.description = description
                 emitGroupUpdate({ desc: description })
                 break
-            case Types_1.WAMessageStubType.GROUP_CHANGE_INVITE_LINK:
+            case WAMessageStubType.GROUP_CHANGE_INVITE_LINK:
                 const code = message.messageStubParameters?.[0]
                 emitGroupUpdate({ inviteCode: code })
                 break
-            case Types_1.WAMessageStubType.GROUP_MEMBER_ADD_MODE:
+            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:
+            case WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE:
                 const approvalMode = message.messageStubParameters?.[0]
                 emitGroupUpdate({ joinApprovalMode: approvalMode === 'on' })
                 break
-            case Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD:
+            case WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD:
                 const participant = message.messageStubParameters?.[0]
                 const action = message.messageStubParameters?.[1]
                 const method = message.messageStubParameters?.[2]
@@ -403,50 +493,50 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
         }
     }
     else if (content?.pollUpdateMessage) {
-    	const pollUpdate = content.pollUpdateMessage
+        const pollUpdate = content.pollUpdateMessage
         const creationMsgKey = pollUpdate.pollCreationMessageKey
-        
+
         // we need to fetch the poll creation message to get the poll enc key
         const pollMsg = await getMessage(creationMsgKey)
         if (pollMsg) {
-                try {
-                    const meLidNormalised = WABinary_1.jidNormalizedUser(meLid)
-                    const getDevice = messages_1.getDevice(creationMsgKey.id) 
-                    const pollCreationFromMe = getDevice === 'baileys' ? true : false
-                    const pollEncKey = pollMsg.messageContextInfo?.messageSecret
-                    const voterJid = generics_1.getKeyAuthor(message.key, meLidNormalised)
+            try {
+                const meLidNormalised = jidNormalizedUser(meLid)
+                const deviceType = getDevice(creationMsgKey.id) 
+                const pollCreationFromMe = deviceType === 'baileys' ? true : false
+                const pollEncKey = pollMsg.messageContextInfo?.messageSecret
+                const voterJid = getKeyAuthor(message.key, meLidNormalised)
 
-                    let pollCreatorJid = generics_1.getKeyAuthor(creationMsgKey, meLidNormalised)
+                let pollCreatorJid = getKeyAuthor(creationMsgKey, meLidNormalised)
 
-                    if (pollCreationFromMe) {
-                        pollCreatorJid = meLidNormalised
-                    }
+                if (pollCreationFromMe) {
+                    pollCreatorJid = meLidNormalised
+                }
 
-                    if (!pollEncKey) {
-                        logger?.warn({ vote: pollUpdate.vote, creationMsgKey }, 'poll creation: missing messageSecret for decryption') 
-                    } else {
-                        const voteMsg = decryptPollVote(pollUpdate.vote, {
-                            pollEncKey,
-                            pollCreatorJid,
-                            pollMsgId: creationMsgKey.id,
-                            voterJid
-                        })
+                if (!pollEncKey) {
+                    logger?.warn({ vote: pollUpdate.vote, creationMsgKey }, 'poll creation: missing messageSecret for decryption') 
+                } else {
+                    const voteMsg = decryptPollVote(pollUpdate.vote, {
+                        pollEncKey,
+                        pollCreatorJid,
+                        pollMsgId: creationMsgKey.id,
+                        voterJid
+                    })
 
-                        ev.emit('messages.update', [
-                            {
-                                key: creationMsgKey,
-                                update: {
-                                    pollUpdates: [
-                                        {
-                                            pollUpdateMessageKey: message.key,
-                                            vote: voteMsg,
-                                            senderTimestampMs: content.pollUpdateMessage.senderTimestampMs.toNumber()
-                                        }
-                                    ]
-                                }
+                    ev.emit('messages.update', [
+                        {
+                            key: creationMsgKey,
+                            update: {
+                                pollUpdates: [
+                                    {
+                                        pollUpdateMessageKey: message.key,
+                                        vote: voteMsg,
+                                        senderTimestampMs: content.pollUpdateMessage.senderTimestampMs.toNumber()
+                                    }
+                                ]
                             }
-                        ])
-                  }
+                        }
+                    ])
+                }
             }
             catch (err) {
                 logger?.warn({ err, creationMsgKey }, 'failed to decrypt poll vote')
@@ -456,45 +546,98 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
             logger?.warn({ creationMsgKey }, 'poll creation message not found, cannot decrypt update')
         }
     }
+    else if (content?.secretEncryptedMessage) {
+        const encEventEdit = content.secretEncryptedMessage
+        const creationMsgKey = encEventEdit.targetMessageKey
+        
+        if (proto.Message.SecretEncryptedMessage.SecretEncType[encEventEdit.secretEncType] !== 'EVENT_EDIT') return
+
+        // we need to fetch the event creation message to get the event enc key
+        const eventMsg = await getMessage(creationMsgKey)
+        if (eventMsg) {
+            try {
+                const meLidNormalised = jidNormalizedUser(meLid)
+                const eventCreatorJid = getKeyAuthor(message.key, meLidNormalised)
+                const responderJid = getKeyAuthor(message.key, meLidNormalised)
+                const eventEncKey = eventMsg.messageContextInfo?.messageSecret
+
+                if (!eventEncKey) {
+                    logger?.warn({ encEventEdit, creationMsgKey }, 'event edit: missing messageSecret for decryption') 
+                } else {
+                    const responseMsg = decryptEventEdit(encEventEdit, {
+                        eventEncKey,
+                        eventCreatorJid,
+                        eventMsgId: creationMsgKey.id,
+                        responderJid
+                    })
+                    const content = normalizeMessageContent(responseMsg)
+                    const protocolMsg = content?.protocolMessage
+
+                    ev.emit('messages.update', [
+                        {
+                            key: { ...message.key, id: protocolMsg.key?.id },
+                            update: {
+                                message: {
+                                	messageContextInfo: responseMsg.messageContextInfo, 
+                                	editedMessage: { 
+                                		message: protocolMsg.editedMessage
+                                	}
+                                }, 
+                                messageTimestamp: protocolMsg.timestampMs
+                             	   ? Math.floor(toNumber(protocolMsg.timestampMs) / 1000)
+                          	      : message.messageTimestamp
+                            }
+                        }
+                    ])
+                }
+            }
+            catch (err) {
+                logger?.warn({ err, creationMsgKey, encEventEdit }, 'failed to decrypt event edit')
+            }
+        }
+        else {
+            logger?.warn({ encEventEdit, creationMsgKey }, 'event creation message not found, cannot decrypt update')
+        }
+    }
     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 = WABinary_1.jidNormalizedUser(meLid)
-        		const eventCreatorJid = generics_1.getKeyAuthor(creationMsgKey, meIdNormalised)
-        		const responderJid = generics_1.getKeyAuthor(message.key, meIdNormalised)
-        		const eventEncKey = eventMsg.messageContextInfo?.messageSecret
-        
-        		if (!eventEncKey) {
-            		logger?.warn({ encEventResponse, 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]
-         	               }
-          	          }
-     	           ])
-       	     }
-        	}
+            try {
+                const meLidNormalised = jidNormalizedUser(meLid)
+                const eventCreatorJid = getKeyAuthor(creationMsgKey, meLidNormalised)
+                const responderJid = getKeyAuthor(message.key, meLidNormalised)
+                const eventEncKey = eventMsg.messageContextInfo?.messageSecret
+
+                if (!eventEncKey) {
+                    logger?.warn({ encEventResponse, 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, encEventResponse }, 'failed to decrypt event response')
             }
@@ -503,6 +646,94 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
             logger?.warn({ encEventResponse, creationMsgKey }, 'event creation message not found, cannot decrypt update')
         }
     }
+    else if (content?.encCommentMessage) {
+        const encComment = content.encCommentMessage
+        const creationMsgKey = encComment.targetMessageKey
+
+        // we need to fetch the message to get the reaction enc key
+        const commentMsg = await getMessage(creationMsgKey)
+        if (commentMsg) {
+            try {
+                const meLidNormalised = jidNormalizedUser(meLid)
+                const commentCreatorJid = creationMsgKey.participant ? creationMsgKey.participant : message.key?.participant ? message.key.participant : meLidNormalised
+                const commentJid = message.key?.participant ? message.key.participant : creationMsgKey.participant ? creationMsgKey.participant : meLidNormalised
+                const commentEncKey = commentMsg.messageContextInfo?.messageSecret
+
+                if (!commentEncKey) {
+                    logger?.warn({ encComment, creationMsgKey }, 'comment message: missing messageSecret for decryption') 
+                } else {
+                    const responseMsg = decryptComment(encComment, {
+                        commentEncKey,
+                        commentCreatorJid,
+                        commentMsgId: creationMsgKey.id,
+                        commentJid
+                    }) 
+
+                    ev.emit('messages.upsert', {
+                        messages: [{
+                        	key: message.key, 
+                        	message: responseMsg
+                        }], 
+                        type: 'append'
+                    }) 
+                }
+            }
+            catch (err) {
+                logger?.warn({ err, creationMsgKey, encComment }, 'failed to decrypt comment message')
+            }
+        }
+        else {
+            logger?.warn({ encComment, creationMsgKey }, 'creation message not found, cannot decrypt')
+        }
+    }
+    else if (content?.encReactionMessage) {
+        const encReaction = content.encReactionMessage
+        const creationMsgKey = encReaction.targetMessageKey
+
+        // we need to fetch the message to get the reaction enc key
+        const reactMsg = await getMessage(creationMsgKey)
+        if (reactMsg) {
+            try {
+                const meLidNormalised = jidNormalizedUser(meLid)
+                const reactionCreatorJid = creationMsgKey.participant ? creationMsgKey.participant : message.key?.participant ? message.key.participant : meLidNormalised
+                const reactionJid = message.key?.participant ? message.key.participant : creationMsgKey.participant ? creationMsgKey.participant : meLidNormalised
+                const reactionEncKey = reactMsg.messageContextInfo?.messageSecret
+
+                if (!reactionEncKey) {
+                    logger?.warn({ encReaction, creationMsgKey }, 'reaction: missing messageSecret for decryption') 
+                } else {
+                    const responseMsg = decryptReaction(encReaction, {
+                        reactionEncKey,
+                        reactionCreatorJid,
+                        reactionMsgId: creationMsgKey.id,
+                        reactionJid
+                    })
+                    
+                    const Reaction = {
+                        key: message.key, 
+                        message: {
+                            reactionMessage: {
+                                key: creationMsgKey, 
+                                text: responseMsg.text, 
+                                senderTimestampMs: responseMsg.senderTimestampMs
+                            }
+                        }
+                    }
+
+                    ev.emit('messages.upsert', {
+                        messages: [Reaction], 
+                        type: 'append'
+                    }) 
+                }
+            }
+            catch (err) {
+                logger?.warn({ err, creationMsgKey, encReaction }, 'failed to decrypt reaction')
+            }
+        }
+        else {
+            logger?.warn({ encReaction, creationMsgKey }, 'creation message not found, cannot decrypt')
+        }
+    }
     if (Object.keys(chat).length > 1) {
         ev.emit('chats.update', [chat])
     }
@@ -514,6 +745,9 @@ module.exports = {
   shouldIncrementChatUnread, 
   getChatId, 
   decryptPollVote, 
+  decryptEventEdit, 
   decryptEventResponse, 
+  decryptComment, 
+  decryptReaction, 
   processMessage
 }