@nexustechpro/baileys 2.1.0 → 2.1.3

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'))
@@ -526,7 +527,7 @@ export const makeMessagesRecvSocket = (config) => {
 
   const tcTokenKnownJids = new Set()
   const tcTokenIndexLoaded = (async () => {
-    try { const jids = await readTcTokenIndex(authState.keys); for (const jid of jids) tcTokenKnownJids.add(jid); logger.debug({ count: tcTokenKnownJids.size }, 'loaded tctoken index') }
+    try { const jids = await readTcTokenIndex(authState.keys); for (const jid of jids) tcTokenKnownJids.add(jid); if (tcTokenKnownJids.size > 0) logger.debug({ count: tcTokenKnownJids.size }, 'loaded tctoken index') }
     catch (err) { logger.warn({ err: err?.message }, 'failed to load tctoken index') }
   })()
 
@@ -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')
@@ -940,7 +942,8 @@ export const makeMessagesRecvSocket = (config) => {
         else survivors.add(jid)
       }
       if (mutated === 0) return
-      await authState.keys.set({ tctoken: { ...writes, [TC_TOKEN_INDEX_KEY]: { token: Buffer.from(JSON.stringify([...survivors])) } } })
+      const indexWrite = await buildMergedTcTokenIndexWrite(authState.keys, [...survivors])
+      await authState.keys.set({ tctoken: { ...writes, ...indexWrite } })
       tcTokenKnownJids.clear()
       for (const jid of survivors) tcTokenKnownJids.add(jid)
       logger.debug({ mutated, remaining: survivors.size }, 'pruned expired tctokens')
@@ -960,5 +963,5 @@ export const makeMessagesRecvSocket = (config) => {
     sendActiveReceipts = false
   })
 
-  return { ...sock, sendMessageAck, sendRetryRequest, rejectCall, offerCall, fetchMessageHistory, requestPlaceholderResend, messageRetryManager }
+  return { ...sock, sendMessageAck, sendRetryRequest, rejectCall, offerCall, fetchMessageHistory, requestPlaceholderResend, messageRetryManager, tcTokenIndexLoaded }
 }

package/lib/Socket/messages-send.js

@@ -362,12 +362,11 @@ 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'
-
         let activeSender = meId
         let groupAddressingMode = 'pn'
         if (isGroup && !isStatus) {
@@ -536,6 +535,14 @@ export const makeMessagesSocket = (config) => {
                 if (isLid && meLid) { ownId = meLid; logger.debug({ to: jid, ownId }, 'Using LID identity') }
 
                 const { user: ownUser } = jidDecode(ownId)
+                const targetUserServer = isLid ? 'lid' : 's.whatsapp.net'
+                devices.push({ user, device: 0, jid: jidEncode(user, targetUserServer, 0) })
+
+                if (user !== ownUser) {
+                    const ownUserServer = isLid ? 'lid' : 's.whatsapp.net'
+                    const ownUserForAddressing = isLid && meLid ? jidDecode(meLid).user : jidDecode(meId).user
+                    devices.push({ user: ownUserForAddressing, device: 0, jid: jidEncode(ownUserForAddressing, ownUserServer, 0) })
+                }
 
                 if (!participant) {
                     const targetUserServer = isLid ? 'lid' : 's.whatsapp.net'
@@ -564,22 +571,16 @@ export const makeMessagesSocket = (config) => {
                         }
                     }
                 }
-
                 const allRecipients = [], meRecipients = [], otherRecipients = []
                 const { user: mePnUser } = jidDecode(meId)
                 const { user: meLidUser } = meLid ? jidDecode(meLid) : { user: null }
-
-                for (const { user, jid } of devices) {
-                    const isExactSenderDevice = jid === meId || (meLid && jid === meLid)
-                    if (isExactSenderDevice) continue
-                    const isMe = user === mePnUser || user === meLidUser
-                    if (isMe) meRecipients.push(jid)
-                    else otherRecipients.push(jid)
-                    allRecipients.push(jid)
+                for (const { user: devUser, jid: devJid } of devices) {
+                    const isOwnUser = devUser === mePnUser || devUser === meLidUser
+                    if (isOwnUser) meRecipients.push(devJid)
+                    else otherRecipients.push(devJid)
+                    allRecipients.push(devJid)
                 }
-
                 await assertSessions(allRecipients)
-
                 const [{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 }, { nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }] = await Promise.all([
                     createParticipantNodes(meRecipients, meMsg || message, extraAttrs),
                     createParticipantNodes(otherRecipients, message, extraAttrs, meMsg)
@@ -607,7 +608,7 @@ export const makeMessagesSocket = (config) => {
                     id: finalMsgId,
                     to: destinationJid,
                     type: getMessageType(message),
-                    ...(isLid || (isGroup && groupAddressingMode === 'lid') ? { addressing_mode: 'lid' } : {}),
+                    ...((isGroup && groupAddressingMode === 'lid') ? { addressing_mode: 'lid' } : {}),
                     ...(hasDeviceFanoutFalse ? { device_fanout: 'false' } : {}),
                     ...(additionalAttributes || {})
                 },