Merge pull request #3085 from RedisInsight/bugfix/release/2.44.0

Bugfix/release/2.44.0

Author: vlad-dargel

redisinsight/api/src/modules/browser/redisearch/redisearch.service.spec.ts

@@ -81,8 +81,8 @@ describe('RedisearchService', () => {
   describe('list', () => {
     it('should get list of indexes for standalone', async () => {
       standaloneClient.sendCommand.mockResolvedValue([
-        keyName1.toString(),
-        keyName2.toString(),
+        keyName1,
+        keyName2,
       ]);
 
       const list = await service.list(mockBrowserClientMetadata);
@@ -97,8 +97,8 @@ describe('RedisearchService', () => {
     it('should get list of indexes for cluster (handle unique index name)', async () => {
       databaseClientFactory.getOrCreateClient = jest.fn().mockResolvedValue(clusterClient);
       mockStandaloneRedisClient.sendCommand.mockResolvedValue([
-        keyName1.toString(),
-        keyName2.toString(),
+        keyName1,
+        keyName2,
       ]);
 
       const list = await service.list(mockBrowserClientMetadata);

redisinsight/api/src/modules/browser/redisearch/redisearch.service.ts

@@ -49,14 +49,18 @@ export class RedisearchService {
 
     try {
       const client: RedisClient = await this.databaseClientFactory.getOrCreateClient(clientMetadata);
-      const nodes = this.getShards(client) as RedisClient[];
+      const nodes = await this.getShards(client) as RedisClient[];
 
       const res = await Promise.all(nodes.map(async (node) => node.sendCommand(
         ['FT._LIST'],
       )));
 
       return plainToClass(ListRedisearchIndexesResponse, {
-        indexes: (uniq([].concat(...res))).map((idx) => Buffer.from(idx)),
+        indexes: (
+          uniq(
+            ([].concat(...res)).map((idx) => idx.toString('hex')),
+          )
+        ).map((idx) => Buffer.from(idx, 'hex')),
       });
     } catch (e) {
       this.logger.error('Failed to get redisearch indexes', e);
@@ -100,7 +104,7 @@ export class RedisearchService {
         }
       }
 
-      const nodes = this.getShards(client) as RedisClient[];
+      const nodes = await this.getShards(client) as RedisClient[];
 
       const commandArgs: any[] = [
         index, 'ON', type,
@@ -121,7 +125,7 @@ export class RedisearchService {
             ...commandArgs,
           ], { replyEncoding: 'utf8' });
         } catch (e) {
-          if (!e.message.includes('MOVED')) {
+          if (!e.message.includes('MOVED') && !e.message.includes('already exists')) {
             throw e;
           }
         }
@@ -228,7 +232,7 @@ export class RedisearchService {
    * @param client
    * @private
    */
-  private getShards(client: RedisClient): Promise<RedisClient[]> | RedisClient[] {
+  private async getShards(client: RedisClient): Promise<RedisClient[]> {
     if (client.getConnectionType() === RedisClientConnectionType.CLUSTER) {
       return client.nodes(RedisClientNodeRole.PRIMARY);
     }