update redis

Author: Systerr

src/helpers/redis/redisConnection.ts

@@ -0,0 +1,61 @@
+import type { RedisClientType } from '@redis/client';
+import { createClient } from '@redis/client';
+import { appInstance } from '../appInstance.ts';
+
+let redisClient: RedisClientType | null = null;
+
+export const getRedisClient = async (): Promise<RedisClientType> => {
+  if (redisClient) {
+    return redisClient;
+  }
+  const redisClientLocal = createNewRedisClient();
+  await redisClientLocal.connect();
+
+  return redisClientLocal;
+};
+
+/**
+ * Synchronous way to get redis client. Make sure to call connect on it before usage
+ */
+export const getRedisClientSync = (): RedisClientType => {
+  if (redisClient) {
+    return redisClient;
+  }
+  const redisClientLocal = createNewRedisClient();
+  // to make sure connection is established
+  (async () => {
+    await redisClientLocal.connect();
+  })();
+
+  return redisClientLocal;
+};
+
+const createNewRedisClient = (): RedisClientType => {
+  if (redisClient) {
+    return redisClient;
+  }
+
+  const redisConfig = appInstance.getConfig('redis') as {
+    url: string;
+  };
+
+  redisClient = createClient({
+    url: redisConfig.url,
+  });
+
+  redisClient.on('error', (error, b, c) => {
+    appInstance.logger?.error('Redis Client Error', error, b, c);
+  });
+
+  redisClient.on('connect', () => {
+    appInstance.logger?.info('Redis connection established');
+  });
+
+  appInstance.events.on('shutdown', async () => {
+    if (redisClient) {
+      await redisClient.quit();
+      redisClient = null;
+    }
+  });
+  return redisClient;
+};

src/services/cache/Cache.ts

@@ -1,5 +1,6 @@
 import type { RedisClientType } from '@redis/client';
 import type redisConfig from '../../config/redis.ts';
+import { getRedisClient } from '../../helpers/redis/redisConnection.ts';
 import Base from '../../modules/Base.ts';
 import type { IApp } from '../../server.ts';
 
@@ -22,23 +23,10 @@ class Cache extends Base {
     // at least memory and redis drivers should be presented
     // memory drives should works on master process level
     // we should support multiple cashe same time
-    const { createClient } = await import('@redis/client');
-    const conf = this.app.getConfig('redis') as typeof redisConfig;
-    this.redisClient = createClient({
-      url: conf.url,
-    });
-
-    this.redisNamespace = conf.namespace;
-
-    this.redisClient.on('error', (error, b, c) => {
-      this.logger?.error(error, b, c);
-    });
-    this.redisClient.on('connect', () => {
-      this.logger?.info('Redis connection success');
-    });
-    this.app.events.on('shutdown', () => {
-      this.redisClient.close();
-    });
+    const { namespace } = this.app.getConfig('redis') as typeof redisConfig;
+    this.redisClient = await getRedisClient();
+
+    this.redisNamespace = namespace;
   }
 
   /**

src/services/http/middleware/RateLimiter.ts

@@ -1,4 +1,3 @@
-import { createClient } from '@redis/client';
 import merge from 'deepmerge';
 import type { NextFunction, Response } from 'express';
 import mongoose from 'mongoose';
@@ -12,6 +11,7 @@ import {
   RateLimiterRedis,
 } from 'rate-limiter-flexible';
 import type rateLimiterConfig from '../../../config/rateLimiter.js';
+import { getRedisClientSync } from '../../../helpers/redis/redisConnection.ts';
 import type { IApp } from '../../../server.ts';
 import type { FrameworkRequest } from '../HttpServer.ts';
 import AbstractMiddleware from './AbstractMiddleware.ts';
@@ -59,26 +59,7 @@ class RateLimiter extends AbstractMiddleware {
   }
 
   initRedisLimiter() {
-    const redisConfig = this.app.getConfig('redis');
-    const redisClient = createClient({
-      url: redisConfig.url as string,
-    });
-
-    // TODO: change it
-    (async () => {
-      await redisClient.connect();
-    })();
-
-    redisClient.on('error', (error, b, c) => {
-      this.logger?.error(error, b, c);
-    });
-    redisClient.on('connect', () => {
-      this.logger?.info('Redis connection success');
-    });
-
-    this.app.events.on('shutdown', async () => {
-      await redisClient.close();
-    });
+    const redisClient = getRedisClientSync();
 
     return new RateLimiterRedis({
       storeClient: redisClient,