@hbmodsofc/baileys 1.5.0 → 1.7.6

package/lib/Utils/noise-handler.d.ts

@@ -1,21 +1,19 @@
-/// <reference types="node" />
-import { Logger } from 'pino';
-import { proto } from '../../WAProto';
-import { KeyPair } from '../Types';
-import { BinaryNode } from '../WABinary';
-export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, routingInfo }: {
+import { proto } from '../../WAProto/index.js';
+import type { KeyPair } from '../Types';
+import type { BinaryNode } from '../WABinary';
+import type { ILogger } from './logger';
+export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }: {
     keyPair: KeyPair;
     NOISE_HEADER: Uint8Array;
-    mobile: boolean;
-    logger: Logger;
+    logger: ILogger;
     routingInfo?: Buffer | undefined;
 }) => {
-    encrypt: (plaintext: Uint8Array) => Buffer;
-    decrypt: (ciphertext: Uint8Array) => Buffer;
+    encrypt: (plaintext: Uint8Array) => Buffer<ArrayBuffer>;
+    decrypt: (ciphertext: Uint8Array) => Buffer<ArrayBuffer>;
     authenticate: (data: Uint8Array) => void;
-    mixIntoKey: (data: Uint8Array) => void;
-    finishInit: () => void;
-    processHandshake: ({ serverHello }: proto.HandshakeMessage, noiseKey: KeyPair) => Buffer;
-    encodeFrame: (data: Buffer | Uint8Array) => Buffer;
-    decodeFrame: (newData: Buffer | Uint8Array, onFrame: (buff: Uint8Array | BinaryNode) => void) => void;
+    mixIntoKey: (data: Uint8Array) => Promise<void>;
+    finishInit: () => Promise<void>;
+    processHandshake: ({ serverHello }: proto.HandshakeMessage, noiseKey: KeyPair) => Promise<Buffer<ArrayBuffer>>;
+    encodeFrame: (data: Buffer | Uint8Array) => Buffer<ArrayBuffer>;
+    decodeFrame: (newData: Buffer | Uint8Array, onFrame: (buff: Uint8Array | BinaryNode) => void) => Promise<void>;
 };

package/lib/Utils/noise-handler.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeNoiseHandler = void 0;
 const boom_1 = require("@hapi/boom");
-const WAProto_1 = require("../../WAProto");
+const index_js_1 = require("../../WAProto/index.js");
 const Defaults_1 = require("../Defaults");
 const WABinary_1 = require("../WABinary");
 const crypto_1 = require("./crypto");
@@ -11,7 +11,7 @@ const generateIV = (counter) => {
     new DataView(iv).setUint32(8, counter);
     return new Uint8Array(iv);
 };
-const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, routingInfo }) => {
+const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }) => {
     logger = logger.child({ class: 'ns' });
     const authenticate = (data) => {
         if (!isFinished) {
@@ -38,20 +38,20 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
         authenticate(ciphertext);
         return result;
     };
-    const localHKDF = (data) => {
-        const key = (0, crypto_1.hkdf)(Buffer.from(data), 64, { salt, info: '' });
+    const localHKDF = async (data) => {
+        const key = await (0, crypto_1.hkdf)(Buffer.from(data), 64, { salt, info: '' });
         return [key.slice(0, 32), key.slice(32)];
     };
-    const mixIntoKey = (data) => {
-        const [write, read] = localHKDF(data);
+    const mixIntoKey = async (data) => {
+        const [write, read] = await localHKDF(data);
         salt = write;
         encKey = read;
         decKey = read;
         readCounter = 0;
         writeCounter = 0;
     };
-    const finishInit = () => {
-        const [write, read] = localHKDF(new Uint8Array(0));
+    const finishInit = async () => {
+        const [write, read] = await localHKDF(new Uint8Array(0));
         encKey = write;
         decKey = read;
         hash = Buffer.from([]);
@@ -60,7 +60,7 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
         isFinished = true;
     };
     const data = Buffer.from(Defaults_1.NOISE_MODE);
-    let hash = Buffer.from(data.byteLength === 32 ? data : (0, crypto_1.sha256)(data));
+    let hash = data.byteLength === 32 ? data : (0, crypto_1.sha256)(data);
     let salt = hash;
     let encKey = hash;
     let decKey = hash;
@@ -77,24 +77,19 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
         authenticate,
         mixIntoKey,
         finishInit,
-        processHandshake: ({ serverHello }, noiseKey) => {
+        processHandshake: async ({ serverHello }, noiseKey) => {
             authenticate(serverHello.ephemeral);
-            mixIntoKey(crypto_1.Curve.sharedKey(privateKey, serverHello.ephemeral));
+            await mixIntoKey(crypto_1.Curve.sharedKey(privateKey, serverHello.ephemeral));
             const decStaticContent = decrypt(serverHello.static);
-            mixIntoKey(crypto_1.Curve.sharedKey(privateKey, decStaticContent));
+            await mixIntoKey(crypto_1.Curve.sharedKey(privateKey, decStaticContent));
             const certDecoded = decrypt(serverHello.payload);
-            if (mobile) {
-                WAProto_1.proto.CertChain.NoiseCertificate.decode(certDecoded);
-            }
-            else {
-                const { intermediate: certIntermediate } = WAProto_1.proto.CertChain.decode(certDecoded);
-                const { issuerSerial } = WAProto_1.proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details);
-                if (issuerSerial !== Defaults_1.WA_CERT_DETAILS.SERIAL) {
-                    throw new boom_1.Boom('certification match failed', { statusCode: 400 });
-                }
+            const { intermediate: certIntermediate } = index_js_1.proto.CertChain.decode(certDecoded);
+            const { issuerSerial } = index_js_1.proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details);
+            if (issuerSerial !== Defaults_1.WA_CERT_DETAILS.SERIAL) {
+                throw new boom_1.Boom('certification match failed', { statusCode: 400 });
             }
             const keyEnc = encrypt(noiseKey.public);
-            mixIntoKey(crypto_1.Curve.sharedKey(noiseKey.private, serverHello.ephemeral));
+            await mixIntoKey(crypto_1.Curve.sharedKey(noiseKey.private, serverHello.ephemeral));
             return keyEnc;
         },
         encodeFrame: (data) => {
@@ -125,8 +120,7 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
             frame.set(data, introSize + 3);
             return frame;
         },
-        decodeFrame: (newData, onFrame) => {
-            var _a;
+        decodeFrame: async (newData, onFrame) => {
             // the binary protocol uses its own framing mechanism
             // on top of the WS frames
             // so we get this data and separate out the frames
@@ -143,9 +137,9 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
                 inBytes = inBytes.slice(size + 3);
                 if (isFinished) {
                     const result = decrypt(frame);
-                    frame = (0, WABinary_1.decodeBinaryNode)(result);
+                    frame = await (0, WABinary_1.decodeBinaryNode)(result);
                 }
-                logger.trace({ msg: (_a = frame === null || frame === void 0 ? void 0 : frame.attrs) === null || _a === void 0 ? void 0 : _a.id }, 'recv frame');
+                logger.trace({ msg: frame?.attrs?.id }, 'recv frame');
                 onFrame(frame);
                 size = getBytesSize();
             }

package/lib/Utils/process-message.d.ts

@@ -1,15 +1,16 @@
-import { AxiosRequestConfig } from 'axios';
-import type { Logger } from 'pino';
-import { proto } from '../../WAProto';
-import { AuthenticationCreds, BaileysEventEmitter, SignalKeyStoreWithTransaction, SocketConfig } from '../Types';
+import type { AxiosRequestConfig } from 'axios';
+import { proto } from '../../WAProto/index.js';
+import type { AuthenticationCreds, BaileysEventEmitter, CacheStore, SignalKeyStoreWithTransaction, SignalRepositoryWithLIDStore } from '../Types';
+import type { ILogger } from './logger';
 type ProcessMessageContext = {
     shouldProcessHistoryMsg: boolean;
+    placeholderResendCache?: CacheStore;
     creds: AuthenticationCreds;
     keyStore: SignalKeyStoreWithTransaction;
     ev: BaileysEventEmitter;
-    getMessage: SocketConfig['getMessage'];
-    logger?: Logger;
+    logger?: ILogger;
     options: AxiosRequestConfig<{}>;
+    signalRepository: SignalRepositoryWithLIDStore;
 };
 /** Cleans a received message to further processing */
 export declare const cleanMessage: (message: proto.IWebMessageInfo, meId: string) => void;
@@ -36,6 +37,6 @@ type PollContext = {
  * @param ctx additional info about the poll required for decryption
  * @returns list of SHA256 options
  */
-export declare function decryptPollVote({ encPayload, encIv }: proto.Message.IPollEncValue, { pollCreatorJid, pollMsgId, pollEncKey, voterJid, }: PollContext): proto.Message.PollVoteMessage;
-declare const processMessage: (message: proto.IWebMessageInfo, { shouldProcessHistoryMsg, ev, creds, keyStore, logger, options, getMessage }: ProcessMessageContext) => Promise<void>;
+export declare function decryptPollVote({ encPayload, encIv }: proto.Message.IPollEncValue, { pollCreatorJid, pollMsgId, pollEncKey, voterJid }: PollContext): proto.Message.PollVoteMessage;
+declare const processMessage: (message: proto.IWebMessageInfo, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, signalRepository, keyStore, logger, options }: ProcessMessageContext) => Promise<void>;
 export default processMessage;

package/lib/Utils/process-message.js

@@ -1,7 +1,8 @@
 "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");
+exports.getChatId = exports.shouldIncrementChatUnread = exports.isRealMessage = exports.cleanMessage = void 0;
+exports.decryptPollVote = decryptPollVote;
+const index_js_1 = require("../../WAProto/index.js");
 const Types_1 = require("../Types");
 const messages_1 = require("../Utils/messages");
 const WABinary_1 = require("../WABinary");
@@ -14,9 +15,7 @@ const REAL_MSG_STUB_TYPES = new Set([
     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
-]);
+const REAL_MSG_REQ_ME_STUB_TYPES = new Set([Types_1.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
@@ -24,10 +23,10 @@ const cleanMessage = (message, meId) => {
     message.key.participant = message.key.participant ? (0, WABinary_1.jidNormalizedUser)(message.key.participant) : undefined;
     const content = (0, messages_1.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) {
@@ -38,9 +37,9 @@ const cleanMessage = (message, meId) => {
             // 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;
+                : // 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
             msgKey.remoteJid = message.key.remoteJid;
             // set participant of the message
@@ -50,29 +49,26 @@ const cleanMessage = (message, meId) => {
 };
 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);
+    return ((!!normalizedContent ||
+        REAL_MSG_STUB_TYPES.has(message.messageStubType) ||
+        (REAL_MSG_REQ_ME_STUB_TYPES.has(message.messageStubType) &&
+            message.messageStubParameters?.some(p => (0, WABinary_1.areJidsSameUser)(meId, p)))) &&
+        hasSomeContent &&
+        !normalizedContent?.protocolMessage &&
+        !normalizedContent?.reactionMessage &&
+        !normalizedContent?.pollUpdateMessage);
 };
 exports.isRealMessage = isRealMessage;
-const shouldIncrementChatUnread = (message) => (!message.key.fromMe && !message.messageStubType);
+const shouldIncrementChatUnread = (message) => !message.key.fromMe && !message.messageStubType;
 exports.shouldIncrementChatUnread = shouldIncrementChatUnread;
 /**
  * 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) {
+    if ((0, WABinary_1.isJidBroadcast)(remoteJid) && !(0, WABinary_1.isJidStatusBroadcast)(remoteJid) && !fromMe) {
         return participant;
     }
     return remoteJid;
@@ -84,7 +80,7 @@ exports.getChatId = getChatId;
  * @param ctx additional info about the poll required for decryption
  * @returns list of SHA256 options
  */
-function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pollEncKey, voterJid, }) {
+function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pollEncKey, voterJid }) {
     const sign = Buffer.concat([
         toBinary(pollMsgId),
         toBinary(pollCreatorJid),
@@ -96,19 +92,18 @@ function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pol
     const decKey = (0, crypto_1.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);
+    return index_js_1.proto.Message.PollVoteMessage.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 }) => {
     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);
     if (isRealMsg) {
+        chat.messages = [{ message }];
         chat.conversationTimestamp = (0, generics_1.toNumber)(message.messageTimestamp);
         // only increment unread count if not CIPHERTEXT and from another person
         if ((0, exports.shouldIncrementChatUnread)(message)) {
@@ -118,38 +113,43 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
     const content = (0, messages_1.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 index_js_1.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 }
-                        ]
-                    });
+                    if (histNotification.syncType !== index_js_1.proto.HistorySync.HistorySyncType.ON_DEMAND) {
+                        ev.emit('creds.update', {
+                            processedHistoryMessages: [
+                                ...(creds.processedHistoryMessages || []),
+                                { key: message.key, messageTimestamp: message.messageTimestamp }
+                            ]
+                        });
+                    }
                     const data = await (0, history_1.downloadAndProcessHistorySyncNotification)(histNotification, options);
-                    ev.emit('messaging-history.set', { ...data, isLatest });
+                    ev.emit('messaging-history.set', {
+                        ...data,
+                        isLatest: histNotification.syncType !== index_js_1.proto.HistorySync.HistorySyncType.ON_DEMAND ? isLatest : undefined,
+                        peerDataRequestSessionId: histNotification.peerDataRequestSessionId
+                    });
                 }
                 break;
-            case WAProto_1.proto.Message.ProtocolMessage.Type.APP_STATE_SYNC_KEY_SHARE:
+            case index_js_1.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,15 +159,15 @@ 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 index_js_1.proto.Message.ProtocolMessage.Type.REVOKE:
                 ev.emit('messages.update', [
                     {
                         key: {
@@ -178,50 +178,94 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
                     }
                 ]);
                 break;
-            case WAProto_1.proto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING:
+            case index_js_1.proto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING:
                 Object.assign(chat, {
                     ephemeralSettingTimestamp: (0, generics_1.toNumber)(message.messageTimestamp),
                     ephemeralExpiration: protocolMsg.ephemeralExpiration || null
                 });
                 break;
-            case WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE:
+            case index_js_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE:
                 const response = protocolMsg.peerDataOperationRequestResponseMessage;
                 if (response) {
+                    await placeholderResendCache?.del(response.stanzaId);
+                    // TODO: IMPLEMENT HISTORY SYNC ETC (sticker uploads etc.).
                     const { peerDataOperationResult } = response;
                     for (const result of peerDataOperationResult) {
                         const { placeholderMessageResendResponse: retryResponse } = result;
+                        //eslint-disable-next-line max-depth
                         if (retryResponse) {
-                            const webMessageInfo = WAProto_1.proto.WebMessageInfo.decode(retryResponse.webMessageInfoBytes);
-                            ev.emit('messages.update', [
-                                { key: webMessageInfo.key, update: { message: webMessageInfo.message } }
-                            ]);
+                            const webMessageInfo = index_js_1.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', {
+                                    messages: [webMessageInfo],
+                                    type: 'notify',
+                                    requestId: response.stanzaId
+                                });
+                            }, 500);
                         }
                     }
                 }
                 break;
+            case index_js_1.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((0, generics_1.toNumber)(protocolMsg.timestampMs) / 1000)
+                                : message.messageTimestamp
+                        }
+                    }
+                ]);
+                break;
+            case index_js_1.proto.Message.ProtocolMessage.Type.LID_MIGRATION_MAPPING_SYNC:
+                const encodedPayload = protocolMsg.lidMigrationMappingSyncMessage?.encodedMappingPayload;
+                const { pnToLidMappings, chatDbMigrationTimestamp } = index_js_1.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);
         }
     }
-    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 (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.participant, 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.participant ?? undefined }]);
+        };
+        const emitGroupRequestJoin = (participant, action, method) => {
+            ev.emit('group.join-request', { id: jid, author: message.participant, participant, action, method: method });
         };
         const participantsIncludesMe = () => participants.find(jid => (0, WABinary_1.areJidsSameUser)(meId, jid));
         switch (message.messageStubType) {
+            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER:
+                participants = message.messageStubParameters || [];
+                emitParticipantsUpdate('modify');
+                break;
             case Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE:
             case Types_1.WAMessageStubType.GROUP_PARTICIPANT_REMOVE:
                 participants = message.messageStubParameters || [];
@@ -249,48 +293,64 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
                 emitParticipantsUpdate('promote');
                 break;
             case Types_1.WAMessageStubType.GROUP_CHANGE_ANNOUNCE:
-                const announceValue = (_d = message.messageStubParameters) === null || _d === void 0 ? void 0 : _d[0];
+                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];
+                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];
+                const name = message.messageStubParameters?.[0];
                 chat.name = name;
                 emitGroupUpdate({ subject: name });
                 break;
+            case Types_1.WAMessageStubType.GROUP_CHANGE_DESCRIPTION:
+                const description = message.messageStubParameters?.[0];
+                chat.description = description;
+                emitGroupUpdate({ desc: description });
+                break;
             case Types_1.WAMessageStubType.GROUP_CHANGE_INVITE_LINK:
-                const code = (_g = message.messageStubParameters) === null || _g === void 0 ? void 0 : _g[0];
+                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];
+                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];
+                const approvalMode = message.messageStubParameters?.[0];
                 emitGroupUpdate({ joinApprovalMode: approvalMode === 'on' });
                 break;
+            case Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD:
+                const participant = 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,21 +359,25 @@ 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?.warn(
+                    { err, creationMsgKey },
+                    'failed to decrypt poll vote'
+                )
             }
-            catch (err) {
-                logger === null || logger === void 0 ? void 0 : logger.warn({ err, creationMsgKey }, 'failed to decrypt poll vote');
-            }
-        }
-        else {
-            logger === null || logger === void 0 ? void 0 : logger.warn({ creationMsgKey }, 'poll creation message not found, cannot decrypt update');
+        } else {
+            logger?.warn(
+                { creationMsgKey },
+                'poll creation message not found, cannot decrypt update'
+            )
         }
-    }
+        } */
     if (Object.keys(chat).length > 1) {
         ev.emit('chats.update', [chat]);
     }

package/lib/Utils/signal.d.ts

@@ -1,6 +1,7 @@
-import { SignalRepository } from '../Types';
-import { AuthenticationCreds, AuthenticationState, KeyPair, SignalIdentity, SignalKeyStore, SignedKeyPair } from '../Types/Auth';
-import { BinaryNode, JidWithDevice } from '../WABinary';
+import type { SignalRepositoryWithLIDStore } from '../Types';
+import type { AuthenticationCreds, AuthenticationState, KeyPair, SignalIdentity, SignalKeyStore, SignedKeyPair } from '../Types/Auth';
+import { type BinaryNode, type JidWithDevice } from '../WABinary';
+import type { USyncQueryResultList } from '../WAUSync';
 export declare const createSignalIdentity: (wid: string, accountSignatureKey: Uint8Array) => SignalIdentity;
 export declare const getPreKeys: ({ get }: SignalKeyStore, min: number, limit: number) => Promise<{
     [id: string]: KeyPair;
@@ -14,8 +15,8 @@ export declare const generateOrGetPreKeys: (creds: AuthenticationCreds, range: n
 };
 export declare const xmppSignedPreKey: (key: SignedKeyPair) => BinaryNode;
 export declare const xmppPreKey: (pair: KeyPair, id: number) => BinaryNode;
-export declare const parseAndInjectE2ESessions: (node: BinaryNode, repository: SignalRepository) => Promise<void>;
-export declare const extractDeviceJids: (result: BinaryNode, myJid: string, excludeZeroDevices: boolean) => JidWithDevice[];
+export declare const parseAndInjectE2ESessions: (node: BinaryNode, repository: SignalRepositoryWithLIDStore) => Promise<void>;
+export declare const extractDeviceJids: (result: USyncQueryResultList[], myJid: string, excludeZeroDevices: boolean) => JidWithDevice[];
 /**
  * get the next N keys for upload or processing
  * @param count number of pre-keys to get or generate