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)
 * Python: Replace instances of Redis with Valkey ([#2266](https://github.com/valkey-io/valkey-glide/pull/2266))
 * Java: Replace instances of Redis with Valkey ([#2268](https://github.com/valkey-io/valkey-glide/pull/2268))
 * Node: Replace instances of Redis with Valkey ([#2260](https://github.com/valkey-io/valkey-glide/pull/2260))

node/tests/GlideClient.test.ts

@@ -40,6 +40,7 @@ import {
     flushAndCloseClient,
     generateLuaLibCode,
     getClientConfigurationOption,
+    getServerVersion,
     parseCommandLineArgs,
     parseEndpoints,
     transactionTest,
@@ -57,12 +58,12 @@ describe("GlideClient", () => {
     beforeAll(async () => {
         const standaloneAddresses =
             parseCommandLineArgs()["standalone-endpoints"];
-        // Connect to cluster or create a new one based on the parsed addresses
         cluster = standaloneAddresses
             ? await ValkeyCluster.initFromExistingCluster(
                   parseEndpoints(standaloneAddresses),
+                  getServerVersion,
               )
-            : await ValkeyCluster.createCluster(false, 1, 1);
+            : await ValkeyCluster.createCluster(false, 1, 1, getServerVersion);
     }, 20000);
 
     afterEach(async () => {

node/tests/GlideClusterClient.test.ts

@@ -46,6 +46,7 @@ import {
     generateLuaLibCode,
     getClientConfigurationOption,
     getFirstResult,
+    getServerVersion,
     intoArray,
     intoString,
     parseCommandLineArgs,
@@ -68,9 +69,19 @@ describe("GlideClusterClient", () => {
         cluster = clusterAddresses
             ? await ValkeyCluster.initFromExistingCluster(
                   parseEndpoints(clusterAddresses),
+                  async (addresses: [string, number][]) => {
+                      return getServerVersion(addresses, true);
+                  },
               )
             : // setting replicaCount to 1 to facilitate tests routed to replicas
-              await ValkeyCluster.createCluster(true, 3, 1);
+              await ValkeyCluster.createCluster(
+                  true,
+                  3,
+                  1,
+                  async (addresses: [string, number][]) => {
+                      return getServerVersion(addresses, true);
+                  },
+              );
     }, 20000);
 
     afterEach(async () => {

node/tests/PubSub.test.ts

@@ -27,6 +27,7 @@ import {
 import ValkeyCluster from "../../utils/TestUtils";
 import {
     flushAndCloseClient,
+    getServerVersion,
     parseCommandLineArgs,
     parseEndpoints,
 } from "./TestUtilities";
@@ -66,13 +67,22 @@ describe("PubSub", () => {
         cmdCluster = standaloneAddresses
             ? await ValkeyCluster.initFromExistingCluster(
                   parseEndpoints(standaloneAddresses),
+                  getServerVersion,
               )
-            : await ValkeyCluster.createCluster(false, 1, 1);
+            : await ValkeyCluster.createCluster(false, 1, 1, getServerVersion);
         cmeCluster = clusterAddresses
             ? await ValkeyCluster.initFromExistingCluster(
                   parseEndpoints(clusterAddresses),
+                  getServerVersion,
               )
-            : await ValkeyCluster.createCluster(true, 3, 1);
+            : await ValkeyCluster.createCluster(
+                  true,
+                  3,
+                  1,
+                  async (addresses: [string, number][]) => {
+                      return getServerVersion(addresses, true);
+                  },
+              );
     }, 40000);
     afterEach(async () => {
         await flushAndCloseClient(false, cmdCluster.getAddresses());

node/tests/TestUtilities.ts

@@ -24,12 +24,13 @@ import {
     GeospatialData,
     GlideClient,
     GlideClusterClient,
+    GlideReturnType,
     GlideString,
     InfBoundary,
+    InfoOptions,
     InsertPosition,
     ListDirection,
     ProtocolVersion,
-    GlideReturnType,
     ReturnTypeMap,
     ScoreFilter,
     SignedEncoding,
@@ -1756,3 +1757,41 @@ export async function transactionTest(
     responseData.push(["wait(1, 200)", 1]);
     return responseData;
 }
+
+/**
+ * This function gets server version using info command in glide client.
+ *
+ * @param addresses - Addresses containing host and port for the valkey server.
+ * @returns Server version for valkey server
+ */
+export async function getServerVersion(
+    addresses: [string, number][],
+    clusterMode = false,
+): Promise<string> {
+    let info = "";
+    if (clusterMode) {
+        const glideClusterClient = await GlideClusterClient.createClient(
+            getClientConfigurationOption(addresses, ProtocolVersion.RESP2),
+        );
+        info = getFirstResult(
+            await glideClusterClient.info({ sections: [InfoOptions.Server] }),
+        ).toString();
+    } else {
+        const glideClient = await GlideClient.createClient(
+            getClientConfigurationOption(addresses, ProtocolVersion.RESP2),
+        );
+        info = await glideClient.info([InfoOptions.Server]);
+    }
+
+    let version = "";
+    const redisVersionKey = "redis_version:";
+    const valkeyVersionKey = "valkey_version:";
+
+    if (info.includes(valkeyVersionKey)) {
+        version = info.split(valkeyVersionKey)[1].split("\n")[0];
+    } else if (info.includes(redisVersionKey)) {
+        version = info.split(redisVersionKey)[1].split("\n")[0];
+    }
+
+    return version;
+}

utils/TestUtils.ts

@@ -2,7 +2,7 @@
  * Copyright Valkey GLIDE Project Contributors - SPDX Identifier: Apache-2.0
  */
 
-import { exec, execFile } from "child_process";
+import { execFile } from "child_process";
 import { lt } from "semver";
 
 const PY_SCRIPT_PATH = __dirname + "/cluster_manager.py";
@@ -21,9 +21,9 @@ function parseOutput(input: string): {
         .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,33 +50,11 @@ export class ValkeyCluster {
         this.version = version;
     }
 
-    private static async detectVersion(): 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));
-                }
-            });
-        });
-    }
-
     public static createCluster(
         cluster_mode: boolean,
         shardCount: number,
         replicaCount: number,
+        getVersionCallback: (addresses: [string, number][]) => Promise<string>,
         loadModule?: string[]
     ): Promise<ValkeyCluster> {
         return new Promise<ValkeyCluster>((resolve, reject) => {
@@ -98,20 +76,17 @@ export class ValkeyCluster {
                 }
             }
 
-            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(
-                            ValkeyCluster.detectVersion().then(
+                            getVersionCallback(ports).then(
                                 (ver) =>
                                     new ValkeyCluster(ver, ports, clusterFolder)
                             )
@@ -123,9 +98,10 @@ export class ValkeyCluster {
     }
 
     public static async initFromExistingCluster(
-        addresses: [string, number][]
+        addresses: [string, number][],
+        getVersionCallback: (addresses: [string, number][]) => Promise<string>
     ): Promise<ValkeyCluster> {
-        return ValkeyCluster.detectVersion().then(
+        return getVersionCallback(addresses).then(
             (ver) => new ValkeyCluster(ver, addresses, "")
         );
     }