Merge pull request #117 from RedisInsight/main

a new release candidate

Author: egor-zalenski

package.json

@@ -75,7 +75,12 @@
       "\\.(jpg|jpeg|png|ico|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/redisinsight/__mocks__/fileMock.js",
       "\\.(css|less|sass|scss)$": "identity-obj-proxy",
       "uiSrc/(.*)": "<rootDir>/redisinsight/ui/src/$1",
-      "monaco-editor": "<rootDir>/redisinsight/__mocks__/monacoMock.js"
+      "monaco-editor": "<rootDir>/redisinsight/__mocks__/monacoMock.js",
+      "unified": "<rootDir>/redisinsight/__mocks__/unified.js",
+      "remark-parse": "<rootDir>/redisinsight/__mocks__/remarkParse.js",
+      "remark-rehype": "<rootDir>/redisinsight/__mocks__/remarkRehype.js",
+      "rehype-stringify": "<rootDir>/redisinsight/__mocks__/rehypeStringify.js",
+      "unist-util-visit": "<rootDir>/redisinsight/__mocks__/unistUtilsVisit.js"
     },
     "setupFilesAfterEnv": [
       "<rootDir>/redisinsight/ui/src/setup-tests.ts"
@@ -243,7 +248,12 @@
     "react-redux": "^7.2.2",
     "react-jsx-parser": "^1.28.4",
     "react-router-dom": "^5.2.0",
-    "react-virtualized": "^9.22.2"
+    "react-virtualized": "^9.22.2",
+    "remark-parse": "^10.0.1",
+    "remark-rehype": "^10.0.1",
+    "rehype-stringify": "^9.0.2",
+    "unified": "^10.1.1",
+    "unist-util-visit": "^4.1.0"
   },
   "devEngines": {
     "node": ">=14.x <16",

redisinsight/__mocks__/rehypeStringify.js

@@ -0,0 +1 @@
+export default jest.fn()

redisinsight/__mocks__/remarkParse.js

@@ -0,0 +1 @@
+export default jest.fn()

redisinsight/__mocks__/remarkRehype.js

@@ -0,0 +1 @@
+export const unified = jest.fn()

redisinsight/__mocks__/unified.js

@@ -0,0 +1 @@
+export const visit = jest.fn();

redisinsight/__mocks__/unistUtilsVisit.js

@@ -27,6 +27,15 @@ export enum ClusterNodeRole {
   Slave = 'SLAVE',
 }
 
+class ClusterNode extends EndpointDto {
+  @ApiPropertyOptional({
+    description: 'Cluster node slot.',
+    type: Number,
+    example: 0,
+  })
+  slot?: number;
+}
+
 export class CreateCliClientDto {
   @ApiPropertyOptional({
     type: String,
@@ -51,7 +60,7 @@ export class SendCommandDto {
 
   @ApiPropertyOptional({
     description: 'Define output format',
-    default: CliOutputFormatterTypes.Text,
+    default: CliOutputFormatterTypes.Raw,
     enum: CliOutputFormatterTypes,
   })
   @IsOptional()
@@ -123,10 +132,10 @@ export class SendClusterCommandResponse {
   response: any;
 
   @ApiPropertyOptional({
-    type: () => EndpointDto,
+    type: () => ClusterNode,
     description: 'Redis Cluster Node info',
   })
-  node?: EndpointDto;
+  node?: ClusterNode;
 
   @ApiProperty({
     description: 'Redis CLI command execution status',

redisinsight/api/src/modules/cli/dto/cli.dto.ts

@@ -55,7 +55,7 @@ const mockENotFoundMessage = 'ENOTFOUND some message';
 const mockMemoryUsageCommand = 'memory usage key';
 const mockGetEscapedKeyCommand = 'get "\\\\key';
 const mockServerInfoCommand = 'info server';
-const mockIntegerResponse = '(integer) 5';
+const mockIntegerResponse = 5;
 
 describe('CliBusinessService', () => {
   let service: CliBusinessService;
@@ -197,9 +197,9 @@ describe('CliBusinessService', () => {
   });
 
   describe('sendCommand', () => {
-    it('should successfully execute command and return text response', async () => {
+    it('should successfully execute command (RAW format)', async () => {
       const dto: SendCommandDto = { command: mockMemoryUsageCommand };
-      const formatSpy = jest.spyOn(textFormatter, 'format');
+      const formatSpy = jest.spyOn(rawFormatter, 'format');
       const mockResult: SendCommandResponse = {
         response: mockIntegerResponse,
         status: CommandExecutionStatus.Success,
@@ -551,11 +551,42 @@ describe('CliBusinessService', () => {
       );
     });
 
-    it('should successfully execute command for single node with redirection', async () => {
+    it('should successfully execute command for single node with redirection (RAW format)', async () => {
+      const command = 'set foo bar';
+      const mockResult: SendClusterCommandResponse = {
+        response: 'OK',
+        node: { ...mockNode, port: 7002, slot: 7008 },
+        status: CommandExecutionStatus.Success,
+      };
+      cliTool.execCommandForNode
+        .mockResolvedValueOnce({
+          response: mockRedisMovedError.message,
+          error: mockRedisMovedError,
+          status: CommandExecutionStatus.Fail,
+        })
+        .mockResolvedValueOnce({
+          response: 'OK',
+          host: '127.0.0.1',
+          port: 7002,
+          status: CommandExecutionStatus.Success,
+        });
+
+      const result = await service.sendCommandForSingleNode(
+        mockClientOptions,
+        command,
+        ClusterNodeRole.All,
+        nodeOptions,
+        CliOutputFormatterTypes.Raw,
+      );
+
+      expect(cliTool.execCommandForNode).toHaveBeenCalledTimes(2);
+      expect(result).toEqual(mockResult);
+    });
+    it('should successfully execute command for single node with redirection (Text format)', async () => {
       const command = 'set foo bar';
       const mockResult: SendClusterCommandResponse = {
         response: '-> Redirected to slot [7008] located at 127.0.0.1:7002\nOK',
-        node: { ...mockNode, port: 7002 },
+        node: { ...mockNode, port: 7002, slot: 7008 },
         status: CommandExecutionStatus.Success,
       };
       cliTool.execCommandForNode
@@ -576,6 +607,7 @@ describe('CliBusinessService', () => {
         command,
         ClusterNodeRole.All,
         nodeOptions,
+        CliOutputFormatterTypes.Text,
       );
 
       expect(cliTool.execCommandForNode).toHaveBeenCalledTimes(2);

redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.spec.ts

@@ -142,7 +142,7 @@ export class CliBusinessService {
     this.logger.log('Executing redis CLI command.');
     const { command: commandLine } = dto;
     let namespace = AppTool.CLI.toString();
-    const outputFormat = dto.outputFormat || CliOutputFormatterTypes.Text;
+    const outputFormat = dto.outputFormat || CliOutputFormatterTypes.Raw;
     try {
       const formatter = this.outputFormatterManager.getStrategy(outputFormat);
       const [command, ...args] = splitCliCommandLine(commandLine);
@@ -216,7 +216,7 @@ export class CliBusinessService {
     clientOptions: IFindRedisClientInstanceByOptions,
     commandLine: string,
     role: ClusterNodeRole,
-    outputFormat: CliOutputFormatterTypes = CliOutputFormatterTypes.Text,
+    outputFormat: CliOutputFormatterTypes = CliOutputFormatterTypes.Raw,
   ): Promise<SendClusterCommandResponse[]> {
     let namespace = AppTool.CLI.toString();
     this.logger.log(`Executing redis.cluster CLI command for [${role}] nodes.`);
@@ -278,7 +278,7 @@ export class CliBusinessService {
     commandLine: string,
     role: ClusterNodeRole,
     nodeOptions: ClusterSingleNodeOptions,
-    outputFormat: CliOutputFormatterTypes = CliOutputFormatterTypes.Text,
+    outputFormat: CliOutputFormatterTypes = CliOutputFormatterTypes.Raw,
   ): Promise<SendClusterCommandResponse> {
     this.logger.log(`Executing redis.cluster CLI command for single node ${JSON.stringify(nodeOptions)}`);
     try {
@@ -306,6 +306,7 @@ export class CliBusinessService {
           replyEncoding,
         );
         result.response = formatter.format(result.response, { slot, address });
+        result.slot = parseInt(slot, 10);
       } else {
         result.response = formatter.format(result.response);
       }
@@ -316,9 +317,9 @@ export class CliBusinessService {
         { command, outputFormat },
       );
       const {
-        host, port, error, ...rest
+        host, port, error, slot, ...rest
       } = result;
-      return { ...rest, node: { host, port } };
+      return { ...rest, node: { host, port, slot } };
     } catch (error) {
       this.logger.error('Failed to execute redis.cluster CLI command.', error);
 

redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.ts

@@ -11,7 +11,7 @@ class TestFormatterStrategy implements IOutputFormatterStrategy {
     return '';
   }
 }
-const strategyName = CliOutputFormatterTypes.Text;
+const strategyName = CliOutputFormatterTypes.Raw;
 const testStrategy = new TestFormatterStrategy();
 
 describe('OutputFormatterManager', () => {