Redis

Author: oklemenz2

CHANGELOG.md

@@ -5,11 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## Version 1.9.1 - 2025-12-xx
+## Version 1.9.1 - 2025-11-05
 
 ### Fixed
 
-- tbd
+- Rework redis client
 
 ## Version 1.9.0 - 2025-11-03
 

package-lock.json

@@ -43,7 +43,7 @@
     "audit": "npm audit --only=prod"
   },
   "dependencies": {
-    "@cap-js-community/common": "^0.3.0",
+    "@cap-js-community/common": "^0.3.2",
     "socket.io": "^4.8.1",
     "socket.io-client": "^4.8.1",
     "ws": "^8.18.3"
@@ -52,12 +52,12 @@
     "@cap-js-community/websocket": "./",
     "@cap-js/cds-test": "^0.4.0",
     "@cap-js/sqlite": "^2.0.4",
-    "@eslint/js": "^9.38.0",
+    "@eslint/js": "^9.39.1",
     "@sap/cds": "^9.4.4",
     "@sap/cds-dk": "^9.4.2",
     "@socket.io/redis-adapter": "^8.3.0",
     "@socket.io/redis-streams-adapter": "^0.2.2",
-    "eslint": "^9.38.0",
+    "eslint": "^9.39.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-jest": "^29.0.1",
     "eslint-plugin-n": "^17.21.3",

package.json

@@ -3,10 +3,8 @@
 const cds = require("@sap/cds");
 
 const SocketServer = require("./socket/base");
-const redis = require("./redis");
 
 const LOG = cds.log("websocket");
-const TIMEOUT_SHUTDOWN = 2500;
 
 const WebSocketAction = {
   Connect: "wsConnect",
@@ -27,9 +25,6 @@ const collectServicesAndMountAdapter = (srv, options) => {
       options.services = services;
       serveWebSocketServer(options);
     });
-    cds.on("shutdown", async () => {
-      await shutdownWebSocketServer();
-    });
   }
   services[srv.name] = srv;
 };
@@ -126,26 +121,6 @@ async function initWebSocketServer(server, path) {
   }
 }
 
-async function shutdownWebSocketServer() {
-  return await new Promise((resolve, reject) => {
-    const timeoutRef = setTimeout(() => {
-      clearTimeout(timeoutRef);
-      LOG?.info("Shutdown timeout reached!");
-      resolve();
-    }, TIMEOUT_SHUTDOWN);
-    redis
-      .closeClients()
-      .then((result) => {
-        clearTimeout(timeoutRef);
-        resolve(result);
-      })
-      .catch((err) => {
-        clearTimeout(timeoutRef);
-        reject(err);
-      });
-  });
-}
-
 function normalizeServicePath(servicePath, protocolPath) {
   if (servicePath.startsWith(`${protocolPath}/`)) {
     return servicePath.substring(`${protocolPath}/`.length);

src/index.js

@@ -6,7 +6,8 @@ const { RedisClient } = require("@cap-js-community/common");
 const LOG = cds.log("websocket/redis");
 const IS_ON_CF = process.env.USER === "vcap";
 
-const redisClient = RedisClient.default("websocket");
+const redisClient = RedisClient.create("websocket");
+const redisClientSecondary = RedisClient.create("websocket-secondary", "websocket");
 
 async function connectionCheck(options) {
   const adapterActive = options?.active !== false;
@@ -28,11 +29,11 @@ async function createPrimaryClientAndConnect(options) {
 }
 
 async function createSecondaryClientAndConnect(options) {
-  return await redisClient.createAdditionalClientAndConnect(options?.config);
+  return await redisClientSecondary.createMainClientAndConnect(options?.config);
 }
 
 async function closeClients() {
-  return await redisClient.closeClients();
+  return await RedisClient.closeAllClients();
 }
 
 module.exports = {