@baileys-md/baileys 10.1.0 → 11.0.0

package/lib/Utils/chat-utils.js

@@ -1,16 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.processSyncAction = exports.chatModificationToAppPatch = exports.decodePatches = exports.decodeSyncdSnapshot = exports.downloadExternalPatch = exports.downloadExternalBlob = exports.extractSyncdPatches = exports.decodeSyncdPatch = exports.decodeSyncdMutations = exports.encodeSyncdPatch = exports.newLTHashState = void 0;
-const boom_1 = require("@hapi/boom");
-const WAProto_1 = require("../../WAProto");
-const LabelAssociation_1 = require("../Types/LabelAssociation");
-const WABinary_1 = require("../WABinary");
-const crypto_1 = require("./crypto");
-const generics_1 = require("./generics");
-const lt_hash_1 = require("./lt-hash");
-const messages_media_1 = require("./messages-media");
+import { Boom } from '@hapi/boom';
+import { proto } from '../../WAProto/index.js';
+import { LabelAssociationType } from '../Types/LabelAssociation.js';
+import { getBinaryNodeChild, getBinaryNodeChildren, isJidGroup, isJidUser, jidNormalizedUser } from '../WABinary/index.js';
+import { aesDecrypt, aesEncrypt, hkdf, hmacSign } from './crypto.js';
+import { toNumber } from './generics.js';
+import { LT_HASH_ANTI_TAMPERING } from './lt-hash.js';
+import { downloadContentFromMessage } from './messages-media.js';
 const mutationKeys = async (keydata) => {
-    const expanded = await (0, crypto_1.hkdf)(keydata, 160, { info: 'WhatsApp Mutation Keys' });
+    const expanded = await hkdf(keydata, 160, { info: 'WhatsApp Mutation Keys' });
     return {
         indexKey: expanded.slice(0, 32),
         valueEncryptionKey: expanded.slice(32, 64),
@@ -23,10 +20,10 @@ const generateMac = (operation, data, keyId, key) => {
     const getKeyData = () => {
         let r;
         switch (operation) {
-            case WAProto_1.proto.SyncdMutation.SyncdOperation.SET:
+            case proto.SyncdMutation.SyncdOperation.SET:
                 r = 0x01;
                 break;
-            case WAProto_1.proto.SyncdMutation.SyncdOperation.REMOVE:
+            case proto.SyncdMutation.SyncdOperation.REMOVE:
                 r = 0x02;
                 break;
         }
@@ -37,7 +34,7 @@ const generateMac = (operation, data, keyId, key) => {
     const last = Buffer.alloc(8); // 8 bytes
     last.set([keyData.length], last.length - 1);
     const total = Buffer.concat([keyData, data, last]);
-    const hmac = (0, crypto_1.hmacSign)(total, key, 'sha512');
+    const hmac = hmacSign(total, key, 'sha512');
     return hmac.slice(0, 32);
 };
 const to64BitNetworkOrder = (e) => {
@@ -53,9 +50,9 @@ const makeLtHashGenerator = ({ indexValueMap, hash }) => {
         mix: ({ indexMac, valueMac, operation }) => {
             const indexMacBase64 = Buffer.from(indexMac).toString('base64');
             const prevOp = indexValueMap[indexMacBase64];
-            if (operation === WAProto_1.proto.SyncdMutation.SyncdOperation.REMOVE) {
+            if (operation === proto.SyncdMutation.SyncdOperation.REMOVE) {
                 if (!prevOp) {
-                    throw new boom_1.Boom('tried remove, but no previous op', { data: { indexMac, valueMac } });
+                    throw new Boom('tried remove, but no previous op', { data: { indexMac, valueMac } });
                 }
                 // remove from index value mac, since this mutation is erased
                 delete indexValueMap[indexMacBase64];
@@ -71,7 +68,7 @@ const makeLtHashGenerator = ({ indexValueMap, hash }) => {
         },
         finish: async () => {
             const hashArrayBuffer = new Uint8Array(hash).buffer;
-            const result = await lt_hash_1.LT_HASH_ANTI_TAMPERING.subtractThenAdd(hashArrayBuffer, addBuffs, subBuffs);
+            const result = await LT_HASH_ANTI_TAMPERING.subtractThenAdd(hashArrayBuffer, addBuffs, subBuffs);
             const buffer = Buffer.from(result);
             return {
                 hash: buffer,
@@ -81,43 +78,33 @@ const makeLtHashGenerator = ({ indexValueMap, hash }) => {
     };
 };
 const generateSnapshotMac = (lthash, version, name, key) => {
-    const total = Buffer.concat([
-        lthash,
-        to64BitNetworkOrder(version),
-        Buffer.from(name, 'utf-8')
-    ]);
-    return (0, crypto_1.hmacSign)(total, key, 'sha256');
+    const total = Buffer.concat([lthash, to64BitNetworkOrder(version), Buffer.from(name, 'utf-8')]);
+    return hmacSign(total, key, 'sha256');
 };
 const generatePatchMac = (snapshotMac, valueMacs, version, type, key) => {
-    const total = Buffer.concat([
-        snapshotMac,
-        ...valueMacs,
-        to64BitNetworkOrder(version),
-        Buffer.from(type, 'utf-8')
-    ]);
-    return (0, crypto_1.hmacSign)(total, key);
+    const total = Buffer.concat([snapshotMac, ...valueMacs, to64BitNetworkOrder(version), Buffer.from(type, 'utf-8')]);
+    return hmacSign(total, key);
 };
-const newLTHashState = () => ({ version: 0, hash: Buffer.alloc(128), indexValueMap: {} });
-exports.newLTHashState = newLTHashState;
-const encodeSyncdPatch = async ({ type, index, syncAction, apiVersion, operation }, myAppStateKeyId, state, getAppStateSyncKey) => {
+export const newLTHashState = () => ({ version: 0, hash: Buffer.alloc(128), indexValueMap: {} });
+export const encodeSyncdPatch = async ({ type, index, syncAction, apiVersion, operation }, myAppStateKeyId, state, getAppStateSyncKey) => {
     const key = !!myAppStateKeyId ? await getAppStateSyncKey(myAppStateKeyId) : undefined;
     if (!key) {
-        throw new boom_1.Boom(`myAppStateKey ("${myAppStateKeyId}") not present`, { statusCode: 404 });
+        throw new Boom(`myAppStateKey ("${myAppStateKeyId}") not present`, { statusCode: 404 });
     }
     const encKeyId = Buffer.from(myAppStateKeyId, 'base64');
     state = { ...state, indexValueMap: { ...state.indexValueMap } };
     const indexBuffer = Buffer.from(JSON.stringify(index));
-    const dataProto = WAProto_1.proto.SyncActionData.fromObject({
+    const dataProto = proto.SyncActionData.fromObject({
         index: indexBuffer,
         value: syncAction,
         padding: new Uint8Array(0),
         version: apiVersion
     });
-    const encoded = WAProto_1.proto.SyncActionData.encode(dataProto).finish();
+    const encoded = proto.SyncActionData.encode(dataProto).finish();
     const keyValue = await mutationKeys(key.keyData);
-    const encValue = (0, crypto_1.aesEncrypt)(encoded, keyValue.valueEncryptionKey);
+    const encValue = aesEncrypt(encoded, keyValue.valueEncryptionKey);
     const valueMac = generateMac(operation, encValue, encKeyId, keyValue.valueMacKey);
-    const indexMac = (0, crypto_1.hmacSign)(indexBuffer, keyValue.indexKey);
+    const indexMac = hmacSign(indexBuffer, keyValue.indexKey);
     // update LT hash
     const generator = makeLtHashGenerator(state);
     generator.mix({ indexMac, valueMac, operation });
@@ -147,8 +134,7 @@ const encodeSyncdPatch = async ({ type, index, syncAction, apiVersion, operation
     state.indexValueMap[base64Index] = { valueMac };
     return { patch, state };
 };
-exports.encodeSyncdPatch = encodeSyncdPatch;
-const decodeSyncdMutations = async (msgMutations, initialState, getAppStateSyncKey, onMutation, validateMacs) => {
+export const decodeSyncdMutations = async (msgMutations, initialState, getAppStateSyncKey, onMutation, validateMacs) => {
     const ltGenerator = makeLtHashGenerator(initialState);
     // indexKey used to HMAC sign record.index.blob
     // valueEncryptionKey used to AES-256-CBC encrypt record.value.blob[0:-32]
@@ -156,8 +142,8 @@ const decodeSyncdMutations = async (msgMutations, initialState, getAppStateSyncK
     for (const msgMutation of msgMutations) {
         // if it's a syncdmutation, get the operation property
         // otherwise, if it's only a record -- it'll be a SET mutation
-        const operation = 'operation' in msgMutation ? msgMutation.operation : WAProto_1.proto.SyncdMutation.SyncdOperation.SET;
-        const record = ('record' in msgMutation && !!msgMutation.record) ? msgMutation.record : msgMutation;
+        const operation = 'operation' in msgMutation ? msgMutation.operation : proto.SyncdMutation.SyncdOperation.SET;
+        const record = 'record' in msgMutation && !!msgMutation.record ? msgMutation.record : msgMutation;
         const key = await getKey(record.keyId.id);
         const content = Buffer.from(record.value.blob);
         const encContent = content.slice(0, -32);
@@ -165,15 +151,15 @@ const decodeSyncdMutations = async (msgMutations, initialState, getAppStateSyncK
         if (validateMacs) {
             const contentHmac = generateMac(operation, encContent, record.keyId.id, key.valueMacKey);
             if (Buffer.compare(contentHmac, ogValueMac) !== 0) {
-                throw new boom_1.Boom('HMAC content verification failed');
+                throw new Boom('HMAC content verification failed');
             }
         }
-        const result = (0, crypto_1.aesDecrypt)(encContent, key.valueEncryptionKey);
-        const syncAction = WAProto_1.proto.SyncActionData.decode(result);
+        const result = aesDecrypt(encContent, key.valueEncryptionKey);
+        const syncAction = proto.SyncActionData.decode(result);
         if (validateMacs) {
-            const hmac = (0, crypto_1.hmacSign)(syncAction.index, key.indexKey);
+            const hmac = hmacSign(syncAction.index, key.indexKey);
             if (Buffer.compare(hmac, record.index.blob) !== 0) {
-                throw new boom_1.Boom('HMAC index verification failed');
+                throw new Boom('HMAC index verification failed');
             }
         }
         const indexStr = Buffer.from(syncAction.index).toString();
@@ -189,38 +175,39 @@ const decodeSyncdMutations = async (msgMutations, initialState, getAppStateSyncK
         const base64Key = Buffer.from(keyId).toString('base64');
         const keyEnc = await getAppStateSyncKey(base64Key);
         if (!keyEnc) {
-            throw new boom_1.Boom(`failed to find key "${base64Key}" to decode mutation`, { statusCode: 404, data: { msgMutations } });
+            throw new Boom(`failed to find key "${base64Key}" to decode mutation`, {
+                statusCode: 404,
+                data: { msgMutations }
+            });
         }
         return mutationKeys(keyEnc.keyData);
     }
 };
-exports.decodeSyncdMutations = decodeSyncdMutations;
-const decodeSyncdPatch = async (msg, name, initialState, getAppStateSyncKey, onMutation, validateMacs) => {
+export const decodeSyncdPatch = async (msg, name, initialState, getAppStateSyncKey, onMutation, validateMacs) => {
     if (validateMacs) {
         const base64Key = Buffer.from(msg.keyId.id).toString('base64');
         const mainKeyObj = await getAppStateSyncKey(base64Key);
         if (!mainKeyObj) {
-            throw new boom_1.Boom(`failed to find key "${base64Key}" to decode patch`, { statusCode: 404, data: { msg } });
+            throw new Boom(`failed to find key "${base64Key}" to decode patch`, { statusCode: 404, data: { msg } });
         }
         const mainKey = await mutationKeys(mainKeyObj.keyData);
         const mutationmacs = msg.mutations.map(mutation => mutation.record.value.blob.slice(-32));
-        const patchMac = generatePatchMac(msg.snapshotMac, mutationmacs, (0, generics_1.toNumber)(msg.version.version), name, mainKey.patchMacKey);
+        const patchMac = generatePatchMac(msg.snapshotMac, mutationmacs, toNumber(msg.version.version), name, mainKey.patchMacKey);
         if (Buffer.compare(patchMac, msg.patchMac) !== 0) {
-            throw new boom_1.Boom('Invalid patch mac');
+            throw new Boom('Invalid patch mac');
         }
     }
-    const result = await (0, exports.decodeSyncdMutations)(msg.mutations, initialState, getAppStateSyncKey, onMutation, validateMacs);
+    const result = await decodeSyncdMutations(msg.mutations, initialState, getAppStateSyncKey, onMutation, validateMacs);
     return result;
 };
-exports.decodeSyncdPatch = decodeSyncdPatch;
-const extractSyncdPatches = async (result, options) => {
-    const syncNode = (0, WABinary_1.getBinaryNodeChild)(result, 'sync');
-    const collectionNodes = (0, WABinary_1.getBinaryNodeChildren)(syncNode, 'collection');
+export const extractSyncdPatches = async (result, options) => {
+    const syncNode = getBinaryNodeChild(result, 'sync');
+    const collectionNodes = getBinaryNodeChildren(syncNode, 'collection');
     const final = {};
     await Promise.all(collectionNodes.map(async (collectionNode) => {
-        const patchesNode = (0, WABinary_1.getBinaryNodeChild)(collectionNode, 'patches');
-        const patches = (0, WABinary_1.getBinaryNodeChildren)(patchesNode || collectionNode, 'patch');
-        const snapshotNode = (0, WABinary_1.getBinaryNodeChild)(collectionNode, 'snapshot');
+        const patchesNode = getBinaryNodeChild(collectionNode, 'patches');
+        const patches = getBinaryNodeChildren(patchesNode || collectionNode, 'patch');
+        const snapshotNode = getBinaryNodeChild(collectionNode, 'snapshot');
         const syncds = [];
         const name = collectionNode.attrs.name;
         const hasMorePatches = collectionNode.attrs.has_more_patches === 'true';
@@ -229,16 +216,16 @@ const extractSyncdPatches = async (result, options) => {
             if (!Buffer.isBuffer(snapshotNode)) {
                 snapshotNode.content = Buffer.from(Object.values(snapshotNode.content));
             }
-            const blobRef = WAProto_1.proto.ExternalBlobReference.decode(snapshotNode.content);
-            const data = await (0, exports.downloadExternalBlob)(blobRef, options);
-            snapshot = WAProto_1.proto.SyncdSnapshot.decode(data);
+            const blobRef = proto.ExternalBlobReference.decode(snapshotNode.content);
+            const data = await downloadExternalBlob(blobRef, options);
+            snapshot = proto.SyncdSnapshot.decode(data);
         }
         for (let { content } of patches) {
             if (content) {
                 if (!Buffer.isBuffer(content)) {
                     content = Buffer.from(Object.values(content));
                 }
-                const syncd = WAProto_1.proto.SyncdPatch.decode(content);
+                const syncd = proto.SyncdPatch.decode(content);
                 if (!syncd.version) {
                     syncd.version = { version: +collectionNode.attrs.version + 1 };
                 }
@@ -249,32 +236,27 @@ const extractSyncdPatches = async (result, options) => {
     }));
     return final;
 };
-exports.extractSyncdPatches = extractSyncdPatches;
-const downloadExternalBlob = async (blob, options) => {
-    const stream = await (0, messages_media_1.downloadContentFromMessage)(blob, 'md-app-state', { options });
+export const downloadExternalBlob = async (blob, options) => {
+    const stream = await downloadContentFromMessage(blob, 'md-app-state', { options });
     const bufferArray = [];
     for await (const chunk of stream) {
         bufferArray.push(chunk);
     }
     return Buffer.concat(bufferArray);
 };
-exports.downloadExternalBlob = downloadExternalBlob;
-const downloadExternalPatch = async (blob, options) => {
-    const buffer = await (0, exports.downloadExternalBlob)(blob, options);
-    const syncData = WAProto_1.proto.SyncdMutations.decode(buffer);
+export const downloadExternalPatch = async (blob, options) => {
+    const buffer = await downloadExternalBlob(blob, options);
+    const syncData = proto.SyncdMutations.decode(buffer);
     return syncData;
 };
-exports.downloadExternalPatch = downloadExternalPatch;
-const decodeSyncdSnapshot = async (name, snapshot, getAppStateSyncKey, minimumVersionNumber, validateMacs = true) => {
-    const newState = (0, exports.newLTHashState)();
-    newState.version = (0, generics_1.toNumber)(snapshot.version.version);
+export const decodeSyncdSnapshot = async (name, snapshot, getAppStateSyncKey, minimumVersionNumber, validateMacs = true) => {
+    const newState = newLTHashState();
+    newState.version = toNumber(snapshot.version.version);
     const mutationMap = {};
-    const areMutationsRequired = typeof minimumVersionNumber === 'undefined'
-        || newState.version > minimumVersionNumber;
-    const { hash, indexValueMap } = await (0, exports.decodeSyncdMutations)(snapshot.records, newState, getAppStateSyncKey, areMutationsRequired
-        ? (mutation) => {
-            var _a;
-            const index = (_a = mutation.syncAction.index) === null || _a === void 0 ? void 0 : _a.toString();
+    const areMutationsRequired = typeof minimumVersionNumber === 'undefined' || newState.version > minimumVersionNumber;
+    const { hash, indexValueMap } = await decodeSyncdMutations(snapshot.records, newState, getAppStateSyncKey, areMutationsRequired
+        ? mutation => {
+            const index = mutation.syncAction.index?.toString();
             mutationMap[index] = mutation;
         }
         : () => { }, validateMacs);
@@ -284,12 +266,12 @@ const decodeSyncdSnapshot = async (name, snapshot, getAppStateSyncKey, minimumVe
         const base64Key = Buffer.from(snapshot.keyId.id).toString('base64');
         const keyEnc = await getAppStateSyncKey(base64Key);
         if (!keyEnc) {
-            throw new boom_1.Boom(`failed to find key "${base64Key}" to decode mutation`);
+            throw new Boom(`failed to find key "${base64Key}" to decode mutation`);
         }
         const result = await mutationKeys(keyEnc.keyData);
         const computedSnapshotMac = generateSnapshotMac(newState.hash, newState.version, name, result.snapshotMacKey);
         if (Buffer.compare(snapshot.mac, computedSnapshotMac) !== 0) {
-            throw new boom_1.Boom(`failed to verify LTHash at ${newState.version} of ${name} from snapshot`);
+            throw new Boom(`failed to verify LTHash at ${newState.version} of ${name} from snapshot`);
         }
     }
     return {
@@ -297,45 +279,41 @@ const decodeSyncdSnapshot = async (name, snapshot, getAppStateSyncKey, minimumVe
         mutationMap
     };
 };
-exports.decodeSyncdSnapshot = decodeSyncdSnapshot;
-const decodePatches = async (name, syncds, initial, getAppStateSyncKey, options, minimumVersionNumber, logger, validateMacs = true) => {
-    var _a;
+export const decodePatches = async (name, syncds, initial, getAppStateSyncKey, options, minimumVersionNumber, logger, validateMacs = true) => {
     const newState = {
         ...initial,
         indexValueMap: { ...initial.indexValueMap }
     };
     const mutationMap = {};
-    for (let i = 0; i < syncds.length; i++) {
-        const syncd = syncds[i];
+    for (const syncd of syncds) {
         const { version, keyId, snapshotMac } = syncd;
         if (syncd.externalMutations) {
-            logger === null || logger === void 0 ? void 0 : logger.trace({ name, version }, 'downloading external patch');
-            const ref = await (0, exports.downloadExternalPatch)(syncd.externalMutations, options);
-            logger === null || logger === void 0 ? void 0 : logger.debug({ name, version, mutations: ref.mutations.length }, 'downloaded external patch');
-            (_a = syncd.mutations) === null || _a === void 0 ? void 0 : _a.push(...ref.mutations);
+            logger?.trace({ name, version }, 'downloading external patch');
+            const ref = await downloadExternalPatch(syncd.externalMutations, options);
+            logger?.debug({ name, version, mutations: ref.mutations.length }, 'downloaded external patch');
+            syncd.mutations?.push(...ref.mutations);
         }
-        const patchVersion = (0, generics_1.toNumber)(version.version);
+        const patchVersion = toNumber(version.version);
         newState.version = patchVersion;
         const shouldMutate = typeof minimumVersionNumber === 'undefined' || patchVersion > minimumVersionNumber;
-        const decodeResult = await (0, exports.decodeSyncdPatch)(syncd, name, newState, getAppStateSyncKey, shouldMutate
+        const decodeResult = await decodeSyncdPatch(syncd, name, newState, getAppStateSyncKey, shouldMutate
             ? mutation => {
-                var _a;
-                const index = (_a = mutation.syncAction.index) === null || _a === void 0 ? void 0 : _a.toString();
+                const index = mutation.syncAction.index?.toString();
                 mutationMap[index] = mutation;
             }
-            : (() => { }), true);
+            : () => { }, true);
         newState.hash = decodeResult.hash;
         newState.indexValueMap = decodeResult.indexValueMap;
         if (validateMacs) {
             const base64Key = Buffer.from(keyId.id).toString('base64');
             const keyEnc = await getAppStateSyncKey(base64Key);
             if (!keyEnc) {
-                throw new boom_1.Boom(`failed to find key "${base64Key}" to decode mutation`);
+                throw new Boom(`failed to find key "${base64Key}" to decode mutation`);
             }
             const result = await mutationKeys(keyEnc.keyData);
             const computedSnapshotMac = generateSnapshotMac(newState.hash, newState.version, name, result.snapshotMacKey);
             if (Buffer.compare(snapshotMac, computedSnapshotMac) !== 0) {
-                throw new boom_1.Boom(`failed to verify LTHash at ${newState.version} of ${name}`);
+                throw new Boom(`failed to verify LTHash at ${newState.version} of ${name}`);
             }
         }
         // clear memory used up by the mutations
@@ -343,31 +321,31 @@ const decodePatches = async (name, syncds, initial, getAppStateSyncKey, options,
     }
     return { state: newState, mutationMap };
 };
-exports.decodePatches = decodePatches;
-const chatModificationToAppPatch = (mod, jid) => {
-    const OP = WAProto_1.proto.SyncdMutation.SyncdOperation;
+export const chatModificationToAppPatch = (mod, jid) => {
+    const OP = proto.SyncdMutation.SyncdOperation;
     const getMessageRange = (lastMessages) => {
         let messageRange;
         if (Array.isArray(lastMessages)) {
             const lastMsg = lastMessages[lastMessages.length - 1];
             messageRange = {
-                lastMessageTimestamp: lastMsg === null || lastMsg === void 0 ? void 0 : lastMsg.messageTimestamp,
-                messages: (lastMessages === null || lastMessages === void 0 ? void 0 : lastMessages.length) ? lastMessages.map(m => {
-                    var _a, _b;
-                    if (!((_a = m.key) === null || _a === void 0 ? void 0 : _a.id) || !((_b = m.key) === null || _b === void 0 ? void 0 : _b.remoteJid)) {
-                        throw new boom_1.Boom('Incomplete key', { statusCode: 400, data: m });
-                    }
-                    if ((0, WABinary_1.isJidGroup)(m.key.remoteJid) && !m.key.fromMe && !m.key.participant) {
-                        throw new boom_1.Boom('Expected not from me message to have participant', { statusCode: 400, data: m });
-                    }
-                    if (!m.messageTimestamp || !(0, generics_1.toNumber)(m.messageTimestamp)) {
-                        throw new boom_1.Boom('Missing timestamp in last message list', { statusCode: 400, data: m });
-                    }
-                    if (m.key.participant) {
-                        m.key.participant = (0, WABinary_1.jidNormalizedUser)(m.key.participant);
-                    }
-                    return m;
-                }) : undefined
+                lastMessageTimestamp: lastMsg?.messageTimestamp,
+                messages: lastMessages?.length
+                    ? lastMessages.map(m => {
+                        if (!m.key?.id || !m.key?.remoteJid) {
+                            throw new Boom('Incomplete key', { statusCode: 400, data: m });
+                        }
+                        if (isJidGroup(m.key.remoteJid) && !m.key.fromMe && !m.key.participant) {
+                            throw new Boom('Expected not from me message to have participant', { statusCode: 400, data: m });
+                        }
+                        if (!m.messageTimestamp || !toNumber(m.messageTimestamp)) {
+                            throw new Boom('Missing timestamp in last message list', { statusCode: 400, data: m });
+                        }
+                        if (m.key.participant) {
+                            m.key.participant = jidNormalizedUser(m.key.participant);
+                        }
+                        return m;
+                    })
+                    : undefined
             };
         }
         else {
@@ -436,7 +414,9 @@ const chatModificationToAppPatch = (mod, jid) => {
     else if ('clear' in mod) {
         patch = {
             syncAction: {
-                clearChatAction: {} // add message range later
+                clearChatAction: {
+                    messageRange: getMessageRange(mod.lastMessages)
+                }
             },
             index: ['clearChat', jid, '1' /*the option here is 0 when keep starred messages is enabled*/, '0'],
             type: 'regular_high',
@@ -457,6 +437,17 @@ const chatModificationToAppPatch = (mod, jid) => {
             operation: OP.SET
         };
     }
+    else if ('contact' in mod) {
+        patch = {
+            syncAction: {
+                contactAction: mod.contact || {}
+            },
+            index: ['contact', jid],
+            type: 'critical_unblock_low',
+            apiVersion: 2,
+            operation: mod.contact ? OP.SET : OP.REMOVE
+        };
+    }
     else if ('star' in mod) {
         const key = mod.star.messages[0];
         patch = {
@@ -475,7 +466,7 @@ const chatModificationToAppPatch = (mod, jid) => {
         patch = {
             syncAction: {
                 deleteChatAction: {
-                    messageRange: getMessageRange(mod.lastMessages),
+                    messageRange: getMessageRange(mod.lastMessages)
                 }
             },
             index: ['deleteChat', jid, '1'],
@@ -494,64 +485,73 @@ const chatModificationToAppPatch = (mod, jid) => {
             index: ['setting_pushName'],
             type: 'critical_block',
             apiVersion: 1,
-            operation: OP.SET,
+            operation: OP.SET
+        };
+    }
+    else if ('addLabel' in mod) {
+        patch = {
+            syncAction: {
+                labelEditAction: {
+                    name: mod.addLabel.name,
+                    color: mod.addLabel.color,
+                    predefinedId: mod.addLabel.predefinedId,
+                    deleted: mod.addLabel.deleted
+                }
+            },
+            index: ['label_edit', mod.addLabel.id],
+            type: 'regular',
+            apiVersion: 3,
+            operation: OP.SET
         };
     }
     else if ('addChatLabel' in mod) {
         patch = {
             syncAction: {
                 labelAssociationAction: {
-                    labeled: true,
+                    labeled: true
                 }
             },
-            index: [LabelAssociation_1.LabelAssociationType.Chat, mod.addChatLabel.labelId, jid],
+            index: [LabelAssociationType.Chat, mod.addChatLabel.labelId, jid],
             type: 'regular',
             apiVersion: 3,
-            operation: OP.SET,
+            operation: OP.SET
         };
     }
     else if ('removeChatLabel' in mod) {
         patch = {
             syncAction: {
                 labelAssociationAction: {
-                    labeled: false,
+                    labeled: false
                 }
             },
-            index: [LabelAssociation_1.LabelAssociationType.Chat, mod.removeChatLabel.labelId, jid],
+            index: [LabelAssociationType.Chat, mod.removeChatLabel.labelId, jid],
             type: 'regular',
             apiVersion: 3,
-            operation: OP.SET,
+            operation: OP.SET
         };
     }
     else if ('addMessageLabel' in mod) {
         patch = {
             syncAction: {
                 labelAssociationAction: {
-                    labeled: true,
+                    labeled: true
                 }
             },
-            index: [
-                LabelAssociation_1.LabelAssociationType.Message,
-                mod.addMessageLabel.labelId,
-                jid,
-                mod.addMessageLabel.messageId,
-                '0',
-                '0'
-            ],
+            index: [LabelAssociationType.Message, mod.addMessageLabel.labelId, jid, mod.addMessageLabel.messageId, '0', '0'],
             type: 'regular',
             apiVersion: 3,
-            operation: OP.SET,
+            operation: OP.SET
         };
     }
     else if ('removeMessageLabel' in mod) {
         patch = {
             syncAction: {
                 labelAssociationAction: {
-                    labeled: false,
+                    labeled: false
                 }
             },
             index: [
-                LabelAssociation_1.LabelAssociationType.Message,
+                LabelAssociationType.Message,
                 mod.removeMessageLabel.labelId,
                 jid,
                 mod.removeMessageLabel.messageId,
@@ -560,34 +560,30 @@ const chatModificationToAppPatch = (mod, jid) => {
             ],
             type: 'regular',
             apiVersion: 3,
-            operation: OP.SET,
+            operation: OP.SET
         };
     }
     else {
-        throw new boom_1.Boom('not supported');
+        throw new Boom('not supported');
     }
     patch.syncAction.timestamp = Date.now();
     return patch;
 };
-exports.chatModificationToAppPatch = chatModificationToAppPatch;
-const processSyncAction = (syncAction, ev, me, initialSyncOpts, logger) => {
-    var _a, _b, _c, _d;
+export const processSyncAction = (syncAction, ev, me, initialSyncOpts, logger) => {
     const isInitialSync = !!initialSyncOpts;
-    const accountSettings = initialSyncOpts === null || initialSyncOpts === void 0 ? void 0 : initialSyncOpts.accountSettings;
-    logger === null || logger === void 0 ? void 0 : logger.trace({ syncAction, initialSync: !!initialSyncOpts }, 'processing sync action');
+    const accountSettings = initialSyncOpts?.accountSettings;
+    logger?.trace({ syncAction, initialSync: !!initialSyncOpts }, 'processing sync action');
     const { syncAction: { value: action }, index: [type, id, msgId, fromMe] } = syncAction;
-    if (action === null || action === void 0 ? void 0 : action.muteAction) {
+    if (action?.muteAction) {
         ev.emit('chats.update', [
             {
                 id,
-                muteEndTime: ((_a = action.muteAction) === null || _a === void 0 ? void 0 : _a.muted)
-                    ? (0, generics_1.toNumber)(action.muteAction.muteEndTimestamp)
-                    : null,
+                muteEndTime: action.muteAction?.muted ? toNumber(action.muteAction.muteEndTimestamp) : null,
                 conditional: getChatUpdateConditional(id, undefined)
             }
         ]);
     }
-    else if ((action === null || action === void 0 ? void 0 : action.archiveChatAction) || type === 'archive' || type === 'unarchive') {
+    else if (action?.archiveChatAction || type === 'archive' || type === 'unarchive') {
         // okay so we've to do some annoying computation here
         // when we're initially syncing the app state
         // there are a few cases we need to handle
@@ -598,36 +594,38 @@ const processSyncAction = (syncAction, ev, me, initialSyncOpts, logger) => {
         //		we compare the timestamp of latest message from the other person to determine this
         // 2. if the account unarchiveChats setting is false -- then it doesn't matter,
         //	it'll always take an app state action to mark in unarchived -- which we'll get anyway
-        const archiveAction = action === null || action === void 0 ? void 0 : action.archiveChatAction;
-        const isArchived = archiveAction
-            ? archiveAction.archived
-            : type === 'archive';
+        const archiveAction = action?.archiveChatAction;
+        const isArchived = archiveAction ? archiveAction.archived : type === 'archive';
         // // basically we don't need to fire an "archive" update if the chat is being marked unarchvied
         // // this only applies for the initial sync
         // if(isInitialSync && !isArchived) {
         // 	isArchived = false
         // }
-        const msgRange = !(accountSettings === null || accountSettings === void 0 ? void 0 : accountSettings.unarchiveChats) ? undefined : archiveAction === null || archiveAction === void 0 ? void 0 : archiveAction.messageRange;
+        const msgRange = !accountSettings?.unarchiveChats ? undefined : archiveAction?.messageRange;
         // logger?.debug({ chat: id, syncAction }, 'message range archive')
-        ev.emit('chats.update', [{
+        ev.emit('chats.update', [
+            {
                 id,
                 archived: isArchived,
                 conditional: getChatUpdateConditional(id, msgRange)
-            }]);
+            }
+        ]);
     }
-    else if (action === null || action === void 0 ? void 0 : action.markChatAsReadAction) {
+    else if (action?.markChatAsReadAction) {
         const markReadAction = action.markChatAsReadAction;
         // basically we don't need to fire an "read" update if the chat is being marked as read
         // because the chat is read by default
         // this only applies for the initial sync
         const isNullUpdate = isInitialSync && markReadAction.read;
-        ev.emit('chats.update', [{
+        ev.emit('chats.update', [
+            {
                 id,
-                unreadCount: isNullUpdate ? null : !!(markReadAction === null || markReadAction === void 0 ? void 0 : markReadAction.read) ? 0 : -1,
-                conditional: getChatUpdateConditional(id, markReadAction === null || markReadAction === void 0 ? void 0 : markReadAction.messageRange)
-            }]);
+                unreadCount: isNullUpdate ? null : !!markReadAction?.read ? 0 : -1,
+                conditional: getChatUpdateConditional(id, markReadAction?.messageRange)
+            }
+        ]);
     }
-    else if ((action === null || action === void 0 ? void 0 : action.deleteMessageForMeAction) || type === 'deleteMessageForMe') {
+    else if (action?.deleteMessageForMeAction || type === 'deleteMessageForMe') {
         ev.emit('messages.delete', {
             keys: [
                 {
@@ -638,32 +636,41 @@ const processSyncAction = (syncAction, ev, me, initialSyncOpts, logger) => {
             ]
         });
     }
-    else if (action === null || action === void 0 ? void 0 : action.contactAction) {
-        ev.emit('contacts.upsert', [{ id, name: action.contactAction.fullName }]);
+    else if (action?.contactAction) {
+        ev.emit('contacts.upsert', [
+            {
+                id: id,
+                name: action.contactAction.fullName,
+                lid: action.contactAction.lidJid || undefined,
+                jid: isJidUser(id) ? id : undefined
+            }
+        ]);
     }
-    else if (action === null || action === void 0 ? void 0 : action.pushNameSetting) {
-        const name = (_b = action === null || action === void 0 ? void 0 : action.pushNameSetting) === null || _b === void 0 ? void 0 : _b.name;
-        if (name && (me === null || me === void 0 ? void 0 : me.name) !== name) {
+    else if (action?.pushNameSetting) {
+        const name = action?.pushNameSetting?.name;
+        if (name && me?.name !== name) {
             ev.emit('creds.update', { me: { ...me, name } });
         }
     }
-    else if (action === null || action === void 0 ? void 0 : action.pinAction) {
-        ev.emit('chats.update', [{
+    else if (action?.pinAction) {
+        ev.emit('chats.update', [
+            {
                 id,
-                pinned: ((_c = action.pinAction) === null || _c === void 0 ? void 0 : _c.pinned) ? (0, generics_1.toNumber)(action.timestamp) : null,
+                pinned: action.pinAction?.pinned ? toNumber(action.timestamp) : null,
                 conditional: getChatUpdateConditional(id, undefined)
-            }]);
+            }
+        ]);
     }
-    else if (action === null || action === void 0 ? void 0 : action.unarchiveChatsSetting) {
+    else if (action?.unarchiveChatsSetting) {
         const unarchiveChats = !!action.unarchiveChatsSetting.unarchiveChats;
         ev.emit('creds.update', { accountSettings: { unarchiveChats } });
-        logger === null || logger === void 0 ? void 0 : logger.info(`archive setting updated => '${action.unarchiveChatsSetting.unarchiveChats}'`);
+        logger?.info(`archive setting updated => '${action.unarchiveChatsSetting.unarchiveChats}'`);
         if (accountSettings) {
             accountSettings.unarchiveChats = unarchiveChats;
         }
     }
-    else if ((action === null || action === void 0 ? void 0 : action.starAction) || type === 'star') {
-        let starred = (_d = action === null || action === void 0 ? void 0 : action.starAction) === null || _d === void 0 ? void 0 : _d.starred;
+    else if (action?.starAction || type === 'star') {
+        let starred = action?.starAction?.starred;
         if (typeof starred !== 'boolean') {
             starred = syncAction.index[syncAction.index.length - 1] === '1';
         }
@@ -674,34 +681,32 @@ const processSyncAction = (syncAction, ev, me, initialSyncOpts, logger) => {
             }
         ]);
     }
-    else if ((action === null || action === void 0 ? void 0 : action.deleteChatAction) || type === 'deleteChat') {
+    else if (action?.deleteChatAction || type === 'deleteChat') {
         if (!isInitialSync) {
             ev.emit('chats.delete', [id]);
         }
     }
-    else if (action === null || action === void 0 ? void 0 : action.labelEditAction) {
+    else if (action?.labelEditAction) {
         const { name, color, deleted, predefinedId } = action.labelEditAction;
         ev.emit('labels.edit', {
-            id,
+            id: id,
             name: name,
             color: color,
             deleted: deleted,
             predefinedId: predefinedId ? String(predefinedId) : undefined
         });
     }
-    else if (action === null || action === void 0 ? void 0 : action.labelAssociationAction) {
+    else if (action?.labelAssociationAction) {
         ev.emit('labels.association', {
-            type: action.labelAssociationAction.labeled
-                ? 'add'
-                : 'remove',
-            association: type === LabelAssociation_1.LabelAssociationType.Chat
+            type: action.labelAssociationAction.labeled ? 'add' : 'remove',
+            association: type === LabelAssociationType.Chat
                 ? {
-                    type: LabelAssociation_1.LabelAssociationType.Chat,
+                    type: LabelAssociationType.Chat,
                     chatId: syncAction.index[2],
                     labelId: syncAction.index[1]
                 }
                 : {
-                    type: LabelAssociation_1.LabelAssociationType.Message,
+                    type: LabelAssociationType.Message,
                     chatId: syncAction.index[2],
                     messageId: syncAction.index[3],
                     labelId: syncAction.index[1]
@@ -709,11 +714,11 @@ const processSyncAction = (syncAction, ev, me, initialSyncOpts, logger) => {
         });
     }
     else {
-        logger === null || logger === void 0 ? void 0 : logger.debug({ syncAction, id }, 'unprocessable update');
+        logger?.debug({ syncAction, id }, 'unprocessable update');
     }
     function getChatUpdateConditional(id, msgRange) {
         return isInitialSync
-            ? (data) => {
+            ? data => {
                 const chat = data.historySets.chats[id] || data.chatUpserts[id];
                 if (chat) {
                     return msgRange ? isValidPatchBasedOnMessageRange(chat, msgRange) : true;
@@ -722,9 +727,9 @@ const processSyncAction = (syncAction, ev, me, initialSyncOpts, logger) => {
             : undefined;
     }
     function isValidPatchBasedOnMessageRange(chat, msgRange) {
-        const lastMsgTimestamp = Number((msgRange === null || msgRange === void 0 ? void 0 : msgRange.lastMessageTimestamp) || (msgRange === null || msgRange === void 0 ? void 0 : msgRange.lastSystemMessageTimestamp) || 0);
-        const chatLastMsgTimestamp = Number((chat === null || chat === void 0 ? void 0 : chat.lastMessageRecvTimestamp) || 0);
+        const lastMsgTimestamp = Number(msgRange?.lastMessageTimestamp || msgRange?.lastSystemMessageTimestamp || 0);
+        const chatLastMsgTimestamp = Number(chat?.lastMessageRecvTimestamp || 0);
         return lastMsgTimestamp >= chatLastMsgTimestamp;
     }
 };
-exports.processSyncAction = processSyncAction;
+//# sourceMappingURL=chat-utils.js.map