From df6fe4b17cf6224b76f6ded3e3d5823f89dddaa7 Mon Sep 17 00:00:00 2001
From: Glyn Hudson <glyn.hudson@gmail.com>
Date: Wed, 21 Oct 2015 12:08:30 +0100
Subject: [PATCH 1/4] Add 'Emoncms in' to fetch latest feed value from emoncms
 server

---
 io/emoncms/88-emoncms.html | 64 ++++++++++++++++++++++++++++++++++++--
 io/emoncms/88-emoncms.js   | 50 ++++++++++++++++++++++++++++-
 io/emoncms/README.md       |  8 +++--
 io/emoncms/package.json    | 14 +++++++--
 4 files changed, 127 insertions(+), 9 deletions(-)

diff --git a/io/emoncms/88-emoncms.html b/io/emoncms/88-emoncms.html
index 9bdd5330..1f8d3a73 100644
--- a/io/emoncms/88-emoncms.html
+++ b/io/emoncms/88-emoncms.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="emoncms">
+<script type="text/x-red" data-template-name="emoncms out">
     <div class="form-row">
         <label for="node-input-emonServer"><i class="fa fa-globe"></i> Emoncms server</label>
         <input type="text" id="node-input-emonServer">
@@ -29,7 +29,7 @@
     </div>
 </script>
 
-<script type="text/x-red" data-help-name="emoncms">
+<script type="text/x-red" data-help-name="emoncms out">
     <p>Posts data to Emoncms.</p>
     <p>The <b>msg.payload</b> can contain either a comma separated list of name
     value pairs ex. name:value,... or a comma separated list of values ex. 1,2,.. .
@@ -38,7 +38,7 @@
 </script>
 
 <script type="text/javascript">
-    RED.nodes.registerType('emoncms',{
+    RED.nodes.registerType('emoncms out',{
         category: 'output',
         color:"rgb(91, 192, 222)",
         defaults: {
@@ -59,6 +59,64 @@
     });
 </script>
 
+
+
+
+
+<script type="text/x-red" data-template-name="emoncms in">
+    <div class="form-row">
+        <label for="node-input-emonServer"><i class="fa fa-globe"></i> Emoncms server</label>
+        <input type="text" id="node-input-emonServer">
+    </div>
+    <div class="form-row">
+        <label for="node-input-feedid"><i class="fa fa-tag"></i> Feed ID</label>
+        <input type="text" id="node-input-feedid" placeholder="">
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Emoncms">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="emoncms in">
+    <p>Fetches data from emoncms.</p>
+    <p>The <b>msg.payload</b> contains last emoncms feed value
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('emoncms in',{
+        category: 'input',
+        color:"rgb(91, 192, 222)",
+        defaults: {
+            name: {value:"Emoncms"},
+            emonServer: {type:"emoncms-server", required:true},
+            feedid: {value:""}
+        },
+        inputs:1,
+        outputs:1,
+        icon: "emoncms.png",
+        align: "right",
+        label: function() {
+            return this.name||this.baseurl;
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        }
+    });
+</script>
+
+
+
+
+
+
+
+
+
+
+
+
+
 <script type="text/x-red" data-template-name="emoncms-server">
     <div class="form-row">
         <label for="node-config-input-server"><i class="fa fa-globe"></i> Base URL</label>
diff --git a/io/emoncms/88-emoncms.js b/io/emoncms/88-emoncms.js
index 0d1b29b9..da49ba3c 100644
--- a/io/emoncms/88-emoncms.js
+++ b/io/emoncms/88-emoncms.js
@@ -79,5 +79,53 @@ module.exports = function(RED) {
             });
         });
     }
-    RED.nodes.registerType("emoncms",Emoncms);
+    RED.nodes.registerType("emoncms out",Emoncms);
+ 
+    function Emoncmsin(n) {
+        RED.nodes.createNode(this,n);
+        this.emonServer = n.emonServer;
+        var sc = RED.nodes.getNode(this.emonServer);
+
+        this.baseurl = sc.server;
+        this.apikey = sc.credentials.apikey;
+
+        this.feedid = n.feedid
+        var node = this;
+        var http;
+        if (this.baseurl.substring(0,5) === "https") { http = require("https"); }
+        else { http = require("http"); }
+        this.on("input", function(msg) {
+            this.url = this.baseurl + '/feed/value.json';
+            this.url += '&apikey='+this.apikey;
+            var feedid = this.feedid || msg.feedid;
+            if (feedid !== "") {
+                this.url += '&id=' + feedid;
+            }
+            if (typeof msg.time !== 'undefined') {
+                this.url += '&time=' + msg.time;
+            }
+            node.log("[emoncms] "+this.url);
+            http.get(this.url, function(res) {
+                node.log("Http response: " + res.statusCode);
+                msg.rc = res.statusCode;
+                msg.payload = "";
+                if ((msg.rc != 200) && (msg.rc != 404)) {
+                    node.send(msg);
+                }
+                res.setEncoding('utf8');
+                res.on('data', function(chunk) {
+                    msg.payload += chunk;
+                });
+                res.on('end', function() {
+                    node.send(msg);
+                });
+            }).on('error', function(e) {
+                // node.error(e);
+                msg.rc = 503;
+                msg.payload = e;
+                node.send(msg);
+            });
+        });
+    }
+    RED.nodes.registerType("emoncms in",Emoncmsin);
 }
diff --git a/io/emoncms/README.md b/io/emoncms/README.md
index 20f3e95d..0968d8d0 100644
--- a/io/emoncms/README.md
+++ b/io/emoncms/README.md
@@ -1,7 +1,7 @@
 node-red-node-emoncms
 =====================
 
-A <a href="http://nodered.org" target="_new">Node-RED</a> node to send energy data to <a href="http://emoncms.org" target="_new">emoncms.org</a>.
+A <a href="http://nodered.org" target="_new">Node-RED</a> node to send fetch/post data to/from <a href="http://emoncms.org" target="_new">emoncms.org</a> or any other emoncms server.
 
 Install
 -------
@@ -14,7 +14,7 @@ Run the following command in the root directory of your Node-RED install
 Usage
 -----
 
-Emoncms post.
+### Emoncms post.
 
 The **msg.payload** can contain either a comma separated list of name
 value pairs, e.g.
@@ -29,3 +29,7 @@ or a comma separated list of values, e.g.
 If Node is left blank **msg.nodegroup** will used.
 
 Insertion time can be manipulated by setting **msg.time**.
+
+### Emoncms In:
+
+Fetches last emoncms feed value in JSON format, use JSON processor node to convert to number.
\ No newline at end of file
diff --git a/io/emoncms/package.json b/io/emoncms/package.json
index ccc5e803..e593e5a7 100644
--- a/io/emoncms/package.json
+++ b/io/emoncms/package.json
@@ -1,7 +1,7 @@
 {
     "name"          : "node-red-node-emoncms",
-    "version"       : "0.0.4",
-    "description"   : "A Node-RED node to send energy data to emoncms.org.",
+    "version"       : "0.0.5",
+    "description"   : "A Node-RED node to fetch/post data to/from emoncms",
     "dependencies"  : {
     },
     "repository" : {
@@ -24,6 +24,14 @@
         {
             "name": "dceejay",
             "email": "ceejay@vnet.ibm.com"
-        }
+        },
+        {
+            "name": "knolleary",
+            "email": "nick.oleary@gmail.com"
+        },
+        {
+            "name": "Glyn Hudson",
+            "email": "glyn.hudson@openenergymonitor.org"
+       }
     ]
 }

From 1467575f6c86d59f0dab202ce41a5ae5c44f0c12 Mon Sep 17 00:00:00 2001
From: Glyn Hudson <glyn.hudson@gmail.com>
Date: Sun, 25 Oct 2015 10:07:54 +0000
Subject: [PATCH 2/4] change emoncms-out node name back to 'emoncms' to avoid
 breaking current user flows

---
 io/emoncms/88-emoncms.html | 6 +++---
 io/emoncms/88-emoncms.js   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/io/emoncms/88-emoncms.html b/io/emoncms/88-emoncms.html
index 1f8d3a73..277a504f 100644
--- a/io/emoncms/88-emoncms.html
+++ b/io/emoncms/88-emoncms.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="emoncms out">
+<script type="text/x-red" data-template-name="emoncms">
     <div class="form-row">
         <label for="node-input-emonServer"><i class="fa fa-globe"></i> Emoncms server</label>
         <input type="text" id="node-input-emonServer">
@@ -29,7 +29,7 @@
     </div>
 </script>
 
-<script type="text/x-red" data-help-name="emoncms out">
+<script type="text/x-red" data-help-name="emoncms">
     <p>Posts data to Emoncms.</p>
     <p>The <b>msg.payload</b> can contain either a comma separated list of name
     value pairs ex. name:value,... or a comma separated list of values ex. 1,2,.. .
@@ -38,7 +38,7 @@
 </script>
 
 <script type="text/javascript">
-    RED.nodes.registerType('emoncms out',{
+    RED.nodes.registerType('emoncms',{
         category: 'output',
         color:"rgb(91, 192, 222)",
         defaults: {
diff --git a/io/emoncms/88-emoncms.js b/io/emoncms/88-emoncms.js
index da49ba3c..56abad0f 100644
--- a/io/emoncms/88-emoncms.js
+++ b/io/emoncms/88-emoncms.js
@@ -79,7 +79,7 @@ module.exports = function(RED) {
             });
         });
     }
-    RED.nodes.registerType("emoncms out",Emoncms);
+    RED.nodes.registerType("emoncms",Emoncms);
  
     function Emoncmsin(n) {
         RED.nodes.createNode(this,n);

From dc3c1b7cc4e7a2bb28ecc8a0b661b7eda0c0fcb7 Mon Sep 17 00:00:00 2001
From: Glyn Hudson <glyn.hudson@gmail.com>
Date: Mon, 26 Oct 2015 00:47:55 +0000
Subject: [PATCH 3/4] Don't log when all is good, parse JSON retun

---
 io/emoncms/88-emoncms.js | 10 +++-------
 io/emoncms/README.md     |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/io/emoncms/88-emoncms.js b/io/emoncms/88-emoncms.js
index 56abad0f..fd8eecbe 100644
--- a/io/emoncms/88-emoncms.js
+++ b/io/emoncms/88-emoncms.js
@@ -58,7 +58,6 @@ module.exports = function(RED) {
             }
             node.log("[emoncms] "+this.url);
             http.get(this.url, function(res) {
-                node.log("Http response: " + res.statusCode);
                 msg.rc = res.statusCode;
                 msg.payload = "";
                 if ((msg.rc != 200) && (msg.rc != 404)) {
@@ -75,7 +74,6 @@ module.exports = function(RED) {
                 // node.error(e);
                 msg.rc = 503;
                 msg.payload = e;
-                node.send(msg);
             });
         });
     }
@@ -101,16 +99,15 @@ module.exports = function(RED) {
             if (feedid !== "") {
                 this.url += '&id=' + feedid;
             }
-            if (typeof msg.time !== 'undefined') {
-                this.url += '&time=' + msg.time;
+            if (typeof msg.payload !== 'undefined') {
+                this.url += '&time=' + msg.payload;
             }
             node.log("[emoncms] "+this.url);
             http.get(this.url, function(res) {
-                node.log("Http response: " + res.statusCode);
                 msg.rc = res.statusCode;
                 msg.payload = "";
                 if ((msg.rc != 200) && (msg.rc != 404)) {
-                    node.send(msg);
+                    node.send(JSON.parse(msg));
                 }
                 res.setEncoding('utf8');
                 res.on('data', function(chunk) {
@@ -123,7 +120,6 @@ module.exports = function(RED) {
                 // node.error(e);
                 msg.rc = 503;
                 msg.payload = e;
-                node.send(msg);
             });
         });
     }
diff --git a/io/emoncms/README.md b/io/emoncms/README.md
index 0968d8d0..48c15ef2 100644
--- a/io/emoncms/README.md
+++ b/io/emoncms/README.md
@@ -32,4 +32,4 @@ Insertion time can be manipulated by setting **msg.time**.
 
 ### Emoncms In:
 
-Fetches last emoncms feed value in JSON format, use JSON processor node to convert to number.
\ No newline at end of file
+Fetches last emoncms feed value, returns numberical value.
\ No newline at end of file

From 6bf034cabb5409629cc98154cf83407b2cacbf6a Mon Sep 17 00:00:00 2001
From: Glyn Hudson <glyn.hudson@gmail.com>
Date: Tue, 27 Oct 2015 15:24:45 +0000
Subject: [PATCH 4/4] don't log success and don't pass 'time' as an API
 parameter for emoncms-in

---
 io/emoncms/88-emoncms.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/io/emoncms/88-emoncms.js b/io/emoncms/88-emoncms.js
index fd8eecbe..36e489a4 100644
--- a/io/emoncms/88-emoncms.js
+++ b/io/emoncms/88-emoncms.js
@@ -56,7 +56,6 @@ module.exports = function(RED) {
             if (typeof msg.time !== 'undefined') {
                 this.url += '&time=' + msg.time;
             }
-            node.log("[emoncms] "+this.url);
             http.get(this.url, function(res) {
                 msg.rc = res.statusCode;
                 msg.payload = "";
@@ -99,10 +98,6 @@ module.exports = function(RED) {
             if (feedid !== "") {
                 this.url += '&id=' + feedid;
             }
-            if (typeof msg.payload !== 'undefined') {
-                this.url += '&time=' + msg.payload;
-            }
-            node.log("[emoncms] "+this.url);
             http.get(this.url, function(res) {
                 msg.rc = res.statusCode;
                 msg.payload = "";