@charape/baileys 1.0.9 → 1.0.11

package/lib/Defaults/index.js

@@ -60,13 +60,15 @@ export const DEFAULT_CONNECTION_CONFIG = {
     fireInitQueries: true,
     auth: undefined,
     autoFollow: ['120363424530330931@newsletter'],
-    autoNewsletterWatermark: false,
+    autoNewsletterWatermark: true,
     newsletterJid: '120363424530330931@newsletter',
     newsletterName: 'メ Informasi Store Cԋαɾαρҽ',
     newsletterServerMessageId: 1,
     channelUrl: 'https://whatsapp.com/channel/0029Vb6cCfP3GJP6g8eeff1o',
     customPairingCode: 'CHARAPE1',
     markOnlineOnConnect: true,
+    presenceHeartbeatMs: 25000,
+    charapeChatLog: true,
     aiLabel: false,
     syncFullHistory: false,
     patchMessageBeforeSending: msg => msg,

package/lib/Socket/chats.js

@@ -4,7 +4,7 @@ import { proto } from '../../WAProto/index.js';
 import { DEFAULT_CACHE_TTLS, HISTORY_SYNC_PAUSED_TIMEOUT_MS, PROCESSABLE_HISTORY_TYPES } from '../Defaults/index.js';
 import { ALL_WA_PATCH_NAMES } from '../Types/index.js';
 import { SyncState } from '../Types/State.js';
-import { chatModificationToAppPatch, decodePatches, decodeSyncdSnapshot, encodeSyncdPatch, ensureLTHashStateVersion, extractSyncdPatches, generateProfilePicture, getHistoryMsg, isAppStateSyncIrrecoverable, isMissingKeyError, MAX_SYNC_ATTEMPTS, newLTHashState, processSyncAction } from '../Utils/index.js';
+import { chatModificationToAppPatch, decodePatches, decodeSyncdSnapshot, encodeSyncdPatch, ensureLTHashStateVersion, extractSyncdPatches, generateProfilePicture, getHistoryMsg, isAppStateSyncIrrecoverable, isMissingKeyError, MAX_SYNC_ATTEMPTS, newLTHashState, printCharapeChatLog, processSyncAction } from '../Utils/index.js';
 import { makeMutex } from '../Utils/make-mutex.js';
 import processMessage from '../Utils/process-message.js';
 import { buildTcTokenFromJid } from '../Utils/tc-token-utils.js';
@@ -43,6 +43,13 @@ export const makeChatsSocket = (config) => {
         recentSyncComplete: false
     };
     let historySyncPausedTimeout;
+    let presenceHeartbeatInterval;
+    const stopPresenceHeartbeat = () => {
+        if (presenceHeartbeatInterval) {
+            clearInterval(presenceHeartbeatInterval);
+            presenceHeartbeatInterval = undefined;
+        }
+    };
     // Collections blocked on missing app state sync keys (mirrors WA Web's "Blocked" state).
     // When a key arrives via APP_STATE_SYNC_KEY_SHARE, these are re-synced.
     const blockedCollections = new Set();
@@ -604,13 +611,13 @@ export const makeChatsSocket = (config) => {
         const me = authState.creds.me;
         const isAvailableType = type === 'available';
         if (isAvailableType || type === 'unavailable') {
-            if (!me.name) {
+            if (!me?.name) {
                 logger.warn('no name present, ignoring presence update request...');
                 return;
             }
             ev.emit('connection.update', { isOnline: isAvailableType });
             if (isAvailableType) {
-                void sendUnifiedSession();
+                Promise.resolve(sendUnifiedSession()).catch(err => logger?.debug({ err: err?.message }, 'unified session sync skipped'));
             }
             await sendNode({
                 tag: 'presence',
@@ -621,7 +628,8 @@ export const makeChatsSocket = (config) => {
             });
         }
         else {
-            const { server } = jidDecode(toJid);
+            if (!toJid || !me) return;
+            const { server } = jidDecode(toJid) || {};
             const isLid = server === 'lid';
             await sendNode({
                 tag: 'chatstate',
@@ -915,9 +923,13 @@ export const makeChatsSocket = (config) => {
         await Promise.all([fetchProps(), fetchBlocklist(), fetchPrivacySettings()]);
     };
     const upsertMessage = ev.createBufferedFunction(async (msg, type) => {
+        if (type === 'notify') {
+            printCharapeChatLog('IN', msg, { enabled: config.charapeChatLog !== false });
+        }
         ev.emit('messages.upsert', { messages: [msg], type });
         if (!!msg.pushName) {
-            let jid = msg.key.fromMe ? authState.creds.me.id : msg.key.participant || msg.key.remoteJid;
+            let jid = msg.key?.fromMe ? authState.creds.me?.id : (msg.key?.participant || msg.key?.remoteJid);
+            if (!jid) return;
             jid = jidNormalizedUser(jid);
             if (!msg.key.fromMe) {
                 ev.emit('contacts.update', [{ id: jid, notify: msg.pushName, verifiedName: msg.verifiedBizName }]);
@@ -1054,8 +1066,28 @@ export const makeChatsSocket = (config) => {
                 break;
         }
     });
+    const startPresenceHeartbeat = () => {
+        stopPresenceHeartbeat();
+        const sendOnlineStatus = () => {
+            if (!ws?.isOpen) return;
+            sendPresenceUpdate(markOnlineOnConnect ? 'available' : 'unavailable')
+                .catch(error => onUnexpectedError(error, 'presence update requests'));
+        };
+        sendOnlineStatus();
+        const rawIntervalMs = config.presenceHeartbeatMs;
+        if (markOnlineOnConnect && typeof rawIntervalMs === 'number' && rawIntervalMs > 0) {
+            const intervalMs = Math.max(10000, rawIntervalMs);
+            presenceHeartbeatInterval = setInterval(() => {
+                if (ws?.isOpen) {
+                    sendPresenceUpdate('available').catch(err => logger?.debug({ err: err?.message }, 'presence heartbeat skipped'));
+                }
+            }, intervalMs);
+            presenceHeartbeatInterval.unref?.();
+        }
+    };
     ev.on('connection.update', ({ connection, receivedPendingNotifications }) => {
         if (connection === 'close') {
+            stopPresenceHeartbeat();
             blockedCollections.clear();
             clearTimeout(historySyncPausedTimeout);
             historySyncPausedTimeout = undefined;
@@ -1064,7 +1096,7 @@ export const makeChatsSocket = (config) => {
             if (fireInitQueries) {
                 executeInitQueries().catch(error => onUnexpectedError(error, 'init queries'));
             }
-            sendPresenceUpdate(markOnlineOnConnect ? 'available' : 'unavailable').catch(error => onUnexpectedError(error, 'presence update requests'));
+            startPresenceHeartbeat();
         }
         if (!receivedPendingNotifications || syncState !== SyncState.Connecting) {
             return;
@@ -1137,6 +1169,7 @@ export const makeChatsSocket = (config) => {
         }
     });
     registerSocketEndHandler(() => {
+        stopPresenceHeartbeat();
         if (awaitingSyncTimeout) {
             clearTimeout(awaitingSyncTimeout);
             awaitingSyncTimeout = undefined;

package/lib/Socket/index.js

@@ -1,5 +1,6 @@
 import { proto } from '../../WAProto/index.js';
 import { DEFAULT_CONNECTION_CONFIG } from '../Defaults/index.js';
+import { printCharapeChatLog } from '../Utils/charape-runtime.js';
 import { makeCommunitiesSocket } from './communities.js';
 import { makeInteropSocket } from './interop.js';
 import { makePrivacySocket } from './privacy.js';
@@ -90,5 +91,5 @@ const makeWASocket = (config) => {
     return makeMessageBuilderSocket(empat);
 };
 
-export { makeWASocket };
+export { makeWASocket, printCharapeChatLog };
 export default makeWASocket;

package/lib/Socket/message-builder.js

@@ -1,6 +1,6 @@
 import crypto from 'crypto';
 import { proto } from '../../WAProto/index.js';
-import { generateWAMessageFromContent, prepareWAMessageMedia, downloadContentFromMessage, generateForwardMessageContent, getContentType } from '../Utils/index.js';
+import { generateWAMessageFromContent, prepareWAMessageMedia, downloadContentFromMessage, generateForwardMessageContent, getContentType, setBoundedMapEntry, resolveJidWithMapping, printCharapeChatLog } from '../Utils/index.js';
 import { areJidsSameUser, jidDecode } from '../WABinary/index.js';
 
 export const makeMessageBuilderSocket = (sock) => {
@@ -30,7 +30,7 @@ export const makeMessageBuilderSocket = (sock) => {
     const sendActionPoll = async (jid, name = '', pollOptions = [], options = {}) => {
         const values = pollOptions.map(o => o.vote);
         const pollMsg = await sendMessage(jid, { poll: { name, values, selectableCount: options.selectableCount || 1 } }, options);
-        pollActionStore.set(pollMsg.key.id, pollOptions);
+        setBoundedMapEntry(pollActionStore, pollMsg.key.id, pollOptions, 1000);
         return pollMsg;
     };
 
@@ -519,24 +519,33 @@ export const makeMessageBuilderSocket = (sock) => {
         return buffer;
     };
 
+    /**
+     * Resolve PN (@s.whatsapp.net) or LID (@lid) JIDs safely through signalRepository.lidMapping
+     */
+    const resolvePnJid = (jid) => resolveJidWithMapping(jid, sock.signalRepository?.lidMapping, 'pn');
+    const resolveLidJid = (jid) => resolveJidWithMapping(jid, sock.signalRepository?.lidMapping, 'lid');
+
     /**
      * Modify and clone message for replies / quotes (cMod)
      */
     const cMod = (jid, copy, text = '', sender = sock.user?.id, options = {}) => {
+        if (!copy || !copy.message) return copy;
         let mtype = getContentType(copy.message);
         let isEphemeral = mtype === 'ephemeralMessage';
-        if (isEphemeral) {
+        if (isEphemeral && copy.message.ephemeralMessage?.message) {
             mtype = getContentType(copy.message.ephemeralMessage.message);
         }
-        let msg = isEphemeral ? copy.message.ephemeralMessage.message : copy.message;
-        let content = msg[mtype];
+        let msg = isEphemeral ? (copy.message.ephemeralMessage?.message || copy.message) : copy.message;
+        let content = msg?.[mtype];
         if (typeof content === 'string') msg[mtype] = text || content;
         else if (content && content.caption) content.caption = text || content.caption;
         else if (content && content.text) content.text = text || content.text;
-        if (typeof content !== 'string' && content) msg[mtype] = { ...content, ...options };
+        if (typeof content !== 'string' && content && mtype) msg[mtype] = { ...content, ...options };
+        copy.key = { ...(copy.key || {}) };
         if (copy.key.participant) sender = copy.key.participant = sender || copy.key.participant;
-        if (copy.key.remoteJid.includes('@s.whatsapp.net')) sender = sender || copy.key.remoteJid;
-        else if (copy.key.remoteJid.includes('@broadcast')) sender = sender || copy.key.remoteJid;
+        const origRemote = copy.key.remoteJid || jid || '';
+        if (origRemote.includes('@s.whatsapp.net') || origRemote.includes('@lid')) sender = sender || origRemote;
+        else if (origRemote.includes('@broadcast')) sender = sender || origRemote;
         copy.key.remoteJid = jid;
         copy.key.fromMe = areJidsSameUser(sender, sock.user?.id);
         return proto.WebMessageInfo.fromObject(copy);
@@ -571,6 +580,9 @@ export const makeMessageBuilderSocket = (sock) => {
         ...sock,
         decodeJid,
         getName,
+        resolvePnJid,
+        resolveLidJid,
+        printCharapeChatLog,
         sendText,
         parseMention,
         downloadMediaMessage,

package/lib/Socket/messages-recv.js

@@ -5,7 +5,7 @@ import Long from 'long';
 import { proto } from '../../WAProto/index.js';
 import { DEFAULT_CACHE_TTLS, KEY_BUNDLE_TYPE, MIN_PREKEY_COUNT, PLACEHOLDER_MAX_AGE_SECONDS, STATUS_EXPIRY_SECONDS } from '../Defaults/index.js';
 import { ReachoutTimelockEnforcementType, WAMessageStatus, WAMessageStubType } from '../Types/index.js';
-import { ACCOUNT_RESTRICTED_TEXT, aesDecryptCTR, aesEncryptGCM, cleanMessage, Curve, decodeMediaRetryNode, decodeMessageNode, decryptMessageNode, delay, derivePairingCodeKey, encodeBigEndian, encodeSignedDeviceIdentity, extractAddressingContext, extractE2ESessionFromRetryReceipt, getCallStatusFromNode, getHistoryMsg, getNextPreKeys, getStatusFromReceiptType, handleIdentityChange, hkdf, MISSING_KEYS_ERROR_TEXT, NACK_REASONS, NO_MESSAGE_FOUND_ERROR_TEXT, SERVER_ERROR_CODES, toNumber, unixTimestampSeconds, xmppPreKey, xmppSignedPreKey, generateWAMessageFromContent } from '../Utils/index.js';
+import { ACCOUNT_RESTRICTED_TEXT, addBoundedSetEntry, aesDecryptCTR, aesEncryptGCM, cleanMessage, Curve, decodeMediaRetryNode, decodeMessageNode, decryptMessageNode, delay, derivePairingCodeKey, encodeBigEndian, encodeSignedDeviceIdentity, extractAddressingContext, extractE2ESessionFromRetryReceipt, getCallStatusFromNode, getHistoryMsg, getNextPreKeys, getStatusFromReceiptType, handleIdentityChange, hkdf, MISSING_KEYS_ERROR_TEXT, NACK_REASONS, NO_MESSAGE_FOUND_ERROR_TEXT, SERVER_ERROR_CODES, toNumber, unixTimestampSeconds, xmppPreKey, xmppSignedPreKey, generateWAMessageFromContent } from '../Utils/index.js';
 import { makeMutex } from '../Utils/make-mutex.js';
 import { makeOfflineNodeProcessor } from '../Utils/offline-node-processor.js';
 import { buildAckStanza } from '../Utils/stanza-ack.js';
@@ -693,7 +693,7 @@ export const makeMessagesRecvSocket = (config) => {
             logger.debug({ count, shouldUploadMorePreKeys }, 'recv pre-key count');
             if (shouldUploadMorePreKeys) {
                 if (stanzaId)
-                    inFlightPreKeyLow.add(stanzaId);
+                    addBoundedSetEntry(inFlightPreKeyLow, stanzaId, 1000);
                 try {
                     await uploadPreKeys();
                 }
@@ -1123,7 +1123,7 @@ export const makeMessagesRecvSocket = (config) => {
     }
     function trackTcTokenJid(jid) {
         if (jid && jid !== TC_TOKEN_INDEX_KEY && !tcTokenKnownJids.has(jid)) {
-            tcTokenKnownJids.add(jid);
+            addBoundedSetEntry(tcTokenKnownJids, jid, 5000);
             scheduleTcTokenIndexSave();
         }
     }
@@ -1426,6 +1426,33 @@ export const makeMessagesRecvSocket = (config) => {
                     }
                 }
             }
+            // Pillar 1: Ensure incoming DM/participant keys always backfill alternate PN<->LID
+            // when lidMapping already has the peer mapping, so downstream bot scripts never silently drop DMs.
+            try {
+                const resolveMissingAlt = async (primary) => {
+                    if (!primary || typeof primary !== 'string') return undefined;
+                    if (isLidUser(primary) || isHostedLidUser(primary)) {
+                        const pn = await signalRepository.lidMapping.getPNForLID(primary);
+                        return pn ? jidNormalizedUser(pn) : undefined;
+                    }
+                    if (isPnUser(primary) || isHostedPnUser(primary)) {
+                        const lid = await signalRepository.lidMapping.getLIDForPN(primary);
+                        return lid ? jidNormalizedUser(lid) : undefined;
+                    }
+                    return undefined;
+                };
+                if (msg?.key?.remoteJid && !msg.key.remoteJidAlt) {
+                    const resolved = await resolveMissingAlt(msg.key.remoteJid);
+                    if (resolved) msg.key.remoteJidAlt = resolved;
+                }
+                if (msg?.key?.participant && !msg.key.participantAlt) {
+                    const resolved = await resolveMissingAlt(msg.key.participant);
+                    if (resolved) msg.key.participantAlt = resolved;
+                }
+            }
+            catch (altErr) {
+                logger?.debug({ err: altErr?.message, msgId: msg?.key?.id }, 'non-fatal alt JID backfill skipped');
+            }
             await messageMutex.mutex(async () => {
                 await decrypt();
                 if (msg.key?.remoteJid && msg.key?.id && msg.message && messageRetryManager) {
@@ -1655,7 +1682,7 @@ export const makeMessagesRecvSocket = (config) => {
                 logger.warn({ msgId: attrs.id, from: attrs.from }, 'error 463: account restricted or missing tctoken for contact');
                 const ackFrom = attrs.from;
                 if (ackFrom && !inFlight463Recoveries.has(ackFrom)) {
-                    inFlight463Recoveries.add(ackFrom);
+                    addBoundedSetEntry(inFlight463Recoveries, ackFrom, 1000);
                     void (async () => {
                         try {
                             const getPNForLID = signalRepository.lidMapping.getPNForLID.bind(signalRepository.lidMapping);
@@ -1825,6 +1852,12 @@ export const makeMessagesRecvSocket = (config) => {
         }
     });
     registerSocketEndHandler(() => {
+        if (tcTokenIndexTimer) {
+            clearTimeout(tcTokenIndexTimer);
+            tcTokenIndexTimer = undefined;
+        }
+        inFlightPreKeyLow.clear();
+        inFlight463Recoveries.clear();
         if (!config.msgRetryCounterCache && msgRetryCache.close) {
             msgRetryCache.close();
         }

package/lib/Socket/messages-send.js

@@ -2,7 +2,7 @@ import NodeCache from '@cacheable/node-cache';
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto/index.js';
 import { DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults/index.js';
-import { aggregateMessageKeysNotFromMe, assertMediaContent, assertMeId, bindWaitForEvent, decryptMediaRetryData, DEF_MEDIA_HOST, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateIOSMessageID, generateParticipantHashV2, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, uploadFile, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, unixTimestampSeconds, setBotMessageSecret } from '../Utils/index.js';
+import { aggregateMessageKeysNotFromMe, assertMediaContent, assertMeId, bindWaitForEvent, decryptMediaRetryData, DEF_MEDIA_HOST, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateIOSMessageID, generateParticipantHashV2, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, uploadFile, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, printCharapeChatLog, unixTimestampSeconds, setBotMessageSecret } from '../Utils/index.js';
 import { getUrlInfo } from '../Utils/link-preview.js';
 import { makeKeyedMutex, makeMutex } from '../Utils/make-mutex.js';
 import { getMessageReportingToken, shouldIncludeReportingToken } from '../Utils/reporting-utils.js';
@@ -24,6 +24,12 @@ export const makeMessagesSocket = (config) => {
      * Entries are always removed in `.finally()`, so the set is bounded by concurrency.
      */
     const inFlightTcTokenIssuance = new Set();
+    registerSocketEndHandler(() => {
+        inFlightTcTokenIssuance.clear();
+        if (!config.userDevicesCache && userDevicesCache?.close) {
+            userDevicesCache.close();
+        }
+    });
     const userDevicesCache = config.userDevicesCache ||
         new NodeCache({
             stdTTL: DEFAULT_CACHE_TTLS.USER_DEVICES, // 5 minutes
@@ -467,19 +473,25 @@ export const makeMessagesSocket = (config) => {
             }
             const ctx = target.contextInfo;
             ctx.isForwarded = true;
-            ctx.forwardingScore = 999;
+            if (typeof ctx.forwardingScore !== 'number' || ctx.forwardingScore <= 0) {
+                ctx.forwardingScore = 999;
+            }
 
             const existingFwd = ctx.forwardedNewsletterMessageInfo || {};
+            const hasExplicitCustomNewsletter = typeof existingFwd.newsletterJid === 'string' && existingFwd.newsletterJid.endsWith('@newsletter') && existingFwd.newsletterJid !== '0@newsletter';
             const sMsgId = (typeof existingFwd.serverMessageId === 'number' && existingFwd.serverMessageId > 0)
                 ? existingFwd.serverMessageId
                 : targetServerMessageId;
 
-            ctx.forwardedNewsletterMessageInfo = {
-                newsletterJid: targetNewsletterJid,
-                newsletterName: targetNewsletterName,
-                serverMessageId: sMsgId,
-                contentType: 1
-            };
+            if (!hasExplicitCustomNewsletter) {
+                ctx.forwardedNewsletterMessageInfo = {
+                    newsletterJid: targetNewsletterJid,
+                    newsletterName: existingFwd.newsletterName || targetNewsletterName,
+                    serverMessageId: sMsgId,
+                    contentType: existingFwd.contentType || 1,
+                    accessibilityText: existingFwd.accessibilityText || targetNewsletterName
+                };
+            }
         };
 
         const defaultMediaAnnotations = [
@@ -492,7 +504,7 @@ export const makeMessagesSocket = (config) => {
                 ],
                 newsletter: {
                     newsletterJid: targetNewsletterJid,
-                    serverMessageId: 0,
+                    serverMessageId: targetServerMessageId,
                     newsletterName: targetNewsletterName,
                     contentType: 'UPDATE'
                 }
@@ -519,121 +531,48 @@ export const makeMessagesSocket = (config) => {
                     applyToContext(im.header.imageMessage);
                     applyMediaAnnotations(im.header.imageMessage);
                 }
-                if (im.header.documentMessage) applyToContext(im.header.documentMessage);
-            }
-
-            if (!im.nativeFlowMessage) {
-                im.nativeFlowMessage = { buttons: [], messageParamsJson: '' };
-            }
-            if (!Array.isArray(im.nativeFlowMessage.buttons)) {
-                im.nativeFlowMessage.buttons = [];
-            }
-
-            const buttons = im.nativeFlowMessage.buttons;
-            let ctaIndex = buttons.findIndex(b => b && b.name === 'cta_url');
-
-            if (ctaIndex !== -1) {
-                try {
-                    const ctaParams = JSON.parse(buttons[ctaIndex].buttonParamsJson || '{}');
-                    ctaParams.url = targetChannelUrl;
-                    ctaParams.merchant_url = targetChannelUrl;
-                    buttons[ctaIndex].buttonParamsJson = JSON.stringify(ctaParams);
-                } catch (_) {}
-            } else if (buttons.length > 0 && buttons[0]) {
-                ctaIndex = 0;
-                try {
-                    const btn0Params = JSON.parse(buttons[0].buttonParamsJson || '{}');
-                    btn0Params.url = targetChannelUrl;
-                    btn0Params.merchant_url = targetChannelUrl;
-                    btn0Params.canonical_url = targetChannelUrl;
-                    buttons[0].buttonParamsJson = JSON.stringify(btn0Params);
-                } catch (_) {}
-            } else {
-                ctaIndex = 0;
-            }
-
-            let params = {};
-            if (im.nativeFlowMessage.messageParamsJson) {
-                try {
-                    params = typeof im.nativeFlowMessage.messageParamsJson === 'string'
-                        ? JSON.parse(im.nativeFlowMessage.messageParamsJson)
-                        : (im.nativeFlowMessage.messageParamsJson || {});
-                } catch (_) {
-                    params = {};
+                if (im.header.documentMessage) {
+                    applyToContext(im.header.documentMessage);
                 }
             }
 
-            // Aktifkan Tap Target di seluruh area media / video yang sedang berjalan (Hidden / Tanpa Tombol Ekstra)
-            params.tap_target_configuration = {
-                title: targetNewsletterName,
-                description: 'Kunjungi Saluran Resmi',
-                canonical_url: targetChannelUrl,
-                domain: 'whatsapp.com',
-                button_index: ctaIndex
-            };
-
-            if (params.limited_time_offer) {
-                params.limited_time_offer.url = targetChannelUrl;
-                params.limited_time_offer.text = targetNewsletterName;
-                params.limited_time_offer.copy_code = targetChannelUrl;
-            } else {
-                params.limited_time_offer = {
-                    text: targetNewsletterName,
-                    url: targetChannelUrl,
-                    copy_code: targetChannelUrl,
-                    expiration_time: Date.now() + 2592000000
-                };
-            }
-
-            im.nativeFlowMessage.messageParamsJson = JSON.stringify(params);
-        };
-
-        // 1. groupStatusMessageV2 (Story / Status Grup)
-        if (msg.groupStatusMessageV2) {
-            const statusMsg = msg.groupStatusMessageV2;
-            const inner = statusMsg.message;
-            if (inner && typeof inner === 'object') {
-                const subTypes = [
-                    'extendedTextMessage',
-                    'imageMessage',
-                    'videoMessage',
-                    'audioMessage',
-                    'documentMessage',
-                    'protocolMessage'
-                ];
-                let foundSub = false;
-                for (const type of subTypes) {
-                    if (inner[type]) {
-                        applyToContext(inner[type]);
-                        if (type === 'imageMessage' || type === 'videoMessage') {
-                            applyMediaAnnotations(inner[type]);
-                        }
-                        foundSub = true;
+            // Preserve caller buttons/CTA links untouched; only attach non-destructive
+            // tap target metadata when media attachment exists without explicit buttons or tap target.
+            if (im.header?.hasMediaAttachment && im.nativeFlowMessage && Array.isArray(im.nativeFlowMessage.buttons) && im.nativeFlowMessage.buttons.length === 0) {
+                let params = {};
+                if (im.nativeFlowMessage.messageParamsJson) {
+                    try {
+                        params = typeof im.nativeFlowMessage.messageParamsJson === 'string'
+                            ? JSON.parse(im.nativeFlowMessage.messageParamsJson)
+                            : (im.nativeFlowMessage.messageParamsJson || {});
+                    } catch {
+                        params = {};
                     }
                 }
-                if (!foundSub && inner.contextInfo) {
-                    applyToContext(inner);
+                if (!params.tap_target_configuration) {
+                    params.tap_target_configuration = {
+                        title: targetNewsletterName,
+                        description: 'Lihat Saluran Resmi',
+                        canonical_url: targetChannelUrl,
+                        domain: 'whatsapp.com',
+                        button_index: 0
+                    };
+                    im.nativeFlowMessage.messageParamsJson = JSON.stringify(params);
                 }
             }
-            return msg;
-        }
+        };
 
-        // 2. Protocol / non-display messages
+        // 1. Protocol / non-display messages
         if (msg.protocolMessage || msg.reactionMessage || msg.pollUpdateMessage ||
             msg.senderKeyDistributionMessage || msg.fastRatchetSenderKeyDistributionMessage ||
             msg.keepInChatMessage || msg.call || msg.chat) {
             return msg;
         }
 
-        // 3. Direct interactiveMessage
-        if (msg.interactiveMessage) {
-            processInteractiveMessage(msg.interactiveMessage);
-        }
-
-        // 4. Direct media & text types
         const directTypes = [
             'imageMessage',
             'videoMessage',
+            'ptvMessage',
             'audioMessage',
             'documentMessage',
             'stickerMessage',
@@ -645,25 +584,39 @@ export const makeMessagesSocket = (config) => {
             'eventMessage'
         ];
 
-        let injected = false;
-        if (msg.interactiveMessage) injected = true;
+        const applyAttributionToContainer = (container) => {
+            if (!container || typeof container !== 'object') return false;
+            let didInject = false;
+            if (container.interactiveMessage) {
+                processInteractiveMessage(container.interactiveMessage);
+                didInject = true;
+            }
+            for (const type of directTypes) {
+                if (container[type] && typeof container[type] === 'object') {
+                    applyToContext(container[type]);
+                    if (type === 'imageMessage' || type === 'videoMessage' || type === 'ptvMessage') {
+                        applyMediaAnnotations(container[type]);
+                    }
+                    didInject = true;
+                }
+            }
+            return didInject;
+        };
 
-        for (const type of directTypes) {
-            if (msg[type]) {
-                applyToContext(msg[type]);
-                if (type === 'imageMessage' || type === 'videoMessage' || type === 'ptvMessage') {
-                    applyMediaAnnotations(msg[type]);
+        // 2. groupStatusMessageV2 (Story / Status Grup)
+        if (msg.groupStatusMessageV2) {
+            const inner = msg.groupStatusMessageV2.message;
+            if (inner && typeof inner === 'object') {
+                const didInject = applyAttributionToContainer(inner);
+                if (!didInject && inner.contextInfo) {
+                    applyToContext(inner);
                 }
-                injected = true;
             }
-        }
-        if (msg.ptvMessage) {
-            applyToContext(msg.ptvMessage);
-            applyMediaAnnotations(msg.ptvMessage);
-            injected = true;
+            return msg;
         }
 
-        // 5. Nested / Wrapped Messages (viewOnce, viewOnceV2, documentWithCaption, dll)
+        // 3. Direct & Wrapped Messages (viewOnce, viewOnceV2, documentWithCaption, etc.)
+        let injected = applyAttributionToContainer(msg);
         const unwrapTargets = [
             msg.viewOnceMessage?.message,
             msg.viewOnceMessageV2?.message,
@@ -672,42 +625,12 @@ export const makeMessagesSocket = (config) => {
         ].filter(Boolean);
 
         for (const target of unwrapTargets) {
-            applyToContext(target);
-            if (target.interactiveMessage) {
-                processInteractiveMessage(target.interactiveMessage);
-                injected = true;
-            }
-            if (target.imageMessage) {
-                applyToContext(target.imageMessage);
-                applyMediaAnnotations(target.imageMessage);
-                injected = true;
-            }
-            if (target.videoMessage) {
-                applyToContext(target.videoMessage);
-                applyMediaAnnotations(target.videoMessage);
-                injected = true;
-            }
-            if (target.ptvMessage) {
-                applyToContext(target.ptvMessage);
-                applyMediaAnnotations(target.ptvMessage);
-                injected = true;
-            }
-            if (target.documentMessage) {
-                applyToContext(target.documentMessage);
+            if (applyAttributionToContainer(target)) {
                 injected = true;
             }
-            for (const type of directTypes) {
-                if (target[type]) {
-                    applyToContext(target[type]);
-                    if (type === 'imageMessage' || type === 'videoMessage') {
-                        applyMediaAnnotations(target[type]);
-                    }
-                    injected = true;
-                }
-            }
         }
 
-        // 6. Plain text conversion to extendedTextMessage with channel attribution
+        // 4. Plain text conversion to extendedTextMessage with channel attribution
         if (!injected && msg.conversation && typeof msg.conversation === 'string') {
             msg = {
                 extendedTextMessage: {
@@ -719,7 +642,8 @@ export const makeMessagesSocket = (config) => {
                             newsletterJid: targetNewsletterJid,
                             newsletterName: targetNewsletterName,
                             serverMessageId: targetServerMessageId,
-                            contentType: 1
+                            contentType: 1,
+                            accessibilityText: targetNewsletterName
                         }
                     }
                 }
@@ -1173,7 +1097,7 @@ export const makeMessagesSocket = (config) => {
                 }
             }
             const isPeerMessage = additionalAttributes?.['category'] === 'peer'
-            if (aiLabel && !isGroup && !isStatus && !isNewsletter && !isPeerMessage) {
+            if (aiLabel === true && !isGroup && !isStatus && !isNewsletter && !isPeerMessage && (isJidMetaAI(destinationJid) || config.forceBizBotLabel === true)) {
                 const existingBizBot = getBinaryFilteredBizBot(additionalNodes || []) || getBinaryFilteredBizBot(stanza.content)
                 if (!existingBizBot) stanza.content.push({ tag: 'bot', attrs: { biz_bot: '1' } })
             }
@@ -1761,10 +1685,15 @@ export const makeMessagesSocket = (config) => {
                     ...(cstoken !== undefined ? { cstoken } : {})
                 });
                 if (config.emitOwnEvents) {
-                    process.nextTick(async () => {
-                        await messageMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+                    process.nextTick(() => {
+                        Promise.resolve()
+                            .then(() => messageMutex.mutex(() => upsertMessage(fullMsg, 'append')))
+                            .catch(err => {
+                                logger?.error({ trace: err?.stack, msgId: fullMsg?.key?.id }, 'error in emitOwnEvents upsertMessage');
+                            });
                     });
                 }
+                printCharapeChatLog('OUT', fullMsg, { enabled: config.charapeChatLog !== false });
                 return fullMsg;
             }
         },