Fix processing cluster response. (#421)

* Fix processing cluster response. Signed-off-by: Yury-Fridlyand <[email protected]> Co-authored-by: Andrew Carbonetto <[email protected]>
Bit-Quill · Sep 5, 2024 · 6d832a4 · 6d832a4
1 parent b8bf37b
commit 6d832a4
Show file tree

Hide file tree

Showing 8 changed files with 224 additions and 131 deletions.
diff --git a/node/src/BaseClient.ts b/node/src/BaseClient.ts
@@ -348,20 +348,54 @@ function convertGlideRecordForZSet(
 
 /**
  * @internal
- * Downcast `GlideRecord` to `Record`. Use if you are 146% aware that `data` keys are always strings.
+ * Recursively downcast `GlideRecord` to `Record`. Use if `data` keys are always strings.
  */
 export function glideRecordToRecord<T>(
     data: GlideRecord<T>,
 ): Record<string, T> {
     const res: Record<string, T> = {};
 
     for (const pair of data) {
-        res[pair.key as string] = pair.value;
+        let newVal = pair.value;
+
+        if (isGlideRecord(pair.value)) {
+            newVal = glideRecordToRecord(
+                pair.value as GlideRecord<unknown>,
+            ) as T;
+        } else if (isGlideRecordArray(pair.value)) {
+            newVal = (pair.value as GlideRecord<unknown>[]).map(
+                glideRecordToRecord,
+            ) as T;
+        }
+
+        res[pair.key as string] = newVal;
     }
 
     return res;
 }
 
+/**
+ * @internal
+ * Check whether an object is a `GlideRecord` (see {@link GlideRecord}).
+ */
+function isGlideRecord(obj?: unknown): boolean {
+    return (
+        Array.isArray(obj) &&
+        obj.length > 0 &&
+        typeof obj[0] === "object" &&
+        "key" in obj[0] &&
+        "value" in obj[0]
+    );
+}
+
+/**
+ * @internal
+ * Check whether an object is a `GlideRecord[]` (see {@link GlideRecord}).
+ */
+function isGlideRecordArray(obj?: unknown): boolean {
+    return Array.isArray(obj) && obj.length > 0 && isGlideRecord(obj[0]);
+}
+
 /** Represents the return type of {@link xinfoStream} command. */
 export type ReturnTypeXinfoStream = Record<
     string,
@@ -5665,32 +5699,8 @@ export class BaseClient {
                 | GlideRecord<StreamEntries | GlideRecord<StreamEntries>[]>[]
             >
         >(createXInfoStream(key, options?.fullOptions ?? false), options).then(
-            (xinfoStream) => {
-                const converted = glideRecordToRecord(xinfoStream);
-
-                if (options?.fullOptions) {
-                    const groups = (
-                        converted["groups"] as GlideRecord<
-                            | GlideRecord<StreamEntries>[]
-                            | Record<string, StreamEntries>[]
-                        >[]
-                    ).map(glideRecordToRecord);
-
-                    for (const group of groups) {
-                        group.consumers = (
-                            group.consumers as GlideRecord<StreamEntries>[]
-                        ).map(glideRecordToRecord);
-                    }
-
-                    (converted as ReturnTypeXinfoStream).groups =
-                        groups as Record<
-                            string,
-                            Record<string, StreamEntries>[]
-                        >[];
-                }
-
-                return converted as ReturnTypeXinfoStream;
-            },
+            (xinfoStream) =>
+                glideRecordToRecord(xinfoStream) as ReturnTypeXinfoStream,
         );
     }
 

diff --git a/node/src/Commands.ts b/node/src/Commands.ts
@@ -2358,7 +2358,7 @@ export type FunctionListOptions = {
 /** Type of the response of `FUNCTION LIST` command. */
 export type FunctionListResponse = Record<
     string,
-    GlideString | Record<string, GlideString | GlideString[]>[]
+    GlideString | Record<string, GlideString | null | GlideString[]>[]
 >[];
 
 /**

diff --git a/node/src/GlideClient.ts b/node/src/GlideClient.ts
@@ -8,20 +8,14 @@ import {
     BaseClientConfiguration,
     Decoder,
     DecoderOption,
+    GlideRecord,
+    glideRecordToRecord,
     GlideString,
     PubSubMsg,
     ReadFrom, // eslint-disable-line @typescript-eslint/no-unused-vars
     ReturnType,
 } from "./BaseClient";
 import {
-    FlushMode,
-    FunctionListOptions,
-    FunctionListResponse,
-    FunctionRestorePolicy,
-    FunctionStatsFullResponse,
-    InfoOptions,
-    LolwutOptions,
-    SortOptions,
     createClientGetName,
     createClientId,
     createConfigGet,
@@ -54,6 +48,14 @@ import {
     createSortReadOnly,
     createTime,
     createUnWatch,
+    FlushMode,
+    FunctionListOptions,
+    FunctionListResponse,
+    FunctionRestorePolicy,
+    FunctionStatsFullResponse,
+    InfoOptions,
+    LolwutOptions,
+    SortOptions,
 } from "./Commands";
 import { connection_request } from "./ProtobufMessage";
 import { Transaction } from "./Transaction";
@@ -397,9 +399,12 @@ export class GlideClient extends BaseClient {
         parameters: string[],
         decoder?: Decoder,
     ): Promise<Record<string, GlideString>> {
-        return this.createWritePromise(createConfigGet(parameters), {
-            decoder: decoder,
-        });
+        return this.createWritePromise<GlideRecord<GlideString>>(
+            createConfigGet(parameters),
+            {
+                decoder,
+            },
+        ).then(glideRecordToRecord);
     }
 
     /**
@@ -654,9 +659,12 @@ export class GlideClient extends BaseClient {
     public async functionList(
         options?: FunctionListOptions & DecoderOption,
     ): Promise<FunctionListResponse> {
-        return this.createWritePromise(createFunctionList(options), {
-            decoder: options?.decoder,
-        });
+        return this.createWritePromise<GlideRecord<unknown>[]>(
+            createFunctionList(options),
+            {
+                decoder: options?.decoder,
+            },
+        ).then((res) => res.map(glideRecordToRecord) as FunctionListResponse);
     }
 
     /**
@@ -708,9 +716,12 @@ export class GlideClient extends BaseClient {
     public async functionStats(
         decoder?: Decoder,
     ): Promise<FunctionStatsFullResponse> {
-        return this.createWritePromise(createFunctionStats(), {
-            decoder,
-        });
+        return this.createWritePromise<GlideRecord<unknown>>(
+            createFunctionStats(),
+            {
+                decoder,
+            },
+        ).then((res) => glideRecordToRecord(res) as FunctionStatsFullResponse);
     }
 
     /**