@cap-js-community/event-queue 0.2.0 → 0.2.1

package/README.md

@@ -3,7 +3,7 @@
 [![npm version](https://img.shields.io/npm/v/@cap-js-community/event-queue)](https://www.npmjs.com/package/@cap-js-community/event-queue)
 [![monthly downloads](https://img.shields.io/npm/dm/@cap-js-community/event-queue)](https://www.npmjs.com/package/@cap-js-community/event-queue)
 [![REUSE status](https://api.reuse.software/badge/github.com/cap-js-community/event-queue)](https://api.reuse.software/info/github.com/cap-js-community/event-queue)
-[![CI Main](https://github.com/cap-js-community/event-queue/actions/workflows/ci-main.yml/badge.svg)](https://github.com/cap-js-community/event-queue/commits/main)
+[![CI Main](https://github.com/cap-js-community/event-queue/actions/workflows/main-ci.yml/badge.svg)](https://github.com/cap-js-community/event-queue/commits/main)
 
 The Event-Queue is a framework built on top of CAP Node.js, specifically designed to enable efficient and streamlined
 asynchronous event processing in a multi-tenancy environment. With a strong emphasis on load balancing, this package

package/package.json

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

@@ -12,7 +12,8 @@ const EventQueueError = require("./EventQueueError");
 const runner = require("./runner");
 const dbHandler = require("./dbHandler");
 const { getConfigInstance } = require("./config");
-const { initEventQueueRedisSubscribe } = require("./redisPubSub");
+const { initEventQueueRedisSubscribe, closeSubscribeClient } = require("./redisPubSub");
+const { closeMainClient } = require("./shared/redis");
 
 const readFileAsync = promisify(fs.readFile);
 
@@ -82,6 +83,7 @@ const initialize = async ({
   }
 
   registerEventProcessors();
+  registerCdsShutdown();
   logger.info("event queue initialized", {
     registerAsEventProcessor: configInstance.registerAsEventProcessor,
     multiTenancyEnabled: configInstance.isMultiTenancy,
@@ -181,6 +183,12 @@ const mixConfigVarsWithEnv = (...args) => {
   });
 };
 
+const registerCdsShutdown = () => {
+  cds.on("shutdown", async () => {
+    await Promise.allSettled([closeMainClient(), closeSubscribeClient()]);
+  });
+};
+
 module.exports = {
   initialize,
 };

package/src/redisPubSub.js

@@ -67,7 +67,19 @@ const broadcastEvent = async (tenantId, type, subType) => {
   }
 };
 
+const closeSubscribeClient = async () => {
+  try {
+    const client = await subscriberClientPromise;
+    if (client?.quit) {
+      await client.quit();
+    }
+  } catch (err) {
+    // ignore errors during shutdown
+  }
+};
+
 module.exports = {
   initEventQueueRedisSubscribe,
   broadcastEvent,
+  closeSubscribeClient,
 };

package/src/shared/redis.js

@@ -29,9 +29,18 @@ const _createClientBase = () => {
   if (env.isOnCF) {
     try {
       const credentials = env.getRedisCredentialsFromEnv();
-      // NOTE: settings the user explicitly to empty resolves auth problems, see
-      // https://github.com/go-redis/redis/issues/1343
+      const redisIsCluster = credentials.cluster_mode;
       const url = credentials.uri.replace(/(?<=rediss:\/\/)[\w-]+?(?=:)/, "");
+      if (redisIsCluster) {
+        return redis.createCluster({
+          rootNodes: [{ url }],
+          // https://github.com/redis/node-redis/issues/1782
+          defaults: {
+            password: credentials.password,
+            socket: { tls: credentials.tls },
+          },
+        });
+      }
       return redis.createClient({ url });
     } catch (err) {
       throw EventQueueError.redisConnectionFailure(err);
@@ -87,9 +96,21 @@ const publishMessage = async (channel, message) => {
 
 const _localReconnectStrategy = () => EventQueueError.redisNoReconnect();
 
+const closeMainClient = async () => {
+  try {
+    const client = await mainClientPromise;
+    if (client?.quit) {
+      await client.quit();
+    }
+  } catch (err) {
+    // ignore errors during shutdown
+  }
+};
+
 module.exports = {
   createClientAndConnect,
   createMainClientAndConnect,
   subscribeRedisChannel,
   publishMessage,
+  closeMainClient,
 };