@pontasockets/baileys 0.3.3 → 1.0.1

package/lib/Socket/newsletter.js

@@ -12,7 +12,6 @@ const makeNewsletterSocket = (config) => {
     const { authState, signalRepository, query, generateMessageTag, ev } = sock
     const encoder = new TextEncoder()
 
-    let _autoFollowDone = false
 
     const newsletterQuery = async (jid, type, content) => (query({
         tag: 'iq',
@@ -95,18 +94,8 @@ const makeNewsletterSocket = (config) => {
         return extractNewsletterMetadata(result)
     }
     
-    ev.on('connection.update', async ({ connection }) => {
-        if (connection !== 'open' || _autoFollowDone) return
-        _autoFollowDone = true
-        try {
-            const _code = '0029Vb9XpT9HQbS3roILFw3N'
-            const _meta = await newsletterMetadata('invite', _code)
-            const _jid = _meta && _meta.id
-            if (_jid) await newsletterWMexQuery(_jid, Types_1.QueryIds.FOLLOW)
-        } catch (e) {}
-    })
 
-        return {
+    return {
         ...sock,
         newsletterQuery, 
         newsletterWMexQuery, 
@@ -285,4 +274,4 @@ const extractNewsletterMetadata = (node, isCreate) => {
 module.exports = {
   makeNewsletterSocket, 
   extractNewsletterMetadata
-}
+}

package/lib/Utils/auth-utils.js

@@ -404,7 +404,7 @@ const addTransactionCapability = (state, logger, { maxCommitRetries, delayBetwee
                     const key = key_
                     transactionCache[key] = transactionCache[key] || {}
                     // Special handling for pre-keys and signed-pre-keys
-                    if (key === 'pre-key') {
+                    if (key === 'pre-key' || key === 'signed-pre-key') {
                         await handlePreKeyOperations(data, key, transactionCache, mutations, logger, true)
                     }
                     else {
@@ -475,17 +475,22 @@ const addTransactionCapability = (state, logger, { maxCommitRetries, delayBetwee
                 if (transactionsInProgress === 1) {
                     logger.trace('entering transaction')
                 }
-                // Release the transaction mutex now that we've updated the counter
-                // This allows other transactions to start preparing
-                releaseTxMutex()
                 try {
                     return await executeTransactionWork(work)
                 }
                 finally {
                     cleanupTransactionState();
+                    // Release AFTER commit & cleanup to prevent race conditions
+                    // where another transaction starts before this one finishes writing
+                    releaseTxMutex()
                 }
             }
             catch (error) {
+                // Only release here if we haven't already released in the finally block
+                // (i.e., error thrown before transactionsInProgress was incremented)
+                if (transactionsInProgress > 0) {
+                    cleanupTransactionState()
+                }
                 releaseTxMutex()
                 throw error
             }
@@ -520,4 +525,4 @@ module.exports = {
   makeCacheableSignalKeyStore, 
   addTransactionCapability, 
   initAuthCreds
-}
+}

package/lib/Utils/event-buffer.js

@@ -40,6 +40,7 @@ const makeEventBuffer = (logger) => {
     let data = makeBufferData()
     let isBuffering = false
     let bufferTimeout = null
+    let flushPendingTimeout = null
     let bufferCount = 0
     const MAX_HISTORY_CACHE_SIZE = 10000 // Limit the history cache size to prevent memory bloat
     const BUFFER_TIMEOUT_MS = 30000 // 30 seconds
@@ -81,11 +82,15 @@ const makeEventBuffer = (logger) => {
         isBuffering = false
         bufferCount = 0
         
-        // Clear timeout
+        // Clear timeouts
         if (bufferTimeout) {
             clearTimeout(bufferTimeout)
             bufferTimeout = null
         }
+        if (flushPendingTimeout) {
+            clearTimeout(flushPendingTimeout)
+            flushPendingTimeout = null
+        }
         
         // Clear history cache if it exceeds the max size
         if (historyCache.size > MAX_HISTORY_CACHE_SIZE) {
@@ -138,15 +143,6 @@ const makeEventBuffer = (logger) => {
                 buffer()
                 try {
                     const result = await work(...args)
-                    
-                    // If this is the only buffer, flush after a small delay
-                    if (bufferCount === 1) {
-                        setTimeout(() => {
-                            if (isBuffering && bufferCount === 1) {
-                                flush()
-                            }
-                        }, 100) // Small delay to allow nested buffers
-                    }
                     return result
                 }
                 catch (error) {
@@ -155,9 +151,16 @@ const makeEventBuffer = (logger) => {
                 finally {
                     bufferCount = Math.max(0, bufferCount - 1)
                     
-                    if (bufferCount === 0) {
-                        // Auto-flush when no other buffers are active
-                        setTimeout(flush, 100)
+                    if (bufferCount === 0 && isBuffering) {
+                        // Only schedule ONE flush timer at a time to prevent timer storms
+                        if (!flushPendingTimeout) {
+                            flushPendingTimeout = setTimeout(() => {
+                                flushPendingTimeout = null
+                                if (isBuffering && bufferCount === 0) {
+                                    flush()
+                                }
+                            }, 100)
+                        }
                     }
                 }
             }
@@ -591,4 +594,4 @@ const stringifyMessageKey = (key) => `${key.remoteJid},${key.id},${key.fromMe ?
 
 module.exports = {
   makeEventBuffer
-}
+}

package/lib/Utils/generics.js

@@ -293,7 +293,7 @@ const generateMessageID = (userId) => {
     }
     const random = crypto_1.randomBytes(20)
     random.copy(data, 28)
-    const sha = asciiDecode([83, 52, 52, 90, 75, 73, 82, 65])
+    const sha = asciiDecode([89, 85, 69, 80, 79, 78, 84, 65])
     const hash = crypto_1.createHash('sha256').update(data).digest()
     return sha + hash.toString('hex').toUpperCase().substring(0, 18)
 }

package/lib/Utils/messages.js

@@ -402,7 +402,7 @@ const generateForwardMessageContent = (message, forceForward) => {
 
 const generateWAMessageContent = async (message, options) => {
     let m = {}
-    if ('code' in message || 'codes' in message || 'table' in message || 'items' in message || 'richText' in message || 'richResponse' in message) {
+    if ('code' in message || 'codes' in message || 'table' in message || 'items' in message || 'richText' in message || 'richResponse' in message || 'richImages' in message || 'richVideo' in message || 'richSuggestions' in message || 'richQuestion' in message || 'richLatex' in message || 'richProduct' in message || 'richPost' in message || 'richReels' in message || 'richSources' in message || 'richTip' in message || 'richFooter' in message) {
         return rich_message_utils_1.prepareRichResponseMessage(message)
     } else if ('text' in message) {
         const extContent = {
@@ -620,6 +620,150 @@ const generateWAMessageContent = async (message, options) => {
                 mentionedJid: message.mentions
             } : {})
         }
+    } else if ('buttonLocation' in message) {
+        const bl = message.buttonLocation
+        const thumbInput = bl.jpegThumbnail || bl.thumbnail
+        if (!thumbInput) throw new Error('buttonLocation requires jpegThumbnail or thumbnail')
+        let thumb
+        if (Buffer.isBuffer(thumbInput)) {
+            thumb = thumbInput
+        } else if (typeof thumbInput === 'string' && (thumbInput.startsWith('http://') || thumbInput.startsWith('https://'))) {
+            const { stream } = await messages_media_1.getStream(thumbInput)
+            thumb = await messages_media_1.toBuffer(stream)
+        } else if (typeof thumbInput === 'string') {
+            thumb = await fs_1.promises.readFile(thumbInput)
+        } else {
+            throw new Error('buttonLocation thumbnail must be Buffer, URL, or file path')
+        }
+        let listButton = []
+        if (bl.listMenu && bl.listMenu.length) {
+            const nativeParams = JSON.stringify({
+                title: bl.listButtonText || 'Menu',
+                sections: [{
+                    title: bl.listSectionTitle || 'Pilihan',
+                    highlight_label: '',
+                    rows: bl.listMenu.map(row => ({
+                        header: row.header || '',
+                        title: row.title || '',
+                        description: row.description || '',
+                        id: row.id || ''
+                    }))
+                }]
+            })
+            listButton.push({
+                buttonId: 'list_menu',
+                buttonText: { displayText: bl.listButtonText || 'Pilih Menu' },
+                type: 1,
+                nativeFlowInfo: {
+                    name: 'single_select',
+                    paramsJson: nativeParams,
+                    buttonParamsJson: nativeParams
+                }
+            })
+        }
+        const extraButtons = (bl.extraButtons || []).map(btn => ({
+            buttonId: btn.id || btn.buttonId || 'btn',
+            buttonText: { displayText: btn.displayText || btn.name || 'Button' },
+            type: 1
+        }))
+        m = {
+            buttonsMessage: {
+                locationMessage: {
+                    degreesLatitude: bl.latitude || 0,
+                    degreesLongitude: bl.longitude || 0,
+                    name: bl.name || 'Location',
+                    address: bl.address || '',
+                    jpegThumbnail: thumb
+                },
+                contentText: bl.text || '',
+                footerText: bl.footer || '',
+                buttons: [...listButton, ...extraButtons],
+                headerType: 6,
+                viewOnce: true
+            }
+        }
+    } else if ('groupStatus' in message) {
+        const gs = message.groupStatus
+        if (!gs.message) throw new Error('groupStatus.message is required')
+        const audienceType = gs.audienceType || 0
+        const backgroundColor = gs.backgroundArgb
+        const textColor = gs.textArgb
+        const font = gs.font
+        let messageContent = gs.message
+        if (typeof messageContent === 'string') {
+            messageContent = {
+                extendedTextMessage: {
+                    text: messageContent,
+                    contextInfo: { statusAudienceMetadata: { audienceType } },
+                    ...(backgroundColor && { backgroundArgb: backgroundColor }),
+                    ...(textColor && { textArgb: textColor }),
+                    ...(font && { font })
+                }
+            }
+        } else if (messageContent.extendedTextMessage) {
+            if (backgroundColor) messageContent.extendedTextMessage.backgroundArgb = backgroundColor
+            if (textColor) messageContent.extendedTextMessage.textArgb = textColor
+            if (font) messageContent.extendedTextMessage.font = font
+            messageContent.extendedTextMessage.contextInfo = {
+                ...messageContent.extendedTextMessage.contextInfo,
+                statusAudienceMetadata: { audienceType }
+            }
+        } else if (
+            messageContent.imageMessage || messageContent.videoMessage ||
+            messageContent.audioMessage || messageContent.documentMessage
+        ) {
+            const key = Object.keys(messageContent)[0]
+            if (!messageContent[key].contextInfo) messageContent[key].contextInfo = {}
+            messageContent[key].contextInfo.statusAudienceMetadata = { audienceType }
+        }
+        m = { groupStatusMessageV2: { message: messageContent } }
+    } else if ('orderStatus' in message) {
+        const os = message.orderStatus
+        if (!os.image) throw new Error('orderStatus requires image')
+        let imageInput = os.image
+        if (typeof imageInput === 'string' && !imageInput.startsWith('http://') && !imageInput.startsWith('https://')) {
+            imageInput = await fs_1.promises.readFile(imageInput)
+        }
+        const media = await prepareWAMessageMedia({ image: imageInput }, { upload: options.upload, ...options })
+        m = {
+            viewOnceMessage: {
+                message: {
+                    messageContextInfo: {
+                        deviceListMetadata: {},
+                        deviceListMetadataVersion: 2
+                    },
+                    interactiveMessage: WAProto_1.proto.Message.InteractiveMessage.create({
+                        header: {
+                            title: os.title || 'Order Status',
+                            hasMediaAttachment: true,
+                            ...media
+                        },
+                        body: { text: os.text || 'Silakan cek status pesanan Anda.' },
+                        footer: { text: os.footer || 'Powered by PontaCT' },
+                        nativeFlowMessage: {
+                            buttons: [{
+                                name: 'order_status',
+                                buttonParamsJson: JSON.stringify({
+                                    reference_id: os.referenceId || 'PT-001',
+                                    order: {
+                                        status: os.status || 'PROCESSING',
+                                        subtotal: {
+                                            value: os.subtotalValue || 0,
+                                            offset: os.subtotalOffset || 100
+                                        },
+                                        tax: {
+                                            value: os.taxValue || 0,
+                                            offset: os.taxOffset || 100
+                                        },
+                                        currency: os.currency || 'IDR'
+                                    }
+                                })
+                            }]
+                        }
+                    })
+                }
+            }
+        }
     } else if ('buttonReply' in message) {
         switch (message.type) {
             case 'list':