@nexustechpro/baileys 2.1.0 → 2.1.2

package/lib/Socket/messages-recv.js

@@ -278,7 +278,8 @@ export const makeMessagesRecvSocket = (config) => {
       if (senderTs === null || senderTs === undefined || isTcTokenExpired(senderTs)) return
       logger.debug({ jid: normalizedJid, senderTimestamp: senderTs }, 'identity changed, re-issuing tctoken')
       const getPNForLID = signalRepository.lidMapping.getPNForLID.bind(signalRepository.lidMapping)
-      const issueJid = await resolveIssuanceJid(normalizedJid, sock.serverProps.lidTrustedTokenIssueToLid, getLIDForPN, getPNForLID)
+      const issueToLid = sock.serverProps?.lidTrustedTokenIssueToLid ?? false
+      const issueJid = await resolveIssuanceJid(normalizedJid, issueToLid, getLIDForPN, getPNForLID)
       const result = await issuePrivacyTokens([issueJid], senderTs)
       await storeTcTokensFromIqResult({ result, fallbackJid: tcJid, keys: authState.keys, getLIDForPN, onNewJidStored: trackTcTokenJid })
     })().catch(err => logger.debug({ jid: from, err: err?.message }, 'failed to re-issue tctoken after identity change'))
@@ -831,7 +832,8 @@ export const makeMessagesRecvSocket = (config) => {
             try {
               const getPNForLID = signalRepository.lidMapping.getPNForLID.bind(signalRepository.lidMapping)
               const tcStorageJid = await resolveTcTokenJid(ackFrom, getLIDForPN)
-              const issueJid = await resolveIssuanceJid(ackFrom, sock.serverProps.lidTrustedTokenIssueToLid, getLIDForPN, getPNForLID)
+              const issueToLid = sock.serverProps?.lidTrustedTokenIssueToLid ?? false
+              const issueJid = await resolveIssuanceJid(ackFrom, issueToLid, getLIDForPN, getPNForLID)
               const result = await issuePrivacyTokens([issueJid], unixTimestampSeconds())
               await storeTcTokensFromIqResult({ result, fallbackJid: tcStorageJid, keys: authState.keys, getLIDForPN, onNewJidStored: trackTcTokenJid })
               logger.debug({ from: ackFrom }, 'completed 463 token recovery issuance')

package/lib/Socket/messages-send.js

@@ -362,12 +362,18 @@ export const makeMessagesSocket = (config) => {
     const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList, quoted } = {}) => {
         const meId = authState.creds.me.id
         const meLid = authState.creds.me?.lid
-        const { user, server } = jidDecode(jid)
+        let { user, server } = jidDecode(jid)
         const isGroup = server === 'g.us'
         const isStatus = jid === 'status@broadcast'
-        const isLid = server === 'lid'
+        let isLid = server === 'lid'
         const isNewsletter = server === 'newsletter'
-
+        if (isLid && !isGroup && !isStatus) {
+            const pn = await signalRepository.lidMapping.getPNForLID(jid)
+            if (pn) {
+                const resolvedJid = pn.replace(/:\d+(?=@)/, ''); logger.debug({ from: jid, to: resolvedJid }, 'relayMessage: resolved 1:1 LID to PN for wire protocol')
+                jid = resolvedJid; const decoded = jidDecode(jid); user = decoded.user; server = decoded.server; isLid = false
+            }
+        }
         let activeSender = meId
         let groupAddressingMode = 'pn'
         if (isGroup && !isStatus) {