fix(types): remove non-null assertions across 14 files
Files fixed: - messages-recv.ts: 58 assertions → null guards, meId extraction, optional chaining - process-message.ts: 38 assertions → remoteJid/participant guards, proto field checks - chat-utils.ts: 31 assertions → proto field validation with Boom errors - messages-send.ts: 20 assertions → meId extraction, participant guards - chats.ts: 15 assertions → me guard, firstChild guard, jid guards - messages.ts: 14 assertions → originalFilePath guard, key guards - groups.ts: 12 assertions → attrs fallbacks with ?? - validate-connection.ts: 9 assertions → grouped proto field validation - generics.ts: 1 assertion → versionLine guard - history.ts: 2 assertions → key guards - libsignal.ts: 1 assertion → deviceId guard - sender-key-message.ts: 3 assertions → proto guards - UsyncBotProfileProtocol.ts: 2 assertions → attrs guards - example.ts: 3 assertions → optional chaining https://claude.ai/code/session_01E2cfX1N3sJgCJBTvzGazSG
This commit is contained in:
Claude
+33
-15
@@ -272,9 +272,12 @@ export const makeChatsSocket = (config: SocketConfig) => {
|
||||
for (const section of getBinaryNodeChildren(botNode, 'section')) {
|
||||
if (section.attrs.type === 'all') {
|
||||
for (const bot of getBinaryNodeChildren(section, 'bot')) {
|
||||
const jid = bot.attrs.jid
|
||||
const personaId = bot.attrs['persona_id']
|
||||
if (!jid || !personaId) continue
|
||||
botList.push({
|
||||
jid: bot.attrs.jid!,
|
||||
personaId: bot.attrs['persona_id']!
|
||||
jid,
|
||||
personaId
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -322,7 +325,9 @@ export const makeChatsSocket = (config: SocketConfig) => {
|
||||
)
|
||||
}
|
||||
|
||||
if (jidNormalizedUser(jid) !== jidNormalizedUser(authState.creds.me!.id)) {
|
||||
const me = authState.creds.me
|
||||
if (!me) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
if (jidNormalizedUser(jid) !== jidNormalizedUser(me.id)) {
|
||||
targetJid = jidNormalizedUser(jid) // in case it is someone other than us
|
||||
} else {
|
||||
targetJid = undefined
|
||||
@@ -356,7 +361,9 @@ export const makeChatsSocket = (config: SocketConfig) => {
|
||||
)
|
||||
}
|
||||
|
||||
if (jidNormalizedUser(jid) !== jidNormalizedUser(authState.creds.me!.id)) {
|
||||
const me = authState.creds.me
|
||||
if (!me) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
if (jidNormalizedUser(jid) !== jidNormalizedUser(me.id)) {
|
||||
targetJid = jidNormalizedUser(jid) // in case it is someone other than us
|
||||
} else {
|
||||
targetJid = undefined
|
||||
@@ -505,10 +512,12 @@ export const makeChatsSocket = (config: SocketConfig) => {
|
||||
const newAppStateChunkHandler = (isInitialSync: boolean) => {
|
||||
return {
|
||||
onMutation(mutation: ChatMutation) {
|
||||
const me = authState.creds.me
|
||||
if (!me) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
processSyncAction(
|
||||
mutation,
|
||||
ev,
|
||||
authState.creds.me!,
|
||||
me,
|
||||
isInitialSync ? { accountSettings: authState.creds.accountSettings } : undefined,
|
||||
logger
|
||||
)
|
||||
@@ -630,7 +639,7 @@ export const makeChatsSocket = (config: SocketConfig) => {
|
||||
// if retry attempts overshoot
|
||||
// or key not found
|
||||
const isIrrecoverableError =
|
||||
attemptsMap[name]! >= MAX_SYNC_ATTEMPTS ||
|
||||
(attemptsMap[name] || 0) >= MAX_SYNC_ATTEMPTS ||
|
||||
error.output?.statusCode === 404 ||
|
||||
error.name === 'TypeError'
|
||||
logger.info(
|
||||
@@ -652,7 +661,9 @@ export const makeChatsSocket = (config: SocketConfig) => {
|
||||
|
||||
const { onMutation } = newAppStateChunkHandler(isInitialSync)
|
||||
for (const key in globalMutationMap) {
|
||||
onMutation(globalMutationMap[key]!)
|
||||
const mutation = globalMutationMap[key]
|
||||
if (!mutation) continue
|
||||
onMutation(mutation)
|
||||
}
|
||||
}
|
||||
)
|
||||
@@ -708,7 +719,8 @@ export const makeChatsSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
const sendPresenceUpdate = async (type: WAPresence, toJid?: string) => {
|
||||
const me = authState.creds.me!
|
||||
const me = authState.creds.me
|
||||
if (!me) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
if (type === 'available' || type === 'unavailable') {
|
||||
if (!me.name) {
|
||||
logger.warn('no name present, ignoring presence update request...')
|
||||
@@ -733,14 +745,17 @@ export const makeChatsSocket = (config: SocketConfig) => {
|
||||
})
|
||||
}
|
||||
} else {
|
||||
const { server } = jidDecode(toJid)!
|
||||
if (!toJid) return
|
||||
const decoded = jidDecode(toJid)
|
||||
if (!decoded) return
|
||||
const { server } = decoded
|
||||
const isLid = server === 'lid'
|
||||
|
||||
await sendNode({
|
||||
tag: 'chatstate',
|
||||
attrs: {
|
||||
from: isLid ? me.lid! : me.id,
|
||||
to: toJid!
|
||||
from: isLid ? (me.lid || me.id) : me.id,
|
||||
to: toJid
|
||||
},
|
||||
content: [
|
||||
{
|
||||
@@ -774,8 +789,9 @@ export const makeChatsSocket = (config: SocketConfig) => {
|
||||
let presence: PresenceData | undefined
|
||||
const jid = attrs.from
|
||||
const participant = attrs.participant || attrs.from
|
||||
if (!jid) return
|
||||
|
||||
if (shouldIgnoreJid(jid!) && jid !== S_WHATSAPP_NET) {
|
||||
if (shouldIgnoreJid(jid) && jid !== S_WHATSAPP_NET) {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -786,12 +802,13 @@ export const makeChatsSocket = (config: SocketConfig) => {
|
||||
}
|
||||
} else if (Array.isArray(content)) {
|
||||
const [firstChild] = content
|
||||
let type = firstChild!.tag as WAPresence
|
||||
if (!firstChild) return
|
||||
let type = firstChild.tag as WAPresence
|
||||
if (type === 'paused') {
|
||||
type = 'available'
|
||||
}
|
||||
|
||||
if (firstChild!.attrs?.media === 'audio') {
|
||||
if (firstChild.attrs?.media === 'audio') {
|
||||
type = 'recording'
|
||||
}
|
||||
|
||||
@@ -801,7 +818,8 @@ export const makeChatsSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
if (presence) {
|
||||
ev.emit('presence.update', { id: jid!, presences: { [participant!]: presence } })
|
||||
if (!participant) return
|
||||
ev.emit('presence.update', { id: jid, presences: { [participant]: presence } })
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -225,12 +225,12 @@ export const makeGroupsSocket = (config: SocketConfig) => {
|
||||
groupAcceptInviteV4: ev.createBufferedFunction(
|
||||
async (key: string | WAMessageKey, inviteMessage: proto.Message.IGroupInviteMessage) => {
|
||||
key = typeof key === 'string' ? { remoteJid: key } : key
|
||||
const results = await groupQuery(inviteMessage.groupJid!, 'set', [
|
||||
const results = await groupQuery(inviteMessage.groupJid ?? '', 'set', [
|
||||
{
|
||||
tag: 'accept',
|
||||
attrs: {
|
||||
code: inviteMessage.inviteCode!,
|
||||
expiration: inviteMessage.inviteExpiration!.toString(),
|
||||
code: inviteMessage.inviteCode ?? '',
|
||||
expiration: String(inviteMessage.inviteExpiration ?? ''),
|
||||
admin: key.remoteJid!
|
||||
}
|
||||
}
|
||||
|
||||
+52
-33
@@ -274,7 +274,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
case 'view':
|
||||
const viewUpdate = {
|
||||
id: from,
|
||||
server_id: child.attrs.message_id!,
|
||||
server_id: child.attrs.message_id ?? '',
|
||||
count: parseInt(child.content?.toString() || '0', 10)
|
||||
}
|
||||
ev.emit('newsletter.view', viewUpdate)
|
||||
@@ -284,9 +284,9 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const participantUpdate = {
|
||||
id: from,
|
||||
author,
|
||||
user: child.attrs.jid!,
|
||||
action: child.attrs.action!,
|
||||
new_role: child.attrs.role!
|
||||
user: child.attrs.jid ?? '',
|
||||
action: child.attrs.action ?? '',
|
||||
new_role: child.attrs.role ?? ''
|
||||
}
|
||||
ev.emit('newsletter-participants.update', participantUpdate)
|
||||
break
|
||||
@@ -325,7 +325,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
fromMe: false // TODO: is this really true though
|
||||
},
|
||||
message: messageProto,
|
||||
messageTimestamp: +child.attrs.t!
|
||||
messageTimestamp: +(child.attrs.t ?? 0)
|
||||
}).toJSON() as WAMessage
|
||||
await upsertMessage(fullMessage, 'append')
|
||||
logger.info('Processed plaintext newsletter message')
|
||||
@@ -346,8 +346,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'ack',
|
||||
attrs: {
|
||||
id: attrs.id!,
|
||||
to: attrs.from!,
|
||||
id: attrs.id ?? '',
|
||||
to: attrs.from ?? '',
|
||||
class: tag
|
||||
}
|
||||
}
|
||||
@@ -372,7 +372,9 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
if (tag === 'message' && getBinaryNodeChild({ tag, attrs, content }, 'unavailable')) {
|
||||
stanza.attrs.from = authState.creds.me!.id
|
||||
const meId = authState.creds.me?.id
|
||||
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
stanza.attrs.from = meId
|
||||
}
|
||||
|
||||
logger.debug({ recv: { tag, attrs }, sent: stanza.attrs }, 'sent ack')
|
||||
@@ -380,10 +382,12 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
const rejectCall = async (callId: string, callFrom: string) => {
|
||||
const meId = authState.creds.me?.id
|
||||
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
from: authState.creds.me!.id,
|
||||
from: meId,
|
||||
to: callFrom
|
||||
},
|
||||
content: [
|
||||
@@ -402,9 +406,16 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
const sendRetryRequest = async (node: BinaryNode, forceIncludeKeys = false) => {
|
||||
const { fullMessage } = decodeMessageNode(node, authState.creds.me!.id, authState.creds.me!.lid || '')
|
||||
const meId = authState.creds.me?.id
|
||||
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
const meLid = authState.creds.me?.lid || ''
|
||||
const { fullMessage } = decodeMessageNode(node, meId, meLid)
|
||||
const { key: msgKey } = fullMessage
|
||||
const msgId = msgKey.id!
|
||||
const msgId = msgKey.id
|
||||
if (!msgId) {
|
||||
logger.debug({ node }, 'missing message id in retry request')
|
||||
return
|
||||
}
|
||||
|
||||
if (messageRetryManager) {
|
||||
// Check if we've exceeded max retries using the new system
|
||||
@@ -442,7 +453,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const retryCount = (await msgRetryCache.get<number>(key)) || 1
|
||||
|
||||
const { account, signedPreKey, signedIdentityKey: identityKey } = authState.creds
|
||||
const fromJid = node.attrs.from!
|
||||
const fromJid = node.attrs.from ?? ''
|
||||
|
||||
// Check if we should recreate the session
|
||||
let shouldRecreateSession = false
|
||||
@@ -499,22 +510,23 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
}
|
||||
}
|
||||
|
||||
const deviceIdentity = encodeSignedDeviceIdentity(account!, true)
|
||||
if (!account) throw new Boom('Account not available', { statusCode: 401 })
|
||||
const deviceIdentity = encodeSignedDeviceIdentity(account, true)
|
||||
await authState.keys.transaction(async () => {
|
||||
const receipt: BinaryNode = {
|
||||
tag: 'receipt',
|
||||
attrs: {
|
||||
id: msgId,
|
||||
type: 'retry',
|
||||
to: node.attrs.from!
|
||||
to: node.attrs.from ?? ''
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'retry',
|
||||
attrs: {
|
||||
count: retryCount.toString(),
|
||||
id: node.attrs.id!,
|
||||
t: node.attrs.t!,
|
||||
id: node.attrs.id ?? '',
|
||||
t: node.attrs.t ?? '',
|
||||
v: '1',
|
||||
// ADD ERROR FIELD
|
||||
error: '0'
|
||||
@@ -540,16 +552,19 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const { update, preKeys } = await getNextPreKeys(authState, 1)
|
||||
|
||||
const [keyId] = Object.keys(preKeys)
|
||||
const key = preKeys[+keyId!]
|
||||
if (!keyId) throw new Boom('No pre-keys available')
|
||||
const key = preKeys[+keyId]
|
||||
if (!key) throw new Boom('Pre-key not found')
|
||||
|
||||
const content = receipt.content! as BinaryNode[]
|
||||
const content = receipt.content as BinaryNode[]
|
||||
if (!content) throw new Boom('Receipt content missing')
|
||||
content.push({
|
||||
tag: 'keys',
|
||||
attrs: {},
|
||||
content: [
|
||||
{ tag: 'type', attrs: {}, content: Buffer.from(KEY_BUNDLE_TYPE) },
|
||||
{ tag: 'identity', attrs: {}, content: identityKey.public },
|
||||
xmppPreKey(key!, +keyId!),
|
||||
xmppPreKey(key, +keyId),
|
||||
xmppSignedPreKey(signedPreKey),
|
||||
{ tag: 'device-identity', attrs: {}, content: deviceIdentity }
|
||||
]
|
||||
@@ -568,7 +583,9 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const from = node.attrs.from
|
||||
if (from === S_WHATSAPP_NET) {
|
||||
const countChild = getBinaryNodeChild(node, 'count')
|
||||
const count = +countChild!.attrs.value!
|
||||
const countVal = countChild?.attrs?.value
|
||||
if (!countVal) return
|
||||
const count = +countVal
|
||||
const shouldUploadMorePreKeys = count < MIN_PREKEY_COUNT
|
||||
|
||||
logger.debug({ count, shouldUploadMorePreKeys }, 'recv pre-key count')
|
||||
@@ -597,8 +614,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const actingParticipantLid = fullNode.attrs.participant
|
||||
const actingParticipantPn = fullNode.attrs.participant_pn
|
||||
|
||||
const affectedParticipantLid = getBinaryNodeChild(child, 'participant')?.attrs?.jid || actingParticipantLid!
|
||||
const affectedParticipantPn = getBinaryNodeChild(child, 'participant')?.attrs?.phone_number || actingParticipantPn!
|
||||
const affectedParticipantLid = getBinaryNodeChild(child, 'participant')?.attrs?.jid || actingParticipantLid || ''
|
||||
const affectedParticipantPn = getBinaryNodeChild(child, 'participant')?.attrs?.phone_number || actingParticipantPn || ''
|
||||
|
||||
switch (child?.tag) {
|
||||
case 'create':
|
||||
@@ -633,7 +650,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
}
|
||||
break
|
||||
case 'modify':
|
||||
const oldNumber = getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid!)
|
||||
const oldNumber = getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid ?? '').filter(Boolean)
|
||||
msg.messageStubParameters = oldNumber || []
|
||||
msg.messageStubType = WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER
|
||||
break
|
||||
@@ -648,7 +665,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const participants = getBinaryNodeChildren(child, 'participant').map(({ attrs }) => {
|
||||
// TODO: Store LID MAPPINGS
|
||||
return {
|
||||
id: attrs.jid!,
|
||||
id: attrs.jid ?? '',
|
||||
phoneNumber: isLidUser(attrs.jid) && isPnUser(attrs.phone_number) ? attrs.phone_number : undefined,
|
||||
lid: isPnUser(attrs.jid) && isLidUser(attrs.lid) ? attrs.lid : undefined,
|
||||
admin: (attrs.type || null) as GroupParticipant['admin']
|
||||
@@ -659,8 +676,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
participants.length === 1 &&
|
||||
// if recv. "remove" message and sender removed themselves
|
||||
// mark as left
|
||||
(areJidsSameUser(participants[0]!.id, actingParticipantLid) ||
|
||||
areJidsSameUser(participants[0]!.id, actingParticipantPn)) &&
|
||||
(areJidsSameUser(participants[0]?.id, actingParticipantLid) ||
|
||||
areJidsSameUser(participants[0]?.id, actingParticipantPn)) &&
|
||||
child.tag === 'remove'
|
||||
) {
|
||||
msg.messageStubType = WAMessageStubType.GROUP_PARTICIPANT_LEAVE
|
||||
@@ -670,7 +687,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
break
|
||||
case 'subject':
|
||||
msg.messageStubType = WAMessageStubType.GROUP_CHANGE_SUBJECT
|
||||
msg.messageStubParameters = [child.attrs.subject!]
|
||||
msg.messageStubParameters = [child.attrs.subject ?? '']
|
||||
break
|
||||
case 'description':
|
||||
const description = getBinaryNodeChild(child, 'body')?.content?.toString()
|
||||
@@ -689,7 +706,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
break
|
||||
case 'invite':
|
||||
msg.messageStubType = WAMessageStubType.GROUP_CHANGE_INVITE_LINK
|
||||
msg.messageStubParameters = [child.attrs.code!]
|
||||
msg.messageStubParameters = [child.attrs.code ?? '']
|
||||
break
|
||||
case 'member_add_mode':
|
||||
const addMode = child.content
|
||||
@@ -703,7 +720,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const approvalMode = getBinaryNodeChild(child, 'group_join')
|
||||
if (approvalMode) {
|
||||
msg.messageStubType = WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE
|
||||
msg.messageStubParameters = [approvalMode.attrs.state!]
|
||||
msg.messageStubParameters = [approvalMode.attrs.state ?? '']
|
||||
}
|
||||
|
||||
break
|
||||
@@ -712,7 +729,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
msg.messageStubParameters = [
|
||||
JSON.stringify({ lid: affectedParticipantLid, pn: affectedParticipantPn }),
|
||||
'created',
|
||||
child.attrs.request_method!
|
||||
child.attrs.request_method ?? ''
|
||||
]
|
||||
break
|
||||
case 'revoked_membership_requests':
|
||||
@@ -742,7 +759,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
break
|
||||
case 'w:gp2':
|
||||
// TODO: HANDLE PARTICIPANT_PN
|
||||
handleGroupNotification(node, child!, result)
|
||||
if (!child) break
|
||||
handleGroupNotification(node, child, result)
|
||||
break
|
||||
case 'mediaretry':
|
||||
const event = decodeMediaRetryNode(node)
|
||||
@@ -752,10 +770,11 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
await handleEncryptNotification(node)
|
||||
break
|
||||
case 'devices':
|
||||
if (!child) break
|
||||
const devices = getBinaryNodeChildren(child, 'device')
|
||||
if (
|
||||
areJidsSameUser(child!.attrs.jid, authState.creds.me!.id) ||
|
||||
areJidsSameUser(child!.attrs.lid, authState.creds.me!.lid)
|
||||
areJidsSameUser(child.attrs.jid, authState.creds.me?.id) ||
|
||||
areJidsSameUser(child.attrs.lid, authState.creds.me?.lid)
|
||||
) {
|
||||
const deviceData = devices.map(d => ({ id: d.attrs.jid, lid: d.attrs.lid }))
|
||||
logger.info({ deviceData }, 'my own devices changed')
|
||||
|
||||
+40
-26
@@ -126,15 +126,16 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
},
|
||||
content: [{ tag: 'media_conn', attrs: {} }]
|
||||
})
|
||||
const mediaConnNode = getBinaryNodeChild(result, 'media_conn')!
|
||||
const mediaConnNode = getBinaryNodeChild(result, 'media_conn')
|
||||
if (!mediaConnNode) throw new Boom('Missing media_conn node')
|
||||
// TODO: explore full length of data that whatsapp provides
|
||||
const node: MediaConnInfo = {
|
||||
hosts: getBinaryNodeChildren(mediaConnNode, 'host').map(({ attrs }) => ({
|
||||
hostname: attrs.hostname!,
|
||||
maxContentLengthBytes: +attrs.maxContentLengthBytes!
|
||||
hostname: attrs.hostname ?? '',
|
||||
maxContentLengthBytes: +(attrs.maxContentLengthBytes ?? 0)
|
||||
})),
|
||||
auth: mediaConnNode.attrs.auth!,
|
||||
ttl: +mediaConnNode.attrs.ttl!,
|
||||
auth: mediaConnNode.attrs.auth ?? '',
|
||||
ttl: +(mediaConnNode.attrs.ttl ?? 0),
|
||||
fetchDate: new Date()
|
||||
}
|
||||
logger.debug('fetched media conn')
|
||||
@@ -162,7 +163,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
const node: BinaryNode = {
|
||||
tag: 'receipt',
|
||||
attrs: {
|
||||
id: messageIds[0]!
|
||||
id: messageIds[0] ?? ''
|
||||
}
|
||||
}
|
||||
const isReadReceipt = type === 'read' || type === 'read-self'
|
||||
@@ -171,8 +172,9 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
if (type === 'sender' && (isPnUser(jid) || isLidUser(jid))) {
|
||||
if (!participant) throw new Boom('Missing participant for sender receipt')
|
||||
node.attrs.recipient = jid
|
||||
node.attrs.to = participant!
|
||||
node.attrs.to = participant
|
||||
} else {
|
||||
node.attrs.to = jid
|
||||
if (participant) {
|
||||
@@ -266,10 +268,11 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
for (const { jid, user } of jidsWithUser) {
|
||||
if (!user) continue
|
||||
if (useCache) {
|
||||
const devices =
|
||||
mgetDevices?.[user!] ||
|
||||
(userDevicesCache.mget ? undefined : ((await userDevicesCache.get(user!)) as FullJid[]))
|
||||
mgetDevices?.[user] ||
|
||||
(userDevicesCache.mget ? undefined : ((await userDevicesCache.get(user)) as FullJid[]))
|
||||
if (devices) {
|
||||
const devicesWithJid = devices.map(d => ({
|
||||
...d,
|
||||
@@ -324,10 +327,14 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
}
|
||||
}
|
||||
|
||||
const meId = authState.creds.me?.id
|
||||
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
const meLid = authState.creds.me?.lid || ''
|
||||
|
||||
const extracted = extractDeviceJids(
|
||||
result?.list,
|
||||
authState.creds.me!.id,
|
||||
authState.creds.me!.lid!,
|
||||
meId,
|
||||
meLid,
|
||||
ignoreZeroDevices
|
||||
)
|
||||
const deviceMap: { [_: string]: FullJid[] } = {}
|
||||
@@ -547,7 +554,8 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
: recipientJids.map(jid => ({ recipientJid: jid, message: patched }))
|
||||
|
||||
let shouldIncludeDeviceIdentity = false
|
||||
const meId = authState.creds.me!.id
|
||||
const meId = authState.creds.me?.id
|
||||
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
const meLid = authState.creds.me?.lid
|
||||
const meLidUser = meLid ? jidDecode(meLid)?.user : null
|
||||
|
||||
@@ -559,8 +567,8 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
let msgToEncrypt = patchedMessage
|
||||
|
||||
if (dsmMessage) {
|
||||
const { user: targetUser } = jidDecode(jid)!
|
||||
const { user: ownPnUser } = jidDecode(meId)!
|
||||
const targetUser = jidDecode(jid)?.user ?? ''
|
||||
const ownPnUser = jidDecode(meId)?.user ?? ''
|
||||
const ownLidUser = meLidUser
|
||||
|
||||
const isOwnUser = targetUser === ownPnUser || (ownLidUser && targetUser === ownLidUser)
|
||||
@@ -816,13 +824,16 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
statusJidList
|
||||
}: MessageRelayOptions
|
||||
) => {
|
||||
const meId = authState.creds.me!.id
|
||||
const meId = authState.creds.me?.id
|
||||
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
const meLid = authState.creds.me?.lid
|
||||
const isRetryResend = Boolean(participant?.jid)
|
||||
let shouldIncludeDeviceIdentity = isRetryResend
|
||||
const statusJid = 'status@broadcast'
|
||||
|
||||
const { user, server } = jidDecode(jid)!
|
||||
const jidDecoded = jidDecode(jid)
|
||||
if (!jidDecoded) throw new Boom('Invalid JID')
|
||||
const { user, server } = jidDecoded
|
||||
const isGroup = server === 'g.us'
|
||||
const isStatus = jid === statusJid
|
||||
const isLid = server === 'lid'
|
||||
@@ -910,7 +921,9 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
additionalAttributes = { ...additionalAttributes, device_fanout: 'false' }
|
||||
}
|
||||
|
||||
const { user, device } = jidDecode(participant.jid)!
|
||||
const participantDecoded = jidDecode(participant.jid)
|
||||
if (!participantDecoded) throw new Boom('Invalid participant JID')
|
||||
const { user, device } = participantDecoded
|
||||
devices.push({
|
||||
user,
|
||||
device,
|
||||
@@ -1068,7 +1081,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
logger.debug({ to: jid, ownId }, 'Using PN identity for @s.whatsapp.net conversation')
|
||||
}
|
||||
|
||||
const { user: ownUser } = jidDecode(ownId)!
|
||||
const ownUser = jidDecode(ownId)?.user ?? ''
|
||||
if (!participant) {
|
||||
const patchedForReporting = await patchMessageBeforeSending(message, [jid])
|
||||
reportingMessage = Array.isArray(patchedForReporting)
|
||||
@@ -1086,7 +1099,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
|
||||
if (user !== ownUser) {
|
||||
const ownUserServer = isLid ? 'lid' : 's.whatsapp.net'
|
||||
const ownUserForAddressing = isLid && meLid ? jidDecode(meLid)!.user : jidDecode(meId)!.user
|
||||
const ownUserForAddressing = isLid && meLid ? (jidDecode(meLid)?.user ?? '') : (jidDecode(meId)?.user ?? '')
|
||||
|
||||
devices.push({
|
||||
user: ownUserForAddressing,
|
||||
@@ -1102,8 +1115,8 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
// Use conversation-appropriate sender identity
|
||||
const senderIdentity =
|
||||
isLid && meLid
|
||||
? jidEncode(jidDecode(meLid)?.user!, 'lid', undefined)
|
||||
: jidEncode(jidDecode(meId)?.user!, 's.whatsapp.net', undefined)
|
||||
? jidEncode(jidDecode(meLid)?.user ?? '', 'lid', undefined)
|
||||
: jidEncode(jidDecode(meId)?.user ?? '', 's.whatsapp.net', undefined)
|
||||
|
||||
// Enumerate devices for sender and target with consistent addressing
|
||||
const sessionDevices = await getUSyncDevices([senderIdentity, jid], true, false)
|
||||
@@ -1122,8 +1135,8 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
const allRecipients: string[] = []
|
||||
const meRecipients: string[] = []
|
||||
const otherRecipients: string[] = []
|
||||
const { user: mePnUser } = jidDecode(meId)!
|
||||
const { user: meLidUser } = meLid ? jidDecode(meLid)! : { user: null }
|
||||
const mePnUser = jidDecode(meId)?.user ?? ''
|
||||
const meLidUser = meLid ? (jidDecode(meLid)?.user ?? null) : null
|
||||
|
||||
// Carousel in DSM wrapper causes error 479 on own devices
|
||||
const isCarouselMsg = isCarouselMessage(message)
|
||||
@@ -1172,10 +1185,11 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
if (isRetryResend) {
|
||||
if (!participant) throw new Boom('Missing participant for retry resend')
|
||||
// Only check for regular LID users, NOT hosted LID users
|
||||
// Hosted LID users should use meId for comparison, not meLid
|
||||
const isParticipantLid = isLidUser(participant!.jid)
|
||||
const isMe = areJidsSameUser(participant!.jid, isParticipantLid ? meLid : meId)
|
||||
const isParticipantLid = isLidUser(participant.jid)
|
||||
const isMe = areJidsSameUser(participant.jid, isParticipantLid ? meLid : meId)
|
||||
|
||||
// Skip DSM for carousel - own devices reject it with error 479
|
||||
const usesDSM = isMe && !isCarouselMessage(message)
|
||||
@@ -1190,7 +1204,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
|
||||
const { type, ciphertext: encryptedContent } = await signalRepository.encryptMessage({
|
||||
data: encodedMessageToSend,
|
||||
jid: participant!.jid
|
||||
jid: participant.jid
|
||||
})
|
||||
|
||||
binaryNodeContent.push({
|
||||
|
||||
Reference in New Issue
Block a user