@cap-js-community/event-queue 1.9.0 → 1.9.1

package/package.json

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

@@ -929,6 +929,7 @@ class EventQueueProcessorBase {
               }
             });
           }
+          this.logger.info("keep alive finished!", { numberOfEvents: ids.length });
         });
       }).catch((err) => {
         this.logger.error("keep alive handling failed!", err);
@@ -971,7 +972,7 @@ class EventQueueProcessorBase {
       { expiryTime: this.#eventConfig.keepAliveMaxInProgressTime }
     );
     if (!lockAcquired) {
-      this.logger.error("renewing redis lock failed!", {
+      this.logger.error("renewing distributed lock failed!", {
         type: this.#eventType,
         subType: this.#eventSubType,
       });

package/src/config.js

@@ -529,6 +529,10 @@ class Config {
     this.#configEvents = JSON.parse(JSON.stringify(value));
   }
 
+  get hasConfigEvents() {
+    return !!(Object.keys(this.#configEvents ?? {}).length || Object.keys(this.#configPeriodicEvents ?? {}).length);
+  }
+
   set configPeriodicEvents(value) {
     this.#configPeriodicEvents = JSON.parse(JSON.stringify(value));
   }

package/src/initialize.js

@@ -134,7 +134,7 @@ const readConfigFromFile = async (configFilepath) => {
       "configFilepath with unsupported extension, allowed extensions are .yaml and .json"
     );
   } catch (err) {
-    if (config.useAsCAPOutbox) {
+    if (!configFilepath && (config.useAsCAPOutbox || config.hasConfigEvents)) {
       return {};
     }
     throw err;

package/src/periodicEvents.js

@@ -150,8 +150,14 @@ const _insertPeriodEvents = async (tx, events, now) => {
   processChunkedSync(eventsToBeInserted, CHUNK_SIZE_INSERT_PERIODIC_EVENTS, (chunk) => {
     logger.info(`${counter}/${chunks} | inserting chunk of changed or new periodic events`, {
       events: chunk.map(({ type, subType, startAfter }) => {
-        const { interval } = eventConfig.getEventConfig(type, subType);
-        return { type, subType, interval, ...(startAfter && { startAfter }) };
+        const { interval, cron } = eventConfig.getEventConfig(type, subType);
+        return {
+          type,
+          subType,
+          ...(startAfter && { startAfter }),
+          ...(interval && { interval }),
+          ...(cron && { cron }),
+        };
       }),
     });
     counter++;

package/src/processEventQueue.js

@@ -20,7 +20,7 @@ const processEventQueue = async (context, eventType, eventSubType, startTime = n
   try {
     let eventTypeInstance;
     const eventConfig = config.getEventConfig(eventType, eventSubType);
-    const [err, EventTypeClass] = resilientRequire(eventConfig);
+    const [err, EventTypeClass] = await resilientRequire(eventConfig);
     if (!eventConfig || err || !(typeof EventTypeClass.constructor === "function")) {
       cds.log(COMPONENT_NAME).error("No Implementation found in the provided configuration file.", {
         eventType,
@@ -331,12 +331,24 @@ const _processEvent = async (eventTypeInstance, processContext, key, queueEntrie
   }
 };
 
-const resilientRequire = (eventConfig) => {
+const resilientRequire = async (eventConfig) => {
   try {
     const path = eventConfig?.impl;
     const internal = eventConfig?.internalEvent;
-    const module = require(pathLib.join(internal ? __dirname : process.cwd(), path));
-    return [null, module];
+    const filePath = pathLib.join(internal ? __dirname : process.cwd(), path);
+    const fileExtension = pathLib.extname(filePath);
+    switch (fileExtension) {
+      case ".js":
+        return [null, require(filePath)];
+      case ".mjs":
+        return [null, (await import(`file://${filePath}`)).default];
+      case "":
+        try {
+          return [null, require(filePath)];
+        } catch {
+          return [null, (await import(`file://${filePath}`)).default];
+        }
+    }
   } catch (err) {
     return [err, null];
   }

package/src/runner/runner.js

@@ -51,7 +51,10 @@ const _scheduleFunction = async (singleRunFn, periodicFn) => {
     }
     if (!singleRunDone) {
       singleRunDone = true;
-      singleRunFn().catch(() => (singleRunDone = false));
+      singleRunFn()
+        .then(periodicFn)
+        .catch(() => (singleRunDone = false));
+      return;
     }
     return periodicFn();
   };

package/src/shared/common.js

@@ -123,7 +123,6 @@ const getTokenInfo = async (tenantId) => {
   }
 
   if (!cds.requires?.auth.kind.match(/jwt|xsuaa/i)) {
-    cds.log(COMPONENT_NAME).warn("Only 'jwt' or 'xsuaa' are supported as values for auth.kind.");
     return null;
   }
 

package/src/shared/distributedLock.js

@@ -90,10 +90,20 @@ const _acquireLockRedis = async (
 
 const _renewLockRedis = async (context, fullKey, expiryTime, { value = "true" } = {}) => {
   const client = await redis.createMainClientAndConnect(config.redisOptions);
-  const result = await client.set(fullKey, value, {
+  let result = await client.set(fullKey, value, {
     PX: Math.round(expiryTime),
     XX: true,
   });
+
+  if (result !== REDIS_COMMAND_OK) {
+    const readResult = await client.get(fullKey);
+    if (!readResult) {
+      result = await client.set(fullKey, value, {
+        PX: Math.round(expiryTime),
+      });
+    }
+  }
+
   return result === REDIS_COMMAND_OK;
 };