franpcode/Baileys
1
0
Fork 0
mirror of https://github.com/FranP-code/Baileys.git synced 2025-10-13 00:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: handle failed msgs

Browse Source
This commit is contained in:
Adhiraj Singh
2023-03-09 16:12:40 +05:30
parent bbe9b3c3f5
commit a4ecac788c
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Socket/messages-recv.ts
View File

@@ -2,7 +2,7 @@
import NodeCache from 'node-cache' import NodeCache from 'node-cache'
import { proto } from '../../WAProto' import { proto } from '../../WAProto'
import { DEFAULT_CACHE_TTLS, KEY_BUNDLE_TYPE, MIN_PREKEY_COUNT } from '../Defaults' import { DEFAULT_CACHE_TTLS, KEY_BUNDLE_TYPE, MIN_PREKEY_COUNT } from '../Defaults'
import { MessageReceiptType, MessageRelayOptions, MessageUserReceipt, SocketConfig, WACallEvent, WAMessageKey, WAMessageStubType, WAPatchName } from '../Types' import { MessageReceiptType, MessageRelayOptions, MessageUserReceipt, SocketConfig, WACallEvent, WAMessageKey, WAMessageStatus, WAMessageStubType, WAPatchName } from '../Types'
import { decodeMediaRetryNode, decryptMessageNode, delay, encodeBigEndian, encodeSignedDeviceIdentity, getCallStatusFromNode, getHistoryMsg, getNextPreKeys, getStatusFromReceiptType, unixTimestampSeconds, xmppPreKey, xmppSignedPreKey } from '../Utils' import { decodeMediaRetryNode, decryptMessageNode, delay, encodeBigEndian, encodeSignedDeviceIdentity, getCallStatusFromNode, getHistoryMsg, getNextPreKeys, getStatusFromReceiptType, unixTimestampSeconds, xmppPreKey, xmppSignedPreKey } from '../Utils'
import { makeMutex } from '../Utils/make-mutex' import { makeMutex } from '../Utils/make-mutex'
import { cleanMessage } from '../Utils/process-message' import { cleanMessage } from '../Utils/process-message'
@@ -648,12 +648,12 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
} }
const handleBadAck = async({ attrs }: BinaryNode) => { const handleBadAck = async({ attrs }: BinaryNode) => {
const key: WAMessageKey = { remoteJid: attrs.from, fromMe: true, id: attrs.id }
// current hypothesis is that if pash is sent in the ack // current hypothesis is that if pash is sent in the ack
// it means -- the message hasn't reached all devices yet // it means -- the message hasn't reached all devices yet
// we'll retry sending the message here // we'll retry sending the message here
if(attrs.phash) { if(attrs.phash) {
logger.info({ attrs }, 'received phash in ack, resending message...') logger.info({ attrs }, 'received phash in ack, resending message...')
const key: WAMessageKey = { remoteJid: attrs.from, fromMe: true, id: attrs.id }
const msg = await getMessage(key) const msg = await getMessage(key)
if(msg) { if(msg) {
await relayMessage(key.remoteJid!, msg, { messageId: key.id!, useUserDevicesCache: false }) await relayMessage(key.remoteJid!, msg, { messageId: key.id!, useUserDevicesCache: false })
@@ -661,14 +661,34 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
logger.warn({ attrs }, 'could not send message again, as it was not found') logger.warn({ attrs }, 'could not send message again, as it was not found')
} }
} }
// error in acknowledgement,
// device could not display the message
if(attrs.error) {
logger.warn({ attrs }, 'received error in ack')
ev.emit(
'messages.update',
[
{
key,
update: {
status: WAMessageStatus.ERROR,
messageStubParameters: [
attrs.error
]
}
}
]
)
}
} }
/// processes a node with the given function /// processes a node with the given function
/// and adds the task to the existing buffer if we're buffering events /// and adds the task to the existing buffer if we're buffering events
const processNodeWithBuffer = async( const processNodeWithBuffer = async<T>(
node: BinaryNode, node: BinaryNode,
identifier: string, identifier: string,
exec: (node: BinaryNode) => Promise<any> exec: (node: BinaryNode) => Promise<T>
) => { ) => {
ev.buffer() ev.buffer()
await execTask() await execTask()