@cap-js-community/event-queue 0.1.51 → 0.1.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js-community/event-queue",
-  "version": "0.1.51",
+  "version": "0.1.53",
   "description": "event queue for cds",
   "main": "src/index.js",
   "files": [
@@ -43,7 +43,7 @@
     "eslint-plugin-node": "11.1.0",
     "sqlite3": "5.1.6",
     "express": "4.18.2",
-    "@sap/cds": "7.0.0",
+    "@sap/cds": "7.1.0",
     "eslint": "^8.39.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-jest": "^27.2.1",

package/src/EventQueueProcessorBase.js

@@ -702,7 +702,7 @@ class EventQueueProcessorBase {
     } else if (runningChecks.length) {
       await Promise.allSettled(runningChecks);
     }
-    const checkAndUpdatePromise = new Promise((resolve) => {
+    const checkAndUpdatePromise = new Promise((resolve, reject) => {
       executeInNewTransaction(this.__baseContext, "eventProcessing-isOutdatedAndKeepalive", async (tx) => {
         const queueEntriesFresh = await tx.run(
           SELECT.from(this.__eventQueueConfig.tableNameEventQueue)
@@ -747,7 +747,7 @@ class EventQueueProcessorBase {
           delete this.__keepalivePromises[queueEntryFresh.ID];
         });
         resolve(eventOutdated);
-      });
+      }).catch(reject);
     });
 
     queueEntries.forEach((queueEntry) => (this.__keepalivePromises[queueEntry.ID] = checkAndUpdatePromise));

package/src/shared/SetIntervalDriftSafe.js

@@ -2,6 +2,8 @@
 
 const COMPONENT = "eventQueue/SetIntervalDriftSafe";
 
+const ALLOWED_SHIFT_IN_PROCENT = 0.1;
+
 class SetIntervalDriftSafe {
   #adjustedInterval;
   #interval;
@@ -19,8 +21,11 @@ class SetIntervalDriftSafe {
     const now = Date.now();
     if (this.#expectedCycleTime === 0) {
       this.#expectedCycleTime = now + this.#interval;
-    } else if (now + this.#interval - this.#nextTickScheduledFor < this.#interval) {
-      this.#logger.info("overlapping ticks, skipping this run");
+    } else if (
+      Math.abs(now + this.#interval - this.#nextTickScheduledFor - this.#interval) >
+      this.#interval * ALLOWED_SHIFT_IN_PROCENT
+    ) {
+      this.#logger.log("overlapping ticks, skipping this run");
       return;
     } else {
       this.#adjustedInterval = this.#interval - (now - this.#expectedCycleTime);