add msg.property option to rbe, randon, smooth and base64 nodes

This commit is contained in:
Dave Conway-Jones
2018-01-30 21:42:14 +00:00
parent 4ed7ab590d
commit be79b6a1c6
17 changed files with 527 additions and 565 deletions

View File

@@ -1,5 +1,9 @@
<script type="text/x-red" data-template-name="base64">
<div class="form-row">
<label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
<input type="text" id="node-input-property" style="width:70%;"/>
</div>
<div class="form-row">
<label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
<input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
@@ -7,7 +11,7 @@
</script>
<script type="text/x-red" data-help-name="base64">
<p>A function that converts the <code>msg.payload</code> to and from base64 format.</p>
<p>A function that converts the chosen proerty (default <code>msg.payload</code>) to and from base64 format.</p>
<p>If the input is a buffer it converts it to a Base64 encoded string.</p>
<p>If the input is a Base64 string it converts it back to a binary buffer.</p>
</script>
@@ -17,7 +21,8 @@
category: 'function',
color:"#DEBD5C",
defaults: {
name: {value:""}
name: {value:""},
property: {value:"payload",required:true}
},
inputs:1,
outputs:1,
@@ -27,6 +32,12 @@
},
labelStyle: function() {
return this.name?"node_label_italic":"";
},
oneditprepare: function() {
if (this.property === undefined) {
$("#node-input-property").val("payload");
}
$("#node-input-property").typedInput({default:'msg',types:['msg']});
}
});
</script>

View File

@@ -1,28 +1,32 @@
module.exports = function(RED) {
"use strict";
function Base64Node(n) {
RED.nodes.createNode(this,n);
this.property = n.property||"payload";
var node = this;
this.on("input", function(msg) {
if (msg.hasOwnProperty("payload")) {
if (Buffer.isBuffer(msg.payload)) {
var value = RED.util.getMessageProperty(msg,node.property);
if (value !== undefined) {
if (Buffer.isBuffer(value)) {
// Take binary buffer and make into a base64 string
msg.payload = msg.payload.toString('base64');
value = value.toString('base64');
RED.util.setMessageProperty(msg,node.property,value);
node.send(msg);
}
else if (typeof msg.payload === "string") {
else if (typeof value === "string") {
// Take base64 string and make into binary buffer
var load = msg.payload.replace(/\s+/g,''); // remove any whitespace
var load = value.replace(/\s+/g,''); // remove any whitespace
var regexp = new RegExp('^[A-Za-z0-9+\/=]*$'); // check it only contains valid characters
if ( regexp.test(load) && (load.length % 4 === 0) ) {
msg.payload = new Buffer(load,'base64');
value = new Buffer(load,'base64');
RED.util.setMessageProperty(msg,node.property,value);
node.send(msg);
}
else {
//node.log("Not a Base64 string - maybe we should encode it...");
msg.payload = (new Buffer(msg.payload,"binary")).toString('base64');
value = (new Buffer(value,"binary")).toString('base64');
RED.util.setMessageProperty(msg,node.property,value);
node.send(msg);
}
}
@@ -30,7 +34,7 @@ module.exports = function(RED) {
node.warn("This node only handles strings or buffers.");
}
}
else { node.warn("No payload found to process"); }
else { node.warn("No property found to process"); }
});
}
RED.nodes.registerType("base64",Base64Node);

View File

@@ -1,6 +1,6 @@
{
"name" : "node-red-node-base64",
"version" : "0.0.8",
"version" : "0.1.0",
"description" : "A Node-RED node to pack and unpack objects to base64 format",
"dependencies" : {
},