Merge pull request #136 from glynhudson/master

Add 'Emoncms in' to fetch latest feed value from emoncms server

io/emoncms/88-emoncms.html

@@ -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>

io/emoncms/88-emoncms.js

@@ -56,9 +56,7 @@ 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) {
-                node.log("Http response: " + res.statusCode);
                 msg.rc = res.statusCode;
                 msg.payload = "";
                 if ((msg.rc != 200) && (msg.rc != 404)) {
@@ -75,9 +73,50 @@ module.exports = function(RED) {
                 // node.error(e);
                 msg.rc = 503;
                 msg.payload = e;
-                node.send(msg);
             });
         });
     }
     RED.nodes.registerType("emoncms",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;
+            }
+            http.get(this.url, function(res) {
+                msg.rc = res.statusCode;
+                msg.payload = "";
+                if ((msg.rc != 200) && (msg.rc != 404)) {
+                    node.send(JSON.parse(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;
+            });
+        });
+    }
+    RED.nodes.registerType("emoncms in",Emoncmsin);
 }

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, returns numberical value.

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"
+       }
     ]
 }