@cap-js-community/event-queue 2.0.2 → 2.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js-community/event-queue",
-  "version": "2.0.2",
+  "version": "2.0.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",
@@ -24,10 +24,10 @@
   "scripts": {
     "start": "PORT=4005 cds-serve",
     "watch": "PORT=4005 cds watch",
-    "test:unit": "jest --testPathIgnorePatterns=\"/test-integration/\"",
-    "test:integration": "jest --testPathIgnorePatterns=\"/test/\" --runInBand --forceExit",
-    "voter:test:integration": "jest --testPathIgnorePatterns=\"/test/\" --forceExit",
-    "test": "npm run test:unit && npm run test:integration",
+    "test:unit": "jest --selectProjects unit",
+    "test:integration": "jest --selectProjects integration --runInBand",
+    "voter:test:integration": "jest --selectProjects integration",
+    "test": "jest --runInBand",
     "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",
@@ -47,30 +47,28 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@cap-js-community/common": "0.3.2",
-    "@sap/xssec": "^4.11.0",
-    "cron-parser": "^5.4.0",
+    "@cap-js-community/common": "^0.3.4",
+    "@sap/xssec": "^4.12.2",
+    "cron-parser": "^5.5.0",
     "verror": "^1.10.1",
-    "yaml": "^2.7.1"
+    "yaml": "^2.8.2"
   },
   "devDependencies": {
-    "@actions/core": "^1.11.1",
-    "@cap-js/cds-test": "^0.4.0",
-    "@cap-js/db-service": "^2.6.0",
-    "@cap-js/hana": "^2.3.4",
-    "@cap-js/sqlite": "^2.1.0",
+    "@actions/core": "^2.0.2",
+    "@cap-js/cds-test": "^0.4.1",
+    "@cap-js/db-service": "^2.8.1",
+    "@cap-js/hana": "^2.5.1",
+    "@cap-js/sqlite": "^2.1.2",
     "@opentelemetry/api": "^1.9.0",
-    "@sap/cds": "^9.4.5",
-    "@sap/cds-dk": "^9.4.2",
-    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-jest": "^28.6.0",
+    "@sap/cds": "^9.6.4",
+    "@sap/cds-dk": "^9.6.1",
+    "eslint": "^8.57.1",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-jest": "^29.12.1",
     "eslint-plugin-node": "^11.1.0",
-    "express": "^4.21.2",
-    "hdb": "^2.26.1",
+    "express": "^4.22.1",
     "jest": "^29.7.0",
-    "prettier": "^2.8.8",
-    "sqlite3": "^5.1.7"
+    "prettier": "^2.8.8"
   },
   "homepage": "https://cap-js-community.github.io/event-queue/",
   "repository": {
@@ -79,6 +77,9 @@
   },
   "cds": {
     "eventQueue": {
+      "[development]": {
+        "cleanupLocksAndEventsForDev": true
+      },
       "[production]": {
         "disableRedis": false
       },

package/src/EventQueueProcessorBase.js

@@ -703,7 +703,7 @@ class EventQueueProcessorBase {
         )
         .orderBy("createdAt", "ID");
 
-      if (this.#eventConfig.selectedDelayedEventIds) {
+      if (this.#eventConfig.selectedDelayedEventIds.length) {
         cqn.where("ID NOT IN", this.#eventConfig.selectedDelayedEventIds);
       }
 

package/src/housekeeping/EventQueueDeleteEvents.js

@@ -37,6 +37,10 @@ class EventQueueDeleteEvents extends EventQueueBaseClass {
           { ref: ["lastAttemptTimestamp"] },
           "<=",
           { val: new Date(processContext.timestamp.getTime() - deleteAfter * DAY_IN_MS).toISOString() },
+          "AND",
+          { ref: ["namespace"] },
+          "IN",
+          { list: config.processingNamespaces.map((value) => ({ val: value })) },
         ])
       );
       this.logger.info("deleted eligible events", {

package/srv/service/admin-service.cds

@@ -1,7 +1,6 @@
 using sap.eventqueue as db from '../../db';
 
 @path: 'event-queue/admin'
-@impl: './admin-service.js'
 @requires: 'internal-user'
 service EventQueueAdminService {
 

package/srv/service/admin-service.js

@@ -13,7 +13,7 @@ const COMPONENT_NAME = "/eventQueue/admin";
 module.exports = class AdminService extends cds.ApplicationService {
   async init() {
     const { Event: EventService, Lock: LockService } = this.entities;
-    const { Event: EventDb } = cds.db.entities("sap.eventqueue");
+    const { Event: EventDb } = cds.entities("sap.eventqueue");
     const { publishEvent } = this.actions;
 
     this.before("*", (req) => {