Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
refactor(baileys): drop the unreachable open-duration reconnect reset
Yudhi Armyndharis60e7ac685177
diff --git a/src/engine/adapters/baileys-lifecycle.ts b/src/engine/adapters/baileys-lifecycle.tsindex bc80d2b69..48ecc7197 100644--- a/src/engine/adapters/baileys-lifecycle.ts+++ b/src/engine/adapters/baileys-lifecycle.ts@@ -177,9 +177,8 @@ export interface BaileysLifecycleHost {}export class BaileysLifecycle {- /** A connection that stayed open this long, or a close this long after the previous close, means the- * connection had been healthy: the backoff counter restarts from scratch instead of inheriting an- * old incident's attempts. */+ /** A close more than this long after the previous close means the connection had been healthy in+ * between: the backoff counter restarts from scratch instead of inheriting an old incident's attempts. */private static readonly RECONNECT_STABILITY_RESET_MS = 5 * 60_000;/** How long a first link's history sync must stay silent before the address-book pull runs. */private static readonly ADDRESSBOOK_QUIET_MS = 20_000;@@ -202,8 +201,6 @@ export class BaileysLifecycle {private addressbookTimer?: ReturnType<typeof setTimeout>;/** Date.now() of the last close that scheduled a reconnect — input to the stability reset. */private lastConnectionCloseAt = 0;- /** Date.now() of the last 'open' not yet followed by a close, or 0: how long the connection stayed up. */- private lastOpenAt = 0;/** Lazily loaded @whiskeysockets/baileys module (ESM-only; loaded on first connect, not at boot). */private lib?: typeof BaileysLib;/** The session proxy's fetch dispatcher, built once: the proxy URL is fixed for the adapter's life. */@@ -613,9 +610,8 @@ export class BaileysLifecycle {this.host.addLidMappings([{ lid: `${userPart(me.lid)}@lid`, pn: `${userPart(me.id)}@s.whatsapp.net` }]);}// The reconnect counter is not reset here: a connection that drops seconds after the handshake- // would otherwise redial at attempt 1 forever. The close branch resets it once the connection- // has stayed up for the stability window.- this.lastOpenAt = Date.now();+ // would otherwise redial at attempt 1 forever. The close branch resets it once more than the+ // stability window passes between drops.this.setStatus(EngineStatus.READY);this.host.getOnReady()?.(this.phoneNumber ?? '', this.pushName ?? '');// WhatsApp only PUSHES a timelock when it changes, so a gateway that starts (or reconnects)@@ -703,22 +699,16 @@ export class BaileysLifecycle {return;}- // Stability reset: a connection that stayed open for the stability window, or a close that long- // after the previous one, means the connection had been healthy, so the backoff starts fresh- // instead of inheriting the old counter. One that drops sooner keeps climbing it, so a link- // that fails right after each handshake backs off instead of redialing every second or two.+ // Stability reset: a close more than 5 minutes after the previous one means the connection had+ // been healthy in between, so the backoff starts fresh instead of inheriting the old counter. A+ // drop sooner than that keeps climbing it, so a link that fails right after each handshake backs+ // off instead of redialing every second or two.// A QR window that ran out resets it too: WhatsApp answered, and a QR left unscanned for hours// must not add up to a reconnect loop.const now = Date.now();- const stayedOpen = this.lastOpenAt > 0 && now - this.lastOpenAt >= BaileysLifecycle.RECONNECT_STABILITY_RESET_MS;- if (- qrWindowEnded ||- stayedOpen ||- now - this.lastConnectionCloseAt > BaileysLifecycle.RECONNECT_STABILITY_RESET_MS- ) {+ if (qrWindowEnded || now - this.lastConnectionCloseAt > BaileysLifecycle.RECONNECT_STABILITY_RESET_MS) {this.reconnectAttempts = 0;}- this.lastOpenAt = 0;this.lastConnectionCloseAt = now;this.scheduleReconnect(!qrWindowEnded);}diff --git a/src/engine/adapters/baileys.adapter.spec.ts b/src/engine/adapters/baileys.adapter.spec.tsindex ff5ab3f77..73566fcaf 100644--- a/src/engine/adapters/baileys.adapter.spec.ts+++ b/src/engine/adapters/baileys.adapter.spec.ts@@ -1059,7 +1059,7 @@ describe('BaileysAdapter reconnect policy — unlimited backoff (I4 hardening)',expect(baileys().default).toHaveBeenCalledTimes(3);});- it('a connection that stayed open past the stability window restarts the backoff at attempt 1', async () => {+ it('a drop more than 5 minutes after the previous drop restarts a climbed backoff at attempt 1', async () => {const onReconnecting = jest.fn();await initWithRealTimers({ onReconnecting });jest.useFakeTimers();@@ -1072,7 +1072,8 @@ describe('BaileysAdapter reconnect policy — unlimited backoff (I4 hardening)',await jest.advanceTimersByTimeAsync(2_000);fakeSock.fire('connection.update', { connection: 'open' });- // Up for the whole window, then dropped: a fresh incident, so attempt 1 (1 s), not attempt 3.+ // The opens in between do not reset the counter, but a drop more than 5 minutes after the+ // previous one is a fresh incident: attempt 1 (1 s), not attempt 3.jest.setSystemTime(Date.now() + 5 * 60_000);fireRecoverableClose();expect(onReconnecting).toHaveBeenLastCalledWith(1, 1_000);