From f9ac210a41b6bbdfce4779409f1d6f366d9ea14b Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Sat, 3 Feb 2018 15:08:05 +0000
Subject: [PATCH] Add fixed conversion modes to base64 node

to close #401
---
 parsers/base64/70-base64.html | 12 ++++++-
 parsers/base64/70-base64.js   | 60 ++++++++++++++++++++++-------------
 parsers/base64/package.json   |  2 +-
 3 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/parsers/base64/70-base64.html b/parsers/base64/70-base64.html
index 5ab31404..2edae4cc 100644
--- a/parsers/base64/70-base64.html
+++ b/parsers/base64/70-base64.html
@@ -1,5 +1,13 @@
 
 <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">
         <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%;"/>
@@ -11,9 +19,10 @@
 </script>
 
 <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 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 type="text/javascript">
@@ -22,6 +31,7 @@
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
+            action: {value:""},
             property: {value:"payload",required:true}
         },
         inputs:1,
diff --git a/parsers/base64/70-base64.js b/parsers/base64/70-base64.js
index 764895df..7463202e 100644
--- a/parsers/base64/70-base64.js
+++ b/parsers/base64/70-base64.js
@@ -3,35 +3,51 @@ module.exports = function(RED) {
     "use strict";
     function Base64Node(n) {
         RED.nodes.createNode(this,n);
-        this.property = n.property||"payload";
+        this.action = n.action || "";
+        this.property = n.property || "payload";
         var node = this;
         this.on("input", function(msg) {
             var value = RED.util.getMessageProperty(msg,node.property);
             if (value !== undefined) {
-                if (Buffer.isBuffer(value)) {
-                    // Take binary buffer and make into a base64 string
-                    value = value.toString('base64');
+                if (node.action === "") {
+                    if (Buffer.isBuffer(value)) {
+                        // 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);
                     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 regexp = new RegExp('^[A-Za-z0-9+\/=]*$');  // check it only contains valid characters
-                    if ( regexp.test(load) && (load.length % 4 === 0) ) {
-                        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.");
+                if (node.action === "b64") {
+                    var load = value.replace(/\s+/g,'');
+                    value = Buffer.from(load,'base64').toString('binary');
+                    RED.util.setMessageProperty(msg,node.property,value);
+                    node.send(msg);
                 }
             }
             else { node.warn("No property found to process"); }
diff --git a/parsers/base64/package.json b/parsers/base64/package.json
index 1805f7ef..28aa8802 100644
--- a/parsers/base64/package.json
+++ b/parsers/base64/package.json
@@ -1,6 +1,6 @@
 {
     "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",
     "dependencies"  : {
     },