ioredis 4.23.0 → 4.24.2

package/Changelog.md

@@ -1,3 +1,31 @@
+## [4.24.2](https://github.com/luin/ioredis/compare/v4.24.1...v4.24.2) (2021-03-14)
+
+
+### Bug Fixes
+
+* properly handle instant stream errors ([#1299](https://github.com/luin/ioredis/issues/1299)) ([0327ef5](https://github.com/luin/ioredis/commit/0327ef5a57481042d3f7d306917f55ef04f3a6cc))
+
+## [4.24.1](https://github.com/luin/ioredis/compare/v4.24.0...v4.24.1) (2021-03-14)
+
+
+### Bug Fixes
+
+* **cluster:** reconnect when failing to refresh slots cache for all nodes ([8524eea](https://github.com/luin/ioredis/commit/8524eeaedaa2542f119f2b65ab8e2f15644b474e))
+
+# [4.24.0](https://github.com/luin/ioredis/compare/v4.23.1...v4.24.0) (2021-03-14)
+
+
+### Features
+
+* **cluster:** support retrying MOVED with a delay ([#1254](https://github.com/luin/ioredis/issues/1254)) ([8599981](https://github.com/luin/ioredis/commit/8599981141e8357f5ae2706fffb55010490bf002))
+
+## [4.23.1](https://github.com/luin/ioredis/compare/v4.23.0...v4.23.1) (2021-03-14)
+
+
+### Bug Fixes
+
+* **cluster:** issues when code is processed by babel ([#1298](https://github.com/luin/ioredis/issues/1298)) ([bfc194d](https://github.com/luin/ioredis/commit/bfc194dcad2af527e802d6f5b060f0b0779e840d)), closes [#1288](https://github.com/luin/ioredis/issues/1288)
+
 # [4.23.0](https://github.com/luin/ioredis/compare/v4.22.0...v4.23.0) (2021-02-25)
 
 

package/README.md

@@ -889,9 +889,12 @@ cluster.get("foo", (err, res) => {
       will resend the commands after the specified time (in ms).
     - `retryDelayOnTryAgain`: If this option is a number (by default, it is `100`), the client
       will resend the commands rejected with `TRYAGAIN` error after the specified time (in ms).
+    - `retryDelayOnMoved`: By default, this value is `0` (in ms), which means when a `MOVED` error is received, the client will resend
+      the command instantly to the node returned together with the `MOVED` error. However, sometimes it takes time for a cluster to become
+      state stabilized after a failover, so adding a delay before resending can prevent a ping pong effect.
     - `redisOptions`: Default options passed to the constructor of `Redis` when connecting to a node.
-    - `slotsRefreshTimeout`: Milliseconds before a timeout occurs while refreshing slots from the cluster (default `1000`)
-    - `slotsRefreshInterval`: Milliseconds between every automatic slots refresh (default `5000`)
+    - `slotsRefreshTimeout`: Milliseconds before a timeout occurs while refreshing slots from the cluster (default `1000`).
+    - `slotsRefreshInterval`: Milliseconds between every automatic slots refresh (default `5000`).
 
 ### Read-write splitting
 

package/built/cluster/ClusterOptions.js

@@ -7,6 +7,7 @@ exports.DEFAULT_CLUSTER_OPTIONS = {
     enableReadyCheck: true,
     scaleReads: "master",
     maxRedirections: 16,
+    retryDelayOnMoved: 0,
     retryDelayOnFailover: 100,
     retryDelayOnClusterDown: 100,
     retryDelayOnTryAgain: 100,

package/built/cluster/index.js

@@ -185,12 +185,7 @@ class Cluster extends events_1.EventEmitter {
                 this.once("refresh", refreshListener);
                 this.once("close", closeListener);
                 this.once("close", this.handleCloseEvent.bind(this));
-                this.refreshSlotsCache(function (err) {
-                    if (err && err.message === "Failed to refresh slots cache.") {
-                        redis_1.default.prototype.silentEmit.call(this, "error", err);
-                        this.connectionPool.reset([]);
-                    }
-                }.bind(this));
+                this.refreshSlotsCache();
                 this.subscriber.start();
             })
                 .catch((err) => {
@@ -390,6 +385,8 @@ class Cluster extends events_1.EventEmitter {
         function tryNode(index) {
             if (index === nodes.length) {
                 const error = new ClusterAllFailedError_1.default("Failed to refresh slots cache.", lastNodeError);
+                redis_1.default.prototype.silentEmit.call(_this, "error", error);
+                _this.connectionPool.reset([]);
                 return wrapper(error);
             }
             const node = nodes[index];
@@ -608,8 +605,17 @@ class Cluster extends events_1.EventEmitter {
             return;
         }
         const errv = error.message.split(" ");
-        if (errv[0] === "MOVED" || errv[0] === "ASK") {
-            handlers[errv[0] === "MOVED" ? "moved" : "ask"](errv[1], errv[2]);
+        if (errv[0] === "MOVED") {
+            const timeout = this.options.retryDelayOnMoved;
+            if (timeout && typeof timeout === "number") {
+                this.delayQueue.push("moved", handlers.moved.bind(null, errv[1], errv[2]), { timeout });
+            }
+            else {
+                handlers.moved(errv[1], errv[2]);
+            }
+        }
+        else if (errv[0] === "ASK") {
+            handlers.ask(errv[1], errv[2]);
         }
         else if (errv[0] === "TRYAGAIN") {
             this.delayQueue.push("tryagain", handlers.tryagain, {

package/built/command.js

@@ -274,9 +274,7 @@ const msetArgumentTransformer = function (args) {
     }
     return args;
 };
-Command.setArgumentTransformer("mset", msetArgumentTransformer);
-Command.setArgumentTransformer("msetnx", msetArgumentTransformer);
-Command.setArgumentTransformer("hmset", function (args) {
+const hsetArgumentTransformer = function (args) {
     if (args.length === 2) {
         if (typeof Map !== "undefined" && args[1] instanceof Map) {
             return [args[0]].concat(utils_1.convertMapToArray(args[1]));
@@ -286,7 +284,11 @@ Command.setArgumentTransformer("hmset", function (args) {
         }
     }
     return args;
-});
+};
+Command.setArgumentTransformer("mset", msetArgumentTransformer);
+Command.setArgumentTransformer("msetnx", msetArgumentTransformer);
+Command.setArgumentTransformer("hset", hsetArgumentTransformer);
+Command.setArgumentTransformer("hmset", hsetArgumentTransformer);
 Command.setReplyTransformer("hgetall", function (result) {
     if (Array.isArray(result)) {
         const obj = {};
@@ -297,17 +299,6 @@ Command.setReplyTransformer("hgetall", function (result) {
     }
     return result;
 });
-Command.setArgumentTransformer("hset", function (args) {
-    if (args.length === 2) {
-        if (typeof Map !== "undefined" && args[1] instanceof Map) {
-            return [args[0]].concat(utils_1.convertMapToArray(args[1]));
-        }
-        if (typeof args[1] === "object" && args[1] !== null) {
-            return [args[0]].concat(utils_1.convertObjectToArray(args[1]));
-        }
-    }
-    return args;
-});
 class MixedBuffers {
     constructor() {
         this.length = 0;

package/built/connectors/SentinelConnector/index.js

@@ -78,6 +78,9 @@ class SentinelConnector extends AbstractConnector_1.default {
                     else {
                         this.stream = net_1.createConnection(resolved);
                     }
+                    this.stream.once("error", (err) => {
+                        this.firstError = err;
+                    });
                     this.sentinelIterator.reset(true);
                     resolve(this.stream);
                 }

package/built/connectors/StandaloneConnector.js

@@ -62,6 +62,9 @@ class StandaloneConnector extends AbstractConnector_1.default {
                     reject(err);
                     return;
                 }
+                this.stream.once("error", (err) => {
+                    this.firstError = err;
+                });
                 resolve(this.stream);
             });
         });

package/built/pipeline.js

@@ -27,7 +27,8 @@ function generateMultiWithNodes(redis, keys) {
 function Pipeline(redis) {
     commander_1.default.call(this);
     this.redis = redis;
-    this.isCluster = this.redis.constructor.name === "Cluster";
+    this.isCluster =
+        this.redis.constructor.name === "Cluster" || this.redis.isCluster;
     this.isPipeline = true;
     this.options = redis.options;
     this._queue = [];

package/built/redis/index.js

@@ -320,11 +320,22 @@ Redis.prototype.connect = function (callback) {
                     });
                 }
             }
+            else if (stream.destroyed) {
+                const firstError = _this.connector.firstError;
+                if (firstError) {
+                    process.nextTick(() => {
+                        eventHandler.errorHandler(_this)(firstError);
+                    });
+                }
+                process.nextTick(eventHandler.closeHandler(_this));
+            }
             else {
                 process.nextTick(eventHandler.connectHandler(_this));
             }
-            stream.once("error", eventHandler.errorHandler(_this));
-            stream.once("close", eventHandler.closeHandler(_this));
+            if (!stream.destroyed) {
+                stream.once("error", eventHandler.errorHandler(_this));
+                stream.once("close", eventHandler.closeHandler(_this));
+            }
             if (options.noDelay) {
                 stream.setNoDelay(true);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ioredis",
-  "version": "4.23.0",
+  "version": "4.24.2",
   "description": "A robust, performance-focused and full-featured Redis client for Node.js.",
   "main": "built/index.js",
   "files": [
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "cluster-key-slot": "^1.1.0",
-    "debug": "^4.1.1",
+    "debug": "^4.3.1",
     "denque": "^1.1.0",
     "lodash.defaults": "^4.2.0",
     "lodash.flatten": "^4.4.0",
@@ -42,7 +42,7 @@
     "redis-commands": "1.7.0",
     "redis-errors": "^1.2.0",
     "redis-parser": "^3.0.0",
-    "standard-as-callback": "^2.0.1"
+    "standard-as-callback": "^2.1.0"
   },
   "devDependencies": {
     "@semantic-release/changelog": "^5.0.1",