refactor getInfo

Author: KrumTy

redisinsight/api/src/modules/cluster-monitor/cluster-monitor.service.ts

@@ -41,7 +41,7 @@ export class ClusterMonitorService {
         return Promise.reject(new BadRequestException('Current database is not in a cluster mode'));
       }
 
-      const info = await client.getInfo(true, 'server');
+      const info = await client.getInfo('server');
 
       const strategy = this.getClusterInfoStrategy(get(info, 'server.redis_version'));
 

redisinsight/api/src/modules/recommendation/providers/recommendation.provider.ts

@@ -39,7 +39,7 @@ export class RecommendationProvider {
     redisClient: RedisClient,
   ): Promise<Recommendation> {
     try {
-      const info = await redisClient.getInfo(true, 'memory');
+      const info = await redisClient.getInfo('memory');
       const nodesNumbersOfCachedScripts = get(info, 'memory.number_of_cached_scripts');
 
       return parseInt(nodesNumbersOfCachedScripts, 10) > LUA_SCRIPT_RECOMMENDATION_COUNT
@@ -90,7 +90,7 @@ export class RecommendationProvider {
       return null;
     }
     try {
-      const info = await redisClient.getInfo(true, 'keyspace');
+      const info = await redisClient.getInfo('keyspace');
       const keyspace = get(info, 'keyspace', {});
       const databasesWithKeys = Object.values(keyspace).filter((db) => {
         const { keys } = convertMultilineReplyToObject(db as string, ',', '=');
@@ -283,7 +283,7 @@ export class RecommendationProvider {
     redisClient: RedisClient,
   ): Promise<Recommendation> {
     try {
-      const info = await redisClient.getInfo(true, 'clients');
+      const info = await redisClient.getInfo('clients');
       const connectedClients = parseInt(get(info, 'clients.connected_clients'), 10);
 
       return connectedClients > BIG_AMOUNT_OF_CONNECTED_CLIENTS_RECOMMENDATION_CLIENTS
@@ -325,7 +325,7 @@ export class RecommendationProvider {
     redisClient: RedisClient,
   ): Promise<Recommendation> {
     try {
-      const info = await redisClient.getInfo(true, 'server');
+      const info = await redisClient.getInfo('server');
       const version = get(info, 'server.redis_version');
       return semverCompare(version, REDIS_VERSION_RECOMMENDATION_VERSION) >= 0
         ? null

redisinsight/api/src/modules/redis/client/redis.client.ts

@@ -51,7 +51,7 @@ export enum RedisFeature {
 export abstract class RedisClient extends EventEmitter2 {
   public readonly id: string;
 
-  protected info: any;
+  protected _redisVersion: string | undefined;
 
   protected lastTimeUsed: number;
 
@@ -147,8 +147,8 @@ export abstract class RedisClient extends EventEmitter2 {
     switch (feature) {
       case RedisFeature.HashFieldsExpiration:
         try {
-          const info = await this.getInfo(false);
-          return info?.['server']?.['redis_version'] && semverCompare('7.3', info['server']['redis_version']) < 1;
+          const redisVersion = await this.getRedisVersion();
+          return redisVersion && semverCompare('7.3', redisVersion) < 1;
         } catch (e) {
           return false;
         }
@@ -157,39 +157,39 @@ export abstract class RedisClient extends EventEmitter2 {
     }
   }
 
+  private async getRedisVersion(): Promise<string> {
+    if (!this._redisVersion) {
+      const infoData = await this.getInfo('server');
+      this._redisVersion = infoData?.server?.redis_version;
+    }
+
+    return this._redisVersion;
+  }
+
   /**
    * Get redis database info
    * Uses cache by default
    * @param force
    * @param infoSection - e.g. server, clients, memory, etc.
    */
-  public async getInfo(force = true, infoSection?: string) {
-    if (force || !this.info) {
-      try {
-        const infoData = convertRedisInfoReplyToObject(await this.call(
-          infoSection ? ['info', infoSection] : ['info'],
-          { replyEncoding: 'utf8' },
-        ) as string);
-
-        this.info = {
-          ...this.info,
-          ...infoData,
-        }
-      } catch (error) {
-        if (error.message.includes(ERROR_MESSAGES.NO_INFO_COMMAND_PERMISSION)) {
-          try {
-            // Fallback to getting basic information from `hello` command
-            this.info = await this.getRedisHelloInfo();
-          } catch (_error) {
-            this.info = UNKNOWN_REDIS_INFO;
-          }
-        } else {
-          this.info = UNKNOWN_REDIS_INFO;
+  public async getInfo(infoSection?: string) {
+    try {
+      return convertRedisInfoReplyToObject(await this.call(
+        infoSection ? ['info', infoSection] : ['info'],
+        { replyEncoding: 'utf8' },
+      ) as string);
+    } catch (error) {
+      if (error.message.includes(ERROR_MESSAGES.NO_INFO_COMMAND_PERMISSION)) {
+        try {
+          // Fallback to getting basic information from `hello` command
+          return await this.getRedisHelloInfo();
+        } catch (_error) {
+          // Ignore: hello is not available pre redis version 6
         }
       }
     }
 
-    return this.info;
+    return UNKNOWN_REDIS_INFO;
   }
 
   private async getRedisHelloInfo() {

redisinsight/api/src/modules/redis/utils/keys.util.ts

@@ -5,7 +5,7 @@ import { convertMultilineReplyToObject } from 'src/modules/redis/utils/reply.uti
 export const getTotalKeysFromInfo = async (client: RedisClient) => {
   try {
     const currentDbIndex = await client.getCurrentDbIndex();
-    const info = await client.getInfo(true, 'keyspace');
+    const info = await client.getInfo('keyspace');
 
     const dbInfo = get(info, 'keyspace', {});
     if (!dbInfo[`db${currentDbIndex}`]) {