proper reconnect implementation (#98)

Author: rlindner81

src/redis-adapter.js

@@ -157,11 +157,18 @@ const _noReconnectStrategy = () => new VError({ name: VERROR_CLUSTER_NAME }, "di
 const _createClientBase = (clientName, options = {}) => {
   const { doReconnect = true } = options;
   try {
-    const [isCluster, redisClientOptions] = _getRedisOptionsTuple();
+    const [isCluster, sharedRedisClientOptions] = _getRedisOptionsTuple();
 
-    if (!doReconnect) {
-      redisClientOptions.socket.reconnectStrategy = _noReconnectStrategy;
-    }
+    // NOTE: we need to take care not to pollute sharedRedisClientOptions for subsequent calls of other clients
+    const redisClientOptions = doReconnect
+      ? sharedRedisClientOptions
+      : {
+          ...sharedRedisClientOptions,
+          socket: {
+            ...sharedRedisClientOptions.socket,
+            reconnectStrategy: _noReconnectStrategy,
+          },
+        };
 
     return isCluster
       ? redis.createCluster({
@@ -632,6 +639,7 @@ const removeAllMessageHandlers = (channel) => __messageHandlers.removeAllHandler
 
 module.exports = {
   REDIS_INTEGRATION_MODE: INTEGRATION_MODE,
+  REDIS_CLIENT_NAME: CLIENT_NAME,
   setCustomOptions,
   getIntegrationMode,
   getMainClient,

test/redis-adapter.test.js

@@ -36,6 +36,8 @@ jest.mock("@redis/client", () => ({
 
 const redisAdapter = require("../src/redis-adapter");
 
+const { REDIS_CLIENT_NAME: CLIENT_NAME } = redisAdapter;
+
 const channel = "channel";
 const channelTwo = "channelTwo";
 const message = "message";
@@ -82,6 +84,40 @@ describe("redis-adapter test", () => {
     expect(loggerSpy.error).not.toHaveBeenCalled();
   });
 
+  test("_createClientAndConnect silent and then main does not leak options", async () => {
+    await redisAdapter._._createClientAndConnect(CLIENT_NAME.SILENT, {
+      doLogEvents: false,
+      doReconnect: false,
+    });
+
+    expect(redis.createClient).toHaveBeenCalledTimes(1);
+    expect(redis.createClient.mock.calls[0]).toMatchInlineSnapshot(`
+      [
+        {
+          "pingInterval": 240000,
+          "socket": {
+            "reconnectStrategy": [Function],
+          },
+        },
+      ]
+    `);
+
+    redis.createClient.mockClear();
+    await redisAdapter._._createClientAndConnect(CLIENT_NAME.MAIN);
+
+    expect(redis.createClient).toHaveBeenCalledTimes(1);
+    expect(redis.createClient.mock.calls[0]).toMatchInlineSnapshot(`
+      [
+        {
+          "pingInterval": 240000,
+          "socket": {},
+        },
+      ]
+    `);
+
+    expect(loggerSpy.error).not.toHaveBeenCalled();
+  });
+
   test.each(Object.entries(require("./__mocks__/mock-redis-credentials.json")))(
     "_createClientBase on CF | %s",
     async (_, credentials) => {