missed handling for multi in cluster

Author: sjpotter

packages/client/lib/cluster/multi-command.ts

@@ -3,6 +3,7 @@ import RedisMultiCommand, { MULTI_REPLY, MultiReply, MultiReplyType, RedisMultiQ
 import { ReplyWithTypeMapping, CommandReply, Command, CommandArguments, CommanderConfig, RedisFunctions, RedisModules, RedisScripts, RespVersions, TransformReply, RedisScript, RedisFunction, TypeMapping, RedisArgument } from '../RESP/types';
 import { attachConfig, functionArgumentsPrefix, getTransformReply } from '../commander';
 import RedisCluster from '.';
+import { BasicClusterCommandParser } from '../client/parser';
 
 type CommandSignature<
   REPLIES extends Array<unknown>,
@@ -93,13 +94,24 @@ export type ClusterMultiExecute = (
 export default class RedisClusterMultiCommand<REPLIES = []> {
   static #createCommand(command: Command, resp: RespVersions) {
     const transformReply = getTransformReply(command, resp);
+
     return function (this: RedisClusterMultiCommand, ...args: Array<unknown>) {
-      const redisArgs = command.transformArguments(...args),
+      let redisArgs: CommandArguments = [];
+      let firstKey: RedisArgument | undefined;
+
+      if (command.parseCommand) {
+        const parser = new BasicClusterCommandParser(resp);
+        command.parseCommand(parser, ...args);
+        firstKey = parser.firstKey;
+      } else {
+        redisArgs = command.transformArguments(...args);
         firstKey = RedisCluster.extractFirstKey(
           command,
           args,
           redisArgs
         );
+      }
+      
       return this.addCommand(
         firstKey,
         command.IS_READ_ONLY,
@@ -111,13 +123,23 @@ export default class RedisClusterMultiCommand<REPLIES = []> {
 
   static #createModuleCommand(command: Command, resp: RespVersions) {
     const transformReply = getTransformReply(command, resp);
+
     return function (this: { _self: RedisClusterMultiCommand }, ...args: Array<unknown>) {
-      const redisArgs = command.transformArguments(...args),
+      let redisArgs: CommandArguments = [];
+      let firstKey: RedisArgument | undefined;
+
+      if (command.parseCommand) {
+        const parser = new BasicClusterCommandParser(resp);
+        command.parseCommand(parser, ...args);
+        firstKey = parser.firstKey;
+      } else {
+        redisArgs = command.transformArguments(...args);
         firstKey = RedisCluster.extractFirstKey(
           command,
           args,
           redisArgs
         );
+      }
       return this._self.addCommand(
         firstKey,
         command.IS_READ_ONLY,
@@ -128,17 +150,29 @@ export default class RedisClusterMultiCommand<REPLIES = []> {
   }
 
   static #createFunctionCommand(name: string, fn: RedisFunction, resp: RespVersions) {
-    const prefix = functionArgumentsPrefix(name, fn),
-      transformReply = getTransformReply(fn, resp);
+    const prefix = functionArgumentsPrefix(name, fn);
+    const transformReply = getTransformReply(fn, resp);
+
     return function (this: { _self: RedisClusterMultiCommand }, ...args: Array<unknown>) {
-      const fnArgs = fn.transformArguments(...args),
-        redisArgs: CommandArguments = prefix.concat(fnArgs),
+      let fnArgs: CommandArguments = [];
+      let firstKey: RedisArgument | undefined;
+
+      if (fn.parseCommand) {
+        const parser = new BasicClusterCommandParser(resp);
+        fn.parseCommand(parser, ...args);
+        firstKey = parser.firstKey;
+      } else {
+        fnArgs = fn.transformArguments(...args);
         firstKey = RedisCluster.extractFirstKey(
           fn,
           args,
           fnArgs
         );
+      }
+
+      const redisArgs: CommandArguments = prefix.concat(fnArgs);
       redisArgs.preserve = fnArgs.preserve;
+
       return this._self.addCommand(
         firstKey,
         fn.IS_READ_ONLY,
@@ -150,21 +184,34 @@ export default class RedisClusterMultiCommand<REPLIES = []> {
 
   static #createScriptCommand(script: RedisScript, resp: RespVersions) {
     const transformReply = getTransformReply(script, resp);
+
     return function (this: RedisClusterMultiCommand, ...args: Array<unknown>) {
-      const scriptArgs = script.transformArguments(...args);
-      this.#setState(
-        RedisCluster.extractFirstKey(
+      let scriptArgs: CommandArguments = [];
+      let firstKey: RedisArgument | undefined;
+
+      if (script.parseCommand) {
+        const parser = new BasicClusterCommandParser(resp);
+        script.parseCommand(parser, ...args);
+        firstKey = parser.firstKey;
+      } else {
+        scriptArgs = script.transformArguments(...args);
+        firstKey = RedisCluster.extractFirstKey(
           script,
           args,
           scriptArgs
-        ),
+        )
+      }
+
+      this.#setState(
+        firstKey,
         script.IS_READ_ONLY
       );
       this.#multi.addScript(
         script,
         scriptArgs,
         transformReply
       );
+
       return this;
     };
   }