@cap-js-community/event-queue 1.10.2 → 1.10.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js-community/event-queue",
-  "version": "1.10.2",
+  "version": "1.10.4",
   "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/EventQueueProcessorBase.js

@@ -174,7 +174,12 @@ class EventQueueProcessorBase {
       eventSubType: this.#eventSubType,
       iterationCounter,
     });
-    this.#eventSchedulerInstance.scheduleEvent(this.__context.tenant, this.#eventType, this.#eventSubType, new Date());
+    this.#eventSchedulerInstance.scheduleEvent(
+      this.__context.tenant,
+      this.#eventType,
+      this.#eventSubType,
+      new Date(Date.now() + 5 * 1000) // add some offset to make sure all locks are released
+    );
   }
 
   logStartMessage() {

package/src/config.js

@@ -638,18 +638,17 @@ class Config {
       let cron;
 
       // NOTE: logic is as follows:
-      // - if event.utc is true --> always use UTC
+      // - if event.utc is true --> always use UTC (default is false)
       // - if event.useCronTimezone is false OR event.cronTimezone is not defined --> use UTC as well
       // - if event.utc is not true AND event.cronTimezone is set AND event.useCronTimezone is NOT set to false use event.cronTimezone
       event.utc = event.utc ?? UTC_DEFAULT;
-
-      if (!event.cronTimezone) {
+      if (!this.cronTimezone) {
         event.useCronTimezone = false;
       } else {
         event.useCronTimezone = event.useCronTimezone ?? USE_CRON_TZ_DEFAULT;
       }
 
-      event.tz = event.utc || !event.useCronTimezone ? "UTC" : event.cronTimezone;
+      event.tz = event.utc || !event.useCronTimezone ? "UTC" : this.cronTimezone;
 
       try {
         cron = CronExpressionParser.parse(event.cron);

package/src/initialize.js

@@ -182,6 +182,14 @@ const monkeyPatchCAPOutbox = () => {
       get: () => eventQueueAsOutbox.unboxed,
       configurable: true,
     });
+    Object.defineProperty(cds, "queued", {
+      get: () => eventQueueAsOutbox.outboxed,
+      configurable: true,
+    });
+    Object.defineProperty(cds, "unqueued", {
+      get: () => eventQueueAsOutbox.unboxed,
+      configurable: true,
+    });
   }
 };
 

package/src/outbox/eventQueueAsOutbox.js

@@ -47,7 +47,6 @@ function outboxed(srv, customOpts) {
       customOpts || {}
     );
     config.addCAPOutboxEventBase(srv.name, outboxOpts);
-    // TODO: check req.event ?? req.method
     const specificSettings = config.getCdsOutboxEventSpecificConfig(srv.name, req.event);
     if (specificSettings) {
       outboxOpts = config.addCAPOutboxEventSpecificAction(srv.name, req.event);

package/src/redis/redisSub.js

@@ -68,9 +68,7 @@ const _messageHandlerProcessEvents = async (messageData) => {
       }
     }
 
-    if (
-      !(config.getEventConfig(type, serviceNameOrSubType) && config.shouldBeProcessedInThisApplication(type, subType))
-    ) {
+    if (!(config.getEventConfig(type, subType) && config.shouldBeProcessedInThisApplication(type, subType))) {
       logger.debug("event is not configured to be processed on this app-name", {
         tenantId,
         type,