RI-6336 - added cluster strategy implementation. Fixed integration tests

Author: KIvanow

redisinsight/api/src/modules/browser/keys/scanner/strategies/cluster.scanner.strategy.ts

@@ -121,7 +121,7 @@ export class ClusterScannerStrategy extends ScannerStrategy {
         // eslint-disable-next-line no-param-reassign
         node.scanned = isNull(node.total) ? 1 : node.total;
       });
-      nodes[0].keys = await this.getKeysInfo(client, [keyName]);
+      nodes[0].keys = await this.getKeysInfo(client, [keyName], undefined, true, true);
       nodes[0].keys = nodes[0].keys.filter((key: GetKeyInfoResponse) => {
         if (key.ttl === -2) {
           return false;
@@ -159,6 +159,8 @@ export class ClusterScannerStrategy extends ScannerStrategy {
             node.node,
             node.keys,
             args.type,
+            true,
+            true
           );
         } else {
           // eslint-disable-next-line no-param-reassign
@@ -180,34 +182,44 @@ export class ClusterScannerStrategy extends ScannerStrategy {
     client: RedisClient,
     keys: RedisString[],
     filterType?: RedisDataType,
+    getSize?: boolean,
+    getTtl?: boolean
   ): Promise<GetKeyInfoResponse[]> {
     return Promise.all(keys.map(async (key) => {
-      const commands: RedisClientCommand[] = [
-        [BrowserToolKeysCommands.Ttl, key],
-        ['memory', 'usage', key, 'samples', '0'],
-      ];
+      const commands: RedisClientCommand[] = [];
+      const responseMap = {
+        ttl: null,
+        size: null,
+        type: null
+      }
+
+      if (getTtl) {
+        responseMap.ttl = commands.length
+        commands.push([BrowserToolKeysCommands.Ttl, key]);
+      }
+
+      if (getSize) {
+        responseMap.size = commands.length
+        commands.push(['memory', 'usage', key, 'samples', '0']);
+      }
 
       if (!filterType) {
+        responseMap.type = commands.length
         commands.push([BrowserToolKeysCommands.Type, key]);
       }
 
       const result = await client.sendPipeline(commands, { replyEncoding: 'utf8' }) as any[];
 
       if (filterType) {
+        responseMap.type = commands.length
         result.push([null, filterType]);
       }
 
-      const [
-        [, ttl = null],
-        [, size = null],
-        [, type = null],
-      ] = result;
-
       return {
         name: key,
-        type,
-        ttl,
-        size,
+        type: result[responseMap.type]?.[1],
+        ttl: responseMap.ttl !== null ? result[responseMap.ttl][1] : null,
+        size: responseMap.size !== null ? result[responseMap.size][1] : null,
       };
     }));
   }

redisinsight/api/src/modules/browser/keys/scanner/strategies/standalone.scanner.strategy.ts

@@ -126,7 +126,7 @@ export class StandaloneScannerStrategy extends ScannerStrategy {
       const keyName = Buffer.from(unescapeRedisGlob(match));
       node.cursor = 0;
       node.scanned = isNull(node.total) ? 1 : node.total;
-      node.keys = await this.getKeysInfo(client, [keyName]);
+      node.keys = await this.getKeysInfo(client, [keyName], undefined, true, true);
       node.keys = node.keys.filter((key: GetKeyInfoResponse) => {
         if (key.ttl === -2) {
           return false;
@@ -142,7 +142,7 @@ export class StandaloneScannerStrategy extends ScannerStrategy {
     await this.scan(client, node, match, count, scanThreshold, args.type);
 
     if (node.keys.length && args.keysInfo) {
-      node.keys = await this.getKeysInfo(client, node.keys, args.type);
+      node.keys = await this.getKeysInfo(client, node.keys, args.type, true, true);
     } else {
       node.keys = node.keys.map((name) => ({ name, type: args.type || undefined }));
     }

redisinsight/api/test/api/keys/POST-databases-id-keys.test.ts

@@ -302,8 +302,6 @@ describe('POST /databases/:id/keys', () => {
           data: {
             cursor: '0',
             match: `${constants.TEST_RUN_ID}_str_key_10?`,
-            getTtl: true,
-            getSize: true,
           },
           responseSchema,
           checkFn: ({ body }) => {
@@ -337,8 +335,6 @@ describe('POST /databases/:id/keys', () => {
             cursor: '0',
             match: `${constants.TEST_RUN_ID}_str_key_10?`,
             keysInfo: 'false',
-            getTtl: true,
-            getSize: true,
           },
           responseSchema,
           checkFn: ({ body }) => {
@@ -592,8 +588,6 @@ describe('POST /databases/:id/keys', () => {
               cursor: '0',
               type: 'string',
               count: 200,
-              getTtl: true,
-              getSize: true,
             },
             responseSchema,
             checkFn: ({ body }) => {
@@ -892,8 +886,6 @@ describe('POST /databases/:id/keys', () => {
               cursor: '0',
               type: 'string',
               count: 200,
-              getTtl: true,
-              getSize: true,
             },
             responseSchema,
             checkFn: ({ body }) => {
@@ -976,8 +968,6 @@ describe('POST /databases/:id/keys', () => {
           data: {
             cursor: '0',
             count: 200,
-            getTtl: true,
-            getSize: true,
           },
           responseSchema,
           checkFn: async ({ body }) => {