@d0v3riz/baileys 6.7.1 → 6.7.4

package/lib/Defaults/baileys-version.json

@@ -1,3 +1,3 @@
 {
-    "version": [2, 2403, 2]
+    "version": [2, 2413, 1]
 }

package/lib/Socket/business.d.ts

@@ -2,6 +2,7 @@
 import { GetCatalogOptions, ProductCreate, ProductUpdate, SocketConfig } from '../Types';
 import { BinaryNode } from '../WABinary';
 export declare const makeBusinessSocket: (config: SocketConfig) => {
+    logger: import("pino").Logger<import("pino").LoggerOptions>;
     getOrderDetails: (orderId: string, tokenBase64: string) => Promise<import("../Types").OrderDetails>;
     getCatalog: ({ jid, limit, cursor }: GetCatalogOptions) => Promise<{
         products: import("../Types").Product[];

package/lib/Socket/business.js

@@ -248,6 +248,7 @@ const makeBusinessSocket = (config) => {
     };
     return {
         ...sock,
+        logger: config.logger,
         getOrderDetails,
         getCatalog,
         getCollections,

package/lib/Socket/chats.d.ts

@@ -61,6 +61,9 @@ export declare const makeChatsSocket: (config: SocketConfig) => {
         creds: import("../Types").AuthenticationCreds;
         keys: import("../Types").SignalKeyStoreWithTransaction;
     };
+    /**
+     * Star or Unstar a message
+     */
     signalRepository: import("../Types").SignalRepository;
     user: import("../Types").Contact | undefined;
     generateMessageTag: () => string;
@@ -72,6 +75,9 @@ export declare const makeChatsSocket: (config: SocketConfig) => {
     logout: (msg?: string | undefined) => Promise<void>;
     end: (error: Error | undefined) => void;
     onUnexpectedError: (err: Error | Boom<any>, msg: string) => void;
+    /**
+     * Adds label for the chats
+     */
     uploadPreKeys: (count?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;
     requestPairingCode: (phoneNumber: string) => Promise<string>;

package/lib/Socket/chats.js

@@ -511,7 +511,7 @@ const makeChatsSocket = (config) => {
         let presence;
         const jid = attrs.from;
         const participant = attrs.participant || attrs.from;
-        if (shouldIgnoreJid(jid)) {
+        if (shouldIgnoreJid(jid) && jid !== '@s.whatsapp.net') {
             return;
         }
         if (tag === 'presence') {
@@ -597,29 +597,9 @@ const makeChatsSocket = (config) => {
             }
         }
     };
-    /** sending abt props may fix QR scan fail if server expects */
-    const fetchAbt = async () => {
-        const abtNode = await query({
-            tag: 'iq',
-            attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
-                xmlns: 'abt',
-                type: 'get',
-            },
-            content: [
-                { tag: 'props', attrs: { protocol: '1' } }
-            ]
-        });
-        const propsNode = (0, WABinary_1.getBinaryNodeChild)(abtNode, 'props');
-        let props = {};
-        if (propsNode) {
-            props = (0, WABinary_1.reduceBinaryNodeToDictionary)(propsNode, 'prop');
-        }
-        logger.debug('fetched abt');
-        return props;
-    };
     /** sending non-abt props may fix QR scan fail if server expects */
     const fetchProps = async () => {
+        var _a, _b;
         const resultNode = await query({
             tag: 'iq',
             attrs: {
@@ -628,12 +608,17 @@ const makeChatsSocket = (config) => {
                 type: 'get',
             },
             content: [
-                { tag: 'props', attrs: {} }
+                { tag: 'props', attrs: {
+                        protocol: '2',
+                        hash: ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.lastPropHash) || ''
+                    } }
             ]
         });
         const propsNode = (0, WABinary_1.getBinaryNodeChild)(resultNode, 'props');
         let props = {};
         if (propsNode) {
+            authState.creds.lastPropHash = (_b = propsNode === null || propsNode === void 0 ? void 0 : propsNode.attrs) === null || _b === void 0 ? void 0 : _b.hash;
+            ev.emit('creds.update', authState.creds);
             props = (0, WABinary_1.reduceBinaryNodeToDictionary)(propsNode, 'prop');
         }
         logger.debug('fetched props');
@@ -707,7 +692,6 @@ const makeChatsSocket = (config) => {
      * */
     const executeInitQueries = async () => {
         await Promise.all([
-            fetchAbt(),
             fetchProps(),
             fetchBlocklist(),
             fetchPrivacySettings(),

package/lib/Socket/index.d.ts

@@ -3,6 +3,7 @@ import { UserFacingSocketConfig } from '../Types';
 declare const makeWASocket: (config: UserFacingSocketConfig) => {
     register: (code: string) => Promise<import("./registration").ExistsResponse>;
     requestRegistrationCode: (registrationOptions?: import("./registration").RegistrationOptions | undefined) => Promise<import("./registration").ExistsResponse>;
+    logger: import("pino").Logger<import("pino").LoggerOptions>;
     getOrderDetails: (orderId: string, tokenBase64: string) => Promise<import("../Types").OrderDetails>;
     getCatalog: ({ jid, limit, cursor }: import("../Types").GetCatalogOptions) => Promise<{
         products: import("../Types").Product[];

package/lib/Socket/messages-recv.js

@@ -163,6 +163,8 @@ const makeMessagesRecvSocket = (config) => {
         }
     };
     const handleGroupNotification = (participant, child, msg) => {
+        var _a, _b;
+        const participantJid = ((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(child, 'participant')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.jid) || participant;
         switch (child === null || child === void 0 ? void 0 : child.tag) {
             case 'create':
                 const metadata = (0, groups_1.extractGroupMetadata)(child);
@@ -237,6 +239,15 @@ const makeMessagesRecvSocket = (config) => {
                     msg.messageStubParameters = [approvalMode.attrs.state];
                 }
                 break;
+            case 'created_membership_requests':
+                msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
+                msg.messageStubParameters = [participantJid, 'created', child.attrs.request_method];
+                break;
+            case 'revoked_membership_requests':
+                const isDenied = (0, WABinary_1.areJidsSameUser)(participantJid, participant);
+                msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
+                msg.messageStubParameters = [participantJid, isDenied ? 'revoked' : 'rejected'];
+                break;
         }
     };
     const processNotification = async (node) => {
@@ -461,7 +472,7 @@ const makeMessagesRecvSocket = (config) => {
             fromMe,
             participant: attrs.participant
         };
-        if (shouldIgnoreJid(remoteJid)) {
+        if (shouldIgnoreJid(remoteJid) && remoteJid !== '@s.whatsapp.net') {
             logger.debug({ remoteJid }, 'ignoring receipt from jid');
             await sendMessageAck(node);
             return;
@@ -480,7 +491,7 @@ const makeMessagesRecvSocket = (config) => {
                     // or another device of ours has read some messages
                     status > WAProto_1.proto.WebMessageInfo.Status.DELIVERY_ACK ||
                         !isNodeFromMe)) {
-                    if ((0, WABinary_1.isJidGroup)(remoteJid)) {
+                    if ((0, WABinary_1.isJidGroup)(remoteJid) || (0, WABinary_1.isJidStatusBroadcast)(remoteJid)) {
                         if (attrs.participant) {
                             const updateKey = status === WAProto_1.proto.WebMessageInfo.Status.DELIVERY_ACK ? 'receiptTimestamp' : 'readTimestamp';
                             ev.emit('message-receipt.update', ids.map(id => ({
@@ -527,7 +538,7 @@ const makeMessagesRecvSocket = (config) => {
     };
     const handleNotification = async (node) => {
         const remoteJid = node.attrs.from;
-        if (shouldIgnoreJid(remoteJid)) {
+        if (shouldIgnoreJid(remoteJid) && remoteJid !== '@s.whatsapp.net') {
             logger.debug({ remoteJid, id: node.attrs.id }, 'ignored notification');
             await sendMessageAck(node);
             return;
@@ -556,17 +567,17 @@ const makeMessagesRecvSocket = (config) => {
     };
     const handleMessage = async (node) => {
         var _a, _b;
+        if (shouldIgnoreJid(node.attrs.from) && node.attrs.from !== '@s.whatsapp.net') {
+            logger.debug({ key: node.attrs.key }, 'ignored message');
+            await sendMessageAck(node);
+            return;
+        }
         const { fullMessage: msg, category, author, decrypt } = (0, Utils_1.decryptMessageNode)(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger);
         if (((_b = (_a = msg.message) === null || _a === void 0 ? void 0 : _a.protocolMessage) === null || _b === void 0 ? void 0 : _b.type) === WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER) {
             if (node.attrs.sender_pn) {
                 ev.emit('chats.phoneNumberShare', { lid: node.attrs.from, jid: node.attrs.sender_pn });
             }
         }
-        if (shouldIgnoreJid(msg.key.remoteJid)) {
-            logger.debug({ key: msg.key }, 'ignored message');
-            await sendMessageAck(node);
-            return;
-        }
         await Promise.all([
             processingMutex.mutex(async () => {
                 await decrypt();

package/lib/Socket/registration.d.ts

@@ -4,6 +4,7 @@ import { KeyPair, SignedKeyPair, SocketConfig } from '../Types';
 export declare const makeRegistrationSocket: (config: SocketConfig) => {
     register: (code: string) => Promise<ExistsResponse>;
     requestRegistrationCode: (registrationOptions?: RegistrationOptions) => Promise<ExistsResponse>;
+    logger: import("pino").Logger<import("pino").LoggerOptions>;
     getOrderDetails: (orderId: string, tokenBase64: string) => Promise<import("../Types").OrderDetails>;
     getCatalog: ({ jid, limit, cursor }: import("../Types").GetCatalogOptions) => Promise<{
         products: import("../Types").Product[];

package/lib/Socket/socket.js

@@ -18,12 +18,16 @@ const Client_1 = require("./Client");
  * - query phone connection
  */
 const makeSocket = (config) => {
+    var _a, _b;
     const { waWebSocketUrl, connectTimeoutMs, logger, keepAliveIntervalMs, browser, auth: authState, printQRInTerminal, defaultQueryTimeoutMs, transactionOpts, qrTimeout, makeSignalRepository, } = config;
     let url = typeof waWebSocketUrl === 'string' ? new url_1.URL(waWebSocketUrl) : waWebSocketUrl;
     config.mobile = config.mobile || url.protocol === 'tcp:';
     if (config.mobile && url.protocol !== 'tcp:') {
         url = new url_1.URL(`tcp://${Defaults_1.MOBILE_ENDPOINT}:${Defaults_1.MOBILE_PORT}`);
     }
+    if (!config.mobile && url.protocol === 'wss' && ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.routingInfo)) {
+        url.searchParams.append('ED', authState.creds.routingInfo.toString('base64url'));
+    }
     const ws = config.socket ? config.socket : config.mobile ? new Client_1.MobileSocketClient(url, config) : new Client_1.WebSocketClient(url, config);
     ws.connect();
     const ev = (0, Utils_1.makeEventBuffer)(logger);
@@ -34,7 +38,8 @@ const makeSocket = (config) => {
         keyPair: ephemeralKeyPair,
         NOISE_HEADER: config.mobile ? Defaults_1.MOBILE_NOISE_HEADER : Defaults_1.NOISE_WA_HEADER,
         mobile: config.mobile,
-        logger
+        logger,
+        routingInfo: (_b = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _b === void 0 ? void 0 : _b.routingInfo
     });
     const { creds } = authState;
     // add transaction capability
@@ -526,6 +531,14 @@ const makeSocket = (config) => {
     ws.on('CB:ib,,downgrade_webclient', () => {
         end(new boom_1.Boom('Multi-device beta not joined', { statusCode: Types_1.DisconnectReason.multideviceMismatch }));
     });
+    ws.on('CB:ib,,edge_routing', (node) => {
+        const edgeRoutingNode = (0, WABinary_1.getBinaryNodeChild)(node, 'edge_routing');
+        const routingInfo = (0, WABinary_1.getBinaryNodeChild)(edgeRoutingNode, 'routing_info');
+        if (routingInfo === null || routingInfo === void 0 ? void 0 : routingInfo.content) {
+            authState.creds.routingInfo = Buffer.from(routingInfo === null || routingInfo === void 0 ? void 0 : routingInfo.content);
+            ev.emit('creds.update', authState.creds);
+        }
+    });
     let didStartBuffer = false;
     process.nextTick(() => {
         var _a;

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

@@ -20,7 +20,7 @@ export type BaileysInMemoryStoreConfig = {
     logger?: Logger;
     socket?: WASocket;
 };
-declare const _default: ({ logger: _logger, chatKey, labelAssociationKey, socket }: BaileysInMemoryStoreConfig) => {
+declare const _default: (config: BaileysInMemoryStoreConfig) => {
     chats: KeyedDB<Chat, string>;
     contacts: {
         [_: string]: Contact;

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

@@ -23,48 +23,11 @@ exports.waLabelAssociationKey = {
     compare: (k1, k2) => k2.localeCompare(k1)
 };
 const makeMessagesDictionary = () => (0, make_ordered_dictionary_1.default)(exports.waMessageID);
-const predefinedLabels = Object.freeze({
-    '1': {
-        id: '1',
-        name: 'New customer',
-        predefinedId: '1',
-        color: 1,
-        deleted: false
-    },
-    '2': {
-        id: '2',
-        name: 'New order',
-        predefinedId: '2',
-        color: 2,
-        deleted: false
-    },
-    '3': {
-        id: '3',
-        name: 'Pending payment',
-        predefinedId: '3',
-        color: 3,
-        deleted: false
-    },
-    '4': {
-        id: '4',
-        name: 'Paid',
-        predefinedId: '4',
-        color: 4,
-        deleted: false
-    },
-    '5': {
-        id: '5',
-        name: 'Order completed',
-        predefinedId: '5',
-        color: 5,
-        deleted: false
-    }
-});
-exports.default = ({ logger: _logger, chatKey, labelAssociationKey, socket }) => {
-    // const logger = _logger || DEFAULT_CONNECTION_CONFIG.logger.child({ stream: 'in-mem-store' })
-    chatKey = chatKey || (0, exports.waChatKey)(true);
-    labelAssociationKey = labelAssociationKey || exports.waLabelAssociationKey;
-    const logger = _logger || Defaults_1.DEFAULT_CONNECTION_CONFIG.logger.child({ stream: 'in-mem-store' });
+exports.default = (config) => {
+    const socket = config.socket;
+    const chatKey = config.chatKey || (0, exports.waChatKey)(true);
+    const labelAssociationKey = config.labelAssociationKey || exports.waLabelAssociationKey;
+    const logger = config.logger || Defaults_1.DEFAULT_CONNECTION_CONFIG.logger.child({ stream: 'in-mem-store' });
     const KeyedDB = require('@adiwajshing/keyed-db').default;
     const chats = new KeyedDB(chatKey, c => c.id);
     const messages = {};
@@ -72,7 +35,7 @@ exports.default = ({ logger: _logger, chatKey, labelAssociationKey, socket }) =>
     const groupMetadata = {};
     const presences = {};
     const state = { connection: 'close' };
-    const labels = new object_repository_1.ObjectRepository(predefinedLabels);
+    const labels = new object_repository_1.ObjectRepository();
     const labelAssociations = new KeyedDB(labelAssociationKey, labelAssociationKey.key);
     const assertMessageList = (jid) => {
         if (!messages[jid]) {
@@ -130,31 +93,31 @@ exports.default = ({ logger: _logger, chatKey, labelAssociationKey, socket }) =>
             contactsUpsert(contacts);
         });
         ev.on('contacts.update', async (updates) => {
+            var _a;
             for (const update of updates) {
                 let contact;
                 if (contacts[update.id]) {
                     contact = contacts[update.id];
                 }
                 else {
-                    const contactHashes = await Promise.all(Object.keys(contacts).map(async (a) => {
-                        return (await (0, Utils_1.md5)(Buffer.from(a + 'WA_ADD_NOTIF', 'utf8'))).toString('base64').slice(0, 3);
+                    const contactHashes = await Promise.all(Object.keys(contacts).map(async (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)];
                     }));
-                    contact = contacts[contactHashes.find(a => a === update.id) || ''];
+                    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 (update.imgUrl === 'changed' || update.imgUrl === 'removed') {
-                    if (contact) {
-                        if (update.imgUrl === 'changed') {
-                            contact.imgUrl = socket ? await (socket === null || socket === void 0 ? void 0 : socket.profilePictureUrl(contact.id)) : undefined;
-                        }
-                        else {
-                            delete contact.imgUrl;
-                        }
+                if (contact) {
+                    if (update.imgUrl === 'changed') {
+                        contact.imgUrl = socket ? await (socket === null || socket === void 0 ? void 0 : socket.profilePictureUrl(contact.id)) : undefined;
                     }
-                    else {
-                        return logger.debug({ update }, 'got update for non-existant contact');
+                    else if (update.imgUrl === 'removed') {
+                        delete contact.imgUrl;
                     }
                 }
-                Object.assign(contacts[update.id], contact);
+                else {
+                    return logger.debug({ update }, 'got update for non-existant contact');
+                }
+                Object.assign(contacts[contact.id], contact);
             }
         });
         ev.on('chats.upsert', newChats => {

package/lib/Types/Auth.d.ts

@@ -64,6 +64,8 @@ export type AuthenticationCreds = SignalCreds & {
     backupToken: Buffer;
     registration: RegistrationOptions;
     pairingCode: string | undefined;
+    lastPropHash: string | undefined;
+    routingInfo: Buffer | undefined;
 };
 export type SignalDataTypeMap = {
     'pre-key': KeyPair;

package/lib/Types/Events.d.ts

@@ -4,7 +4,7 @@ import { AuthenticationCreds } from './Auth';
 import { WACallEvent } from './Call';
 import { Chat, ChatUpdate, PresenceData } from './Chat';
 import { Contact } from './Contact';
-import { GroupMetadata, ParticipantAction } from './GroupMetadata';
+import { GroupMetadata, ParticipantAction, RequestJoinAction, RequestJoinMethod } from './GroupMetadata';
 import { Label } from './Label';
 import { LabelAssociation } from './LabelAssociation';
 import { MessageUpsertType, MessageUserReceiptUpdate, WAMessage, WAMessageKey, WAMessageUpdate } from './Message';
@@ -78,6 +78,13 @@ export type BaileysEventMap = {
         participants: string[];
         action: ParticipantAction;
     };
+    'group.join-request': {
+        id: string;
+        author: string;
+        participant: string;
+        action: RequestJoinAction;
+        method: RequestJoinMethod;
+    };
     'blocklist.set': {
         blocklist: string[];
     };

package/lib/Types/GroupMetadata.d.ts

@@ -5,6 +5,8 @@ export type GroupParticipant = (Contact & {
     admin?: 'admin' | 'superadmin' | null;
 });
 export type ParticipantAction = 'add' | 'remove' | 'promote' | 'demote';
+export type RequestJoinAction = 'created' | 'revoked' | 'rejected';
+export type RequestJoinMethod = 'invite_link' | 'linked_group_join' | 'non_admin_add' | undefined;
 export interface GroupMetadata {
     id: string;
     owner: string | undefined;

package/lib/Types/Message.d.ts

@@ -210,6 +210,8 @@ export type MiscMessageGenerationOptions = MinimalRelayOptions & {
     backgroundColor?: string;
     /** font type for status */
     font?: number;
+    /** if it is broadcast */
+    broadcast?: boolean;
 };
 export type MessageGenerationOptionsFromContent = MiscMessageGenerationOptions & {
     userJid: string;

package/lib/Utils/auth-utils.js

@@ -199,6 +199,8 @@ const initAuthCreds = () => {
         backupToken: (0, crypto_1.randomBytes)(20),
         registration: {},
         pairingCode: undefined,
+        lastPropHash: undefined,
+        routingInfo: undefined,
     };
 };
 exports.initAuthCreds = initAuthCreds;

package/lib/Utils/messages.d.ts

@@ -1,6 +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';
@@ -70,7 +71,7 @@ type DownloadMediaMessageContext = {
 /**
  * Downloads the given message. Throws an error if it's not a media message
  */
-export declare const downloadMediaMessage: (message: WAMessage, type: 'buffer' | 'stream', options: MediaDownloadOptions, ctx?: DownloadMediaMessageContext) => Promise<Buffer | import("stream").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

@@ -706,12 +706,9 @@ const REUPLOAD_REQUIRED_STATUS = [410, 404];
  * Downloads the given message. Throws an error if it's not a media message
  */
 const downloadMediaMessage = async (message, type, options, ctx) => {
-    var _a;
-    try {
-        const result = await downloadMsg();
-        return result;
-    }
-    catch (error) {
+    const result = await downloadMsg()
+        .catch(async (error) => {
+        var _a;
         if (ctx) {
             if (axios_1.default.isAxiosError(error)) {
                 // check if the message requires a reupload
@@ -725,7 +722,8 @@ const downloadMediaMessage = async (message, type, options, ctx) => {
             }
         }
         throw error;
-    }
+    });
+    return result;
     async function downloadMsg() {
         const mContent = (0, exports.extractMessageContent)(message.message);
         if (!mContent) {

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

@@ -3,11 +3,12 @@ import { Logger } from 'pino';
 import { proto } from '../../WAProto';
 import { KeyPair } from '../Types';
 import { BinaryNode } from '../WABinary';
-export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, }: {
+export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, routingInfo }: {
     keyPair: KeyPair;
     NOISE_HEADER: Uint8Array;
     mobile: boolean;
     logger: Logger;
+    routingInfo?: Buffer | undefined;
 }) => {
     encrypt: (plaintext: Uint8Array) => Buffer;
     decrypt: (ciphertext: Uint8Array) => Buffer;

package/lib/Utils/noise-handler.js

@@ -11,7 +11,7 @@ const generateIV = (counter) => {
     new DataView(iv).setUint32(8, counter);
     return new Uint8Array(iv);
 };
-const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, }) => {
+const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, routingInfo }) => {
     logger = logger.child({ class: 'ns' });
     const authenticate = (data) => {
         if (!isFinished) {
@@ -101,10 +101,23 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
             if (isFinished) {
                 data = encrypt(data);
             }
-            const introSize = sentIntro ? 0 : NOISE_HEADER.length;
+            let header;
+            if (routingInfo) {
+                header = Buffer.alloc(7);
+                header.write('ED', 0, 'utf8');
+                header.writeUint8(0, 2);
+                header.writeUint8(1, 3);
+                header.writeUint8(routingInfo.byteLength >> 16, 4);
+                header.writeUint16BE(routingInfo.byteLength & 65535, 5);
+                header = Buffer.concat([header, routingInfo, NOISE_HEADER]);
+            }
+            else {
+                header = Buffer.from(NOISE_HEADER);
+            }
+            const introSize = sentIntro ? 0 : header.length;
             const frame = Buffer.alloc(introSize + 3 + data.byteLength);
             if (!sentIntro) {
-                frame.set(NOISE_HEADER);
+                frame.set(header);
                 sentIntro = true;
             }
             frame.writeUInt8(data.byteLength >> 16, introSize);

package/lib/Utils/process-message.js

@@ -103,7 +103,7 @@ function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pol
 }
 exports.decryptPollVote = decryptPollVote;
 const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, keyStore, logger, options, getMessage }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const meId = creds.me.id;
     const { accountSettings } = creds;
     const chat = { id: (0, WABinary_1.jidNormalizedUser)((0, exports.getChatId)(message.key)) };
@@ -220,6 +220,9 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
             var _a;
             ev.emit('groups.update', [{ id: jid, ...update, author: (_a = message.participant) !== null && _a !== void 0 ? _a : undefined }]);
         };
+        const emitGroupRequestJoin = (participant, action, method) => {
+            ev.emit('group.join-request', { id: jid, author: message.participant, participant, action, method: method });
+        };
         const participantsIncludesMe = () => participants.find(jid => (0, WABinary_1.areJidsSameUser)(meId, jid));
         switch (message.messageStubType) {
             case Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE:
@@ -273,6 +276,12 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
                 const approvalMode = (_j = message.messageStubParameters) === null || _j === void 0 ? void 0 : _j[0];
                 emitGroupUpdate({ joinApprovalMode: approvalMode === 'on' });
                 break;
+            case Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD:
+                const participant = (_k = message.messageStubParameters) === null || _k === void 0 ? void 0 : _k[0];
+                const action = (_l = message.messageStubParameters) === null || _l === void 0 ? void 0 : _l[1];
+                const method = (_m = message.messageStubParameters) === null || _m === void 0 ? void 0 : _m[2];
+                emitGroupRequestJoin(participant, action, method);
+                break;
         }
     }
     else if (content === null || content === void 0 ? void 0 : content.pollUpdateMessage) {
@@ -283,7 +292,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
             const meIdNormalised = (0, WABinary_1.jidNormalizedUser)(meId);
             const pollCreatorJid = (0, generics_1.getKeyAuthor)(creationMsgKey, meIdNormalised);
             const voterJid = (0, generics_1.getKeyAuthor)(message.key, meIdNormalised);
-            const pollEncKey = (_k = pollMsg.messageContextInfo) === null || _k === void 0 ? void 0 : _k.messageSecret;
+            const pollEncKey = (_o = pollMsg.messageContextInfo) === null || _o === void 0 ? void 0 : _o.messageSecret;
             try {
                 const voteMsg = decryptPollVote(content.pollUpdateMessage.vote, {
                     pollEncKey,

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

@@ -1,11 +1,21 @@
 "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 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 fileLock = new async_lock_1.default({ maxPending: Infinity });
 /**
  * stores the full authentication state in a single folder.
  * Far more efficient than singlefileauthstate
@@ -15,11 +25,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 +40,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d0v3riz/baileys",
-  "version": "6.7.1",
+  "version": "6.7.4",
   "description": "WhatsApp API",
   "keywords": [
     "whatsapp",
@@ -46,6 +46,7 @@
     "@adiwajshing/keyed-db": "^0.2.4",
     "@d0v3riz/ws": "^8.13.0",
     "@hapi/boom": "^9.1.3",
+    "async-lock": "^1.4.1",
     "audio-decode": "^2.1.3",
     "axios": "^1.3.3",
     "cache-manager": "4.0.1",
@@ -70,6 +71,7 @@
     "eslint": "^8.0.0",
     "jest": "^27.0.6",
     "jimp": "^0.16.1",
+    "json": "^11.0.0",
     "link-preview-js": "^3.0.0",
     "open": "^8.4.2",
     "qrcode-terminal": "^0.12.0",
@@ -78,8 +80,7 @@
     "ts-jest": "^27.0.3",
     "ts-node": "^10.8.1",
     "typedoc": "^0.24.7",
-    "typescript": "^4.6.4",
-    "json": "^11.0.0"
+    "typescript": "^4.6.4"
   },
   "peerDependencies": {
     "jimp": "^0.16.1",