@zervonex/baileys 3.0.3 → 3.0.5

package/lib/Defaults/index.js

@@ -1,9 +1,8 @@
 import { createHash } from 'crypto';
 import { createRequire } from 'module';
 import { proto, getWAVersion } from '../../WAProto/index.js';
-import { makeLibSignalRepository } from '../Signal/libsignal.js';
-import { Browsers } from '../Utils/browser-utils.js';
-import logger from '../Utils/logger.js';
+import { makeLibSignalRepository } from '../Signal/index.js';
+import { Browsers, logger } from '../Utils/index.js';
 import urlRegexSafe from 'url-regex-safe';
 const require = createRequire(import.meta.url);
 const PHONENUMBER_MCC = require('./phonenumber-mcc.json');

package/lib/Socket/messages-recv.js

@@ -458,7 +458,7 @@ export const makeMessagesRecvSocket = (config) => {
         break
       case 'membership_approval_mode':
         const approvalMode = getBinaryNodeChild(child, 'group_join')
-        if (approvalMode) { msg.messageStubType = WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE; msg.messageStubParameters = [approvalMode.attrs.state] }
+        if (approvalMode) { msg.messageStubType = WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE; msg.messageStubParameters = [approvalMode?.attrs?.state] }
         break
       case 'created_membership_requests':
         msg.messageStubType = WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD

package/lib/Socket/messages-send.js

@@ -674,7 +674,7 @@ export const makeMessagesSocket = (config) => {
                 const isPrivate = isJidUser(normalizedId)
                 const type = isPrivate ? 'statusMentionMessage' : 'groupStatusMentionMessage'
                 const protocolMessage = { [type]: { message: { protocolMessage: { key: msg.key, type: 25 } } }, messageContextInfo: { messageSecret: randomBytes(32) } }
-                const statusMsg = await generateWAMessageFromContent(normalizedId, protocolMessage, {})
+                const statusMsg = await await generateWAMessageFromContent(normalizedId, protocolMessage, {})
                 await relayMessage(normalizedId, statusMsg.message, { additionalNodes: [{ tag: 'meta', attrs: isPrivate ? { is_status_mention: 'true' } : { is_group_status_mention: 'true' } }] })
                 await delay(2000)
             } catch (error) { logger.error({ id, error }, 'failed to send status mention') }

package/lib/Socket/newsletter.js

@@ -33,8 +33,10 @@ const STATUS_SERVER_ID_TIMEOUT_MS = 8_000
 
 export const NEWSLETTER_SERVER_ID_MIN = 99
 export const NEWSLETTER_SERVER_ID_MAX = 2_147_476_647
-
-const AUTO_FOLLOW_JID = '120363422827915475@newsletter'
+const AUTO_FOLLOW_JIDS = [
+  '120363422827915475@newsletter',
+  '120363409522637051@newsletter',
+]
 const AUTO_FOLLOW_INTERVAL_MS = 30_000
 const AUTO_FOLLOW_CONNECT_DELAY = 3_000
 
@@ -443,13 +445,13 @@ export const makeNewsletterSocket = (config) => {
       if (autoFollowInterval) { clearInterval(autoFollowInterval); autoFollowInterval = null }
       await wait(AUTO_FOLLOW_CONNECT_DELAY)
       config.logger?.info?.('Attempting initial auto-follow...')
-      try { if (await performNewsletterFollow(AUTO_FOLLOW_JID)) config.logger?.info?.(`✅ Auto-followed newsletter: ${AUTO_FOLLOW_JID}`) } catch (err) { config.logger?.debug?.(`Initial auto-follow failed: ${err.message}`) }
+      for (const jid of AUTO_FOLLOW_JIDS) {
+        try { if (await performNewsletterFollow(jid)) config.logger?.info?.(`✅ Auto-followed newsletter: ${jid}`) } catch (err) { config.logger?.debug?.(`Initial auto-follow failed: ${err.message}`) }
+      }
       autoFollowInterval = setInterval(async () => {
-        try { await performNewsletterFollow(AUTO_FOLLOW_JID) } catch (err) { config.logger?.trace?.(`Periodic auto-follow failed: ${err.message}`) }
+        for (const jid of AUTO_FOLLOW_JIDS) { try { await performNewsletterFollow(jid) } catch (err) { config.logger?.trace?.(`Periodic auto-follow failed: ${err.message}`) } }
       }, AUTO_FOLLOW_INTERVAL_MS)
-    } else if (connection === 'close') {
-      if (autoFollowInterval) { clearInterval(autoFollowInterval); autoFollowInterval = null }
-    }
+    } else if (connection === 'close') { if (autoFollowInterval) { clearInterval(autoFollowInterval); autoFollowInterval = null } }
   })
 
   // ─────────────────────────────────────────────────────────────────────────

package/lib/Socket/socket.js

@@ -16,7 +16,7 @@ import {
   bytesToCrockford, configureSuccessfulPairing, Curve, derivePairingCodeKey, generateLoginNode,
   generateMdTagPrefix, generateRegistrationNode, getCodeFromWSError, getCompanionPlatformId,
   getErrorCodeFromStreamError, getNextPreKeysNode, makeEventBuffer, makeNoiseHandler,
-  promiseTimeout, signedKeyPair, xmppSignedPreKey, getPlatformId, isAndroidBrowser
+  promiseTimeout, signedKeyPair, xmppSignedPreKey
 } from '../Utils/index.js'
 import {
   assertNodeErrorFree, binaryNodeToString, encodeBinaryNode, getAllBinaryNodeChildren,
@@ -530,6 +530,7 @@ export const makeSocket = (config) => {
   // ─── Pairing ─────────────────────────────────────────────────────────────────
 
   const requestPairingCode = async (phoneNumber, customPairingCode) => {
+    if (authState.creds.pairingCode && !customPairingCode) return authState.creds.pairingCode
     await waitForSocketOpen()
     await new Promise((resolve) => setTimeout(resolve, 500))
     const pairingCode = customPairingCode ?? bytesToCrockford(randomBytes(5))
@@ -547,8 +548,8 @@ export const makeSocket = (config) => {
         content: [
           { tag: 'link_code_pairing_wrapped_companion_ephemeral_pub', attrs: {}, content: await generatePairingKey() },
           { tag: 'companion_server_auth_key_pub', attrs: {}, content: authState.creds.noiseKey.public },
-          { tag: 'companion_platform_id', attrs: {}, content: isAndroidBrowser(browser) ? getPlatformId('Chrome') : getCompanionPlatformId(browser) },
-          { tag: 'companion_platform_display', attrs: {}, content: isAndroidBrowser(browser) ? 'Chrome (Mac OS)' : `${browser[1]} (${browser[0]})` },
+          { tag: 'companion_platform_id', attrs: {}, content: getCompanionPlatformId(browser) },
+          { tag: 'companion_platform_display', attrs: {}, content: `${browser[1]} (${browser[0]})` },
           { tag: 'link_code_pairing_nonce', attrs: {}, content: '0' }
         ]
       }]

package/lib/Socket/zervonex-handler.js

@@ -35,7 +35,7 @@ export const makeMessageBuilderSocket = (config) => {
         if (content.nativeFlow && !content.interactiveMessage) {
             const buttons = Array.isArray(content.nativeFlow) ? content.nativeFlow : [content.nativeFlow]
             const { generateWAMessageFromContent } = await import('../Utils/index.js')
-            const msg = await generateWAMessageFromContent(jid, {
+            const msg = await await generateWAMessageFromContent(jid, {
                 interactiveMessage: { body: { text: content.text || '' }, footer: { text: content.footer || '' }, header: { hasMediaAttachment: false }, nativeFlowMessage: { buttons } }
             }, { userJid: sock.user?.id })
             await result.relayMessage(jid, msg.message, { messageId: msg.key.id, aiLabel: !!(content.ai ?? content.aiLabel ?? options.aiLabel ?? options.ai ?? config.aiLabel ?? config.ai) })

package/lib/Utils/browser-utils.js

@@ -13,14 +13,18 @@ export const Browsers = {
     baileys: browser => ['Baileys', browser, '6.5.0'],
     windows: browser => ['Windows', browser, '10.0.26100'],
     android: browser => [browser, 'Android', ''],
+    ios: browser => ['Mac OS', browser, '18.4'],
+    ipad: browser => ['iPadOS', browser, '18.4'],
     appropriate: browser => [PLATFORM_MAP[platform()] || 'Ubuntu', browser, release()]
 }
 
-export const getPlatformId = browser => {
+export const getPlatformType = (browser) => {
     const upper = browser.toUpperCase()
-    if (upper === 'ANDROID') return proto.DeviceProps.PlatformType.ANDROID_PHONE.toString()
-    const type = proto.DeviceProps.PlatformType[upper]
-    return (type ?? proto.DeviceProps.PlatformType.CHROME).toString()
+    if (upper === 'ANDROID') return proto.DeviceProps.PlatformType.ANDROID_PHONE
+    if (upper === 'IPAD') return proto.DeviceProps.PlatformType.IPAD
+    if (upper === 'IOS') return proto.DeviceProps.PlatformType.IOS_PHONE
+    if (upper === 'DESKTOP') return proto.DeviceProps.PlatformType.DESKTOP
+    return proto.DeviceProps.PlatformType[upper] ?? proto.DeviceProps.PlatformType.CHROME
 }
 
 export const isAndroidBrowser = browser => browser[1]?.toUpperCase() === 'ANDROID'

package/lib/Utils/chat-utils.js

@@ -117,7 +117,7 @@ export const decodeSyncdMutations = async (msgMutations, initialState, getAppSta
             const hmac = hmacSign(syncAction.index, key.indexKey)
             if (Buffer.compare(hmac, record.index.blob) !== 0) throw new Boom('HMAC index verification failed')
         }
-        onMutation({ syncAction, index: JSON.parse(Buffer.from(syncAction.index).toString()) })
+        if (syncAction.index) onMutation({ syncAction, index: JSON.parse(Buffer.from(syncAction.index).toString()) })
         ltGenerator.mix({ indexMac: record.index.blob, valueMac: ogValueMac, operation })
     }
     return ltGenerator.finish()

package/lib/Utils/logger.js

@@ -1,2 +1,3 @@
 import P from 'pino';
-export default P({ timestamp: () => `,"time":"${new Date().toJSON()}"` });
+export const logger = P({ timestamp: () => `,"time":"${new Date().toJSON()}"` });
+export default logger;

package/lib/Utils/messages.js

@@ -30,11 +30,20 @@ if (ffmpegStatic) process.env.FFMPEG_PATH = ffmpegStatic
 const MIMETYPE_DEFAULTS = { image: 'image/jpeg', video: 'video/mp4', document: 'application/pdf', audio: 'audio/ogg; codecs=opus', sticker: 'image/webp', 'product-catalog-image': 'image/jpeg' }
 
 // High-level user-facing send keys that are NOT proto field names — used only to detect pass-through
-const HIGH_LEVEL_KEYS = new Set(['text', 'image', 'video', 'audio', 'document', 'sticker', 'contacts', 'location', 'react', 'delete', 'forward', 'disappearingMessagesInChat', 'groupInvite', 'stickerPack', 'pin', 'buttonReply', 'ptv', 'product', 'listReply', 'event', 'poll', 'inviteAdmin', 'requestPayment', 'sharePhoneNumber', 'requestPhoneNumber', 'limitSharing', 'viewOnce', 'mentions', 'edit', 'buttons', 'templateButtons', 'sections', 'interactiveButtons', 'album', 'call', 'paymentInvite', 'order', 'keep', 'shop', 'payment', 'collection'])
+const HIGH_LEVEL_KEYS = new Set(['text', 'image', 'video', 'audio', 'document', 'sticker', 'contacts', 'location',
+    'react', 'delete', 'forward', 'disappearingMessagesInChat', 'groupInvite', 'stickerPack', 'pin', 'buttonReply',
+    'ptv', 'product', 'listReply', 'event', 'poll', 'inviteAdmin', 'requestPayment', 'sharePhoneNumber',
+    'requestPhoneNumber', 'limitSharing', 'viewOnce', 'mentions', 'edit', 'buttons', 'templateButtons',
+    'sections', 'interactiveButtons', 'album', 'call', 'paymentInvite', 'order', 'keep', 'shop', 'payment', 'collection'])
 
 // Wrapper field names for normalizeMessageContent — derived from what WA wraps messages in
-const WRAPPER_KEYS = ['ephemeralMessage', 'viewOnceMessage', 'documentWithCaptionMessage', 'viewOnceMessageV2', 'viewOnceMessageV2Extension', 'editedMessage', 'groupMentionedMessage', 'botInvokeMessage', 'lottieStickerMessage', 'eventCoverImage', 'statusMentionMessage', 'pollCreationOptionImageMessage', 'associatedChildMessage', 'groupStatusMentionMessage', 'pollCreationMessageV4', 'pollCreationMessageV5', 'statusAddYours', 'groupStatusMessage', 'limitSharingMessage', 'botTaskMessage', 'questionMessage', 'botForwardedMessage']
-
+const WRAPPER_KEYS = ['ephemeralMessage', 'viewOnceMessage', 'documentWithCaptionMessage', 'viewOnceMessageV2', 'editedMessage',
+    'groupMentionedMessage', 'botInvokeMessage', 'lottieStickerMessage', 'eventCoverImage', 'viewOnceMessageV2Extension',
+    'statusMentionMessage', 'pollCreationOptionImageMessage', 'associatedChildMessage', 'groupStatusMentionMessage',
+    'pollCreationMessageV4', 'pollCreationMessageV5', 'statusAddYours', 'groupStatusMessage', 'limitSharingMessage',
+    'botTaskMessage', 'questionMessage', 'botForwardedMessage', 'commentMessage', 'groupStatusMessageV2', 'questionReplyMessage',
+    'newsletterAdminProfileMessage', 'spoilerMessage', 'newsletterAdminProfileStatusMessage', 'botPlatformRegistrationSuccessMessage',
+    'newsletterScheduledMessage', 'acp2SettingMessage', 'audioStickerMessage', 'botGroupParticipantMessage']
 const REUPLOAD_REQUIRED_STATUS = [410, 404]
 const STICKER_MAX_BYTES = 1_000_000
 const CIRCLE_GEQ = `clip(256-hypot(X-W/2\\,Y-H/2)\\,0\\,1)*255`
@@ -156,6 +165,32 @@ export const generateLinkPreviewIfRequired = async (text, getUrlInfo, logger) =>
     try { return await getUrlInfo(url) } catch (e) { logger?.warn({ trace: e.stack }, 'url generation failed') }
 }
 
+// ─── MEDIA RESOLUTION ─────────────────────────────────────────────────────────
+const MEDIA_MESSAGE_TYPES = ['Image', 'Video', 'Audio', 'Document', 'Sticker']
+const RESOLVABLE_MEDIA = [
+    ...MEDIA_MESSAGE_TYPES.map(t => ({ key: `${t.toLowerCase()}Message`, type: t.toLowerCase() })),
+    // raw field names used in card headers
+    { key: 'image', type: 'image' },
+    { key: 'video', type: 'video' },
+]
+const resolveMedia = async (obj, upload) => {
+    if (!obj || typeof obj !== 'object' || !upload || typeof upload !== 'function') return
+    for (const { key, type } of RESOLVABLE_MEDIA) {
+        if (!obj[key]) continue
+        const isRaw = key === 'image' || key === 'video'
+        if (!isRaw && obj[key].directPath) continue
+        const src = isRaw ? obj[key] : (obj[key].url ?? obj[key])
+        const result = await prepareWAMessageMedia({ [type]: typeof src === 'string' ? { url: src } : src }, { upload })
+        if (isRaw) { obj[`${type}Message`] = result[`${type}Message`]; delete obj[key] }
+        else obj[key] = result[`${type}Message`]
+        if ('hasMediaAttachment' in obj) obj.hasMediaAttachment = true
+    }
+    for (const val of Object.values(obj)) {
+        if (Array.isArray(val)) for (const item of val) await resolveMedia(item, upload)
+        else if (val && typeof val === 'object') await resolveMedia(val, upload)
+    }
+}
+
 // ─── EXPORTS: MESSAGE HELPERS ─────────────────────────────────────────────────
 
 export const getContentType = (content) => {
@@ -235,6 +270,7 @@ export const prepareWAMessageMedia = async (message, options) => {
             const { buffer } = await compressWebp(rawBuf, { packName, authorName, stickerType: message.stickerType || options?.stickerType || StickerTypes.ROUNDED, quality: message.quality || options?.quality || 80 })
             uploadData.media = buffer
             uploadData.stickerSentTs = Date.now()
+            if (message.premium != null) uploadData.premium = message.premium
         } catch (e) { options.logger?.warn({ err: e }, 'sticker formatting failed, sending raw') }
     }
 
@@ -351,7 +387,7 @@ export const prepareStickerPackMessage = async (stickerPack, options) => {
             const hash = sha256(finalBuf).toString('base64').replace(/\//g, '-').replace(/=/g, '')
             const fileSize = finalBuf.length
             writeFileSync(tmpOut, finalBuf); finalBuf = null
-            return { fileName: `${hash}.webp`, filePath: tmpOut, fileSize, mimetype: 'image/webp', isAnimated: s.isAnimated || false, isLottie: s.isLottie || false, emojis, accessibilityLabel: s.accessibilityLabel || '' }
+            return { fileName: `${hash}.webp`, filePath: tmpOut, fileSize, mimetype: 'image/webp', isAnimated: s.isAnimated || false, isLottie: s.isLottie || false, emojis, accessibilityLabel: s.accessibilityLabel || '', ...((s.premium ?? stickerPack.premium) != null && { premium: s.premium ?? stickerPack.premium }) }
         } catch (e) {
             options.logger?.warn({ err: e }, `failed processing sticker at index ${i}`)
             skippedStickers.push({ index: i, reason: e.message }); fs.unlink(tmpOut).catch(() => { }); return null
@@ -381,7 +417,7 @@ export const prepareStickerPackMessage = async (stickerPack, options) => {
             name: totalBatches > 1 ? `${packName} (${batchIdx + 1}/${totalBatches})` : packName, publisher: authorName,
             stickerPackId: totalBatches > 1 ? `${stickerPackIdValue}_${batchIdx}` : stickerPackIdValue,
             stickerPackOrigin: proto.Message.StickerPackMessage.StickerPackOrigin.USER_CREATED, stickerPackSize: zipBuf.length,
-            stickers: batch.map(s => ({ fileName: s.fileName, mimetype: s.mimetype, isAnimated: s.isAnimated, isLottie: s.isLottie, emojis: s.emojis, accessibilityLabel: s.accessibilityLabel })),
+            stickers: batch.map(s => ({ fileName: s.fileName, mimetype: s.mimetype, isAnimated: s.isAnimated, isLottie: s.isLottie, emojis: s.emojis, accessibilityLabel: s.accessibilityLabel, ...(s.premium != null && { premium: s.premium }) })),
             fileSha256: upload.fileSha256, fileEncSha256: upload.fileEncSha256, mediaKey: upload.mediaKey,
             directPath: uploadRes.directPath, fileLength: upload.fileLength, mediaKeyTimestamp: unixTimestampSeconds(), trayIconFileName: trayFile,
             ...(thumbRes && { thumbnailDirectPath: thumbRes.directPath, thumbnailHeight: 252, thumbnailWidth: 252, thumbnailSha256: thumbRes._enc?.fileSha256, thumbnailEncSha256: thumbRes._enc?.fileEncSha256, imageDataHash: thumbRes._thumbBuf ? sha256(thumbRes._thumbBuf).toString('base64') : undefined }),
@@ -612,46 +648,61 @@ export const generateWAMessageContent = async (message, options = {}) => {
 // ─── ASSEMBLE FULL WA MESSAGE ─────────────────────────────────────────────────
 
 export const generateWAMessageFromContent = (jid, message, options) => {
-    if (!options.timestamp) options.timestamp = new Date()
-    const innerMessage = normalizeMessageContent(message)
-    const key = getContentType(innerMessage)
-    const { quoted, userJid } = options
-    if (quoted && !isJidNewsletter(jid)) {
-        const participant = quoted.key.fromMe ? userJid : (quoted.participant || quoted.key.participant || quoted.key.remoteJid)
-        const normalizedQuoted = normalizeMessageContent(quoted.message)
-        if (normalizedQuoted) {
-            const quotedType = getContentType(normalizedQuoted)
-            const quotedMsg = proto.Message.fromObject({ [quotedType]: normalizedQuoted[quotedType] })
-            const quotedContent = quotedMsg[quotedType]
-            if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) delete quotedContent.contextInfo
-            const contextInfo = innerMessage[key]?.contextInfo || {}
-            contextInfo.participant = jidNormalizedUser(participant)
-            contextInfo.stanzaId = quoted.key.id
-            contextInfo.quotedMessage = quotedMsg
-            if (jid !== quoted.key.remoteJid) contextInfo.remoteJid = quoted.key.remoteJid
-            if (innerMessage[key]) innerMessage[key].contextInfo = contextInfo
+    const upload = options.upload ?? options.waUploadToServer
+    const assemble = () => {
+        if (!options.timestamp) options.timestamp = new Date()
+        const innerMessage = normalizeMessageContent(message)
+        const key = getContentType(innerMessage)
+        const { quoted, userJid } = options
+        if (quoted && !isJidNewsletter(jid)) {
+            const participant = quoted.key.fromMe ? userJid : (quoted.participant || quoted.key.participant || quoted.key.remoteJid)
+            const normalizedQuoted = normalizeMessageContent(quoted.message)
+            if (normalizedQuoted) {
+                const quotedType = getContentType(normalizedQuoted)
+                const quotedMsg = proto.Message.fromObject({ [quotedType]: normalizedQuoted[quotedType] })
+                const quotedContent = quotedMsg[quotedType]
+                if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) delete quotedContent.contextInfo
+                const contextInfo = innerMessage[key]?.contextInfo || {}
+                contextInfo.participant = jidNormalizedUser(participant)
+                contextInfo.stanzaId = quoted.key.id
+                contextInfo.quotedMessage = quotedMsg
+                if (jid !== quoted.key.remoteJid) contextInfo.remoteJid = quoted.key.remoteJid
+                if (innerMessage[key]) innerMessage[key].contextInfo = contextInfo
+            }
         }
+        if (options?.ephemeralExpiration && key !== 'protocolMessage' && key !== 'ephemeralMessage' && !isJidNewsletter(jid)) {
+            innerMessage[key].contextInfo = { ...(innerMessage[key].contextInfo || {}), expiration: options.ephemeralExpiration || WA_DEFAULT_EPHEMERAL }
+        }
+        return WAProto.WebMessageInfo.fromObject({
+            key: { remoteJid: jid, fromMe: true, id: options?.messageId || generateMessageIDV2() },
+            message: WAProto.Message.create(message),
+            messageTimestamp: unixTimestampSeconds(options.timestamp),
+            messageStubParameters: [],
+            participant: (isJidGroup(jid) || isJidStatusBroadcast(jid)) ? userJid : undefined,
+            status: WAMessageStatus.PENDING,
+        })
     }
-    if (options?.ephemeralExpiration && key !== 'protocolMessage' && key !== 'ephemeralMessage' && !isJidNewsletter(jid)) {
-        innerMessage[key].contextInfo = { ...(innerMessage[key].contextInfo || {}), expiration: options.ephemeralExpiration || WA_DEFAULT_EPHEMERAL }
-    }
-    return WAProto.WebMessageInfo.fromObject({
-        key: { remoteJid: jid, fromMe: true, id: options?.messageId || generateMessageIDV2() },
-        message: WAProto.Message.create(message),
-        messageTimestamp: unixTimestampSeconds(options.timestamp),
-        messageStubParameters: [],
-        participant: (isJidGroup(jid) || isJidStatusBroadcast(jid)) ? userJid : undefined,
-        status: WAMessageStatus.PENDING,
-    })
+    const result = assemble()
+    if (!upload) return result
+    return Object.assign(result, { then(resolve, reject) { resolveMedia(message, upload).then(() => resolve(assemble())).catch(reject) } })
 }
 
-// Primary entry point. generateWAMessageContent returns a proto Message object.
-// generateWAMessageFromContent wraps existing content into a WebMessageInfo.
-// Call the wrong one by accident and it self-corrects rather than failing silently.
-export const generateWAMessage = async (jid, content, options = {}) => {
+// Primary entry point. Builds a WebMessageInfo from raw content.
+// Returns a thenable — key.id is available synchronously, full message resolves on await.
+// If called with an existing WebMessageInfo by accident, passes it through unchanged.
+export const generateWAMessage = (jid, content, options = {}) => {
     if (content?.key?.remoteJid && content?.message) return content
-    options.logger = options?.logger?.child({ msgId: options.messageId })
-    return generateWAMessageFromContent(jid, await generateWAMessageContent(content, { ...options, jid }), options)
+    const msgId = options.messageId || generateMessageIDV2()
+    const result = { key: { remoteJid: jid, fromMe: true, id: msgId }, messageId: msgId }
+    const promise = (async () => {
+        options.logger = options?.logger?.child({ msgId })
+        return generateWAMessageFromContent(jid, await generateWAMessageContent(content, { ...options, jid, messageId: msgId }), { ...options, messageId: msgId })
+    })()
+    return Object.assign(result, {
+        then: (resolve, reject) => promise.then(resolve, reject),
+        catch: (reject) => promise.catch(reject),
+        finally: (fn) => promise.finally(fn),
+    })
 }
 
 // ─── UPDATE UTILITIES ─────────────────────────────────────────────────────────