feat: centralized LID→PN normalization for all emitted events (#246)
* feat: centralized LID→PN normalization for all emitted events WhatsApp's server increasingly uses LID (Linked ID) as the primary addressing format. Consumers expect phone numbers (PN), not opaque LID identifiers. This adds comprehensive LID→PN resolution across all ev.emit() paths so downstream consumers always receive PN. Key changes: - Add resolveLidToPn() and normalizeKeyLidToPn() centralized helpers in process-message.ts for consistent LID→PN resolution - normalizeMessageJids() fast path: use alt JID directly from stanza attributes (zero I/O, eliminates race condition with LIDMappingStore) - Await storeLIDPNMappings() before normalization in message receipt flow (was fire-and-forget, could race with subsequent getPNForLID) - Normalize LID→PN in all event emission points: * messages.upsert (keys, nested reaction/poll keys, participantAlt) * presence.update (jid + participant) * message-receipt.update (key + userJid) * contacts.update (picture notifications) * blocklist.update (blocklist JIDs) * call events (chatId, from) * group metadata (participants, owner, subjectOwner) * group notifications (acting participant, add/remove/promote/demote) * newsletter notifications (author, user JIDs) * sync actions (mutation index normalization) - Make handlePresenceUpdate and handleGroupNotification async to support await on LID resolution - Add normalizeGroupMetadata() helper in groups.ts for all extractGroupMetadata call sites Performance: ~0.01ms per message (LRU cache hit). No impact on message sending. First-contact resolution ~2-5ms (one-time per contact). * fix: normalize LID→PN in handleBadAck, media retry, and PDO recovery Additional leak points found during final audit: - handleBadAck: key.remoteJid from ack stanza could be LID - messages.media-update: media retry key JIDs not normalized - CTWA PDO recovery: webMessageInfo.key from phone response not normalized * fix: address PR review — parallelize LID resolution, use helper consistently - normalizeGroupMetadata: resolve participant LIDs with Promise.all instead of sequential loop (perf on large groups) - handleCall: resolve participant JIDs with Promise.all - handleBadAck: use normalizeKeyLidToPn() helper instead of manual resolveLidToPn + assignment (consistency with other code paths) - CB:relay: resolve callCreator LID→PN before emitting
This commit is contained in:
+43
-7
@@ -1,7 +1,7 @@
|
||||
import { proto } from '../../WAProto/index.js'
|
||||
import type { GroupMetadata, GroupParticipant, ParticipantAction, SocketConfig, WAMessageKey } from '../Types'
|
||||
import { WAMessageAddressingMode, WAMessageStubType } from '../Types'
|
||||
import { generateMessageIDV2, unixTimestampSeconds } from '../Utils'
|
||||
import { generateMessageIDV2, resolveLidToPn, unixTimestampSeconds } from '../Utils'
|
||||
import {
|
||||
type BinaryNode,
|
||||
getBinaryNodeChild,
|
||||
@@ -17,6 +17,43 @@ import { makeChatsSocket } from './chats'
|
||||
export const makeGroupsSocket = (config: SocketConfig) => {
|
||||
const sock = makeChatsSocket(config)
|
||||
const { authState, ev, query, upsertMessage } = sock
|
||||
const { signalRepository } = sock
|
||||
const { logger } = config
|
||||
|
||||
/** Normalize group metadata participant IDs from LID to PN */
|
||||
const normalizeGroupMetadata = async (metadata: GroupMetadata): Promise<GroupMetadata> => {
|
||||
const lidMapping = signalRepository.lidMapping
|
||||
|
||||
// Resolve all participant LIDs in parallel for better performance on large groups
|
||||
await Promise.all(metadata.participants.map(async (p) => {
|
||||
if (isLidUser(p.id)) {
|
||||
if (p.phoneNumber) {
|
||||
p.lid = p.id
|
||||
p.id = p.phoneNumber
|
||||
} else {
|
||||
const resolved = await resolveLidToPn(p.id, lidMapping, logger)
|
||||
if (resolved && resolved !== p.id) {
|
||||
p.lid = p.id
|
||||
p.id = resolved
|
||||
}
|
||||
}
|
||||
}
|
||||
}))
|
||||
|
||||
// Normalize owner/subjectOwner if LID (parallel)
|
||||
const [resolvedOwner, resolvedSubjectOwner] = await Promise.all([
|
||||
metadata.owner && isLidUser(metadata.owner)
|
||||
? (metadata.ownerPn || resolveLidToPn(metadata.owner, lidMapping, logger))
|
||||
: null,
|
||||
metadata.subjectOwner && isLidUser(metadata.subjectOwner)
|
||||
? (metadata.subjectOwnerPn || resolveLidToPn(metadata.subjectOwner, lidMapping, logger))
|
||||
: null
|
||||
])
|
||||
if (resolvedOwner) metadata.owner = resolvedOwner
|
||||
if (resolvedSubjectOwner) metadata.subjectOwner = resolvedSubjectOwner
|
||||
|
||||
return metadata
|
||||
}
|
||||
|
||||
const groupQuery = async (jid: string, type: 'get' | 'set', content: BinaryNode[]) =>
|
||||
query({
|
||||
@@ -31,7 +68,7 @@ export const makeGroupsSocket = (config: SocketConfig) => {
|
||||
|
||||
const groupMetadata = async (jid: string) => {
|
||||
const result = await groupQuery(jid, 'get', [{ tag: 'query', attrs: { request: 'interactive' } }])
|
||||
return extractGroupMetadata(result)
|
||||
return normalizeGroupMetadata(extractGroupMetadata(result))
|
||||
}
|
||||
|
||||
const groupFetchAllParticipating = async () => {
|
||||
@@ -58,16 +95,15 @@ export const makeGroupsSocket = (config: SocketConfig) => {
|
||||
if (groupsChild) {
|
||||
const groups = getBinaryNodeChildren(groupsChild, 'group')
|
||||
for (const groupNode of groups) {
|
||||
const meta = extractGroupMetadata({
|
||||
const meta = await normalizeGroupMetadata(extractGroupMetadata({
|
||||
tag: 'result',
|
||||
attrs: {},
|
||||
content: [groupNode]
|
||||
})
|
||||
}))
|
||||
data[meta.id] = meta
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: properly parse LID / PN DATA
|
||||
sock.ev.emit('groups.update', Object.values(data))
|
||||
|
||||
return data
|
||||
@@ -101,7 +137,7 @@ export const makeGroupsSocket = (config: SocketConfig) => {
|
||||
}))
|
||||
}
|
||||
])
|
||||
return extractGroupMetadata(result)
|
||||
return normalizeGroupMetadata(extractGroupMetadata(result))
|
||||
},
|
||||
groupLeave: async (id: string) => {
|
||||
await groupQuery('@g.us', 'set', [
|
||||
@@ -277,7 +313,7 @@ export const makeGroupsSocket = (config: SocketConfig) => {
|
||||
),
|
||||
groupGetInviteInfo: async (code: string) => {
|
||||
const results = await groupQuery('@g.us', 'get', [{ tag: 'invite', attrs: { code } }])
|
||||
return extractGroupMetadata(results)
|
||||
return normalizeGroupMetadata(extractGroupMetadata(results))
|
||||
},
|
||||
groupToggleEphemeral: async (jid: string, ephemeralExpiration: number) => {
|
||||
const content: BinaryNode = ephemeralExpiration
|
||||
|
||||
Reference in New Issue
Block a user