NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2026-01-11 06:12:19 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: normalize remoteJid in message updates and handle race condition in contact cache

Browse Source
This commit is contained in:
Vitordotpy
2025-12-16 11:00:11 -03:00
parent f46699ef3f
commit 52a8d9ea71
2 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
View File

@@ -1565,8 +1565,15 @@ export class BaileysStartupService extends ChannelStartupService {
for await (const { key, update } of args) {
const keyAny = key as any;
const normalizedRemoteJid = keyAny.remoteJid?.replace(/:.*$/, '');
const normalizedParticipant = keyAny.participant?.replace(/:.*$/, '');
if (keyAny.remoteJid) {
keyAny.remoteJid = keyAny.remoteJid.replace(/:.*$/, '');
}
if (keyAny.participant) {
keyAny.participant = keyAny.participant.replace(/:.*$/, '');
}
const normalizedRemoteJid = keyAny.remoteJid;
const normalizedParticipant = keyAny.participant;
if (settings?.groupsIgnore && normalizedRemoteJid?.includes('@g.us')) {
continue;
@@ -1644,18 +1651,38 @@ export class BaileysStartupService extends ChannelStartupService {
const searchId = originalMessageId || key.id;
const messages = (await this.prismaRepository.$queryRaw`
SELECT * FROM "Message"
WHERE "instanceId" = ${this.instanceId}
AND "key"->>'id' = ${searchId}
LIMIT 1
`) as any[];
findMessage = messages[0] || null;
let retries = 0;
const maxRetries = 3;
while (retries < maxRetries) {
const messages = (await this.prismaRepository.$queryRaw`
SELECT * FROM "Message"
WHERE "instanceId" = ${this.instanceId}
AND "key"->>'id' = ${searchId}
LIMIT 1
`) as any[];
findMessage = messages[0] || null;
if (findMessage?.id) {
break;
}
retries++;
if (retries < maxRetries) {
await delay(2000);
}
}
if (!findMessage?.id) {
this.logger.warn(`Original message not found for update. Skipping. Key: ${JSON.stringify(key)}`);
continue;
}
if (findMessage?.key?.remoteJid && findMessage.key.remoteJid !== key.remoteJid) {
this.logger.verbose(
`Updating key.remoteJid from ${key.remoteJid} to ${findMessage.key.remoteJid} based on stored message`,
);
key.remoteJid = findMessage.key.remoteJid;
}
message.messageId = findMessage.id;
}