Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(baileys): check a retry from an unmapped lid against Baileys' map

Yudhi Armyndharisc48fc68d917f
diff --git a/src/engine/adapters/baileys-lifecycle.ts b/src/engine/adapters/baileys-lifecycle.ts
index f28ee79ad..1249499a6 100644
--- a/src/engine/adapters/baileys-lifecycle.ts
+++ b/src/engine/adapters/baileys-lifecycle.ts
@@ -384,11 +384,25 @@ export class BaileysLifecycle {
return undefined;
}
const stored = await this.host.config.messageStore?.getMessage(this.host.config.dbSessionId, key.id);
+ if (!stored) {
+ return undefined;
+ }
const neutral = (jid: string): string => this.host.toNeutralJid(jid);
- if (stored && differentWaIds([stored.key.remoteJid, stored.key.remoteJidAlt], [key.remoteJid], neutral)) {
+ const chat = [stored.key.remoteJid, stored.key.remoteJidAlt];
+ if (differentWaIds(chat, [key.remoteJid], neutral)) {
return undefined;
}
- return stored?.message ?? undefined;
+ // A lid the session cannot map cannot be compared with a phone-number chat, so ask Baileys'
+ // own mapping (a local store read) for its phone number too. When neither knows it, the retry
+ // is still answered: refusing then would leave a real recipient waiting for good.
+ const lid = key.remoteJid;
+ if (lid?.endsWith('@lid') && neutral(lid).endsWith('@lid')) {
+ const pn = await this.sock?.signalRepository?.lidMapping?.getPNForLID(lid).catch(() => null);
+ if (pn && differentWaIds(chat, [pn], neutral)) {
+ return undefined;
+ }
+ }
+ return stored.message ?? undefined;
},
logger: baileysLogger,
});
diff --git a/src/engine/adapters/baileys.adapter.spec.ts b/src/engine/adapters/baileys.adapter.spec.ts
index 2f03e49eb..c557ddfc4 100644
--- a/src/engine/adapters/baileys.adapter.spec.ts
+++ b/src/engine/adapters/baileys.adapter.spec.ts
@@ -82,7 +82,7 @@ class FakeSock extends EventEmitter {
creds: { accountSyncCounter: 0 },
keys: { set: jest.fn().mockResolvedValue(undefined) },
};
- public signalRepository: { lidMapping: { getLIDForPN: jest.Mock } } | undefined;
+ public signalRepository: { lidMapping: { getLIDForPN: jest.Mock; getPNForLID?: jest.Mock } } | undefined;
fire(event: string, arg: unknown): void {
this.emitter.emit(event, arg);
}
@@ -292,6 +292,36 @@ describe('BaileysAdapter lifecycle & status', () => {
await expect(getMessage({ remoteJid: '99887766@lid', id: 'M1' })).resolves.toBe(content);
});
+ it("compares a retry from a lid the session cannot map through Baileys' own lid mapping", async () => {
+ await newAdapter().initialize(noopCallbacks({}));
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+ const makeWASocket = jest.requireMock('@whiskeysockets/baileys').default as jest.Mock;
+ const [[{ getMessage }]] = makeWASocket.mock.calls as Array<
+ [{ getMessage: (key: { remoteJid?: string; id?: string }) => Promise<unknown> }]
+ >;
+ const content = { conversation: 'hi' };
+ fakeStore.getMessage.mockResolvedValue({
+ key: { remoteJid: '[email protected]', fromMe: true, id: 'M1' },
+ message: content,
+ });
+ // Baileys answers with a device-qualified phone jid, or null when it has no mapping either.
+ const known: Record<string, string> = {
+ '99887766': '628222:[email protected]',
+ '11223344': '628111:[email protected]',
+ };
+ const getPNForLID = jest.fn((lid: string) => Promise.resolve(known[lid.split(/[:@]/)[0]] ?? null));
+ fakeSock.signalRepository = { lidMapping: { getLIDForPN: jest.fn(), getPNForLID } };
+ try {
+ await expect(getMessage({ remoteJid: '99887766:3@lid', id: 'M1' })).resolves.toBeUndefined();
+ expect(getPNForLID).toHaveBeenCalledWith('99887766:3@lid');
+ await expect(getMessage({ remoteJid: '11223344@lid', id: 'M1' })).resolves.toBe(content);
+ // Neither the session nor Baileys can map it: it may be the same chat, so it is still answered.
+ await expect(getMessage({ remoteJid: '55667788@lid', id: 'M1' })).resolves.toBe(content);
+ } finally {
+ fakeSock.signalRepository = undefined;
+ }
+ });
+
it('on a logged-out close: DISCONNECTED, onDisconnected, and NO reconnect', async () => {
const rmSpy = jest.spyOn(fs.promises, 'rm').mockResolvedValue(undefined);
try {