Add fixed conversion modes to base64 node

to close #401
This commit is contained in:
Dave Conway-Jones 2018-02-03 15:08:05 +00:00
parent b406b32909
commit f9ac210a41
No known key found for this signature in database
GPG Key ID: 9E7F9C73F5168CD4
3 changed files with 50 additions and 24 deletions

View File

@ -1,5 +1,13 @@
<script type="text/x-red" data-template-name="base64"> <script type="text/x-red" data-template-name="base64">
<div class="form-row">
<label for="node-input-action"><i class="fa fa-dot-circle-o"></i> Action</label>
<select style="width:70%" id="node-input-action">
<option value="">Convert Buffer <-> Base64</option>
<option value="str">Convert String to Base64</option>
<option value="b64">Convert Base64 to String</option>
</select>
</div>
<div class="form-row"> <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> <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%;"/> <input type="text" id="node-input-property" style="width:70%;"/>
@ -11,9 +19,10 @@
</script> </script>
<script type="text/x-red" data-help-name="base64"> <script type="text/x-red" data-help-name="base64">
<p>A function that converts the chosen proerty (default <code>msg.payload</code>) to and from base64 format.</p> <p>A function that converts the chosen property (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 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> <p>If the input is a Base64 string it converts it back to a binary buffer.</p>
<p>You can also fix conversion string to base64,and base64 to string if required.</p>
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
@ -22,6 +31,7 @@
color:"#DEBD5C", color:"#DEBD5C",
defaults: { defaults: {
name: {value:""}, name: {value:""},
action: {value:""},
property: {value:"payload",required:true} property: {value:"payload",required:true}
}, },
inputs:1, inputs:1,

View File

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

View File

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