@cap-js-community/event-queue 0.2.2 → 0.2.4

package/package.json

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

package/src/EventQueueError.js

@@ -16,6 +16,7 @@ const ERROR_CODES = {
   MISSING_IMPL: "MISSING_IMPL",
   DUPLICATE_EVENT_REGISTRATION: "DUPLICATE_EVENT_REGISTRATION",
   NO_MANUEL_INSERT_OF_PERIODIC: "NO_MANUEL_INSERT_OF_PERIODIC",
+  LOAD_HIGHER_THAN_LIMIT: "LOAD_HIGHER_THAN_LIMIT",
 };
 
 const ERROR_CODES_META = {
@@ -59,6 +60,9 @@ const ERROR_CODES_META = {
   [ERROR_CODES.NO_MANUEL_INSERT_OF_PERIODIC]: {
     message: "Periodic events are managed by the framework and are not allowed to insert manually.",
   },
+  [ERROR_CODES.LOAD_HIGHER_THAN_LIMIT]: {
+    message: "The defined load of an event is higher than the maximum defined limit. Check your configuration!",
+  },
 };
 
 class EventQueueError extends VError {
@@ -206,6 +210,16 @@ class EventQueueError extends VError {
       message
     );
   }
+  static loadHigherThanLimit(load) {
+    const { message } = ERROR_CODES_META[ERROR_CODES.LOAD_HIGHER_THAN_LIMIT];
+    return new EventQueueError(
+      {
+        name: ERROR_CODES.LOAD_HIGHER_THAN_LIMIT,
+        info: { load },
+      },
+      message
+    );
+  }
 }
 
 module.exports = EventQueueError;

package/src/EventQueueProcessorBase.js

@@ -8,7 +8,7 @@ const distributedLock = require("./shared/distributedLock");
 const EventQueueError = require("./EventQueueError");
 const { arrayToFlatMap } = require("./shared/common");
 const eventScheduler = require("./shared/eventScheduler");
-const eventQueueConfig = require("./config");
+const eventConfig = require("./config");
 const PerformanceTracer = require("./shared/PerformanceTracer");
 
 const IMPLEMENT_ERROR_MESSAGE = "needs to be reimplemented";
@@ -31,37 +31,43 @@ class EventQueueProcessorBase {
   #eventType = null;
   #eventSubType = null;
   #config = null;
+  #eventSchedulerInstance = null;
+  #eventConfig;
+  #isPeriodic;
 
   constructor(context, eventType, eventSubType, config) {
     this.__context = context;
     this.__baseContext = context;
     this.__tx = cds.tx(context);
     this.__baseLogger = cds.log(COMPONENT_NAME);
+    this.#eventSchedulerInstance = eventScheduler.getInstance();
+    this.#config = eventConfig;
+    this.#isPeriodic = this.#config.isPeriodicEvent(eventType, eventSubType);
     this.__logger = null;
     this.__eventProcessingMap = {};
     this.__statusMap = {};
     this.__commitedStatusMap = {};
     this.#eventType = eventType;
     this.#eventSubType = eventSubType;
-    this.__eventConfig = config ?? {};
-    this.__parallelEventProcessing = this.__eventConfig.parallelEventProcessing ?? DEFAULT_PARALLEL_EVENT_PROCESSING;
+    this.#eventConfig = config ?? {};
+    this.__parallelEventProcessing = this.#eventConfig.parallelEventProcessing ?? DEFAULT_PARALLEL_EVENT_PROCESSING;
     if (this.__parallelEventProcessing > LIMIT_PARALLEL_EVENT_PROCESSING) {
       this.__parallelEventProcessing = LIMIT_PARALLEL_EVENT_PROCESSING;
     }
     // NOTE: keep the feature, this might be needed again
     this.__concurrentEventProcessing = false;
-    this.__startTime = this.__eventConfig.startTime ?? new Date();
-    this.__retryAttempts = this.__eventConfig.retryAttempts ?? DEFAULT_RETRY_ATTEMPTS;
-    this.__selectMaxChunkSize = this.__eventConfig.selectMaxChunkSize ?? SELECT_LIMIT_EVENTS_PER_TICK;
-    this.__selectNextChunk = !!this.__eventConfig.checkForNextChunk;
+    this.__startTime = this.#eventConfig.startTime ?? new Date();
+    this.__retryAttempts = this.#eventConfig.retryAttempts ?? DEFAULT_RETRY_ATTEMPTS;
+    this.__selectMaxChunkSize = this.#eventConfig.selectMaxChunkSize ?? SELECT_LIMIT_EVENTS_PER_TICK;
+    this.__selectNextChunk = !!this.#eventConfig.checkForNextChunk;
     this.__keepalivePromises = {};
-    this.__outdatedCheckEnabled = this.__eventConfig.eventOutdatedCheck ?? true;
-    this.__transactionMode = this.__eventConfig.transactionMode ?? TransactionMode.isolated;
-    if (this.__eventConfig.deleteFinishedEventsAfterDays) {
+    this.__outdatedCheckEnabled = this.#eventConfig.eventOutdatedCheck ?? true;
+    this.__transactionMode = this.#eventConfig.transactionMode ?? TransactionMode.isolated;
+    if (this.#eventConfig.deleteFinishedEventsAfterDays) {
       this.__deleteFinishedEventsAfter =
-        Number.isInteger(this.__eventConfig.deleteFinishedEventsAfterDays) &&
-        this.__eventConfig.deleteFinishedEventsAfterDays > 0
-          ? this.__eventConfig.deleteFinishedEventsAfterDays
+        Number.isInteger(this.#eventConfig.deleteFinishedEventsAfterDays) &&
+        this.#eventConfig.deleteFinishedEventsAfterDays > 0
+          ? this.#eventConfig.deleteFinishedEventsAfterDays
           : DEFAULT_DELETE_FINISHED_EVENTS_AFTER;
     } else {
       this.__deleteFinishedEventsAfter = DEFAULT_DELETE_FINISHED_EVENTS_AFTER;
@@ -71,7 +77,6 @@ class EventQueueProcessorBase {
     this.__txUsageAllowed = true;
     this.__txMap = {};
     this.__txRollback = {};
-    this.#config = eventQueueConfig.getConfigInstance();
     this.__queueEntries = [];
   }
 
@@ -93,6 +98,20 @@ class EventQueueProcessorBase {
     throw new Error(IMPLEMENT_ERROR_MESSAGE);
   }
 
+  /**
+   * Process one periodic event
+   * @param processContext the context valid for the event processing. This context is associated with a valid transaction
+   *                       Access to the context is also possible with this.getContextForEventProcessing(key).
+   *                       The associated tx can be accessed with this.getTxForEventProcessing(key).
+   * @param {string} key cluster key generated during the clustering step. By default, this is ID of the event queue entry
+   * @param {Object} queueEntry this is the queueEntry which should be processed
+   * @returns {Promise<undefined>}
+   */
+  // eslint-disable-next-line no-unused-vars
+  async processPeriodicEvent(processContext, key, queueEntry) {
+    throw new Error(IMPLEMENT_ERROR_MESSAGE);
+  }
+
   startPerformanceTracerEvents() {
     this.__performanceLoggerEvents = new PerformanceTracer(this.logger, "Processing events");
   }
@@ -249,7 +268,8 @@ class EventQueueProcessorBase {
         this.#determineAndAddEventStatusToMap(queueEntry.ID, EventProcessingStatus.Error, statusMap)
       );
       this.logger.error(
-        `The supplied status tuple doesn't have the required structure. Setting all entries to error. Error: ${error.toString()}`,
+        "The supplied status tuple doesn't have the required structure. Setting all entries to error.",
+        error,
         {
           eventType: this.#eventType,
           eventSubType: this.#eventSubType,
@@ -290,7 +310,8 @@ class EventQueueProcessorBase {
   handleErrorDuringProcessing(error, queueEntries) {
     queueEntries = Array.isArray(queueEntries) ? queueEntries : [queueEntries];
     this.logger.error(
-      `Caught error during event processing - setting queue entry to error. Please catch your promises/exceptions. Error: ${error}`,
+      "Caught error during event processing - setting queue entry to error. Please catch your promises/exceptions",
+      error,
       {
         eventType: this.#eventType,
         eventSubType: this.#eventSubType,
@@ -304,14 +325,11 @@ class EventQueueProcessorBase {
   }
 
   handleErrorDuringPeriodicEventProcessing(error, queueEntry) {
-    this.logger.error(
-      `Caught error during event periodic processing. Please catch your promises/exceptions. Error: ${error}`,
-      {
-        eventType: this.#eventType,
-        eventSubType: this.#eventSubType,
-        queueEntryId: queueEntry.ID,
-      }
-    );
+    this.logger.error("Caught error during event periodic processing. Please catch your promises/exceptions.", error, {
+      eventType: this.#eventType,
+      eventSubType: this.#eventSubType,
+      queueEntryId: queueEntry.ID,
+    });
   }
 
   async setPeriodicEventStatus(queueEntryIds) {
@@ -486,7 +504,7 @@ class EventQueueProcessorBase {
   }
 
   handleErrorDuringClustering(error) {
-    this.logger.error(`Error during clustering of events - setting all queue entries to error. Error: ${error}`, {
+    this.logger.error("Error during clustering of events - setting all queue entries to error.", error, {
       eventType: this.#eventType,
       eventSubType: this.#eventSubType,
     });
@@ -610,9 +628,8 @@ class EventQueueProcessorBase {
   }
 
   #handleDelayedEvents(delayedEvents) {
-    const eventSchedulerInstance = eventScheduler.getInstance();
     for (const delayedEvent of delayedEvents) {
-      eventSchedulerInstance.scheduleEvent(
+      this.#eventSchedulerInstance.scheduleEvent(
         this.__context.tenant,
         this.#eventType,
         this.#eventSubType,
@@ -673,7 +690,8 @@ class EventQueueProcessorBase {
             await this.#persistEventQueueStatusForExceeded(this.tx, [exceededEvent], EventProcessingStatus.Exceeded);
           } catch (err) {
             this.logger.error(
-              `Caught error during hook for exceeded events - setting queue entry to error. Please catch your promises/exceptions. Error: ${err}`,
+              "Caught error during hook for exceeded events - setting queue entry to error. Please catch your promises/exceptions.",
+              err,
               {
                 eventType: this.#eventType,
                 eventSubType: this.#eventSubType,
@@ -818,6 +836,10 @@ class EventQueueProcessorBase {
       [this.#eventType, this.#eventSubType].join("##")
     );
     if (!lockAcquired) {
+      this.logger.debug("no lock available, exit processing", {
+        type: this.#eventType,
+        subType: this.#eventSubType,
+      });
       return false;
     }
     this.__lockAcquired = true;
@@ -831,22 +853,52 @@ class EventQueueProcessorBase {
     try {
       await distributedLock.releaseLock(this.context, [this.#eventType, this.#eventSubType].join("##"));
     } catch (err) {
-      this.logger.error("Releasing distributed lock failed. Error:", err.toString());
+      this.logger.error("Releasing distributed lock failed.", err);
     }
   }
 
   async scheduleNextPeriodEvent(queueEntry) {
-    const interval = this.__eventConfig.interval;
+    const interval = this.#eventConfig.interval;
     const newEvent = {
       type: this.#eventType,
       subType: this.#eventSubType,
       startAfter: new Date(new Date(queueEntry.startAfter).getTime() + interval * 1000),
     };
+    const { relative } = this.#eventSchedulerInstance.calculateOffset(
+      this.#eventType,
+      this.#eventSubType,
+      newEvent.startAfter
+    );
+
+    // more than one interval behind - shift tick to keep up
+    if (relative < 0 && Math.abs(relative) >= this.#eventConfig.interval * 1000) {
+      newEvent.startAfter = new Date(Date.now() + 5 * 1000);
+      this.logger.info("interval adjusted because shifted more than one interval", {
+        eventType: this.#eventType,
+        eventSubType: this.#eventSubType,
+        newStartAfter: newEvent.startAfter,
+      });
+    }
+
     this.tx._skipEventQueueBroadcase = true;
     await this.tx.run(INSERT.into(this.#config.tableNameEventQueue).entries({ ...newEvent }));
     this.tx._skipEventQueueBroadcase = false;
     if (interval < this.#config.runInterval) {
       this.#handleDelayedEvents([newEvent]);
+      const { relative: relativeAfterSchedule } = this.#eventSchedulerInstance.calculateOffset(
+        this.#eventType,
+        this.#eventSubType,
+        newEvent.startAfter
+      );
+      // next tick is already behind schedule --> execute direct
+      if (relativeAfterSchedule <= 0) {
+        this.logger.info("running behind schedule - executing next tick immediately", {
+          eventType: this.#eventType,
+          eventSubType: this.#eventSubType,
+          newStartAfter: newEvent.startAfter,
+        });
+        return true;
+      }
     }
   }
 
@@ -986,7 +1038,7 @@ class EventQueueProcessorBase {
   }
 
   get isPeriodicEvent() {
-    return this.__eventConfig.isPeriodic;
+    return this.#eventConfig.isPeriodic;
   }
 }
 

package/src/config.js

@@ -6,13 +6,12 @@ const { getEnvInstance } = require("./shared/env");
 const redis = require("./shared/redis");
 const EventQueueError = require("./EventQueueError");
 
-let instance;
-
 const FOR_UPDATE_TIMEOUT = 10;
 const GLOBAL_TX_TIMEOUT = 30 * 60 * 1000;
 const REDIS_CONFIG_CHANNEL = "EVENT_QUEUE_CONFIG_CHANNEL";
 const COMPONENT_NAME = "eventQueue/config";
 const MIN_INTERVAL_SEC = 10;
+const DEFAULT_LOAD = 1;
 
 class Config {
   #logger;
@@ -29,10 +28,12 @@ class Config {
   #configFilePath;
   #processEventsAfterPublish;
   #skipCsnCheck;
+  #registerAsEventProcessor;
   #disableRedis;
   #env;
   #eventMap;
   #updatePeriodicEvents;
+  static #instance;
   constructor() {
     this.#logger = cds.log(COMPONENT_NAME);
     this.#config = null;
@@ -107,20 +108,25 @@ class Config {
     config.events = config.events ?? [];
     config.periodicEvents = config.periodicEvents ?? [];
     this.#eventMap = config.events.reduce((result, event) => {
+      event.load = event.load ?? DEFAULT_LOAD;
       this.validateAdHocEvents(result, event);
       result[[event.type, event.subType].join("##")] = event;
       return result;
     }, {});
     this.#eventMap = config.periodicEvents.reduce((result, event) => {
-      this.validatePeriodicConfig(result, event);
+      event.load = event.load ?? DEFAULT_LOAD;
+      const SUFFIX_PERIODIC = "_PERIODIC";
+      event.type = `${event.type}${SUFFIX_PERIODIC}`;
       event.isPeriodic = true;
+      this.validatePeriodicConfig(result, event);
       result[[event.type, event.subType].join("##")] = event;
       return result;
     }, this.#eventMap);
   }
 
   validatePeriodicConfig(eventMap, config) {
-    if (eventMap[this.generateKey(config.type, config.subType)]) {
+    const key = this.generateKey(config.type, config.subType);
+    if (eventMap[key] && eventMap[key].isPeriodic) {
       throw EventQueueError.duplicateEventRegistration(config.type, config.subType);
     }
 
@@ -134,7 +140,8 @@ class Config {
   }
 
   validateAdHocEvents(eventMap, config) {
-    if (eventMap[this.generateKey(config.type, config.subType)]) {
+    const key = this.generateKey(config.type, config.subType);
+    if (eventMap[key] && !eventMap[key].isPeriodic) {
       throw EventQueueError.duplicateEventRegistration(config.type, config.subType);
     }
 
@@ -271,18 +278,29 @@ class Config {
     return this.#updatePeriodicEvents;
   }
 
+  set registerAsEventProcessor(value) {
+    this.#registerAsEventProcessor = value;
+  }
+
+  get registerAsEventProcessor() {
+    return this.#registerAsEventProcessor;
+  }
+
   get isMultiTenancy() {
     return !!cds.requires.multitenancy;
   }
-}
 
-const getConfigInstance = () => {
-  if (!instance) {
-    instance = new Config();
+  /**
+    @return { Config }
+  **/
+  static get instance() {
+    if (!Config.#instance) {
+      Config.#instance = new Config();
+    }
+    return Config.#instance;
   }
-  return instance;
-};
+}
+
+const instance = Config.instance;
 
-module.exports = {
-  getConfigInstance,
-};
+module.exports = instance;

package/src/dbHandler.js

@@ -8,8 +8,7 @@ const config = require("./config");
 const COMPONENT_NAME = "eventQueue/dbHandler";
 
 const registerEventQueueDbHandler = (dbService) => {
-  const configInstance = config.getConfigInstance();
-  const def = dbService.model.definitions[configInstance.tableNameEventQueue];
+  const def = dbService.model.definitions[config.tableNameEventQueue];
   dbService.after("CREATE", def, (_, req) => {
     if (req.tx._skipEventQueueBroadcase) {
       return;
@@ -21,7 +20,7 @@ const registerEventQueueDbHandler = (dbService) => {
     const eventCombinations = Object.keys(
       data.reduce((result, event) => {
         const key = [event.type, event.subType].join("##");
-        if (!configInstance.hasEventAfterCommitFlag(event.type, event.subType) || eventQueuePublishEvents[key]) {
+        if (!config.hasEventAfterCommitFlag(event.type, event.subType) || eventQueuePublishEvents[key]) {
           return result;
         }
         eventQueuePublishEvents[key] = true;

package/src/index.js

@@ -11,7 +11,7 @@
 
 module.exports = {
   ...require("./initialize"),
-  ...require("./config"),
+  config: require("./config"),
   ...require("./processEventQueue"),
   ...require("./dbHandler"),
   ...require("./constants"),

package/src/initialize.js

@@ -11,7 +11,7 @@ const VError = require("verror");
 const EventQueueError = require("./EventQueueError");
 const runner = require("./runner");
 const dbHandler = require("./dbHandler");
-const { getConfigInstance } = require("./config");
+const config = require("./config");
 const { initEventQueueRedisSubscribe, closeSubscribeClient } = require("./redisPubSub");
 const { closeMainClient } = require("./shared/redis");
 
@@ -54,11 +54,10 @@ const initialize = async ({
   // - content of yaml check
   // - betweenRuns and parallelTenantProcessing
 
-  const configInstance = getConfigInstance();
-  if (configInstance.initialized) {
+  if (config.initialized) {
     return;
   }
-  configInstance.initialized = true;
+  config.initialized = true;
 
   mixConfigVarsWithEnv(
     configFilePath,
@@ -75,24 +74,25 @@ const initialize = async ({
   );
 
   const logger = cds.log(COMPONENT);
-  configInstance.fileContent = await readConfigFromFile(configInstance.configFilePath);
-  configInstance.checkRedisEnabled();
+  config.fileContent = await readConfigFromFile(config.configFilePath);
+  config.checkRedisEnabled();
 
   const dbService = await cds.connect.to("db");
   await (cds.model ? Promise.resolve() : new Promise((resolve) => cds.on("serving", resolve)));
-  !configInstance.skipCsnCheck && (await csnCheck());
-  if (configInstance.processEventsAfterPublish) {
+  !config.skipCsnCheck && (await csnCheck());
+  if (config.processEventsAfterPublish) {
     dbHandler.registerEventQueueDbHandler(dbService);
   }
 
   registerEventProcessors();
   registerCdsShutdown();
   logger.info("event queue initialized", {
-    registerAsEventProcessor: configInstance.registerAsEventProcessor,
-    multiTenancyEnabled: configInstance.isMultiTenancy,
-    redisEnabled: configInstance.redisEnabled,
-    runInterval: configInstance.runInterval,
-    parallelTenantProcessing: configInstance.parallelTenantProcessing,
+    registerAsEventProcessor: config.registerAsEventProcessor,
+    processEventsAfterPublish: config.processEventsAfterPublish,
+    multiTenancyEnabled: config.isMultiTenancy,
+    redisEnabled: config.redisEnabled,
+    runInterval: config.runInterval,
+    config: config.parallelTenantProcessing,
   });
 };
 
@@ -114,22 +114,20 @@ const readConfigFromFile = async (configFilepath) => {
 };
 
 const registerEventProcessors = () => {
-  const configInstance = getConfigInstance();
-
-  if (!configInstance.registerAsEventProcessor) {
+  if (!config.registerAsEventProcessor) {
     return;
   }
 
   const errorHandler = (err) => cds.log(COMPONENT).error("error during init runner", err);
 
-  if (!configInstance.isMultiTenancy) {
+  if (!config.isMultiTenancy) {
     runner.singleTenant().catch(errorHandler);
     return;
   }
 
-  if (configInstance.redisEnabled) {
+  if (config.redisEnabled) {
     initEventQueueRedisSubscribe();
-    configInstance.attachConfigChangeHandler();
+    config.attachConfigChangeHandler();
     runner.multiTenancyRedis().catch(errorHandler);
   } else {
     runner.multiTenancyDb().catch(errorHandler);
@@ -137,21 +135,17 @@ const registerEventProcessors = () => {
 };
 
 const csnCheck = async () => {
-  const configInstance = getConfigInstance();
-  const eventCsn = cds.model.definitions[configInstance.tableNameEventQueue];
+  const eventCsn = cds.model.definitions[config.tableNameEventQueue];
   if (!eventCsn) {
-    throw EventQueueError.missingTableInCsn(configInstance.tableNameEventQueue);
+    throw EventQueueError.missingTableInCsn(config.tableNameEventQueue);
   }
 
-  const lockCsn = cds.model.definitions[configInstance.tableNameEventLock];
+  const lockCsn = cds.model.definitions[config.tableNameEventLock];
   if (!lockCsn) {
-    throw EventQueueError.missingTableInCsn(configInstance.tableNameEventLock);
+    throw EventQueueError.missingTableInCsn(config.tableNameEventLock);
   }
 
-  if (
-    configInstance.tableNameEventQueue === BASE_TABLES.EVENT &&
-    configInstance.tableNameEventLock === BASE_TABLES.LOCK
-  ) {
+  if (config.tableNameEventQueue === BASE_TABLES.EVENT && config.tableNameEventLock === BASE_TABLES.LOCK) {
     return; // no need to check base tables
   }
 
@@ -181,10 +175,9 @@ const checkCustomTable = (baseCsn, customCsn) => {
 };
 
 const mixConfigVarsWithEnv = (...args) => {
-  const configInstance = getConfigInstance();
   CONFIG_VARS.forEach(([configName, defaultValue], index) => {
     const configValue = args[index];
-    configInstance[configName] = configValue ?? cds.env.eventQueue?.[configName] ?? defaultValue;
+    config[configName] = configValue ?? cds.env.eventQueue?.[configName] ?? defaultValue;
   });
 };
 

package/src/periodicEvents.js

@@ -4,19 +4,18 @@ const cds = require("@sap/cds");
 
 const { EventProcessingStatus } = require("./constants");
 const { processChunkedSync } = require("./shared/common");
-const { getConfigInstance } = require("./config");
+const eventConfig = require("./config");
 
 const COMPONENT_NAME = "eventQueue/periodicEvents";
 
 const checkAndInsertPeriodicEvents = async (context) => {
   const tx = cds.tx(context);
-  const configInstance = getConfigInstance();
-  const baseCqn = SELECT.from(configInstance.tableNameEventQueue)
+  const baseCqn = SELECT.from(eventConfig.tableNameEventQueue)
     .where([
       { list: [{ ref: ["type"] }, { ref: ["subType"] }] },
       "IN",
       {
-        list: configInstance.periodicEvents.map((periodicEvent) => ({
+        list: eventConfig.periodicEvents.map((periodicEvent) => ({
           list: [{ val: periodicEvent.type }, { val: periodicEvent.subType }],
         })),
       },
@@ -30,7 +29,7 @@ const checkAndInsertPeriodicEvents = async (context) => {
 
   if (!currentPeriodEvents.length) {
     // fresh insert all
-    return await insertPeriodEvents(tx, configInstance.periodicEvents);
+    return await insertPeriodEvents(tx, eventConfig.periodicEvents);
   }
 
   const exitingEventMap = currentPeriodEvents.reduce((result, current) => {
@@ -39,7 +38,7 @@ const checkAndInsertPeriodicEvents = async (context) => {
     return result;
   }, {});
 
-  const { newEvents, existingEvents } = configInstance.periodicEvents.reduce(
+  const { newEvents, existingEvents } = eventConfig.periodicEvents.reduce(
     (result, event) => {
       if (exitingEventMap[_generateKey(event)]) {
         result.existingEvents.push(exitingEventMap[_generateKey(event)]);
@@ -53,7 +52,7 @@ const checkAndInsertPeriodicEvents = async (context) => {
 
   const currentDate = new Date();
   const exitingWithNotMatchingInterval = existingEvents.filter((existingEvent) => {
-    const config = configInstance.getEventConfig(existingEvent.type, existingEvent.subType);
+    const config = eventConfig.getEventConfig(existingEvent.type, existingEvent.subType);
     const eventStartAfter = new Date(existingEvent.startAfter);
     // check if to far in future
     const dueInWithNewInterval = new Date(currentDate.getTime() + config.interval * 1000);
@@ -64,12 +63,15 @@ const checkAndInsertPeriodicEvents = async (context) => {
     cds.log(COMPONENT_NAME).info("deleting periodic events because they have changed", {
       changedEvents: exitingWithNotMatchingInterval.map(({ type, subType }) => ({ type, subType })),
     });
-  await tx.run(
-    DELETE.from(configInstance.tableNameEventQueue).where(
-      "ID IN",
-      exitingWithNotMatchingInterval.map(({ ID }) => ID)
-    )
-  );
+
+  if (exitingWithNotMatchingInterval.length) {
+    await tx.run(
+      DELETE.from(eventConfig.tableNameEventQueue).where(
+        "ID IN",
+        exitingWithNotMatchingInterval.map(({ ID }) => ID)
+      )
+    );
+  }
 
   const newOrChangedEvents = newEvents.concat(exitingWithNotMatchingInterval);
 
@@ -82,11 +84,10 @@ const checkAndInsertPeriodicEvents = async (context) => {
 
 const insertPeriodEvents = async (tx, events) => {
   const startAfter = new Date();
-  const configInstance = getConfigInstance();
   processChunkedSync(events, 4, (chunk) => {
     cds.log(COMPONENT_NAME).info("inserting changed or new periodic events", {
       events: chunk.map(({ type, subType }) => {
-        const { interval } = configInstance.getEventConfig(type, subType);
+        const { interval } = eventConfig.getEventConfig(type, subType);
         return { type, subType, interval };
       }),
     });
@@ -98,7 +99,7 @@ const insertPeriodEvents = async (tx, events) => {
   }));
 
   tx._skipEventQueueBroadcase = true;
-  await tx.run(INSERT.into(configInstance.tableNameEventQueue).entries(periodEventsInsert));
+  await tx.run(INSERT.into(eventConfig.tableNameEventQueue).entries(periodEventsInsert));
   tx._skipEventQueueBroadcase = false;
 };