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:
+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')
|
||||
|
||||
Reference in New Issue
Block a user