redis 0.7.2 → 0.7.3

package/index.js

@@ -5,6 +5,7 @@ var net = require("net"),
     Queue = require("./lib/queue"),
     to_array = require("./lib/to_array"),
     events = require("events"),
+    crypto = require("crypto"),
     parsers = [], commands,
     connection_id = 0,
     default_port = 6379,
@@ -50,6 +51,12 @@ function RedisClient(stream, options) {
     if (options.connect_timeout && !isNaN(options.connect_timeout) && options.connect_timeout > 0) {
         this.connect_timeout = +options.connect_timeout;
     }
+
+    this.enable_offline_queue = true;
+    if (typeof this.options.enable_offline_queue === "boolean") {
+        this.enable_offline_queue = this.options.enable_offline_queue;
+    }
+
     this.initialize_retry_vars();
     this.pub_sub_mode = false;
     this.subscription_set = {};
@@ -59,7 +66,9 @@ function RedisClient(stream, options) {
     this.auth_pass = null;
     this.parser_module = null;
     this.selected_db = null;	// save the selected db here, used when reconnecting
-	
+
+    this.old_state = null;
+
     var self = this;
 
     this.stream.on("connect", function () {
@@ -266,18 +275,35 @@ RedisClient.prototype.on_ready = function () {
 
     this.ready = true;
 
+    if (this.old_state !== null) {
+        this.monitoring = this.old_state.monitoring;
+        this.pub_sub_mode = this.old_state.pub_sub_mode;
+        this.selected_db = this.old_state.selected_db;
+        this.old_state = null;
+    }
+
     // magically restore any modal commands from a previous connection
     if (this.selected_db !== null) {
         this.send_command('select', [this.selected_db]);
     }
     if (this.pub_sub_mode === true) {
+        // only emit "ready" when all subscriptions were made again
+        var callback_count = 0;
+        var callback = function() {
+            callback_count--;
+            if (callback_count == 0) {
+                self.emit("ready");
+            }
+        }
         Object.keys(this.subscription_set).forEach(function (key) {
             var parts = key.split(" ");
             if (exports.debug_mode) {
                 console.warn("sending pub/sub on_ready " + parts[0] + ", " + parts[1]);
             }
-            self.send_command(parts[0], [parts[1]]);
+            callback_count++;
+            self.send_command(parts[0] + "scribe", [parts[1]], callback);
         });
+        return;
     } else if (this.monitoring) {
         this.send_command("monitor");
     } else {
@@ -376,6 +402,18 @@ RedisClient.prototype.connection_gone = function (why) {
     this.connected = false;
     this.ready = false;
 
+    if (this.old_state === null) {
+        var state = {
+            monitoring: this.monitoring,
+            pub_sub_mode: this.pub_sub_mode,
+            selected_db: this.selected_db
+        };
+        this.old_state = state;
+        this.monitoring = false;
+        this.pub_sub_mode = false;
+        this.selected_db = null;
+    }
+
     // since we are collapsing end and close, users don't expect to be called twice
     if (! this.emitted_end) {
         this.emit("end");
@@ -525,8 +563,9 @@ function reply_to_strings(reply) {
 
 RedisClient.prototype.return_reply = function (reply) {
     var command_obj, obj, i, len, type, timestamp, argindex, args, queue_len;
-    
-    queue_len = this.command_queue.getLength();
+
+    command_obj = this.command_queue.shift(),
+    queue_len   = this.command_queue.getLength();
 
     if (this.pub_sub_mode === false && queue_len === 0) {
         this.emit("idle");
@@ -537,8 +576,6 @@ RedisClient.prototype.return_reply = function (reply) {
         this.should_buffer = false;
     }
 
-    command_obj = this.command_queue.shift();
-
     if (command_obj && !command_obj.sub_command) {
         if (typeof command_obj.callback === "function") {
             if (this.options.detect_buffers && command_obj.buffer_args === false) {
@@ -639,12 +676,11 @@ RedisClient.prototype.send_command = function (command, args, callback) {
         throw new Error("send_command: second argument must be an array");
     }
 
-    // if the last argument is an array, expand it out.  This allows commands like this:
-    //     client.command(arg1, [arg2, arg3, arg4], cb);
-    //  and converts to:
-    //     client.command(arg1, arg2, arg3, arg4, cb);
-    // which is convenient for some things like sadd
-    if (args.length > 0 && Array.isArray(args[args.length - 1])) {
+    // if the last argument is an array and command is sadd, expand it out:
+    //     client.sadd(arg1, [arg2, arg3, arg4], cb);
+    //  converts to:
+    //     client.sadd(arg1, arg2, arg3, arg4, cb);
+    if ((command === 'sadd' || command === 'SADD') && args.length > 0 && Array.isArray(args[args.length - 1])) {
         args = args.slice(0, -1).concat(args[args.length - 1]);
     }
 
@@ -662,11 +698,23 @@ RedisClient.prototype.send_command = function (command, args, callback) {
             if (!stream.writable) {
                 console.log("send command: stream is not writeable.");
             }
-            
-            console.log("Queueing " + command + " for next server connection.");
         }
-        this.offline_queue.push(command_obj);
-        this.should_buffer = true;
+
+        if (this.enable_offline_queue) {
+            if (exports.debug_mode) {
+                console.log("Queueing " + command + " for next server connection.");
+            }
+            this.offline_queue.push(command_obj);
+            this.should_buffer = true;
+        } else {
+            var not_writeable_error = new Error('send_command: stream not writeable. enable_offline_queue is false');
+            if (command_obj.callback) {
+                command_obj.callback(not_writeable_error);
+            } else {
+                throw not_writeable_error;
+            }
+        }
+
         return false;
     }
 
@@ -746,7 +794,7 @@ RedisClient.prototype.send_command = function (command, args, callback) {
 
 RedisClient.prototype.pub_sub_command = function (command_obj) {
     var i, key, command, args;
-    
+
     if (this.pub_sub_mode === false && exports.debug_mode) {
         console.log("Entering pub/sub mode from " + command_obj.command);
     }
@@ -796,7 +844,7 @@ exports.Multi = Multi;
 // take 2 arrays and return the union of their elements
 function set_union(seta, setb) {
     var obj = {};
-    
+
     seta.forEach(function (val) {
         obj[val] = true;
     });
@@ -898,6 +946,11 @@ RedisClient.prototype.hmset = function (args, callback) {
         for (i = 0, il = tmp_keys.length; i < il ; i++) {
             key = tmp_keys[i];
             tmp_args.push(key);
+            if (typeof args[1][key] !== "string") {
+                var err = new Error("hmset expected value to be a string", key, ":", args[1][key]);
+                if (callback) return callback(err);
+                else throw err;
+            }
             tmp_args.push(args[1][key]);
         }
         args = tmp_args;
@@ -943,7 +996,7 @@ Multi.prototype.exec = function (callback) {
         if (args.length === 1 && Array.isArray(args[0])) {
             args = args[0];
         }
-        if (command === 'hmset' && typeof args[1] === 'object') {
+        if (command.toLowerCase() === 'hmset' && typeof args[1] === 'object') {
             obj = args.pop();
             Object.keys(obj).forEach(function (key) {
                 args.push(key);
@@ -1006,6 +1059,36 @@ RedisClient.prototype.MULTI = function (args) {
     return new Multi(this, args);
 };
 
+
+// stash original eval method
+var eval = RedisClient.prototype.eval;
+// hook eval with an attempt to evalsha for cached scripts
+RedisClient.prototype.eval =
+RedisClient.prototype.EVAL = function () {
+    var self = this,
+        args = to_array(arguments),
+        callback;
+
+    if (typeof args[args.length - 1] === "function") {
+        callback = args.pop();
+    }
+
+    // replace script source with sha value
+    var source = args[0];
+    args[0] = crypto.createHash("sha1").update(source).digest("hex");
+
+    self.evalsha(args, function (err, reply) {
+        if (err && /NOSCRIPT/.test(err.message)) {
+            args[0] = source;
+            eval.call(self, args, callback);
+
+        } else if (callback) {
+            callback(err, reply);
+        }
+    });
+};
+
+
 exports.createClient = function (port_arg, host_arg, options) {
     var port = port_arg || default_port,
         host = host_arg || default_host,

package/lib/commands.js

@@ -1,12 +1,16 @@
-// This file was generated by ./generate_commands.js on Tue Jun 28 2011 22:37:02 GMT-0700 (PDT)
+// This file was generated by ./generate_commands.js on Mon Aug 06 2012 15:04:06 GMT-0700 (PDT)
 module.exports = [
     "append",
     "auth",
     "bgrewriteaof",
     "bgsave",
+    "bitcount",
+    "bitop",
     "blpop",
     "brpop",
     "brpoplpush",
+    "client kill",
+    "client list",
     "config get",
     "config set",
     "config resetstat",
@@ -17,7 +21,10 @@ module.exports = [
     "decrby",
     "del",
     "discard",
+    "dump",
     "echo",
+    "eval",
+    "evalsha",
     "exec",
     "exists",
     "expire",
@@ -33,6 +40,7 @@ module.exports = [
     "hget",
     "hgetall",
     "hincrby",
+    "hincrbyfloat",
     "hkeys",
     "hlen",
     "hmget",
@@ -42,6 +50,7 @@ module.exports = [
     "hvals",
     "incr",
     "incrby",
+    "incrbyfloat",
     "info",
     "keys",
     "lastsave",
@@ -56,6 +65,7 @@ module.exports = [
     "lset",
     "ltrim",
     "mget",
+    "migrate",
     "monitor",
     "move",
     "mset",
@@ -63,14 +73,19 @@ module.exports = [
     "multi",
     "object",
     "persist",
+    "pexpire",
+    "pexpireat",
     "ping",
+    "psetex",
     "psubscribe",
+    "pttl",
     "publish",
     "punsubscribe",
     "quit",
     "randomkey",
     "rename",
     "renamenx",
+    "restore",
     "rpop",
     "rpoplpush",
     "rpush",
@@ -78,6 +93,10 @@ module.exports = [
     "sadd",
     "save",
     "scard",
+    "script exists",
+    "script flush",
+    "script kill",
+    "script load",
     "sdiff",
     "sdiffstore",
     "select",
@@ -91,6 +110,7 @@ module.exports = [
     "sinterstore",
     "sismember",
     "slaveof",
+    "slowlog",
     "smembers",
     "smove",
     "sort",
@@ -102,6 +122,7 @@ module.exports = [
     "sunion",
     "sunionstore",
     "sync",
+    "time",
     "ttl",
     "type",
     "unsubscribe",

package/mem.js

@@ -0,0 +1,11 @@
+var client = require("redis").createClient();
+
+client.set("foo", "barvalskdjlksdjflkdsjflksdjdflkdsjflksdjflksdj", function (err, res) {
+    if (err) {
+        console.log("Got an error, please adapt somehow.");
+    } else {
+        console.log("Got a result: " + res);
+    }
+});
+
+client.quit();

package/package.json

@@ -1,8 +1,8 @@
 {   "name" : "redis",
-    "version" : "0.7.2",
+    "version" : "0.7.3",
     "description" : "Redis client library",
     "author": "Matt Ranney <mjr@ranney.com>",
-    "maintainers": [ 
+    "maintainers": [
         "David Trejo <david.daniel.trejo@gmail.com> (http://dtrejo.com/)"
     ],
     "main": "./index.js",
@@ -12,9 +12,6 @@
     "devDependencies": {
         "metrics": ">=0.1.5"
     },
-    "optionalDependencies": {
-        "hiredis": "*"
-    },
     "repository": {
         "type": "git",
         "url": "git://github.com/mranney/node_redis.git"