@periskope/baileys 7.0.0-alpha-4 → 7.0.0-beta-1

package/lib/Utils/auth-utils.js

@@ -1,7 +1,5 @@
 import NodeCache from '@cacheable/node-cache';
-import { Mutex } from 'async-mutex';
 import { randomBytes } from 'crypto';
-import { LRUCache } from 'lru-cache';
 import { DEFAULT_CACHE_TTLS } from '../Defaults/index.js';
 import { Curve, signedKeyPair } from './crypto.js';
 import { delay, generateRegistrationId } from './generics.js';
@@ -18,197 +16,52 @@ export function makeCacheableSignalKeyStore(store, logger, _cache) {
             useClones: false,
             deleteOnExpire: true
         });
-    // Mutex for protecting cache operations
-    const cacheMutex = new Mutex();
     function getUniqueId(type, id) {
         return `${type}.${id}`;
     }
     return {
         async get(type, ids) {
-            return cacheMutex.runExclusive(async () => {
-                const data = {};
-                const idsToFetch = [];
-                for (const id of ids) {
-                    const item = cache.get(getUniqueId(type, id));
-                    if (typeof item !== 'undefined') {
-                        data[id] = item;
-                    }
-                    else {
-                        idsToFetch.push(id);
-                    }
+            const data = {};
+            const idsToFetch = [];
+            for (const id of ids) {
+                const item = cache.get(getUniqueId(type, id));
+                if (typeof item !== 'undefined') {
+                    data[id] = item;
                 }
-                if (idsToFetch.length) {
-                    logger?.trace({ items: idsToFetch.length }, 'loading from store');
-                    const fetched = await store.get(type, idsToFetch);
-                    for (const id of idsToFetch) {
-                        const item = fetched[id];
-                        if (item) {
-                            data[id] = item;
-                            cache.set(getUniqueId(type, id), item);
-                        }
+                else {
+                    idsToFetch.push(id);
+                }
+            }
+            if (idsToFetch.length) {
+                logger?.trace({ items: idsToFetch.length }, 'loading from store');
+                const fetched = await store.get(type, idsToFetch);
+                for (const id of idsToFetch) {
+                    const item = fetched[id];
+                    if (item) {
+                        data[id] = item;
+                        cache.set(getUniqueId(type, id), item);
                     }
                 }
-                return data;
-            });
+            }
+            return data;
         },
         async set(data) {
-            return cacheMutex.runExclusive(async () => {
-                let keys = 0;
-                for (const type in data) {
-                    for (const id in data[type]) {
-                        await cache.set(getUniqueId(type, id), data[type][id]);
-                        keys += 1;
-                    }
+            let keys = 0;
+            for (const type in data) {
+                for (const id in data[type]) {
+                    cache.set(getUniqueId(type, id), data[type][id]);
+                    keys += 1;
                 }
-                logger?.trace({ keys }, 'updated cache');
-                await store.set(data);
-            });
+            }
+            logger?.trace({ keys }, 'updated cache');
+            await store.set(data);
         },
         async clear() {
-            await cache.flushAll();
+            cache.flushAll();
             await store.clear?.();
         }
     };
 }
-// Module-level specialized mutexes for pre-key operations
-const preKeyMutex = new Mutex();
-const signedPreKeyMutex = new Mutex();
-/**
- * Get the appropriate mutex for the key type
- */
-const getPreKeyMutex = (keyType) => {
-    return keyType === 'signed-pre-key' ? signedPreKeyMutex : preKeyMutex;
-};
-/**
- * Handles pre-key operations with mutex protection
- */
-async function handlePreKeyOperations(data, keyType, transactionCache, mutations, logger, isInTransaction, state) {
-    const mutex = getPreKeyMutex(keyType);
-    await mutex.runExclusive(async () => {
-        const keyData = data[keyType];
-        if (!keyData)
-            return;
-        // Ensure structures exist
-        transactionCache[keyType] = transactionCache[keyType] || {};
-        mutations[keyType] = mutations[keyType] || {};
-        // Separate deletions from updates for batch processing
-        const deletionKeys = [];
-        const updateKeys = [];
-        for (const keyId in keyData) {
-            if (keyData[keyId] === null) {
-                deletionKeys.push(keyId);
-            }
-            else {
-                updateKeys.push(keyId);
-            }
-        }
-        // Process updates first (no validation needed)
-        for (const keyId of updateKeys) {
-            if (transactionCache[keyType]) {
-                transactionCache[keyType][keyId] = keyData[keyId];
-            }
-            if (mutations[keyType]) {
-                mutations[keyType][keyId] = keyData[keyId];
-            }
-        }
-        // Process deletions with validation
-        if (deletionKeys.length === 0)
-            return;
-        if (isInTransaction) {
-            // In transaction, only allow deletion if key exists in cache
-            for (const keyId of deletionKeys) {
-                if (transactionCache[keyType]) {
-                    transactionCache[keyType][keyId] = null;
-                    if (mutations[keyType]) {
-                        // Mark for deletion in mutations
-                        mutations[keyType][keyId] = null;
-                    }
-                }
-                else {
-                    logger.warn(`Skipping deletion of non-existent ${keyType} in transaction: ${keyId}`);
-                }
-            }
-            return;
-        }
-        // Outside transaction, batch validate all deletions
-        if (!state)
-            return;
-        const existingKeys = await state.get(keyType, deletionKeys);
-        for (const keyId of deletionKeys) {
-            if (existingKeys[keyId]) {
-                if (transactionCache[keyType])
-                    transactionCache[keyType][keyId] = null;
-                if (mutations[keyType])
-                    mutations[keyType][keyId] = null;
-            }
-            else {
-                logger.warn(`Skipping deletion of non-existent ${keyType}: ${keyId}`);
-            }
-        }
-    });
-}
-/**
- * Handles normal key operations for transactions
- */
-function handleNormalKeyOperations(data, key, transactionCache, mutations) {
-    Object.assign(transactionCache[key], data[key]);
-    mutations[key] = mutations[key] || {};
-    Object.assign(mutations[key], data[key]);
-}
-/**
- * Process pre-key deletions with validation
- */
-async function processPreKeyDeletions(data, keyType, state, logger) {
-    const mutex = getPreKeyMutex(keyType);
-    await mutex.runExclusive(async () => {
-        const keyData = data[keyType];
-        if (!keyData)
-            return;
-        // Validate deletions
-        for (const keyId in keyData) {
-            if (keyData[keyId] === null) {
-                const existingKeys = await state.get(keyType, [keyId]);
-                if (!existingKeys[keyId]) {
-                    logger.warn(`Skipping deletion of non-existent ${keyType}: ${keyId}`);
-                    if (data[keyType])
-                        delete data[keyType][keyId];
-                }
-            }
-        }
-    });
-}
-/**
- * Executes a function with mutexes acquired for given key types
- * Uses async-mutex's runExclusive with efficient batching
- */
-async function withMutexes(keyTypes, getKeyTypeMutex, fn) {
-    if (keyTypes.length === 0) {
-        return fn();
-    }
-    if (keyTypes.length === 1) {
-        return getKeyTypeMutex(keyTypes[0]).runExclusive(fn);
-    }
-    // For multiple mutexes, sort by key type to prevent deadlocks
-    // Then acquire all mutexes in order using Promise.all for better efficiency
-    const sortedKeyTypes = [...keyTypes].sort();
-    const mutexes = sortedKeyTypes.map(getKeyTypeMutex);
-    // Acquire all mutexes in order to prevent deadlocks
-    const releases = [];
-    try {
-        for (const mutex of mutexes) {
-            releases.push(await mutex.acquire());
-        }
-        return await fn();
-    }
-    finally {
-        // Release in reverse order
-        while (releases.length > 0) {
-            const release = releases.pop();
-            if (release)
-                release();
-        }
-    }
-}
 /**
  * Adds DB like transaction capability (https://en.wikipedia.org/wiki/Database_transaction) to the SignalKeyStore,
  * this allows batch read & write operations & improves the performance of the lib
@@ -222,81 +75,7 @@ export const addTransactionCapability = (state, logger, { maxCommitRetries, dela
     let dbQueriesInTransaction = 0;
     let transactionCache = {};
     let mutations = {};
-    // LRU Cache to hold mutexes for different key types
-    const mutexCache = new LRUCache({
-        ttl: 60 * 60 * 1000, // 1 hour
-        ttlAutopurge: true,
-        updateAgeOnGet: true
-    });
     let transactionsInProgress = 0;
-    function getKeyTypeMutex(type) {
-        return getMutex(`keytype:${type}`);
-    }
-    function getSenderKeyMutex(senderKeyName) {
-        return getMutex(`senderkey:${senderKeyName}`);
-    }
-    function getTransactionMutex(key) {
-        return getMutex(`transaction:${key}`);
-    }
-    // Get or create a mutex for a specific key name
-    function getMutex(key) {
-        let mutex = mutexCache.get(key);
-        if (!mutex) {
-            mutex = new Mutex();
-            mutexCache.set(key, mutex);
-            logger.info({ key }, 'created new mutex');
-        }
-        return mutex;
-    }
-    // Sender key operations with proper mutex sequencing
-    function queueSenderKeyOperation(senderKeyName, operation) {
-        return getSenderKeyMutex(senderKeyName).runExclusive(operation);
-    }
-    // Check if we are currently in a transaction
-    function isInTransaction() {
-        return transactionsInProgress > 0;
-    }
-    // Helper function to handle transaction commit with retries
-    async function commitTransaction() {
-        if (!Object.keys(mutations).length) {
-            logger.trace('no mutations in transaction');
-            return;
-        }
-        logger.trace('committing transaction');
-        let tries = maxCommitRetries;
-        while (tries > 0) {
-            tries -= 1;
-            try {
-                await state.set(mutations);
-                logger.trace({ dbQueriesInTransaction }, 'committed transaction');
-                return;
-            }
-            catch (error) {
-                logger.warn(`failed to commit ${Object.keys(mutations).length} mutations, tries left=${tries}`);
-                if (tries > 0) {
-                    await delay(delayBetweenTriesMs);
-                }
-            }
-        }
-    }
-    // Helper function to clean up transaction state
-    function cleanupTransactionState() {
-        transactionsInProgress -= 1;
-        if (transactionsInProgress === 0) {
-            transactionCache = {};
-            mutations = {};
-            dbQueriesInTransaction = 0;
-        }
-    }
-    // Helper function to execute work within transaction
-    async function executeTransactionWork(work) {
-        const result = await work();
-        // commit if this is the outermost transaction
-        if (transactionsInProgress === 1) {
-            await commitTransaction();
-        }
-        return result;
-    }
     return {
         get: async (type, ids) => {
             if (isInTransaction()) {
@@ -305,30 +84,9 @@ export const addTransactionCapability = (state, logger, { maxCommitRetries, dela
                 // only fetch if there are any items to fetch
                 if (idsRequiringFetch.length) {
                     dbQueriesInTransaction += 1;
-                    // Use per-sender-key queue for sender-key operations when possible
-                    if (type === 'sender-key') {
-                        logger.info({ idsRequiringFetch }, 'processing sender keys in transaction');
-                        // For sender keys, process each one with queued operations to maintain serialization
-                        for (const senderKeyName of idsRequiringFetch) {
-                            await queueSenderKeyOperation(senderKeyName, async () => {
-                                logger.info({ senderKeyName }, 'fetching sender key in transaction');
-                                const result = await state.get(type, [senderKeyName]);
-                                // Update transaction cache
-                                transactionCache[type] || (transactionCache[type] = {});
-                                Object.assign(transactionCache[type], result);
-                                logger.info({ senderKeyName, hasResult: !!result[senderKeyName] }, 'sender key fetch complete');
-                            });
-                        }
-                    }
-                    else {
-                        // Use runExclusive for cleaner mutex handling
-                        await getKeyTypeMutex(type).runExclusive(async () => {
-                            const result = await state.get(type, idsRequiringFetch);
-                            // Update transaction cache
-                            transactionCache[type] || (transactionCache[type] = {});
-                            Object.assign(transactionCache[type], result);
-                        });
-                    }
+                    const result = await state.get(type, idsRequiringFetch);
+                    transactionCache[type] || (transactionCache[type] = {});
+                    Object.assign(transactionCache[type], result);
                 }
                 return ids.reduce((dict, id) => {
                     const value = transactionCache[type]?.[id];
@@ -339,115 +97,73 @@ export const addTransactionCapability = (state, logger, { maxCommitRetries, dela
                 }, {});
             }
             else {
-                // Not in transaction, fetch directly with queue protection
-                if (type === 'sender-key') {
-                    // For sender keys, use individual queues to maintain per-key serialization
-                    const results = {};
-                    for (const senderKeyName of ids) {
-                        const result = await queueSenderKeyOperation(senderKeyName, async () => await state.get(type, [senderKeyName]));
-                        Object.assign(results, result);
-                    }
-                    return results;
-                }
-                else {
-                    return await getKeyTypeMutex(type).runExclusive(() => state.get(type, ids));
-                }
+                return state.get(type, ids);
             }
         },
-        set: async (data) => {
+        set: data => {
             if (isInTransaction()) {
                 logger.trace({ types: Object.keys(data) }, 'caching in transaction');
                 for (const key_ in data) {
                     const key = key_;
                     transactionCache[key] = transactionCache[key] || {};
-                    // Special handling for pre-keys and signed-pre-keys
-                    if (key === 'pre-key') {
-                        await handlePreKeyOperations(data, key, transactionCache, mutations, logger, true);
-                    }
-                    else {
-                        // Normal handling for other key types
-                        handleNormalKeyOperations(data, key, transactionCache, mutations);
-                    }
+                    Object.assign(transactionCache[key], data[key]);
+                    mutations[key] = mutations[key] || {};
+                    Object.assign(mutations[key], data[key]);
                 }
             }
             else {
-                // Not in transaction, apply directly with mutex protection
-                const hasSenderKeys = 'sender-key' in data;
-                const senderKeyNames = hasSenderKeys ? Object.keys(data['sender-key'] || {}) : [];
-                if (hasSenderKeys) {
-                    logger.info({ senderKeyNames }, 'processing sender key set operations');
-                    // Handle sender key operations with per-key queues
-                    for (const senderKeyName of senderKeyNames) {
-                        await queueSenderKeyOperation(senderKeyName, async () => {
-                            // Create data subset for this specific sender key
-                            const senderKeyData = {
-                                'sender-key': {
-                                    [senderKeyName]: data['sender-key'][senderKeyName]
-                                }
-                            };
-                            logger.trace({ senderKeyName }, 'storing sender key');
-                            // Apply changes to the store
-                            await state.set(senderKeyData);
-                            logger.trace({ senderKeyName }, 'sender key stored');
-                        });
-                    }
-                    // Handle any non-sender-key data with regular mutexes
-                    const nonSenderKeyData = { ...data };
-                    delete nonSenderKeyData['sender-key'];
-                    if (Object.keys(nonSenderKeyData).length > 0) {
-                        await withMutexes(Object.keys(nonSenderKeyData), getKeyTypeMutex, async () => {
-                            // Process pre-keys and signed-pre-keys separately with specialized mutexes
-                            for (const key_ in nonSenderKeyData) {
-                                const keyType = key_;
-                                if (keyType === 'pre-key') {
-                                    await processPreKeyDeletions(nonSenderKeyData, keyType, state, logger);
-                                }
-                            }
-                            // Apply changes to the store
-                            await state.set(nonSenderKeyData);
-                        });
-                    }
-                }
-                else {
-                    // No sender keys - use original logic
-                    await withMutexes(Object.keys(data), getKeyTypeMutex, async () => {
-                        // Process pre-keys and signed-pre-keys separately with specialized mutexes
-                        for (const key_ in data) {
-                            const keyType = key_;
-                            if (keyType === 'pre-key') {
-                                await processPreKeyDeletions(data, keyType, state, logger);
-                            }
-                        }
-                        // Apply changes to the store
-                        await state.set(data);
-                    });
-                }
+                return state.set(data);
             }
         },
         isInTransaction,
-        async transaction(work, key) {
-            const releaseTxMutex = await getTransactionMutex(key).acquire();
+        async transaction(work) {
+            let result;
+            transactionsInProgress += 1;
+            if (transactionsInProgress === 1) {
+                logger.trace('entering transaction');
+            }
             try {
-                transactionsInProgress += 1;
+                result = await work();
+                // commit if this is the outermost transaction
                 if (transactionsInProgress === 1) {
-                    logger.trace('entering transaction');
-                }
-                // Release the transaction mutex now that we've updated the counter
-                // This allows other transactions to start preparing
-                releaseTxMutex();
-                try {
-                    return await executeTransactionWork(work);
-                }
-                finally {
-                    cleanupTransactionState();
+                    if (Object.keys(mutations).length) {
+                        logger.trace('committing transaction');
+                        // retry mechanism to ensure we've some recovery
+                        // in case a transaction fails in the first attempt
+                        let tries = maxCommitRetries;
+                        while (tries) {
+                            tries -= 1;
+                            //eslint-disable-next-line max-depth
+                            try {
+                                await state.set(mutations);
+                                logger.trace({ dbQueriesInTransaction }, 'committed transaction');
+                                break;
+                            }
+                            catch (error) {
+                                logger.warn(`failed to commit ${Object.keys(mutations).length} mutations, tries left=${tries}`);
+                                await delay(delayBetweenTriesMs);
+                            }
+                        }
+                    }
+                    else {
+                        logger.trace('no mutations in transaction');
+                    }
                 }
             }
-            catch (error) {
-                releaseTxMutex();
-                throw error;
+            finally {
+                transactionsInProgress -= 1;
+                if (transactionsInProgress === 0) {
+                    transactionCache = {};
+                    mutations = {};
+                    dbQueriesInTransaction = 0;
+                }
             }
+            return result;
         }
     };
+    function isInTransaction() {
+        return transactionsInProgress > 0;
+    }
 };
 export const initAuthCreds = () => {
     const identityKey = Curve.generateKeyPair();

package/lib/Utils/auth-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth-utils.js","sourceRoot":"","sources":["../../src/Utils/auth-utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,uBAAuB,CAAA;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAUhD,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAG1D;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B,CAC1C,KAAqB,EACrB,MAAgB,EAChB,MAAmB;IAEnB,MAAM,KAAK,GACV,MAAM;QACN,IAAI,SAAS,CAA6C;YACzD,MAAM,EAAE,kBAAkB,CAAC,YAAY,EAAE,YAAY;YACrD,SAAS,EAAE,KAAK;YAChB,cAAc,EAAE,IAAI;SACpB,CAAC,CAAA;IAEH,wCAAwC;IACxC,MAAM,UAAU,GAAG,IAAI,KAAK,EAAE,CAAA;IAE9B,SAAS,WAAW,CAAC,IAAY,EAAE,EAAU;QAC5C,OAAO,GAAG,IAAI,IAAI,EAAE,EAAE,CAAA;IACvB,CAAC;IAED,OAAO;QACN,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG;YAClB,OAAO,UAAU,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;gBACzC,MAAM,IAAI,GAAoD,EAAE,CAAA;gBAChE,MAAM,UAAU,GAAa,EAAE,CAAA;gBAC/B,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;oBACtB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAiC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAQ,CAAA;oBACpF,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;wBACjC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;oBAChB,CAAC;yBAAM,CAAC;wBACP,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;oBACpB,CAAC;gBACF,CAAC;gBAED,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;oBACvB,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,EAAE,EAAE,oBAAoB,CAAC,CAAA;oBACjE,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;oBACjD,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;wBAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,CAAA;wBACxB,IAAI,IAAI,EAAE,CAAC;4BACV,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;4BACf,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;wBACvC,CAAC;oBACF,CAAC;gBACF,CAAC;gBAED,OAAO,IAAI,CAAA;YACZ,CAAC,CAAC,CAAA;QACH,CAAC;QACD,KAAK,CAAC,GAAG,CAAC,IAAI;YACb,OAAO,UAAU,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;gBACzC,IAAI,IAAI,GAAG,CAAC,CAAA;gBACZ,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;oBACzB,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,IAA+B,CAAC,EAAE,CAAC;wBACxD,MAAM,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,IAA+B,CAAE,CAAC,EAAE,CAAE,CAAC,CAAA;wBACnF,IAAI,IAAI,CAAC,CAAA;oBACV,CAAC;gBACF,CAAC;gBAED,MAAM,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,eAAe,CAAC,CAAA;gBAExC,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACtB,CAAC,CAAC,CAAA;QACH,CAAC;QACD,KAAK,CAAC,KAAK;YACV,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAA;YACtB,MAAM,KAAK,CAAC,KAAK,EAAE,EAAE,CAAA;QACtB,CAAC;KACD,CAAA;AACF,CAAC;AAED,0DAA0D;AAC1D,MAAM,WAAW,GAAG,IAAI,KAAK,EAAE,CAAA;AAC/B,MAAM,iBAAiB,GAAG,IAAI,KAAK,EAAE,CAAA;AAErC;;GAEG;AACH,MAAM,cAAc,GAAG,CAAC,OAAe,EAAS,EAAE;IACjD,OAAO,OAAO,KAAK,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,WAAW,CAAA;AACtE,CAAC,CAAA;AAED;;GAEG;AACH,KAAK,UAAU,sBAAsB,CACpC,IAAmB,EACnB,OAAgC,EAChC,gBAA+B,EAC/B,SAAwB,EACxB,MAAe,EACf,eAAwB,EACxB,KAAsB;IAEtB,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;IAErC,MAAM,KAAK,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAA;QAC7B,IAAI,CAAC,OAAO;YAAE,OAAM;QAEpB,0BAA0B;QAC1B,gBAAgB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAK,EAAU,CAAA;QACpE,SAAS,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,IAAK,EAAU,CAAA;QAEtD,uDAAuD;QACvD,MAAM,YAAY,GAAa,EAAE,CAAA;QACjC,MAAM,UAAU,GAAa,EAAE,CAAA;QAE/B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC7B,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACzB,CAAC;iBAAM,CAAC;gBACP,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACvB,CAAC;QACF,CAAC;QAED,+CAA+C;QAC/C,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;YAChC,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC/B,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAE,CAAA;YACnD,CAAC;YAED,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;gBACxB,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAE,CAAA;YAC5C,CAAC;QACF,CAAC;QAED,oCAAoC;QACpC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAAE,OAAM;QAErC,IAAI,eAAe,EAAE,CAAC;YACrB,6DAA6D;YAC7D,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;gBAClC,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC/B,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;oBACvC,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;wBACxB,iCAAiC;wBACjC,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;oBACjC,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,MAAM,CAAC,IAAI,CAAC,qCAAqC,OAAO,oBAAoB,KAAK,EAAE,CAAC,CAAA;gBACrF,CAAC;YACF,CAAC;YAED,OAAM;QACP,CAAC;QAED,oDAAoD;QACpD,IAAI,CAAC,KAAK;YAAE,OAAM;QAElB,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;QAC3D,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;YAClC,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzB,IAAI,gBAAgB,CAAC,OAAO,CAAC;oBAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;gBAEtE,IAAI,SAAS,CAAC,OAAO,CAAC;oBAAE,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;YACzD,CAAC;iBAAM,CAAC;gBACP,MAAM,CAAC,IAAI,CAAC,qCAAqC,OAAO,KAAK,KAAK,EAAE,CAAC,CAAA;YACtE,CAAC;QACF,CAAC;IACF,CAAC,CAAC,CAAA;AACH,CAAC;AAED;;GAEG;AACH,SAAS,yBAAyB,CACjC,IAAmB,EACnB,GAA4B,EAC5B,gBAA+B,EAC/B,SAAwB;IAExB,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IAChD,SAAS,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,IAAK,EAAU,CAAA;IAC9C,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;AAC1C,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,sBAAsB,CACpC,IAAmB,EACnB,OAAgC,EAChC,KAAqB,EACrB,MAAe;IAEf,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;IAErC,MAAM,KAAK,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAA;QAC7B,IAAI,CAAC,OAAO;YAAE,OAAM;QAEpB,qBAAqB;QACrB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC7B,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;gBACtD,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC1B,MAAM,CAAC,IAAI,CAAC,qCAAqC,OAAO,KAAK,KAAK,EAAE,CAAC,CAAA;oBAErE,IAAI,IAAI,CAAC,OAAO,CAAC;wBAAE,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAA;gBAC/C,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC,CAAC,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,WAAW,CACzB,QAAkB,EAClB,eAAwC,EACxC,EAAoB;IAEpB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,EAAE,EAAE,CAAA;IACZ,CAAC;IAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;IACtD,CAAC;IAED,8DAA8D;IAC9D,4EAA4E;IAC5E,MAAM,cAAc,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAA;IAC3C,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAEnD,oDAAoD;IACpD,MAAM,QAAQ,GAAmB,EAAE,CAAA;IAEnC,IAAI,CAAC;QACJ,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC7B,QAAQ,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QACrC,CAAC;QAED,OAAO,MAAM,EAAE,EAAE,CAAA;IAClB,CAAC;YAAS,CAAC;QACV,2BAA2B;QAC3B,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAA;YAC9B,IAAI,OAAO;gBAAE,OAAO,EAAE,CAAA;QACvB,CAAC;IACF,CAAC;AACF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACvC,KAAqB,EACrB,MAAe,EACf,EAAE,gBAAgB,EAAE,mBAAmB,EAAgC,EACvC,EAAE;IAClC,0DAA0D;IAC1D,kCAAkC;IAClC,IAAI,sBAAsB,GAAG,CAAC,CAAA;IAC9B,IAAI,gBAAgB,GAAkB,EAAE,CAAA;IACxC,IAAI,SAAS,GAAkB,EAAE,CAAA;IAEjC,oDAAoD;IACpD,MAAM,UAAU,GAAG,IAAI,QAAQ,CAAgB;QAC9C,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,SAAS;QAC9B,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE,IAAI;KACpB,CAAC,CAAA;IAEF,IAAI,sBAAsB,GAAG,CAAC,CAAA;IAE9B,SAAS,eAAe,CAAC,IAAY;QACpC,OAAO,QAAQ,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;IACnC,CAAC;IAED,SAAS,iBAAiB,CAAC,aAAqB;QAC/C,OAAO,QAAQ,CAAC,aAAa,aAAa,EAAE,CAAC,CAAA;IAC9C,CAAC;IAED,SAAS,mBAAmB,CAAC,GAAW;QACvC,OAAO,QAAQ,CAAC,eAAe,GAAG,EAAE,CAAC,CAAA;IACtC,CAAC;IAED,gDAAgD;IAChD,SAAS,QAAQ,CAAC,GAAW;QAC5B,IAAI,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,KAAK,GAAG,IAAI,KAAK,EAAE,CAAA;YACnB,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;YAC1B,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAA;QAC1C,CAAC;QAED,OAAO,KAAK,CAAA;IACb,CAAC;IAED,qDAAqD;IACrD,SAAS,uBAAuB,CAAI,aAAqB,EAAE,SAA2B;QACrF,OAAO,iBAAiB,CAAC,aAAa,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;IAChE,CAAC;IAED,6CAA6C;IAC7C,SAAS,eAAe;QACvB,OAAO,sBAAsB,GAAG,CAAC,CAAA;IAClC,CAAC;IAED,4DAA4D;IAC5D,KAAK,UAAU,iBAAiB;QAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;YACpC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;YAC3C,OAAM;QACP,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;QACtC,IAAI,KAAK,GAAG,gBAAgB,CAAA;QAE5B,OAAO,KAAK,GAAG,CAAC,EAAE,CAAC;YAClB,KAAK,IAAI,CAAC,CAAA;YACV,IAAI,CAAC;gBACJ,MAAM,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;gBAC1B,MAAM,CAAC,KAAK,CAAC,EAAE,sBAAsB,EAAE,EAAE,uBAAuB,CAAC,CAAA;gBACjE,OAAM;YACP,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,CAAC,IAAI,CAAC,oBAAoB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,0BAA0B,KAAK,EAAE,CAAC,CAAA;gBAC/F,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;oBACf,MAAM,KAAK,CAAC,mBAAmB,CAAC,CAAA;gBACjC,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;IAED,gDAAgD;IAChD,SAAS,uBAAuB;QAC/B,sBAAsB,IAAI,CAAC,CAAA;QAC3B,IAAI,sBAAsB,KAAK,CAAC,EAAE,CAAC;YAClC,gBAAgB,GAAG,EAAE,CAAA;YACrB,SAAS,GAAG,EAAE,CAAA;YACd,sBAAsB,GAAG,CAAC,CAAA;QAC3B,CAAC;IACF,CAAC;IAED,qDAAqD;IACrD,KAAK,UAAU,sBAAsB,CAAC,IAAwB;QAC7D,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAA;QAE3B,8CAA8C;QAC9C,IAAI,sBAAsB,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,iBAAiB,EAAE,CAAA;QAC1B,CAAC;QAED,OAAO,MAAM,CAAA;IACd,CAAC;IAED,OAAO;QACN,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;YACxB,IAAI,eAAe,EAAE,EAAE,CAAC;gBACvB,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;gBACnC,MAAM,iBAAiB,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;gBAC5F,6CAA6C;gBAC7C,IAAI,iBAAiB,CAAC,MAAM,EAAE,CAAC;oBAC9B,sBAAsB,IAAI,CAAC,CAAA;oBAE3B,mEAAmE;oBACnE,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;wBAC3B,MAAM,CAAC,IAAI,CAAC,EAAE,iBAAiB,EAAE,EAAE,uCAAuC,CAAC,CAAA;wBAC3E,qFAAqF;wBACrF,KAAK,MAAM,aAAa,IAAI,iBAAiB,EAAE,CAAC;4BAC/C,MAAM,uBAAuB,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;gCACvD,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,EAAE,EAAE,oCAAoC,CAAC,CAAA;gCACpE,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;gCACrD,2BAA2B;gCAC3B,gBAAgB,CAAC,IAAI,MAArB,gBAAgB,CAAC,IAAI,IAAM,EAAE,EAAA;gCAC7B,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAE,EAAE,MAAM,CAAC,CAAA;gCAC9C,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,EAAE,2BAA2B,CAAC,CAAA;4BAChG,CAAC,CAAC,CAAA;wBACH,CAAC;oBACF,CAAC;yBAAM,CAAC;wBACP,8CAA8C;wBAC9C,MAAM,eAAe,CAAC,IAAc,CAAC,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;4BAC7D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;4BAEvD,2BAA2B;4BAC3B,gBAAgB,CAAC,IAAI,MAArB,gBAAgB,CAAC,IAAI,IAAM,EAAE,EAAA;4BAC7B,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAE,EAAE,MAAM,CAAC,CAAA;wBAC/C,CAAC,CAAC,CAAA;oBACH,CAAC;gBACF,CAAC;gBAED,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,IAA4B,EAAE,EAAE,EAAE,EAAE;oBACtD,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;oBAC1C,IAAI,KAAK,EAAE,CAAC;wBACX,IAAI,CAAC,EAAE,CAAC,GAAG,KAAK,CAAA;oBACjB,CAAC;oBAED,OAAO,IAAI,CAAA;gBACZ,CAAC,EAAE,EAAE,CAAC,CAAA;YACP,CAAC;iBAAM,CAAC;gBACP,2DAA2D;gBAC3D,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;oBAC3B,2EAA2E;oBAC3E,MAAM,OAAO,GAAsD,EAAE,CAAA;oBACrE,KAAK,MAAM,aAAa,IAAI,GAAG,EAAE,CAAC;wBACjC,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAC3C,aAAa,EACb,KAAK,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC,CAAC,CAClD,CAAA;wBACD,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;oBAC/B,CAAC;oBAED,OAAO,OAAO,CAAA;gBACf,CAAC;qBAAM,CAAC;oBACP,OAAO,MAAM,eAAe,CAAC,IAAc,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAA;gBACtF,CAAC;YACF,CAAC;QACF,CAAC;QACD,GAAG,EAAE,KAAK,EAAC,IAAI,EAAC,EAAE;YACjB,IAAI,eAAe,EAAE,EAAE,CAAC;gBACvB,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,wBAAwB,CAAC,CAAA;gBACpE,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;oBACzB,MAAM,GAAG,GAAG,IAA+B,CAAA;oBAC3C,gBAAgB,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAK,EAAU,CAAA;oBAE5D,oDAAoD;oBACpD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;wBACvB,MAAM,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;oBACnF,CAAC;yBAAM,CAAC;wBACP,sCAAsC;wBACtC,yBAAyB,CAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAA;oBAClE,CAAC;gBACF,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,2DAA2D;gBAC3D,MAAM,aAAa,GAAG,YAAY,IAAI,IAAI,CAAA;gBAC1C,MAAM,cAAc,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;gBAEjF,IAAI,aAAa,EAAE,CAAC;oBACnB,MAAM,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,EAAE,sCAAsC,CAAC,CAAA;oBACvE,mDAAmD;oBACnD,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;wBAC5C,MAAM,uBAAuB,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;4BACvD,kDAAkD;4BAClD,MAAM,aAAa,GAAG;gCACrB,YAAY,EAAE;oCACb,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,YAAY,CAAE,CAAC,aAAa,CAAC;iCACnD;6BACD,CAAA;4BAED,MAAM,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,EAAE,oBAAoB,CAAC,CAAA;4BACrD,6BAA6B;4BAC7B,MAAM,KAAK,CAAC,GAAG,CAAC,aAA8B,CAAC,CAAA;4BAC/C,MAAM,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,EAAE,mBAAmB,CAAC,CAAA;wBACrD,CAAC,CAAC,CAAA;oBACH,CAAC;oBAED,sDAAsD;oBACtD,MAAM,gBAAgB,GAAG,EAAE,GAAG,IAAI,EAAE,CAAA;oBACpC,OAAO,gBAAgB,CAAC,YAAY,CAAC,CAAA;oBAErC,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC9C,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,eAAe,EAAE,KAAK,IAAI,EAAE;4BAC5E,2EAA2E;4BAC3E,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE,CAAC;gCACrC,MAAM,OAAO,GAAG,IAA+B,CAAA;gCAC/C,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;oCAC3B,MAAM,sBAAsB,CAAC,gBAAgB,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;gCACvE,CAAC;4BACF,CAAC;4BAED,6BAA6B;4BAC7B,MAAM,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;wBAClC,CAAC,CAAC,CAAA;oBACH,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,sCAAsC;oBACtC,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,KAAK,IAAI,EAAE;wBAChE,2EAA2E;wBAC3E,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;4BACzB,MAAM,OAAO,GAAG,IAA+B,CAAA;4BAC/C,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gCAC3B,MAAM,sBAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;4BAC3D,CAAC;wBACF,CAAC;wBAED,6BAA6B;wBAC7B,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;oBACtB,CAAC,CAAC,CAAA;gBACH,CAAC;YACF,CAAC;QACF,CAAC;QACD,eAAe;QACf,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG;YAC1B,MAAM,cAAc,GAAG,MAAM,mBAAmB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAA;YAE/D,IAAI,CAAC;gBACJ,sBAAsB,IAAI,CAAC,CAAA;gBAC3B,IAAI,sBAAsB,KAAK,CAAC,EAAE,CAAC;oBAClC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;gBACrC,CAAC;gBAED,mEAAmE;gBACnE,oDAAoD;gBACpD,cAAc,EAAE,CAAA;gBAEhB,IAAI,CAAC;oBACJ,OAAO,MAAM,sBAAsB,CAAC,IAAI,CAAC,CAAA;gBAC1C,CAAC;wBAAS,CAAC;oBACV,uBAAuB,EAAE,CAAA;gBAC1B,CAAC;YACF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,cAAc,EAAE,CAAA;gBAChB,MAAM,KAAK,CAAA;YACZ,CAAC;QACF,CAAC;KACD,CAAA;AACF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,GAAwB,EAAE;IACtD,MAAM,WAAW,GAAG,KAAK,CAAC,eAAe,EAAE,CAAA;IAC3C,OAAO;QACN,QAAQ,EAAE,KAAK,CAAC,eAAe,EAAE;QACjC,uBAAuB,EAAE,KAAK,CAAC,eAAe,EAAE;QAChD,iBAAiB,EAAE,WAAW;QAC9B,YAAY,EAAE,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC;QAC3C,cAAc,EAAE,sBAAsB,EAAE;QACxC,YAAY,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAChD,wBAAwB,EAAE,EAAE;QAC5B,YAAY,EAAE,CAAC;QACf,uBAAuB,EAAE,CAAC;QAC1B,kBAAkB,EAAE,CAAC;QACrB,eAAe,EAAE;YAChB,cAAc,EAAE,KAAK;SACrB;QACD,UAAU,EAAE,KAAK;QACjB,WAAW,EAAE,SAAS;QACtB,YAAY,EAAE,SAAS;QACvB,WAAW,EAAE,SAAS;KACtB,CAAA;AACF,CAAC,CAAA"}
+{"version":3,"file":"auth-utils.js","sourceRoot":"","sources":["../../src/Utils/auth-utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,uBAAuB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAUhD,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAG1D;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B,CAC1C,KAAqB,EACrB,MAAgB,EAChB,MAAmB;IAEnB,MAAM,KAAK,GACV,MAAM;QACN,IAAI,SAAS,CAA6C;YACzD,MAAM,EAAE,kBAAkB,CAAC,YAAY,EAAE,YAAY;YACrD,SAAS,EAAE,KAAK;YAChB,cAAc,EAAE,IAAI;SACpB,CAAC,CAAA;IAEH,SAAS,WAAW,CAAC,IAAY,EAAE,EAAU;QAC5C,OAAO,GAAG,IAAI,IAAI,EAAE,EAAE,CAAA;IACvB,CAAC;IAED,OAAO;QACN,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG;YAClB,MAAM,IAAI,GAAoD,EAAE,CAAA;YAChE,MAAM,UAAU,GAAa,EAAE,CAAA;YAC/B,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;gBACtB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAiC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAQ,CAAA;gBACpF,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;oBACjC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;gBAChB,CAAC;qBAAM,CAAC;oBACP,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;gBACpB,CAAC;YACF,CAAC;YAED,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;gBACvB,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,EAAE,EAAE,oBAAoB,CAAC,CAAA;gBACjE,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;gBACjD,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;oBAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,CAAA;oBACxB,IAAI,IAAI,EAAE,CAAC;wBACV,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;wBACf,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;oBACvC,CAAC;gBACF,CAAC;YACF,CAAC;YAED,OAAO,IAAI,CAAA;QACZ,CAAC;QACD,KAAK,CAAC,GAAG,CAAC,IAAI;YACb,IAAI,IAAI,GAAG,CAAC,CAAA;YACZ,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;gBACzB,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,IAA+B,CAAC,EAAE,CAAC;oBACxD,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,IAA+B,CAAE,CAAC,EAAE,CAAE,CAAC,CAAA;oBAC7E,IAAI,IAAI,CAAC,CAAA;gBACV,CAAC;YACF,CAAC;YAED,MAAM,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,eAAe,CAAC,CAAA;YAExC,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACtB,CAAC;QACD,KAAK,CAAC,KAAK;YACV,KAAK,CAAC,QAAQ,EAAE,CAAA;YAChB,MAAM,KAAK,CAAC,KAAK,EAAE,EAAE,CAAA;QACtB,CAAC;KACD,CAAA;AACF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACvC,KAAqB,EACrB,MAAe,EACf,EAAE,gBAAgB,EAAE,mBAAmB,EAAgC,EACvC,EAAE;IAClC,0DAA0D;IAC1D,kCAAkC;IAClC,IAAI,sBAAsB,GAAG,CAAC,CAAA;IAC9B,IAAI,gBAAgB,GAAkB,EAAE,CAAA;IACxC,IAAI,SAAS,GAAkB,EAAE,CAAA;IAEjC,IAAI,sBAAsB,GAAG,CAAC,CAAA;IAE9B,OAAO;QACN,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;YACxB,IAAI,eAAe,EAAE,EAAE,CAAC;gBACvB,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;gBACnC,MAAM,iBAAiB,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;gBAC5F,6CAA6C;gBAC7C,IAAI,iBAAiB,CAAC,MAAM,EAAE,CAAC;oBAC9B,sBAAsB,IAAI,CAAC,CAAA;oBAC3B,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;oBAEvD,gBAAgB,CAAC,IAAI,MAArB,gBAAgB,CAAC,IAAI,IAAM,EAAE,EAAA;oBAC7B,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAE,EAAE,MAAM,CAAC,CAAA;gBAC/C,CAAC;gBAED,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,IAA4B,EAAE,EAAE,EAAE,EAAE;oBACtD,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;oBAC1C,IAAI,KAAK,EAAE,CAAC;wBACX,IAAI,CAAC,EAAE,CAAC,GAAG,KAAK,CAAA;oBACjB,CAAC;oBAED,OAAO,IAAI,CAAA;gBACZ,CAAC,EAAE,EAAE,CAAC,CAAA;YACP,CAAC;iBAAM,CAAC;gBACP,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;YAC5B,CAAC;QACF,CAAC;QACD,GAAG,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,eAAe,EAAE,EAAE,CAAC;gBACvB,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,wBAAwB,CAAC,CAAA;gBACpE,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;oBACzB,MAAM,GAAG,GAAG,IAA+B,CAAA;oBAC3C,gBAAgB,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAK,EAAU,CAAA;oBAC5D,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;oBAEhD,SAAS,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,IAAK,EAAU,CAAA;oBAC9C,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;gBAC1C,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACvB,CAAC;QACF,CAAC;QACD,eAAe;QACf,KAAK,CAAC,WAAW,CAAC,IAAI;YACrB,IAAI,MAAwC,CAAA;YAC5C,sBAAsB,IAAI,CAAC,CAAA;YAC3B,IAAI,sBAAsB,KAAK,CAAC,EAAE,CAAC;gBAClC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;YACrC,CAAC;YAED,IAAI,CAAC;gBACJ,MAAM,GAAG,MAAM,IAAI,EAAE,CAAA;gBACrB,8CAA8C;gBAC9C,IAAI,sBAAsB,KAAK,CAAC,EAAE,CAAC;oBAClC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;wBACnC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;wBACtC,gDAAgD;wBAChD,mDAAmD;wBACnD,IAAI,KAAK,GAAG,gBAAgB,CAAA;wBAC5B,OAAO,KAAK,EAAE,CAAC;4BACd,KAAK,IAAI,CAAC,CAAA;4BACV,oCAAoC;4BACpC,IAAI,CAAC;gCACJ,MAAM,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;gCAC1B,MAAM,CAAC,KAAK,CAAC,EAAE,sBAAsB,EAAE,EAAE,uBAAuB,CAAC,CAAA;gCACjE,MAAK;4BACN,CAAC;4BAAC,OAAO,KAAK,EAAE,CAAC;gCAChB,MAAM,CAAC,IAAI,CAAC,oBAAoB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,0BAA0B,KAAK,EAAE,CAAC,CAAA;gCAC/F,MAAM,KAAK,CAAC,mBAAmB,CAAC,CAAA;4BACjC,CAAC;wBACF,CAAC;oBACF,CAAC;yBAAM,CAAC;wBACP,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;oBAC5C,CAAC;gBACF,CAAC;YACF,CAAC;oBAAS,CAAC;gBACV,sBAAsB,IAAI,CAAC,CAAA;gBAC3B,IAAI,sBAAsB,KAAK,CAAC,EAAE,CAAC;oBAClC,gBAAgB,GAAG,EAAE,CAAA;oBACrB,SAAS,GAAG,EAAE,CAAA;oBACd,sBAAsB,GAAG,CAAC,CAAA;gBAC3B,CAAC;YACF,CAAC;YAED,OAAO,MAAM,CAAA;QACd,CAAC;KACD,CAAA;IAED,SAAS,eAAe;QACvB,OAAO,sBAAsB,GAAG,CAAC,CAAA;IAClC,CAAC;AACF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,GAAwB,EAAE;IACtD,MAAM,WAAW,GAAG,KAAK,CAAC,eAAe,EAAE,CAAA;IAC3C,OAAO;QACN,QAAQ,EAAE,KAAK,CAAC,eAAe,EAAE;QACjC,uBAAuB,EAAE,KAAK,CAAC,eAAe,EAAE;QAChD,iBAAiB,EAAE,WAAW;QAC9B,YAAY,EAAE,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC;QAC3C,cAAc,EAAE,sBAAsB,EAAE;QACxC,YAAY,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAChD,wBAAwB,EAAE,EAAE;QAC5B,YAAY,EAAE,CAAC;QACf,uBAAuB,EAAE,CAAC;QAC1B,kBAAkB,EAAE,CAAC;QACrB,eAAe,EAAE;YAChB,cAAc,EAAE,KAAK;SACrB;QACD,UAAU,EAAE,KAAK;QACjB,WAAW,EAAE,SAAS;QACtB,YAAY,EAAE,SAAS;QACvB,WAAW,EAAE,SAAS;KACtB,CAAA;AACF,CAAC,CAAA"}

package/lib/Utils/chat-utils.d.ts

@@ -13,7 +13,7 @@ export declare const encodeSyncdPatch: ({ type, index, syncAction, apiVersion, o
     state: LTHashState;
 }>;
 export declare const decodeSyncdMutations: (msgMutations: (proto.ISyncdMutation | proto.ISyncdRecord)[], initialState: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey, onMutation: (mutation: ChatMutation) => void, validateMacs: boolean) => Promise<{
-    hash: Buffer<ArrayBuffer>;
+    hash: Buffer<ArrayBufferLike>;
     indexValueMap: {
         [indexMacBase64: string]: {
             valueMac: Uint8Array | Buffer;
@@ -21,7 +21,7 @@ export declare const decodeSyncdMutations: (msgMutations: (proto.ISyncdMutation
     };
 }>;
 export declare const decodeSyncdPatch: (msg: proto.ISyncdPatch, name: WAPatchName, initialState: LTHashState, getAppStateSyncKey: FetchAppStateSyncKey, onMutation: (mutation: ChatMutation) => void, validateMacs: boolean) => Promise<{
-    hash: Buffer<ArrayBuffer>;
+    hash: Buffer<ArrayBufferLike>;
     indexValueMap: {
         [indexMacBase64: string]: {
             valueMac: Uint8Array | Buffer;

package/lib/Utils/chat-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-utils.d.ts","sourceRoot":"","sources":["../../src/Utils/chat-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC9C,OAAO,KAAK,EACX,mBAAmB,EAEnB,gBAAgB,EAChB,YAAY,EAEZ,OAAO,EACP,0BAA0B,EAE1B,WAAW,EACX,aAAa,EACb,WAAW,EACX,MAAM,UAAU,CAAA;AAMjB,OAAO,EAAE,KAAK,UAAU,EAA4E,MAAM,aAAa,CAAA;AAGvH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAIvC,KAAK,oBAAoB,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,oBAAoB,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;AAE7G,MAAM,MAAM,eAAe,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,CAAA;CAAE,CAAA;AA4G/D,eAAO,MAAM,cAAc,QAAO,WAA2E,CAAA;AAE7G,eAAO,MAAM,gBAAgB,GAC5B,oDAAoD,aAAa,EACjE,iBAAiB,MAAM,EACvB,OAAO,WAAW,EAClB,oBAAoB,oBAAoB;;;EA2DxC,CAAA;AAED,eAAO,MAAM,oBAAoB,GAChC,cAAc,CAAC,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC,YAAY,CAAC,EAAE,EAC3D,cAAc,WAAW,EACzB,oBAAoB,oBAAoB,EACxC,YAAY,CAAC,QAAQ,EAAE,YAAY,KAAK,IAAI,EAC5C,cAAc,OAAO;;;;;;;EA0DrB,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC5B,KAAK,KAAK,CAAC,WAAW,EACtB,MAAM,WAAW,EACjB,cAAc,WAAW,EACzB,oBAAoB,oBAAoB,EACxC,YAAY,CAAC,QAAQ,EAAE,YAAY,KAAK,IAAI,EAC5C,cAAc,OAAO;;;;;;;EA0BrB,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAU,QAAQ,UAAU,EAAE,SAAS,kBAAkB,CAAC,EAAE,CAAC;;iBAK5D,KAAK,CAAC,WAAW,EAAE;wBAAkB,OAAO;mBAAa,KAAK,CAAC,cAAc;;;iBAA7E,KAAK,CAAC,WAAW,EAAE;wBAAkB,OAAO;mBAAa,KAAK,CAAC,cAAc;;;iBAA7E,KAAK,CAAC,WAAW,EAAE;wBAAkB,OAAO;mBAAa,KAAK,CAAC,cAAc;;;iBAA7E,KAAK,CAAC,WAAW,EAAE;wBAAkB,OAAO;mBAAa,KAAK,CAAC,cAAc;;;iBAA7E,KAAK,CAAC,WAAW,EAAE;wBAAkB,OAAO;mBAAa,KAAK,CAAC,cAAc;;EA6C7G,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAU,MAAM,KAAK,CAAC,sBAAsB,EAAE,SAAS,kBAAkB,CAAC,EAAE,CAAC,iCAQ7G,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAU,MAAM,KAAK,CAAC,sBAAsB,EAAE,SAAS,kBAAkB,CAAC,EAAE,CAAC,kCAI9G,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC/B,MAAM,WAAW,EACjB,UAAU,KAAK,CAAC,cAAc,EAC9B,oBAAoB,oBAAoB,EACxC,sBAAsB,MAAM,GAAG,SAAS,EACxC,sBAAmB;;;EAyCnB,CAAA;AAED,eAAO,MAAM,aAAa,GACzB,MAAM,WAAW,EACjB,QAAQ,KAAK,CAAC,WAAW,EAAE,EAC3B,SAAS,WAAW,EACpB,oBAAoB,oBAAoB,EACxC,SAAS,kBAAkB,CAAC,EAAE,CAAC,EAC/B,uBAAuB,MAAM,EAC7B,SAAS,OAAO,EAChB,sBAAmB;;;EA2DnB,CAAA;AAED,eAAO,MAAM,0BAA0B,GAAI,KAAK,gBAAgB,EAAE,KAAK,MAAM,kBAyQ5E,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC7B,YAAY,YAAY,EACxB,IAAI,mBAAmB,EACvB,IAAI,OAAO,EACX,kBAAkB,0BAA0B,EAC5C,SAAS,OAAO,SA8KhB,CAAA"}
+{"version":3,"file":"chat-utils.d.ts","sourceRoot":"","sources":["../../src/Utils/chat-utils.ts"],"names":[],"mappings":"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"}

package/lib/Utils/chat-utils.js

@@ -1,7 +1,7 @@
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto/index.js';
 import { LabelAssociationType } from '../Types/LabelAssociation.js';
-import { getBinaryNodeChild, getBinaryNodeChildren, isJidGroup, jidNormalizedUser } from '../WABinary/index.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';
@@ -670,7 +670,7 @@ export const processSyncAction = (syncAction, ev, me, initialSyncOpts, logger) =
                 id: id,
                 name: action.contactAction.fullName,
                 lid: action.contactAction.lidJid || undefined,
-                phoneNumber: action.contactAction.pnJid || undefined
+                jid: isJidUser(id) ? id : undefined
             }
         ]);
     }