@cap-js-community/event-queue 1.6.4 → 1.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js-community/event-queue",
-  "version": "1.6.4",
+  "version": "1.6.6",
   "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",
@@ -27,7 +27,7 @@
     "test:all:coverage": "jest --runInBand --forceExit --collect-coverage",
     "test:prepare": "npm run build:ci --prefix=./test-integration/_env",
     "test:deploySchema": "node test-integration/_env/srv/hana/deploy.js",
-    "test:cleanSchemas": "node test-integration/_env/srv/hana/cleanObsoletSchemas.js",
+    "test:cleanSchemas": "node test-integration/_env/srv/hana/deleteTestSchema.js ",
     "lint": "npm run eslint && npm run prettier",
     "lint:ci": "npm run eslint:ci && npm run prettier:ci",
     "eslint": "eslint --fix .",

package/src/EventQueueProcessorBase.js

@@ -24,6 +24,7 @@ const TRIES_FOR_EXCEEDED_EVENTS = 3;
 const EVENT_START_AFTER_HEADROOM = 3 * 1000;
 const ETAG_CHECK_AFTER_MIN = 10;
 const SUFFIX_PERIODIC = "_PERIODIC";
+const DEFAULT_RETRY_AFTER = 5 * 60 * 1000;
 
 class EventQueueProcessorBase {
   #eventsWithExceededTries = [];
@@ -37,6 +38,7 @@ class EventQueueProcessorBase {
   #eventConfig;
   #isPeriodic;
   #lastSuccessfulRunTimestamp;
+  #retryFailedAfter;
 
   constructor(context, eventType, eventSubType, config) {
     this.__context = context;
@@ -57,6 +59,7 @@ class EventQueueProcessorBase {
     if (this.__parallelEventProcessing > LIMIT_PARALLEL_EVENT_PROCESSING) {
       this.__parallelEventProcessing = LIMIT_PARALLEL_EVENT_PROCESSING;
     }
+    this.#retryFailedAfter = this.#eventConfig.retryFailedAfter ?? DEFAULT_RETRY_AFTER;
     // NOTE: keep the feature, this might be needed again
     this.__concurrentEventProcessing = false;
     this.__startTime = this.#eventConfig.startTime ?? new Date();
@@ -454,11 +457,23 @@ class EventQueueProcessorBase {
         if (!eventIds.length) {
           continue;
         }
+        let startAfter;
+        if (status === EventProcessingStatus.Error) {
+          startAfter = new Date(Date.now() + this.#retryFailedAfter);
+          this.#eventSchedulerInstance.scheduleEvent(
+            this.__context.tenant,
+            this.#eventType,
+            this.#eventSubType,
+            startAfter
+          );
+        }
+
         await tx.run(
           UPDATE.entity(this.#config.tableNameEventQueue)
             .set({
               status: status,
               lastAttemptTimestamp: ts,
+              ...(status === EventProcessingStatus.Error ? { startAfter: startAfter.toISOString() } : {}),
             })
             .where("ID IN", eventIds)
         );
@@ -552,7 +567,8 @@ class EventQueueProcessorBase {
    */
   async getQueueEntriesAndSetToInProgress() {
     let result = [];
-    const refDateStartAfter = new Date(Date.now() + this.#config.runInterval * 1.2);
+    const baseDate = Date.now();
+    const refDateStartAfter = new Date(baseDate + this.#config.runInterval * 1.2);
     await executeInNewTransaction(this.__baseContext, "eventQueue-getQueueEntriesAndSetToInProgress", async (tx) => {
       const entries = await tx.run(
         SELECT.from(this.#config.tableNameEventQueue)
@@ -574,7 +590,7 @@ class EventQueueProcessorBase {
                   "OR lastAttemptTimestamp IS NULL ) OR ( status =",
                   EventProcessingStatus.InProgress,
                   "AND lastAttemptTimestamp <=",
-                  new Date(new Date().getTime() - this.#config.globalTxTimeout).toISOString(),
+                  new Date(baseDate - this.#config.globalTxTimeout).toISOString(),
                   ") )",
                 ]
               : [
@@ -585,7 +601,7 @@ class EventQueueProcessorBase {
                   ") OR ( status =",
                   EventProcessingStatus.InProgress,
                   "AND lastAttemptTimestamp <=",
-                  new Date(new Date().getTime() - this.#config.globalTxTimeout).toISOString(),
+                  new Date(baseDate - this.#config.globalTxTimeout).toISOString(),
                   ") )",
                 ])
           )

package/src/runner/runner.js

@@ -142,7 +142,8 @@ const _executeEventsAllTenantsRedis = async (tenantIds) => {
             if (!entries.length) {
               return;
             }
-            await redisPub.broadcastEvent(tenantId, entries).catch((err) => {
+            // Do not wait until this is finished - as broadcastEvent has a retry mechanism and can delay this loop
+            redisPub.broadcastEvent(tenantId, entries).catch((err) => {
               logger.error("broadcasting event failed", err, {
                 tenantId,
                 entries: entries.length,