@cap-js-community/event-queue 1.5.0 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js-community/event-queue",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "An event queue that enables secure transactional processing of asynchronous and periodic events, featuring instant event processing with Redis Pub/Sub and load distribution across all application instances.",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/dbHandler.js

@@ -2,7 +2,7 @@
 
 const cds = require("@sap/cds");
 
-const { broadcastEvent } = require("./redis/redisPub");
+const redisPub = require("./redis/redisPub");
 const config = require("./config");
 
 const COMPONENT_NAME = "/eventQueue/dbHandler";
@@ -25,7 +25,7 @@ const registerEventQueueDbHandler = (dbService) => {
     req.tx._ = req.tx._ ?? {};
     req.tx._.eventQueuePublishEvents = req.tx._.eventQueuePublishEvents ?? {};
     const eventQueuePublishEvents = req.tx._.eventQueuePublishEvents;
-    const data = Array.isArray(req.data) ? req.data : [req.data];
+    const data = Array.isArray(req.query.INSERT.entries) ? req.query.INSERT.entries : [req.query.INSERT.entries];
     const eventCombinations = Object.keys(
       data.reduce((result, event) => {
         const key = [event.type, event.subType].join("##");
@@ -45,7 +45,7 @@ const registerEventQueueDbHandler = (dbService) => {
           return { type, subType };
         });
 
-        broadcastEvent(req.tenant, events).catch((err) => {
+        redisPub.broadcastEvent(req.tenant, events).catch((err) => {
           cds.log(COMPONENT_NAME).error("db handler failure during broadcasting event", err, {
             tenant: req.tenant,
             events,

package/src/shared/eventScheduler.js

@@ -28,7 +28,8 @@ class EventScheduler {
       delaySeconds: (date.getTime() - Date.now()) / 1000,
     });
     this.#eventsByTenants[tenantId] ??= {};
-    const timeoutId = setTimeout(() => {
+    let timeoutId;
+    const timeout = setTimeout(() => {
       delete this.#eventsByTenants[tenantId][timeoutId];
       delete this.#scheduledEvents[key];
       redisPub.broadcastEvent(tenantId, { type, subType }).catch((err) => {
@@ -40,6 +41,10 @@ class EventScheduler {
         });
       });
     }, relative).unref();
+    // Convert the timeout object to a primitive timeout id to avoid circular dependencies between the callback of setTimeout
+    // and the closure. The usage of the timeout object in the callback, leads to a deadlock for the garbage collector
+    // as the timeout object has a reference to the callback of setTimeout.
+    timeoutId = String(timeout);
     this.#eventsByTenants[tenantId][timeoutId] = true;
   }