ioredis 5.8.0 → 5.8.2

package/built/Command.d.ts

@@ -30,6 +30,8 @@ export interface CommandNameFlags {
     ENTER_SUBSCRIBER_MODE: ["subscribe", "psubscribe", "ssubscribe"];
     EXIT_SUBSCRIBER_MODE: ["unsubscribe", "punsubscribe", "sunsubscribe"];
     WILL_DISCONNECT: ["quit"];
+    HANDSHAKE_COMMANDS: ["auth", "select", "client", "readonly", "info"];
+    IGNORE_RECONNECT_ON_ERROR: ["client"];
 }
 /**
  * Command instance

package/built/Command.js

@@ -270,6 +270,8 @@ Command.FLAGS = {
     ENTER_SUBSCRIBER_MODE: ["subscribe", "psubscribe", "ssubscribe"],
     EXIT_SUBSCRIBER_MODE: ["unsubscribe", "punsubscribe", "sunsubscribe"],
     WILL_DISCONNECT: ["quit"],
+    HANDSHAKE_COMMANDS: ["auth", "select", "client", "readonly", "info"],
+    IGNORE_RECONNECT_ON_ERROR: ["client"],
 };
 Command._transformer = {
     argument: {},

package/built/Redis.js

@@ -345,7 +345,8 @@ class Redis extends Commander_1.default {
             (!stream &&
                 this.status === "connect" &&
                 (0, commands_1.exists)(command.name) &&
-                (0, commands_1.hasFlag)(command.name, "loading"));
+                ((0, commands_1.hasFlag)(command.name, "loading") ||
+                    Command_1.default.checkFlag("HANDSHAKE_COMMANDS", command.name)));
         if (!this.stream) {
             writable = false;
         }
@@ -501,7 +502,8 @@ class Redis extends Commander_1.default {
     handleReconnection(err, item) {
         var _a;
         let needReconnect = false;
-        if (this.options.reconnectOnError) {
+        if (this.options.reconnectOnError &&
+            !Command_1.default.checkFlag("IGNORE_RECONNECT_ON_ERROR", item.command.name)) {
             needReconnect = this.options.reconnectOnError(err);
         }
         switch (needReconnect) {

package/built/autoPipelining.js

@@ -19,6 +19,7 @@ exports.notAllowedAutoPipelineCommands = [
     "unsubscribe",
     "unpsubscribe",
     "select",
+    "client",
 ];
 function executeAutoPipeline(client, slotKey) {
     /*

package/built/cluster/ClusterSubscriber.js

@@ -158,9 +158,27 @@ class ClusterSubscriber {
             let pending = 0;
             for (const type of ["subscribe", "psubscribe", "ssubscribe"]) {
                 const channels = previousChannels[type];
-                if (channels.length) {
+                if (channels.length == 0) {
+                    continue;
+                }
+                debug("%s %d channels", type, channels.length);
+                if (type === "ssubscribe") {
+                    for (const channel of channels) {
+                        pending += 1;
+                        this.subscriber[type](channel)
+                            .then(() => {
+                            if (!--pending) {
+                                this.lastActiveSubscriber = this.subscriber;
+                            }
+                        })
+                            .catch(() => {
+                            // TODO: should probably disconnect the subscriber and try again.
+                            debug("failed to ssubscribe to channel: %s", channel);
+                        });
+                    }
+                }
+                else {
                     pending += 1;
-                    debug("%s %d channels", type, channels.length);
                     this.subscriber[type](channels)
                         .then(() => {
                         if (!--pending) {

package/built/redis/RedisOptions.js

@@ -5,7 +5,7 @@ exports.DEFAULT_REDIS_OPTIONS = {
     // Connection
     port: 6379,
     host: "localhost",
-    family: 4,
+    family: 0,
     connectTimeout: 10000,
     disconnectTimeout: 2000,
     retryStrategy: function (times) {

package/built/redis/event_handler.js

@@ -9,6 +9,7 @@ const DataHandler_1 = require("../DataHandler");
 const debug = (0, utils_1.Debug)("connection");
 function connectHandler(self) {
     return function () {
+        var _a;
         self.setStatus("connect");
         self.resetCommandQueue();
         // AUTH command should be processed before any other commands
@@ -43,9 +44,6 @@ function connectHandler(self) {
                 self.silentEmit("error", err);
             });
         }
-        if (!self.options.enableReadyCheck) {
-            exports.readyHandler(self)();
-        }
         /*
           No need to keep the reference of DataHandler here
           because we don't need to do the cleanup.
@@ -54,26 +52,53 @@ function connectHandler(self) {
         new DataHandler_1.default(self, {
             stringNumbers: self.options.stringNumbers,
         });
-        if (self.options.enableReadyCheck) {
-            self._readyCheck(function (err, info) {
-                if (connectionEpoch !== self.connectionEpoch) {
-                    return;
-                }
-                if (err) {
-                    if (!flushed) {
-                        self.recoverFromFatalError(new Error("Ready check failed: " + err.message), err);
+        const clientCommandPromises = [];
+        if (self.options.connectionName) {
+            debug("set the connection name [%s]", self.options.connectionName);
+            clientCommandPromises.push(self.client("setname", self.options.connectionName).catch(utils_1.noop));
+        }
+        if (!self.options.disableClientInfo) {
+            debug("set the client info");
+            clientCommandPromises.push((0, utils_1.getPackageMeta)()
+                .then((packageMeta) => {
+                return self
+                    .client("SETINFO", "LIB-VER", packageMeta.version)
+                    .catch(utils_1.noop);
+            })
+                .catch(utils_1.noop));
+            clientCommandPromises.push(self
+                .client("SETINFO", "LIB-NAME", ((_a = self.options) === null || _a === void 0 ? void 0 : _a.clientInfoTag)
+                ? `ioredis(${self.options.clientInfoTag})`
+                : "ioredis")
+                .catch(utils_1.noop));
+        }
+        Promise.all(clientCommandPromises)
+            .catch(utils_1.noop)
+            .finally(() => {
+            if (!self.options.enableReadyCheck) {
+                exports.readyHandler(self)();
+            }
+            if (self.options.enableReadyCheck) {
+                self._readyCheck(function (err, info) {
+                    if (connectionEpoch !== self.connectionEpoch) {
+                        return;
                     }
-                }
-                else {
-                    if (self.connector.check(info)) {
-                        exports.readyHandler(self)();
+                    if (err) {
+                        if (!flushed) {
+                            self.recoverFromFatalError(new Error("Ready check failed: " + err.message), err);
+                        }
                     }
                     else {
-                        self.disconnect(true);
+                        if (self.connector.check(info)) {
+                            exports.readyHandler(self)();
+                        }
+                        else {
+                            self.disconnect(true);
+                        }
                     }
-                }
-            });
-        }
+                });
+            }
+        });
     };
 }
 exports.connectHandler = connectHandler;
@@ -199,7 +224,6 @@ function errorHandler(self) {
 exports.errorHandler = errorHandler;
 function readyHandler(self) {
     return function () {
-        var _a, _b;
         self.setStatus("ready");
         self.retryAttempts = 0;
         if (self.options.monitor) {
@@ -220,29 +244,6 @@ function readyHandler(self) {
         const finalSelect = self.prevCondition
             ? self.prevCondition.select
             : self.condition.select;
-        if (self.options.connectionName) {
-            debug("set the connection name [%s]", self.options.connectionName);
-            self.client("setname", self.options.connectionName).catch(utils_1.noop);
-        }
-        if (!((_a = self.options) === null || _a === void 0 ? void 0 : _a.disableClientInfo)) {
-            debug("set the client info");
-            let version = null;
-            (0, utils_1.getPackageMeta)()
-                .then((packageMeta) => {
-                version = packageMeta === null || packageMeta === void 0 ? void 0 : packageMeta.version;
-            })
-                .catch(utils_1.noop)
-                .finally(() => {
-                self
-                    .client("SETINFO", "LIB-VER", version)
-                    .catch(utils_1.noop);
-            });
-            self
-                .client("SETINFO", "LIB-NAME", ((_b = self.options) === null || _b === void 0 ? void 0 : _b.clientInfoTag)
-                ? `ioredis(${self.options.clientInfoTag})`
-                : "ioredis")
-                .catch(utils_1.noop);
-        }
         if (self.options.readOnly) {
             debug("set the connection to readonly mode");
             self.readonly().catch(utils_1.noop);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ioredis",
-  "version": "5.8.0",
+  "version": "5.8.2",
   "description": "A robust, performance-focused and full-featured Redis client for Node.js.",
   "main": "./built/index.js",
   "types": "./built/index.d.ts",
@@ -8,12 +8,12 @@
     "built/"
   ],
   "scripts": {
-    "cluster:setup": "docker compose -f test/cluster/docker-compose.cluster.yml up -d --wait",
-    "cluster:teardown": "docker compose -f test/cluster/docker-compose.cluster.yml down --volumes --remove-orphans",
+    "docker:setup": "docker compose -f test/docker-compose.yml up -d --wait",
+    "docker:teardown": "docker compose -f test/docker-compose.yml down --volumes --remove-orphans",
     "test:tsd": "npm run build && tsd",
-    "test:js": "TS_NODE_TRANSPILE_ONLY=true NODE_ENV=test mocha \"test/helpers/*.ts\" \"test/unit/**/*.ts\" \"test/functional/**/*.ts\"",
+    "test:js": "TS_NODE_TRANSPILE_ONLY=true NODE_ENV=test mocha --no-experimental-strip-types \"test/helpers/*.ts\" \"test/unit/**/*.ts\" \"test/functional/**/*.ts\"",
     "test:cov": "nyc npm run test:js",
-    "test:cluster": "TS_NODE_TRANSPILE_ONLY=true NODE_ENV=test mocha \"test/cluster/**/*.ts\"",
+    "test:cluster": "TS_NODE_TRANSPILE_ONLY=true NODE_ENV=test mocha --no-experimental-strip-types \"test/cluster/**/*.ts\"",
     "test": "npm run test:js && npm run test:tsd",
     "lint": "eslint --ext .js,.ts ./lib",
     "docs": "npx typedoc --logLevel Error --excludeExternals --excludeProtected --excludePrivate --readme none lib/index.ts",