@cap-js-community/event-queue 1.3.1 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js-community/event-queue",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "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",
   "files": [
@@ -44,7 +44,7 @@
   "dependencies": {
     "redis": "4.6.13",
     "verror": "1.10.1",
-    "yaml": "2.3.4"
+    "yaml": "2.4.0"
   },
   "devDependencies": {
     "@cap-js/hana": "^0.0.5",

package/src/initialize.js

@@ -84,21 +84,19 @@ const initialize = async ({
   );
 
   const logger = cds.log(COMPONENT);
-  config.fileContent = await readConfigFromFile(config.configFilePath);
   config.checkRedisEnabled();
+  cds.on("connect", (service) => {
+    if (service.name === "db") {
+      config.processEventsAfterPublish && dbHandler.registerEventQueueDbHandler(service);
+      config.cleanupLocksAndEventsForDev && registerCleanupForDevDb().catch(() => {});
+      registerEventProcessors();
+    }
+  });
+  config.fileContent = await readConfigFromFile(config.configFilePath);
 
-  if (config.processEventsAfterPublish) {
-    cds.on("connect", (service) => {
-      if (service.name === "db") {
-        dbHandler.registerEventQueueDbHandler(service);
-        config.cleanupLocksAndEventsForDev && registerCleanupForDevDb().catch(() => {});
-      }
-    });
-  }
   !config.skipCsnCheck && (await csnCheck());
 
   monkeyPatchCAPOutbox();
-  registerEventProcessors();
   registerCdsShutdown();
   logger.info("event queue initialized", {
     registerAsEventProcessor: config.registerAsEventProcessor,

package/src/outbox/eventQueueAsOutbox.js

@@ -68,21 +68,30 @@ function unboxed(srv) {
   return srv[UNBOXED] || srv;
 }
 
-const _mapToEventAndPublish = async (context, name, msg) => {
+const _mapToEventAndPublish = async (context, name, req) => {
+  let startAfter;
+  for (const header in req.headers ?? {}) {
+    if (header.toLocaleLowerCase() === "x-eventqueue-startafter") {
+      startAfter = req.headers[header];
+      delete req.headers[header];
+      break;
+    }
+  }
   const event = {
     contextUser: context.user.id,
-    ...(msg._fromSend || (msg.reply && { _fromSend: true })), // send or emit
-    ...(msg.inbound && { inbound: msg.inbound }),
-    ...(msg.event && { event: msg.event }),
-    ...(msg.data && { data: msg.data }),
-    ...(msg.headers && { headers: msg.headers }),
-    ...(msg.query && { query: msg.query }),
+    ...(req._fromSend || (req.reply && { _fromSend: true })), // send or emit
+    ...(req.inbound && { inbound: req.inbound }),
+    ...(req.event && { event: req.event }),
+    ...(req.data && { data: req.data }),
+    ...(req.headers && { headers: req.headers }),
+    ...(req.query && { query: req.query }),
   };
 
   await publishEvent(cds.tx(context), {
     type: CDS_EVENT_TYPE,
     subType: name,
     payload: JSON.stringify(event),
+    ...(startAfter && { startAfter }),
   });
 };
 

package/src/shared/cdsHelper.js

@@ -57,6 +57,13 @@ async function executeInNewTransaction(context = {}, transactionTag, fn, args, {
         );
       } else {
         contextTx.context.user = user;
+        try {
+          contextTx.set?.({
+            "$user.id": user.id,
+          });
+        } catch {
+          /* empty */
+        }
         await fn(contextTx, ...parameters);
       }
     }