@baileys-md/baileys 11.2.4 → 12.0.0

package/lib/Socket/messages-recv.js

@@ -18,7 +18,7 @@ const messages_send_1 = require("./messages-send");
 const makeMessagesRecvSocket = (config) => {
     const { logger, retryRequestDelayMs, maxMsgRetryCount, getMessage, shouldIgnoreJid } = config;
     const sock = (0, messages_send_1.makeMessagesSocket)(config);
-    const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, createParticipantNodes, getUSyncDevices, sendPeerDataOperationMessage, } = sock;
+    const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, groupMetadata, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, createParticipantNodes, getUSyncDevices, sendPeerDataOperationMessage, } = sock;
     /** this mutex ensures that each retryRequest will wait for the previous one to finish */
     const retryMutex = (0, make_mutex_1.makeMutex)();
     const msgRetryCache = config.msgRetryCounterCache || new node_cache_1.default({
@@ -332,28 +332,28 @@ const makeMessagesRecvSocket = (config) => {
                 break;
                 break;
             default:
-            // console.log("BAILEYS-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
+            // console.log("WILEYS-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
         }
     };
     const handleNewsletterNotification = (id, node) => {
         const messages = (0, WABinary_1.getBinaryNodeChild)(node, 'messages');
         const message = (0, WABinary_1.getBinaryNodeChild)(messages, 'message');
-        const server_id = message.attrs.server_id;
+        const serverId = message.attrs.server_id;
         const reactionsList = (0, WABinary_1.getBinaryNodeChild)(message, 'reactions');
         const viewsList = (0, WABinary_1.getBinaryNodeChildren)(message, 'views_count');
         if (reactionsList) {
             const reactions = (0, WABinary_1.getBinaryNodeChildren)(reactionsList, 'reaction');
             if (reactions.length === 0) {
-                ev.emit('newsletter.reaction', { id, server_id, reaction: { removed: true } });
+                ev.emit('newsletter.reaction', { id, 'server_id': serverId, reaction: { removed: true } });
             }
             reactions.forEach(item => {
                 var _a, _b;
-                ev.emit('newsletter.reaction', { id, server_id, reaction: { code: (_a = item.attrs) === null || _a === void 0 ? void 0 : _a.code, count: +((_b = item.attrs) === null || _b === void 0 ? void 0 : _b.count) } });
+                ev.emit('newsletter.reaction', { id, 'server_id': serverId, reaction: { code: (_a = item.attrs) === null || _a === void 0 ? void 0 : _a.code, count: +((_b = item.attrs) === null || _b === void 0 ? void 0 : _b.count) } });
             });
         }
         if (viewsList.length) {
             viewsList.forEach(item => {
-                ev.emit('newsletter.view', { id, server_id, count: +item.attrs.count });
+                ev.emit('newsletter.view', { id, 'server_id': serverId, count: +item.attrs.count });
             });
         }
     };
@@ -574,8 +574,7 @@ const makeMessagesRecvSocket = (config) => {
             await authState.keys.set({ 'sender-key-memory': { [remoteJid]: null } });
         }
         logger.debug({ participant, sendToAll }, 'forced new session for retry recp');
-        for (let i = 0; i < msgs.length; i++) {
-            const msg = msgs[i];
+        for (const [i, msg] of msgs.entries()) {
             if (msg) {
                 updateSendMessageAgainCount(ids[i], participant);
                 const msgRelayOpts = { messageId: ids[i] };
@@ -601,7 +600,7 @@ const makeMessagesRecvSocket = (config) => {
         const isLid = attrs.from.includes('lid');
         const isNodeFromMe = (0, WABinary_1.areJidsSameUser)(attrs.participant || attrs.from, isLid ? (_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.lid : (_b = authState.creds.me) === null || _b === void 0 ? void 0 : _b.id);
         const remoteJid = !isNodeFromMe || (0, WABinary_1.isJidGroup)(attrs.from) ? attrs.from : attrs.recipient;
-        const fromMe = !attrs.recipient || (attrs.type === 'retry' && isNodeFromMe);
+        const fromMe = !attrs.recipient || ((attrs.type === 'retry' || attrs.type === 'sender') && isNodeFromMe);
         const key = {
             remoteJid,
             id: '',
@@ -742,15 +741,13 @@ const makeMessagesRecvSocket = (config) => {
         if (response && ((_a = msg === null || msg === void 0 ? void 0 : msg.messageStubParameters) === null || _a === void 0 ? void 0 : _a[0]) === Utils_1.NO_MESSAGE_FOUND_ERROR_TEXT) {
             msg.messageStubParameters = [Utils_1.NO_MESSAGE_FOUND_ERROR_TEXT, response];
         }
-        if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.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 (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.type) === WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER && node.attrs.sender_pn) {
+            ev.emit('chats.phoneNumberShare', { lid: node.attrs.from, jid: node.attrs.sender_pn });
         }
         try {
             await Promise.all([
                 processingMutex.mutex(async () => {
-                    var _a;
+                    var _a, _b, _c, _d, _e, _f;
                     await decrypt();
                     // message failed to decrypt
                     if (msg.messageStubType === WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT) {
@@ -776,6 +773,20 @@ const makeMessagesRecvSocket = (config) => {
                     else {
                         // no type in the receipt => message delivered
                         let type = undefined;
+                        if ((_b = msg.key.participant) === null || _b === void 0 ? void 0 : _b.endsWith('@lid')) {
+                            msg.key.participant = node.attrs.participant_pn || authState.creds.me.id;
+                        }
+                        if ((0, WABinary_1.isJidGroup)(msg.key.remoteJid) && ((_f = (_e = (_d = (_c = msg.message) === null || _c === void 0 ? void 0 : _c.extendedTextMessage) === null || _d === void 0 ? void 0 : _d.contextInfo) === null || _e === void 0 ? void 0 : _e.participant) === null || _f === void 0 ? void 0 : _f.endsWith('@lid'))) {
+                            if (msg.message.extendedTextMessage.contextInfo) {
+                                const metadata = await groupMetadata(msg.key.remoteJid);
+                                const sender = msg.message.extendedTextMessage.contextInfo.participant;
+                                const found = metadata.participants.find(p => p.id === sender);
+                                msg.message.extendedTextMessage.contextInfo.participant = (found === null || found === void 0 ? void 0 : found.jid) || sender;
+                            }
+                        }
+                        if (!(0, WABinary_1.isJidGroup)(msg.key.remoteJid) && (0, WABinary_1.isLidUser)(msg.key.remoteJid)) {
+                            msg.key.remoteJid = node.attrs.sender_pn || node.attrs.peer_recipient_pn;
+                        }
                         let participant = msg.key.participant;
                         if (category === 'peer') { // special peer message
                             type = 'peer_msg';
@@ -890,7 +901,7 @@ const makeMessagesRecvSocket = (config) => {
         await sendMessageAck(node);
     };
     const handleBadAck = async ({ attrs }) => {
-        const key = { remoteJid: attrs.from, fromMe: true, id: attrs.id, server_id: attrs === null || attrs === void 0 ? void 0 : attrs.server_id };
+        const key = { remoteJid: attrs.from, fromMe: true, id: attrs.id, 'server_id': attrs === null || attrs === void 0 ? void 0 : attrs.server_id };
         // current hypothesis is that if pash is sent in the ack
         // it means -- the message hasn't reached all devices yet
         // we'll retry sending the message here

package/lib/Socket/messages-send.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMessagesSocket = void 0;
 const boom_1 = require("@hapi/boom");
 const node_cache_1 = __importDefault(require("@cacheable/node-cache"));
+const crypto_1 = require("crypto");
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
 const Utils_1 = require("../Utils");
@@ -13,7 +14,6 @@ const link_preview_1 = require("../Utils/link-preview");
 const WABinary_1 = require("../WABinary");
 const WAUSync_1 = require("../WAUSync");
 const newsletter_1 = require("./newsletter");
-var ListType = WAProto_1.proto.Message.ListMessage.ListType;
 const makeMessagesSocket = (config) => {
     const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: axiosOptions, patchMessageBeforeSending, cachedGroupMetadata, } = config;
     const sock = (0, newsletter_1.makeNewsletterSocket)(config);
@@ -266,7 +266,7 @@ const makeMessagesSocket = (config) => {
         const { user, server } = (0, WABinary_1.jidDecode)(jid);
         const statusJid = 'status@broadcast';
         const isGroup = server === 'g.us';
-        const isNewsletter = server == 'newsletter';
+        const isNewsletter = server === 'newsletter';
         const isStatus = jid === statusJid;
         const isLid = server === 'lid';
         msgId = msgId || (0, Utils_1.generateMessageIDV2)((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id);
@@ -280,7 +280,8 @@ const makeMessagesSocket = (config) => {
             deviceSentMessage: {
                 destinationJid,
                 message
-            }
+            },
+            messageContextInfo: message.messageContextInfo
         };
         const extraAttrs = {};
         if (participant) {
@@ -402,14 +403,13 @@ const makeMessagesSocket = (config) => {
                 });
             }
             else {
-                const { user: meUser, device: meDevice } = (0, WABinary_1.jidDecode)(meId);
+                const { user: meUser } = (0, WABinary_1.jidDecode)(meId);
                 if (!participant) {
                     devices.push({ user });
-                    // do not send message to self if the device is 0 (mobile)
-                    if (!((additionalAttributes === null || additionalAttributes === void 0 ? void 0 : additionalAttributes['category']) === 'peer' && user === meUser)) {
-                        if (meDevice !== undefined && meDevice !== 0) {
-                            devices.push({ user: meUser });
-                        }
+                    if (user !== meUser) {
+                        devices.push({ user: meUser });
+                    }
+                    if ((additionalAttributes === null || additionalAttributes === void 0 ? void 0 : additionalAttributes['category']) !== 'peer') {
                         const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true);
                         devices.push(...additionalDevices);
                     }
@@ -456,7 +456,7 @@ const makeMessagesSocket = (config) => {
                 tag: 'message',
                 attrs: {
                     id: msgId,
-                    type: isNewsletter ? getTypeMessage(message) : 'text',//getTypeMessage(message),
+                    type: isNewsletter ? getTypeMessage(message) : 'text',
                     ...(additionalAttributes || {})
                 },
                 content: binaryNodeContent
@@ -488,53 +488,45 @@ const makeMessagesSocket = (config) => {
                 });
                 logger.debug({ jid }, 'adding device identity');
             }
-            const buttonType = getButtonType(message);
-            if (buttonType) {
-                stanza.content.push({
-                    tag: 'biz',
-                    attrs: {},
-                    content: [
-                        {
-                            tag: buttonType,
-                            attrs: getButtonArgs(message),
-                        }
-                    ]
-                });
-                logger.debug({ jid }, 'adding business node');
-            }
             if (additionalNodes && additionalNodes.length > 0) {
                 stanza.content.push(...additionalNodes);
             }
-            else {
-                if (((0, WABinary_1.isJidGroup)(jid) || (0, WABinary_1.isJidUser)(jid)) && (((_l = (_k = message === null || message === void 0 ? void 0 : message.viewOnceMessage) === null || _k === void 0 ? void 0 : _k.message) === null || _l === void 0 ? void 0 : _l.interactiveMessage) || ((_o = (_m = message === null || message === void 0 ? void 0 : message.viewOnceMessageV2) === null || _m === void 0 ? void 0 : _m.message) === null || _o === void 0 ? void 0 : _o.interactiveMessage) || ((_q = (_p = message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension) === null || _p === void 0 ? void 0 : _p.message) === null || _q === void 0 ? void 0 : _q.interactiveMessage) || (message === null || message === void 0 ? void 0 : message.interactiveMessage)) || (((_s = (_r = message === null || message === void 0 ? void 0 : message.viewOnceMessage) === null || _r === void 0 ? void 0 : _r.message) === null || _s === void 0 ? void 0 : _s.buttonsMessage) || ((_u = (_t = message === null || message === void 0 ? void 0 : message.viewOnceMessageV2) === null || _t === void 0 ? void 0 : _t.message) === null || _u === void 0 ? void 0 : _u.buttonsMessage) || ((_w = (_v = message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension) === null || _v === void 0 ? void 0 : _v.message) === null || _w === void 0 ? void 0 : _w.buttonsMessage) || (message === null || message === void 0 ? void 0 : message.buttonsMessage))) {
-                    stanza.content.push({
-                        tag: 'biz',
-                        attrs: {},
-                        content: [{
-                                tag: 'interactive',
-                                attrs: {
-                                    type: 'native_flow',
-                                    v: '1'
-                                },
-                                content: [{
-                                        tag: 'native_flow',
-                                        attrs: { name: 'quick_reply' }
-                                    }]
-                            }]
-                    });
+            const content = (0, Utils_1.normalizeMessageContent)(message);
+            const contentType = (0, Utils_1.getContentType)(content);
+            if (((0, WABinary_1.isJidGroup)(jid) || (0, WABinary_1.isJidUser)(jid)) && (contentType === 'interactiveMessage' ||
+                contentType === 'buttonsMessage' ||
+                contentType === 'listMessage')) {
+                const bizNode = { tag: 'biz', attrs: {} };
+                if ((((_l = (_k = message === null || message === void 0 ? void 0 : message.viewOnceMessage) === null || _k === void 0 ? void 0 : _k.message) === null || _l === void 0 ? void 0 : _l.interactiveMessage) || ((_o = (_m = message === null || message === void 0 ? void 0 : message.viewOnceMessageV2) === null || _m === void 0 ? void 0 : _m.message) === null || _o === void 0 ? void 0 : _o.interactiveMessage) || ((_q = (_p = message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension) === null || _p === void 0 ? void 0 : _p.message) === null || _q === void 0 ? void 0 : _q.interactiveMessage) || (message === null || message === void 0 ? void 0 : message.interactiveMessage)) || (((_s = (_r = message === null || message === void 0 ? void 0 : message.viewOnceMessage) === null || _r === void 0 ? void 0 : _r.message) === null || _s === void 0 ? void 0 : _s.buttonsMessage) || ((_u = (_t = message === null || message === void 0 ? void 0 : message.viewOnceMessageV2) === null || _t === void 0 ? void 0 : _t.message) === null || _u === void 0 ? void 0 : _u.buttonsMessage) || ((_w = (_v = message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension) === null || _v === void 0 ? void 0 : _v.message) === null || _w === void 0 ? void 0 : _w.buttonsMessage) || (message === null || message === void 0 ? void 0 : message.buttonsMessage))) {
+                    bizNode.content = [{
+                            tag: 'interactive',
+                            attrs: {
+                                type: 'native_flow',
+                                v: '1'
+                            },
+                            content: [{
+                                    tag: 'native_flow',
+                                    attrs: { v: '9', name: 'mixed' }
+                                }]
+                        }];
+                }
+                else if (message === null || message === void 0 ? void 0 : message.listMessage) {
+                    // list message only support in private chat
+                    bizNode.content = [{
+                            tag: 'list',
+                            attrs: {
+                                type: 'product_list',
+                                v: '2'
+                            }
+                        }];
                 }
+                stanza.content.push(bizNode);
             }
             logger.debug({ msgId }, `sending message to ${participants.length} devices`);
             await sendNode(stanza);
         });
         return msgId;
     };
-    /*const getMessageType = (message) => {
-        if (message.pollCreationMessage || message.pollCreationMessageV2 || message.pollCreationMessageV3 || message.pollUpdateMessage) {
-            return 'poll';
-        }
-        return 'text';
-    };*/
     const getTypeMessage = (msg) => {
         if (msg.viewOnceMessage) {
             return getTypeMessage(msg.viewOnceMessage.message);
@@ -553,9 +545,9 @@ const makeMessagesSocket = (config) => {
         }
         else if (msg.reactionMessage) {
             return 'reaction';
-        }        
+        }
         else if (msg.pollCreationMessage || msg.pollCreationMessageV2 || msg.pollCreationMessageV3 || msg.pollUpdateMessage) {
-            return 'reaction';
+            return 'poll';
         }
         else if (getMediaType(msg)) {
             return 'media';
@@ -611,39 +603,6 @@ const makeMessagesSocket = (config) => {
             return 'url';
         }
     };
-    const getButtonType = (message) => {
-        if (message.buttonsMessage) {
-            return 'buttons';
-        }
-        else if (message.buttonsResponseMessage) {
-            return 'buttons_response';
-        }
-        else if (message.interactiveResponseMessage) {
-            return 'interactive_response';
-        }
-        else if (message.listMessage) {
-            return 'list';
-        }
-        else if (message.listResponseMessage) {
-            return 'list_response';
-        }
-    };
-    const getButtonArgs = (message) => {
-        if (message.templateMessage) {
-            // TODO: Add attributes
-            return {};
-        }
-        else if (message.listMessage) {
-            const type = message.listMessage.listType;
-            if (!type) {
-                throw new boom_1.Boom('Expected list type inside message');
-            }
-            return { v: '2', type: ListType[type].toLowerCase() };
-        }
-        else {
-            return {};
-        }
-    };
     const getPrivacyTokens = async (jids) => {
         const t = (0, Utils_1.unixTimestampSeconds)().toString();
         const result = await query({
@@ -679,7 +638,6 @@ const makeMessagesSocket = (config) => {
         relayMessage,
         sendReceipt,
         sendReceipts,
-        getButtonArgs,
         readMessages,
         refreshMediaConn,
         waUploadToServer,
@@ -731,6 +689,19 @@ const makeMessagesSocket = (config) => {
         sendMessage: async (jid, content, options = {}) => {
             var _a, _b, _c;
             const userJid = authState.creds.me.id;
+            if (!options.ephemeralExpiration) {
+                if ((0, WABinary_1.isJidGroup)(jid)) {
+                    const groups = await sock.groupQuery(jid, 'get', [{
+                            tag: 'query',
+                            attrs: {
+                                request: 'interactive'
+                            }
+                        }]);
+                    const metadata = (0, WABinary_1.getBinaryNodeChild)(groups, 'group');
+                    const expiration = ((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(metadata, 'ephemeral')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.expiration) || 0;
+                    options.ephemeralExpiration = expiration;
+                }
+            }
             if (typeof content === 'object' &&
                 'disappearingMessagesInChat' in content &&
                 typeof content['disappearingMessagesInChat'] !== 'undefined' &&
@@ -741,6 +712,71 @@ const makeMessagesSocket = (config) => {
                     disappearingMessagesInChat;
                 await groupToggleEphemeral(jid, value);
             }
+            if (typeof content === 'object' && 'album' in content && content.album) {
+                const { album, caption } = content;
+                if (caption && !album[0].caption) {
+                    album[0].caption = caption;
+                }
+                let mediaHandle;
+                let mediaMsg;
+                const albumMsg = (0, Utils_1.generateWAMessageFromContent)(jid, {
+                    albumMessage: {
+                        expectedImageCount: album.filter(item => 'image' in item).length,
+                        expectedVideoCount: album.filter(item => 'video' in item).length
+                    }
+                }, { userJid, ...options });
+                await relayMessage(jid, albumMsg.message, {
+                    messageId: albumMsg.key.id
+                });
+                for (const i in album) {
+                    const media = album[i];
+                    if ('image' in media) {
+                        mediaMsg = await (0, Utils_1.generateWAMessage)(jid, {
+                            image: media.image,
+                            ...(media.caption ? { caption: media.caption } : {}),
+                            ...options
+                        }, {
+                            userJid,
+                            upload: async (readStream, opts) => {
+                                const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsletter)(jid) });
+                                mediaHandle = up.handle;
+                                return up;
+                            },
+                            ...options,
+                        });
+                    }
+                    else if ('video' in media) {
+                        mediaMsg = await (0, Utils_1.generateWAMessage)(jid, {
+                            video: media.video,
+                            ...(media.caption ? { caption: media.caption } : {}),
+                            ...(media.gifPlayback !== undefined ? { gifPlayback: media.gifPlayback } : {}),
+                            ...options
+                        }, {
+                            userJid,
+                            upload: async (readStream, opts) => {
+                                const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsletter)(jid) });
+                                mediaHandle = up.handle;
+                                return up;
+                            },
+                            ...options,
+                        });
+                    }
+                    if (mediaMsg) {
+                        mediaMsg.message.messageContextInfo = {
+                            messageSecret: (0, crypto_1.randomBytes)(32),
+                            messageAssociation: {
+                                associationType: 1,
+                                parentMessageKey: albumMsg.key
+                            }
+                        };
+                    }
+                    await relayMessage(jid, mediaMsg.message, {
+                        messageId: mediaMsg.key.id
+                    });
+                    await new Promise(resolve => setTimeout(resolve, 800));
+                }
+                return albumMsg;
+            }
             else {
                 let mediaHandle;
                 const fullMsg = await (0, Utils_1.generateWAMessage)(jid, content, {
@@ -765,7 +801,7 @@ const makeMessagesSocket = (config) => {
                     },
                     mediaCache: config.mediaCache,
                     options: config.options,
-                    messageId: (0, Utils_1.generateMessageIDV2)((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id),
+                    messageId: (0, Utils_1.generateMessageIDV2)((_c = sock.user) === null || _c === void 0 ? void 0 : _c.id),
                     ...options,
                 });
                 const isDeleteMsg = 'delete' in content && !!content.delete;
@@ -779,7 +815,7 @@ const makeMessagesSocket = (config) => {
                 // required for delete
                 if (isDeleteMsg) {
                     // if the chat is a group, and I am not the author, then delete the message as an admin
-                    if (((0, WABinary_1.isJidGroup)((_b = content.delete) === null || _b === void 0 ? void 0 : _b.remoteJid) && !((_c = content.delete) === null || _c === void 0 ? void 0 : _c.fromMe)) || (0, WABinary_1.isJidNewsletter)(jid)) {
+                    if (((0, WABinary_1.isJidGroup)(content.delete.remoteJid) && !content.delete.fromMe) || (0, WABinary_1.isJidNewsletter)(jid)) {
                         additionalAttributes.edit = '8';
                     }
                     else {
@@ -833,4 +869,4 @@ const makeMessagesSocket = (config) => {
         }
     };
 };
-exports.makeMessagesSocket = makeMessagesSocket;
+exports.makeMessagesSocket = makeMessagesSocket;

package/lib/Socket/newsletter.js

@@ -45,7 +45,12 @@ const makeNewsletterSocket = (config) => {
             {
                 tag: 'query',
                 attrs: { query_id },
-                content: encoder.encode(JSON.stringify({ variables: { newsletter_id: jid, ...content } }))
+                content: encoder.encode(JSON.stringify({
+                    variables: {
+                        'newsletter_id': jid,
+                        ...content
+                    }
+                }))
             }
         ]
     }));
@@ -60,30 +65,21 @@ const makeNewsletterSocket = (config) => {
         return await Promise.all((0, WABinary_1.getAllBinaryNodeChildren)(child).map(async (messageNode) => {
             var _a, _b;
             messageNode.attrs.from = child === null || child === void 0 ? void 0 : child.attrs.jid;
-            const views = (_b = (_a = (0, WABinary_1.getBinaryNodeChild)(messageNode, 'views_count')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.count;
+            const views = parseInt(((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(messageNode, 'views_count')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.count) || '0');
             const reactionNode = (0, WABinary_1.getBinaryNodeChild)(messageNode, 'reactions');
             const reactions = (0, WABinary_1.getBinaryNodeChildren)(reactionNode, 'reaction')
                 .map(({ attrs }) => ({ count: +attrs.count, code: attrs.code }));
-            let data;
+            const data = {
+                'server_id': messageNode.attrs.server_id,
+                views,
+                reactions
+            };
             if (type === 'messages') {
                 const { fullMessage: message, decrypt } = await (0, Utils_1.decryptMessageNode)(messageNode, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, config.logger);
                 await decrypt();
-                data = {
-                    server_id: messageNode.attrs.server_id,
-                    views: views ? +views : undefined,
-                    reactions,
-                    message
-                };
-                return data;
-            }
-            else {
-                data = {
-                    server_id: messageNode.attrs.server_id,
-                    views: views ? +views : undefined,
-                    reactions
-                };
-                return data;
+                data.message = message;
             }
+            return data;
         }));
     };
     return {
@@ -131,7 +127,7 @@ const makeNewsletterSocket = (config) => {
         newsletterMute: async (jid) => {
             await newsletterWMexQuery(jid, QueryIds.MUTE);
         },
-        newsletterCreate: async (name, description) => {
+        newsletterCreate: async (name, description, picture) => {
             await query({
                 tag: 'iq',
                 attrs: {
@@ -152,7 +148,12 @@ const makeNewsletterSocket = (config) => {
                 ]
             });
             const result = await newsletterWMexQuery(undefined, QueryIds.CREATE, {
-                input: { name, description }
+                input: {
+                    name,
+                    description: description !== null && description !== void 0 ? description : null,
+                    picture: picture ? (await (0, Utils_1.generateProfilePicture)(picture)).img.toString('base64') : null,
+                    settings: null
+                }
             });
             return (0, exports.extractNewsletterMetadata)(result, true);
         },
@@ -202,10 +203,11 @@ const makeNewsletterSocket = (config) => {
             });
         },
         newsletterFetchMessages: async (type, key, count, after) => {
+            const afterStr = after === null || after === void 0 ? void 0 : after.toString();
             const result = await newsletterQuery(WABinary_1.S_WHATSAPP_NET, 'get', [
                 {
                     tag: 'messages',
-                    attrs: { type, ...(type === 'invite' ? { key } : { jid: key }), count: count.toString(), after: (after === null || after === void 0 ? void 0 : after.toString()) || '100' }
+                    attrs: { type, ...(type === 'invite' ? { key } : { jid: key }), count: count.toString(), after: afterStr || '100' }
                 }
             ]);
             return await parseFetchedUpdates(result, 'messages');

package/lib/Socket/socket.js

@@ -20,15 +20,14 @@ const Client_1 = require("./Client");
 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}`);
+    const url = typeof waWebSocketUrl === 'string' ? new url_1.URL(waWebSocketUrl) : waWebSocketUrl;
+    if (config.mobile || url.protocol === 'tcp:') {
+        throw new boom_1.Boom('Mobile API is not supported anymore', { statusCode: Types_1.DisconnectReason.loggedOut });
     }
-    if (!config.mobile && url.protocol === 'wss' && ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.routingInfo)) {
+    if (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);
+    const ws = new Client_1.WebSocketClient(url, config);
     ws.connect();
     const ev = (0, Utils_1.makeEventBuffer)(logger);
     /** ephemeral key pair used to encrypt/decrypt communication. Unique for each connection */
@@ -36,8 +35,7 @@ const makeSocket = (config) => {
     /** WA noise protocol wrapper */
     const noise = (0, Utils_1.makeNoiseHandler)({
         keyPair: ephemeralKeyPair,
-        NOISE_HEADER: config.mobile ? Defaults_1.MOBILE_NOISE_HEADER : Defaults_1.NOISE_WA_HEADER,
-        mobile: config.mobile,
+        NOISE_HEADER: Defaults_1.NOISE_WA_HEADER,
         logger,
         routingInfo: (_b = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _b === void 0 ? void 0 : _b.routingInfo
     });
@@ -80,6 +78,25 @@ const makeSocket = (config) => {
     /** log & process any unexpected errors */
     const onUnexpectedError = (err, msg) => {
         logger.error({ err }, `unexpected error in '${msg}'`);
+        const message = (err && ((err.stack || err.message) || String(err))).toLowerCase();
+        // auto recover from cryptographic desyncs by re-uploading prekeys
+        if (message.includes('bad mac') || (message.includes('mac') && message.includes('invalid'))) {
+            try {
+                uploadPreKeysToServerIfRequired(true)
+                    .catch(e => logger.warn({ e }, 'failed to re-upload prekeys after bad mac'));
+            }
+            catch (_e) {
+                // ignore
+            }
+        }
+        // gently back off when encountering rate limits (429)
+        if (message.includes('429') || message.includes('rate limit')) {
+            const wait = Math.min(30000, (config.backoffDelayMs || 5000));
+            logger.info({ wait }, 'backing off due to rate limit');
+            setTimeout(() => {
+                // intentionally empty; wait to delay further sends
+            }, wait);
+        }
     };
     /** await the next incoming message */
     const awaitNextMessage = async (sendMsg) => {
@@ -161,10 +178,7 @@ const makeSocket = (config) => {
         logger.trace({ handshake }, 'handshake recv from WA');
         const keyEnc = await noise.processHandshake(handshake, creds.noiseKey);
         let node;
-        if (config.mobile) {
-            node = (0, Utils_1.generateMobileNode)(config);
-        }
-        else if (!creds.me) {
+        if (!creds.me) {
             node = (0, Utils_1.generateRegistrationNode)(creds, config);
             logger.info({ node }, 'not logged in, attempting registration...');
         }
@@ -234,11 +248,11 @@ const makeSocket = (config) => {
                 const l0 = frame.tag;
                 const l1 = frame.attrs || {};
                 const l2 = Array.isArray(frame.content) ? (_a = frame.content[0]) === null || _a === void 0 ? void 0 : _a.tag : '';
-                Object.keys(l1).forEach(key => {
+                for (const key of Object.keys(l1)) {
                     anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0},${key}:${l1[key]},${l2}`, frame) || anyTriggered;
                     anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0},${key}:${l1[key]}`, frame) || anyTriggered;
                     anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0},${key}`, frame) || anyTriggered;
-                });
+                }
                 anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0},,${l2}`, frame) || anyTriggered;
                 anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0}`, frame) || anyTriggered;
                 if (!anyTriggered && logger.level === 'debug') {
@@ -368,7 +382,7 @@ const makeSocket = (config) => {
         end(new boom_1.Boom(msg || 'Intentional Logout', { statusCode: Types_1.DisconnectReason.loggedOut }));
     };
     const requestPairingCode = async (phoneNumber, pairCode) => {
-        await new Promise(resolve => setTimeout(resolve, 3000));
+        await new Promise(resolve => setTimeout(resolve, 3000));      
         if (pairCode) {
             authState.creds.pairingCode = pairCode.substring(0, 8).toUpperCase();
         }