Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b69ecc004d | |||
| 5351dce3a5 |
+5
-4
@@ -1060,21 +1060,22 @@ export const makeChatsSocket = (config: SocketConfig) => {
|
||||
}
|
||||
}
|
||||
|
||||
/** fetch AB props */
|
||||
/** sending non-abt props may fix QR scan fail if server expects */
|
||||
const fetchProps = async () => {
|
||||
//TODO: implement both protocol 1 and protocol 2 prop fetching, specially for abKey for WM
|
||||
const resultNode = await query({
|
||||
tag: 'iq',
|
||||
attrs: {
|
||||
to: S_WHATSAPP_NET,
|
||||
xmlns: 'abt',
|
||||
xmlns: 'w',
|
||||
type: 'get'
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'props',
|
||||
attrs: {
|
||||
protocol: '1',
|
||||
...(authState?.creds?.lastPropHash ? { hash: authState.creds.lastPropHash } : {})
|
||||
protocol: '2',
|
||||
hash: authState?.creds?.lastPropHash || ''
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
+17
-34
@@ -2124,6 +2124,12 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
if (resolvedRemoteJid) key.remoteJid = resolvedRemoteJid
|
||||
if (resolvedParticipant) key.participant = resolvedParticipant
|
||||
|
||||
if (shouldIgnoreJid(remoteJid!) && remoteJid !== S_WHATSAPP_NET) {
|
||||
logger.trace({ remoteJid }, 'ignoring receipt from jid')
|
||||
await sendMessageAck(node)
|
||||
return
|
||||
}
|
||||
|
||||
const ids = [attrs.id!]
|
||||
if (Array.isArray(content)) {
|
||||
const items = getBinaryNodeChildren(content[0], 'item')
|
||||
@@ -2199,6 +2205,11 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
const handleNotification = async (node: BinaryNode) => {
|
||||
const remoteJid = node.attrs.from
|
||||
if (shouldIgnoreJid(remoteJid!) && remoteJid !== S_WHATSAPP_NET) {
|
||||
logger.trace({ remoteJid }, 'ignored notification')
|
||||
await sendMessageAck(node)
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
await Promise.all([
|
||||
@@ -2235,6 +2246,12 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
const handleMessage = async (node: BinaryNode) => {
|
||||
if (shouldIgnoreJid(node.attrs.from!) && node.attrs.from !== S_WHATSAPP_NET) {
|
||||
logger.trace({ from: node.attrs.from }, 'ignored message')
|
||||
await sendMessageAck(node)
|
||||
return
|
||||
}
|
||||
|
||||
const encNode = getBinaryNodeChild(node, 'enc')
|
||||
const unavailableNode = getBinaryNodeChild(node, 'unavailable')
|
||||
|
||||
@@ -3088,40 +3105,6 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
identifier: string,
|
||||
exec: (node: BinaryNode) => Promise<void>
|
||||
) => {
|
||||
// Fast path: ack and drop ignored JIDs before entering the buffer/queue.
|
||||
// Skips type='call' so call events are never silently dropped via
|
||||
// shouldIgnoreJid (preserves InfiniteAPI's pre-existing behavior).
|
||||
// Wrapped in try/catch so a throw from shouldIgnoreJid (user callback)
|
||||
// or sendMessageAck (e.g. websocket closed) is routed through
|
||||
// onUnexpectedError instead of becoming an unhandled rejection —
|
||||
// matches the protection processNodeWithBuffer provides.
|
||||
if (type !== 'call') {
|
||||
try {
|
||||
const from = node.attrs.from
|
||||
let ignoreJid = from
|
||||
if (type === 'receipt' && from) {
|
||||
const attrs = node.attrs
|
||||
const isLid = attrs.from!.includes('lid')
|
||||
const isNodeFromMe = areJidsSameUser(
|
||||
attrs.participant || attrs.from,
|
||||
isLid ? authState.creds.me?.lid : authState.creds.me?.id
|
||||
)
|
||||
ignoreJid = !isNodeFromMe || isJidGroup(attrs.from) ? attrs.from : attrs.recipient
|
||||
}
|
||||
|
||||
if (ignoreJid && ignoreJid !== S_WHATSAPP_NET && shouldIgnoreJid(ignoreJid)) {
|
||||
// Plain ack (no NACK error code) preserves InfiniteAPI's prior
|
||||
// behavior — ignored stanzas are an intentional drop, not a
|
||||
// processing failure, so we don't want server-side retries.
|
||||
await sendMessageAck(node)
|
||||
return
|
||||
}
|
||||
} catch (error) {
|
||||
onUnexpectedError(error as Error, identifier)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
const isOffline = !!node.attrs.offline
|
||||
|
||||
if (isOffline) {
|
||||
|
||||
Reference in New Issue
Block a user