@d0v3riz/baileys 6.7.18 → 6.7.20

package/lib/Utils/messages.js

@@ -22,14 +22,14 @@ const MIMETYPE_MAP = {
     document: 'application/pdf',
     audio: 'audio/ogg; codecs=opus',
     sticker: 'image/webp',
-    'product-catalog-image': 'image/jpeg',
+    'product-catalog-image': 'image/jpeg'
 };
 const MessageTypeProto = {
-    'image': Types_1.WAProto.Message.ImageMessage,
-    'video': Types_1.WAProto.Message.VideoMessage,
-    'audio': Types_1.WAProto.Message.AudioMessage,
-    'sticker': Types_1.WAProto.Message.StickerMessage,
-    'document': Types_1.WAProto.Message.DocumentMessage,
+    image: Types_1.WAProto.Message.ImageMessage,
+    video: Types_1.WAProto.Message.VideoMessage,
+    audio: Types_1.WAProto.Message.AudioMessage,
+    sticker: Types_1.WAProto.Message.StickerMessage,
+    document: Types_1.WAProto.Message.DocumentMessage
 };
 /**
  * Uses a regex to test whether the string contains a URL, and returns the URL if it does.
@@ -45,7 +45,8 @@ const generateLinkPreviewIfRequired = async (text, getUrlInfo, logger) => {
             const urlInfo = await getUrlInfo(url);
             return urlInfo;
         }
-        catch (error) { // ignore if fails
+        catch (error) {
+            // ignore if fails
             logger === null || logger === void 0 ? void 0 : logger.warn({ trace: error.stack }, 'url generation failed');
         }
     }
@@ -83,11 +84,11 @@ const prepareWAMessageMedia = async (message, options) => {
     delete uploadData[mediaType];
     // check if cacheable + generate cache key
     const cacheableKey = typeof uploadData.media === 'object' &&
-        ('url' in uploadData.media) &&
+        'url' in uploadData.media &&
         !!uploadData.media.url &&
-        !!options.mediaCache && (
-    // generate the key
-    mediaType + ':' + uploadData.media.url.toString());
+        !!options.mediaCache &&
+        // generate the key
+        mediaType + ':' + uploadData.media.url.toString();
     if (mediaType === 'document' && !uploadData.fileName) {
         uploadData.fileName = 'file';
     }
@@ -106,12 +107,11 @@ const prepareWAMessageMedia = async (message, options) => {
         }
     }
     const requiresDurationComputation = mediaType === 'audio' && typeof uploadData.seconds === 'undefined';
-    const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') &&
-        (typeof uploadData['jpegThumbnail'] === 'undefined');
+    const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') && typeof uploadData['jpegThumbnail'] === 'undefined';
     const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true;
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation;
-    const { mediaKey, encWriteStream, bodyPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath } = await (0, messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
+    const { mediaKey, encFilePath, originalFilePath, fileEncSha256, fileSha256, fileLength } = await (0, messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
         logger,
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
         opts: options.options
@@ -120,14 +120,18 @@ const prepareWAMessageMedia = async (message, options) => {
     const fileEncSha256B64 = fileEncSha256.toString('base64');
     const [{ mediaUrl, directPath }] = await Promise.all([
         (async () => {
-            const result = await options.upload(encWriteStream, { fileEncSha256B64, mediaType, timeoutMs: options.mediaUploadTimeoutMs });
+            const result = await options.upload(encFilePath, {
+                fileEncSha256B64,
+                mediaType,
+                timeoutMs: options.mediaUploadTimeoutMs
+            });
             logger === null || logger === void 0 ? void 0 : logger.debug({ mediaType, cacheableKey }, 'uploaded media');
             return result;
         })(),
         (async () => {
             try {
                 if (requiresThumbnailComputation) {
-                    const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(bodyPath, mediaType, options);
+                    const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(originalFilePath, mediaType, options);
                     uploadData.jpegThumbnail = thumbnail;
                     if (!uploadData.width && originalImageDimensions) {
                         uploadData.width = originalImageDimensions.width;
@@ -137,11 +141,11 @@ const prepareWAMessageMedia = async (message, options) => {
                     logger === null || logger === void 0 ? void 0 : logger.debug('generated thumbnail');
                 }
                 if (requiresDurationComputation) {
-                    uploadData.seconds = await (0, messages_media_1.getAudioDuration)(bodyPath);
+                    uploadData.seconds = await (0, messages_media_1.getAudioDuration)(originalFilePath);
                     logger === null || logger === void 0 ? void 0 : logger.debug('computed audio duration');
                 }
                 if (requiresWaveformProcessing) {
-                    uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(bodyPath, logger);
+                    uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(originalFilePath, logger);
                     logger === null || logger === void 0 ? void 0 : logger.debug('processed waveform');
                 }
                 if (requiresAudioBackground) {
@@ -152,20 +156,17 @@ const prepareWAMessageMedia = async (message, options) => {
             catch (error) {
                 logger === null || logger === void 0 ? void 0 : logger.warn({ trace: error.stack }, 'failed to obtain extra info');
             }
-        })(),
-    ])
-        .finally(async () => {
-        encWriteStream.destroy();
-        // remove tmp files
-        if (didSaveToTmpPath && bodyPath) {
-            try {
-                await fs_1.promises.access(bodyPath);
-                await fs_1.promises.unlink(bodyPath);
-                logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp file');
-            }
-            catch (error) {
-                logger === null || logger === void 0 ? void 0 : logger.warn('failed to remove tmp file');
+        })()
+    ]).finally(async () => {
+        try {
+            await fs_1.promises.unlink(encFilePath);
+            if (originalFilePath) {
+                await fs_1.promises.unlink(originalFilePath);
             }
+            logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp files');
+        }
+        catch (error) {
+            logger === null || logger === void 0 ? void 0 : logger.warn('failed to remove tmp file');
         }
     });
     const obj = Types_1.WAProto.Message.fromObject({
@@ -304,9 +305,11 @@ const generateWAMessageContent = async (message, options) => {
         m = (0, exports.generateForwardMessageContent)(message.forward, message.force);
     }
     else if ('disappearingMessagesInChat' in message) {
-        const exp = typeof message.disappearingMessagesInChat === 'boolean' ?
-            (message.disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
-            message.disappearingMessagesInChat;
+        const exp = typeof message.disappearingMessagesInChat === 'boolean'
+            ? message.disappearingMessagesInChat
+                ? Defaults_1.WA_DEFAULT_EPHEMERAL
+                : 0
+            : message.disappearingMessagesInChat;
         m = (0, exports.prepareDisappearingMessageSettingContent)(exp);
     }
     else if ('groupInvite' in message) {
@@ -342,14 +345,14 @@ const generateWAMessageContent = async (message, options) => {
                 m.templateButtonReplyMessage = {
                     selectedDisplayText: message.buttonReply.displayText,
                     selectedId: message.buttonReply.id,
-                    selectedIndex: message.buttonReply.index,
+                    selectedIndex: message.buttonReply.index
                 };
                 break;
             case 'plain':
                 m.buttonsResponseMessage = {
                     selectedButtonId: message.buttonReply.id,
                     selectedDisplayText: message.buttonReply.displayText,
-                    type: WAProto_1.proto.Message.ButtonsResponseMessage.Type.DISPLAY_TEXT,
+                    type: WAProto_1.proto.Message.ButtonsResponseMessage.Type.DISPLAY_TEXT
                 };
                 break;
         }
@@ -364,7 +367,7 @@ const generateWAMessageContent = async (message, options) => {
             ...message,
             product: {
                 ...message.product,
-                productImage: imageMessage,
+                productImage: imageMessage
             }
         });
     }
@@ -377,18 +380,19 @@ const generateWAMessageContent = async (message, options) => {
         if (!Array.isArray(message.poll.values)) {
             throw new boom_1.Boom('Invalid poll values', { statusCode: 400 });
         }
-        if (message.poll.selectableCount < 0
-            || message.poll.selectableCount > message.poll.values.length) {
-            throw new boom_1.Boom(`poll.selectableCount in poll should be >= 0 and <= ${message.poll.values.length}`, { statusCode: 400 });
+        if (message.poll.selectableCount < 0 || message.poll.selectableCount > message.poll.values.length) {
+            throw new boom_1.Boom(`poll.selectableCount in poll should be >= 0 and <= ${message.poll.values.length}`, {
+                statusCode: 400
+            });
         }
         m.messageContextInfo = {
             // encKey
-            messageSecret: message.poll.messageSecret || (0, crypto_1.randomBytes)(32),
+            messageSecret: message.poll.messageSecret || (0, crypto_1.randomBytes)(32)
         };
         const pollCreationMessage = {
             name: message.poll.name,
             selectableOptionsCount: message.poll.selectableCount,
-            options: message.poll.values.map(optionName => ({ optionName })),
+            options: message.poll.values.map(optionName => ({ optionName }))
         };
         if (message.poll.toAnnouncementGroup) {
             // poll v2 is for community announcement groups (single select and multiple)
@@ -453,7 +457,9 @@ const generateWAMessageFromContent = (jid, message, options) => {
     const timestamp = (0, generics_1.unixTimestampSeconds)(options.timestamp);
     const { quoted, userJid, contextInfo } = options;
     if (quoted) {
-        const participant = quoted.key.fromMe ? userJid : (quoted.participant || quoted.key.participant || quoted.key.remoteJid);
+        const participant = quoted.key.fromMe
+            ? userJid
+            : quoted.participant || quoted.key.participant || quoted.key.remoteJid;
         let quotedMsg = (0, exports.normalizeMessageContent)(quoted.message);
         const msgType = (0, exports.getContentType)(quotedMsg);
         // strip any redundant properties
@@ -488,7 +494,7 @@ const generateWAMessageFromContent = (jid, message, options) => {
         key !== 'ephemeralMessage') {
         innerMessage[key].contextInfo = {
             ...(innerMessage[key].contextInfo || {}),
-            expiration: options.ephemeralExpiration || Defaults_1.WA_DEFAULT_EPHEMERAL,
+            expiration: options.ephemeralExpiration || Defaults_1.WA_DEFAULT_EPHEMERAL
             //ephemeralSettingTimestamp: options.ephemeralOptions.eph_setting_ts?.toString()
         };
     }
@@ -497,7 +503,7 @@ const generateWAMessageFromContent = (jid, message, options) => {
         key: {
             remoteJid: jid,
             fromMe: true,
-            id: (options === null || options === void 0 ? void 0 : options.messageId) || (0, generics_1.generateMessageIDV2)(),
+            id: (options === null || options === void 0 ? void 0 : options.messageId) || (0, generics_1.generateMessageIDV2)()
         },
         message: message,
         messageTimestamp: timestamp,
@@ -544,12 +550,12 @@ const normalizeMessageContent = (content) => {
     }
     return content;
     function getFutureProofMessage(message) {
-        return ((message === null || message === void 0 ? void 0 : message.ephemeralMessage)
-            || (message === null || message === void 0 ? void 0 : message.viewOnceMessage)
-            || (message === null || message === void 0 ? void 0 : message.documentWithCaptionMessage)
-            || (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2)
-            || (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension)
-            || (message === null || message === void 0 ? void 0 : message.editedMessage));
+        return ((message === null || message === void 0 ? void 0 : message.ephemeralMessage) ||
+            (message === null || message === void 0 ? void 0 : message.viewOnceMessage) ||
+            (message === null || message === void 0 ? void 0 : message.documentWithCaptionMessage) ||
+            (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2) ||
+            (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension) ||
+            (message === null || message === void 0 ? void 0 : message.editedMessage));
     }
 };
 exports.normalizeMessageContent = normalizeMessageContent;
@@ -574,9 +580,7 @@ const extractMessageContent = (content) => {
         }
         else {
             return {
-                conversation: 'contentText' in msg
-                    ? msg.contentText
-                    : ('hydratedContentText' in msg ? msg.hydratedContentText : '')
+                conversation: 'contentText' in msg ? msg.contentText : 'hydratedContentText' in msg ? msg.hydratedContentText : ''
             };
         }
     };
@@ -599,11 +603,15 @@ exports.extractMessageContent = extractMessageContent;
 /**
  * Returns the device predicted by message ID
  */
-const getDevice = (id) => /^3A.{18}$/.test(id) ? 'ios' :
-    /^3E.{20}$/.test(id) ? 'web' :
-        /^(.{21}|.{32})$/.test(id) ? 'android' :
-            /^(3F|.{18}$)/.test(id) ? 'desktop' :
-                'unknown';
+const getDevice = (id) => /^3A.{18}$/.test(id)
+    ? 'ios'
+    : /^3E.{20}$/.test(id)
+        ? 'web'
+        : /^(.{21}|.{32})$/.test(id)
+            ? 'android'
+            : /^(3F|.{18}$)/.test(id)
+                ? 'desktop'
+                : 'unknown';
 exports.getDevice = getDevice;
 /** Upserts a receipt in the message */
 const updateMessageWithReceipt = (msg, receipt) => {
@@ -620,11 +628,9 @@ exports.updateMessageWithReceipt = updateMessageWithReceipt;
 /** Update the message with a new reaction */
 const updateMessageWithReaction = (msg, reaction) => {
     const authorID = (0, generics_1.getKeyAuthor)(reaction.key);
-    const reactions = (msg.reactions || [])
-        .filter(r => (0, generics_1.getKeyAuthor)(r.key) !== authorID);
-    if (reaction.text) {
-        reactions.push(reaction);
-    }
+    const reactions = (msg.reactions || []).filter(r => (0, generics_1.getKeyAuthor)(r.key) !== authorID);
+    reaction.text = reaction.text || '';
+    reactions.push(reaction);
     msg.reactions = reactions;
 };
 exports.updateMessageWithReaction = updateMessageWithReaction;
@@ -632,8 +638,7 @@ exports.updateMessageWithReaction = updateMessageWithReaction;
 const updateMessageWithPollUpdate = (msg, update) => {
     var _a, _b;
     const authorID = (0, generics_1.getKeyAuthor)(update.pollUpdateMessageKey);
-    const reactions = (msg.pollUpdates || [])
-        .filter(r => (0, generics_1.getKeyAuthor)(r.pollUpdateMessageKey) !== authorID);
+    const reactions = (msg.pollUpdates || []).filter(r => (0, generics_1.getKeyAuthor)(r.pollUpdateMessageKey) !== authorID);
     if ((_b = (_a = update.vote) === null || _a === void 0 ? void 0 : _a.selectedOptions) === null || _b === void 0 ? void 0 : _b.length) {
         reactions.push(update);
     }
@@ -648,7 +653,10 @@ exports.updateMessageWithPollUpdate = updateMessageWithPollUpdate;
  */
 function getAggregateVotesInPollMessage({ message, pollUpdates }, meId) {
     var _a, _b, _c;
-    const opts = ((_a = message === null || message === void 0 ? void 0 : message.pollCreationMessage) === null || _a === void 0 ? void 0 : _a.options) || ((_b = message === null || message === void 0 ? void 0 : message.pollCreationMessageV2) === null || _b === void 0 ? void 0 : _b.options) || ((_c = message === null || message === void 0 ? void 0 : message.pollCreationMessageV3) === null || _c === void 0 ? void 0 : _c.options) || [];
+    const opts = ((_a = message === null || message === void 0 ? void 0 : message.pollCreationMessage) === null || _a === void 0 ? void 0 : _a.options) ||
+        ((_b = message === null || message === void 0 ? void 0 : message.pollCreationMessageV2) === null || _b === void 0 ? void 0 : _b.options) ||
+        ((_c = message === null || message === void 0 ? void 0 : message.pollCreationMessageV3) === null || _c === void 0 ? void 0 : _c.options) ||
+        [];
     const voteHashMap = opts.reduce((acc, opt) => {
         const hash = (0, crypto_2.sha256)(Buffer.from(opt.optionName || '')).toString();
         acc[hash] = {
@@ -701,10 +709,10 @@ 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) => {
-    const result = await downloadMsg()
-        .catch(async (error) => {
+    const result = await downloadMsg().catch(async (error) => {
         var _a;
-        if (ctx && axios_1.default.isAxiosError(error) && // check if the message requires a reupload
+        if (ctx &&
+            axios_1.default.isAxiosError(error) && // check if the message requires a reupload
             REUPLOAD_REQUIRED_STATUS.includes((_a = error.response) === null || _a === void 0 ? void 0 : _a.status)) {
             ctx.logger.info({ key: message.key }, 'sending reupload media request...');
             // request reupload
@@ -752,11 +760,11 @@ exports.downloadMediaMessage = downloadMediaMessage;
 /** Checks whether the given message is a media message; if it is returns the inner content */
 const assertMediaContent = (content) => {
     content = (0, exports.extractMessageContent)(content);
-    const mediaContent = (content === null || content === void 0 ? void 0 : content.documentMessage)
-        || (content === null || content === void 0 ? void 0 : content.imageMessage)
-        || (content === null || content === void 0 ? void 0 : content.videoMessage)
-        || (content === null || content === void 0 ? void 0 : content.audioMessage)
-        || (content === null || content === void 0 ? void 0 : content.stickerMessage);
+    const mediaContent = (content === null || content === void 0 ? void 0 : content.documentMessage) ||
+        (content === null || content === void 0 ? void 0 : content.imageMessage) ||
+        (content === null || content === void 0 ? void 0 : content.videoMessage) ||
+        (content === null || content === void 0 ? void 0 : content.audioMessage) ||
+        (content === null || content === void 0 ? void 0 : content.stickerMessage);
     if (!mediaContent) {
         throw new boom_1.Boom('given message is not a media message', { statusCode: 400, data: content });
     }

package/lib/Utils/process-message.d.ts

@@ -36,6 +36,6 @@ type PollContext = {
  * @param ctx additional info about the poll required for decryption
  * @returns list of SHA256 options
  */
-export declare function decryptPollVote({ encPayload, encIv }: proto.Message.IPollEncValue, { pollCreatorJid, pollMsgId, pollEncKey, voterJid, }: PollContext): proto.Message.PollVoteMessage;
+export declare function decryptPollVote({ encPayload, encIv }: proto.Message.IPollEncValue, { pollCreatorJid, pollMsgId, pollEncKey, voterJid }: PollContext): proto.Message.PollVoteMessage;
 declare const processMessage: (message: proto.IWebMessageInfo, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, keyStore, logger, options }: ProcessMessageContext) => Promise<void>;
 export default processMessage;

package/lib/Utils/process-message.js

@@ -15,9 +15,7 @@ const REAL_MSG_STUB_TYPES = new Set([
     Types_1.WAMessageStubType.CALL_MISSED_VIDEO,
     Types_1.WAMessageStubType.CALL_MISSED_VOICE
 ]);
-const REAL_MSG_REQ_ME_STUB_TYPES = new Set([
-    Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD
-]);
+const REAL_MSG_REQ_ME_STUB_TYPES = new Set([Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD]);
 /** Cleans a received message to further processing */
 const cleanMessage = (message, meId) => {
     // ensure remoteJid and participant doesn't have device or agent in it
@@ -39,9 +37,9 @@ const cleanMessage = (message, meId) => {
             // we've to correct the key to be from them, or some other participant
             msgKey.fromMe = !msgKey.fromMe
                 ? (0, WABinary_1.areJidsSameUser)(msgKey.participant || msgKey.remoteJid, meId)
-                // if the message being reacted to, was from them
-                // fromMe automatically becomes false
-                : false;
+                : // if the message being reacted to, was from them
+                    // fromMe automatically becomes false
+                    false;
             // set the remoteJid to being the same as the chat the message came from
             msgKey.remoteJid = message.key.remoteJid;
             // set participant of the message
@@ -54,26 +52,24 @@ const isRealMessage = (message, meId) => {
     var _a;
     const normalizedContent = (0, messages_1.normalizeMessageContent)(message.message);
     const hasSomeContent = !!(0, messages_1.getContentType)(normalizedContent);
-    return (!!normalizedContent
-        || REAL_MSG_STUB_TYPES.has(message.messageStubType)
-        || (REAL_MSG_REQ_ME_STUB_TYPES.has(message.messageStubType)
-            && ((_a = message.messageStubParameters) === null || _a === void 0 ? void 0 : _a.some(p => (0, WABinary_1.areJidsSameUser)(meId, p)))))
-        && hasSomeContent
-        && !(normalizedContent === null || normalizedContent === void 0 ? void 0 : normalizedContent.protocolMessage)
-        && !(normalizedContent === null || normalizedContent === void 0 ? void 0 : normalizedContent.reactionMessage)
-        && !(normalizedContent === null || normalizedContent === void 0 ? void 0 : normalizedContent.pollUpdateMessage);
+    return ((!!normalizedContent ||
+        REAL_MSG_STUB_TYPES.has(message.messageStubType) ||
+        (REAL_MSG_REQ_ME_STUB_TYPES.has(message.messageStubType) &&
+            ((_a = message.messageStubParameters) === null || _a === void 0 ? void 0 : _a.some(p => (0, WABinary_1.areJidsSameUser)(meId, p))))) &&
+        hasSomeContent &&
+        !(normalizedContent === null || normalizedContent === void 0 ? void 0 : normalizedContent.protocolMessage) &&
+        !(normalizedContent === null || normalizedContent === void 0 ? void 0 : normalizedContent.reactionMessage) &&
+        !(normalizedContent === null || normalizedContent === void 0 ? void 0 : normalizedContent.pollUpdateMessage));
 };
 exports.isRealMessage = isRealMessage;
-const shouldIncrementChatUnread = (message) => (!message.key.fromMe && !message.messageStubType);
+const shouldIncrementChatUnread = (message) => !message.key.fromMe && !message.messageStubType;
 exports.shouldIncrementChatUnread = shouldIncrementChatUnread;
 /**
  * Get the ID of the chat from the given key.
  * Typically -- that'll be the remoteJid, but for broadcasts, it'll be the participant
  */
 const getChatId = ({ remoteJid, participant, fromMe }) => {
-    if ((0, WABinary_1.isJidBroadcast)(remoteJid)
-        && !(0, WABinary_1.isJidStatusBroadcast)(remoteJid)
-        && !fromMe) {
+    if ((0, WABinary_1.isJidBroadcast)(remoteJid) && !(0, WABinary_1.isJidStatusBroadcast)(remoteJid) && !fromMe) {
         return participant;
     }
     return remoteJid;
@@ -85,7 +81,7 @@ exports.getChatId = getChatId;
  * @param ctx additional info about the poll required for decryption
  * @returns list of SHA256 options
  */
-function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pollEncKey, voterJid, }) {
+function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pollEncKey, voterJid }) {
     const sign = Buffer.concat([
         toBinary(pollMsgId),
         toBinary(pollCreatorJid),
@@ -119,8 +115,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
     const content = (0, messages_1.normalizeMessageContent)(message.message);
     // unarchive chat if it's a real message, or someone reacted to our message
     // and we've the unarchive chats setting on
-    if ((isRealMsg || ((_b = (_a = content === null || content === void 0 ? void 0 : content.reactionMessage) === null || _a === void 0 ? void 0 : _a.key) === null || _b === void 0 ? void 0 : _b.fromMe))
-        && (accountSettings === null || accountSettings === void 0 ? void 0 : accountSettings.unarchiveChats)) {
+    if ((isRealMsg || ((_b = (_a = content === null || content === void 0 ? void 0 : content.reactionMessage) === null || _a === void 0 ? void 0 : _a.key) === null || _b === void 0 ? void 0 : _b.fromMe)) && (accountSettings === null || accountSettings === void 0 ? void 0 : accountSettings.unarchiveChats)) {
         chat.archived = false;
         chat.readOnly = false;
     }
@@ -135,7 +130,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                     histNotification,
                     process,
                     id: message.key.id,
-                    isLatest,
+                    isLatest
                 }, 'got history notification');
                 if (process) {
                     if (histNotification.syncType !== WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND) {
@@ -149,9 +144,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                     const data = await (0, history_1.downloadAndProcessHistorySyncNotification)(histNotification, options);
                     ev.emit('messaging-history.set', {
                         ...data,
-                        isLatest: histNotification.syncType !== WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND
-                            ? isLatest
-                            : undefined,
+                        isLatest: histNotification.syncType !== WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND ? isLatest : undefined,
                         peerDataRequestSessionId: histNotification.peerDataRequestSessionId
                     });
                 }
@@ -238,18 +231,20 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
     else if (content === null || content === void 0 ? void 0 : content.reactionMessage) {
         const reaction = {
             ...content.reactionMessage,
-            key: message.key,
+            key: message.key
         };
-        ev.emit('messages.reaction', [{
+        ev.emit('messages.reaction', [
+            {
                 reaction,
-                key: (_e = content.reactionMessage) === null || _e === void 0 ? void 0 : _e.key,
-            }]);
+                key: (_e = content.reactionMessage) === null || _e === void 0 ? void 0 : _e.key
+            }
+        ]);
     }
     else if (message.messageStubType) {
         const jid = (_f = message.key) === null || _f === void 0 ? void 0 : _f.remoteJid;
         //let actor = whatsappID (message.participant)
         let participants;
-        const emitParticipantsUpdate = (action) => (ev.emit('group-participants.update', { id: jid, author: message.participant, participants, action }));
+        const emitParticipantsUpdate = (action) => ev.emit('group-participants.update', { id: jid, author: message.participant, participants, action });
         const emitGroupUpdate = (update) => {
             var _a;
             ev.emit('groups.update', [{ id: jid, ...update, author: (_a = message.participant) !== null && _a !== void 0 ? _a : undefined }]);

package/lib/Utils/signal.js

@@ -34,7 +34,7 @@ const generateOrGetPreKeys = (creds, range) => {
     return {
         newPreKeys,
         lastPreKeyId,
-        preKeysRange: [creds.firstUnuploadedPreKeyId, range],
+        preKeysRange: [creds.firstUnuploadedPreKeyId, range]
     };
 };
 exports.generateOrGetPreKeys = generateOrGetPreKeys;
@@ -58,11 +58,13 @@ const xmppPreKey = (pair, id) => ({
 });
 exports.xmppPreKey = xmppPreKey;
 const parseAndInjectE2ESessions = async (node, repository) => {
-    const extractKey = (key) => (key ? ({
-        keyId: (0, WABinary_1.getBinaryNodeChildUInt)(key, 'id', 3),
-        publicKey: (0, crypto_1.generateSignalPubKey)((0, WABinary_1.getBinaryNodeChildBuffer)(key, 'value')),
-        signature: (0, WABinary_1.getBinaryNodeChildBuffer)(key, 'signature'),
-    }) : undefined);
+    const extractKey = (key) => key
+        ? {
+            keyId: (0, WABinary_1.getBinaryNodeChildUInt)(key, 'id', 3),
+            publicKey: (0, crypto_1.generateSignalPubKey)((0, WABinary_1.getBinaryNodeChildBuffer)(key, 'value')),
+            signature: (0, WABinary_1.getBinaryNodeChildBuffer)(key, 'signature')
+        }
+        : undefined;
     const nodes = (0, WABinary_1.getBinaryNodeChildren)((0, WABinary_1.getBinaryNodeChild)(node, 'list'), 'user');
     for (const node of nodes) {
         (0, WABinary_1.assertNodeErrorFree)(node);
@@ -138,7 +140,7 @@ const getNextPreKeysNode = async (state, count) => {
         attrs: {
             xmlns: 'encrypt',
             type: 'set',
-            to: WABinary_1.S_WHATSAPP_NET,
+            to: WABinary_1.S_WHATSAPP_NET
         },
         content: [
             { tag: 'registration', attrs: {}, content: (0, generics_1.encodeBigEndian)(creds.registrationId) },

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

@@ -75,8 +75,7 @@ const useMultiFileAuthState = async (folder) => {
                 }
             });
         }
-        catch (_a) {
-        }
+        catch (_a) { }
     };
     const folderInfo = await (0, promises_1.stat)(folder).catch(() => { });
     if (folderInfo) {
@@ -88,7 +87,7 @@ const useMultiFileAuthState = async (folder) => {
         await (0, promises_1.mkdir)(folder, { recursive: true });
     }
     const fixFileName = (file) => { var _a; return (_a = file === null || file === void 0 ? void 0 : file.replace(/\//g, '__')) === null || _a === void 0 ? void 0 : _a.replace(/:/g, '-'); };
-    const creds = await readData('creds.json') || (0, auth_utils_1.initAuthCreds)();
+    const creds = (await readData('creds.json')) || (0, auth_utils_1.initAuthCreds)();
     return {
         state: {
             creds,

package/lib/Utils/validate-connection.js

@@ -14,7 +14,7 @@ const getUserAgent = (config) => {
         appVersion: {
             primary: config.version[0],
             secondary: config.version[1],
-            tertiary: config.version[2],
+            tertiary: config.version[2]
         },
         platform: WAProto_1.proto.ClientPayload.UserAgent.Platform.WEB,
         releaseChannel: WAProto_1.proto.ClientPayload.UserAgent.ReleaseChannel.RELEASE,
@@ -24,12 +24,12 @@ const getUserAgent = (config) => {
         localeLanguageIso6391: 'en',
         mnc: '000',
         mcc: '000',
-        localeCountryIso31661Alpha2: config.countryCode,
+        localeCountryIso31661Alpha2: config.countryCode
     };
 };
 const PLATFORM_MAP = {
     'Mac OS': WAProto_1.proto.ClientPayload.WebInfo.WebSubPlatform.DARWIN,
-    'Windows': WAProto_1.proto.ClientPayload.WebInfo.WebSubPlatform.WIN32
+    Windows: WAProto_1.proto.ClientPayload.WebInfo.WebSubPlatform.WIN32
 };
 const getWebInfo = (config) => {
     let webSubPlatform = WAProto_1.proto.ClientPayload.WebInfo.WebSubPlatform.WEB_BROWSER;
@@ -42,7 +42,7 @@ const getClientPayload = (config) => {
     const payload = {
         connectType: WAProto_1.proto.ClientPayload.ConnectType.WIFI_UNKNOWN,
         connectReason: WAProto_1.proto.ClientPayload.ConnectReason.USER_ACTIVATED,
-        userAgent: getUserAgent(config),
+        userAgent: getUserAgent(config)
     };
     payload.webInfo = getWebInfo(config);
     return payload;
@@ -54,7 +54,7 @@ const generateLoginNode = (userJid, config) => {
         passive: false,
         pull: true,
         username: +user,
-        device: device,
+        device: device
     };
     return WAProto_1.proto.ClientPayload.fromObject(payload);
 };
@@ -72,7 +72,7 @@ const generateRegistrationNode = ({ registrationId, signedPreKey, signedIdentity
     const companion = {
         os: config.browser[0],
         platformType: getPlatformType(config.browser[1]),
-        requireFullSync: config.syncFullHistory,
+        requireFullSync: config.syncFullHistory
     };
     const companionProto = WAProto_1.proto.DeviceProps.encode(companion).finish();
     const registerPayload = {
@@ -87,8 +87,8 @@ const generateRegistrationNode = ({ registrationId, signedPreKey, signedIdentity
             eIdent: signedIdentityKey.public,
             eSkeyId: (0, generics_1.encodeBigEndian)(signedPreKey.keyId, 3),
             eSkeyVal: signedPreKey.keyPair.public,
-            eSkeySig: signedPreKey.signature,
-        },
+            eSkeySig: signedPreKey.signature
+        }
     };
     return WAProto_1.proto.ClientPayload.fromObject(registerPayload);
 };
@@ -105,21 +105,21 @@ const configureSuccessfulPairing = (stanza, { advSecretKey, signedIdentityKey, s
     }
     const bizName = businessNode === null || businessNode === void 0 ? void 0 : businessNode.attrs.name;
     const jid = deviceNode.attrs.jid;
-    const { details, hmac } = WAProto_1.proto.ADVSignedDeviceIdentityHMAC.decode(deviceIdentityNode.content);
-    // check HMAC matches
-    const advSign = (0, crypto_2.hmacSign)(details, Buffer.from(advSecretKey, 'base64'));
+    const { details, hmac, accountType } = WAProto_1.proto.ADVSignedDeviceIdentityHMAC.decode(deviceIdentityNode.content);
+    const isHostedAccount = accountType !== undefined && accountType === WAProto_1.proto.ADVEncryptionType.HOSTED;
+    const hmacPrefix = isHostedAccount ? Buffer.from([6, 5]) : Buffer.alloc(0);
+    const advSign = (0, crypto_2.hmacSign)(Buffer.concat([hmacPrefix, details]), Buffer.from(advSecretKey, 'base64'));
     if (Buffer.compare(hmac, advSign) !== 0) {
         throw new boom_1.Boom('Invalid account signature');
     }
     const account = WAProto_1.proto.ADVSignedDeviceIdentity.decode(details);
     const { accountSignatureKey, accountSignature, details: deviceDetails } = account;
-    // verify the device signature matches
     const accountMsg = Buffer.concat([Buffer.from([6, 0]), deviceDetails, signedIdentityKey.public]);
     if (!crypto_2.Curve.verify(accountSignatureKey, accountMsg, accountSignature)) {
         throw new boom_1.Boom('Failed to verify account signature');
     }
-    // sign the details with our identity key
-    const deviceMsg = Buffer.concat([Buffer.from([6, 1]), deviceDetails, signedIdentityKey.public, accountSignatureKey]);
+    const devicePrefix = isHostedAccount ? Buffer.from([6, 6]) : Buffer.from([6, 1]);
+    const deviceMsg = Buffer.concat([devicePrefix, deviceDetails, signedIdentityKey.public, accountSignatureKey]);
     account.deviceSignature = crypto_2.Curve.sign(signedIdentityKey.private, deviceMsg);
     const identity = (0, signal_1.createSignalIdentity)(jid, accountSignatureKey);
     const accountEnc = (0, exports.encodeSignedDeviceIdentity)(account, false);
@@ -129,7 +129,7 @@ const configureSuccessfulPairing = (stanza, { advSecretKey, signedIdentityKey, s
         attrs: {
             to: WABinary_1.S_WHATSAPP_NET,
             type: 'result',
-            id: msgId,
+            id: msgId
         },
         content: [
             {
@@ -148,10 +148,7 @@ const configureSuccessfulPairing = (stanza, { advSecretKey, signedIdentityKey, s
     const authUpdate = {
         account,
         me: { id: jid, name: bizName },
-        signalIdentities: [
-            ...(signalIdentities || []),
-            identity
-        ],
+        signalIdentities: [...(signalIdentities || []), identity],
         platform: platformNode === null || platformNode === void 0 ? void 0 : platformNode.attrs.name
     };
     return {
@@ -168,8 +165,6 @@ const encodeSignedDeviceIdentity = (account, includeSignatureKey) => {
     if (!includeSignatureKey || !((_a = account.accountSignatureKey) === null || _a === void 0 ? void 0 : _a.length)) {
         account.accountSignatureKey = null;
     }
-    return WAProto_1.proto.ADVSignedDeviceIdentity
-        .encode(account)
-        .finish();
+    return WAProto_1.proto.ADVSignedDeviceIdentity.encode(account).finish();
 };
 exports.encodeSignedDeviceIdentity = encodeSignedDeviceIdentity;