feat: support commands added in Redis v7

Author: luin

bin/generateRedisCommander/index.js

@@ -5,7 +5,7 @@ const overrides = require("./overrides");
 const { getCommanderInterface } = require("@ioredis/interface-generator");
 
 const ignoredCommands = ["monitor", "multi"];
-const commands = require("redis-commands").list.filter(
+const commands = require("@ioredis/commands").list.filter(
   (name) => !ignoredCommands.includes(name)
 );
 

lib/Command.ts

@@ -1,4 +1,4 @@
-import * as commands from "redis-commands";
+import { exists, getKeyIndexes } from "@ioredis/commands";
 import * as calculateSlot from "cluster-key-slot";
 import asCallback from "standard-as-callback";
 import {
@@ -59,7 +59,7 @@ export interface CommandNameFlags {
  * Command instance
  *
  * It's rare that you need to create a Command instance yourself.
- * 
+ *
  * ```js
  * var infoCommand = new Command('info', null, function (err, result) {
  *   console.log('result', result);
@@ -332,8 +332,9 @@ export default class Command implements Respondable {
   ): Array<string | Buffer> {
     if (typeof this.keys === "undefined") {
       this.keys = [];
-      if (commands.exists(this.name)) {
-        const keyIndexes = commands.getKeyIndexes(this.name, this.args);
+      if (exists(this.name)) {
+        // @ts-expect-error
+        const keyIndexes = getKeyIndexes(this.name, this.args);
         for (const index of keyIndexes) {
           this.args[index] = transform(this.args[index]);
           this.keys.push(this.args[index] as string | Buffer);

lib/Pipeline.ts

@@ -1,5 +1,5 @@
 import * as calculateSlot from "cluster-key-slot";
-import { exists, hasFlag } from "redis-commands";
+import { exists, hasFlag } from "@ioredis/commands";
 import asCallback from "standard-as-callback";
 import { deprecate } from "util";
 import Redis from "./Redis";

lib/Redis.ts

@@ -1,5 +1,5 @@
+import { exists, hasFlag } from "@ioredis/commands";
 import { EventEmitter } from "events";
-import * as commands from "redis-commands";
 import asCallback from "standard-as-callback";
 import Cluster from "./cluster";
 import Command from "./Command";
@@ -422,8 +422,8 @@ class Redis extends Commander {
       this.status === "ready" ||
       (!stream &&
         this.status === "connect" &&
-        commands.exists(command.name) &&
-        commands.hasFlag(command.name, "loading"));
+        exists(command.name) &&
+        hasFlag(command.name, "loading"));
     if (!this.stream) {
       writable = false;
     } else if (!this.stream.writable) {
@@ -549,7 +549,7 @@ class Redis extends Commander {
 
   /**
    * Emit only when there's at least one listener.
-   * 
+   *
    * @ignore
    */
   silentEmit(eventName: string, arg?: unknown): boolean {

lib/cluster/index.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from "events";
-import * as commands from "redis-commands";
+import { exists, hasFlag } from "@ioredis/commands";
 import { AbortError, RedisError } from "redis-errors";
 import asCallback from "standard-as-callback";
 import Pipeline from "../Pipeline";
@@ -462,8 +462,7 @@ class Cluster extends Commander {
     if (to !== "master") {
       const isCommandReadOnly =
         command.isReadOnly ||
-        (commands.exists(command.name) &&
-          commands.hasFlag(command.name, "readonly"));
+        (exists(command.name) && hasFlag(command.name, "readonly"));
       if (!isCommandReadOnly) {
         to = "master";
       }

lib/utils/Commander.ts

@@ -1,3 +1,4 @@
+import { list } from "@ioredis/commands";
 import asCallback from "standard-as-callback";
 import {
   executeWithAutoPipelining,
@@ -99,9 +100,7 @@ class Commander<Context extends ClientContext = { type: "default" }> {
 
 interface Commander<Context> extends RedisCommander<Context> {}
 
-const commands = require("redis-commands").list.filter(function (command) {
-  return command !== "monitor";
-});
+const commands = list.filter((command) => command !== "monitor");
 commands.push("sentinel");
 
 commands.forEach(function (commandName) {
@@ -189,7 +188,8 @@ function generateScriptingFunction(
   encoding: unknown
 ) {
   return function (...args) {
-    const callback = typeof args[args.length - 1] === "function" ? args.pop() : undefined;
+    const callback =
+      typeof args[args.length - 1] === "function" ? args.pop() : undefined;
 
     let options;
     if (this.options.dropBufferSupport) {

lib/utils/RedisCommander.ts

@@ -37,12 +37,12 @@
     "url": "https://opencollective.com/ioredis"
   },
   "dependencies": {
+    "@ioredis/commands": "^1.0.2",
     "cluster-key-slot": "^1.1.0",
     "debug": "^4.3.3",
     "denque": "^2.0.1",
     "lodash.defaults": "^4.2.0",
     "lodash.isarguments": "^3.1.0",
-    "redis-commands": "1.7.0",
     "redis-errors": "^1.2.0",
     "redis-parser": "^3.0.0",
     "standard-as-callback": "^2.1.0"