Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(session): let a retiring control proceed past a failed status write

Yudhi Armyndharis22051b79b9c9
diff --git a/src/modules/session/session-lifecycle-fences.spec.ts b/src/modules/session/session-lifecycle-fences.spec.ts
index 02eb5f39f..b213f56db 100644
--- a/src/modules/session/session-lifecycle-fences.spec.ts
+++ b/src/modules/session/session-lifecycle-fences.spec.ts
@@ -152,6 +152,23 @@ describe('SessionLifecycleFences', () => {
await waiting;
expect(settled).toBe(true);
});
+
+ it('proceeds when the write rejects, without leaving its deadline timer armed', async () => {
+ // A rejected write has settled, which is all the fence waits for; start() reports the failure.
+ jest.useFakeTimers();
+ try {
+ const { fences, pendingInitialStatuses } = makeFences();
+ const engineA = engine();
+ const failed = Promise.reject(new Error('db down'));
+ failed.catch(() => undefined);
+ pendingInitialStatuses.set('s1', { engine: engineA, promise: failed });
+
+ await expect(fences.awaitInitialStatus('s1', engineA)).resolves.toBeUndefined();
+ expect(jest.getTimerCount()).toBe(0);
+ } finally {
+ jest.useRealTimers();
+ }
+ });
});
describe('evictAndForceDestroy', () => {
diff --git a/src/modules/session/session-lifecycle-fences.ts b/src/modules/session/session-lifecycle-fences.ts
index f9057bb0c..556cfc54e 100644
--- a/src/modules/session/session-lifecycle-fences.ts
+++ b/src/modules/session/session-lifecycle-fences.ts
@@ -186,8 +186,10 @@ export class SessionLifecycleFences {
if (!pending || pending.engine !== engine) return;
let timer: ReturnType<typeof setTimeout> | undefined;
+ // A rejected write has settled too, and start()'s catch owns reporting it: the retiring control
+ // must still reach its teardown and final write.
const settled = await Promise.race([
- pending.promise.then(() => true),
+ pending.promise.catch(() => undefined).then(() => true),
new Promise<boolean>(resolve => {
timer = setTimeout(() => resolve(false), 10_000);
}),