@cap-js-community/event-queue 1.8.1 → 1.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js-community/event-queue",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "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",
@@ -75,13 +75,19 @@
         "disableRedis": false
       },
       "[test]": {
-        "isEventQueueActive": true,
+        "isEventQueueActive": false,
         "registerAsEventProcessor": false,
         "updatePeriodicEvents": false,
         "insertEventsBeforeCommit": false
       }
     },
     "requires": {
+      "redis-eventQueue": {
+        "options": {},
+        "vcap": {
+          "label": "redis-cache"
+        }
+      },
       "event-queue": {
         "model": "@cap-js-community/event-queue"
       }

package/src/config.js

@@ -113,7 +113,7 @@ class Config {
   }
 
   _checkRedisIsBound() {
-    return !!this.#env.redisCredentialsFromEnv;
+    return !!this.#env.redisRequires?.credentials;
   }
 
   shouldBeProcessedInThisApplication(type, subType) {

package/src/shared/env.js

@@ -1,25 +1,24 @@
 "use strict";
 
+const cds = require("@sap/cds");
+
 let instance;
 
 class Env {
-  #vcapServices;
   #vcapApplication;
   #vcapApplicationInstance;
 
   constructor() {
     try {
-      this.#vcapServices = JSON.parse(process.env.VCAP_SERVICES);
       this.#vcapApplication = JSON.parse(process.env.VCAP_APPLICATION);
     } catch {
-      this.#vcapServices = {};
       this.#vcapApplication = {};
     }
     this.#vcapApplicationInstance = Number(process.env.CF_INSTANCE_INDEX);
   }
 
-  get redisCredentialsFromEnv() {
-    return this.#vcapServices["redis-cache"]?.[0]?.credentials;
+  get redisRequires() {
+    return cds.requires["redis-eventQueue"] ?? cds.requires["redis"];
   }
 
   get applicationName() {
@@ -30,14 +29,6 @@ class Env {
     return this.#vcapApplicationInstance;
   }
 
-  set vcapServices(value) {
-    this.#vcapServices = value;
-  }
-
-  get vcapServices() {
-    return this.#vcapServices;
-  }
-
   set applicationInstance(value) {
     this.#vcapApplicationInstance = value;
   }

package/src/shared/redis.js

@@ -27,24 +27,30 @@ const createMainClientAndConnect = (options) => {
   return mainClientPromise;
 };
 
-const _createClientBase = (redisOptions) => {
+const _createClientBase = (redisOptions = {}) => {
   const env = getEnvInstance();
   try {
-    const credentials = env.redisCredentialsFromEnv;
-    const redisIsCluster = credentials.cluster_mode;
-    const url = credentials.uri.replace(/(?<=rediss:\/\/)[\w-]+?(?=:)/, "");
-    if (redisIsCluster) {
+    const { credentials, options } = env.redisRequires;
+    const socket = Object.assign(
+      {
+        host: credentials.hostname,
+        tls: !!credentials.tls,
+        port: credentials.port,
+      },
+      options?.socket,
+      redisOptions.socket
+    );
+    const socketOptions = Object.assign({}, options, redisOptions, {
+      password: redisOptions.password ?? options.password ?? credentials.password,
+      socket,
+    });
+    if (credentials.cluster_mode) {
       return redis.createCluster({
-        rootNodes: [{ url }],
-        // https://github.com/redis/node-redis/issues/1782
-        defaults: {
-          password: credentials.password,
-          socket: { tls: credentials.tls },
-          ...redisOptions,
-        },
+        rootNodes: [socketOptions],
+        defaults: socketOptions,
       });
     }
-    return redis.createClient({ url, ...redisOptions });
+    return redis.createClient(socketOptions);
   } catch (err) {
     throw EventQueueError.redisConnectionFailure(err);
   }