@jkt48connect-corp/baileys 7.3.2 → 7.3.3

package/lib/Utils/messages.js

@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertMediaContent = exports.downloadMediaMessage = exports.aggregateMessageKeysNotFromMe = exports.updateMessageWithPollUpdate = exports.updateMessageWithReaction = exports.updateMessageWithReceipt = exports.getDevice = exports.extractMessageContent = exports.normalizeMessageContent = exports.getContentType = exports.generateWAMessage = exports.generateWAMessageFromContent = exports.generateWAMessageContent = exports.generateForwardMessageContent = exports.prepareDisappearingMessageSettingContent = exports.prepareWAMessageMedia = exports.generateLinkPreviewIfRequired = exports.extractUrlFromText = void 0;
-exports.getAggregateVotesInPollMessage = getAggregateVotesInPollMessage;
+exports.assertMediaContent = exports.downloadMediaMessage = exports.aggregateMessageKeysNotFromMe = exports.getAggregateVotesInPollMessage = exports.updateMessageWithPollUpdate = exports.updateMessageWithReaction = exports.updateMessageWithReceipt = exports.getDevice = exports.extractMessageContent = exports.normalizeMessageContent = exports.getContentType = exports.generateWAMessage = exports.generateWAMessageFromContent = exports.generateWAMessageContent = exports.generateForwardMessageContent = exports.prepareDisappearingMessageSettingContent = exports.prepareWAMessageMedia = exports.generateLinkPreviewIfRequired = exports.extractUrlFromText = void 0;
 const boom_1 = require("@hapi/boom");
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = require("crypto");
@@ -272,8 +271,8 @@ const generateForwardMessageContent = (message, forceForward) => {
 };
 exports.generateForwardMessageContent = generateForwardMessageContent;
 const generateWAMessageContent = async (message, options) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    var _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
+    var _6, _7;
     let m = {};
     if ('text' in message) {
         const extContent = { text: message.text };
@@ -321,6 +320,15 @@ const generateWAMessageContent = async (message, options) => {
     }
     else if ('location' in message) {
         m.locationMessage = Types_1.WAProto.Message.LocationMessage.fromObject(message.location);
+        if ('contextInfo' in message && !!message.contextInfo) {
+            m.locationMessage.contextInfo = message.contextInfo;
+        }
+    }
+    else if ('liveLocation' in message) {
+        m.liveLocationMessage = Types_1.WAProto.Message.LiveLocationMessage.fromObject(message.liveLocation);
+        if ('contextInfo' in message && !!message.contextInfo) {
+            m.liveLocationMessage.contextInfo = message.contextInfo;
+        }
     }
     else if ('react' in message) {
         if (!message.react.senderTimestampMs) {
@@ -350,16 +358,26 @@ const generateWAMessageContent = async (message, options) => {
         m.groupInviteMessage.caption = message.groupInvite.text;
         m.groupInviteMessage.groupJid = message.groupInvite.jid;
         m.groupInviteMessage.groupName = message.groupInvite.subject;
+        m.groupInviteMessage.jpegThumbnail = message.groupInvite.thumbnail;
         //TODO: use built-in interface and get disappearing mode info etc.
         //TODO: cache / use store!?
         if (options.getProfilePicUrl) {
-            const pfpUrl = await options.getProfilePicUrl(message.groupInvite.jid, 'preview');
+            let pfpUrl;
+            try {
+                pfpUrl = await options.getProfilePicUrl(message.groupInvite.jid, 'preview');
+            }
+            catch (_8) {
+                pfpUrl = null;
+            }
             if (pfpUrl) {
                 const resp = await axios_1.default.get(pfpUrl, { responseType: 'arraybuffer' });
                 if (resp.status === 200) {
                     m.groupInviteMessage.jpegThumbnail = resp.data;
                 }
             }
+            else {
+                m.groupInviteMessage.jpegThumbnail = null;
+            }
         }
     }
     else if ('pin' in message) {
@@ -407,6 +425,19 @@ const generateWAMessageContent = async (message, options) => {
                     type: WAProto_1.proto.Message.ButtonsResponseMessage.Type.DISPLAY_TEXT,
                 };
                 break;
+            case 'interactive':
+                m.interactiveResponseMessage = {
+                    body: {
+                        text: message.buttonReply.text,
+                        format: WAProto_1.proto.Message.InteractiveResponseMessage.Body.Format.EXTENSIONS_1
+                    },
+                    nativeFlowResponseMessage: {
+                        name: message.buttonReply.nativeFlow.name,
+                        paramsJson: message.buttonReply.nativeFlow.paramsJson,
+                        version: message.buttonReply.nativeFlow.version
+                    }
+                };
+                break;
         }
     }
     else if ('product' in message) {
@@ -418,6 +449,12 @@ const generateWAMessageContent = async (message, options) => {
                 productImage: imageMessage,
             }
         });
+        if ('contextInfo' in message && !!message.contextInfo) {
+            m.productMessage.contextInfo = message.contextInfo;
+        }
+        if ('mentions' in message && !!message.mentions) {
+            m.productMessage.contextInfo = { mentionedJid: message.mentions };
+        }
     }
     else if ('order' in message) {
         m.orderMessage = Types_1.WAProto.Message.OrderMessage.fromObject({
@@ -438,8 +475,8 @@ const generateWAMessageContent = async (message, options) => {
         m.listResponseMessage = { ...message.listReply };
     }
     else if ('poll' in message) {
-        (_o = message.poll).selectableCount || (_o.selectableCount = 0);
-        (_p = message.poll).toAnnouncementGroup || (_p.toAnnouncementGroup = false);
+        (_6 = message.poll).selectableCount || (_6.selectableCount = 0);
+        (_7 = message.poll).toAnnouncementGroup || (_7.toAnnouncementGroup = false);
         if (!Array.isArray(message.poll.values)) {
             throw new boom_1.Boom('Invalid poll values', { statusCode: 400 });
         }
@@ -470,6 +507,32 @@ const generateWAMessageContent = async (message, options) => {
                 m.pollCreationMessage = pollCreationMessage;
             }
         }
+        if ('contextInfo' in message && !!message.contextInfo) {
+            pollCreationMessage.contextInfo = message.contextInfo;
+        }
+    }
+    else if ('pollResult' in message) {
+        if (!Array.isArray(message.pollResult.votes)) {
+            throw new boom_1.Boom('Invalid poll votes result', { statusCode: 400 });
+        }
+        m.messageContextInfo = {
+            // encKey
+            messageSecret: message.pollResult.messageSecret || (0, crypto_1.randomBytes)(32),
+        };
+        const pollResultSnapshotMessage = {
+            name: message.pollResult.name,
+            pollVotes: message.pollResult.votes.map((option) => ({
+                optionName: option[0],
+                optionVoteCount: option[1]
+            })),
+        };
+        if ('contextInfo' in message && !!message.contextInfo) {
+            pollResultSnapshotMessage.contextInfo = message.contextInfo;
+        }
+        if ('mentions' in message && !!message.mentions) {
+            pollResultSnapshotMessage.contextInfo = { mentionedJid: message.mentions };
+        }
+        m.pollResultSnapshotMessage = pollResultSnapshotMessage;
     }
     else if ('event' in message) {
         m.messageContextInfo = {
@@ -484,6 +547,26 @@ const generateWAMessageContent = async (message, options) => {
         m.newsletterAdminInviteMessage.newsletterJid = message.inviteAdmin.jid;
         m.newsletterAdminInviteMessage.newsletterName = message.inviteAdmin.subject;
         m.newsletterAdminInviteMessage.jpegThumbnail = message.inviteAdmin.thumbnail;
+        //TODO: use built-in interface and get disappearing mode info etc.
+        //TODO: cache / use store!?
+        if (options.getProfilePicUrl) {
+            let pfpUrl;
+            try {
+                pfpUrl = await options.getProfilePicUrl(message.inviteAdmin.jid, 'preview');
+            }
+            catch (_9) {
+                pfpUrl = null;
+            }
+            if (pfpUrl) {
+                const resp = await axios_1.default.get(pfpUrl, { responseType: 'arraybuffer' });
+                if (resp.status === 200) {
+                    m.newsletterAdminInviteMessage.jpegThumbnail = resp.data;
+                }
+            }
+            else {
+                m.newsletterAdminInviteMessage.jpegThumbnail = null;
+            }
+        }
     }
     else if ('requestPayment' in message) {
         const sticker = ((_d = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _d === void 0 ? void 0 : _d.sticker) ?
@@ -494,7 +577,12 @@ const generateWAMessageContent = async (message, options) => {
             notes = {
                 stickerMessage: {
                     ...sticker === null || sticker === void 0 ? void 0 : sticker.stickerMessage,
-                    contextInfo: (_g = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _g === void 0 ? void 0 : _g.contextInfo
+                    contextInfo: {
+                        stanzaId: (_h = (_g = options === null || options === void 0 ? void 0 : options.quoted) === null || _g === void 0 ? void 0 : _g.key) === null || _h === void 0 ? void 0 : _h.id,
+                        participant: (_k = (_j = options === null || options === void 0 ? void 0 : options.quoted) === null || _j === void 0 ? void 0 : _j.key) === null || _k === void 0 ? void 0 : _k.participant,
+                        quotedMessage: (_l = options === null || options === void 0 ? void 0 : options.quoted) === null || _l === void 0 ? void 0 : _l.message,
+                        ...(_m = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _m === void 0 ? void 0 : _m.contextInfo,
+                    }
                 }
             };
         }
@@ -502,20 +590,22 @@ const generateWAMessageContent = async (message, options) => {
             notes = {
                 extendedTextMessage: {
                     text: message.requestPayment.note,
-                    contextInfo: (_h = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _h === void 0 ? void 0 : _h.contextInfo,
+                    contextInfo: {
+                        stanzaId: (_p = (_o = options === null || options === void 0 ? void 0 : options.quoted) === null || _o === void 0 ? void 0 : _o.key) === null || _p === void 0 ? void 0 : _p.id,
+                        participant: (_r = (_q = options === null || options === void 0 ? void 0 : options.quoted) === null || _q === void 0 ? void 0 : _q.key) === null || _r === void 0 ? void 0 : _r.participant,
+                        quotedMessage: (_s = options === null || options === void 0 ? void 0 : options.quoted) === null || _s === void 0 ? void 0 : _s.message,
+                        ...(_t = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _t === void 0 ? void 0 : _t.contextInfo,
+                    }
                 }
             };
         }
-        else {
-            throw new boom_1.Boom('Invalid media type', { statusCode: 400 });
-        }
         m.requestPaymentMessage = Types_1.WAProto.Message.RequestPaymentMessage.fromObject({
             expiryTimestamp: message.requestPayment.expiry,
             amount1000: message.requestPayment.amount,
             currencyCodeIso4217: message.requestPayment.currency,
             requestFrom: message.requestPayment.from,
             noteMessage: { ...notes },
-            background: (_j = message.requestPayment.background) !== null && _j !== void 0 ? _j : null,
+            background: (_u = message.requestPayment.background) !== null && _u !== void 0 ? _u : null,
         });
     }
     else if ('sharePhoneNumber' in message) {
@@ -583,22 +673,33 @@ const generateWAMessageContent = async (message, options) => {
             }
         };
     }
-    if ('interactive' in message && !!message.interactive) {
+    if ('interactiveButtons' in message && !!message.interactiveButtons) {
         const interactiveMessage = {
             nativeFlowMessage: Types_1.WAProto.Message.InteractiveMessage.NativeFlowMessage.fromObject({
-                buttons: message.interactive,
+                buttons: message.interactiveButtons,
             })
         };
         if ('text' in message) {
             body: interactiveMessage.body = {
                 text: message.text
             };
+            header: interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: (_v = message === null || message === void 0 ? void 0 : message.media) !== null && _v !== void 0 ? _v : false,
+            };
         }
         else {
             if ('caption' in message) {
                 body: interactiveMessage.body = {
                     text: message.caption
                 };
+                header: interactiveMessage.header = {
+                    title: message.title,
+                    subtitle: message.subtitle,
+                    hasMediaAttachment: (_w = message === null || message === void 0 ? void 0 : message.media) !== null && _w !== void 0 ? _w : false,
+                };
+                Object.assign(interactiveMessage.header, m);
             }
         }
         if ('footer' in message && !!message.footer) {
@@ -606,13 +707,48 @@ const generateWAMessageContent = async (message, options) => {
                 text: message.footer
             };
         }
-        if ('title' in message && !!message.title) {
+        if ('contextInfo' in message && !!message.contextInfo) {
+            interactiveMessage.contextInfo = message.contextInfo;
+        }
+        if ('mentions' in message && !!message.mentions) {
+            interactiveMessage.contextInfo = { mentionedJid: message.mentions };
+        }
+        m = { interactiveMessage };
+    }
+    if ('shop' in message && !!message.shop) {
+        const interactiveMessage = {
+            shopStorefrontMessage: Types_1.WAProto.Message.InteractiveMessage.ShopMessage.fromObject({
+                surface: message.shop,
+                id: message.id
+            })
+        };
+        if ('text' in message) {
+            body: interactiveMessage.body = {
+                text: message.text
+            };
             header: interactiveMessage.header = {
                 title: message.title,
                 subtitle: message.subtitle,
-                hasMediaAttachment: (_k = message === null || message === void 0 ? void 0 : message.media) !== null && _k !== void 0 ? _k : false,
+                hasMediaAttachment: (_x = message === null || message === void 0 ? void 0 : message.media) !== null && _x !== void 0 ? _x : false,
+            };
+        }
+        else {
+            if ('caption' in message) {
+                body: interactiveMessage.body = {
+                    text: message.caption
+                };
+                header: interactiveMessage.header = {
+                    title: message.title,
+                    subtitle: message.subtitle,
+                    hasMediaAttachment: (_y = message === null || message === void 0 ? void 0 : message.media) !== null && _y !== void 0 ? _y : false,
+                };
+                Object.assign(interactiveMessage.header, m);
+            }
+        }
+        if ('footer' in message && !!message.footer) {
+            footer: interactiveMessage.footer = {
+                text: message.footer
             };
-            Object.assign(interactiveMessage.header, m);
         }
         if ('contextInfo' in message && !!message.contextInfo) {
             interactiveMessage.contextInfo = message.contextInfo;
@@ -622,23 +758,35 @@ const generateWAMessageContent = async (message, options) => {
         }
         m = { interactiveMessage };
     }
-    if ('shop' in message && !!message.shop) {
+    if ('collection' in message && !!message.shop) {
         const interactiveMessage = {
-            shopStorefrontMessage: Types_1.WAProto.Message.InteractiveMessage.ShopMessage.fromObject({
-                surface: message.shop,
-                id: message.id
+            collectionMessage: Types_1.WAProto.Message.InteractiveMessage.CollectionMessage.fromObject({
+                bizJid: (_z = message === null || message === void 0 ? void 0 : message.collection) === null || _z === void 0 ? void 0 : _z.bizJid,
+                id: (_0 = message === null || message === void 0 ? void 0 : message.collection) === null || _0 === void 0 ? void 0 : _0.id,
+                messageVersion: (_1 = message === null || message === void 0 ? void 0 : message.collection) === null || _1 === void 0 ? void 0 : _1.version
             })
         };
         if ('text' in message) {
             body: interactiveMessage.body = {
                 text: message.text
             };
+            header: interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: (_2 = message === null || message === void 0 ? void 0 : message.media) !== null && _2 !== void 0 ? _2 : false,
+            };
         }
         else {
             if ('caption' in message) {
                 body: interactiveMessage.body = {
                     text: message.caption
                 };
+                header: interactiveMessage.header = {
+                    title: message.title,
+                    subtitle: message.subtitle,
+                    hasMediaAttachment: (_3 = message === null || message === void 0 ? void 0 : message.media) !== null && _3 !== void 0 ? _3 : false,
+                };
+                Object.assign(interactiveMessage.header, m);
             }
         }
         if ('footer' in message && !!message.footer) {
@@ -646,13 +794,73 @@ const generateWAMessageContent = async (message, options) => {
                 text: message.footer
             };
         }
-        if ('title' in message && !!message.title) {
+        if ('contextInfo' in message && !!message.contextInfo) {
+            interactiveMessage.contextInfo = message.contextInfo;
+        }
+        if ('mentions' in message && !!message.mentions) {
+            interactiveMessage.contextInfo = { mentionedJid: message.mentions };
+        }
+        m = { interactiveMessage };
+    }
+    if ('cards' in message && !!message.cards) {
+        const slides = await Promise.all(message.cards.map(async (slide) => {
+            const { image, video, product, title, caption, footer, buttons } = slide;
+            let header;
+            if (product) {
+                const { imageMessage } = await (0, exports.prepareWAMessageMedia)({ image: product.productImage, ...options }, options);
+                header = {
+                    productMesage: Types_1.WAProto.Message.ProductMessage.fromObject({
+                        product: {
+                            ...product,
+                            productImage: imageMessage,
+                        },
+                        ...slide
+                    })
+                };
+            }
+            else if (image) {
+                header = await (0, exports.prepareWAMessageMedia)({ image: image, ...options }, options);
+            }
+            else if (video) {
+                header = await (0, exports.prepareWAMessageMedia)({ video: video, ...options }, options);
+            }
+            const msg = {
+                header: {
+                    title,
+                    hasMediaAttachment: true,
+                    ...header
+                },
+                body: {
+                    text: caption
+                },
+                footer: {
+                    text: footer
+                },
+                nativeFlowMessage: {
+                    buttons,
+                },
+            };
+            return msg;
+        }));
+        const interactiveMessage = {
+            carouselMessage: Types_1.WAProto.Message.InteractiveMessage.CarouselMessage.fromObject({
+                cards: slides
+            })
+        };
+        if ('text' in message) {
+            body: interactiveMessage.body = {
+                text: message.text
+            };
             header: interactiveMessage.header = {
                 title: message.title,
                 subtitle: message.subtitle,
-                hasMediaAttachment: (_l = message === null || message === void 0 ? void 0 : message.media) !== null && _l !== void 0 ? _l : false,
+                hasMediaAttachment: (_4 = message === null || message === void 0 ? void 0 : message.media) !== null && _4 !== void 0 ? _4 : false,
+            };
+        }
+        if ('footer' in message && !!message.footer) {
+            footer: interactiveMessage.footer = {
+                text: message.footer
             };
-            Object.assign(interactiveMessage.header, m);
         }
         if ('contextInfo' in message && !!message.contextInfo) {
             interactiveMessage.contextInfo = message.contextInfo;
@@ -669,7 +877,7 @@ const generateWAMessageContent = async (message, options) => {
             title: message.title,
             footerText: message.footer,
             description: message.text,
-            listType: message.hasOwnProperty("listType") ? message.listType : WAProto_1.proto.Message.ListMessage.ListType.PRODUCT_LIST
+            listType: WAProto_1.proto.Message.ListMessage.ListType.SINGLE_SELECT
         };
         m = { listMessage };
     }
@@ -688,7 +896,7 @@ const generateWAMessageContent = async (message, options) => {
     if ('lottie' in message && !!message.lottie) {
         m = { lottieStickerMessage: { message: m } };
     }
-    if ('mentions' in message && ((_m = message.mentions) === null || _m === void 0 ? void 0 : _m.length)) {
+    if ('mentions' in message && ((_5 = message.mentions) === null || _5 === void 0 ? void 0 : _5.length)) {
         const [messageType] = Object.keys(m);
         m[messageType].contextInfo = m[messageType] || {};
         m[messageType].contextInfo.mentionedJid = message.mentions;
@@ -712,17 +920,7 @@ const generateWAMessageContent = async (message, options) => {
 };
 exports.generateWAMessageContent = generateWAMessageContent;
 const generateWAMessageFromContent = (jid, message, options) => {
-    if (message?.viewOnceMessage) {
-        const viewOnceMessage = message.viewOnceMessage;
-    
-        if (viewOnceMessage.message?.interactiveMessage) {
-            message = viewOnceMessage.message;
-        }
-    
-        if (viewOnceMessage.message?.buttonsMessage) {
-            message = viewOnceMessage.message;
-        }
-    }
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     // set timestamp to now
     // if not specified
     if (!options.timestamp) {
@@ -742,7 +940,16 @@ const generateWAMessageFromContent = (jid, message, options) => {
         if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) {
             delete quotedContent.contextInfo;
         }
-        const contextInfo = innerMessage[key].contextInfo || {};
+        let requestPayment;
+        if (key === 'requestPaymentMessage') {
+            if (((_a = innerMessage === null || innerMessage === void 0 ? void 0 : innerMessage.requestPaymentMessage) === null || _a === void 0 ? void 0 : _a.noteMessage) && ((_c = (_b = innerMessage === null || innerMessage === void 0 ? void 0 : innerMessage.requestPaymentMessage) === null || _b === void 0 ? void 0 : _b.noteMessage) === null || _c === void 0 ? void 0 : _c.extendedTextMessage)) {
+                requestPayment = (_e = (_d = innerMessage === null || innerMessage === void 0 ? void 0 : innerMessage.requestPaymentMessage) === null || _d === void 0 ? void 0 : _d.noteMessage) === null || _e === void 0 ? void 0 : _e.extendedTextMessage;
+            }
+            else if (((_f = innerMessage === null || innerMessage === void 0 ? void 0 : innerMessage.requestPaymentMessage) === null || _f === void 0 ? void 0 : _f.noteMessage) && ((_h = (_g = innerMessage === null || innerMessage === void 0 ? void 0 : innerMessage.requestPaymentMessage) === null || _g === void 0 ? void 0 : _g.noteMessage) === null || _h === void 0 ? void 0 : _h.stickerMessage)) {
+                requestPayment = (_k = (_j = innerMessage.requestPaymentMessage) === null || _j === void 0 ? void 0 : _j.noteMessage) === null || _k === void 0 ? void 0 : _k.stickerMessage;
+            }
+        }
+        const contextInfo = (key === 'requestPaymentMessage' ? requestPayment.contextInfo : innerMessage[key].contextInfo) || {};
         contextInfo.participant = (0, WABinary_1.jidNormalizedUser)(participant);
         contextInfo.stanzaId = quoted.key.id;
         contextInfo.quotedMessage = quotedMsg;
@@ -949,6 +1156,7 @@ function getAggregateVotesInPollMessage({ message, pollUpdates }, meId) {
     }
     return Object.values(voteHashMap);
 }
+exports.getAggregateVotesInPollMessage = getAggregateVotesInPollMessage;
 /** Given a list of message keys, aggregates them by chat & sender. Useful for sending read receipts in bulk */
 const aggregateMessageKeysNotFromMe = (keys) => {
     const keyMap = {};

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 { 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;
@@ -15,7 +16,7 @@ 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 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

package/lib/Utils/signal.js

@@ -85,27 +85,19 @@ const parseAndInjectE2ESessions = async (node, repository) => {
 };
 exports.parseAndInjectE2ESessions = parseAndInjectE2ESessions;
 const extractDeviceJids = (result, myJid, excludeZeroDevices) => {
-    var _a;
     const { user: myUser, device: myDevice } = (0, WABinary_1.jidDecode)(myJid);
     const extracted = [];
-    for (const node of result.content) {
-        const list = (_a = (0, WABinary_1.getBinaryNodeChild)(node, 'list')) === null || _a === void 0 ? void 0 : _a.content;
-        if (list && Array.isArray(list)) {
-            for (const item of list) {
-                const { user } = (0, WABinary_1.jidDecode)(item.attrs.jid);
-                const devicesNode = (0, WABinary_1.getBinaryNodeChild)(item, 'devices');
-                const deviceListNode = (0, WABinary_1.getBinaryNodeChild)(devicesNode, 'device-list');
-                if (Array.isArray(deviceListNode === null || deviceListNode === void 0 ? void 0 : deviceListNode.content)) {
-                    for (const { tag, attrs } of deviceListNode.content) {
-                        const device = +attrs.id;
-                        if (tag === 'device' && // ensure the "device" tag
-                            (!excludeZeroDevices || device !== 0) && // if zero devices are not-excluded, or device is non zero
-                            (myUser !== user || myDevice !== device) && // either different user or if me user, not this device
-                            (device === 0 || !!attrs['key-index']) // ensure that "key-index" is specified for "non-zero" devices, produces a bad req otherwise
-                        ) {
-                            extracted.push({ user, device });
-                        }
-                    }
+    for (const userResult of result) {
+        const { devices, id } = userResult;
+        const { user } = (0, WABinary_1.jidDecode)(id);
+        const deviceList = devices === null || devices === void 0 ? void 0 : devices.deviceList;
+        if (Array.isArray(deviceList)) {
+            for (const { id: device, keyIndex } of deviceList) {
+                if ((!excludeZeroDevices || device !== 0) && // if zero devices are not-excluded, or device is non zero
+                    (myUser !== user || myDevice !== device) && // either different user or if me user, not this device
+                    (device === 0 || !!keyIndex) // ensure that "key-index" is specified for "non-zero" devices, produces a bad req otherwise
+                ) {
+                    extracted.push({ user, device });
                 }
             }
         }

package/lib/Utils/use-multi-file-auth-state.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useMultiFileAuthState = void 0;
 const promises_1 = require("fs/promises");
@@ -6,6 +9,8 @@ const path_1 = require("path");
 const WAProto_1 = require("../../WAProto");
 const auth_utils_1 = require("./auth-utils");
 const generics_1 = require("./generics");
+const async_lock_1 = __importDefault(require("async-lock"));
+const fileLock = new async_lock_1.default({ maxPending: Infinity });
 /**
  * stores the full authentication state in a single folder.
  * Far more efficient than singlefileauthstate
@@ -15,11 +20,13 @@ const generics_1 = require("./generics");
  * */
 const useMultiFileAuthState = async (folder) => {
     const writeData = (data, file) => {
-        return (0, promises_1.writeFile)((0, path_1.join)(folder, fixFileName(file)), JSON.stringify(data, generics_1.BufferJSON.replacer));
+        const filePath = (0, path_1.join)(folder, fixFileName(file));
+        return fileLock.acquire(filePath, () => (0, promises_1.writeFile)((0, path_1.join)(filePath), JSON.stringify(data, generics_1.BufferJSON.replacer)));
     };
     const readData = async (file) => {
         try {
-            const data = await (0, promises_1.readFile)((0, path_1.join)(folder, fixFileName(file)), { encoding: 'utf-8' });
+            const filePath = (0, path_1.join)(folder, fixFileName(file));
+            const data = await fileLock.acquire(filePath, () => (0, promises_1.readFile)(filePath, { encoding: 'utf-8' }));
             return JSON.parse(data, generics_1.BufferJSON.reviver);
         }
         catch (error) {
@@ -28,7 +35,8 @@ const useMultiFileAuthState = async (folder) => {
     };
     const removeData = async (file) => {
         try {
-            await (0, promises_1.unlink)((0, path_1.join)(folder, fixFileName(file)));
+            const filePath = (0, path_1.join)(folder, fixFileName(file));
+            await fileLock.acquire(filePath, () => (0, promises_1.unlink)(filePath));
         }
         catch (_a) {
         }

package/lib/Utils/validate-connection.d.ts

@@ -4,8 +4,8 @@ import { BinaryNode } from '../WABinary';
 export declare const generateMobileNode: (config: SocketConfig) => proto.IClientPayload;
 export declare const generateLoginNode: (userJid: string, config: SocketConfig) => proto.IClientPayload;
 export declare const generateRegistrationNode: ({ registrationId, signedPreKey, signedIdentityKey }: SignalCreds, config: SocketConfig) => proto.ClientPayload;
-export declare const configureSuccessfulPairing: (stanza: BinaryNode, { advSecretKey, signedIdentityKey, signalIdentities }: Pick<AuthenticationCreds, "advSecretKey" | "signedIdentityKey" | "signalIdentities">) => {
+export declare const configureSuccessfulPairing: (stanza: BinaryNode, { advSecretKey, signedIdentityKey, signalIdentities }: Pick<AuthenticationCreds, 'advSecretKey' | 'signedIdentityKey' | 'signalIdentities'>) => {
     creds: Partial<AuthenticationCreds>;
     reply: BinaryNode;
 };
-export declare const encodeSignedDeviceIdentity: (account: proto.IADVSignedDeviceIdentity, includeSignatureKey: boolean) => any;
+export declare const encodeSignedDeviceIdentity: (account: proto.IADVSignedDeviceIdentity, includeSignatureKey: boolean) => Uint8Array;

package/lib/Utils/validate-connection.js

@@ -72,7 +72,7 @@ const generateMobileNode = (config) => {
             appCached: false,
             dnsMethod: WAProto_1.proto.ClientPayload.DNSSource.DNSResolutionMethod.SYSTEM,
         },
-        passive: false, // XMPP heartbeat setting (false: server actively pings) (true: client actively pings)
+        passive: false,
         pushName: 'test',
         username: Number(`${config.auth.creds.registration.phoneNumberCountryCode}${config.auth.creds.registration.phoneNumberNationalNumber}`),
     };

package/lib/WABinary/encode.d.ts

@@ -1,2 +1,2 @@
 import type { BinaryNode, BinaryNodeCodingOptions } from './types';
-export declare const encodeBinaryNode: ({ tag, attrs, content }: BinaryNode, opts?: Pick<BinaryNodeCodingOptions, "TAGS" | "TOKEN_MAP">, buffer?: number[]) => any;
+export declare const encodeBinaryNode: (node: BinaryNode, opts?: Pick<BinaryNodeCodingOptions, "TAGS" | "TOKEN_MAP">, buffer?: number[]) => Buffer;