From ed1499b349b2e8c003419eebc11124d9e644bc3d Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 24 May 2024 17:08:57 +0200
Subject: [PATCH] events-backend: fix event bus notify timeout

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../events-backend/src/service/hub/createEventBusRouter.ts  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/events-backend/src/service/hub/createEventBusRouter.ts b/plugins/events-backend/src/service/hub/createEventBusRouter.ts
index 84d04a00fb..14237650fc 100644
--- a/plugins/events-backend/src/service/hub/createEventBusRouter.ts
+++ b/plugins/events-backend/src/service/hub/createEventBusRouter.ts
@@ -141,6 +141,11 @@ export async function createEventBusRouter(options: {
         notify(204);
         controller.abort();
       }, notifyTimeoutMs);
+      shouldNotifyPromise.then(shouldNotify => {
+        if (!shouldNotify) {
+          clearTimeout(timeout);
+        }
+      });
 
       try {
         const { events } = await store.readSubscription(id);
@@ -156,7 +161,6 @@ export async function createEventBusRouter(options: {
           resolveShouldNotify!(true);
         }
       } finally {
-        clearTimeout(timeout);
         resolveShouldNotify!(false);
       }
     },