Update command extensions

Author: Mordil

Sources/NIORedis/Commands/BasicCommands.swift

@@ -1,21 +1,22 @@
 import Foundation
 import NIO
 
-extension NIORedisConnection {
+extension RedisConnection {
     /// Select the Redis logical database having the specified zero-based numeric index.
     /// New connections always use the database 0.
     ///
     /// https://redis.io/commands/select
     public func select(_ id: Int) -> EventLoopFuture<Void> {
-        return command("SELECT", [RESPValue(bulk: id.description)])
+        return command("SELECT", arguments: [RESPValue(bulk: id.description)])
             .map { _ in return () }
     }
 
     /// Request for authentication in a password-protected Redis server.
     ///
     /// https://redis.io/commands/auth
     public func authorize(with password: String) -> EventLoopFuture<Void> {
-        return command("AUTH", [RESPValue(bulk: password)]).map { _ in return () }
+        return command("AUTH", arguments: [RESPValue(bulk: password)])
+            .map { _ in return () }
     }
 
     /// Removes the specified keys. A key is ignored if it does not exist.
@@ -24,7 +25,7 @@ extension NIORedisConnection {
     /// - Returns: A future number of keys that were removed.
     public func delete(_ keys: String...) -> EventLoopFuture<Int> {
         let keyArgs = keys.map { RESPValue(bulk: $0) }
-        return command("DEL", keyArgs)
+        return command("DEL", arguments: keyArgs)
             .thenThrowing { res in
                 guard let count = res.int else {
                     throw RedisError(identifier: "delete", reason: "Unexpected response: \(res)")
@@ -41,7 +42,7 @@ extension NIORedisConnection {
     ///     - after: The lifetime (in seconds) the key will expirate at.
     /// - Returns: A future bool indicating if the expiration was set or not.
     public func expire(_ key: String, after deadline: Int) -> EventLoopFuture<Bool> {
-        return command("EXPIRE", [RESPValue(bulk: key), RESPValue(bulk: deadline.description)])
+        return command("EXPIRE", arguments: [RESPValue(bulk: key), RESPValue(bulk: deadline.description)])
             .thenThrowing { res in
                 guard let value = res.int else {
                     throw RedisError(identifier: "expire", reason: "Unexpected response: \(res)")
@@ -56,7 +57,7 @@ extension NIORedisConnection {
     ///
     /// https://redis.io/commands/get
     public func get(_ key: String) -> EventLoopFuture<String?> {
-        return command("GET", [RESPValue(bulk: key)])
+        return command("GET", arguments: [RESPValue(bulk: key)])
             .map { return $0.string }
     }
 
@@ -66,7 +67,7 @@ extension NIORedisConnection {
     ///
     /// https://redis.io/commands/set
     public func set(_ key: String, to value: String) -> EventLoopFuture<Void> {
-        return command("SET", [RESPValue(bulk: key), RESPValue(bulk: value)])
+        return command("SET", arguments: [RESPValue(bulk: key), RESPValue(bulk: value)])
             .map { _ in return () }
     }
 }

Sources/NIORedis/RedisConnection.swift

@@ -41,15 +41,25 @@ public final class RedisConnection {
     ///     - command: The command to execute.
     ///     - arguments: The arguments to be sent with the command.
     /// - Returns: An `EventLoopFuture` that will resolve with the Redis command response.
-    public func send(command: String, arguments: [RESPConvertible] = []) throws -> EventLoopFuture<RESPValue> {
+    public func send(command: String, with arguments: [RESPConvertible] = []) throws -> EventLoopFuture<RESPValue> {
+        let args = try arguments.map { try $0.convertToRESP() }
+        return self.command(command, arguments: args)
+    }
+
+    /// Invokes a command against Redis with the provided arguments.
+    /// - Important: Arguments should be stored as `.bulkString`.
+    /// - Parameters:
+    ///     - command: The command to execute.
+    ///     - arguments: The arguments to be sent with the command.
+    /// - Returns: An `EventLoopFuture` that will resolve with the Redis command response.
+    public func command(_ command: String, arguments: [RESPValue] = []) -> EventLoopFuture<RESPValue> {
         guard !isClosed.load() else {
             return channel.eventLoop.makeFailedFuture(error: RedisError.connectionClosed)
         }
 
         let promise = channel.eventLoop.makePromise(of: RESPValue.self)
-        let args = try arguments.map { try $0.convertToRESP() }
         let context = RedisCommandContext(
-            command: .array([RESPValue(bulk: command)] + args),
+            command: .array([RESPValue(bulk: command)] + arguments),
             promise: promise
         )
 

Sources/NIORedis/RedisDriver.swift

@@ -66,9 +66,7 @@ public final class RedisDriver {
                     return self.eventLoopGroup.next().makeSucceededFuture(result: connection)
                 }
 
-                #warning("TODO - Fix command extensions")
-                return self.eventLoopGroup.next().makeSucceededFuture(result: connection)
-                // return connection.authorize(with: pw).map { _ in return connection }
+                return connection.authorize(with: pw).map { _ in return connection }
             }
     }
 }