Get valkey/redis version using client's info command

CHANGELOG.md

@@ -1,4 +1,5 @@
 #### Changes
+* Node: Get valkey/redis version using cli command ([#2276]https://github.com/valkey-io/valkey-glide/pull/2276)
 * Java: Fetch server version using info command ([#2258](https://github.com/valkey-io/valkey-glide/pull/2258))
 * Node: Added binary variant for commands which have `Record` as input or output ([#2207](https://github.com/valkey-io/valkey-glide/pull/2207))
 * Node: Renamed `ReturnType` to `GlideReturnType` ([#2241](https://github.com/valkey-io/valkey-glide/pull/2241))

node/tests/GlideClusterClient.test.ts

@@ -17,7 +17,11 @@ import {
     ClusterTransaction,
     convertRecordToGlideRecord,
     Decoder,
+    FlushMode,
     FunctionListResponse,
+    FunctionRestorePolicy,
+    FunctionStatsSingleResponse,
+    GeoUnit,
     GlideClusterClient,
     GlideReturnType,
     InfoOptions,
@@ -27,10 +31,6 @@ import {
     Routes,
     ScoreFilter,
     SlotKeyTypes,
-    FlushMode,
-    FunctionRestorePolicy,
-    FunctionStatsSingleResponse,
-    GeoUnit,
     SortOrder,
 } from "..";
 import { RedisCluster } from "../../utils/TestUtils.js";

utils/TestUtils.ts

@@ -21,9 +21,9 @@
         .split(",")
         .map((address) => address.split(":"))
         .map((address) => [address[0], Number(address[1])]) as [
-        string,
-        number
-    ][];
+            string,
+            number
+        ][];
 
     if (clusterFolder === undefined || ports === undefined) {
         throw new Error(`Insufficient data in input: ${input}`);
@@ -50,26 +50,34 @@
         this.version = version;
     }
 
-    private static async detectVersion(): Promise<string> {
+    private static async detectVersion(addresses: [string, number][]): Promise<string> {
         return new Promise<string>((resolve, reject) => {
-            const extractVersion = (stdout: string): string =>
-                stdout.split("v=")[1].split(" ")[0];
-
-            // First, try with `valkey-server -v`
-            exec("valkey-server -v", (error, stdout) => {
-                if (error) {
-                    // If `valkey-server` fails, try `redis-server -v`
-                    exec("redis-server -v", (error, stdout) => {
-                        if (error) {
-                            reject(error);
-                        } else {
-                            resolve(extractVersion(stdout));
-                        }
-                    });
-                } else {
-                    resolve(extractVersion(stdout));
-                }
-            });
+            const redisVersionKey = "redis_version:";
+            const valkeyVersionKey = "valkey_version:";
+            const extractVersion = (versionKey: string, stdout: string): string =>
+                stdout.split(versionKey)[1].split("\n")[0];
+            if (addresses.length > 0 && addresses[0].length > 1) {
+                let redisInfoCommand = "redis-cli -h " + addresses[0][0] + " -p " + addresses[0][1] + " info";
+                let valkeyInfoCommand = "valkey-cli -h " + addresses[0][0] + " -p " + addresses[0][1] + " info";
+
+                //First, try with `valkey-server -v`
+                exec(valkeyInfoCommand, (error, stdout) => {
+                    if (error) {
+                        // If `valkey-server` fails, try `redis-server -v`
+                        exec(redisInfoCommand, (error, stdout) => {
+                            if (error) {
+                                reject(error);
+                            } else {
+                                resolve(extractVersion(redisVersionKey, stdout));
+                            }
+                        });
+                    } else {
+                        resolve(extractVersion(valkeyVersionKey, stdout));
+                    }
+                });
+            } else {
+                reject("Addresses not found for getting valkey/redis version");
+            }
         });
     }
 
@@ -98,20 +106,17 @@
                 }
             }
 
-            console.log(command);
             execFile(
                 "python3",
                 [PY_SCRIPT_PATH, ...command.split(" ")],
                 (error, stdout, stderr) => {
                     if (error) {
-                        console.error(stderr);
                         reject(error);
                     } else {
                         const { clusterFolder, addresses: ports } =
                             parseOutput(stdout);
-
                         resolve(
-                            RedisCluster.detectVersion().then(
+                            RedisCluster.detectVersion(ports).then(
                                 (ver) =>
                                     new RedisCluster(ver, ports, clusterFolder)
                             )
@@ -125,7 +130,7 @@
     public static async initFromExistingCluster(
         addresses: [string, number][]
     ): Promise<RedisCluster> {
-        return RedisCluster.detectVersion().then(
+        return RedisCluster.detectVersion(addresses).then(
             (ver) => new RedisCluster(ver, addresses, "")
         );
     }