moves client creation out of cache service

Signed-off-by: Konstantina Blazhukova <konstantina.blajukova@gmail.com>

Author: konstantinabl

packages/relay/src/lib/clients/cache/redisCache.ts

@@ -3,7 +3,7 @@
 import { ConfigService } from '@hashgraph/json-rpc-config-service/dist/services';
 import { Logger } from 'pino';
 import { Registry } from 'prom-client';
-import { createClient, RedisClientType } from 'redis';
+import type { RedisClientType } from 'redis';
 
 import { Utils } from '../../../utils';
 import { RedisCacheError } from '../../errors/RedisCacheError';
@@ -53,22 +53,10 @@ export class RedisCache implements IRedisCacheClient {
    * @param {Logger} logger - The logger instance.
    * @param {Registry} register - The metrics registry.
    */
-  public constructor(logger: Logger, register: Registry) {
+  public constructor(logger: Logger, register: Registry, client: RedisClientType) {
     this.logger = logger;
     this.register = register;
-
-    const redisUrl = ConfigService.get('REDIS_URL')!;
-    const reconnectDelay = ConfigService.get('REDIS_RECONNECT_DELAY_MS');
-    this.client = createClient({
-      url: redisUrl,
-      socket: {
-        reconnectStrategy: (retries: number) => {
-          const delay = retries * reconnectDelay;
-          logger.warn(`Trying to reconnect with Redis, retry #${retries}. Delay is ${delay} ms...`);
-          return delay;
-        },
-      },
-    });
+    this.client = client;
     this.connected = this.client
       .connect()
       .then(() => true)
@@ -82,7 +70,9 @@ export class RedisCache implements IRedisCacheClient {
         this.logger.error(error);
         return 0;
       });
-      logger.info(`Connected to Redis server (${redisUrl}) successfully! Number of connections: ${connections}`);
+      logger.info(
+        `Connected to Redis server (${ConfigService.get('REDIS_URL')}) successfully! Number of connections: ${connections}`,
+      );
     });
     this.client.on('end', () => {
       this.connected = Promise.resolve(false);

packages/relay/src/lib/relay.ts

@@ -4,6 +4,7 @@ import { ConfigService } from '@hashgraph/json-rpc-config-service/dist/services'
 import { AccountId } from '@hashgraph/sdk';
 import { Logger } from 'pino';
 import { Gauge, Registry } from 'prom-client';
+import { createClient, RedisClientType } from 'redis';
 
 import { Admin, Eth, Net, Web3 } from '../index';
 import { Utils } from '../utils';
@@ -127,11 +128,24 @@ export class Relay {
     register: Registry,
   ) {
     logger.info('Configurations successfully loaded');
-
+    // Initialize Redis client for cache (DB index defaults to 0)
+    const redisUrl = ConfigService.get('REDIS_URL')!;
+    const reconnectDelay = ConfigService.get('REDIS_RECONNECT_DELAY_MS');
+    const cacheRedisClient: RedisClientType = createClient({
+      url: redisUrl,
+      socket: {
+        reconnectStrategy: (retries: number) => retries * reconnectDelay,
+      },
+    });
     const chainId = ConfigService.get('CHAIN_ID');
     const duration = constants.HBAR_RATE_LIMIT_DURATION;
     const reservedKeys = HbarSpendingPlanConfigService.getPreconfiguredSpendingPlanKeys(logger);
-    this.cacheService = new CacheService(logger.child({ name: 'cache-service' }), register, reservedKeys);
+    this.cacheService = new CacheService(
+      logger.child({ name: 'cache-service' }),
+      register,
+      reservedKeys,
+      cacheRedisClient,
+    );
 
     const hbarSpendingPlanRepository = new HbarSpendingPlanRepository(
       this.cacheService,

packages/relay/src/lib/services/cacheService/cacheService.ts

@@ -3,6 +3,7 @@
 import { ConfigService } from '@hashgraph/json-rpc-config-service/dist/services';
 import type { Logger } from 'pino';
 import { Counter, Registry } from 'prom-client';
+import type { RedisClientType } from 'redis';
 
 import { LocalLRUCache, RedisCache } from '../../clients';
 import { ICacheClient } from '../../clients/cache/ICacheClient';
@@ -78,7 +79,12 @@ export class CacheService {
 
   private readonly cacheMethodsCounter: Counter;
 
-  public constructor(logger: Logger, register: Registry = new Registry(), reservedKeys: Set<string> = new Set()) {
+  public constructor(
+    logger: Logger,
+    register: Registry = new Registry(),
+    reservedKeys: Set<string> = new Set(),
+    redisClient?: RedisClientType,
+  ) {
     this.logger = logger;
     this.register = register;
 
@@ -88,7 +94,7 @@ export class CacheService {
     this.shouldMultiSet = ConfigService.get('MULTI_SET');
 
     if (this.isSharedCacheEnabled) {
-      this.sharedCache = new RedisCache(logger.child({ name: 'redisCache' }), register);
+      this.sharedCache = new RedisCache(logger.child({ name: 'redisCache' }), register, redisClient!);
     }
 
     /**