redis 3.0.0 → 3.1.1

package/lib/individualCommands.js

@@ -4,7 +4,7 @@ var utils = require('./utils');
 var debug = require('./debug');
 var Multi = require('./multi');
 var Command = require('./command');
-var no_password_is_set = /no password is set/;
+var no_password_is_set = /no password is set|called without any password configured/;
 var loading = /LOADING/;
 var RedisClient = require('../').RedisClient;
 
@@ -180,7 +180,7 @@ Multi.prototype.info = Multi.prototype.INFO = function info (section, callback)
     return this;
 };
 
-function auth_callback (self, pass, callback) {
+function auth_callback (self, pass, user, callback) {
     return function (err, res) {
         if (err) {
             if (no_password_is_set.test(err.message)) {
@@ -191,7 +191,7 @@ function auth_callback (self, pass, callback) {
                 // If redis is still loading the db, it will not authenticate and everything else will fail
                 debug('Redis still loading, trying to authenticate later');
                 setTimeout(function () {
-                    self.auth(pass, callback);
+                    self.auth(pass, user, callback);
                 }, 100);
                 return;
             }
@@ -200,25 +200,37 @@ function auth_callback (self, pass, callback) {
     };
 }
 
-RedisClient.prototype.auth = RedisClient.prototype.AUTH = function auth (pass, callback) {
+RedisClient.prototype.auth = RedisClient.prototype.AUTH = function auth (pass, user, callback) {
     debug('Sending auth to ' + this.address + ' id ' + this.connection_id);
 
+    // Backward compatibility support for auth with password only
+    if (user instanceof Function) {
+        callback = user;
+        user = null;
+    }
     // Stash auth for connect and reconnect.
     this.auth_pass = pass;
+    this.auth_user = user;
     var ready = this.ready;
     this.ready = ready || this.offline_queue.length === 0;
-    var tmp = this.internal_send_command(new Command('auth', [pass], auth_callback(this, pass, callback)));
+    var tmp = this.internal_send_command(new Command('auth', user ? [user, pass] : [pass], auth_callback(this, pass, user, callback)));
     this.ready = ready;
     return tmp;
 };
 
 // Only works with batch, not in a transaction
-Multi.prototype.auth = Multi.prototype.AUTH = function auth (pass, callback) {
+Multi.prototype.auth = Multi.prototype.AUTH = function auth (pass, user, callback) {
     debug('Sending auth to ' + this.address + ' id ' + this.connection_id);
 
+    // Backward compatibility support for auth with password only
+    if (user instanceof Function) {
+        callback = user;
+        user = null;
+    }
     // Stash auth for connect and reconnect.
     this.auth_pass = pass;
-    this.queue.push(new Command('auth', [pass], auth_callback(this._client, callback)));
+    this.auth_user = user;
+    this.queue.push(new Command('auth', user ? [user, pass] : [pass], auth_callback(this._client, pass, user, callback)));
     return this;
 };
 

package/lib/utils.js

@@ -127,7 +127,7 @@ module.exports = {
     reply_to_object: replyToObject,
     print: print,
     err_code: /^([A-Z]+)\s+(.+)$/,
-    monitor_regex: /^[0-9]{10,11}\.[0-9]+ \[[0-9]+ .+\]( ".+?")+$/,
+    monitor_regex: /^[0-9]{10,11}\.[0-9]+ \[[0-9]+ .+\].*"$/,
     clone: convenienceClone,
     callback_or_emit: callbackOrEmit,
     reply_in_order: replyInOrder

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redis",
-  "version": "3.0.0",
+  "version": "3.1.1",
   "description": "A high performance Redis client.",
   "keywords": [
     "database",
@@ -30,31 +30,33 @@
     "coveralls": "nyc report --reporter=text-lcov | coveralls",
     "coverage": "nyc report --reporter=html",
     "benchmark": "node benchmarks/multi_bench.js",
-    "test": "nyc --cache mocha ./test/*.js ./test/commands/*.js --timeout=8000",
-    "lint": "eslint . --fix && npm run coverage",
+    "test": "nyc --cache mocha ./test/*.spec.js ./test/commands/*.spec.js --timeout=8000 && npm run coverage",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "lint:report": "eslint --output-file=eslint-report.json --format=json  .",
     "compare": "node benchmarks/diff_multi_bench_output.js beforeBench.txt afterBench.txt"
   },
   "dependencies": {
-    "denque": "^1.4.1",
-    "prettier": "^1.19.1",
-    "redis-commands": "^1.5.0",
+    "denque": "^1.5.0",
+    "redis-commands": "^1.7.0",
     "redis-errors": "^1.2.0",
     "redis-parser": "^3.0.0"
   },
   "engines": {
-    "node": ">=6"
+    "node": ">=10"
   },
   "devDependencies": {
     "bluebird": "^3.7.2",
-    "coveralls": "^2.11.2",
-    "eslint": "^6.8.0",
+    "coveralls": "^3.1.0",
+    "cross-spawn": "^7.0.3",
+    "eslint": "^7.21.0",
     "intercept-stdout": "~0.1.2",
     "metrics": "^0.1.21",
-    "mocha": "^4.1.0",
-    "nyc": "^14.1.1",
+    "mocha": "^8.3.0",
+    "nyc": "^15.1.0",
+    "prettier": "^2.2.1",
     "tcp-port-used": "^1.0.1",
-    "uuid": "^3.4.0",
-    "cross-spawn": "^6.0.5"
+    "uuid": "^8.3.2"
   },
   "repository": {
     "type": "git",