redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00
Code Activity

Fix issues with returning buffers

Browse Source 
Fixes #818 and #354
This commit is contained in:
Ruben Bridgewater
2015-09-21 02:41:24 +02:00
parent b900bd697f
commit 55e4a9b847
2 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
index.js
View File

@@ -556,9 +556,8 @@ function reply_to_strings(reply) {
if (Array.isArray(reply)) { if (Array.isArray(reply)) {
for (i = 0; i < reply.length; i++) { for (i = 0; i < reply.length; i++) {
if (reply[i] !== null && reply[i] !== undefined) { // Recusivly call the function as slowlog returns deep nested replies
reply[i] = reply[i].toString(); reply[i] = reply_to_strings(reply[i]);
}
} }
return reply; return reply;
} }
@@ -612,14 +611,17 @@ RedisClient.prototype.return_reply = function (reply) {
} else { } else {
debug("No callback for reply"); debug("No callback for reply");
} }
} else if (this.pub_sub_mode || (command_obj && command_obj.sub_command)) { } else if (this.pub_sub_mode || command_obj && command_obj.sub_command) {
if (Array.isArray(reply)) { if (Array.isArray(reply)) {
if (!this.options.return_buffers && (!command_obj || this.options.detect_buffers && command_obj.buffer_args === false)) {
reply = reply_to_strings(reply);
}
type = reply[0].toString(); type = reply[0].toString();
if (type === "message") { if (type === "message") {
this.emit("message", reply[1].toString(), reply[2]); // channel, message this.emit("message", reply[1], reply[2]); // channel, message
} else if (type === "pmessage") { } else if (type === "pmessage") {
this.emit("pmessage", reply[1].toString(), reply[2].toString(), reply[3]); // pattern, channel, message this.emit("pmessage", reply[1], reply[2], reply[3]); // pattern, channel, message
} else if (type === "subscribe" || type === "unsubscribe" || type === "psubscribe" || type === "punsubscribe") { } else if (type === "subscribe" || type === "unsubscribe" || type === "psubscribe" || type === "punsubscribe") {
if (reply[2] === 0) { if (reply[2] === 0) {
this.pub_sub_mode = false; this.pub_sub_mode = false;
@@ -629,12 +631,10 @@ RedisClient.prototype.return_reply = function (reply) {
} }
// subscribe commands take an optional callback and also emit an event, but only the first response is included in the callback // subscribe commands take an optional callback and also emit an event, but only the first response is included in the callback
// TODO - document this or fix it so it works in a more obvious way // TODO - document this or fix it so it works in a more obvious way
// reply[1] can be null
var reply1String = (reply[1] === null) ? null : reply[1].toString();
if (command_obj && typeof command_obj.callback === "function") { if (command_obj && typeof command_obj.callback === "function") {
command_obj.callback(null, reply1String); command_obj.callback(null, reply[1]);
} }
this.emit(type, reply1String, reply[2]); // channel, count this.emit(type, reply[1], reply[2]); // channel, count
} else { } else {
this.emit("error", new Error("subscriptions are active but got unknown reply type " + type)); this.emit("error", new Error("subscriptions are active but got unknown reply type " + type));
return; return;
@@ -644,6 +644,9 @@ RedisClient.prototype.return_reply = function (reply) {
return; return;
} }
} else if (this.monitoring) { } else if (this.monitoring) {
if (Buffer.isBuffer(reply)) {
reply = reply.toString();
}
len = reply.indexOf(" "); len = reply.indexOf(" ");
timestamp = reply.slice(0, len); timestamp = reply.slice(0, len);
argindex = reply.indexOf('"'); argindex = reply.indexOf('"');
@@ -776,7 +779,7 @@ RedisClient.prototype.send_command = function (command, args, callback) {
for (i = 0; i < args.length; i += 1) { for (i = 0; i < args.length; i += 1) {
arg = args[i]; arg = args[i];
if (!(Buffer.isBuffer(arg) || arg instanceof String)) { if (!(Buffer.isBuffer(arg) || typeof arg === 'string')) {
arg = String(arg); arg = String(arg);
} }

36
test/helper.js
View File

@@ -108,27 +108,39 @@ module.exports = {
} }
return true; return true;
}, },
allTests: function (options, cb) { allTests: function (opts, cb) {
if (!cb) { if (!cb) {
cb = options; cb = opts;
options = {}; opts = {};
} }
// TODO: Test all different option cases at some point (e.g. buffers)
// [undefined, { return_buffers: true }].forEach(function (config_options) {
// describe(config_options && config_options.return_buffers ? "returning buffers" : "returning strings", function () {
// });
// });
var parsers = ['javascript']; var parsers = ['javascript'];
var protocols = ['IPv4']; var protocols = ['IPv4'];
if (process.platform !== 'win32') { if (process.platform !== 'win32') {
parsers.push('hiredis'); parsers.push('hiredis');
protocols.push('IPv6', '/tmp/redis.sock'); protocols.push('IPv6', '/tmp/redis.sock');
} }
parsers.forEach(function (parser) { var options = [{
protocols.forEach(function (ip, i) { detect_buffers: true
if (i === 0 || options.allConnections) { // Somehow we need a undefined here - otherwise the parsers return_buffers value is always true
cb(parser, ip, config.configureClient(parser, ip)); // Investigate this further
}, undefined];
options.forEach(function (options) {
var strOptions = '';
var key;
for (key in options) {
if (options.hasOwnProperty(key)) {
strOptions += key + ': ' + options[key] + '; ';
} }
}
describe('using options: ' + strOptions, function() {
parsers.forEach(function (parser) {
protocols.forEach(function (ip, i) {
if (i !== 0 && !opts.allConnections) {
return;
}
cb(parser, ip, config.configureClient(parser, ip, options));
});
});
}); });
}); });
}, },