@charape/baileys 1.0.8 → 1.0.10

package/lib/Defaults/index.js

@@ -60,14 +60,16 @@ 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,
-    aiLabel: true,
+    presenceHeartbeatMs: 25000,
+    charapeChatLog: true,
+    aiLabel: false,
     syncFullHistory: false,
     patchMessageBeforeSending: msg => msg,
     shouldSyncHistoryMessage: ({ syncType }) => {

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,12 +5,12 @@ 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';
 import { buildMergedTcTokenIndexWrite, isTcTokenExpired, readTcTokenIndex, resolveIssuanceJid, resolveTcTokenJid, storeTcTokensFromIqResult, TC_TOKEN_INDEX_KEY } from '../Utils/tc-token-utils.js';
-import { areJidsSameUser, binaryNodeToString, getAllBinaryNodeChildren, getBinaryNodeChild, getBinaryNodeChildBuffer, getBinaryNodeChildren, getBinaryNodeChildString, getBinaryNodeChildUInt, isJidGroup, isJidNewsletter, isJidStatusBroadcast, isLidUser, isPnUser, jidDecode, jidNormalizedUser, S_WHATSAPP_NET } from '../WABinary/index.js';
+import { areJidsSameUser, binaryNodeToString, getAllBinaryNodeChildren, getBinaryNodeChild, getBinaryNodeChildBuffer, getBinaryNodeChildren, getBinaryNodeChildString, getBinaryNodeChildUInt, isHostedLidUser, isHostedPnUser, isJidGroup, isJidNewsletter, isJidStatusBroadcast, isLidUser, isPnUser, jidDecode, jidNormalizedUser, S_WHATSAPP_NET } from '../WABinary/index.js';
 import { extractGroupMetadata } from './groups.js';
 import { makeMessagesSocket } from './messages-send.js';
 const ENFORCEMENT_TYPE_VALUES = new Set(Object.values(ReachoutTimelockEnforcementType));
@@ -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();
         }
     }
@@ -1413,17 +1413,46 @@ export const makeMessagesRecvSocket = (config) => {
             if (!!alt) {
                 const altServer = jidDecode(alt)?.server;
                 const primaryJid = msg.key.participant || msg.key.remoteJid;
-                if (altServer === 'lid') {
+                if ((altServer === 'lid' || altServer === 'hosted.lid') && (isPnUser(primaryJid) || isHostedPnUser(primaryJid))) {
                     if (!(await signalRepository.lidMapping.getPNForLID(alt))) {
                         await signalRepository.lidMapping.storeLIDPNMappings([{ lid: alt, pn: primaryJid }]);
                         await signalRepository.migrateSession(primaryJid, alt);
                     }
                 }
-                else {
-                    await signalRepository.lidMapping.storeLIDPNMappings([{ lid: primaryJid, pn: alt }]);
-                    await signalRepository.migrateSession(alt, primaryJid);
+                else if ((altServer === 's.whatsapp.net' || altServer === 'hosted') && (isLidUser(primaryJid) || isHostedLidUser(primaryJid))) {
+                    if (!(await signalRepository.lidMapping.getPNForLID(primaryJid))) {
+                        await signalRepository.lidMapping.storeLIDPNMappings([{ lid: primaryJid, pn: alt }]);
+                        await signalRepository.migrateSession(alt, primaryJid);
+                    }
+                }
+            }
+            // 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) {
@@ -1653,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);
@@ -1823,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();
         }