@violetix/baileys 0.4.0 → 0.5.0

package/lib/Defaults/index.js

@@ -2,7 +2,7 @@ import { proto } from '../../WAProto/index.js';
 import { makeLibSignalRepository } from '../Signal/libsignal.js';
 import { Browsers } from '../Utils/browser-utils.js';
 import logger from '../Utils/logger.js';
-const version = [2, 3000, 1048107131];
+const version = [2, 3000, 1053032355];
 export const UNAUTHORIZED_CODES = [401, 403, 419];
 export const BIZ_BOT_SUPPORT_PAYLOAD = '{"version":1,"is_ai_message":true,"should_upload_client_logs":false,"should_show_system_message":false,"ticket_id":"7004947587700716","citation_items":[],"ticket_locale":"us"}';
 export const DEFAULT_ORIGIN = 'https://web.whatsapp.com';
@@ -68,7 +68,9 @@ export const DEFAULT_CONNECTION_CONFIG = {
     fireInitQueries: true,
     auth: undefined,
     markOnlineOnConnect: true,
-    syncFullHistory: true,
+    // FULL history is dropped by shouldSyncHistoryMessage below anyway; asking for it only adds
+    // reconnect load (upstream default is false too)
+    syncFullHistory: false,
     patchMessageBeforeSending: msg => msg,
     shouldSyncHistoryMessage: ({ syncType }) => {
         return syncType !== proto.HistorySync.HistorySyncType.FULL;

package/lib/Socket/chats.js

@@ -1077,7 +1077,9 @@ export const makeChatsSocket = (config) => {
                 if (attrs.timestamp) {
                     let { lastAccountSyncTimestamp } = authState.creds;
                     if (lastAccountSyncTimestamp) {
-                        await cleanDirtyBits('account_sync', lastAccountSyncTimestamp);
+                        // async ws handler: a rejection here would be unhandled and kill the process
+                        await cleanDirtyBits('account_sync', lastAccountSyncTimestamp)
+                            .catch(error => logger.warn({ error }, 'failed to clean account_sync dirty bits'));
                     }
                     lastAccountSyncTimestamp = +attrs.timestamp;
                     ev.emit('creds.update', { lastAccountSyncTimestamp });

package/lib/Socket/groups.js

@@ -23,7 +23,7 @@ export const makeGroupsSocket = (config) => {
         }
         const promise = groupQuery(jid, 'get', [{ tag: 'query', attrs: { request: 'interactive' } }])
             .then(result => extractGroupMetadata(result))
-            .catch(() => null)
+            // no swallow: a null here made group sends go to zero recipients silently
             .finally(() => inflightGroupMetadata.delete(jid));
         inflightGroupMetadata.set(jid, promise);
         return promise;
@@ -69,8 +69,13 @@ export const makeGroupsSocket = (config) => {
         if (attrs.type !== 'groups') {
             return;
         }
-        await groupFetchAllParticipating();
-        await sock.cleanDirtyBits('groups');
+        try {
+            await groupFetchAllParticipating();
+            await sock.cleanDirtyBits('groups');
+        }
+        catch (error) {
+            config.logger?.warn({ error }, 'failed to handle dirty groups');
+        }
     });
     return {
         ...sock,

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, setBotMessageSecret, 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 } from '../Utils/index.js';
+import { ACCOUNT_RESTRICTED_TEXT, aesDecryptCTR, aesEncryptGCM, cleanMessage, Curve, decodeMediaRetryNode, decodeMessageNode, decryptMessageNode, setBotMessageSecret, 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, unpadRandomMax16, xmppPreKey, xmppSignedPreKey } 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';
@@ -394,7 +394,7 @@ export const makeMessagesRecvSocket = (config) => {
         }
     };
     const sendMessageAck = async (node, errorCode) => {
-        const stanza = buildAckStanza(node, errorCode, authState.creds.me.id);
+        const stanza = buildAckStanza(node, errorCode, authState.creds.me?.id);
         logger.debug({ recv: { tag: node.tag, attrs: node.attrs }, sent: stanza.attrs }, 'sent ack');
         await sendNode(stanza);
     };
@@ -657,7 +657,7 @@ export const makeMessagesRecvSocket = (config) => {
                 };
                 break;
             case 'modify':
-                const oldNumber = getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid);
+                const oldNumber = getBinaryNodeChildren(child, 'participant').map(p => JSON.stringify({ id: p.attrs.jid, phoneNumber: p.attrs.phone_number, lid: p.attrs.lid }));
                 msg.messageStubParameters = oldNumber || [];
                 msg.messageStubType = WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER;
                 break;

package/lib/Socket/messages-send.js

@@ -1455,8 +1455,10 @@ export const makeMessagesSocket = (config) => {
                 const isQuizMsg = 'poll' in content && !!content.poll.pollType;
                 const isAiMsg = 'ai' in content && !!content.ai;
                 const isNeedBizAttrs = 'secureMetaServiceLabel' in content && !!content.secureMetaServiceLabel;
-                const additionalAttributes = options.additionalAttributes || {};
-                const additionalNodes = options.additionalNodes || [];
+                // copies: these get .edit / meta / bot added below, which must not leak into the
+                // caller's reused options object (stacked nodes, stray edit turning sends into deletes)
+                const additionalAttributes = { ...options.additionalAttributes };
+                const additionalNodes = [...(options.additionalNodes || [])];
                 // required for delete
                 if (isDeleteMsg || isKeepMsg) {
                     // if the chat is a group, and I am not the author, then delete the message as an admin
@@ -1512,7 +1514,6 @@ export const makeMessagesSocket = (config) => {
                         },
                         content: undefined
                     });
-                    delete content.ai;
                 }
                 const relayOpts = {
                     messageId: fullMsg.key.id,
@@ -1523,12 +1524,11 @@ export const makeMessagesSocket = (config) => {
                     additionalAttributes,
                     additionalNodes
                 };
-                if (options.exclusive) {
-                    await relayExclusive(jid, fullMsg.message, options, relayOpts);
-                }
-                else {
-                    await relayMessage(jid, fullMsg.message, relayOpts);
-                }
+                // children (poll option images, album items) must honour `exclusive` too
+                const relay = (message, opts) => options.exclusive
+                    ? relayExclusive(jid, message, options, opts)
+                    : relayMessage(jid, message, opts);
+                await relay(fullMsg.message, relayOpts);
                 if (config.emitOwnEvents) {
                     setImmediate(() => emitOwnUpsert(fullMsg));
                 }
@@ -1548,7 +1548,7 @@ export const makeMessagesSocket = (config) => {
                             userJid,
                             messageId: generateMessageIDV2(userJid)
                         });
-                        await relayMessage(jid, optionMsg.message, {
+                        await relay(optionMsg.message, {
                             messageId: optionMsg.key.id,
                             useCachedGroupMetadata: options.useCachedGroupMetadata,
                             additionalAttributes,
@@ -1581,7 +1581,7 @@ export const makeMessagesSocket = (config) => {
                             parentMessageKey: fullMsg.key,
                             associationType: AssociationType.MEDIA_ALBUM
                         };
-                        await relayMessage(jid, albumMsg.message, {
+                        await relay(albumMsg.message, {
                             messageId: albumMsg.key.id,
                             useCachedGroupMetadata: options.useCachedGroupMetadata,
                             addBizAttributes: isNeedBizAttrs,

package/lib/Socket/socket.js

@@ -136,12 +136,13 @@ export const makeSocket = (config) => {
             node.attrs.id = generateMessageTag();
         }
         const msgId = node.attrs.id;
+        pendingQueries++;
         const result = await promiseTimeout(timeoutMs, async (resolve, reject) => {
             const result = waitForMessage(msgId, timeoutMs).catch(reject);
             sendNode(node)
                 .then(async () => resolve(await result))
                 .catch(reject);
-        });
+        }).finally(() => { pendingQueries--; });
         if (result && 'tag' in result) {
             assertNodeErrorFree(result);
         }
@@ -376,6 +377,8 @@ export const makeSocket = (config) => {
     const keys = addTransactionCapability(authState.keys, logger, transactionOpts);
     const signalRepository = makeSignalRepository({ creds, keys }, logger, pnFromLIDUSync);
     let lastDateRecv;
+    /** queries awaiting a reply; keep-alive skips its ping while these are flowing */
+    let pendingQueries = 0;
     let epoch = 1;
     let keepAliveReq;
     let qrTimer;
@@ -711,48 +714,89 @@ export const makeSocket = (config) => {
             ws.off('error', onClose);
         });
     };
+    /**
+     * Keep-alive, modelled on zapo-js (src/transport/keepalive/WaKeepAlive.ts):
+     * - self-rescheduling setTimeout with +-10% jitter (min 250ms), so a fleet of sockets in one
+     *   process drifts apart instead of pinging in the same tick
+     * - at most one ping in flight; a slow pong never stacks more pings on a busy loop
+     * - no ping while other queries are pending and data arrived recently: the link is
+     *   demonstrably alive and the ping would only add queue pressure
+     * - "lost" is still decided by inbound silence (interval + grace), and skipped when the
+     *   timer itself fired late (blocked event loop: pongs may be unread in the socket buffer)
+     */
     const startKeepAliveRequest = () => {
+        let timer;
+        let stopped = false;
+        let pingInFlight = false;
+        let lastCheckAt;
+        let expectedDelayMs = 0;
+        const nextDelay = () => {
+            const jitter = Math.max(250, Math.floor(keepAliveIntervalMs * 0.1));
+            return Math.max(1000, keepAliveIntervalMs + Math.floor((Math.random() * 2 - 1) * jitter));
+        };
+        const schedule = (delayMs) => {
+            if (stopped) {
+                return;
+            }
+            expectedDelayMs = delayMs;
+            timer = safeSetTimeout(() => {
+                timer = undefined;
+                cb();
+                schedule(nextDelay());
+            }, delayMs);
+        };
         const cb = () => {
             if (!lastDateRecv) {
                 lastDateRecv = new Date();
             }
-            const diff = Date.now() - lastDateRecv.getTime();
-            if (diff > keepAliveIntervalMs + keepAliveGracePeriodMs) {
-                void end(new Boom('Connection was lost', { statusCode: DisconnectReason.connectionLost }));
+            const now = Date.now();
+            const sinceRecvMs = now - lastDateRecv.getTime();
+            const lagMs = lastCheckAt ? now - lastCheckAt - expectedDelayMs : 0;
+            lastCheckAt = now;
+            const loopStalled = lagMs > keepAliveGracePeriodMs;
+            if (loopStalled) {
+                logger.warn({ lagMs, sinceLastRecvMs: sinceRecvMs }, 'event loop stalled; deferring keep-alive timeout');
             }
-            else if (ws.isOpen) {
-                query({
-                    tag: 'iq',
-                    attrs: {
-                        id: generateMessageTag(),
-                        to: S_WHATSAPP_NET,
-                        type: 'get',
-                        xmlns: 'w:p'
-                    },
-                    content: [{ tag: 'ping', attrs: {} }]
-                }).catch(err => {
-                    logger.error({ trace: err.stack }, 'error in sending keep alive');
-                });
+            if (sinceRecvMs > keepAliveIntervalMs + keepAliveGracePeriodMs && !loopStalled) {
+                void end(new Boom('Connection was lost', { statusCode: DisconnectReason.connectionLost }));
+                return;
             }
-            else {
+            if (!ws.isOpen) {
                 logger.warn('keep alive called when WS not open');
+                return;
+            }
+            if (pingInFlight) {
+                logger.trace('keep alive skipped: ping already in flight');
+                return;
+            }
+            if (pendingQueries > 0 && sinceRecvMs < keepAliveGracePeriodMs) {
+                logger.trace({ pendingQueries, sinceRecvMs }, 'keep alive skipped: queries pending with recent inbound');
+                return;
             }
+            pingInFlight = true;
+            query({
+                tag: 'iq',
+                attrs: {
+                    id: generateMessageTag(),
+                    to: S_WHATSAPP_NET,
+                    type: 'get',
+                    xmlns: 'w:p'
+                },
+                content: [{ tag: 'ping', attrs: {} }]
+            }, keepAliveIntervalMs + keepAliveGracePeriodMs)
+                .catch(err => {
+                    // the verdict stays with inbound silence above; a failed ping alone is not "lost"
+                    logger.warn({ trace: err.stack }, 'error in sending keep alive');
+                })
+                .finally(() => { pingInFlight = false; });
         };
-        // Per socket, so keepAliveIntervalMs from the config is actually the ping interval: the
-        // shared process-wide timer ran at a hardcoded 30s while the staleness check below still
-        // used the configured value, so any interval other than 30s produced false connectionLost.
-        // The random start offset staggers the fleet - on the shared timer every socket in the
-        // process pinged in the same tick, which is a self-inflicted burst at 100+ sessions.
-        let pinger;
-        const starter = safeSetTimeout(() => {
-            cb();
-            pinger = safeSetInterval(cb, keepAliveIntervalMs);
-        }, Math.floor(Math.random() * (keepAliveIntervalMs / 2)));
+        // random first tick staggers sockets that connect together (reconnect storms)
+        schedule(Math.floor(Math.random() * (keepAliveIntervalMs / 2)));
         keepAliveReq = {
             cb,
             cancel: () => {
-                clearSafeTimer(starter);
-                clearSafeTimer(pinger);
+                stopped = true;
+                clearSafeTimer(timer);
             }
         };
     };

package/lib/Store/make-in-memory-store.js

@@ -9,7 +9,7 @@ import { writeFileSync, readFileSync, existsSync } from 'fs';
 import { WAProto } from '../Types/index.js';
 import { LabelAssociationType } from '../Types/LabelAssociation.js';
 import { DEFAULT_CONNECTION_CONFIG } from '../Defaults/index.js';
-import { md5, toNumber, updateMessageWithReceipt, updateMessageWithReaction } from '../Utils/index.js';
+import { BufferJSON, md5, toNumber, updateMessageWithReceipt, updateMessageWithReaction } from '../Utils/index.js';
 import { jidDecode, jidNormalizedUser } from '../WABinary/index.js';
 import { makeOrderedDictionary } from './make-ordered-dictionary.js';
 import { ObjectRepository } from './object-repository.js';
@@ -69,6 +69,9 @@ export const makeInMemoryStore = (config = {}) => {
             }
         }
     };
+    // one key rule for every handler; upsert used alt+normalized while update/receipt/reaction/delete
+    // used raw or non-alt keys, so LID chats never found their stored messages
+    const keyJid = (key) => jidNormalizedUser(key.remoteJidAlt || key.remoteJid);
     const assertMessageList = (jid) => {
         if (!messages[jid]) {
             messages[jid] = makeMessagesDictionary();
@@ -116,8 +119,7 @@ export const makeInMemoryStore = (config = {}) => {
             }
             logger.debug({ deletedContacts: isLatest ? oldContacts.size : 0, newContacts }, 'synced contacts');
             for (const msg of newMessages) {
-                const jid = msg.key.remoteJidAlt || msg.key.remoteJid;
-                const list = assertMessageList(jid);
+                const list = assertMessageList(keyJid(msg.key));
                 list.upsert(msg, 'prepend');
             }
             enforceLimits(messages, groupMetadata, chats, maxChats, maxMessagesPerChat);
@@ -149,9 +151,13 @@ export const makeInMemoryStore = (config = {}) => {
                     }
                 }
                 else {
-                    return logger.debug({ update }, 'got update for non-existant contact');
+                    logger.debug({ update }, 'got update for non-existant contact');
+                    continue;
                 }
-                Object.assign(contacts[contact.id], contact);
+                // was Object.assign(contact, contact): update fields (notify, name...) never landed.
+                // id may be a WA_ADD_NOTIF hash and imgUrl a sentinel, so neither is copied.
+                const { id: _id, imgUrl: _imgUrl, ...fields } = update;
+                Object.assign(contact, fields);
             }
         });
         on('chats.upsert', newChats => {
@@ -211,7 +217,7 @@ export const makeInMemoryStore = (config = {}) => {
                 case 'append':
                 case 'notify':
                     for (const msg of newMessages) {
-                        const jid = jidNormalizedUser(msg.key.remoteJidAlt || msg.key.remoteJid);
+                        const jid = keyJid(msg.key);
                         const list = assertMessageList(jid);
                         list.upsert(msg, 'append');
                         enforceLimits(messages, groupMetadata, chats, maxChats, maxMessagesPerChat);
@@ -231,7 +237,12 @@ export const makeInMemoryStore = (config = {}) => {
         on('messages.update', updates => {
             var _a;
             for (const { update, key } of updates) {
-                const list = assertMessageList(jidNormalizedUser(key.remoteJid));
+                // no create: an update for an unknown chat must not add an empty list that evicts real ones
+                const list = messages[keyJid(key)];
+                if (!list) {
+                    logger.debug({ update }, 'got update for non-existent message');
+                    continue;
+                }
                 if (update === null || update === void 0 ? void 0 : update.status) {
                     const listStatus = (_a = list.get(key.id)) === null || _a === void 0 ? void 0 : _a.status;
                     if (listStatus && (update === null || update === void 0 ? void 0 : update.status) <= listStatus) {
@@ -252,8 +263,7 @@ export const makeInMemoryStore = (config = {}) => {
                 list === null || list === void 0 ? void 0 : list.clear();
             }
             else {
-                const jid = item.keys[0].remoteJidAlt || item.keys[0].remoteJid;
-                const list = messages[jid];
+                const list = messages[keyJid(item.keys[0])];
                 if (list) {
                     const idSet = new Set(item.keys.map(k => k.id));
                     list.filter(m => !idSet.has(m.key.id));
@@ -308,8 +318,7 @@ export const makeInMemoryStore = (config = {}) => {
         });
         on('message-receipt.update', updates => {
             for (const { key, receipt } of updates) {
-                const obj = messages[key.remoteJidAlt || key.remoteJid];
-                const msg = obj === null || obj === void 0 ? void 0 : obj.get(key.id);
+                const msg = messages[keyJid(key)]?.get(key.id);
                 if (msg) {
                     updateMessageWithReceipt(msg, receipt);
                 }
@@ -317,8 +326,7 @@ export const makeInMemoryStore = (config = {}) => {
         });
         on('messages.reaction', (reactions) => {
             for (const { key, reaction } of reactions) {
-                const obj = messages[key.remoteJidAlt || key.remoteJid];
-                const msg = obj === null || obj === void 0 ? void 0 : obj.get(key.id);
+                const msg = messages[keyJid(key)]?.get(key.id);
                 if (msg) {
                     updateMessageWithReaction(msg, reaction);
                 }
@@ -363,28 +371,28 @@ export const makeInMemoryStore = (config = {}) => {
         bind,
         /** loads messages from the store, if not found -- uses the legacy connection */
         loadMessages: async (jid, count, cursor) => {
-            const list = assertMessageList(jid);
+            const list = messages[jid]; // read-only: don't create phantom lists
             const mode = !cursor || 'before' in cursor ? 'before' : 'after';
             const cursorKey = !!cursor ? ('before' in cursor ? cursor.before : cursor.after) : undefined;
-            const cursorValue = cursorKey ? list.get(cursorKey.id) : undefined;
-            let messages;
+            const cursorValue = cursorKey ? list?.get(cursorKey.id) : undefined;
+            let result;
             if (list && mode === 'before' && (!cursorKey || cursorValue)) {
                 if (cursorValue) {
                     const msgIdx = list.array.findIndex(m => m.key.id === (cursorKey === null || cursorKey === void 0 ? void 0 : cursorKey.id));
-                    messages = list.array.slice(0, msgIdx);
+                    result = list.array.slice(0, msgIdx);
                 }
                 else {
-                    messages = list.array;
+                    result = list.array;
                 }
-                const diff = count - messages.length;
+                const diff = count - result.length;
                 if (diff < 0) {
-                    messages = messages.slice(-count); // get the last X messages
+                    result = result.slice(-count); // get the last X messages
                 }
             }
             else {
-                messages = [];
+                result = [];
             }
-            return messages;
+            return result;
         },
         /**
          * Get all available labels for profile
@@ -447,13 +455,13 @@ export const makeInMemoryStore = (config = {}) => {
         toJSON,
         fromJSON,
         writeToFile: (path) => {
-            writeFileSync(path, JSON.stringify(toJSON()));
+            writeFileSync(path, JSON.stringify(toJSON(), BufferJSON.replacer));
         },
         readFromFile: (path) => {
             if (existsSync(path)) {
                 logger.debug({ path }, 'reading from file');
                 const jsonStr = readFileSync(path, { encoding: 'utf-8' });
-                const json = JSON.parse(jsonStr);
+                const json = JSON.parse(jsonStr, BufferJSON.reviver);
                 fromJSON(json);
             }
         }

package/lib/Utils/chat-utils.js

@@ -344,7 +344,6 @@ export const decodePatches = async (name, syncds, initial, getAppStateSyncKey, o
             syncd.mutations?.push(...ref.mutations);
         }
         const patchVersion = toNumber(version.version);
-        newState.version = patchVersion;
         const shouldMutate = typeof minimumVersionNumber === 'undefined' || patchVersion > minimumVersionNumber;
         let decodeResult;
         try {
@@ -358,9 +357,12 @@ export const decodePatches = async (name, syncds, initial, getAppStateSyncKey, o
         catch (err) {
             if (isMissingKeyError(err))
                 throw err;
-            logger?.warn({ name, version: patchVersion, error: err.message }, 'failed to decode patch, skipping');
-            continue;
+            // stop here: advancing the version past an undecoded patch loses its mutations for good;
+            // the next sync resumes from the last good version
+            logger?.warn({ name, version: patchVersion, error: err.message }, 'failed to decode patch, stopping');
+            break;
         }
+        newState.version = patchVersion;
         newState.hash = decodeResult.hash;
         newState.indexValueMap = decodeResult.indexValueMap;
         if (validateMacs) {

package/lib/Utils/event-buffer.js

@@ -400,7 +400,8 @@ eventData, logger) {
                     data.contactUpserts[contact.id] = upsert;
                 }
                 if (data.contactUpdates[contact.id]) {
-                    upsert = Object.assign(data.contactUpdates[contact.id], trimUndefined(contact));
+                    // merge into the stored upsert itself; the old code merged into a temp and lost the update
+                    Object.assign(upsert, trimUndefined(data.contactUpdates[contact.id]), trimUndefined(contact));
                     delete data.contactUpdates[contact.id];
                 }
             }
@@ -525,10 +526,8 @@ eventData, logger) {
             const groupUpdates = eventData;
             for (const update of groupUpdates) {
                 const id = update.id;
-                const groupUpdate = data.groupUpdates[id] || {};
-                if (!data.groupUpdates[id]) {
-                    data.groupUpdates[id] = Object.assign(groupUpdate, update);
-                }
+                // merge every update in the window, not just the first
+                data.groupUpdates[id] = Object.assign(data.groupUpdates[id] || {}, update);
             }
             break;
         default:

package/lib/Utils/generics.js

@@ -263,17 +263,32 @@ export const getStatusFromReceiptType = (type) => {
     }
     return status;
 };
-const CODE_MAP = {
-    conflict: DisconnectReason.connectionReplaced
-};
 /**
- * Stream errors generally provide a reason, map that to a baileys DisconnectReason
- * @param reason the string reason given, eg. "conflict"
+ * Stream errors generally provide a reason, map that to a baileys DisconnectReason.
+ * Mirrors zapo-js (src/transport/stream/parse.ts): only conflict means the session is gone;
+ * ack / xml-not-well-formed / unknown reasons are transient and must stay reconnectable.
+ * The old fallback was badSession (500), which made bots wipe healthy sessions.
  */
 export const getErrorCodeFromStreamError = (node) => {
     const [reasonNode] = getAllBinaryNodeChildren(node);
     let reason = reasonNode?.tag || 'unknown';
-    const statusCode = +(node.attrs.code || CODE_MAP[reason] || DisconnectReason.badSession);
+    let statusCode;
+    if (reason === 'conflict') {
+        // type="replaced": another client took over; any other type (device_removed): unlinked
+        statusCode = reasonNode.attrs?.type === 'replaced' || !reasonNode.attrs?.type
+            ? DisconnectReason.connectionReplaced
+            : DisconnectReason.loggedOut;
+    }
+    else if (node.attrs.code) {
+        statusCode = +node.attrs.code;
+        // 516 = server-forced logout
+        if (statusCode === 516) {
+            statusCode = DisconnectReason.loggedOut;
+        }
+    }
+    else {
+        statusCode = DisconnectReason.connectionClosed;
+    }
     if (statusCode === DisconnectReason.restartRequired) {
         reason = 'restart required';
     }

package/lib/Utils/ignore-key.js

@@ -101,7 +101,8 @@ export const buildIgnoreContext = (node, meId, meLid) => {
     const fromMe = !!author && ((!!meId && areJidsSameUser(author, meId)) || (!!meLid && areJidsSameUser(author, meLid)));
     return {
         kind: node.tag,
-        remoteJid: stripDevice(attrs.from),
+        // a 1:1 message sent from another of our devices arrives from us, with the chat in `recipient`
+        remoteJid: stripDevice(fromMe && attrs.recipient ? attrs.recipient : attrs.from),
         fromMe,
         id: attrs.id,
         participant: stripDevice(attrs.participant || attrs.participant_pn || attrs.participant_lid)
@@ -121,7 +122,8 @@ export const matchesIgnoreKey = (entry, ctx, node) => {
         return false;
     }
     const attrs = node.attrs || {};
-    if (entry.remoteJid && !entry.remoteJid.some(wanted => REMOTE_JID_ATTRS.some(attr => sameJid(attrs[attr], wanted)))) {
+    const remoteAttrs = ctx.fromMe && attrs.recipient ? ['recipient', ...REMOTE_JID_ATTRS] : REMOTE_JID_ATTRS;
+    if (entry.remoteJid && !entry.remoteJid.some(wanted => remoteAttrs.some(attr => sameJid(attrs[attr], wanted)))) {
         return false;
     }
     if (entry.participant && !PARTICIPANT_ATTRS.some(attr => sameJid(attrs[attr], entry.participant))) {

package/lib/Utils/messages-media.d.ts

@@ -57,6 +57,8 @@ export interface MediaEncryptionOptions {
     };
     saveOriginalFileIfRequired?: boolean;
     opts?: MediaFetchOptions;
+    /** Reuse an existing 32-byte media key instead of generating one (e.g. sticker-pack thumbnails). */
+    mediaKey?: Uint8Array;
 }
 export interface MediaDownloadOptions {
     startByte?: number;

package/lib/Utils/messages-media.js

@@ -481,10 +481,11 @@ class SidecarAccumulator {
         this.windowOffset = SIDECAR_IV_SIZE;
     }
 }
-export const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
+export const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts, mediaKey: givenMediaKey } = {}) => {
     const { stream, type } = await getStream(media, opts);
     logger?.debug('fetched media stream');
-    const mediaKey = Crypto.randomBytes(32);
+    // sticker-pack thumbnails must reuse the pack's key, the message carries only that one
+    const mediaKey = givenMediaKey ?? Crypto.randomBytes(32);
     const { cipherKey, iv, macKey } = await getMediaKeys(mediaKey, mediaType);
     const encFilePath = join(getTmpFilesDirectory(), mediaType + generateMessageIDV2() + '-enc');
     const encFileWriteStream = createWriteStream(encFilePath);

package/lib/Utils/messages.js

@@ -105,7 +105,8 @@ export const prepareWAMessageMedia = async (message, options) => {
         if (mediaBuff) {
             logger?.debug({ cacheableKey }, 'got media cache hit');
             const obj = proto.Message.decode(mediaBuff);
-            const key = `${mediaType}Message`;
+            // ptv entries are cached after videoMessage was renamed to ptvMessage
+            const key = obj.ptvMessage ? 'ptvMessage' : `${mediaType}Message`;
             Object.assign(obj[key], { ...uploadData, media: undefined });
             return obj;
         }

package/lib/Utils/process-message.js

@@ -114,7 +114,10 @@ export const isRealMessage = (message) => {
         hasSomeContent &&
         !normalizedContent?.protocolMessage &&
         !normalizedContent?.reactionMessage &&
-        !normalizedContent?.pollUpdateMessage);
+        !normalizedContent?.pollUpdateMessage &&
+        // edit envelopes and event responses are not new chat messages (unread/timestamp bump)
+        !normalizedContent?.secretEncryptedMessage &&
+        !normalizedContent?.encEventResponseMessage);
 };
 export const shouldIncrementChatUnread = (message) => !message.key.fromMe && !message.messageStubType;
 /**

package/lib/Utils/rich-message-utils.js

@@ -236,7 +236,7 @@ export const prepareRichResponseMessage = (content) => {
             submessages.push({
                 messageType: RichSubMessageType.LATEX,
                 latexMetadata: {
-                    text,
+                    text: contentText,
                     expressions: latex
                 }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@violetix/baileys",
-   "version": "0.4.0",
+   "version": "0.5.0",
    "description": "Enhanced Baileys v7 with fixes for newsletter media uploads, plus support for interactive messages, albums, and additional message types.",
    "main": "lib/index.js",
    "types": "lib/index.d.ts",