Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(wwebjs): keep the credentials after the event-bridge reload
Yudhi Armyndharisda1be1930e6f
diff --git a/src/engine/adapters/whatsapp-web-js.adapter.spec.ts b/src/engine/adapters/whatsapp-web-js.adapter.spec.tsindex a552645a8..22ed71fee 100644--- a/src/engine/adapters/whatsapp-web-js.adapter.spec.ts+++ b/src/engine/adapters/whatsapp-web-js.adapter.spec.ts@@ -1996,6 +1996,37 @@ describe('WhatsAppWebJsAdapter ready reconciliation (#251/#273)', () => {expect(jest.getTimerCount()).toBe(0);});+ // The reload only follows a probe that saw CONNECTED, but the page it reboots reports OPENING+ // while its socket comes back. That reading is caused by the reload, not by broken credentials.+ it('keeps the credentials when the page the bridge reload rebooted is not yet connected at the deadline', async () => {+ jest.useFakeTimers();++ const adapter = newAdapter();+ const getState = jest.fn().mockResolvedValue(WAState.CONNECTED);+ const reload = jest.fn().mockImplementation(() => {+ getState.mockResolvedValue(WAState.OPENING);+ return Promise.resolve(undefined);+ });+ const { client, onReady, onStateChanged } = attachFakeClient(adapter, {+ eventsAttached: false,+ getState,+ pupPage: { evaluate: jest.fn().mockResolvedValue(true), reload },+ });+ const onError = jest.fn();+ (adapter as unknown as { callbacks: unknown }).callbacks = { onReady, onStateChanged, onError };+ // The deadline's non-bridge branch: it deletes the LocalAuth profile and forces a re-pair.+ const recoverFromStuckAuth = jest.fn().mockResolvedValue(undefined);+ (adapter as unknown as { recoverFromStuckAuth: unknown }).recoverFromStuckAuth = recoverFromStuckAuth;++ client.emit('authenticated');+ await jest.advanceTimersByTimeAsync(91_000);++ expect(reload).toHaveBeenCalledTimes(1);+ expect(recoverFromStuckAuth).not.toHaveBeenCalled();+ expect(adapter.getStatus()).toBe(EngineStatus.FAILED);+ expect(onError).toHaveBeenCalledWith(expect.stringContaining('event bridge'));+ });+it('ignores a premature ready emitted before the bridge attached, then promotes on the real one', () => {jest.useFakeTimers();diff --git a/src/engine/adapters/wwebjs-reconcile.ts b/src/engine/adapters/wwebjs-reconcile.tsindex c78f3ea38..a1a1b5efa 100644--- a/src/engine/adapters/wwebjs-reconcile.ts+++ b/src/engine/adapters/wwebjs-reconcile.ts@@ -66,8 +66,10 @@ export class WwebjsReadyReconcile {// different animal from a stuck-after-QR session: the link and the credentials are fine,// only this browser instance is broken. Wiping the only copy of the credentials would trade// a restart-fixable fault for a forced re-pair — fail loudly and keep the auth instead.+ // A reload attempt counts as proof of CONNECTED: it only follows a CONNECTED probe, and the+ // page it reboots can report OPENING on every probe until the deadline.const bridgeDead =- this.lastProbeStateConnected &&+ (this.lastProbeStateConnected || this.readyReconcileReloadAttempted) &&(this.host.getClient() as Client & { eventsAttached?: boolean })?.eventsAttached === false;if (bridgeDead) {this.host.logger.error(