Start making non-red-nodes tolerant to missing payloads

This commit is contained in:
dceejay
2015-03-31 13:18:25 +01:00
parent 32f6dc0346
commit 3896a82bd8
13 changed files with 210 additions and 122 deletions

View File

@@ -21,27 +21,29 @@ module.exports = function(RED) {
RED.nodes.createNode(this,n);
var node = this;
this.on("input", function(msg) {
if (Buffer.isBuffer(msg.payload)) {
// Take binary buffer and make into a base64 string
msg.payload = msg.payload.toString('base64');
node.send(msg);
}
else if (typeof msg.payload === "string") {
// Take base64 string and make into binary buffer
var regexp = new RegExp('^[A-Za-z0-9+\/=]*$');
if ( regexp.test(msg.payload) && (msg.payload.length % 4 === 0) ) {
msg.payload = new Buffer(msg.payload,'base64');
if (msg.hasOwnProperty("payload")) {
if (Buffer.isBuffer(msg.payload)) {
// Take binary buffer and make into a base64 string
msg.payload = msg.payload.toString('base64');
node.send(msg);
}
else if (typeof msg.payload === "string") {
// Take base64 string and make into binary buffer
var regexp = new RegExp('^[A-Za-z0-9+\/=]*$');
if ( regexp.test(msg.payload) && (msg.payload.length % 4 === 0) ) {
msg.payload = new Buffer(msg.payload,'base64');
node.send(msg);
}
else {
node.log("Not a Base64 string - maybe we should encode it...");
msg.payload = (new Buffer(msg.payload,"binary")).toString('base64');
node.send(msg);
}
}
else {
node.log("Not a Base64 string - maybe we should encode it...");
msg.payload = (new Buffer(msg.payload,"binary")).toString('base64');
node.send(msg);
node.warn("This node only handles strings or buffers.");
}
}
else {
node.warn("This node only handles strings or buffers.");
}
} else { node.warn("No payload found to process"); }
});
}
RED.nodes.registerType("base64",Base64Node);

View File

@@ -22,24 +22,26 @@ module.exports = function(RED) {
RED.nodes.createNode(this,n);
var node = this;
this.on("input", function(msg) {
if (Buffer.isBuffer(msg.payload)) {
var l = msg.payload.length;
try {
msg.payload = msgpack.decode(msg.payload);
if (msg.hasOwnProperty("payload")) {
if (Buffer.isBuffer(msg.payload)) {
var l = msg.payload.length;
try {
msg.payload = msgpack.decode(msg.payload);
node.send(msg);
node.status({text:l +" b->o "+ JSON.stringify(msg.payload).length});
}
catch (e) {
node.warn("Bad decode: "+e);
node.status({text:"not a msgpack buffer"});
}
}
else {
var le = JSON.stringify(msg.payload).length;
msg.payload = msgpack.encode(msg.payload);
node.send(msg);
node.status({text:l +" b->o "+ JSON.stringify(msg.payload).length});
node.status({text:le +" o->b "+ msg.payload.length});
}
catch (e) {
node.warn("Bad decode: "+e);
node.status({text:"not a msgpack buffer"});
}
}
else {
var le = JSON.stringify(msg.payload).length;
msg.payload = msgpack.encode(msg.payload);
node.send(msg);
node.status({text:le +" o->b "+ msg.payload.length});
}
} else { node.warn("No payload found to process");
});
}
RED.nodes.registerType("msgpack",MsgPackNode);