@jkt48connect-corp/baileys 7.2.8 → 7.3.0

package/lib/Socket/usync.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeUSyncSocket = void 0;
+const boom_1 = require("@hapi/boom");
+const WABinary_1 = require("../WABinary");
+const socket_1 = require("./socket");
+const makeUSyncSocket = (config) => {
+    const sock = (0, socket_1.makeSocket)(config);
+    const { generateMessageTag, query, } = sock;
+    const executeUSyncQuery = async (usyncQuery) => {
+        if (usyncQuery.protocols.length === 0) {
+            throw new boom_1.Boom('USyncQuery must have at least one protocol');
+        }
+        // todo: validate users, throw WARNING on no valid users
+        // variable below has only validated users
+        const validUsers = usyncQuery.users;
+        const userNodes = validUsers.map((user) => {
+            return {
+                tag: 'user',
+                attrs: {
+                    jid: !user.phone ? user.id : undefined,
+                },
+                content: usyncQuery.protocols
+                    .map((a) => a.getUserElement(user))
+                    .filter(a => a !== null)
+            };
+        });
+        const listNode = {
+            tag: 'list',
+            attrs: {},
+            content: userNodes
+        };
+        const queryNode = {
+            tag: 'query',
+            attrs: {},
+            content: usyncQuery.protocols.map((a) => a.getQueryElement())
+        };
+        const iq = {
+            tag: 'iq',
+            attrs: {
+                to: WABinary_1.S_WHATSAPP_NET,
+                type: 'get',
+                xmlns: 'usync',
+            },
+            content: [
+                {
+                    tag: 'usync',
+                    attrs: {
+                        context: usyncQuery.context,
+                        mode: usyncQuery.mode,
+                        sid: generateMessageTag(),
+                        last: 'true',
+                        index: '0',
+                    },
+                    content: [
+                        queryNode,
+                        listNode
+                    ]
+                }
+            ],
+        };
+        const result = await query(iq);
+        return usyncQuery.parseUSyncQueryResult(result);
+    };
+    return {
+        ...sock,
+        executeUSyncQuery,
+    };
+};
+exports.makeUSyncSocket = makeUSyncSocket;

package/lib/Store/make-in-memory-store.d.ts

@@ -1,3 +1,4 @@
+import type KeyedDB from '@adiwajshing/keyed-db';
 import type { Comparable } from '@adiwajshing/keyed-db/lib/Types';
 import type { Logger } from 'pino';
 import { proto } from '../../WAProto';
@@ -64,13 +65,13 @@ declare const _default: (config: BaileysInMemoryStoreConfig) => {
      *
      * @returns Label IDs
      **/
-    getChatLabels: (chatId: string) => any;
+    getChatLabels: (chatId: string) => LabelAssociation[];
     /**
      * Get labels for message
      *
      * @returns Label IDs
      **/
-    getMessageLabels: (messageId: string) => any;
+    getMessageLabels: (messageId: string) => string[];
     loadMessage: (jid: string, id: string) => Promise<proto.IWebMessageInfo | undefined>;
     mostRecentMessage: (jid: string) => Promise<proto.IWebMessageInfo>;
     fetchImageUrl: (jid: string, sock: WASocket | undefined) => Promise<string | null | undefined>;
@@ -104,7 +105,7 @@ declare const _default: (config: BaileysInMemoryStoreConfig) => {
             [id: string]: Contact;
         };
         messages: {
-            [id: string]: WAMessage[];
+            [id: string]: proto.IWebMessageInfo[];
         };
         labels: {
             [labelId: string]: Label;

package/lib/Store/make-in-memory-store.js

@@ -56,6 +56,14 @@ exports.default = (config) => {
             labels.upsertById(label.id, label);
         }
     };
+    const getValidContacts = () => {
+        for (const contact of Object.keys(contacts)) {
+            if (contact.indexOf('@') < 0) {
+                delete contacts[contact];
+            }
+        }
+        return Object.keys(contacts);
+    };
     /**
      * binds to a BaileysEventEmitter.
      * It listens to all events and constructs a state that you can query accurate data from.
@@ -104,10 +112,11 @@ exports.default = (config) => {
                     contact = contacts[update.id];
                 }
                 else {
-                    const contactHashes = await Promise.all(Object.keys(contacts).map(async (contactId) => {
+                    const validContacts = getValidContacts();
+                    const contactHashes = validContacts.map((contactId) => {
                         const { user } = (0, WABinary_1.jidDecode)(contactId);
-                        return [contactId, (await (0, Utils_1.md5)(Buffer.from(user + 'WA_ADD_NOTIF', 'utf8'))).toString('base64').slice(0, 3)];
-                    }));
+                        return [contactId, ((0, Utils_1.md5)(Buffer.from(user + 'WA_ADD_NOTIF', 'utf8'))).toString('base64').slice(0, 3)];
+                    });
                     contact = contacts[((_a = contactHashes.find(([, b]) => b === update.id)) === null || _a === void 0 ? void 0 : _a[0]) || '']; // find contact by attrs.hash, when user is not saved as a contact
                 }
                 if (contact) {
@@ -117,11 +126,11 @@ exports.default = (config) => {
                     else if (update.imgUrl === 'removed') {
                         delete contact.imgUrl;
                     }
+                    Object.assign(contacts[contact.id], contact);
                 }
                 else {
-                    return logger.debug({ update }, 'got update for non-existant contact');
+                    logger.debug({ update }, 'got update for non-existant contact');
                 }
-                Object.assign(contacts[contact.id], contact);
             }
         });
         ev.on('chats.upsert', newChats => {
@@ -182,14 +191,16 @@ exports.default = (config) => {
                         const jid = (0, WABinary_1.jidNormalizedUser)(msg.key.remoteJid);
                         const list = assertMessageList(jid);
                         list.upsert(msg, 'append');
-                        if (type === 'notify' && !chats.get(jid)) {
-                            ev.emit('chats.upsert', [
-                                {
-                                    id: jid,
-                                    conversationTimestamp: (0, Utils_1.toNumber)(msg.messageTimestamp),
-                                    unreadCount: 1
-                                }
-                            ]);
+                        if (type === 'notify') {
+                            if (!chats.get(jid)) {
+                                ev.emit('chats.upsert', [
+                                    {
+                                        id: jid,
+                                        conversationTimestamp: (0, Utils_1.toNumber)(msg.messageTimestamp),
+                                        unreadCount: 1
+                                    }
+                                ]);
+                            }
                         }
                     }
                     break;

package/lib/Types/Message.d.ts

@@ -1,3 +1,6 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import { AxiosRequestConfig } from 'axios';
 import type { Logger } from 'pino';
 import type { Readable } from 'stream';
@@ -25,6 +28,7 @@ export type WAMediaUpload = Buffer | {
 } | {
     stream: Readable;
 };
+export import Annotations = proto.IInteractiveAnnotation;
 /** Set of message types that are supported by the library */
 export type MessageType = keyof proto.Message;
 export type DownloadableMessage = {
@@ -155,6 +159,7 @@ export type AnyMediaMessageContent = (({
     image: WAMediaUpload;
     caption?: string;
     jpegThumbnail?: string;
+    annotations?: Annotations;
 } & Mentionable & Contextable & Buttonable & Templatable & Interactiveable & Shopable & Collectionable & Cardsable & WithDimensions) | ({
     video: WAMediaUpload;
     caption?: string;
@@ -162,20 +167,24 @@ export type AnyMediaMessageContent = (({
     jpegThumbnail?: string;
     /** if set to true, will send as a `video note` */
     ptv?: boolean;
+    annotations?: Annotations;
 } & Mentionable & Contextable & Buttonable & Templatable & Interactiveable & Shopable & Collectionable & Cardsable & WithDimensions) | {
     audio: WAMediaUpload;
     /** if set to true, will send as a `voice note` */
     ptt?: boolean;
     /** optionally tell the duration of the audio */
     seconds?: number;
+    annotations?: Annotations;
 } | ({
     sticker: WAMediaUpload;
     isAnimated?: boolean;
+    annotations?: Annotations;
 } & WithDimensions) | ({
     document: WAMediaUpload;
     mimetype: string;
     fileName?: string;
     caption?: string;
+    annotations?: Annotations;
 } & Contextable & Buttonable & Templatable & Interactiveable & Shopable & Collectionable & Cardsable)) & {
     mimetype?: string;
 } & Editable;

package/lib/Types/USync.d.ts

@@ -0,0 +1,25 @@
+import { BinaryNode } from '../WABinary';
+import { USyncUser } from '../WAUSync';
+/**
+ * Defines the interface for a USyncQuery protocol
+ */
+export interface USyncQueryProtocol {
+    /**
+     * The name of the protocol
+     */
+    name: string;
+    /**
+     * Defines what goes inside the query part of a USyncQuery
+     */
+    getQueryElement: () => BinaryNode;
+    /**
+     * Defines what goes inside the user part of a USyncQuery
+     */
+    getUserElement: (user: USyncUser) => BinaryNode | null;
+    /**
+     * Parse the result of the query
+     * @param data Data from the result
+     * @returns Whatever the protocol is supposed to return
+     */
+    parser: (data: BinaryNode) => unknown;
+}

package/lib/Types/USync.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/Utils/generics.js

@@ -180,11 +180,11 @@ const generateMessageIDV2 = (userId) => {
     const random = (0, crypto_1.randomBytes)(16);
     random.copy(data, 28);
     const hash = (0, crypto_1.createHash)('sha256').update(data).digest();
-    return 'FizzxyTheGreat-' + hash.toString('hex').toUpperCase().substring(0, 18);
+    return 'FTG-' + hash.toString('hex').toUpperCase().substring(0, 18);
 };
 exports.generateMessageIDV2 = generateMessageIDV2;
 // generate a random ID to attach to a message
-const generateMessageID = () => 'FizzxyTheGreat-' + (0, crypto_1.randomBytes)(6).toString('hex').toUpperCase();
+const generateMessageID = () => 'FTG-' + (0, crypto_1.randomBytes)(6).toString('hex').toUpperCase();
 exports.generateMessageID = generateMessageID;
 function bindWaitForEvent(ev, event) {
     return async (check, timeoutMs) => {

package/lib/Utils/messages.d.ts

@@ -1,4 +1,7 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import { Logger } from 'pino';
+import { type Transform } from 'stream';
 import { proto } from '../../WAProto';
 import { AnyMediaMessageContent, AnyMessageContent, MediaGenerationOptions, MessageContentGenerationOptions, MessageGenerationOptions, MessageGenerationOptionsFromContent, MessageUserReceipt, WAMessage, WAMessageContent, WAProto } from '../Types';
 import { MediaDownloadOptions } from './messages-media';
@@ -8,7 +11,7 @@ import { MediaDownloadOptions } from './messages-media';
  * @returns the URL, eg. https://google.com
  */
 export declare const extractUrlFromText: (text: string) => string | undefined;
-export declare const generateLinkPreviewIfRequired: (text: string, getUrlInfo: MessageGenerationOptions["getUrlInfo"], logger: MessageGenerationOptions["logger"]) => Promise<import("../Types").WAUrlInfo | undefined>;
+export declare const generateLinkPreviewIfRequired: (text: string, getUrlInfo: MessageGenerationOptions['getUrlInfo'], logger: MessageGenerationOptions['logger']) => Promise<import("../Types").WAUrlInfo | undefined>;
 export declare const prepareWAMessageMedia: (message: AnyMediaMessageContent, options: MediaGenerationOptions) => Promise<proto.Message>;
 export declare const prepareDisappearingMessageSettingContent: (ephemeralExpiration?: number) => proto.Message;
 /**
@@ -39,11 +42,11 @@ export declare const extractMessageContent: (content: WAMessageContent | undefin
  */
 export declare const getDevice: (id: string) => "android" | "unknown" | "web" | "ios" | "desktop";
 /** Upserts a receipt in the message */
-export declare const updateMessageWithReceipt: (msg: Pick<WAMessage, "userReceipt">, receipt: MessageUserReceipt) => void;
+export declare const updateMessageWithReceipt: (msg: Pick<WAMessage, 'userReceipt'>, receipt: MessageUserReceipt) => void;
 /** Update the message with a new reaction */
-export declare const updateMessageWithReaction: (msg: Pick<WAMessage, "reactions">, reaction: proto.IReaction) => void;
+export declare const updateMessageWithReaction: (msg: Pick<WAMessage, 'reactions'>, reaction: proto.IReaction) => void;
 /** Update the message with a new poll update */
-export declare const updateMessageWithPollUpdate: (msg: Pick<WAMessage, "pollUpdates">, update: proto.IPollUpdate) => void;
+export declare const updateMessageWithPollUpdate: (msg: Pick<WAMessage, 'pollUpdates'>, update: proto.IPollUpdate) => void;
 type VoteAggregation = {
     name: string;
     voters: string[];
@@ -68,7 +71,7 @@ type DownloadMediaMessageContext = {
 /**
  * Downloads the given message. Throws an error if it's not a media message
  */
-export declare const downloadMediaMessage: <Type extends "buffer" | "stream">(message: WAMessage, type: Type, options: MediaDownloadOptions, ctx?: DownloadMediaMessageContext) => Promise<Type extends "buffer" ? Buffer : Transform>;
+export declare const downloadMediaMessage: <Type extends "stream" | "buffer">(message: WAMessage, type: Type, options: MediaDownloadOptions, ctx?: DownloadMediaMessageContext) => Promise<Type extends "buffer" ? Buffer : Transform>;
 /** Checks whether the given message is a media message; if it is returns the inner content */
 export declare const assertMediaContent: (content: proto.IMessage | null | undefined) => proto.Message.IVideoMessage | proto.Message.IImageMessage | proto.Message.IAudioMessage | proto.Message.IDocumentMessage | proto.Message.IStickerMessage;
 export {};

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");
@@ -79,6 +78,38 @@ const prepareWAMessageMedia = async (message, options) => {
     }
     const uploadData = {
         ...message,
+        ...(message.annotations ? {
+            annotations: message.annotations
+        } : {
+            annotations: [
+                {
+                    polygonVertices: [
+                        {
+                            x: 60.71664810180664,
+                            y: -36.39784622192383
+                        },
+                        {
+                            x: -16.710189819335938,
+                            y: 49.263675689697266
+                        },
+                        {
+                            x: -56.585853576660156,
+                            y: 37.85963439941406
+                        },
+                        {
+                            x: 20.840980529785156,
+                            y: -47.80188751220703
+                        }
+                    ],
+                    newsletter: {
+                        newsletterJid: "120363412252486516@newsletter",
+                        serverMessageId: 0,
+                        newsletterName: "BAILEYS-PRO [INFO]",
+                        contentType: "UPDATE",
+                    }
+                }
+            ]
+        }),
         media: message[mediaType]
     };
     delete uploadData[mediaType];
@@ -516,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) ?
@@ -774,20 +825,20 @@ const generateWAMessageContent = async (message, options) => {
                 header = await (0, exports.prepareWAMessageMedia)({ video: video, ...options }, options);
             }
             const msg = {
-                header: Types_1.WAProto.Message.InteractiveMessage.Header.fromObject({
+                header: {
                     title,
                     hasMediaAttachment: true,
                     ...header
-                }),
-                body: Types_1.WAProto.Message.InteractiveMessage.Body.fromObject({
+                },
+                body: {
                     text: caption
-                }),
-                footer: Types_1.WAProto.Message.InteractiveMessage.Footer.fromObject({
+                },
+                footer: {
                     text: footer
-                }),
-                nativeFlowMessage: Types_1.WAProto.Message.InteractiveMessage.NativeFlowMessage.fromObject({
+                },
+                nativeFlowMessage: {
                     buttons,
-                })
+                },
             };
             return msg;
         }));
@@ -869,7 +920,7 @@ const generateWAMessageContent = async (message, options) => {
 };
 exports.generateWAMessageContent = generateWAMessageContent;
 const generateWAMessageFromContent = (jid, message, options) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     // set timestamp to now
     // if not specified
     if (!options.timestamp) {
@@ -889,7 +940,16 @@ const generateWAMessageFromContent = (jid, message, options) => {
         if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) {
             delete quotedContent.contextInfo;
         }
-        const contextInfo = (key === 'requestPaymentMessage' ? (((_b = (_a = innerMessage.requestPaymentMessage) === null || _a === void 0 ? void 0 : _a.noteMessage) === null || _b === void 0 ? void 0 : _b.extendedTextMessage) || ((_d = (_c = innerMessage.requestPaymentMessage) === null || _c === void 0 ? void 0 : _c.noteMessage) === null || _d === void 0 ? void 0 : _d.stickerMessage)).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;
@@ -1096,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

@@ -4,17 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useMultiFileAuthState = void 0;
-const async_lock_1 = __importDefault(require("async-lock"));
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const WAProto_1 = require("../../WAProto");
 const auth_utils_1 = require("./auth-utils");
 const generics_1 = require("./generics");
-// We need to lock files due to the fact that we are using async functions to read and write files
-// https://github.com/WhiskeySockets/Baileys/issues/794
-// https://github.com/nodejs/node/issues/26338
-// Default pending is 1000, set it to infinity
-// https://github.com/rogierschouten/async-lock/issues/63
+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.
@@ -24,7 +19,6 @@ const fileLock = new async_lock_1.default({ maxPending: Infinity });
  * Would recommend writing an auth state for use with a proper SQL or No-SQL DB
  * */
 const useMultiFileAuthState = async (folder) => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const writeData = (data, file) => {
         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)));

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

@@ -10,21 +10,30 @@ const crypto_2 = require("./crypto");
 const generics_1 = require("./generics");
 const signal_1 = require("./signal");
 const getUserAgent = (config) => {
+    var _a, _b;
+    const osVersion = config.mobile ? '15.3.1' : '0.1';
+    const version = config.mobile ? [2, 24, 6] : config.version;
+    const device = config.mobile ? 'iPhone_7' : 'Desktop';
+    const manufacturer = config.mobile ? 'Apple' : '';
+    const platform = config.mobile ? WAProto_1.proto.ClientPayload.UserAgent.Platform.IOS : WAProto_1.proto.ClientPayload.UserAgent.Platform.WEB;
+    const phoneId = config.mobile ? { phoneId: config.auth.creds.phoneId } : {};
     return {
         appVersion: {
-            primary: config.version[0],
-            secondary: config.version[1],
-            tertiary: config.version[2],
+            primary: version[0],
+            secondary: version[1],
+            tertiary: version[2],
         },
-        platform: WAProto_1.proto.ClientPayload.UserAgent.Platform.WEB,
+        platform,
         releaseChannel: WAProto_1.proto.ClientPayload.UserAgent.ReleaseChannel.RELEASE,
-        osVersion: '0.1',
-        device: 'Desktop',
-        osBuildNumber: '0.1',
+        mcc: ((_a = config.auth.creds.registration) === null || _a === void 0 ? void 0 : _a.phoneNumberMobileCountryCode) || '000',
+        mnc: ((_b = config.auth.creds.registration) === null || _b === void 0 ? void 0 : _b.phoneNumberMobileNetworkCode) || '000',
+        osVersion: osVersion,
+        manufacturer,
+        device,
+        osBuildNumber: osVersion,
         localeLanguageIso6391: 'en',
-        mnc: '000',
-        mcc: '000',
-        localeCountryIso31661Alpha2: config.countryCode,
+        localeCountryIso31661Alpha2: 'US',
+        ...phoneId
     };
 };
 const PLATFORM_MAP = {
@@ -44,7 +53,9 @@ const getClientPayload = (config) => {
         connectReason: WAProto_1.proto.ClientPayload.ConnectReason.USER_ACTIVATED,
         userAgent: getUserAgent(config),
     };
-    payload.webInfo = getWebInfo(config);
+    if (!config.mobile) {
+        payload.webInfo = getWebInfo(config);
+    }
     return payload;
 };
 const generateMobileNode = (config) => {
@@ -61,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/index.js

@@ -17,9 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.proto = exports.makeWASocket = void 0;
-const WAProto_1 = require("../WAProto");
-Object.defineProperty(exports, "proto", { enumerable: true, get: function () { return WAProto_1.proto; } });
+exports.makeWASocket = void 0;
 const Socket_1 = __importDefault(require("./Socket"));
 exports.makeWASocket = Socket_1.default;
 __exportStar(require("../WAProto"), exports);