Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(session): ignore a presence publish from a replaced engine

Yudhi Armyndharis4f0767e4e162
diff --git a/src/modules/session/session.service.spec.ts b/src/modules/session/session.service.spec.ts
index 6a5baf408..d090be673 100644
--- a/src/modules/session/session.service.spec.ts
+++ b/src/modules/session/session.service.spec.ts
@@ -7763,6 +7763,36 @@ describe('SessionService', () => {
expect(await service.getPresence('sess-uuid-1', '[email protected]')).toBeNull();
});
+ it('does not replay a presence publish that settles after its engine was replaced', async () => {
+ await startAndCaptureCallbacks();
+ let finishPublish: () => void = () => undefined;
+ mockEngine.setOnlinePresence.mockImplementationOnce(
+ () =>
+ new Promise<void>(resolve => {
+ finishPublish = resolve;
+ }),
+ );
+ const publishing = service.setOnlinePresence('sess-uuid-1', false);
+ await flush();
+ await service.stop('sess-uuid-1');
+ const replacement = {
+ ...mockEngine,
+ initialize: jest.fn().mockResolvedValue(undefined),
+ setOnlinePresence: jest.fn().mockResolvedValue(undefined),
+ };
+ (engineFactory.create as jest.Mock).mockReturnValue(replacement);
+ await service.start('sess-uuid-1', { explicit: true });
+ await service.setOnlinePresence('sess-uuid-1', true);
+ finishPublish();
+ await publishing;
+ replacement.setOnlinePresence.mockClear();
+ const callbacks = (replacement.initialize.mock.calls as [EngineEventCallbacks][])[0][0];
+ callbacks.onReady!('628123', 'Alice');
+ await flush();
+ expect(replacement.setOnlinePresence).toHaveBeenCalledTimes(1);
+ expect(replacement.setOnlinePresence).toHaveBeenCalledWith(true);
+ });
+
it('does not publish own presence on ready when the caller never set one', async () => {
const callbacks = await startAndCaptureCallbacks();
mockEngine.setOnlinePresence.mockClear();
diff --git a/src/modules/session/session.service.ts b/src/modules/session/session.service.ts
index 58a5134c9..dac1ef2ab 100644
--- a/src/modules/session/session.service.ts
+++ b/src/modules/session/session.service.ts
@@ -1418,7 +1418,8 @@ export class SessionService implements OnModuleDestroy, OnModuleInit, OnApplicat
await this.findOne(id);
const engine = this.requireEngine(id);
await engine.setOnlinePresence(available);
- this.presence.setOwnIntent(id, available);
+ // A publish that settles after its engine was replaced must not leave a preference the replacement never had.
+ if (this.engines.isLive(id, engine)) this.presence.setOwnIntent(id, available);
}
/**