feat: support more compatibility with redis client (#85)

Author: supercaracal

docs/class_diagrams_redis_cluster_client.md

@@ -94,6 +94,9 @@ classDiagram
   RedisClient_Cluster ..> RedisClient_Cluster_PubSub : new
   RedisClient_Cluster ..> RedisClient_Cluster_Router : new
 
+  RedisClient_Cluster_Pipeline ..> RedisClient_Cluster_Router : use
+  RedisClient_Cluster_PubSub ..> RedisClient_Cluster_Router : use
+
   RedisClient_Cluster_Router ..> RedisClient_Cluster_Node : new
   RedisClient_Cluster_Router ..> RedisClient_Cluster_Command : new
   RedisClient_Cluster_Router ..> module_RedisClient_Cluster_KeySlotConverter : call

lib/redis_client/cluster.rb

@@ -11,7 +11,6 @@ class Cluster
 
     def initialize(config, pool: nil, **kwargs)
       @router = ::RedisClient::Cluster::Router.new(config, pool: pool, **kwargs)
-      @command_builder = config.command_builder
     end
 
     def inspect
@@ -78,19 +77,16 @@ def close
     def method_missing(name, *args, **kwargs)
       if @router.command_exists?(name)
         args.unshift(name)
-        args = @command_builder.generate!(args, kwargs)
-        @router.send_command(:call, *args)
-      else
-        super
+        return @router.send_command(:call, *args)
       end
+
+      super
     end
 
     def respond_to_missing?(name, include_private = false)
-      if @router.command_exists?(name)
-        true
-      else
-        super
-      end
+      return true if @router.command_exists?(name)
+
+      super
     end
   end
 end

lib/redis_client/cluster/pipeline.rb

@@ -15,19 +15,19 @@ def initialize(router)
       end
 
       def call(*command, **kwargs)
-        node_key = @router.find_node_key(*command, primary_only: true)
+        node_key = @router.find_node_key(*command, primary_only: true, **kwargs)
         @grouped[node_key] += [[@size, :call, command, kwargs]]
         @size += 1
       end
 
       def call_once(*command, **kwargs)
-        node_key = @router.find_node_key(*command, primary_only: true)
+        node_key = @router.find_node_key(*command, primary_only: true, **kwargs)
         @grouped[node_key] += [[@size, :call_once, command, kwargs]]
         @size += 1
       end
 
       def blocking_call(timeout, *command, **kwargs)
-        node_key = @router.find_node_key(*command, primary_only: true)
+        node_key = @router.find_node_key(*command, primary_only: true, **kwargs)
         @grouped[node_key] += [[@size, :blocking_call, timeout, command, kwargs]]
         @size += 1
       end

lib/redis_client/cluster/pub_sub.rb

@@ -10,7 +10,7 @@ def initialize(router)
 
       def call(*command, **kwargs)
         close
-        @pubsub = @router.assign_node(*command).pubsub
+        @pubsub = @router.assign_node(*command, **kwargs).pubsub
         @pubsub.call(*command, **kwargs)
       end
 

lib/redis_client/cluster/router.rb

@@ -20,11 +20,13 @@ def initialize(config, pool: nil, **kwargs)
         @client_kwargs = kwargs
         @node = fetch_cluster_info(@config, pool: @pool, **@client_kwargs)
         @command = ::RedisClient::Cluster::Command.load(@node)
+        @command_builder = @config.command_builder
         @mutex = Mutex.new
       end
 
       def send_command(method, *args, **kwargs, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
+        command = @command_builder.generate!(command, kwargs)
 
         cmd = command.first.to_s.downcase
         case cmd
@@ -95,6 +97,8 @@ def try_send(node, method, *args, retry_count: 3, **kwargs, &block) # rubocop:di
       end
 
       def scan(*command, **kwargs) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+        command = @command_builder.generate!(command, kwargs)
+
         command[1] = ZERO_CURSOR_FOR_SCAN if command.size == 1
         input_cursor = Integer(command[1])
 
@@ -116,12 +120,14 @@ def scan(*command, **kwargs) # rubocop:disable Metrics/MethodLength, Metrics/Abc
         [((result_cursor << 8) + client_index).to_s, result_keys]
       end
 
-      def assign_node(*command)
-        node_key = find_node_key(*command)
+      def assign_node(*command, **kwargs)
+        node_key = find_node_key(*command, **kwargs)
         find_node(node_key)
       end
 
-      def find_node_key(*command, primary_only: false)
+      def find_node_key(*command, primary_only: false, **kwargs)
+        command = @command_builder.generate!(command, kwargs)
+
         key = @command.extract_first_key(command)
         slot = key.empty? ? nil : ::RedisClient::Cluster::KeySlotConverter.convert(key)
 
@@ -163,6 +169,7 @@ def send_wait_command(method, *args, retry_count: 3, **kwargs, &block)
 
       def send_config_command(method, *args, **kwargs, &block)
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
+        command = @command_builder.generate!(command, kwargs)
 
         case command[1].to_s.downcase
         when 'resetstat', 'rewrite', 'set'
@@ -173,6 +180,7 @@ def send_config_command(method, *args, **kwargs, &block)
 
       def send_memory_command(method, *args, **kwargs, &block)
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
+        command = @command_builder.generate!(command, kwargs)
 
         case command[1].to_s.downcase
         when 'stats' then @node.call_all(method, *args, **kwargs, &block)
@@ -183,6 +191,7 @@ def send_memory_command(method, *args, **kwargs, &block)
 
       def send_client_command(method, *args, **kwargs, &block)
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
+        command = @command_builder.generate!(command, kwargs)
 
         case command[1].to_s.downcase
         when 'list' then @node.call_all(method, *args, **kwargs, &block).flatten
@@ -194,6 +203,7 @@ def send_client_command(method, *args, **kwargs, &block)
 
       def send_cluster_command(method, *args, **kwargs, &block) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
+        command = @command_builder.generate!(command, kwargs)
         subcommand = command[1].to_s.downcase
 
         case subcommand
@@ -211,6 +221,7 @@ def send_cluster_command(method, *args, **kwargs, &block) # rubocop:disable Metr
 
       def send_script_command(method, *args, **kwargs, &block)
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
+        command = @command_builder.generate!(command, kwargs)
 
         case command[1].to_s.downcase
         when 'debug', 'kill'
@@ -223,6 +234,7 @@ def send_script_command(method, *args, **kwargs, &block)
 
       def send_pubsub_command(method, *args, **kwargs, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         command = method == :blocking_call && args.size > 1 ? args[1..] : args
+        command = @command_builder.generate!(command, kwargs)
 
         case command[1].to_s.downcase
         when 'channels' then @node.call_all(method, *args, **kwargs, &block).flatten.uniq.sort_by(&:to_s)