Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(messages): drop queued echoes after retirement

Yudhi Armyndharis9ba811d9c6cf
diff --git a/src/modules/session/message-projector.service.ts b/src/modules/session/message-projector.service.ts
index fe38f475d..9cd06e232 100644
--- a/src/modules/session/message-projector.service.ts
+++ b/src/modules/session/message-projector.service.ts
@@ -1396,6 +1396,7 @@ export class MessageProjector {
}
}
+ if (!this.engines.isLive(id, engine)) return;
const sent = this.withChangesMadeInFlight(finalMessage, entry, rowMarked);
if (!sent) return;
void this.webhookService.dispatch(id, 'message.sent', sent);
diff --git a/src/modules/session/message-projector.tombstone-identity.spec.ts b/src/modules/session/message-projector.tombstone-identity.spec.ts
index 061385ac2..52f8d38ca 100644
--- a/src/modules/session/message-projector.tombstone-identity.spec.ts
+++ b/src/modules/session/message-projector.tombstone-identity.spec.ts
@@ -1042,6 +1042,28 @@ describe('reported identities before a tombstone delivery reaches its hooks', ()
},
);
+ it('drops a duplicate retired while waiting for its edited mark', async () => {
+ await repository.insert({
+ sessionId: 's1',
+ waMessageId: 'A',
+ chatId: PHONE,
+ from: SELF,
+ to: PHONE,
+ direction: MessageDirection.OUTGOING,
+ body: 'content',
+ type: 'text',
+ timestamp: 1_700_000_000,
+ });
+ const gate = deferred<void>();
+ projector.enqueueMessageMutation('s1', 'A', () => gate.promise);
+ deliver(incoming('A', PHONE, true));
+ await flush();
+ expect(sent).toEqual([]);
+ engines.delete('s1');
+ gate.resolve();
+ await flush();
+ expect({ sent, dispatched, emitted }).toEqual({ sent: [], dispatched: [], emitted: [] });
+ });
it.each([false, true])('runs admitted hooks with a stored tombstone cleared, own=%s', async own => {
await tombstone(PHONE, own);
const ticket = projector.admitInbound('s1', engine, {