@lordmega/baileys 0.3.23 → 0.3.25

package/lib/Socket/communities.d.ts

@@ -436,7 +436,7 @@ export function makeCommunitiesSocket(config: any): {
     appPatch: (patchCreate: any) => Promise<void>;
     sendPresenceUpdate: (type: any, toJid: any) => Promise<void>;
     presenceSubscribe: (toJid: any) => Promise<void>;
-    profilePictureUrl: (jid: any, type?: string, timeoutMs?: number, shouldIncludeTcToken?: boolean) => Promise<any>;
+    profilePictureUrl: (jid: any, type: string | undefined, timeoutMs: any) => Promise<any>;
     fetchBlocklist: () => Promise<any>;
     fetchStatus: (...jids: any[]) => Promise<any>;
     fetchDisappearingDuration: (...jids: any[]) => Promise<any>;

package/lib/Socket/communities.js

@@ -353,7 +353,7 @@ export const makeCommunitiesSocket = (config) => {
                     remoteJid: inviteMessage.groupJid,
                     id: generateMessageIDV2(sock.user?.id),
                     fromMe: false,
-                    participant: key.remoteJid // TODO: investigate if this makes any sense at all
+                    participant: key.remoteJid
                 },
                 messageStubType: WAMessageStubType.GROUP_PARTICIPANT_ADD,
                 messageStubParameters: [JSON.stringify(authState.creds.me)],
@@ -419,8 +419,9 @@ export const extractCommunityMetadata = (result) => {
         memberAddMode,
         participants: getBinaryNodeChildren(community, 'participant').map(({ attrs }) => {
             return {
-                // TODO: IMPLEMENT THE PN/LID FIELDS HERE!!
                 id: attrs.jid,
+                lid: attrs.lid || undefined,
+                phoneNumber: attrs.phone_number || undefined,
                 admin: (attrs.type || null)
             };
         }),

package/lib/Socket/groups.d.ts

@@ -151,7 +151,7 @@ export function makeGroupsSocket(config: any): {
     appPatch: (patchCreate: any) => Promise<void>;
     sendPresenceUpdate: (type: any, toJid: any) => Promise<void>;
     presenceSubscribe: (toJid: any) => Promise<void>;
-    profilePictureUrl: (jid: any, type?: string, timeoutMs?: number, shouldIncludeTcToken?: boolean) => Promise<any>;
+    profilePictureUrl: (jid: any, type: string | undefined, timeoutMs: any) => Promise<any>;
     fetchBlocklist: () => Promise<any>;
     fetchStatus: (...jids: any[]) => Promise<any>;
     fetchDisappearingDuration: (...jids: any[]) => Promise<any>;

package/lib/Socket/groups.js

@@ -6,7 +6,7 @@ import { getBinaryNodeChild, getBinaryNodeChildren, getBinaryNodeChildString, is
 import { makeChatsSocket } from './chats.js';
 export const makeGroupsSocket = (config) => {
     const sock = makeChatsSocket(config);
-    const { authState, ev, query, upsertMessage } = sock;
+    const { authState, ev, query, upsertMessage, signalRepository } = sock;
     const groupQuery = async (jid, type, content) => query({
         tag: 'iq',
         attrs: {
@@ -16,9 +16,20 @@ export const makeGroupsSocket = (config) => {
         },
         content
     });
+    const storeGroupLIDMappings = async (participants) => {
+        if (!signalRepository?.lidMapping)
+            return;
+        const pairs = participants
+            .filter(p => p.lid && p.phoneNumber)
+            .map(p => ({ lid: p.lid, pn: p.phoneNumber }));
+        if (pairs.length)
+            await signalRepository.lidMapping.storeLIDPNMappings(pairs).catch(() => { });
+    };
     const groupMetadata = async (jid) => {
         const result = await groupQuery(jid, 'get', [{ tag: 'query', attrs: { request: 'interactive' } }]);
-        return extractGroupMetadata(result);
+        const meta = extractGroupMetadata(result);
+        storeGroupLIDMappings(meta.participants).catch(() => { });
+        return meta;
     };
     const groupFetchAllParticipating = async () => {
         const result = await query({
@@ -44,12 +55,17 @@ export const makeGroupsSocket = (config) => {
         if (groupsChild) {
             const groups = getBinaryNodeChildren(groupsChild, 'group');
             for (const groupNode of groups) {
-                const meta = extractGroupMetadata({
-                    tag: 'result',
-                    attrs: {},
-                    content: [groupNode]
-                });
-                data[meta.id] = meta;
+                try {
+                    const meta = extractGroupMetadata({
+                        tag: 'result',
+                        attrs: {},
+                        content: [groupNode]
+                    });
+                    data[meta.id] = meta;
+                }
+                catch (err) {
+                    sock.logger.warn({ err, groupNode: groupNode?.attrs }, 'failed to parse group in groupFetchAllParticipating, skipping');
+                }
             }
         }
         // TODO: properly parse LID / PN DATA

package/lib/Socket/index.d.ts

@@ -426,7 +426,7 @@ declare function makeWASocket(config: any): {
     appPatch: (patchCreate: any) => Promise<void>;
     sendPresenceUpdate: (type: any, toJid: any) => Promise<void>;
     presenceSubscribe: (toJid: any) => Promise<void>;
-    profilePictureUrl: (jid: any, type?: string, timeoutMs?: number, shouldIncludeTcToken?: boolean) => Promise<any>;
+    profilePictureUrl: (jid: any, type: string | undefined, timeoutMs: any) => Promise<any>;
     fetchBlocklist: () => Promise<any>;
     fetchStatus: (...jids: any[]) => Promise<any>;
     fetchDisappearingDuration: (...jids: any[]) => Promise<any>;

package/lib/Socket/messages-recv.d.ts

@@ -229,7 +229,7 @@ export function makeMessagesRecvSocket(config: any): {
     appPatch: (patchCreate: any) => Promise<void>;
     sendPresenceUpdate: (type: any, toJid: any) => Promise<void>;
     presenceSubscribe: (toJid: any) => Promise<void>;
-    profilePictureUrl: (jid: any, type?: string, timeoutMs?: number, shouldIncludeTcToken?: boolean) => Promise<any>;
+    profilePictureUrl: (jid: any, type: string | undefined, timeoutMs: any) => Promise<any>;
     fetchBlocklist: () => Promise<any>;
     fetchStatus: (...jids: any[]) => Promise<any>;
     fetchDisappearingDuration: (...jids: any[]) => Promise<any>;

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 } from '../Utils/index.js';
+import { ACCOUNT_RESTRICTED_TEXT, aesDecryptCTR, aesEncryptGCM, cleanMessage, Curve, decodeMediaRetryNode, decodeMessageNode, decryptMessageNode, decryptSecretEncryptedMessage, delay, derivePairingCodeKey, encodeBigEndian, encodeSignedDeviceIdentity, extractAddressingContext, extractE2ESessionFromRetryReceipt, getCallStatusFromNode, getHistoryMsg, getNextPreKeys, getStatusFromReceiptType, handleIdentityChange, hkdf, MISSING_KEYS_ERROR_TEXT, NACK_REASONS, NO_MESSAGE_FOUND_ERROR_TEXT, normalizeMessageContent, SERVER_ERROR_CODES, toNumber, unixTimestampSeconds, 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';
@@ -384,7 +384,23 @@ export const makeMessagesRecvSocket = (config) => {
         };
         await query(stanza);
     };
-    const sendRetryRequest = async (node, forceIncludeKeys = false) => {
+    const mapDecryptErrorToRetryReason = (errMsg) => {
+        if (!errMsg)
+            return '0';
+        const m = errMsg.toLowerCase();
+        if (m.includes('no session'))
+            return '1';
+        if (m.includes('invalid key id') || m.includes('unknown keyid'))
+            return '3';
+        if (m.includes('bad mac') || m.includes('badmac'))
+            return '7';
+        if (m.includes('invalid message') || m.includes('badmessage'))
+            return '4';
+        if (m.includes('invalid signature'))
+            return '5';
+        return '0';
+    };
+    const sendRetryRequest = async (node, forceIncludeKeys = false, decryptErrorMsg) => {
         const { fullMessage } = decodeMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '');
         const { key: msgKey } = fullMessage;
         const msgId = msgKey.id;
@@ -476,8 +492,7 @@ export const makeMessagesRecvSocket = (config) => {
                             id: node.attrs.id,
                             t: node.attrs.t,
                             v: '1',
-                            // ADD ERROR FIELD
-                            error: '0'
+                            error: mapDecryptErrorToRetryReason(decryptErrorMsg)
                         }
                     },
                     {
@@ -635,7 +650,6 @@ export const makeMessagesRecvSocket = (config) => {
                 const stubType = `GROUP_PARTICIPANT_${child.tag.toUpperCase()}`;
                 msg.messageStubType = WAMessageStubType[stubType];
                 const participants = getBinaryNodeChildren(child, 'participant').map(({ attrs }) => {
-                    // TODO: Store LID MAPPINGS
                     return {
                         id: attrs.jid,
                         phoneNumber: isLidUser(attrs.jid) && isPnUser(attrs.phone_number) ? attrs.phone_number : undefined,
@@ -644,6 +658,15 @@ export const makeMessagesRecvSocket = (config) => {
                         admin: (attrs.type || null)
                     };
                 });
+                // store LID-PN mappings from participant notification
+                {
+                    const pairs = participants
+                        .filter(p => p.lid && p.phoneNumber)
+                        .map(p => ({ lid: p.lid, pn: p.phoneNumber }));
+                    if (pairs.length) {
+                        signalRepository.lidMapping.storeLIDPNMappings(pairs).catch(err => logger.warn({ err }, 'failed to store group participant LID mappings'));
+                    }
+                }
                 if (participants.length === 1 &&
                     // if recv. "remove" message and sender removed themselves
                     // mark as left
@@ -701,7 +724,10 @@ export const makeMessagesRecvSocket = (config) => {
                 break;
             case 'revoked_membership_requests':
                 const isDenied = areJidsSameUser(affectedParticipantLid, actingParticipantLid);
-                // TODO: LIDMAPPING SUPPORT
+                if (affectedParticipantLid && affectedParticipantPn) {
+                    signalRepository.lidMapping.storeLIDPNMappings([{ lid: affectedParticipantLid, pn: affectedParticipantPn }])
+                        .catch(err => logger.warn({ err }, 'failed to store membership request LID mapping'));
+                }
                 msg.messageStubType = WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
                 msg.messageStubParameters = [
                     JSON.stringify({ lid: affectedParticipantLid, pn: affectedParticipantPn }),
@@ -828,19 +854,24 @@ export const makeMessagesRecvSocket = (config) => {
                 const update = getBinaryNodeChild(node, 'collection');
                 if (update) {
                     const name = update.attrs.name;
-                    await resyncAppState([name], false);
+                    // guard: resyncAppState failure must not block the notification mutex (#2453)
+                    await resyncAppState([name], false).catch(err => logger.warn({ err, name }, 'server_sync resyncAppState failed, skipping'));
                 }
                 break;
             case 'picture':
                 const setPicture = getBinaryNodeChild(node, 'set');
                 const delPicture = getBinaryNodeChild(node, 'delete');
-                // TODO: WAJIDHASH stuff proper support inhouse
-                ev.emit('contacts.update', [
-                    {
-                        id: jidNormalizedUser(node?.attrs?.from) || (setPicture || delPicture)?.attrs?.hash || '',
-                        imgUrl: setPicture ? 'changed' : 'removed'
-                    }
-                ]);
+                // use node.attrs.from as the contact JID; attrs.hash is a server-side
+                // obfuscated reference not suitable as a contact identifier
+                const picContactJid = jidNormalizedUser(node?.attrs?.from);
+                if (picContactJid) {
+                    ev.emit('contacts.update', [
+                        {
+                            id: picContactJid,
+                            imgUrl: setPicture ? 'changed' : 'removed'
+                        }
+                    ]);
+                }
                 if (isJidGroup(from)) {
                     const node = setPicture || delPicture;
                     result.messageStubType = WAMessageStubType.GROUP_CHANGE_ICON;
@@ -1198,7 +1229,7 @@ export const makeMessagesRecvSocket = (config) => {
                         else {
                             ev.emit('messages.update', ids.map(id => ({
                                 key: { ...key, id },
-                                update: { status, messageTimestamp: toNumber(+(attrs.t ?? 0)) }
+                                update: { status, ...(attrs.t ? { messageTimestamp: toNumber(+attrs.t) } : {}) }
                             })));
                         }
                     }
@@ -1265,13 +1296,19 @@ export const makeMessagesRecvSocket = (config) => {
     };
     const handleMessage = async (node) => {
         const encNode = getBinaryNodeChild(node, 'enc');
-        // TODO: temporary fix for crashes and issues resulting of failed msmsg decryption
+        // msmsg = multi-signal business message; requires MESSAGE_SECRET from phone
+        // that companions don't have. NACK with MissingMessageSecret so the server
+        // knows to request the key from the primary device.
         if (encNode?.attrs.type === 'msmsg') {
-            logger.debug({ key: node.attrs.key }, 'ignored msmsg');
+            logger.debug({ key: node.attrs.key }, 'recv msmsg: requesting key from phone');
             await sendMessageAck(node, NACK_REASONS.MissingMessageSecret);
             return;
         }
         let acked = false;
+        // Send provisional ACK before entering messageMutex so WA server doesn't
+        // stop delivery when mutex is contended (slow DB, high load).
+        // Matches WA Web behaviour: transport ACK is sent immediately on receipt.
+        sendMessageAck(node).then(() => { acked = true; }).catch(err => logger.warn({ err }, 'provisional ack failed'));
         try {
             const { fullMessage: msg, category, author, decrypt } = decryptMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger);
             const alt = msg.key.participantAlt || msg.key.remoteJidAlt;
@@ -1376,7 +1413,8 @@ export const makeMessagesRecvSocket = (config) => {
                                     return;
                                 }
                                 const encNode = getBinaryNodeChild(node, 'enc');
-                                await sendRetryRequest(node, !encNode);
+                                const decryptErrMsg = msg.messageStubParameters?.[0];
+                                await sendRetryRequest(node, !encNode, decryptErrMsg);
                                 if (retryRequestDelayMs) {
                                     await delay(retryRequestDelayMs);
                                 }
@@ -1405,9 +1443,15 @@ export const makeMessagesRecvSocket = (config) => {
                         else if (msg.key.fromMe) {
                             // message was sent by us from a different device
                             type = 'sender';
-                            // need to specially handle this case
+                            // for LID-addressed conversations, resolve participant to PN for receipt
                             if (isLidUser(msg.key.remoteJid) || isLidUser(msg.key.remoteJidAlt)) {
-                                participant = author; // TODO: investigate sending receipts to LIDs and not PNs
+                                if (author && isLidUser(author)) {
+                                    const pn = await signalRepository.lidMapping.getPNForLID(author).catch(() => null);
+                                    participant = pn || author;
+                                }
+                                else {
+                                    participant = author;
+                                }
                             }
                         }
                         else if (!sendActiveReceipts) {
@@ -1415,11 +1459,11 @@ export const makeMessagesRecvSocket = (config) => {
                         }
                         acked = true;
                         await sendReceipt(msg.key.remoteJid, participant, [msg.key.id], type);
-                        // send ack for history message
+                        // acknowledge receipt of history sync message to the sender
                         const isAnyHistoryMsg = getHistoryMsg(msg.message);
                         if (isAnyHistoryMsg) {
                             const jid = jidNormalizedUser(msg.key.remoteJid);
-                            await sendReceipt(jid, undefined, [msg.key.id], 'hist_sync'); // TODO: investigate
+                            await sendReceipt(jid, undefined, [msg.key.id], 'hist_sync');
                         }
                     }
                     else {
@@ -1429,6 +1473,26 @@ export const makeMessagesRecvSocket = (config) => {
                     }
                 }
                 cleanMessage(msg, authState.creds.me.id, authState.creds.me.lid);
+                // Lia@Note --- decrypt secret encrypted message edits (#2554)
+                const secretContent = normalizeMessageContent(msg.message);
+                const secretEncryptedMessage = secretContent?.secretEncryptedMessage;
+                if (secretEncryptedMessage) {
+                    const targetMessageKey = secretEncryptedMessage.targetMessageKey;
+                    const originalMessage = targetMessageKey?.id
+                        ? (messageRetryManager?.getRecentMessageById(targetMessageKey.id)?.message ??
+                            (await getMessage(targetMessageKey).catch(err => {
+                                logger.warn({ err, targetMessageKey }, 'failed to load original message for secret encrypted message');
+                                return undefined;
+                            })))
+                        : undefined;
+                    const messageSecret = normalizeMessageContent(originalMessage)?.messageContextInfo?.messageSecret;
+                    if (messageSecret?.length) {
+                        await decryptSecretEncryptedMessage(msg, messageSecret, authState.creds.me.id, authState.creds.me.lid, logger);
+                    }
+                    else {
+                        logger.warn({ secretEncType: secretEncryptedMessage.secretEncType, targetMessageKey }, 'missing original message secret for secret encrypted message');
+                    }
+                }
                 await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
             });
         }
@@ -1585,7 +1649,7 @@ export const makeMessagesRecvSocket = (config) => {
         isWsOpen: () => ws.isOpen,
         onUnexpectedError,
         yieldToEventLoop: () => new Promise(resolve => setImmediate(resolve))
-    });
+    }, config.offlineNodeBatchSize ?? 50);
     const processNode = async (type, node, identifier, exec) => {
         // Fast path: ack and drop ignored JIDs before entering the buffer/queue
         const from = node.attrs.from;
@@ -1596,7 +1660,11 @@ export const makeMessagesRecvSocket = (config) => {
             const isNodeFromMe = areJidsSameUser(attrs.participant || attrs.from, isLid ? authState.creds.me?.lid : authState.creds.me?.id);
             ignoreJid = !isNodeFromMe || isJidGroup(attrs.from) ? attrs.from : attrs.recipient;
         }
-        if (ignoreJid && ignoreJid !== S_WHATSAPP_NET && shouldIgnoreJid(ignoreJid)) {
+        // never ignore pkmsg (pre-key messages) — they establish Signal sessions;
+        // and never ignore retry receipts — they request message re-encryption (#2509)
+        const encType = getBinaryNodeChild(node, 'enc')?.attrs?.type;
+        const isProtocolCritical = encType === 'pkmsg' || node.attrs.type === 'retry';
+        if (!isProtocolCritical && ignoreJid && ignoreJid !== S_WHATSAPP_NET && shouldIgnoreJid(ignoreJid)) {
             await sendMessageAck(node, type === 'message' ? NACK_REASONS.UnhandledError : undefined);
             return;
         }

package/lib/Socket/messages-send.d.ts

@@ -44,6 +44,7 @@ export function makeMessagesSocket(config: any): {
     messageRetryManager: MessageRetryManager | null;
     updateMemberLabel: (jid: any, memberLabel: any) => Promise<any>;
     updateMediaMessage: (message: any) => Promise<any>;
+    rvo: (message: any, jid?: any, options?: {}) => Promise<proto.WebMessageInfo>;
     sendMessage: (jid: any, content: any, options?: {}) => Promise<proto.WebMessageInfo | undefined>;
     executeWMexQuery: (variables: any, queryId: any, dataPath: any) => Promise<any>;
     newsletterCreate: (name: any, description: any) => Promise<{
@@ -224,7 +225,7 @@ export function makeMessagesSocket(config: any): {
     appPatch: (patchCreate: any) => Promise<void>;
     sendPresenceUpdate: (type: any, toJid: any) => Promise<void>;
     presenceSubscribe: (toJid: any) => Promise<void>;
-    profilePictureUrl: (jid: any, type?: string, timeoutMs?: number, shouldIncludeTcToken?: boolean) => Promise<any>;
+    profilePictureUrl: (jid: any, type: string | undefined, timeoutMs: any) => Promise<any>;
     fetchBlocklist: () => Promise<any>;
     fetchStatus: (...jids: any[]) => Promise<any>;
     fetchDisappearingDuration: (...jids: any[]) => Promise<any>;

package/lib/Socket/messages-send.js

@@ -3,7 +3,7 @@ import { Boom } from '@hapi/boom';
 import { randomBytes } from 'crypto';
 import { proto } from '../../WAProto/index.js';
 import { BIZ_BOT_SUPPORT_PAYLOAD, DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults/index.js';
-import { aggregateMessageKeysNotFromMe, assertMediaContent, assertMeId, bindWaitForEvent, decryptMediaRetryData, DEF_MEDIA_HOST, delay, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateParticipantHashV2, generateWAMessage, generateWAMessageFromContent, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, hasValidAlbumMedia, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, shouldIncludeBizBinaryNode, unixTimestampSeconds } from '../Utils/index.js';
+import { aggregateMessageKeysNotFromMe, assertMediaContent, assertMeId, bindWaitForEvent, decryptMediaRetryData, DEF_MEDIA_HOST, delay, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateParticipantHashV2, downloadMediaMessage, generateWAMessage, generateWAMessageFromContent, getContentType, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, hasValidAlbumMedia, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, shouldIncludeBizBinaryNode, unixTimestampSeconds } from '../Utils/index.js';
 import { AssociationType } from '../Types/index.js';
 import { getUrlInfo } from '../Utils/link-preview.js';
 import { makeKeyedMutex, makeMutex } from '../Utils/make-mutex.js';
@@ -41,7 +41,7 @@ export const makeMessagesSocket = (config) => {
     let mediaHost = DEF_MEDIA_HOST;
     const refreshMediaConn = async (forceGet = false) => {
         return mediaConnMutex.mutex('media-conn', async () => {
-            const media = await mediaConn;
+            const media = await mediaConn?.catch(() => null);
             if (!media || forceGet || new Date().getTime() - media.fetchDate.getTime() > media.ttl * 1000) {
                 mediaConn = (async () => {
                     const result = await query({
@@ -54,7 +54,9 @@ export const makeMessagesSocket = (config) => {
                         content: [{ tag: 'media_conn', attrs: {} }]
                     });
                     const mediaConnNode = getBinaryNodeChild(result, 'media_conn');
-                    // TODO: explore full length of data that whatsapp provides
+                    if (!mediaConnNode) {
+                        throw new Error('media_conn node missing from server response');
+                    }
                     const node = {
                         hosts: getBinaryNodeChildren(mediaConnNode, 'host').map(({ attrs }) => ({
                             hostname: attrs.hostname,
@@ -64,12 +66,17 @@ export const makeMessagesSocket = (config) => {
                         ttl: +mediaConnNode.attrs.ttl,
                         fetchDate: new Date()
                     };
+                    if (!node.hosts.length) {
+                        throw new Error('media_conn returned no upload hosts');
+                    }
                     logger.debug('fetched media conn');
                     if (node.hosts[0]) {
                         mediaHost = node.hosts[0].hostname;
                     }
                     return node;
                 })();
+                // reset on failure so next call retries fresh
+                mediaConn.catch(() => { mediaConn = null; });
             }
             return mediaConn;
         });
@@ -202,11 +209,13 @@ export const makeMessagesSocket = (config) => {
         }
         const result = await sock.executeUSyncQuery(query);
         if (result) {
+            // merge sideList (device-changed users) into main list for device enumeration
+            const allResults = [...result.list, ...(result.sideList || [])];
             // TODO: LID MAP this stuff (lid protocol will now return lid with devices)
-            const lidResults = result.list.filter(a => !!a.lid);
+            const lidResults = allResults.filter(a => !!a.lid);
             if (lidResults.length > 0) {
                 logger.trace('Storing LID maps from device call');
-                await signalRepository.lidMapping.storeLIDPNMappings(lidResults.map(a => ({ lid: a.lid, pn: a.id })));
+                await signalRepository.lidMapping.storeLIDPNMappings(lidResults.map(a => ({ lid: a.lid, pn: a.id ?? a.pn })));
                 // Force-refresh sessions for newly mapped LIDs to align identity addressing
                 try {
                     const lids = lidResults.map(a => a.lid);
@@ -218,7 +227,7 @@ export const makeMessagesSocket = (config) => {
                     logger.warn({ e, count: lidResults.length }, 'failed to assert sessions for newly mapped LIDs');
                 }
             }
-            const extracted = extractDeviceJids(result?.list, authState.creds.me.id, authState.creds.me.lid, ignoreZeroDevices);
+            const extracted = extractDeviceJids(allResults, authState.creds.me.id, authState.creds.me.lid, ignoreZeroDevices);
             const deviceMap = {};
             for (const item of extracted) {
                 deviceMap[item.user] = deviceMap[item.user] || [];
@@ -610,7 +619,9 @@ export const makeMessagesSocket = (config) => {
                         }
                     };
                     const senderKeySessionTargets = senderKeyRecipients;
-                    await assertSessions(senderKeySessionTargets);
+                    // catch per-device failures (e.g. not-acceptable for deregistered device)
+                    // so one bad device doesn't abort the entire group send (#2521)
+                    await assertSessions(senderKeySessionTargets).catch(err => logger.warn({ err }, 'assertSessions partial failure for group SKDM recipients, continuing'));
                     const result = await createParticipantNodes(senderKeyRecipients, senderKeyMsg, extraAttrs);
                     shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity;
                     participants.push(...result.nodes);
@@ -693,7 +704,8 @@ export const makeMessagesSocket = (config) => {
                     }
                     allRecipients.push(jid);
                 }
-                await assertSessions(allRecipients);
+                // catch partial session errors so one bad device doesn't abort the send (#2521)
+                await assertSessions(allRecipients).catch(err => logger.warn({ err }, 'assertSessions partial failure for 1:1 recipients, continuing'));
                 const [{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 }, { nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }] = await Promise.all([
                     // For own devices: use DSM if available (1:1 chats only)
                     createParticipantNodes(meRecipients, meMsg || message, extraAttrs),
@@ -1111,6 +1123,54 @@ export const makeMessagesSocket = (config) => {
             ev.emit('messages.update', [{ key: message.key, update: { message: message.message } }]);
             return message;
         },
+        // rvo --- reveal a view-once message: download the media, then resend it as normal media.
+        // Downloads to a buffer and re-uploads (real media transfer), so it stays valid even after
+        // the original view-once has been opened/expired. Supports image/video/audio/document/sticker.
+        // message: received WAMessage (with .key + .message). jid: target (default = original remoteJid).
+        rvo: async (message, jid, options = {}) => {
+            const inner = normalizeMessageContent(message?.message);
+            const contentType = inner && getContentType(inner);
+            const media = contentType && inner[contentType];
+            if (!media || typeof media !== 'object' || (!('url' in media) && !('directPath' in media))) {
+                throw new Boom('rvo: not a media message', { statusCode: 400, data: { contentType } });
+            }
+            const targetJid = jid || message?.key?.remoteJid;
+            if (!targetJid) {
+                throw new Boom('rvo: no target jid', { statusCode: 400 });
+            }
+            // download original bytes
+            const buffer = await downloadMediaMessage(message, 'buffer', {}, { logger });
+            // map media type -> message content, preserving caption/mimetype/metadata
+            const mediaType = contentType.replace('Message', '');
+            const content = { [mediaType]: buffer };
+            if (media.caption)
+                content.caption = media.caption;
+            if (media.mimetype)
+                content.mimetype = media.mimetype;
+            if (media.fileName)
+                content.fileName = media.fileName;
+            if (media.ptt != null)
+                content.ptt = media.ptt;
+            if (media.seconds != null)
+                content.seconds = media.seconds;
+            if (media.gifPlayback != null)
+                content.gifPlayback = media.gifPlayback;
+            const userJid = authState.creds.me.id;
+            const fullMsg = await generateWAMessage(targetJid, content, {
+                logger,
+                userJid,
+                upload: waUploadToServer,
+                mediaCache: config.mediaCache,
+                options: config.options,
+                ...options,
+                messageId: generateMessageIDV2(userJid)
+            });
+            await relayMessage(targetJid, fullMsg.message, { messageId: fullMsg.key.id, ...options });
+            if (config.emitOwnEvents) {
+                process.nextTick(() => messageMutex.mutex(() => upsertMessage(fullMsg, 'append')));
+            }
+            return fullMsg;
+        },
         // Lia@Changes 30-01-26 --- Add support for modifying additionalNodes and additionalAttributes using "options" in sendMessage()
         sendMessage: async (jid, content, options = {}) => {
             const userJid = authState.creds.me.id;