Bump 0.10.4

(for the ones it reads)

.gitignore

@@ -1,4 +1,11 @@
 node_modules
 credentials.json
 flows*.json
+*.backup
+*_cred*
 nodes/node-red-nodes/
+.npm
+/coverage
+.config.json
+.sessions.json
+

.nodemonignore

@@ -1,3 +1,4 @@
 .git/*
 *.json
 lib/*
+*.backup

.travis.yml

@@ -0,0 +1,11 @@
+language: node_js
+before_install:
+  - npm install -g npm@~1.4.18
+node_js:
+  - "0.10"
+  - "0.8"
+script:
+  - istanbul cover ./node_modules/.bin/grunt --report lcovonly && istanbul report text && ( cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js || true ) && rm -rf coverage
+before_script:
+  - npm install -g istanbul
+  - npm install coveralls

CONTRIBUTING.md

@@ -0,0 +1,71 @@
+# Contributing to Node-RED
+
+We welcome contributions, but request you follow these guidelines.
+
+ - [Raising issues](#raising-issues)
+ - [Feature requests](#feature-requests)
+ - [Pull-Requests](#pull-requests)
+   - [Contributor License Agreement](#contributor-license-agreement)
+ 
+## Raising issues
+
+Please raise any bug reports on the project's 
+[issue tracker](https://github.com/node-red/node-red/issues?state=open). Be sure to
+search the list to see if your issue has already been raised.
+
+A good bug report is one that make it easy for us to understand what you were
+trying to do and what went wrong.
+
+Provide as much context as possible so we can try to recreate the issue.
+If possible, include the relevant part of your flow. To do this, select the
+relevant nodes, press Ctrl-E and copy the flow data from the Export dialog.
+
+At a minimum, please include:
+
+ - Version of Node-RED - either release number if you downloaded a zip, or the first few lines of `git log` if you are cloning the repository directly.
+ - Version of node.js - what does `node -v` say?
+
+
+## Feature requests
+
+For feature requests, please raise them on the [mailing list](https://groups.google.com/forum/#!forum/node-red).
+
+## Pull-Requests
+
+If you want to raise a pull-request with a new feature, or a refactoring
+of existing code, it may well get rejected if you haven't discussed it on 
+the [mailing list](https://groups.google.com/forum/#!forum/node-red) first.
+
+### Contributor License Agreement
+
+In order for us to accept pull-requests, the contributor must first complete
+a Contributor License Agreement (CLA). This clarifies the intellectual 
+property license granted with any contribution. It is for your protection as a 
+Contributor as well as the protection of IBM and its customers; it does not 
+change your rights to use your own Contributions for any other purpose.
+
+You can download the CLAs here:
+
+ - [individual](http://nodered.org/cla/node-red-cla-individual.pdf)
+ - [corporate](http://nodered.org/cla/node-red-cla-corporate.pdf)
+
+If you are an IBMer, please contact us directly as the contribution process is
+slightly different.
+
+### Coding standards
+
+Please ensure you follow the coding standards used through-out the existing
+code base. Some basic rules include:
+
+ - all files must have the Apache license in the header.
+ - indent with 4-spaces, no tabs. No arguments.
+ - opening brace on same line as `if`/`for`/`function`/etc, closing brace on its
+   own line.
+
+
+
+
+
+
+
+

Gruntfile.js

@@ -0,0 +1,95 @@
+/**
+ * Copyright 2013, 2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(grunt) {
+    
+    // Project configuration.
+    grunt.initConfig({
+            pkg: grunt.file.readJSON('package.json'),
+            simplemocha: {
+                options: {
+                    globals: ['expect'],
+                    timeout: 3000,
+                    ignoreLeaks: false,
+                    ui: 'bdd',
+                    reporter: 'spec'
+                },
+                all: { src: ['test/**/*_spec.js'] },
+                core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
+                nodes: { src: ["test/nodes/**/*_spec.js"]}
+            },
+            jshint: {
+                options: {
+                    // http://www.jshint.com/docs/options/
+                    "asi": true,      // allow missing semicolons
+                    "curly": true,    // require braces
+                    "eqnull": true,   // ignore ==null
+                    "forin": true,    // require property filtering in "for in" loops
+                    "immed": true,    // require immediate functions to be wrapped in ( )
+                    "nonbsp": true,   // warn on unexpected whitespace breaking chars
+                    //"strict": true, // commented out for now as it causes 100s of warnings, but want to get there eventually
+                    "loopfunc": true, // allow functions to be defined in loops
+                    "sub": true       // don't warn that foo['bar'] should be written as foo.bar
+                },
+                all: [
+                    'Gruntfile.js',
+                    'red.js',
+                    'red/**/*.js',
+                    'nodes/**/*.js',
+                    'public/red/**/*.js'
+                ],
+                
+                core: {
+                    files: {
+                        src: [
+                            'Gruntfile.js',
+                            'red.js',
+                            'red/**/*.js'
+                        ]
+                    }
+                },
+                nodes: {
+                    files: {
+                        src: [ 'nodes/**/*.js' ]
+                    }
+                },
+                editor: {
+                    files: {
+                        src: [ 'public/red/**/*.js' ]
+                    }
+                },
+                tests: {
+                    files: {
+                        src: ['test/**/*.js']
+                    },
+                    options: {
+                        "expr": true
+                    }
+                }
+                
+            }
+    });
+    
+    grunt.loadNpmTasks('grunt-simple-mocha');
+    grunt.loadNpmTasks('grunt-contrib-jshint');
+    
+    grunt.registerTask('default', ['test-core','test-editor','test-nodes']);
+    
+    grunt.registerTask('test-core', ['jshint:core','simplemocha:core']);
+    grunt.registerTask('test-editor', ['jshint:editor']);
+    grunt.registerTask('test-nodes', ['simplemocha:nodes']);
+    
+};

README.md

@@ -1,5 +1,10 @@
 # Node-RED
 
+http://nodered.org
+
+[![Build Status](https://travis-ci.org/node-red/node-red.png)](https://travis-ci.org/node-red/node-red) [![Coverage Status](https://coveralls.io/repos/node-red/node-red/badge.png?branch=master)](https://coveralls.io/r/node-red/node-red?branch=master)
+
+
 A visual tool for wiring the Internet of Things.
 
 ![Screenshot](http://nodered.org/images/node-red-screenshot.png "Node-RED: A visual tool for wiring the Internet of Things")
@@ -14,70 +19,32 @@ Check out [INSTALL](INSTALL.md) for full instructions on getting started.
 4. node red.js
 5. Open <http://localhost:1880>
 
-## Documentation
+## Getting Help
 
 More documentation can be found [here](http://nodered.org/docs).
 
-For further help, or general discussion, there is also a [mailing list](https://groups.google.com/forum/#!forum/node-red).
+For further help, or general discussion, please use the [mailing list](https://groups.google.com/forum/#!forum/node-red).
 
 ## Browser Support
 
 The Node-RED editor runs in the browser. We routinely develop and test using
-Chrome and Firefox. We have anecdotal evidence that it works in IE9.
+Chrome and Firefox. We have anecdotal evidence that it works in recent versions of IE.
 
-We do not yet support mobile browsers, although that is high on our priority
-list.
+We have basic support for using in mobile/tablet browsers.
 
 ## Contributing
 
-### Reporting issues
-
-Please raise any bug reports on the project's [issue tracker](https://github.com/node-red/node-red/issues?state=open).
-Be sure to search the list to see if your issue has already been raised.
-
-For feature requests, please raise them on the [mailing list](https://groups.google.com/forum/#!forum/node-red)
-first.
-
-### Creating new nodes
-
-The plugin nature of Node-RED means anyone can create a new node to extend
-its capabilities. 
-
-We want to avoid duplication as that can lead to confusion. Many of our existing
-nodes offer a starting point of functionality. If they are missing features,
-we would rather extend them than add separate 'advanced' versions. But the key
-to that approach is getting the UX right to not lose the simplicity.
-
-We are also going to be quite selective over what nodes are included in the main
-repository - enough to be useful, but not so many that new user is overwhelmed.
-
-To contribute a new node, please raise a pull-request against the 
-`node-red-nodes` repository.
-
-Eventually, the nodes will be npm-installable, but we're not there yet. We'll
-also have some sort of registry of nodes to help with discoverability.
-
-### Pull-Requests
-
-In order for us to accept pull-requests, the contributor must first complete
-a Contributor License Agreement (CLA). This clarifies the intellectual 
-property license granted with any contribution. It is for your protection as a 
-Contributor as well as the protection of IBM and its customers; it does not 
-change your rights to use your own Contributions for any other purpose.
-
-Once you have created a pull-request, we'll provide a link to the appropriate
-CLA document.
-
-If you are an IBMer, please contact us directly as the contribution process is
-slightly different.
+Before raising a pull-request, please read our [contributing guide](https://github.com/node-red/node-red/blob/master/CONTRIBUTING.md).
 
 ## Authors
 
-Node-RED is a creation of the IBM Emerging Technology Services team.
+Node-RED is a creation of [IBM Emerging Technology](http://ibm.com/blogs/et).
 
 * Nick O'Leary [@knolleary](http://twitter.com/knolleary)
 * Dave Conway-Jones [@ceejay](http://twitter.com/ceejay)
 
+For more open-source projects from IBM, head over [here](http://ibm.github.io).
+
 ## Copyright and license
 
-Copyright 2013 IBM Corp. under [the Apache 2.0 license](LICENSE).
+Copyright 2013, 2015 IBM Corp. under [the Apache 2.0 license](LICENSE).

bin/node-red-pi

@@ -0,0 +1,43 @@
+#!/bin/bash
+#
+# Copyright 2015 IBM Corp.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Separate out node/v8 options from node-red ones
+OPTIONS=""
+ARGS=""
+
+for arg in "$@"
+do
+   case $arg in
+      --userDir|--settings|--help) ARGS="$ARGS $arg";;
+            --*) OPTIONS="$OPTIONS $arg";;
+              *) ARGS="$ARGS $arg";;
+   esac
+done
+
+# Find the real location of this script
+CURRENT_PATH=`pwd`
+SCRIPT_PATH="${BASH_SOURCE[0]}";
+while([ -h "${SCRIPT_PATH}" ]); do
+    cd "`dirname "${SCRIPT_PATH}"`"
+    SCRIPT_PATH="$(readlink "`basename "${SCRIPT_PATH}"`")";
+done
+cd "`dirname "${SCRIPT_PATH}"`" > /dev/null
+SCRIPT_PATH="`pwd`";
+cd $CURRENT_PATH
+
+# Run Node-RED
+/usr/bin/env node $OPTIONS $SCRIPT_PATH/../red.js $ARGS

nodes/99-sample.html.demo

@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013 IBM Corp.
+  Copyright 2014 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 <!-- Sample html file that corresponds to the 99-sample.js file              -->
 <!-- This creates and configures the onscreen elements of the node           -->
 
-<!-- If you use this as a template, replace IBM Corp. with your own name.    -->
+<!-- If you use this as a template, update the copyright with your own name. -->
 
 <!-- First, the content of the edit dialog is defined.                       -->
 
@@ -28,16 +28,17 @@
    <!-- Generally, there should be an input for each property of the node.   -->
    <!-- The for and id attributes identify the corresponding property        -->
    <!-- (with the 'node-input-' prefix).                                     -->
-   <!-- The available icon classes are defined in Twitter Bootstrap          -->
+   <!-- The available icon classes are defined Twitter Bootstrap glyphicons  -->
     <div class="form-row">
-        <label for="node-input-topic"><i class="icon-tasks"></i> Topic</label>
+        <label for="node-input-topic"><i class="fa fa-tasks"></i> Topic</label>
         <input type="text" id="node-input-topic" placeholder="Topic">
     </div>
 
+    <br/>
     <!-- By convention, most nodes have a 'name' property. The following div -->
-    <!-- provides the necessary field.                                       -->
+    <!-- provides the necessary field. Should always be the last option      -->
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
 </script>
@@ -64,10 +65,11 @@
             name: {value:""},   //  along with default values.
             topic: {value:"", required:true}
         },
-        inputs:0,                // set the number of inputs - only 0 or 1
-        outputs:1,               // set the number of outputs - 0 to n
-        icon: "arrow-in.png",    // set the icon (held in public/icons)
-        label: function() {      // sets the default label contents
+        inputs:1,               // set the number of inputs - only 0 or 1
+        outputs:1,              // set the number of outputs - 0 to n
+        // set the icon (held in icons dir below where you save the node)
+        icon: "myicon.png",     // saved in  icons/myicon.png
+        label: function() {     // sets the default label contents
             return this.name||this.topic||"sample";
         },
         labelStyle: function() { // sets the class to apply to the label

nodes/99-sample.js.demo

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 IBM Corp.
+ * Copyright 2014 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,39 +14,55 @@
  * limitations under the License.
  **/
 
-// If you use this as a template, replace IBM Corp. with your own name.
+// If you use this as a template, update the copyright with your own name.
 
 // Sample Node-RED node file
 
-// Require main module
-var RED = require(process.env.NODE_RED_HOME+"/red/red");
 
-// The main node definition - most things happen in here
-function SampleNode(n) {
-    // Create a RED node
-    RED.nodes.createNode(this,n);
+module.exports = function(RED) {
+    "use strict";
+    // require any external libraries we may need....
+    //var foo = require("foo-library");
 
-    // Store local copies of the node configuration (as defined in the .html)
-    this.topic = n.topic;
+    // The main node definition - most things happen in here
+    function SampleNode(n) {
+        // Create a RED node
+        RED.nodes.createNode(this,n);
 
-    // Do whatever you need to do in here - declare callbacks etc
-    // Note: this sample doesn't do anything much - it will only send
-    // this message once at startup...
-    // Look at other real nodes for some better ideas of what to do....
-    var msg = {};
-    msg.topic = this.topic;
-    msg.payload = "Hello world !"
+        // Store local copies of the node configuration (as defined in the .html)
+        this.topic = n.topic;
 
-    // send out the message to the rest of the workspace.
-    this.send(msg);
+        // copy "this" object in case we need it in context of callbacks of other functions.
+        var node = this;
+
+        // Do whatever you need to do in here - declare callbacks etc
+        // Note: this sample doesn't do anything much - it will only send
+        // this message once at startup...
+        // Look at other real nodes for some better ideas of what to do....
+        var msg = {};
+        msg.topic = this.topic;
+        msg.payload = "Hello world !"
+
+        // send out the message to the rest of the workspace.
+        // ... this message will get sent at startup so you may not see it in a debug node.
+        this.send(msg);
+
+        // respond to inputs....
+        this.on('input', function (msg) {
+            node.warn("I saw a payload: "+msg.payload);
+            // in this example just send it straight on... should process it here really
+            node.send(msg);
+        });
+
+        this.on("close", function() {
+            // Called when the node is shutdown - eg on redeploy.
+            // Allows ports to be closed, connections dropped etc.
+            // eg: node.client.disconnect();
+        });
+    }
+
+    // Register the node by name. This must be called before overriding any of the
+    // Node functions.
+    RED.nodes.registerType("sample",SampleNode);
 
-    this.on("close", function() {
-        // Called when the node is shutdown - eg on redeploy.
-        // Allows ports to be closed, connections dropped etc.
-        // eg: this.client.disconnect();
-    });
 }
-
-// Register the node by name. This must be called before overriding any of the
-// Node functions.
-RED.nodes.registerType("sample",SampleNode);

nodes/analysis/73-parsexml.html

@@ -1,53 +0,0 @@
-<!--
-  Copyright 2013 IBM Corp.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<script type="text/x-red" data-template-name="xml2js">
-    <div class="form-row">
-        <label>Use Console</label>
-        <input type="checkbox" id="node-input-useEyes" placeholder="Name" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-useEyes" style="width: 70%;">Debug output in console ?</label>
-    </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
-    <div class="form-tips">Uses xml2js to process xml into javascript object.</div>
-</script>
-
-<script type="text/x-red" data-help-name="xml2js">
-    <p>A function that parses the <b>msg.payload</b> using the xml2js library. Places the result in the payload.</p>
-    <p>See <a href="https://github.com/Leonidas-from-XIV/node-xml2js/blob/master/README.md" target="_new">the xml2js docs <i>here</i></a> for more information.</p>
-</script>
-
-<script type="text/javascript">
-    RED.nodes.registerType('xml2js',{
-        category: 'advanced-function',
-        color:"#E6E0F8",
-        defaults: {
-        useEyes: {value:false},
-        name: {value:""},
-        },
-        inputs:1,
-        outputs:1,
-        icon: "arrow-in.png",
-        label: function() {
-            return this.name||"xml2js";
-        },
-        labelStyle: function() {
-            return this.name?"node_label_italic":"";
-        }
-    });
-</script>

nodes/analysis/73-parsexml.js

@@ -1,49 +0,0 @@
-/**
- * Copyright 2013 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-var RED = require("../../red/red");
-var util = require("util");
-var parseString = require('xml2js').parseString;
-var gotEyes = false;
-try {
-    var eyes = require("eyes");
-    gotEyes = true;
-} catch(e) {
-    util.log("[73-parsexml.js] Note: Module 'eyes' not installed. (not needed, but useful)");
-}
-
-function Xml2jsNode(n) {
-    RED.nodes.createNode(this,n);
-    this.useEyes = n.useEyes;
-    var node = this;
-    this.on("input", function(msg) {
-        try {
-		    parseString(msg.payload, function (err, result) {
-		        if (err) { node.error(err); }
-		        else {
-		            msg.payload = result;
-		            node.send(msg);
-		            if (node.useEyes == true) {
-		                if (gotEyes == true) { eyes.inspect(msg); }
-		                else { node.log(JSON.stringify(msg)); }
-		            }
-		        }
-		    });
-		}
-		catch(e) { console.log(e); }
-    });
-}
-RED.nodes.registerType("xml2js",Xml2jsNode);

nodes/core/20-inject.html

@@ -1,371 +0,0 @@
-<!--
-  Copyright 2013 IBM Corp.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<script type="text/x-red" data-template-name="inject">
-    <div class="form-row node-input-payload">
-        <label for="node-input-payload"><i class="icon-envelope"></i> Payload</label>
-        <input type="text" id="node-input-payload" placeholder="Payload">
-    </div>
-
-    <div class="form-row">
-        <label for="node-input-topic"><i class="icon-tasks"></i> Topic</label>
-        <input type="text" id="node-input-topic" placeholder="Topic">
-    </div>
-
-    <div class="form-row">
-        <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-once" placeholder="once" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-once" style="width: 70%;">Fire once at start ?</label>
-    </div>
-
-    <div class="form-row">
-        <label for=""><i class="icon-repeat"></i> Repeat</label>
-        <select id="inject-time-type-select"><option value="none">None</option><option value="interval">interval</option><option value="interval-time">interval between times</option><option value="time">at a specific time</option></select>
-        <input type="hidden" id="node-input-repeat" placeholder="Payload">
-        <input type="hidden" id="node-input-crontab" placeholder="Payload">
-    </div>
-
-    <div class="form-row inject-time-row hidden" id="inject-time-row-interval">
-        every <input id="inject-time-interval-count" class="inject-time-count" value="1"></input>
-              <select style="width: 100px" id="inject-time-interval-units"><option value="s">seconds</option><option value="m">minutes</option><option value="h">hours</option></select><br/>
-        on <select disabled id="inject-time-interval-days" class="inject-time-days"></select>
-    </div>
-
-    <div class="form-row inject-time-row hidden" id="inject-time-row-interval-time">
-        every <input id="inject-time-interval-time-units" class="inject-time-count" value="1"></input> minutes<br/>
-        between <select id="inject-time-interval-time-start" class="inject-time-times"></select>
-        and <select id="inject-time-interval-time-end" class="inject-time-times"></select><br/>
-        on <select id="inject-time-interval-time-days" class="inject-time-days"></select>
-    </div>
-
-    <div class="form-row inject-time-row hidden" id="inject-time-row-time">
-        at <input id="inject-time-time" value="12:00"></input><br/>
-        on <select id="inject-time-time-days" class="inject-time-days"></select>
-    </div>
-
-    <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
-
-    <div class="form-tips">Tip: Injects Date.now() if no payload set</div>
-    <script>
-    {
-
-        $("#inject-time-type-select").change(function() {
-            var id = $("#inject-time-type-select option:selected").val();
-            $(".inject-time-row").hide();
-            $("#inject-time-row-"+id).show();
-        });
-
-        var days = [
-            {v:"*",t:"every day"},
-            {v:"1-5",t:"Mondays to Fridays"},
-            {v:"6-7",t:"Saturdays and Sundays"},
-            {v:"1",t:"Mondays"},
-            {v:"2",t:"Tuesdays"},
-            {v:"3",t:"Wednesdays"},
-            {v:"4",t:"Thursdays"},
-            {v:"5",t:"Fridays"},
-            {v:"6",t:"Saturdays"},
-            {v:"7",t:"Sundays"}
-        ];
-        $(".inject-time-days").each(function() {
-            for (var d in days) {
-                $(this).append($("<option></option>").val(days[d].v).text(days[d].t));
-            }
-        });
-
-        $(".inject-time-times").each(function() {
-            for (var i=0;i<24;i++) {
-                var l = (i<10?"0":"")+i+":00";
-                $(this).append($("<option></option>").val(i).text(l));
-            }
-        });
-        $(".inject-time-count").spinner({
-            min:1,
-            max:60
-        });
-
-        $("#inject-time-interval-units").change(function() {
-            var units = $("#inject-time-interval-units option:selected").val();
-            $("#inject-time-interval-days").prop("disabled",(units == "s")?"disabled":false);
-            $(".inject-time-count").spinner("option","max",(units == "h")?24:60);
-
-        });
-
-
-        $.widget( "ui.injecttimespinner", $.ui.spinner, {
-            options: {
-                // seconds
-                step: 60 * 1000,
-                // hours
-                page: 60,
-                min:0,
-                max:(23*60+59)*60*1000
-            },
-            _parse: function( value ) {
-                if ( typeof value === "string" ) {
-                    // already a timestamp
-                    if ( Number( value ) == value ) {
-                        return Number( value );
-                    }
-                    var p = value.split(":");
-                    return ((p[0]*60)+Number(p[1]))*60*1000;
-                }
-                return value;
-            },
-            _format: function( value ) {
-                var d = new Date(value);
-                var h = d.getHours();
-                var m = d.getMinutes();
-
-                return ((h<10)?"0":"")+h+":"+((m<10)?"0":"")+m;
-            }
-        });
-
-
-        $("#inject-time-time").injecttimespinner();
-    };
-
-
-    </script>
-</script>
-<style>
-    .inject-time-row {
-        padding-left: 110px;
-    }
-    .inject-time-row select {
-        margin: 3px 0;
-    }
-    .inject-time-days {
-        width: 225px;
-    }
-    .inject-time-times {
-        width: 90px;
-    }
-    .inject-time-row > .ui-spinner {
-        height: 28px;
-        margin: 3px 0;
-        border-color: rgb(204, 204, 204);
-    }
-    #inject-time-time {
-        margin-top: 3px;
-        width: 75px;
-    }
-    .inject-time-count {
-        width: 30px !important;
-    }
-    .
-
-</style>
-<script type="text/x-red" data-help-name="inject">
-	<p>Pressing the button on the left side of the node allows a message on a topic to be injected into the flow. This is mainly for test purposes.</p>
-	<p>If no payload is specified the payload is set to the current time in millisecs since 1970. This allows subsequent functions to perform time based actions.</p>
-	<p>The repeat function does what it says on the tin and continuously sends the payload every x seconds.</p>
-	<p>The Fire once at start option actually waits 50mS before firing to give other nodes a chance to instantiate properly.</p>
-</script>
-
-<script type="text/javascript">
-    RED.nodes.registerType('inject',{
-        category: 'input',
-        color:"#a6bbcf",
-        defaults: {
-            name: {value:""},
-            topic: {value:""},
-            payload: {value:""},
-            repeat: {value:""},
-            crontab: {value:""},
-            once: {value:false}
-        },
-        inputs:0,
-        outputs:1,
-        icon: "inject.png",
-        label: function() {
-            return this.name||this.topic||this.payload||"inject";
-        },
-        labelStyle: function() {
-            return this.name?"node_label_italic":"";
-        },
-        oneditprepare: function() {
-            var repeattype = "none";
-            if (this.repeat != "") {
-                repeattype = "interval";
-                $("#inject-time-interval-units option").filter(function() {return $(this).val() == "s";}).attr('selected',true);
-                $("#inject-time-interval-count").val(this.repeat);
-                $("#inject-time-interval-days").prop("disabled","disabled");
-            } else if (this.crontab) {
-                var cronparts = this.crontab.split(" ");
-                var days = cronparts[4];
-                if (!isNaN(cronparts[0]) && !isNaN(cronparts[1])) {
-                    repeattype = "time";
-                    // Fixed time
-                    var time = cronparts[1]+":"+cronparts[0];
-                    $("#inject-time-time").val(time);
-                    $("#inject-time-type-select option").filter(function() {return $(this).val() == "s";}).attr('selected',true);
-                    $("#inject-time-time-days option").filter(function() {return $(this).val() == days;}).attr('selected',true);
-
-                } else if (cronparts[0] == "0") {
-                    // interval - hours
-                    var hours = cronparts[1].slice(2);
-                    repeattype = "interval";
-                    $("#inject-time-interval-days").prop("disabled",false);
-                    $("#inject-time-interval-days option").filter(function() {return $(this).val() == days;}).attr('selected',true);
-                    $("#inject-time-interval-count").val(hours)
-                    $("#inject-time-interval-units option").filter(function() {return $(this).val() == "h";}).attr('selected',true);
-                } else if (cronparts[1] == "*") {
-                    // interval - minutes
-                    var minutes = cronparts[0].slice(2);
-                    repeattype = "interval";
-                    $("#inject-time-interval-days").prop("disabled",false);
-                    $("#inject-time-interval-days option").filter(function() {return $(this).val() == days;}).attr('selected',true);
-                    $("#inject-time-interval-count").val(minutes)
-                    $("#inject-time-interval-units option").filter(function() {return $(this).val() == "m";}).attr('selected',true);
-                } else {
-                    repeattype = "interval-time";
-                    // interval - time period
-                    var minutes = cronparts[0].slice(2);
-                    $("#inject-time-interval-time-units").val(minutes);
-                    $("#inject-time-interval-time-days option").filter(function() {return $(this).val() == days;}).attr('selected',true);
-                    var time = cronparts[1];
-                    var timeparts = time.split(",");
-                    var start;
-                    var end;
-                    if (timeparts.length == 1) {
-                        // 0 or 0-10
-                        var hours = timeparts[0].split("-");
-                        if (hours.length == 1) {
-                            start = hours[0];
-                            end = Number(hours[0])+1;
-                        } else {
-                            start = hours[0];
-                            end = (Number(hours[1])+1)%24;
-                        }
-                    } else {
-                        // 23,0 or 17-23,0-10 or 23,0-2 or 17-23,0
-                        var startparts = timeparts[0].split("-");
-                        start = startparts[0];
-
-                        var endparts = timeparts[1].split("-");
-                        if (endparts.length == 1) {
-                            end = Number(endparts[0])+1;
-                        } else {
-                            end = Number(endparts[1])+1;
-                        }
-                    }
-                    $("#inject-time-interval-time-start option").filter(function() {return $(this).val() == start;}).attr('selected',true);
-                    $("#inject-time-interval-time-end option").filter(function() {return $(this).val() == end;}).attr('selected',true);
-
-                }
-            } else {
-                $("#inject-time-type-select option").filter(function() {return $(this).val() == "none";}).attr('selected',true);
-            }
-
-            $(".inject-time-row").hide();
-            $("#inject-time-type-select option").filter(function() {return $(this).val() == repeattype;}).attr('selected',true);
-            $("#inject-time-row-"+repeattype).show();
-
-
-        },
-        oneditsave: function() {
-            var repeat = "";
-            var crontab = "";
-            var type = $("#inject-time-type-select option:selected").val();
-            if (type == "none") {
-                // nothing
-            } else if (type == "interval") {
-                var count = $("#inject-time-interval-count").val();
-                var units = $("#inject-time-interval-units option:selected").val();
-                var days = $("#inject-time-interval-days option:selected").val();
-                if (units == "s") {
-                    repeat = count;
-                } else {
-                    if (units == "m") {
-                        crontab = "*/"+count+" * * * "+days;
-                    } else if (units == "h") {
-                        crontab = "0 */"+count+" * * "+days;
-                    }
-                }
-            } else if (type == "interval-time") {
-                var count = $("#inject-time-interval-time-units").val();
-                var startTime = Number($("#inject-time-interval-time-start option:selected").val());
-                var endTime = Number($("#inject-time-interval-time-end option:selected").val());
-                var days = $("#inject-time-interval-time-days option:selected").val();
-                var timerange = "";
-                if (startTime == endTime) {
-                    //TODO: invalid
-                    repeat = 0;
-                    crontab = "";
-                } else if (endTime == 0) {
-                    timerange = startTime+"-23";
-                } else if (startTime+1 < endTime) {
-                    timerange = startTime+"-"+(endTime-1);
-                } else if (startTime+1 == endTime) {
-                    timerange = startTime;
-                } else {
-                    var startpart = "";
-                    var endpart = "";
-                    if (startTime == 23) {
-                        startpart = "23";
-                    } else {
-                        startpart = startTime+"-23";
-                    }
-                    if (endTime == 1) {
-                        endpart = "0";
-                    } else {
-                        endpart = "0-"+(endTime-1);
-                    }
-                    timerange = startpart+","+endpart;
-                }
-                repeat = 0;
-                crontab = "*/"+count+" "+timerange+" * * "+days;
-            } else if (type == "time") {
-                var time = $("#inject-time-time").val();
-                var days = $("#inject-time-time-days option:selected").val();
-                var parts = time.split(":");
-                repeat = 0;
-                crontab = parts[1]+" "+parts[0]+" * * "+days;
-            }
-
-            $("#node-input-repeat").val(repeat);
-            $("#node-input-crontab").val(crontab);
-
-        },
-        button: {
-            onclick: function() {
-                var label = this.name||this.payload;
-                d3.xhr("inject/"+this.id).post(function(err,resp) {
-                        if (err) {
-                            if (err.status == 404) {
-                                RED.notify("<strong>Error</strong>: inject node not deployed","error");
-                            } else if (err.status == 500) {
-                                RED.notify("<strong>Error</strong>: inject failed, see log for details.","error");
-                            } else if (err.status == 0) {
-                                RED.notify("<strong>Error</strong>: no response from server","error");
-                            } else {
-                                RED.notify("<strong>Error</strong>: unexpected error: ("+err.status+")"+err.response,"error");
-                            }
-                        } else if (resp.status == 200) {
-                            RED.notify("Successfully injected: "+label,"success");
-                        } else {
-                            RED.notify("<strong>Error</strong>: unexpected response: ("+resp.status+") "+resp.response,"error");
-                        }
-                });
-            }
-        }
-    });
-
-</script>

nodes/core/20-inject.js

@@ -1,93 +0,0 @@
-/**
- * Copyright 2013 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-var RED = require("../../red/red");
-try {
-    var cron = require("cron");
-} catch(err) {
-    require("util").log("[inject] Warning: cannot find module 'cron'");
-}
-
-function InjectNode(n) {
-	RED.nodes.createNode(this,n);
-	this.topic = n.topic;
-	this.payload = n.payload;
-	this.repeat = n.repeat;
-	this.crontab = n.crontab;
-	this.once = n.once;
-	var node = this;
-	this.interval_id = null;
-	this.cronjob = null;
-
-	if (this.repeat && !isNaN(this.repeat) && this.repeat > 0) {
-		this.repeat = this.repeat * 1000;
-		this.log("repeat = "+this.repeat);
-		this.interval_id = setInterval( function() {
-			node.emit("input",{});
-		}, this.repeat );
-	} else if (this.crontab) {
-	    if (cron) {
-	        this.log("crontab = "+this.crontab);
-	        this.cronjob = new cron.CronJob(this.crontab,
-	            function() {
-	                node.emit("input",{});
-	            },
-	            null,true);
-	    } else {
-	        this.error("'cron' module not found");
-	    }
-	}
-
-	if (this.once) {
-		setTimeout( function(){ node.emit("input",{}); }, 50);
-	}
-
-	this.on("input",function(msg) {
-		var msg = {topic:this.topic,payload:this.payload};
-		if (msg.payload == "") { msg.payload = Date.now(); }
-		this.send(msg);
-		msg = null;
-	});
-}
-
-RED.nodes.registerType("inject",InjectNode);
-
-InjectNode.prototype.close = function() {
-    if (this.interval_id != null) {
-        clearInterval(this.interval_id);
-        this.log("inject: repeat stopped");
-    } else if (this.cronjob != null) {
-        this.cronjob.stop();
-        this.log("inject: cronjob stopped");
-        delete this.cronjob;
-    }
-}
-
-RED.app.post("/inject/:id", function(req,res) {
-        var node = RED.nodes.getNode(req.params.id);
-        if (node != null) {
-            try {
-                node.receive();
-                res.send(200);
-            } catch(err) {
-                res.send(500);
-                node.error("Inject failed:"+err);
-                console.log(err.stack);
-            }
-        } else {
-            res.send(404);
-        }
-});

nodes/core/58-debug.html

@@ -1,247 +0,0 @@
-<!--
-  Copyright 2013 IBM Corp.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<script type="text/x-red" data-template-name="debug">
-    <div class="form-row">
-        <label for="node-input-complete"><i class="icon-list"></i> Output</label>
-        <select type="text" id="node-input-complete" style="display: inline-block; width: auto; vertical-align: top;">
-            <option value=false>Payload only</option>
-            <option value=true>Complete msg object</option>
-        </select>
-    </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
-</script>
-
-<script type="text/x-red" data-help-name="debug">
-    <p>The Debug node can be connected to the output of any node. It will display the timestamp, <b>msg.topic</b> and <b>msg.payload</b> fields of any messages it receives in the debug tab of the sidebar.
-    <br/>The sidebar can be accessed under the options drop-down in the top right corner.</p>
-    <p>The button to the right of the node will toggle it's output on and off so you can de-clutter the debug window.</p>
-    <p>If the payload is an object it will be stringified first for display and indicate that by saying "(Object) ".</p>
-    <p>If the payload is a buffer it will be stringified first for display and indicate that by saying "(Buffer) ".</p>
-    <p>Selecting any particular message will highlight (in red) the debug node that reported it. This is useful if you wire up multiple debug nodes.</p>
-    <p>Optionally can show the complete msg object - but the screen can get messy.</p>
-    <p>In addition any calls to node.warn or node.error will appear here.</p>
-</script>
-
-<script type="text/javascript">
-    RED.nodes.registerType('debug',{
-        category: 'output',
-        defaults: {
-            name: {value:""},
-            active: {value:true},
-            complete: {value:false}
-        },
-        label: function() {
-            return this.name||"debug";
-        },
-        labelStyle: function() {
-            return this.name?"node_label_italic":"";
-        },
-        color:"#87a980",
-        inputs:1,
-        outputs:0,
-        icon: "debug.png",
-        align: "right",
-        button: {
-            toggle: "active",
-            onclick: function() {
-                var label = this.name||"debug";
-                d3.xhr("debug/"+this.id+"/"+(this.active?"enable":"disable")).post(function(err,resp) {
-                    if (err) {
-                        if (err.status == 404) {
-                            RED.notify("<strong>Error</strong>: debug node not deployed","error");
-                        } else if (err.status == 0) {
-                            RED.notify("<strong>Error</strong>: no response from server","error");
-                        } else {
-                            RED.notify("<strong>Error</strong>: unexpected error: ("+err.status+")"+err.response,"error");
-                        }
-                    } else if (resp.status == 200) {
-                        RED.notify("Successfully activated: "+label,"success");
-                    } else if (resp.status == 201) {
-                        RED.notify("Successfully deactivated: "+label,"success");
-                    } else {
-                        RED.notify("<strong>Error</strong>: unexpected response: ("+resp.status+") "+resp.response,"error");
-                    }
-                });
-            }
-        }
-    });
-
-    var a = function() {
-        var content = document.createElement("div");
-        content.id = "tab-debug";
-
-        var toolbar = document.createElement("div");
-        toolbar.id = "debug-toolbar";
-        content.appendChild(toolbar);
-
-        toolbar.innerHTML = '<div class="btn-group pull-right"><a id="debug-tab-clear" title="clear log" class="btn btn-mini" href="#"><i class="icon-trash"></i></a></div> ';
-
-        var messages = document.createElement("div");
-        messages.id = "debug-content";
-        content.appendChild(messages);
-
-        RED.sidebar.addTab("debug",content);
-
-        function getTimestamp() {
-            var d = new Date();
-            return d.toUTCString().substring(5,25)+"."+d.getMilliseconds();
-        }
-
-        var sbc = document.getElementById("debug-content");
-
-        var errornotification = null;
-
-        var messageCount = 0;
-
-
-        function debugConnect() {
-            //console.log("debug ws connecting");
-            var ws = new WebSocket("ws://"+location.hostname+":"+location.port+document.location.pathname+"/debug");
-            ws.onopen = function() {
-                if (errornotification) {
-                    errornotification.close();
-                    errornotification = null;
-                }
-                //console.log("debug ws connected");
-            }
-            ws.onmessage = function(event) {
-                var o = JSON.parse(event.data);
-                //console.log(msg);
-                var msg = document.createElement("div");
-                msg.onmouseover = function() {
-                    msg.style.borderRightColor = "#999";
-                    RED.nodes.eachNode(function(node) {
-                        if( node.id == o.id) {
-                            node.highlighted = true;
-                            node.dirty = true;
-                        }
-                    });
-                    RED.view.redraw();
-                };
-                msg.onmouseout = function() {
-                    msg.style.borderRightColor = "";
-                    RED.nodes.eachNode(function(node) {
-                        if( node.id == o.id) {
-                            node.highlighted = false;
-                            node.dirty = true;
-                        }
-                    });
-                    RED.view.redraw();
-                };
-                var name = (o.name?o.name:o.id).toString().replace(/</g,"&lt;").replace(/>/g,"&gt;");
-                var topic = (o.topic||"").toString().replace(/</g,"&lt;").replace(/>/g,"&gt;");
-                var payload = (o.msg||"").toString().replace(/</g,"&lt;").replace(/>/g,"&gt;");
-                msg.className = 'debug-message'+(o.level?(' debug-message-level-'+o.level):'')
-                msg.innerHTML = '<span class="debug-message-date">'+getTimestamp()+'</span>'+
-                                '<span class="debug-message-name">['+name+']</span>'+
-                                (o.topic?'<span class="debug-message-topic">'+topic+'</span>':'')+
-                                '<span class="debug-message-payload">'+payload+'</span>';
-                var atBottom = (sbc.scrollHeight-messages.offsetHeight-sbc.scrollTop) < 5;
-                messageCount++;
-                $(messages).append(msg);
-
-                if (messageCount > 200) {
-                    $("#debug-content .debug-message:first").remove();
-                    messageCount--;
-                }
-                if (atBottom) {
-                    $(sbc).scrollTop(sbc.scrollHeight);
-                }
-            };
-            ws.onclose = function() {
-                if (errornotification == null) {
-                    errornotification = RED.notify("<b>Error</b>: Lost connection to server","error",true);
-                }
-                setTimeout(debugConnect,1000);
-            }
-        }
-        debugConnect();
-
-        $("#debug-tab-clear").click(function() {
-            $(".debug-message").remove();
-            messageCount = 0;
-            RED.nodes.eachNode(function(node) {
-                node.highlighted = false;
-                node.dirty = true;
-            });
-            RED.view.redraw();
-        });
-
-    }();
-</script>
-
-<style>
-    #debug-content {
-        position: absolute;
-        top: 30px;
-        bottom: 0px;
-        left:0px;
-        right: 0px;
-        overflow-y: scroll;
-    }
-    #debug-toolbar {
-        padding: 3px 10px;
-        height: 24px;
-        background: #f3f3f3;
-    }
-    .debug-message {
-        cursor: pointer;
-        border-bottom: 1px solid #eee;
-        border-left: 8px solid #eee;
-        border-right: 8px solid #eee;
-        padding: 2px;
-    }
-    .debug-message-date {
-        background: #fff;
-        font-size: 9px;
-        color: #aaa;
-        padding: 1px 5px 1px 1px;
-    }
-    .debug-message-topic {
-        display: block;
-        background: #fff;
-        padding: 1px 5px;
-        font-size: 9px;
-        color: #caa;
-    }
-    .debug-message-name {
-        background: #fff;
-        padding: 1px 5px;
-        font-size: 9px;
-        color: #aac;
-    }
-    .debug-message-payload {
-        display: block;
-        padding: 2px;
-        background: #fff;
-    }
-    .debug-message-level-log {
-        border-left-color: #eee;
-        border-right-color: #eee;
-    }
-    .debug-message-level-warn {
-        border-left-color: #ffdf9d;
-        border-right-color: #ffdf9d;
-    }
-    .debug-message-level-error {
-        border-left-color: #f99;
-        border-right-color: #f99;
-    }
-</style>

nodes/core/58-debug.js

@@ -1,119 +0,0 @@
-/**
- * Copyright 2013 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-var RED = require("../../red/red");
-
-var util = require("util");
-var ws = require('ws');
-var events = require("events");
-var debuglength = RED.settings.debugMaxLength||1000;
-
-function DebugNode(n) {
-	RED.nodes.createNode(this,n);
-	this.name = n.name;
-	this.complete = n.complete;
-	this.active = (n.active == null)||n.active;
-
-	this.on("input",function(msg) {
-		if (this.active) {
-			if (msg.payload instanceof Buffer) {
-				msg.payload = "(Buffer) "+msg.payload.toString();
-			}
-			if (this.complete == "true") {
-				DebugNode.send({id:this.id,name:this.name,topic:msg.topic,msg:msg,_path:msg._path});
-			} else {
-				if (typeof msg.payload !== "undefined") {
-					DebugNode.send({id:this.id,name:this.name,topic:msg.topic,msg:msg.payload,_path:msg._path});
-				}
-			}
-		}
-	});
-}
-
-RED.nodes.registerType("debug",DebugNode);
-
-DebugNode.send = function(msg) {
-	if (msg.msg instanceof Error) {
-		msg.msg = msg.msg.toString();
-	}
-	else if (typeof msg.msg === 'object') {
-		var seen = [];
-		msg.msg = "(Object) " + JSON.stringify(msg.msg, function(key, value) {
-			if (typeof value === 'object' && value !== null) {
-				if (seen.indexOf(value) !== -1) { return "[circular]"; }
-				seen.push(value);
-			}
-			return value;
-		}," ");
-		seen = null;
-	}
-	else if (typeof msg.msg === "boolean") msg.msg = "(boolean) "+msg.msg.toString();
-	else if (msg.msg === 0) msg.msg = "0";
-
-	if (msg.msg.length > debuglength) {
-		msg.msg = msg.msg.substr(0,debuglength) +" ....";
-	}
-
-	for (var i in DebugNode.activeConnections) {
-		var ws = DebugNode.activeConnections[i];
-		try {
-			var p = JSON.stringify(msg);
-			ws.send(p);
-		} catch(err) {
-			util.log("[debug] ws error : "+err);
-		}
-	}
-}
-
-DebugNode.activeConnections = [];
-DebugNode.wsServer = new ws.Server({server:RED.server});
-DebugNode.wsServer.on('connection',function(ws) {
-	DebugNode.activeConnections.push(ws);
-	ws.on('close',function() {
-		for (var i in DebugNode.activeConnections) {
-			if (DebugNode.activeConnections[i] === ws) {
-				DebugNode.activeConnections.splice(i,1);
-				break;
-			}
-		}
-	});
-});
-
-DebugNode.logHandler = new events.EventEmitter();
-DebugNode.logHandler.on("log",function(msg) {
-	if (msg.level == "warn" || msg.level == "error") {
-		DebugNode.send(msg);
-	}
-});
-RED.nodes.addLogHandler(DebugNode.logHandler);
-
-RED.app.post("/debug/:id/:state", function(req,res) {
-	var node = RED.nodes.getNode(req.params.id);
-	var state = req.params.state;
-	if (node != null) {
-	    if (state === "enable") {
-	        node.active = true;
-			res.send(201);
-	    } else if (state === "disable") {
-	        node.active = false;
-			res.send(200);
-	    } else {
-	        res.send(404);
-	    }
-	} else {
-		res.send(404);
-	}
-});

nodes/core/75-exec.js

@@ -1,75 +0,0 @@
-/**
- * Copyright 2013 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-var RED = require("../../red/red");
-
-var spawn = require('child_process').spawn;
-var exec = require('child_process').exec;
-
-function ExecNode(n) {
-    RED.nodes.createNode(this,n);
-    this.cmd = n.command;
-    this.append = n.append || "";
-    this.useSpawn = n.useSpawn;
-
-    var node = this;
-    this.on("input", function(msg) {
-        if (msg != null) {
-
-            if (this.useSpawn == true) {
-                // make the extra args into an array
-                // then prepend with the msg.payload
-                var arg = node.append.split(",");
-                if (msg.payload != " ") { arg.unshift(msg.payload); }
-                //console.log(arg);
-                var ex = spawn(node.cmd,arg);
-                ex.stdout.on('data', function (data) {
-                    //console.log('[exec] stdout: ' + data);
-                    msg.payload = data;
-                    node.send([msg,null,null]);
-                });
-                ex.stderr.on('data', function (data) {
-                    //console.log('[exec] stderr: ' + data);
-                    msg.payload = data;
-                    node.send([null,msg,null]);
-                });
-                ex.on('close', function (code) {
-                    //console.log('[exec] result: ' + code);
-                    msg.payload = code;
-                    node.send([null,null,msg]);
-                });
-            }
-
-            else {
-                var cl = node.cmd+" "+msg.payload+" "+node.append;
-                var child = exec(cl, function (error, stdout, stderr) {
-                    msg.payload = stdout;
-                    var msg2 = {payload:stderr};
-                    //console.log('[exec] stdout: ' + stdout);
-                    //console.log('[exec] stderr: ' + stderr);
-                    if (error !== null) {
-                        var msg3 = {payload:error};
-                        //console.log('[exec] error: ' + error);
-                    }
-                    node.send([msg,msg2,msg3]);
-                });
-            }
-        }
-
-    });
-}
-
-RED.nodes.registerType("exec",ExecNode);

nodes/core/80-function.js

@@ -1,71 +0,0 @@
-/**
- * Copyright 2013 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-var RED = require("../../red/red");
-
-var util = require("util");
-var vm = require("vm");
-var fs = require('fs');
-var fspath = require('path');
-
-function FunctionNode(n) {
-    RED.nodes.createNode(this,n);
-    this.name = n.name;
-    this.func = n.func;
-    var functionText = "var results = (function(msg){"+this.func+"})(msg);";
-    this.topic = n.topic;
-    this.context = {global:RED.settings.functionGlobalContext || {}};
-    try {
-        this.script = vm.createScript(functionText);
-        this.on("input", function(msg) {
-                if (msg != null) {
-                    var sandbox = {msg:msg,console:console,util:util,Buffer:Buffer,context:this.context};
-                    try {
-                        this.script.runInNewContext(sandbox);
-                        var results = sandbox.results;
-
-                        if (results == null) {
-                            results = [];
-                        } else if (results.length == null) {
-                            results = [results];
-                        }
-                        if (msg._topic) {
-                            for (var m in results) {
-                                if (results[m]) {
-                                    if (util.isArray(results[m])) {
-                                        for (var n in results[m]) {
-                                            results[m][n]._topic = msg._topic;
-                                        }
-                                    } else {
-                                        results[m]._topic = msg._topic;
-                                    }
-                                }
-                            }
-                        }
-                        this.send(results);
-
-                    } catch(err) {
-                        this.error(err.message);
-                    }
-                }
-        });
-    } catch(err) {
-        this.error(err.message);
-    }
-}
-
-RED.nodes.registerType("function",FunctionNode);
-RED.library.register("functions");

nodes/core/80-template.js

@@ -1,41 +0,0 @@
-/**
- * Copyright 2013 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-var RED = require("../../red/red");
-
-var mustache = require("mustache");
-var util = require("util");
-var fs = require('fs');
-
-function TemplateNode(n) {
-    RED.nodes.createNode(this,n);
-    this.name = n.name;
-    this.template = n.template;
-    this.on("input", function(msg) {
-            if (msg != null) {
-                try {
-                    msg.payload = mustache.render(this.template,msg)
-                    this.send(msg);
-                } catch(err) {
-                    this.error(err.message);
-                }
-            }
-    });
-}
-
-RED.nodes.registerType("template",TemplateNode);
-
-RED.library.register("templates");

nodes/core/89-delay.html

@@ -1,117 +0,0 @@
-<!--
-  Copyright 2013 IBM Corp.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<script type="text/x-red" data-template-name="delay">
-    <div class="form-row">
-        <label for="node-input-pauseType"><i class="icon-tasks"></i> Action</label>
-        <select id="node-input-pauseType" style="width:270px !important">
-          <option value="delay">Delay message</option>
-          <option value="rate">Limit message rate</option>
-        </select>
-    </div>
-    <div id="delay-details" class="form-row">
-        <label for="node-input-timeout"><i class="icon-time"></i> For</label>
-        <input type="text" id="node-input-timeout" placeholder="Time" style="direction:rtl; width:50px !important">
-        <select id="node-input-timeoutUnits" style="width:200px !important">
-          <option value="milliseconds">Milliseconds</option>
-          <option value="seconds">Seconds</option>
-          <option value="minutes">Minutes</option>
-          <option value="hours">Hours</option>
-          <option value="days">Days</option>
-        </select>
-    </div>
-    <div id="rate-details" class="form-row">
-        <label for="node-input-rate"><i class="icon-time"></i> To</label>
-        <input type="text" id="node-input-rate" placeholder="1" style="direction:rtl; width:40px !important">
-        <label for="node-input-rateUnits" style="width:120px !important">message(s) per</label>
-        <select id="node-input-rateUnits" style="width:140px !important">
-          <option value="second">Second</option>
-          <option value="minute">Minute</option>
-          <option value="hour">Hour</option>
-          <option value="day">Day</option>
-        </select>
-    </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
-</script>
-
-
-<script type="text/x-red" data-help-name="delay">
-    <p>Introduces a delay into a flow or rate limits messages</p>
-    <p>Default delay is 5 seconds or rate limit of 1 message/second, but both can be configured</p>
-    <p>The rate limiter will delay messages by buffering in a time released queue. A warning is generated if the buffer is larger than 1000 items.</p>
-</script>
-
-<script type="text/javascript">
-    RED.nodes.registerType('delay',{
-        category: 'function',
-        color:"#E6E0F8",
-        defaults: {
-            name: {value:""},
-            pauseType: {value:"delay", required:true},
-            timeout: {value:"5", required:true, validate:RED.validators.number()},
-            timeoutUnits: {value:"seconds"},
-            rate: {value:"1", required:true, validate:RED.validators.number()},
-            rateUnits: {value: "second"}
-        },
-        inputs:1,
-        outputs:1,
-        icon: "timer.png",
-        label: function() {
-            if (this.pauseType == "delay") {
-              var units = this.timeoutUnits ? this.timeoutUnits.charAt(0) : "s";
-              return this.name||"delay "+this.timeout+" " + units;
-            } else if (this.pauseType == "rate") {
-              var units = this.rateUnits ? this.rateUnits.charAt(0) : "s";
-              return this.name||"limit "+this.rate+" msg/"+ units;
-            }
-            return "";
-        },
-        labelStyle: function() {
-            return this.name?"node_label_italic":"";
-        },
-        oneditprepare: function() {
-          $( "#node-input-timeout" ).spinner({ min:1, max:60 });
-          $( "#node-input-rate" ).spinner({ min:1});
-
-          if (this.pauseType == "delay") {
-            $("#delay-details").show();
-            $("#rate-details").hide();
-          } else if (this.pauseType == "rate") {
-            $("#delay-details").hide();
-            $("#rate-details").show();
-          }
-
-          if (!this.timeoutUnits) {
-            $("#node-input-timeoutUnits option").filter(function() {
-              return $(this).val() == 'seconds';
-            }).attr('selected', true);
-          }
-
-          $("#node-input-pauseType").on("change",function() {
-            if (this.value == "delay") {
-              $("#delay-details").show();
-              $("#rate-details").hide();
-            } else if (this.value == "rate") {
-              $("#delay-details").hide();
-              $("#rate-details").show();
-            }
-          });
-        }
-    });
-</script>

nodes/core/89-delay.js

@@ -1,102 +0,0 @@
-/**
- * Copyright 2013 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-// Simple node to introduce a pause into a flow
-
-var RED = require("../../red/red");
-
-function DelayNode(n) {
-   RED.nodes.createNode(this,n);
-
-   this.pauseType = n.pauseType;
-   this.timeoutUnits = n.timeoutUnits;
-   this.rateUnits = n.rateUnits;
-
-   if (n.timeoutUnits == "milliseconds") {
-     this.timeout = n.timout;
-   } else if (n.timeoutUnits == "seconds") {
-     this.timeout = n.timeout * 1000;
-   } else if (n.timeoutUnits == "minutes") {
-     this.timeout = n.timeout * (60 * 1000);
-   } else if (n.timeoutUnits == "hours") {
-     this.timeout = n.timeout * (60 * 60 * 1000);
-   } else if (n.timeoutUnits == "days") {
-     this.timeout = n.timeout * (24 * 60 * 60 * 1000);
-   }
-
-   if (n.rateUnits == "second") {
-     this.rate = 1000/n.rate;
-   } else if (n.rateUnits == "minute") {
-     this.rate = (60 * 1000)/n.rate;
-   } else if (n.rateUnits == "hour") {
-     this.rate = (60 * 60 * 1000)/n.rate;
-   } else if (n.rateUnits == "day") {
-     this.rate = (24 * 60 * 60 * 1000)/n.rate;
-   }
-
-   this.name = n.name;
-   this.idList = [];
-   this.buffer = [];
-   this.intervalID = -1;
-   var node= this;
-
-   if (this.pauseType == "delay") {
-      this.on("input", function(msg) {
-        var node= this;
-        var id;
-        id = setTimeout(function(){
-          node.idList.splice(node.idList.indexOf(id),1);
-          node.send(msg);
-        }, node.timeout);
-        this.idList.push(id);
-      });
-
-     this.on("close", function() {
-       for (var i=0; i<this.idList.length; i++ ) {
-         clearTimeout(this.idList[i]);
-       }
-       this.idList = [];
-     });
-   } else if (this.pauseType == "rate") {
-
-     this.on("input", function(msg) {
-       if ( node.intervalID != -1) {
-         node.buffer.push(msg);
-         if (node.buffer.length > 1000) {
-           node.warn(this.name + " buffer exceeded 1000 messages");
-         }
-       } else {
-         node.send(msg);
-         node.intervalID = setInterval(function() {
-           if (node.buffer.length == 0) {
-             clearInterval(node.intervalID);
-             node.intervalID = -1;
-           }
-
-           if (node.buffer.length > 0) {
-             node.send(node.buffer.shift());
-           }
-         },node.rate);
-       }
-     });
-
-     this.on("close", function() {
-       clearInterval(this.intervalID);
-       this.buffer = [];
-     });
-   }
-}
-RED.nodes.registerType("delay",DelayNode);

nodes/core/analysis/72-sentiment.html

@@ -16,18 +16,17 @@
 
 <script type="text/x-red" data-template-name="sentiment">
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
-    <div class="form-tips">Adds <b>msg.sentiment.score</b> as the anaylsis result.
-    </div>
 </script>
 
 <script type="text/x-red" data-help-name="sentiment">
-	<p>Analyses the <b>msg.payload</b> and adds a <b>msg.sentiment</b> object that contains the resulting AFINN-111 sentiment score as <b>msg.sentiment.score</b>.</p>
-	<p>A score greater than zero is positive and less than zero is negative.</p>
-	<p>Score can range from -5 to +5.</p>
-	<p>See <a href="https://github.com/thisandagain/sentiment/blob/master/README.md" target="_new">the Sentiment docs here</a>.</p>
+    <p>Analyses the <b>msg.payload</b> and adds a <b>msg.sentiment</b> object that contains the resulting AFINN-111 sentiment score as <b>msg.sentiment.score</b>.</p>
+    <p>A score greater than zero is positive and less than zero is negative.</p>
+    <p>The score typically ranges from -5 to +5, but can go higher and lower.</p>
+    <p>An object of word score overrides can be supplied as <b>msg.overrides</b>.</p>
+    <p>See <a href="https://github.com/thisandagain/sentiment/blob/master/README.md" target="_new">the Sentiment docs here</a>.</p>
 </script>
 
 <script type="text/javascript">
@@ -47,5 +46,4 @@
             return this.name?"node_label_italic":"";
         }
     });
-
 </script>

nodes/core/analysis/72-sentiment.js

@@ -14,19 +14,20 @@
  * limitations under the License.
  **/
 
-var RED = require("../../red/red");
-var sentiment = require('sentiment');
+module.exports = function(RED) {
+    "use strict";
+    var sentiment = require('sentiment');
 
-function SentimentNode(n) {
-    RED.nodes.createNode(this,n);
+    function SentimentNode(n) {
+        RED.nodes.createNode(this,n);
+        var node = this;
 
-    this.on("input", function(msg) {
-            var node = this;
-            sentiment(msg.payload, function (err, result) {
+        this.on("input", function(msg) {
+            sentiment(msg.payload, msg.overrides || null, function (err, result) {
                 msg.sentiment = result;
                 node.send(msg);
             });
-    });
+        });
+    }
+    RED.nodes.registerType("sentiment",SentimentNode);
 }
-
-RED.nodes.registerType("sentiment",SentimentNode);

nodes/core/core/20-inject.html

@@ -0,0 +1,500 @@
+<!--
+  Copyright 2013,2015 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="inject">
+    <div class="form-row node-input-payload">
+        <label for="node-input-payloadType"><i class="fa fa-envelope"></i> Payload</label>
+        <select id="node-input-payloadType" style="width:73%">
+          <option value="date">timestamp</option>
+          <option value="string">string</option>
+          <option value="none">blank</option>
+        </select>
+    </div>
+
+    <div class="form-row" id="node-input-row-payload">
+        <label for="node-input-payload"></label>
+        <input type="text" id="node-input-payload" placeholder="payload" style="width:70%">
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-topic"><i class="fa fa-tasks"></i> Topic</label>
+        <input type="text" id="node-input-topic" placeholder="topic" style="width: 70%x">
+    </div>
+
+    <div class="form-row">
+        <label for=""><i class="fa fa-repeat"></i> Repeat</label>
+        <select id="inject-time-type-select" style="width: 73%"><option value="none">none</option><option value="interval">interval</option><option value="interval-time">interval between times</option><option value="time">at a specific time</option></select>
+        <input type="hidden" id="node-input-repeat" placeholder="payload">
+        <input type="hidden" id="node-input-crontab" placeholder="payload">
+    </div>
+
+    <div class="form-row inject-time-row hidden" id="inject-time-row-interval">
+        every <input id="inject-time-interval-count" class="inject-time-count" value="1"></input>
+              <select style="width: 100px" id="inject-time-interval-units"><option value="s">seconds</option><option value="m">minutes</option><option value="h">hours</option></select><br/>
+    </div>
+
+    <div class="form-row inject-time-row hidden" id="inject-time-row-interval-time">
+        at every <select style="width: 90px" id="inject-time-interval-time-units" class="inject-time-int-count" value="1">
+            <option value="1">1</option>
+            <option value="2">2</option>
+            <option value="3">3</option>
+            <option value="4">4</option>
+            <option value="5">5</option>
+            <option value="6">6</option>
+            <option value="10">10</option>
+            <option value="12">12</option>
+            <option value="15">15</option>
+            <option value="20">20</option>
+            <option value="30">30</option>
+            <option value="0">60</option>
+        </select> minutes<br/>
+        between <select id="inject-time-interval-time-start" class="inject-time-times"></select>
+        and <select id="inject-time-interval-time-end" class="inject-time-times"></select><br/>
+        <div id="inject-time-interval-time-days" class="inject-time-days">
+            <div style="display: inline-block; vertical-align: top;margin-right: 5px;">on </div>
+            <div style="display:inline-block;">
+                <div>
+                    <label><input type='checkbox' checked value='1'/> Monday</label>
+                    <label><input type='checkbox' checked value='2'/> Tuesday</label>
+                    <label><input type='checkbox' checked value='3'/> Wednesday</label>
+                </div>
+                <div>
+                    <label><input type='checkbox' checked value='4'/> Thursday</label>
+                    <label><input type='checkbox' checked value='5'/> Friday</label>
+                    <label><input type='checkbox' checked value='6'/> Saturday</label>
+                </div>
+                <div>
+                    <label><input type='checkbox' checked value='0'/> Sunday</label>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-row inject-time-row hidden" id="inject-time-row-time">
+        at <input id="inject-time-time" value="12:00"></input><br/>
+        <div id="inject-time-time-days" class="inject-time-days">
+            <div style="display: inline-block; vertical-align: top;margin-right: 5px;">on </div>
+            <div style="display:inline-block;">
+                <div>
+                    <label><input type='checkbox' checked value='1'/> Monday</label>
+                    <label><input type='checkbox' checked value='2'/> Tuesday</label>
+                    <label><input type='checkbox' checked value='3'/> Wednesday</label>
+                </div>
+                <div>
+                    <label><input type='checkbox' checked value='4'/> Thursday</label>
+                    <label><input type='checkbox' checked value='5'/> Friday</label>
+                    <label><input type='checkbox' checked value='6'/> Saturday</label>
+                </div>
+                <div>
+                    <label><input type='checkbox' checked value='0'/> Sunday</label>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-row" id="node-once">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-once" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-once" style="width: 70%;">Fire once at start ?</label>
+    </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="name">
+    </div>
+
+    <div class="form-tips"><b>Note:</b> "interval between times" and "at a specific time" will use cron.<br/>See info box for details.</div>
+</script>
+<style>
+    .inject-time-row {
+        padding-left: 110px;
+    }
+    .inject-time-row select {
+        margin: 3px 0;
+    }
+    .inject-time-days label {
+        -webkit-user-select: none;
+        -khtml-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+        vertical-align: top;
+        width: 100px;
+    }
+     .inject-time-days input {
+         width: auto;
+     }
+    .inject-time-times {
+        width: 90px;
+    }
+    .inject-time-row > .ui-spinner {
+        height: 28px;
+        margin: 3px 0;
+        border-color: rgb(204, 204, 204);
+    }
+    #inject-time-time {
+        margin-top: 3px;
+        width: 75px;
+    }
+    .inject-time-count {
+        width: 40px !important;
+    }
+</style>
+<script type="text/x-red" data-help-name="inject">
+    <p>Pressing the button on the left side of the node allows a message on a topic
+       to be injected into the flow. This is mainly for test purposes.</p>
+    <p>The payload defaults to the current time in millisecs since 1970, but can
+       also be set to a String or left blank.</p>
+    <p>The repeat function allows the payload to be sent on the required schedule.</p>
+    <p>The Fire once at start option actually waits a short interval before firing
+       to give other nodes a chance to instantiate properly.</p>
+    <p><b>Note: </b>"Interval between times" and "at a specific time" uses cron.
+       This means that 20 minutes will be at the next hour, 20 minutes past and
+       40 minutes past - not in 20 minutes time. If you want every 20 minutes
+       from now - use the "interval" option.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('inject',{
+        category: 'input',
+        color:"#a6bbcf",
+        defaults: {
+            name: {value:""},
+            topic: {value:""},
+            payload: {value:""},
+            payloadType: {value:"date"},
+            repeat: {value:""},
+            crontab: {value:""},
+            once: {value:false}
+        },
+        inputs:0,
+        outputs:1,
+        icon: "inject.png",
+        label: function() {
+            if (this.payloadType === "string") {
+                if ((this.topic !== "") && ((this.topic.length + this.payload.length) <= 32)) {
+                    return this.name||this.topic + ":" + this.payload;
+                }
+                else if (this.payload.length < 24) {
+                    return this.name||this.payload;
+                }
+            }
+            if ((this.topic.length < 24) && (this.topic.length > 0)) {
+                return this.name||this.topic;
+            }
+            else { return this.name||(this.payloadType==="date"?"timestamp":null)||"inject"; }
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            $("#inject-time-type-select").change(function() {
+                $("#node-input-crontab").val('');
+                var id = $("#inject-time-type-select option:selected").val();
+                $(".inject-time-row").hide();
+                $("#inject-time-row-"+id).show();
+                if ((id == "none") || (id == "interval")) {
+                    $("#node-once").show();
+                }
+                else {
+                    $("#node-once").hide();
+                    $("#node-input-once").prop('checked', false);
+                }
+            });
+
+            $(".inject-time-times").each(function() {
+                for (var i=0;i<24;i++) {
+                    var l = (i<10?"0":"")+i+":00";
+                    $(this).append($("<option></option>").val(i).text(l));
+                }
+            });
+            
+            $("#inject-time-interval-time-start").change(function() {
+                var start = Number($("#inject-time-interval-time-start option:selected").val());
+                var end = Number($("#inject-time-interval-time-end option:selected").val());
+                $("#inject-time-interval-time-end option").remove();
+                for (var i=start+1;i<25;i++) {
+                    var l = (i<10?"0":"")+i+":00";
+                    if (i==24) {
+                        l = "00:00";
+                    }
+                    var opt = $("<option></option>").val(i).text(l).appendTo("#inject-time-interval-time-end");
+                    if (i === end) {
+                        opt.attr("selected","selected");
+                    }
+                }
+            });
+
+            $(".inject-time-count").spinner({
+                //max:60,
+                min:1
+            });
+
+            $("#inject-time-interval-units").change(function() {
+                var units = $("#inject-time-interval-units option:selected").val();
+            });
+
+            $.widget( "ui.injecttimespinner", $.ui.spinner, {
+                options: {
+                    // seconds
+                    step: 60 * 1000,
+                    // hours
+                    page: 60
+                },
+                _parse: function( value ) {
+                    if ( typeof value === "string" ) {
+                        // already a timestamp
+                        if ( Number( value ) == value ) {
+                            return Number( value );
+                        }
+                        var p = value.split(":");
+                        var offset = new Date().getTimezoneOffset();
+                        return (((Number(p[0])+1)*60)+Number(p[1])+offset)*60*1000;
+                    }
+                    return value;
+                },
+                _format: function( value ) {
+                    var d = new Date(value);
+                    var h = d.getHours();
+                    var m = d.getMinutes();
+                    return ((h < 10)?"0":"")+h+":"+((m < 10)?"0":"")+m;
+                }
+            });
+
+            $("#inject-time-time").injecttimespinner();
+
+            var repeattype = "none";
+            if (this.repeat != "" && this.repeat != 0) {
+                repeattype = "interval";
+                var r = "s";
+                var c = this.repeat;
+                if (this.repeat % 60 === 0) { r = "m"; c = c/60; }
+                if (this.repeat % 1440 === 0) { r = "h"; c = c/60; }
+                $("#inject-time-interval-count").val(c);
+                $("#inject-time-interval-units").val(r);
+                $("#inject-time-interval-days").prop("disabled","disabled");
+            } else if (this.crontab) {
+                var cronparts = this.crontab.split(" ");
+                var days = cronparts[4];
+                if (!isNaN(cronparts[0]) && !isNaN(cronparts[1])) {
+                    repeattype = "time";
+                    // Fixed time
+                    var time = cronparts[1]+":"+cronparts[0];
+                    $("#inject-time-time").val(time);
+                    $("#inject-time-type-select option").filter(function() {return $(this).val() == "s";}).attr('selected',true);
+                    if (days == "*") {
+                        $("#inject-time-time-days input[type=checkbox]").prop("checked",true);
+                    } else {
+                        $("#inject-time-time-days input[type=checkbox]").removeAttr("checked");
+                        days.split(",").forEach(function(v) {
+                            $("#inject-time-time-days [value=" + v + "]").prop("checked", true);
+                        });
+                    }
+                } else {
+                    repeattype = "interval-time";
+                    // interval - time period
+                    var minutes = cronparts[0].slice(2);
+                    if (minutes === "") { minutes = "0"; }
+                    $("#inject-time-interval-time-units").val(minutes);
+                    if (days == "*") {
+                        $("#inject-time-interval-time-days input[type=checkbox]").prop("checked",true);
+                    } else {
+                        $("#inject-time-interval-time-days input[type=checkbox]").removeAttr("checked");
+                        days.split(",").forEach(function(v) {
+                            $("#inject-time-interval-time-days [value=" + v + "]").prop("checked", true);
+                        });
+                    }
+                    var time = cronparts[1];
+                    var timeparts = time.split(",");
+                    var start;
+                    var end;
+                    if (timeparts.length == 1) {
+                        // 0 or 0-10
+                        var hours = timeparts[0].split("-");
+                        if (hours.length == 1) {
+                            if (hours[0] === "") {
+                                start = "0";
+                                end = "0";
+                            }
+                            else {
+                                start = hours[0];
+                                end = Number(hours[0])+1;
+                            }
+                        } else {
+                            start = hours[0];
+                            end = (Number(hours[1])+1)%24;
+                        }
+                    } else {
+                        // 23,0 or 17-23,0-10 or 23,0-2 or 17-23,0
+                        var startparts = timeparts[0].split("-");
+                        start = startparts[0];
+
+                        var endparts = timeparts[1].split("-");
+                        if (endparts.length == 1) {
+                            end = Number(endparts[0])+1;
+                        } else {
+                            end = Number(endparts[1])+1;
+                        }
+                    }
+                    $("#inject-time-interval-time-start option").filter(function() {return $(this).val() == start;}).attr('selected',true);
+                    $("#inject-time-interval-time-end option").filter(function() {return $(this).val() == end;}).attr('selected',true);
+
+                }
+            } else {
+                $("#inject-time-type-select option").filter(function() {return $(this).val() == "none";}).attr('selected',true);
+            }
+
+            $(".inject-time-row").hide();
+            $("#inject-time-type-select option").filter(function() {return $(this).val() == repeattype;}).attr('selected',true);
+            $("#inject-time-row-"+repeattype).show();
+
+            if (this.payloadType == null) {
+                if (this.payload == "") {
+                    this.payloadType = "date";
+                } else {
+                    this.payloadType = "string";
+                }
+            }
+
+            $("#node-input-payloadType").change(function() {
+                var id = $("#node-input-payloadType option:selected").val();
+                if (id === "string") {
+                    $("#node-input-row-payload").show();
+                } else {
+                    $("#node-input-row-payload").hide();
+                }
+            });
+            $("#node-input-payloadType").val(this.payloadType);
+            $("#node-input-payloadType").change();
+            $("#inject-time-type-select").change();
+            $("#inject-time-interval-time-start").change();
+
+        },
+        oneditsave: function() {
+            var repeat = "";
+            var crontab = "";
+            var type = $("#inject-time-type-select option:selected").val();
+            if (type == "none") {
+                // nothing
+            } else if (type == "interval") {
+                var count = $("#inject-time-interval-count").val();
+                var units = $("#inject-time-interval-units option:selected").val();
+                if (units == "s") {
+                    repeat = count;
+                } else {
+                    if (units == "m") {
+                        //crontab = "*/"+count+" * * * "+days;
+                        repeat = count * 60;
+                    } else if (units == "h") {
+                        //crontab = "0 */"+count+" * * "+days;
+                        repeat = count * 60 * 60;
+                    }
+                }
+            } else if (type == "interval-time") {
+                repeat = "";
+                var count = $("#inject-time-interval-time-units").val();
+                var startTime = Number($("#inject-time-interval-time-start option:selected").val());
+                var endTime = Number($("#inject-time-interval-time-end option:selected").val());
+                var days = $('#inject-time-interval-time-days  input[type=checkbox]:checked').map(function(_, el) {
+                    return $(el).val()
+                }).get();
+                if (days.length == 0) {
+                    crontab = "";
+                } else {
+                    if (days.length == 7) {
+                        days="*";
+                    } else {
+                        days = days.join(",");
+                    }
+                    var timerange = "";
+                    if (endTime == 0) {
+                        timerange = startTime+"-23";
+                    } else if (startTime+1 < endTime) {
+                        timerange = startTime+"-"+(endTime-1);
+                    } else if (startTime+1 == endTime) {
+                        timerange = startTime;
+                    } else {
+                        var startpart = "";
+                        var endpart = "";
+                        if (startTime == 23) {
+                            startpart = "23";
+                        } else {
+                            startpart = startTime+"-23";
+                        }
+                        if (endTime == 1) {
+                            endpart = "0";
+                        } else {
+                            endpart = "0-"+(endTime-1);
+                        }
+                        timerange = startpart+","+endpart;
+                    }
+                    if (count === "0") {
+                        crontab = count+" "+timerange+" * * "+days;
+                    } else {
+                        crontab = "*/"+count+" "+timerange+" * * "+days;
+                    }
+                }
+            } else if (type == "time") {
+                var time = $("#inject-time-time").val();
+                var days = $('#inject-time-time-days  input[type=checkbox]:checked').map(function(_, el) {
+                    return $(el).val()
+                }).get();
+                if (days.length == 0) {
+                    crontab = "";
+                } else {
+                    if (days.length == 7) {
+                        days="*";
+                    } else {
+                        days = days.join(",");
+                    }
+                    var parts = time.split(":");
+                    repeat = "";
+                    crontab = parts[1]+" "+parts[0]+" * * "+days;
+                }
+            }
+
+            $("#node-input-repeat").val(repeat);
+            $("#node-input-crontab").val(crontab);
+        },
+        button: {
+            onclick: function() {
+                var label = (this.name||this.payload).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
+                if (this.payloadType === "date") { label = "timestamp"; }
+                if (this.payloadType === "none") { label = "blank"; }
+
+                $.ajax({
+                    url: "inject/"+this.id,
+                    type:"POST",
+                    success: function(resp) {
+                        RED.notify("Successfully injected: "+label,"success");
+                    },
+                    error: function(jqXHR,textStatus,errorThrown) {
+                        if (jqXHR.status == 404) {
+                            RED.notify("<strong>Error</strong>: inject node not deployed","error");
+                        } else if (jqXHR.status == 500) {
+                            RED.notify("<strong>Error</strong>: inject failed, see log for details.","error");
+                        } else if (jqXHR.status == 0) {
+                            RED.notify("<strong>Error</strong>: no response from server","error");
+                        } else {
+                            RED.notify("<strong>Error</strong>: unexpected error: ("+jqXHR.status+") "+textStatus,"error");
+                        }
+                    }
+                });
+            }
+        }
+    });
+
+</script>

nodes/core/core/20-inject.js

@@ -0,0 +1,97 @@
+/**
+ * Copyright 2013, 2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var cron = require("cron");
+
+    function InjectNode(n) {
+        RED.nodes.createNode(this,n);
+        this.topic = n.topic;
+        this.payload = n.payload;
+        this.payloadType = n.payloadType;
+        this.repeat = n.repeat;
+        this.crontab = n.crontab;
+        this.once = n.once;
+        var node = this;
+        this.interval_id = null;
+        this.cronjob = null;
+
+        if (this.repeat && !isNaN(this.repeat) && this.repeat > 0) {
+            this.repeat = this.repeat * 1000;
+            if (RED.settings.verbose) { this.log("repeat = "+this.repeat); }
+            this.interval_id = setInterval( function() {
+                node.emit("input",{});
+            }, this.repeat );
+        } else if (this.crontab) {
+            if (cron) {
+                if (RED.settings.verbose) { this.log("crontab = "+this.crontab); }
+                this.cronjob = new cron.CronJob(this.crontab,
+                    function() {
+                        node.emit("input",{});
+                    },
+                    null,true);
+            } else {
+                this.error("'cron' module not found");
+            }
+        }
+
+        if (this.once) {
+            setTimeout( function(){ node.emit("input",{}); }, 100);
+        }
+
+        this.on("input",function(msg) {
+            var msg = {topic:this.topic};
+            if ( (this.payloadType == null && this.payload === "") || this.payloadType === "date") {
+                msg.payload = Date.now();
+            } else if (this.payloadType == null || this.payloadType === "string") {
+                msg.payload = this.payload;
+            } else {
+                msg.payload = "";
+            }
+            this.send(msg);
+            msg = null;
+        });
+    }
+
+    RED.nodes.registerType("inject",InjectNode);
+
+    InjectNode.prototype.close = function() {
+        if (this.interval_id != null) {
+            clearInterval(this.interval_id);
+            if (RED.settings.verbose) { this.log("inject: repeat stopped"); }
+        } else if (this.cronjob != null) {
+            this.cronjob.stop();
+            if (RED.settings.verbose) { this.log("inject: cronjob stopped"); }
+            delete this.cronjob;
+        }
+    }
+
+    RED.httpAdmin.post("/inject/:id", RED.auth.needsPermission("inject.write"), function(req,res) {
+        var node = RED.nodes.getNode(req.params.id);
+        if (node != null) {
+            try {
+                node.receive();
+                res.send(200);
+            } catch(err) {
+                res.send(500);
+                node.error("Inject failed:"+err);
+            }
+        } else {
+            res.send(404);
+        }
+    });
+}

nodes/core/core/58-debug.html

@@ -0,0 +1,296 @@
+<!--
+  Copyright 2013, 2015 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="debug">
+    <div class="form-row">
+        <label for="node-input-select-complete"><i class="fa fa-list"></i> Output</label>
+        <select type="text" id="node-input-select-complete" style="display: inline-block; width: 250px; vertical-align: top;">
+            <option value="false">message property</option>
+            <option value="true">complete msg object</option>
+        </select>
+    </div>
+    <div class="form-row" id="node-prop-row">
+        <label for="node-input-complete">&nbsp;</label>msg.<input type="text" style="width:208px" id="node-input-complete">
+    </div>
+    <div class="form-row">
+        <label for="node-input-console"><i class="fa fa-random"></i> to</label>
+        <select type="text" id="node-input-console" style="display: inline-block; width: 250px; vertical-align: top;">
+            <option value="false">debug tab</option>
+            <option value="true">debug tab and console</option>
+        </select>
+    </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="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="debug">
+    <p>The Debug node can be connected to the output of any node. It can be used to display the output of any message property in the debug tab of the sidebar. The default is to display <b>msg.payload</b>.</p>
+    <p>Each message will also display the timestamp, <b>msg.topic</b> and the property chosen to output.</p>
+    <p>The sidebar can be accessed under the options drop-down in the top right corner.</p>
+    <p>The button to the right of the node will toggle its output on and off so you can de-clutter the debug window.</p>
+    <p>If the payload is an object or buffer it will be stringified first for display and indicate that by saying "(Object)" or "(Buffer)".</p>
+    <p>Selecting any particular message will highlight (in red) the debug node that reported it. This is useful if you wire up multiple debug nodes.</p>
+    <p>Optionally can show the complete <b>msg</b> object.</p>
+    <p>In addition any calls to node.warn or node.error will appear here.</p>
+</script>
+
+<script type="text/javascript">
+
+    function oneditprepare() {
+        if (this.complete === "true" || this.complete === true) {
+            // show complete message object
+            $("#node-input-select-complete").val("true");
+            $("#node-prop-row").hide();
+        } else {
+            // show msg.[   ]
+            var property = (!this.complete||(this.complete === "false")) ? "payload" : this.complete+"";
+            $("#node-input-select-complete").val("false");
+            $("#node-input-complete").val(property);
+            $("#node-prop-row").show();
+        }
+        $("#node-input-select-complete").change(function() {
+            var v = $("#node-input-select-complete option:selected").val();
+            $("#node-input-complete").val(v);
+            if (v !== "true") {
+                $("#node-input-complete").val("payload");
+                $("#node-prop-row").show();
+                $("#node-input-complete").focus();
+            } else {
+                $("#node-prop-row").hide();
+            }
+        });
+    }
+
+    RED.nodes.registerType('debug',{
+        category: 'output',
+        defaults: {
+            name: {value:""},
+            active: {value:true},
+            console: {value:"false"},
+            complete: {value:"false", required:true}
+        },
+        label: function() {
+            if (this.complete === true || this.complete === "true") {
+                return this.name||"msg";
+            } else {
+                return this.name || "msg." + ((!this.complete || this.complete === "false") ? "payload" : this.complete);
+            }
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        color:"#87a980",
+        inputs:1,
+        outputs:0,
+        icon: "debug.png",
+        align: "right",
+        button: {
+            toggle: "active",
+            onclick: function() {
+                var label = this.name||"debug";
+                $.ajax({
+                    url: "debug/"+this.id+"/"+(this.active?"enable":"disable"),
+                    type: "POST",
+                    success: function(resp, textStatus, xhr) {
+                        if (xhr.status == 200) {
+                            RED.notify("Successfully activated: "+label,"success");
+                        } else if (xhr.status == 201) {
+                            RED.notify("Successfully deactivated: "+label,"success");
+                        }
+                    },
+                    error: function(jqXHR,textStatus,errorThrown) {
+                        if (jqXHR.status == 404) {
+                            RED.notify("<strong>Error</strong>: debug node not deployed","error");
+                        } else if (jqXHR.status == 0) {
+                            RED.notify("<strong>Error</strong>: no response from server","error");
+                        } else {
+                            RED.notify("<strong>Error</strong>: unexpected error: ("+err.status+") "+err.response,"error");
+                        }
+                    }
+                });
+            }
+        },
+        onpaletteadd: function() {
+            var content = document.createElement("div");
+            content.id = "tab-debug";
+
+            var toolbar = document.createElement("div");
+            toolbar.id = "debug-toolbar";
+            content.appendChild(toolbar);
+
+            toolbar.innerHTML = '<div class="btn-group pull-right"><a id="debug-tab-clear" title="clear log" class="btn btn-mini" href="#"><i class="fa fa-trash"></i></a></div> ';
+
+            var messages = document.createElement("div");
+            messages.id = "debug-content";
+            content.appendChild(messages);
+
+            RED.sidebar.addTab("debug",content);
+
+            function getTimestamp() {
+                var d = new Date();
+                return d.toLocaleString();
+            }
+
+            var sbc = document.getElementById("debug-content");
+
+            var messageCount = 0;
+            var that = this;
+            RED._debug = function(msg) {
+                that.handleDebugMessage("",{
+                    name:"debug",
+                    msg:msg
+                });
+            }
+
+            this.handleDebugMessage = function(t,o) {
+                var msg = document.createElement("div");
+                msg.onmouseover = function() {
+                    msg.style.borderRightColor = "#999";
+                    var n = RED.nodes.node(o.id);
+                    if (n) {
+                        n.highlighted = true;
+                        n.dirty = true;
+                    }
+                    RED.view.redraw();
+                };
+                msg.onmouseout = function() {
+                    msg.style.borderRightColor = "";
+                    var n = RED.nodes.node(o.id);
+                    if (n) {
+                        n.highlighted = false;
+                        n.dirty = true;
+                    }
+                    RED.view.redraw();
+                };
+                msg.onclick = function() {
+                    var node = RED.nodes.node(o.id);
+                    if (node) {
+                        RED.view.showWorkspace(node.z);
+                    }
+
+                };
+                var name = (o.name?o.name:o.id).toString().replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
+                var topic = (o.topic||"").toString().replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
+                var property = (o.property?o.property:'').replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
+                var payload = (o.msg||"()").toString().replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
+                var typ = payload.substring(0,payload.indexOf(')')+1);
+                payload = payload.substring(payload.indexOf(')')+1);
+                msg.className = 'debug-message'+(o.level?(' debug-message-level-'+o.level):'');
+                msg.innerHTML = '<span class="debug-message-date">'+
+                                getTimestamp()+'</span><span class="debug-message-name">['+name+']'+
+                                '</span>';
+                // NOTE: relying on function error to have a "type" that all other msgs don't
+                if (o.hasOwnProperty("type") && (o.type === "function")) {
+                    msg.className = 'debug-message debug-message-level-20';
+                    msg.innerHTML += '<span class="debug-message-topic">[function] : (error)</span>';
+                } else {
+                    msg.innerHTML += '<span class="debug-message-topic">'+(o.topic?topic+' : ':'')+
+                                    (o.property?'[msg.'+property+']':'[msg]')+" : "+typ+'</span>';
+                }
+                msg.innerHTML += '<span class="debug-message-payload">'+ payload+ '</span>';
+                var atBottom = (sbc.scrollHeight-messages.offsetHeight-sbc.scrollTop) < 5;
+                messageCount++;
+                $(messages).append(msg);
+
+                if (messageCount > 200) {
+                    $("#debug-content .debug-message:first").remove();
+                    messageCount--;
+                }
+                if (atBottom) {
+                    $(sbc).scrollTop(sbc.scrollHeight);
+                }
+            };
+            RED.comms.subscribe("debug",this.handleDebugMessage);
+
+            $("#debug-tab-clear").click(function() {
+                $(".debug-message").remove();
+                messageCount = 0;
+                RED.nodes.eachNode(function(node) {
+                    node.highlighted = false;
+                    node.dirty = true;
+                });
+                RED.view.redraw();
+            });
+        },
+        onpaletteremove: function() {
+            RED.comms.unsubscribe("debug",this.handleDebugMessage);
+            RED.sidebar.removeTab("debug");
+            delete RED._debug;
+        },
+        oneditprepare: oneditprepare
+    });
+</script>
+
+<style>
+    #debug-content {
+        position: absolute;
+        top: 30px;
+        bottom: 0px;
+        left:0px;
+        right: 0px;
+        overflow-y: scroll;
+    }
+    #debug-toolbar {
+        padding: 3px 10px;
+        height: 24px;
+        background: #f3f3f3;
+    }
+    .debug-message {
+        cursor: pointer;
+        border-bottom: 1px solid #eee;
+        border-left: 8px solid #eee;
+        border-right: 8px solid #eee;
+        padding: 2px;
+    }
+    .debug-message-date {
+        background: #fff;
+        font-size: 9px;
+        color: #aaa;
+        padding: 1px 5px 1px 1px;
+    }
+    .debug-message-topic {
+        display: block;
+        background: #fff;
+        padding: 1px 5px;
+        font-size: 10px;
+        color: #a66;
+    }
+    .debug-message-name {
+        background: #fff;
+        padding: 1px 5px;
+        font-size: 9px;
+        color: #aac;
+    }
+    .debug-message-payload {
+        display: block;
+        padding: 2px;
+        background: #fff;
+    }
+    .debug-message-level-log {
+        border-left-color: #eee;
+        border-right-color: #eee;
+    }
+    .debug-message-level-30 {
+        border-left-color: #ffdf9d;
+        border-right-color: #ffdf9d;
+    }
+    .debug-message-level-20 {
+        border-left-color: #f99;
+        border-right-color: #f99;
+    }
+</style>

nodes/core/core/58-debug.js

@@ -0,0 +1,142 @@
+/**
+ * Copyright 2013 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var util = require("util");
+    var events = require("events");
+    var debuglength = RED.settings.debugMaxLength||1000;
+    var useColors = false;
+    // util.inspect.styles.boolean = "red";
+
+    function DebugNode(n) {
+        RED.nodes.createNode(this,n);
+        this.name = n.name;
+        this.complete = n.complete||"payload";
+
+        if (this.complete === "false") {
+            this.complete = "payload";
+        }
+        if (this.complete === true) {
+            this.complete = "true";
+        }
+
+        this.console = n.console;
+        this.active = (n.active === null || typeof n.active === "undefined") || n.active;
+        var node = this;
+
+        this.on("input",function(msg) {
+            if (this.complete === "true") {
+            // debug complete msg object
+                if (this.console === "true") {
+                    node.log("\n"+util.inspect(msg, {colors:useColors, depth:10}));
+                }
+                if (this.active) {
+                    sendDebug({id:this.id,name:this.name,topic:msg.topic,msg:msg,_path:msg._path});
+                }
+            } else {
+            // debug user defined msg property
+                var property = "payload";
+                var output = msg[property];
+                if (this.complete !== "false" && typeof this.complete !== "undefined") {
+                    property = this.complete;
+                    var propertyParts = property.split(".");
+                    try {
+                        output = propertyParts.reduce(function (obj, i) {
+                            return obj[i];
+                        }, msg);
+                    } catch (err) {
+                        output = undefined;
+                    }
+                }
+                if (this.console === "true") {
+                    if (typeof output === "string") {
+                        node.log((output.indexOf("\n") !== -1 ? "\n" : "") + output);
+                    } else if (typeof output === "object") {
+                        node.log("\n"+util.inspect(output, {colors:useColors, depth:10}));
+                    } else {
+                        node.log(util.inspect(output, {colors:useColors}));
+                    }
+                }
+                if (this.active) {
+                    sendDebug({id:this.id,name:this.name,topic:msg.topic,property:property,msg:output,_path:msg._path});
+                }
+            }
+        });
+    }
+
+    RED.nodes.registerType("debug",DebugNode);
+
+    function sendDebug(msg) {
+        if (msg.msg instanceof Error) {
+            msg.msg = msg.msg.toString();
+        } else if (msg.msg instanceof Buffer) {
+            msg.msg = "(Buffer) "+msg.msg.toString('hex');
+        } else if (typeof msg.msg === 'object') {
+            var seen = [];
+            var ty = "(Object) ";
+            if (util.isArray(msg.msg)) { ty = "(Array) "; }
+            msg.msg = ty + JSON.stringify(msg.msg, function(key, value) {
+                if (typeof value === 'object' && value !== null) {
+                    if (seen.indexOf(value) !== -1) { return "[circular]"; }
+                    seen.push(value);
+                }
+                return value;
+            }," ");
+            seen = null;
+        } else if (typeof msg.msg === "boolean") {
+            msg.msg = "(boolean) "+msg.msg.toString();
+        } else if (typeof msg.msg === "number") {
+            msg.msg = "(number) "+msg.msg.toString();
+        } else if (msg.msg === 0) {
+            msg.msg = "0";
+        } else if (msg.msg === null || typeof msg.msg === "undefined") {
+            msg.msg = "(undefined)";
+        } else { msg.msg = "(string) "+msg.msg; }
+
+        if (msg.msg.length > debuglength) {
+            msg.msg = msg.msg.substr(0,debuglength) +" ....";
+        }
+
+        RED.comms.publish("debug",msg);
+    }
+
+    DebugNode.logHandler = new events.EventEmitter();
+    DebugNode.logHandler.on("log",function(msg) {
+        if (msg.level === RED.log.WARN || msg.level === RED.log.ERROR) {
+            sendDebug(msg);
+        }
+    });
+    RED.log.addHandler(DebugNode.logHandler);
+
+    RED.httpAdmin.post("/debug/:id/:state", RED.auth.needsPermission("debug.write"), function(req,res) {
+        var node = RED.nodes.getNode(req.params.id);
+        var state = req.params.state;
+        if (node !== null && typeof node !== "undefined" ) {
+            if (state === "enable") {
+                node.active = true;
+                res.send(200);
+            } else if (state === "disable") {
+                node.active = false;
+                res.send(201);
+            } else {
+                res.send(404);
+            }
+        } else {
+            res.send(404);
+        }
+    });
+};

nodes/core/core/75-exec.html

@@ -16,11 +16,11 @@
 
 <script type="text/x-red" data-template-name="exec">
     <div class="form-row">
-        <label for="node-input-command"><i class="icon-file"></i> Command</label>
+        <label for="node-input-command"><i class="fa fa-file"></i> Command</label>
         <input type="text" id="node-input-command" placeholder="command">
     </div>
     <div class="form-row">
-        <label for="node-input-append"><i class="icon-list"></i> Append</label>
+        <label for="node-input-append"><i class="fa fa-list"></i> Append</label>
         <input type="text" id="node-input-append" placeholder="extra input">
     </div>
     <div class="form-row">
@@ -29,17 +29,20 @@
         <label for="node-input-useSpawn" style="width: 70%;">Use spawn() instead of exec() ?</label>
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
+    <div class="form-tips">Tip: <i>spawn</i> expects only one command word - and appended args to be comma separated.</div>
 </script>
 
 <script type="text/x-red" data-help-name="exec">
-	<p>Call to a system command.<br/>This can be very dangerous...</p>
-	<p>Provides 3 outputs... stdout, stderr, and return code.</p>
-	<p>By default uses exec() which calls the command, waits for completion and then returns the complete result in one go. Along with any errors.</p>
-	<p>Optionally can use spawn() instead, which returns output from stdout and stderr as the command runs (ie one line at a time). On completion then returns a return code (on the 3rd output).</p>
-	<p>The optional append gets added to the command after the <b>msg.payload</b> (so you can do things like pipe etc.)</p>
+    <p>Calls out to a system command.<br/></p>
+    <p>Provides 3 outputs... stdout, stderr, and return code.</p>
+    <p>By default uses exec() which calls the command, blocks while waiting for completion, and then returns the complete result in one go, along with any errors.</p>
+    <p>Optionally can use spawn() instead, which returns output from stdout and stderr as the command runs (ie one line at a time). On completion it then returns a return code (on the 3rd output).</p>
+    <p>Spawn only expect one command word, with all extra parameters to be comma separated and passed as the append.</p>
+    <p>The optional append gets added to the command after the <b>msg.payload</b> - so you can do things like pipe the result to another command.</p>
+    <p>If stdout is binary a <i>buffer</i> is returned - otherwise returns a <i>string</i>.</p>
 </script>
 
 <script type="text/javascript">
@@ -58,6 +61,9 @@
         align: "right",
         label: function() {
             return this.name||this.command;
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
         }
     });
 </script>

nodes/core/core/75-exec.js

@@ -0,0 +1,88 @@
+/**
+ * Copyright 2013 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var spawn = require('child_process').spawn;
+    var exec = require('child_process').exec;
+    var isUtf8 = require('is-utf8');
+
+    function ExecNode(n) {
+        RED.nodes.createNode(this,n);
+        this.cmd = n.command.trim();
+        this.append = n.append.trim() || "";
+        this.useSpawn = n.useSpawn;
+
+        var node = this;
+        this.on("input", function(msg) {
+            node.status({fill:"blue",shape:"dot"});
+            if (this.useSpawn === true) {
+                // make the extra args into an array
+                // then prepend with the msg.payload
+                if (typeof(msg.payload !== "string")) { msg.payload = msg.payload.toString(); }
+                var arg = [];
+                if (node.append.length > 0) { arg = node.append.split(","); }
+                if (msg.payload.trim() !== "") { arg.unshift(msg.payload); }
+                if (RED.settings.verbose) { node.log(node.cmd+" ["+arg+"]"); }
+                if (node.cmd.indexOf(" ") == -1) {
+                    var ex = spawn(node.cmd,arg);
+                    ex.stdout.on('data', function (data) {
+                        //console.log('[exec] stdout: ' + data);
+                        if (isUtf8(data)) { msg.payload = data.toString(); }
+                        else { msg.payload = data; }
+                        node.send([msg,null,null]);
+                    });
+                    ex.stderr.on('data', function (data) {
+                        //console.log('[exec] stderr: ' + data);
+                        if (isUtf8(data)) { msg.payload = data.toString(); }
+                        else { msg.payload = new Buffer(data); }
+                        node.send([null,msg,null]);
+                    });
+                    ex.on('close', function (code) {
+                        //console.log('[exec] result: ' + code);
+                        msg.payload = code;
+                        node.status({});
+                        node.send([null,null,msg]);
+                    });
+                    ex.on('error', function (code) {
+                        node.error(code);
+                    });
+                }
+                else { node.error("Spawn command must be just the command - no spaces or extra parameters"); }
+            }
+            else {
+                var cl = node.cmd+" "+msg.payload+" "+node.append;
+                if (RED.settings.verbose) { node.log(cl); }
+                var child = exec(cl, {encoding: 'binary', maxBuffer:10000000}, function (error, stdout, stderr) {
+                    msg.payload = new Buffer(stdout,"binary");
+                    if (isUtf8(msg.payload)) { msg.payload = msg.payload.toString(); }
+                    var msg2 = {payload:stderr};
+                    var msg3 = null;
+                    //console.log('[exec] stdout: ' + stdout);
+                    //console.log('[exec] stderr: ' + stderr);
+                    if (error !== null) {
+                        msg3 = {payload:error};
+                        //console.log('[exec] error: ' + error);
+                    }
+                    node.status({});
+                    node.send([msg,msg2,msg3]);
+                });
+            }
+        });
+    }
+
+    RED.nodes.registerType("exec",ExecNode);
+}

nodes/core/core/80-function.html

@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013 IBM Corp.
+  Copyright 2013, 2014 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -16,25 +16,40 @@
 
 <script type="text/x-red" data-template-name="function">
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
-    <div class="form-row">
-        <label for="node-input-func"><i class="icon-wrench"></i> Function</label>
-        <input type="hidden" id="node-input-func" autofocus="autofocus">
+    <div class="form-row" style="margin-bottom: 0px;">
+            <label for="node-input-func"><i class="fa fa-wrench"></i> Function</label>
+            <input type="hidden" id="node-input-func" autofocus="autofocus">
+    </div>
+    <div class="form-row node-text-editor-row">
         <div style="height: 250px;" class="node-text-editor" id="node-input-func-editor" ></div>
     </div>
     <div class="form-row">
-        <label for="node-input-outputs"><i class="icon-random"></i> Outputs</label>
+        <label for="node-input-outputs"><i class="fa fa-random"></i> Outputs</label>
         <input id="node-input-outputs" style="width: 60px; height: 1.7em;" value="1">
     </div>
+    <div class="form-tips">See the Info tab for help writing functions.</div>
 </script>
 
 <script type="text/x-red" data-help-name="function">
-	<p>The generic function block where you can write code to do more interesting things.</p>
-	<p>You can have multiple outputs - in which case the function expects you to return an array of messages... <pre>return [msg,msg2,...];</pre></p>
-	<p>You may return null for any or all outputs if you want to.</p>
-	<p>You can save your functions to a library (button to right of name field) - and likewise pick from that library.</p>
+	<p>A function block where you can write code to do more interesting things.</p>
+	<p>The message is passed in as a JavaScript object called <code>msg</code>.</p>
+	<p>By convention it will have a <code>msg.payload</code> property containing
+	   the body of the message.</p>
+	<p>The function should return the messages it wants to pass on to the next nodes
+	in the flow. It can return:</p>
+	<ul>
+	  <li>a single message object - passed to nodes connected to the first output</li>
+	  <li>an array of message objects - passed to nodes connected to the corresponding outputs</li>
+    </ul>
+    <p>If any element of the array is itself an array of messages, multiple
+	      messages are sent to the corresponding output.</p>
+	<p>If null is returned, either by itself or as an element of the array, no
+	      message is passed on.</p>
+	<p>See the <a target="_new" href="http://nodered.org/docs/writing-functions.html">online documentation</a> for more help.</p>
+	      
 </script>
 
 <script type="text/javascript">
@@ -43,7 +58,7 @@
         category: 'function',
         defaults: {
             name: {value:""},
-            func: {value:"// The received message is stored in 'msg'\n// It will have at least a 'payload' property:\n//   console.log(msg.payload);\n// The 'context' object is available to store state\n// between invocations of the function\n//   context = {};\n\n\nreturn msg;"},
+            func: {value:"\nreturn msg;"},
             outputs: {value:1}
         },
         inputs:1,
@@ -57,15 +72,24 @@
                 min:1
             });
 
-            function functionDialogResize(ev,ui) {
-                $("#node-input-func-editor").css("height",(ui.size.height-235)+"px");
+            function functionDialogResize() {
+                var rows = $("#dialog-form>div:not(.node-text-editor-row)");
+                var height = $("#dialog-form").height();
+                for (var i=0;i<rows.size();i++) {
+                    height -= $(rows[i]).outerHeight(true);
+                }
+                var editorRow = $("#dialog-form>div.node-text-editor-row");
+                height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+                $(".node-text-editor").css("height",height+"px");
             };
 
             $( "#dialog" ).on("dialogresize", functionDialogResize);
             $( "#dialog" ).one("dialogopen", function(ev) {
                 var size = $( "#dialog" ).dialog('option','sizeCache-function');
                 if (size) {
-                    functionDialogResize(null,{size:size});
+                    $("#dialog").dialog('option','width',size.width);
+                    $("#dialog").dialog('option','height',size.height);
+                    functionDialogResize();
                 }
             });
             $( "#dialog" ).one("dialogclose", function(ev,ui) {

nodes/core/core/80-function.js

@@ -0,0 +1,93 @@
+/**
+ * Copyright 2013,2015 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var util = require("util");
+    var vm = require("vm");
+
+    function FunctionNode(n) {
+        RED.nodes.createNode(this,n);
+        this.name = n.name;
+        this.func = n.func;
+        var functionText = "var results = null; results = (function(msg){\n"+this.func+"\n})(msg);";
+        this.topic = n.topic;
+        var sandbox = {
+            console:console,
+            util:util,
+            Buffer:Buffer,
+            context: {
+                global:RED.settings.functionGlobalContext || {}
+            }
+        };
+        var context = vm.createContext(sandbox);
+        try {
+            this.script = vm.createScript(functionText);
+            this.on("input", function(msg) {
+                try {
+                    var start = process.hrtime();
+                    context.msg = msg;
+                    this.script.runInContext(context);
+                    var results = context.results;
+                    if (results == null) {
+                        results = [];
+                    } else if (results.length == null) {
+                        results = [results];
+                    }
+                    if (msg._topic) {
+                        for (var m in results) {
+                            if (results[m]) {
+                                if (util.isArray(results[m])) {
+                                    for (var n=0; n < results[m].length; n++) {
+                                        results[m][n]._topic = msg._topic;
+                                    }
+                                } else {
+                                    results[m]._topic = msg._topic;
+                                }
+                            }
+                        }
+                    }
+                    this.send(results);
+                    var duration = process.hrtime(start);
+                    var converted = Math.floor((duration[0]* 1e9 +  duration[1])/10000)/100;
+                    this.metric("duration", msg, converted);
+                    if (process.env.NODE_RED_FUNCTION_TIME) {
+                        this.status({fill:"yellow",shape:"dot",text:""+converted});
+                    }
+                } catch(err) {
+                    var errorMessage = err.toString();
+                    var stack = err.stack.split(/\r?\n/);
+                    if (stack.length > 0) {
+                        var m = /at undefined:(\d+):(\d+)$/.exec(stack[1]);
+                        if (m) {
+                            var line = Number(m[1])-1;
+                            var cha = m[2];
+                            errorMessage += " (line "+line+", col "+cha+")";
+                        }
+                    }
+                    this.error(errorMessage);
+                }
+            });
+        } catch(err) {
+            // eg SyntaxError - which v8 doesn't include line number information
+            // so we can't do better than this
+            this.error(err);
+        }
+    }
+
+    RED.nodes.registerType("function",FunctionNode);
+    RED.library.register("functions");
+}

nodes/core/core/80-template.html

@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013 IBM Corp.
+  Copyright 2013,2014 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -16,22 +16,35 @@
 
 <script type="text/x-red" data-template-name="template">
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
-
-    <div class="form-row">
-        <label for="node-input-template"><i class="icon-wrench"></i> Template</label>
+    <div class="form-row" style="margin-bottom: 0px;">
+        <label for="node-input-template"><i class="fa fa-file-code-o"></i> Template</label>
         <input type="hidden" id="node-input-template" autofocus="autofocus">
+    </div>
+    <div class="form-row node-text-editor-row">
         <div style="height: 250px;" class="node-text-editor" id="node-input-template-editor" ></div>
     </div>
-
+    <div class="form-row">
+        <label for="node-input-field"><i class="fa fa-edit"></i> Property</label>
+        msg.<input type="text" id="node-input-field" placeholder="payload" style="width: 64%;">
+    </div>
 </script>
 
 <script type="text/x-red" data-help-name="template">
-	<p>Creates new messages based on a template.</p>
-	<p>Very useful for creating boilerplate web pages, emails, tweets and so on.</p>
-	<p>Uses the <i><a href="http://mustache.github.io/mustache.5.html" target="_new">Mustache</a></i> format.</p>
+    <p>Creates a new message based on the provided template.</p>
+    <p>This uses the <i><a href="http://mustache.github.io/mustache.5.html" target="_new">mustache</a></i> format.</p>
+    <p>For example, when a template of:
+    <pre>Hello {{name}}. Today is {{date}}</pre>
+    <p>receives a message containing:
+    <pre>{
+  name: "Fred",
+  date: "Monday"
+  payload: ...
+}</pre>
+    <p>The resulting payload will be:
+    <pre>Hello Fred. Today is Monday</pre>
 </script>
 
 <script type="text/javascript">
@@ -40,6 +53,7 @@
         category: 'function',
         defaults: {
             name: {value:""},
+            field: {value:"payload"},
             template: {value:"This is the payload: {{payload}}!"},
         },
         inputs:1,
@@ -50,15 +64,24 @@
         },
         oneditprepare: function() {
 
-            function templateDialogResize(ev,ui) {
-                $("#node-input-template-editor").css("height",(ui.size.height-200)+"px");
+            function templateDialogResize() {
+                var rows = $("#dialog-form>div:not(.node-text-editor-row)");
+                var height = $("#dialog-form").height();
+                for (var i=0;i<rows.size();i++) {
+                    height -= $(rows[i]).outerHeight(true);
+                }
+                var editorRow = $("#dialog-form>div.node-text-editor-row");
+                height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+                $(".node-text-editor").css("height",height+"px");
             };
 
             $( "#dialog" ).on("dialogresize", templateDialogResize);
             $( "#dialog" ).one("dialogopen", function(ev) {
                 var size = $( "#dialog" ).dialog('option','sizeCache-template');
                 if (size) {
-                    templateDialogResize(null,{size:size});
+                    $("#dialog").dialog('option','width',size.width);
+                    $("#dialog").dialog('option','height',size.height);
+                    templateDialogResize();
                 }
             });
             $( "#dialog" ).one("dialogclose", function(ev,ui) {
@@ -77,7 +100,7 @@
                     url:"templates", // where to get the data from
                     type:"template", // the type of object the library is for
                     editor:that.editor, // the field name the main text body goes to
-                    fields:['name']
+                    fields:['name','field']
                 });
                 $("#node-input-name").focus();
             });
@@ -87,5 +110,4 @@
             delete this.editor;
         }
     });
-
 </script>

nodes/core/core/80-template.js

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2013 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var mustache = require("mustache");
+
+    function TemplateNode(n) {
+        RED.nodes.createNode(this,n);
+        this.name = n.name;
+        this.field = n.field || "payload";
+        this.template = n.template;
+        var node = this;
+
+        var b = node.field.split(".");
+        var i = 0;
+        var m = null;
+        var rec = function(obj) {
+            i += 1;
+            if ((i < b.length) && (typeof obj[b[i-1]] === "object")) {
+                rec(obj[b[i-1]]); // not there yet - carry on digging
+            }
+            else {
+                 if (i === b.length) { // we've finished so assign the value
+                     obj[b[i-1]] = mustache.render(node.template,m);
+                     node.send(m);
+                 }
+                 else {
+                     obj[b[i-1]] = {}; // needs to be a new object so create it
+                     rec(obj[b[i-1]]); // and carry on digging
+                 }
+            }
+        }
+
+        node.on("input", function(msg) {
+            try {
+                m = msg;
+                i = 0;
+                rec(msg);
+            } catch(err) {
+                node.error(err.message);
+            }
+        });
+    }
+
+    RED.nodes.registerType("template",TemplateNode);
+    RED.library.register("templates");
+}

nodes/core/core/89-delay.html

@@ -0,0 +1,193 @@
+<!--
+  Copyright 2013 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- First, the content of the edit dialog is defined.                       -->
+<script type="text/x-red" data-template-name="delay">
+
+    <div class="form-row">
+        <label for="node-input-pauseType"><i class="fa fa-tasks"></i> Action</label>
+        <select id="node-input-pauseType" style="width:270px !important">
+          <option value="delay">Delay message</option>
+          <option value="random">Random delay</option>
+          <option value="rate">Limit rate to</option>
+          <option value="queue">Topic based fair queue</option>
+        </select>
+    </div>
+    <div id="delay-details" class="form-row">
+        <label for="node-input-timeout"><i class="fa fa-clock-o"></i> For</label>
+        <input type="text" id="node-input-timeout" placeholder="Time" style="direction:rtl; width:50px !important">
+        <select id="node-input-timeoutUnits" style="width:200px !important">
+          <option value="milliseconds">Milliseconds</option>
+          <option value="seconds">Seconds</option>
+          <option value="minutes">Minutes</option>
+          <option value="hours">Hours</option>
+          <option value="days">Days</option>
+        </select>
+    </div>
+
+    <div id="rate-details" class="form-row">
+        <label for="node-input-rate"><i class="fa fa-clock-o"></i> Rate</label>
+        <input type="text" id="node-input-rate" placeholder="1" style="direction:rtl; width:30px !important">
+        <label for="node-input-rateUnits">msg(s) per</label>
+        <select id="node-input-rateUnits" style="width:140px !important">
+          <option value="second">Second</option>
+          <option value="minute">Minute</option>
+          <option value="hour">Hour</option>
+          <option value="day">Day</option>
+        </select>
+        <br/>
+        <div id="node-input-dr"><input style="margin: 20px 0 20px 100px; width: 30px;" type="checkbox" id="node-input-drop"><label style="width: 250px;" for="node-input-drop">drop intermediate messages</label></div>
+    </div>
+
+
+    <div id="random-details" class="form-row">
+        <label for="node-input-randomFirst"><i class="fa fa-clock-o"></i> Between</label>
+        <input type="text" id="node-input-randomFirst" placeholder="" style="directon:rtl; width:30px !important">
+        <label for="node-input-randomLast" style="width:20px"> &amp; </label>
+        <input type="text" id="node-input-randomLast" placeholder="" style="directon:rtl; width:30px !important">
+        <select id="node-input-randomUnits" style="width:140px !important">
+          <option value="milliseconds">Milliseconds</option>
+          <option value="seconds">Seconds</option>
+          <option value="minutes">Minutes</option>
+          <option value="hours">Hours</option>
+          <option value="days">Days</option>
+        </select>
+    </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="Name">
+    </div>
+
+</script>
+
+<!-- Next, some simple help text is provided for the node.                   -->
+<script type="text/x-red" data-help-name="delay">
+    <p>Introduces a delay into a flow or rate limits messages.</p>
+    <p>Default delay is 5 seconds and rate limit of 1 msg/second, but both can be configured.</p>
+    <p>If you select a rate limit you may optionally discard any intermediate messages that arrive.</p>
+    <p>The "topic based fair queue" adds messages to a release queue tagged by their <b>msg.topic</b> property.
+    At each "tick", derived from the rate, the next "topic" is released.
+    Any messages arriving on the same topic before release replace those in that position in the queue.
+    So each "topic" gets a turn - but the most recent value is always the one sent.</p>
+</script>
+
+<!-- Finally, the node type is registered along with all of its properties   -->
+<script type="text/javascript">
+    RED.nodes.registerType('delay',{
+        category: 'function',      // the palette category
+        color:"#E6E0F8",
+        defaults: {             // defines the editable properties of the node
+            name: {value:""},   //  along with default values.
+            pauseType: {value:"delay", required:true},
+            timeout: {value:"5", required:true, validate:RED.validators.number()},
+            timeoutUnits: {value:"seconds"},
+            rate: {value:"1", required:true, validate:RED.validators.number()},
+            rateUnits: {value: "second"},
+            randomFirst: {value:"1", required:true, validate:RED.validators.number()},
+            randomLast: {value:"5", required:true, validate:RED.validators.number()},
+            randomUnits: {value: "seconds"},
+            drop: {value:false}
+        },
+        inputs:1,                // set the number of inputs - only 0 or 1
+        outputs:1,               // set the number of outputs - 0 to n
+        icon: "timer.png",    // set the icon (held in public/icons)
+        label: function() {      // sets the default label contents
+            if (this.pauseType == "delay") {
+              var units = this.timeoutUnits ? this.timeoutUnits.charAt(0) : "s";
+              if (this.timeoutUnits == "milliseconds") { units = "ms"; }
+              return this.name||"delay "+this.timeout+" " + units;
+            } else if (this.pauseType == "rate") {
+              var units = this.rateUnits ? this.rateUnits.charAt(0) : "s";
+              return this.name||"limit "+this.rate+" msg/"+ units;
+            } else if (this.pauseType == "random") {
+              return this.name || "random";
+            }
+            else {
+                var units = this.rateUnits ? this.rateUnits.charAt(0) : "s";
+                return this.name || "queue" +this.rate+" msg/"+ units;
+            }
+        },
+        labelStyle: function() { // sets the class to apply to the label
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+          $( "#node-input-timeout" ).spinner({min:1,max:60});
+          $( "#node-input-rate" ).spinner({min:1});
+
+          $( "#node-input-randomFirst" ).spinner({min:0});
+          $( "#node-input-randomLast" ).spinner({min:1});
+
+          if (this.pauseType == "delay") {
+            $("#delay-details").show();
+            $("#rate-details").hide();
+            $("#random-details").hide();
+            $("#node-input-dr").hide();
+          } else if (this.pauseType == "rate") {
+            $("#delay-details").hide();
+            $("#rate-details").show();
+            $("#random-details").hide();
+            $("#node-input-dr").show();
+          } else if (this.pauseType == "random") {
+            $("#delay-details").hide();
+            $("#rate-details").hide();
+            $("#random-details").show();
+            $("#node-input-dr").hide();
+          } else if (this.pauseType == "queue") {
+            $("#delay-details").hide();
+            $("#rate-details").show();
+            $("#random-details").hide();
+            $("#node-input-dr").hide();
+          }
+
+          if (!this.timeoutUnits) {
+            $("#node-input-timeoutUnits option").filter(function() {
+              return $(this).val() == 'seconds';
+            }).attr('selected', true);
+          }
+
+          if (!this.randomUnits) {
+            $("#node-input-randomUnits option").filter(function() {
+               return $(this).val() == 'seconds';
+            }).attr('selected', true);
+          }
+
+          $("#node-input-pauseType").on("change",function() {
+            if (this.value == "delay") {
+              $("#delay-details").show();
+              $("#rate-details").hide();
+              $("#random-details").hide();
+              $("#node-input-dr").hide();
+            } else if (this.value == "rate") {
+              $("#delay-details").hide();
+              $("#rate-details").show();
+              $("#random-details").hide();
+              $("#node-input-dr").show();
+              } else if (this.value == "random") {
+              $("#delay-details").hide();
+              $("#rate-details").hide();
+              $("#random-details").show();
+              $("#node-input-dr").hide();
+            } else if (this.value == "queue") {
+              $("#delay-details").hide();
+              $("#rate-details").show();
+              $("#random-details").hide();
+              $("#node-input-dr").hide();
+            }
+          });
+        }
+    });
+</script>

nodes/core/core/89-delay.js

@@ -0,0 +1,191 @@
+/**
+ * Copyright 2013, 2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+//Simple node to introduce a pause into a flow
+module.exports = function(RED) {
+    "use strict";
+
+    var MILLIS_TO_NANOS = 1000000;
+    var SECONDS_TO_NANOS = 1000000000;
+
+    function DelayNode(n) {
+        RED.nodes.createNode(this,n);
+
+        this.pauseType = n.pauseType;
+        this.timeoutUnits = n.timeoutUnits;
+        this.randomUnits = n.randomUnits;
+        this.rateUnits = n.rateUnits;
+
+        if (n.timeoutUnits === "milliseconds") {
+            this.timeout = n.timeout;
+        } else if (n.timeoutUnits === "seconds") {
+            this.timeout = n.timeout * 1000;
+        } else if (n.timeoutUnits === "minutes") {
+            this.timeout = n.timeout * (60 * 1000);
+        } else if (n.timeoutUnits === "hours") {
+            this.timeout = n.timeout * (60 * 60 * 1000);
+        } else if (n.timeoutUnits === "days") {
+            this.timeout = n.timeout * (24 * 60 * 60 * 1000);
+        }
+
+        if (n.rateUnits === "second") {
+            this.rate = 1000/n.rate;
+        } else if (n.rateUnits === "minute") {
+            this.rate = (60 * 1000)/n.rate;
+        } else if (n.rateUnits === "hour") {
+            this.rate = (60 * 60 * 1000)/n.rate;
+        } else if (n.rateUnits === "day") {
+            this.rate = (24 * 60 * 60 * 1000)/n.rate;
+        }
+
+        if (n.randomUnits === "milliseconds") {
+            this.randomFirst = n.randomFirst * 1;
+            this.randomLast = n.randomLast * 1;
+        } else if (n.randomUnits === "seconds") {
+            this.randomFirst = n.randomFirst * 1000;
+            this.randomLast = n.randomLast * 1000;
+        } else if (n.randomUnits === "minutes") {
+            this.randomFirst = n.randomFirst * (60 * 1000);
+            this.randomLast = n.randomLast * (60 * 1000);
+        } else if (n.randomUnits === "hours") {
+            this.randomFirst = n.randomFirst * (60 * 60 * 1000);
+            this.randomLast = n.randomLast * (60 * 60 * 1000);
+        } else if (n.randomUnits === "days") {
+            this.randomFirst = n.randomFirst * (24 * 60 * 60 * 1000);
+            this.randomLast = n.randomLast * (24 * 60 * 60 * 1000);
+        }
+
+        this.diff = this.randomLast - this.randomFirst;
+        this.name = n.name;
+        this.idList = [];
+        this.buffer = [];
+        this.intervalID = -1;
+        this.randomID = -1;
+        this.lastSent = null;
+        this.drop = n.drop;
+        var node = this;
+
+        if (this.pauseType === "delay") {
+            this.on("input", function(msg) {
+                var id;
+                id = setTimeout(function(){
+                    node.idList.splice(node.idList.indexOf(id),1);
+                    node.send(msg);
+                }, node.timeout);
+                this.idList.push(id);
+            });
+
+            this.on("close", function() {
+                for (var i=0; i<this.idList.length; i++ ) {
+                    clearTimeout(this.idList[i]);
+                }
+                this.idList = [];
+            });
+
+        } else if (this.pauseType === "rate") {
+            this.on("input", function(msg) {
+                if (!node.drop) {
+                    if ( node.intervalID !== -1) {
+                        node.buffer.push(msg);
+                        if (node.buffer.length > 0) {
+                            node.status({text:node.buffer.length});
+                        }
+                        if (node.buffer.length > 1000) {
+                            node.warn(this.name + " buffer exceeded 1000 messages");
+                        }
+                    } else {
+                        node.send(msg);
+                        node.intervalID = setInterval(function() {
+                            if (node.buffer.length === 0) {
+                                clearInterval(node.intervalID);
+                                node.intervalID = -1;
+                                node.status({text:""});
+                            }
+
+                            if (node.buffer.length > 0) {
+                                node.send(node.buffer.shift());
+                                node.status({text:node.buffer.length});
+                            }
+                        },node.rate);
+                    }
+                } else {
+                    var timeSinceLast;
+                    if (node.lastSent) {
+                        timeSinceLast = process.hrtime(node.lastSent);
+                    }
+                    if (!node.lastSent) { // ensuring that we always send the first message
+                        node.lastSent = process.hrtime();
+                        node.send(msg);
+                    } else if ( ( (timeSinceLast[0] * SECONDS_TO_NANOS) + timeSinceLast[1] ) > (node.rate * MILLIS_TO_NANOS) ) {
+                        node.lastSent = process.hrtime();
+                        node.send(msg);
+                    }
+                }
+            });
+
+            this.on("close", function() {
+                clearInterval(this.intervalID);
+                this.buffer = [];
+            });
+
+        } else if (this.pauseType === "queue") {
+            this.intervalID = setInterval(function() {
+                if (node.buffer.length > 0) {
+                    node.send(node.buffer.shift()); // send the first on the queue
+                }
+                node.status({text:node.buffer.length});
+            },node.rate);
+
+            this.on("input", function(msg) {
+                if (!msg.hasOwnProperty("topic")) { msg.topic = "_none_"; }
+                var hit = false;
+                for (var b in node.buffer) { // check if already in queue
+                    if (msg.topic === node.buffer[b].topic) {
+                        node.buffer[b] = msg; // if so - replace existing entry
+                        hit = true;
+                    }
+                }
+                if (!hit) { node.buffer.push(msg); } // if not add to end of queue
+                node.status({text:node.buffer.length});
+            });
+
+            this.on("close", function() {
+                clearInterval(this.intervalID);
+                this.buffer = [];
+                node.status({text:node.buffer.length});
+            });
+
+        } else if (this.pauseType === "random") {
+            this.on("input", function(msg) {
+                var wait = node.randomFirst + (node.diff * Math.random());
+                var id = setTimeout(function(){
+                    node.idList.splice(node.idList.indexOf(id),1);
+                    node.send(msg);
+                }, wait);
+                this.idList.push(id);
+            });
+
+            this.on("close", function() {
+                for (var i=0; i<this.idList.length; i++ ) {
+                    clearTimeout(this.idList[i]);
+                }
+                this.idList = [];
+            });
+
+        }
+    }
+    RED.nodes.registerType("delay",DelayNode);
+}

nodes/core/core/89-trigger.html

@@ -0,0 +1,130 @@
+<!--
+  Copyright 2014 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="trigger">
+    <div class="form-row">
+        <label for="node-input-op1type"><i class="fa fa-arrow-up"></i> Output</label>
+        <select id="node-input-op1type" style="width:73% !important">
+            <option value="val">the value below</option>
+            <option value="pay">the existing payload</option>
+            <option value="nul">nothing (no output)</option>
+        </select>
+    </div>
+    <div class="form-row" id="node-op1">
+        <label for="node-input-op1">&nbsp;</label>
+        <input type="text" id="node-input-op1">
+    </div>
+    <div class="form-row">
+        <label for="node-input-duration"><i class="fa fa-clock-o"></i> then wait</label>
+        <input type="text" id="node-input-duration" placeholder="250" style="direction:rtl; width:70px !important">
+        <select id="node-input-units" style="width:140px !important">
+            <option value="ms">Milliseconds</option>
+            <option value="s">Seconds</option>
+            <option value="min">Minutes</option>
+            <option value="hr">Hours</option>
+        </select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-op2type"><i class="fa fa-arrow-down"></i> output</label>
+        <select id="node-input-op2type" style="width:73% !important">
+            <option value="val">the value below</option>
+            <option value="pay">the existing payload</option>
+            <option value="nul">nothing (no output)</option>
+        </select>
+    </div>
+    <div class="form-row" id="node-op2">
+        <label for="node-input-op2">&nbsp;</label>
+        <input type="text" id="node-input-op2">
+    </div>
+    <div class="form-row">
+        <label for="node-input-extend"><i class="fa fa-repeat"></i> and</label>
+        <select id="node-input-extend" style="width:73% !important">
+            <option value="false">don't extend the timer if retriggered</option>
+            <option value="true">extend the timer if retriggered</option>
+        </select>
+    </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="Name">
+    </div>
+    <!-- <div class="form-tips">Tip: Outputs can be values, null, {{templated}} or msg.payload<br/> -->
+    <div class="form-tips">Setting the timeout to 0 sets an infinite timeout = single shot.</div>
+    <script>
+    {
+        $("#node-input-op1type").change(function() {
+            if ($("#node-input-op1type").val() == "val") { $("#node-op1").show(); }
+            else { $("#node-op1").hide(); }
+        });
+        $("#node-input-op2type").change(function() {
+            if ($("#node-input-op2type").val() == "val") { $("#node-op2").show(); }
+            else { $("#node-op2").hide(); }
+        });
+    }
+    </script>
+</script>
+
+<script type="text/x-red" data-help-name="trigger">
+    <p>Creates two messages on the output separated by a timeout whenever ANY <b>msg</b> arrives on the input.</p>
+    <p>For example, this can be used to toggle a Raspberry PI GPIO pin on and off.</p>
+    <p>The two output states can be specified as can the duration of the timer.
+    Either output can be set to a value, or templated from the inbound
+    <b>msg</b> using mustache syntax. <pre>The payload is {{payload}}</pre></p>
+    <p>If the payload is an object then setting the output to <i>existing payload</i> will pass the complete payload object through.</p>
+    <p>Optionally the timer can be extended by being retriggered... or not.</p>
+    <p>By setting the first output to <i>nothing</i>, and selecting extend timer - a watchdog timer can be created.
+    No output will happen as long as repeated inputs occur within the timeout period.</p>
+    <p>Setting the timer to 0 creates an "infinite" timeout - the first output will happen but the second
+    never will, and neither can the first be retriggered - so a true one shot.</p>
+    <p>If a <b>msg.reset</b> property is present any timeout currently in progress
+    will be cleared and the second output will not happen.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('trigger',{
+        category: 'function',
+        color:"#E6E0F8",
+        defaults: {
+            op1: {value:"1"},
+            op2: {value:"0"},
+            op1type: {value:""},
+            op2type: {value:""},
+            duration: {value:"250",required:true,validate:RED.validators.number()},
+            extend: {value:"false"},
+            units: {value: "ms"},
+            name: {value:""}
+        },
+        inputs:1,
+        outputs:1,
+        icon: "trigger.png",
+        label: function() {
+            if (this.duration > 0) {
+                return this.name||"trigger "+this.duration+this.units;
+            }
+            else {
+                return this.name||"trigger once &infin;";
+            }
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            $( "#node-input-duration" ).spinner({
+                min:1,
+                increment:25
+            });
+        }
+    });
+</script>

nodes/core/core/89-trigger.js

@@ -0,0 +1,91 @@
+/**
+ * Copyright 2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var mustache = require("mustache");
+    function TriggerNode(n) {
+        RED.nodes.createNode(this,n);
+        this.op1 = n.op1 || "1";
+        this.op2 = n.op2 || "0";
+        this.op1type = n.op1type || "val";
+        this.op2type = n.op2type || "val";
+        this.extend = n.extend || false;
+        this.units = n.units || "ms";
+        this.duration = n.duration || 250;
+        if (this.duration <= 0) { this.duration = 0; }
+        else {
+            if (this.units == "s") { this.duration = this.duration * 1000; }
+            if (this.units == "min") { this.duration = this.duration * 1000 * 60; }
+            if (this.units == "hr") { this.duration = this.duration * 1000 *60 * 60; }
+        }
+        this.op1Templated = this.op1.indexOf("{{") != -1;
+        this.op2Templated = this.op2.indexOf("{{") != -1;
+        if (!isNaN(this.op1)) { this.op1 = Number(this.op1); }
+        if (!isNaN(this.op2)) { this.op2 = Number(this.op2); }
+        if (this.op1 == "true") { this.op1 = true; }
+        if (this.op2 == "true") { this.op2 = true; }
+        if (this.op1 == "false") { this.op1 = false; }
+        if (this.op2 == "false") { this.op2 = false; }
+        if (this.op1 == "null") { this.op1 = null; }
+        if (this.op2 == "null") { this.op2 = null; }
+        try { this.op1 = JSON.parse(this.op1); }
+        catch(e) { this.op1 = this.op1; }
+        try { this.op2 = JSON.parse(this.op2); }
+        catch(e) { this.op2 = this.op2; }
+
+        var node = this;
+        var tout = null;
+        var m2;
+        this.on("input", function(msg) {
+            if (msg.hasOwnProperty("reset")) {
+                clearTimeout(tout);
+                tout = null;
+            }
+            else {
+                if (!tout) {
+                    if (node.op2type === "pay") { m2 = msg.payload; }
+                    else if (node.op2Templated) { m2 = mustache.render(node.op2,msg); }
+                    else { m2 = node.op2; }
+                    if (node.op1type === "pay") { }
+                    else if (node.op1Templated) { msg.payload = mustache.render(node.op1,msg); }
+                    else { msg.payload = node.op1; }
+                    if (node.op1type !== "nul") { node.send(msg); }
+                    if (node.duration === 0) { tout = "infinite"; }
+                    else {
+                        tout = setTimeout(function() {
+                            msg.payload = m2;
+                            if (node.op2type !== "nul") { node.send(msg); }
+                            tout = null;
+                        },node.duration);
+                    }
+                }
+                else if ((node.extend == "true") && (node.duration > 0)) {
+                    clearTimeout(tout);
+                    tout = setTimeout(function() {
+                        msg.payload = m2;
+                        if (node.op2type !== "nul") { node.send(msg); }
+                        tout = null;
+                    },node.duration);
+                }
+            }
+        });
+        this.on("close", function() {
+            if (tout) { clearTimeout(tout); }
+        });
+    }
+    RED.nodes.registerType("trigger",TriggerNode);
+}

nodes/core/core/90-comment.html

@@ -15,20 +15,22 @@
 -->
 
 <script type="text/x-red" data-template-name="comment">
-	<div class="form-row">
-		<label for="node-input-name"><i class="icon-tag"></i> Comment</label>
-		<input type="text" id="node-input-name" placeholder="Comment">
-	</div>
-	<div class="form-row">
-        <label for="node-input-info" style="width: 100% !important;"><i class="icon-file"></i> More</label>
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-comment"></i> Title</label>
+        <input type="text" id="node-input-name" placeholder="Comment">
+    </div>
+    <div class="form-row" style="margin-bottom: 0px;">
+        <label for="node-input-info" style="width: 100% !important;"><i class="fa fa-comments"></i> Body - will be rendered in info tab.</label>
         <input type="hidden" id="node-input-info" autofocus="autofocus">
+    </div>
+    <div class="form-row node-text-editor-row">
         <div style="height: 250px;" class="node-text-editor" id="node-input-info-editor" ></div>
     </div>
-    <div class="form-tips">Tip: this isn't meant for War and Peace - but useful notes can be kept here.</div>
+    <div class="form-tips">Tip: The text here can be styled as <i><a href="https://help.github.com/articles/markdown-basics/" target="_new">Github flavored Markdown</a></i></div>
 </script>
 
 <script type="text/x-red" data-help-name="comment">
-	<p>Simple comment block.</p>
+    <p>A node you can use to add comments to your flows.</p>
 </script>
 
 <script type="text/javascript">
@@ -41,25 +43,37 @@
         },
         inputs:0,
         outputs:0,
-        icon: "file.png",
+        icon: "comment.png",
         label: function() {
             return this.name||"";
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
         },
+        info: function() {
+            return "### "+this.name+"\n"+this.info;
+        },
         oneditprepare: function() {
             $( "#node-input-outputs" ).spinner({
                 min:1
             });
-            function functionDialogResize(ev,ui) {
-                $("#node-input-info-editor").css("height",(ui.size.height-235)+"px");
+            function functionDialogResize() {
+                var rows = $("#dialog-form>div:not(.node-text-editor-row)");
+                var height = $("#dialog-form").height();
+                for (var i=0;i<rows.size();i++) {
+                    height -= $(rows[i]).outerHeight(true);
+                }
+                var editorRow = $("#dialog-form>div.node-text-editor-row");
+                height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+                $(".node-text-editor").css("height",height+"px");
             };
             $( "#dialog" ).on("dialogresize", functionDialogResize);
             $( "#dialog" ).one("dialogopen", function(ev) {
                 var size = $( "#dialog" ).dialog('option','sizeCache-function');
                 if (size) {
-                    functionDialogResize(null,{size:size});
+                    $("#dialog").dialog('option','width',size.width);
+                    $("#dialog").dialog('option','height',size.height);
+                    functionDialogResize();
                 }
             });
             $( "#dialog" ).one("dialogclose", function(ev,ui) {

nodes/core/core/90-comment.js

@@ -14,10 +14,10 @@
  * limitations under the License.
  **/
 
-var RED = require("../../red/red");
-
-function CommentNode(n) {
-	RED.nodes.createNode(this,n);
+module.exports = function(RED) {
+    "use strict";
+    function CommentNode(n) {
+        RED.nodes.createNode(this,n);
+    }
+    RED.nodes.registerType("comment",CommentNode);
 }
-
-RED.nodes.registerType("comment",CommentNode);

nodes/core/core/98-unknown.html

@@ -0,0 +1,51 @@
+<!--
+  Copyright 2013 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="unknown">
+    <div class="form-tips"><p>This node is a type unknown to your installation of Node-RED.</p>
+    <p><i>If you deploy with the node in this state, it's configuration will be preserved, but
+    the flow will not start until the missing type is installed.</i></p>
+    <p>See the Info side bar for more help</p></div>
+</script>
+
+<script type="text/x-red" data-help-name="unknown">
+    <p>This node is a type unknown to your installation of Node-RED.</p>
+    <p><i>If you deploy with the node in this state, it's configuration will be preserved, but
+    the flow will not start until the missing type is installed.</i></p>
+    <p>It is possible this node type is already installed, but is missing a dependency. Check the Node-RED start-up log for
+       any error messages associated with the missing node type. Use <b>npm install &lt;module&gt;</b> to install any missing modules
+       and restart Node-RED and reimport the nodes.</p>
+    <p>Otherwise, you should contact the author of the flow to obtain a copy of the missing node type.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('unknown',{
+        category: 'unknown',
+        color:"#fff0f0",
+        defaults: {
+            name: {value:""}
+        },
+        inputs:1,
+        outputs:1,
+        icon: "",
+        label: function() {
+            return "("+this.name+")"||"unknown";
+        },
+        labelStyle: function() {
+            return "node_label_unknown";
+        }
+    });
+</script>

nodes/core/core/98-unknown.js

@@ -0,0 +1,23 @@
+/**
+ * Copyright 2013 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    function UnknownNode(n) {
+        RED.nodes.createNode(this,n);
+    }
+    RED.nodes.registerType("unknown",UnknownNode);
+}

nodes/core/hardware/35-arduino.html

@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013 IBM Corp.
+  Copyright 2013,2014 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,22 +15,22 @@
 -->
 <script type="text/x-red" data-template-name="arduino in">
     <div class="form-row">
-        <label for="node-input-arduino"><i class="icon-tasks"></i> Arduino</label>
+        <label for="node-input-arduino"><i class="fa fa-tasks"></i> Arduino</label>
         <input type="text" id="node-input-arduino">
     </div>
     <div class="form-row">
-        <label for="node-input-pin"><i class="icon-asterisk"></i> Pin</label>
+        <label for="node-input-pin"><i class="fa fa-circle"></i> Pin</label>
         <input type="text" id="node-input-pin" placeholder="2">
     </div>
     <div class="form-row">
-        <label for="node-input-state"><i class="icon-wrench"></i> Type</label>
+        <label for="node-input-state"><i class="fa fa-wrench"></i> Type</label>
         <select type="text" id="node-input-state" style="width: 150px;">
             <option value="INPUT">Digital pin</option>
             <option value="ANALOG">Analogue pin</option>
         </select>
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-tips"><b>Note:</b> You cannot use the same pin for both output and input.</div>
@@ -38,6 +38,7 @@
 
 <script type="text/x-red" data-help-name="arduino in">
     <p>Arduino input node. Connects to local Arduino and monitors the selected pin for changes. Uses <a href="http://firmata.org/" target="_new"><i>Firmata</i>.</a></p>
+    <p>The Arduino must be loaded with the Standard Firmata sketch available in the Arduino examples.</p>
     <p>You can select either Digital or Analogue input. Outputs the value read as <b>msg.payload</b> and the pin number as <b>msg.topic</b>.</p>
     <p>It only outputs on a change of value - fine for digital inputs, but you can get a lot of data from analogue pins which you must then handle.</p>
     <p>You can set the sample rate in ms from 20 to 65535.</p>
@@ -45,13 +46,13 @@
 
 <script type="text/javascript">
     RED.nodes.registerType('arduino in',{
-        category: 'advanced-input',
+        category: 'Arduino',
         color:"#3fadb5",
         defaults: {
             name: {value:""},
             pin: {value:"",required:true},
             state: {value:"INPUT",required:true},
-            arduino: {type:"arduino-board",required:true}
+            arduino: {type:"arduino-board"}
         },
         inputs:0,
         outputs:1,
@@ -69,23 +70,23 @@
 
 <script type="text/x-red" data-template-name="arduino out">
     <div class="form-row">
-        <label for="node-input-arduino"><i class="icon-tasks"></i> Arduino</label>
+        <label for="node-input-arduino"><i class="fa fa-tasks"></i> Arduino</label>
         <input type="text" id="node-input-arduino">
     </div>
     <div class="form-row">
-        <label for="node-input-pin"><i class="icon-asterisk"></i> Pin</label>
+        <label for="node-input-pin"><i class="fa fa-circle"></i> Pin</label>
         <input type="text" id="node-input-pin" placeholder="13">
     </div>
     <div class="form-row">
-        <label for="node-input-state"><i class="icon-wrench"></i> Type</label>
-        <select type="text" id="node-input-state" style="width: 150px;">
+        <label for="node-input-state"><i class="fa fa-wrench"></i> Type</label>
+        <select type="text" id="node-input-state" style="width: 200px;">
             <option value="OUTPUT">Digital (0/1)</option>
             <option value="PWM">Analogue (0-255)</option>
             <option value="SERVO">Servo (0-180)</option>
         </select>
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-tips"><b>Note:</b> You cannot use the same pin for both output and input.</div>
@@ -93,18 +94,19 @@
 
 <script type="text/x-red" data-help-name="arduino out">
     <p>Arduino output node. Connects to local Arduino and writes to the selected digital pin. Uses <a href="http://firmata.org/" target="_new"><i>Firmata</i>.</a></p>
+    <p>The Arduino must be loaded with the Standard Firmata sketch available in the Arduino examples.</p>
     <p>You can select Digital, Analogue (PWM) or Servo type outputs. Expects a numeric value in <b>msg.payload</b>. The pin number is set in the properties panel.</p>
 </script>
 
 <script type="text/javascript">
     RED.nodes.registerType('arduino out',{
-        category: 'advanced-output',
+        category: 'Arduino',
         color:"#3fadb5",
         defaults: {
             name: {value:""},
-            pin: {value:""},
+            pin: {value:"",required:true},
             state: {value:"",required:true},
-            arduino: {type:"arduino-board",required:true}
+            arduino: {type:"arduino-board"}
         },
         inputs:1,
         outputs:0,
@@ -122,29 +124,48 @@
 
 <script type="text/x-red" data-template-name="arduino-board">
     <div class="form-row">
-        <label for="node-config-input-device"><i class="icon-bullhorn"></i> Arduino Port</label>
-        <input type="text" id="node-config-input-device" placeholder="/dev/ttyUSB0" style="width:50%;">
+        <label for="node-config-input-device"><i class="fa fa-random"></i> Port</label>
+        <input type="text" id="node-config-input-device" style="width:60%;" placeholder="e.g. /dev/ttyUSB0  COM1"/>
+        <a id="node-config-lookup-serial" class="btn"><i id="node-config-lookup-serial-icon" class="fa fa-search"></i></a>
     </div>
-    <div class="form-row">
-        <label for="node-config-input-repeat"><i class="icon-repeat"></i> Sample (ms)</label>
-        <input type="text" id="node-config-input-repeat" placeholder="25">
-    </div>
-    <!-- <div class="form-row">
-        <label for="node-config-input-baud"><i class="icon-bullhorn"></i> Baudrate</label>
-        <input type="text" id="node-config-input-baud" placeholder="115200" style="width:50%;">
-    </div> -->
+    <div class="form-tips"><b>Tip:</b> Use search to try to auto-detect serial port.</div>
 </script>
 
 <script type="text/javascript">
     RED.nodes.registerType('arduino-board',{
         category: 'config',
         defaults: {
-            //baud: {baud:"57600",required:true},
-            repeat: {value:"50",required:true,validate:RED.validators.number()},
             device: {value:"",required:true}
         },
         label: function() {
             return this.device||"arduino";
+        },
+        oneditprepare: function() {
+            try {
+                $("#node-config-input-device").autocomplete( "destroy" );
+            } catch(err) { }
+            $("#node-config-lookup-serial").click(function() {
+                $("#node-config-lookup-serial-icon").removeClass('fa-search');
+                $("#node-config-lookup-serial-icon").addClass('spinner');
+                $("#node-config-lookup-serial").addClass('disabled');
+
+                $.getJSON('arduinoports',function(data) {
+                    $("#node-config-lookup-serial-icon").addClass('fa-search');
+                    $("#node-config-lookup-serial-icon").removeClass('spinner');
+                    $("#node-config-lookup-serial").removeClass('disabled');
+                    var ports = [];
+                    $.each(data, function(i, port){
+                        ports.push(port);
+                    });
+                    $("#node-config-input-device").autocomplete({
+                        source:ports,
+                        minLength:0,
+                        close: function( event, ui ) {
+                            $("#node-config-input-device").autocomplete( "destroy" );
+                        }
+                    }).autocomplete("search","");
+                });
+            });
         }
     });
 </script>

nodes/core/hardware/35-arduino.js

@@ -0,0 +1,157 @@
+/**
+ * Copyright 2013,2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var ArduinoFirmata = require('arduino-firmata');
+    var fs = require('fs');
+    var plat = require('os').platform();
+    var portlist = ArduinoFirmata.list(function (err, ports) {
+        portlist = ports;
+    });
+
+    // The Board Definition - this opens (and closes) the connection
+    function ArduinoNode(n) {
+        RED.nodes.createNode(this,n);
+        this.device = n.device || null;
+        this.repeat = n.repeat||25;
+        //node.log("opening connection "+this.device);
+        var node = this;
+        node.board = new ArduinoFirmata();
+        if (portlist.indexOf(node.device) === -1) {
+            node.warn("device "+node.device+" not found");
+        }
+        else {
+            node.board.connect(node.device);
+        }
+
+        node.board.on('boardReady', function(){
+            if (RED.settings.verbose) { node.log("version "+node.board.boardVersion); }
+        });
+
+        node.on('close', function(done) {
+            if (node.board) {
+                try {
+                    node.board.close(function() {
+                        done();
+                        if (RED.settings.verbose) { node.log("port closed"); }
+                    });
+                } catch(e) { done(); }
+            } else { done(); }
+        });
+    }
+    RED.nodes.registerType("arduino-board",ArduinoNode);
+
+
+    // The Input Node
+    function DuinoNodeIn(n) {
+        RED.nodes.createNode(this,n);
+        this.buttonState = -1;
+        this.pin = n.pin;
+        this.state = n.state;
+        this.arduino = n.arduino;
+        this.serverConfig = RED.nodes.getNode(this.arduino);
+        if (typeof this.serverConfig === "object") {
+            this.board = this.serverConfig.board;
+            //this.repeat = this.serverConfig.repeat;
+            var node = this;
+            node.status({fill:"red",shape:"ring",text:"connecting"});
+
+            node.board.on('connect', function() {
+                node.status({fill:"green",shape:"dot",text:"connected"});
+                //console.log("i",node.state,node.pin);
+                if (node.state == "ANALOG") {
+                    node.board.on('analogChange', function(e) {
+                        if (e.pin == node.pin) {
+                            var msg = {payload:e.value, topic:"A"+e.pin};
+                            node.send(msg);
+                        }
+                    });
+
+                }
+                else {
+                    node.board.pinMode(node.pin, ArduinoFirmata.INPUT);
+                    node.board.on('digitalChange', function(e) {
+                        if (e.pin == node.pin) {
+                            var msg = {payload:e.value, topic:e.pin};
+                            node.send(msg);
+                        }
+                    });
+                }
+            });
+        }
+        else {
+            this.warn("port not configured");
+        }
+    }
+    RED.nodes.registerType("arduino in",DuinoNodeIn);
+
+
+    // The Output Node
+    function DuinoNodeOut(n) {
+        RED.nodes.createNode(this,n);
+        this.buttonState = -1;
+        this.pin = n.pin;
+        this.state = n.state;
+        this.arduino = n.arduino;
+        this.serverConfig = RED.nodes.getNode(this.arduino);
+        if (typeof this.serverConfig === "object") {
+            this.board = this.serverConfig.board;
+            var node = this;
+            node.status({fill:"red",shape:"ring",text:"connecting"});
+
+            node.board.on('connect', function() {
+                node.status({fill:"green",shape:"dot",text:"connected"});
+                //console.log("o",node.state,node.pin);
+                node.board.pinMode(node.pin, node.state);
+                node.on("input", function(msg) {
+                    if (node.state == "OUTPUT") {
+                        if ((msg.payload == true)||(msg.payload == 1)||(msg.payload.toString().toLowerCase() == "on")) {
+                            node.board.digitalWrite(node.pin, true);
+                        }
+                        if ((msg.payload == false)||(msg.payload == 0)||(msg.payload.toString().toLowerCase() == "off")) {
+                            node.board.digitalWrite(node.pin, false);
+                        }
+                    }
+                    if (node.state == "PWM") {
+                        msg.payload = msg.payload * 1;
+                        if ((msg.payload >= 0) && (msg.payload <= 255)) {
+                            //console.log(msg.payload, node.pin);
+                            node.board.analogWrite(node.pin, msg.payload);
+                        }
+                    }
+                    if (node.state == "SERVO") {
+                        msg.payload = msg.payload * 1;
+                        if ((msg.payload >= 0) && (msg.payload <= 180)) {
+                            //console.log(msg.payload, node.pin);
+                            node.board.servoWrite(node.pin, msg.payload);
+                        }
+                    }
+                });
+            });
+        }
+        else {
+            this.warn("port not configured");
+        }
+    }
+    RED.nodes.registerType("arduino out",DuinoNodeOut);
+
+    RED.httpAdmin.get("/arduinoports", RED.auth.needsPermission("arduino.read"), function(req,res) {
+        ArduinoFirmata.list(function (err, ports) {
+            res.json(ports);
+        });
+    });
+}

nodes/core/hardware/36-rpi-gpio.html

@@ -0,0 +1,354 @@
+<!--
+  Copyright 2013,2014 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="rpi-gpio in">
+    <div class="form-row">
+        <label for="node-input-pin"><i class="fa fa-circle"></i> GPIO Pin</label>
+        <select type="text" id="node-input-pin" style="width: 250px;">
+            <option value='' disabled selected style='display:none;'>select pin</option>
+            <option value="3">3 - SDA1 </option>
+            <option value="5">5 - SCL1 </option>
+            <option value="7">7 - GPIO7</option>
+            <option value="8">8 - TxD </option>
+            <option value="10">10 - RxD </option>
+            <option value="11">11 - GPIO0</option>
+            <option value="12">12 - GPIO1</option>
+            <option value="13">13 - GPIO2</option>
+            <option value="15">15 - GPIO3</option>
+            <option value="16">16 - GPIO4</option>
+            <option value="18">18 - GPIO5</option>
+            <option value="19">19 - MOSI </option>
+            <option value="21">21 - MISO </option>
+            <option value="22">22 - GPIO6</option>
+            <option value="23">23 - SCLK </option>
+            <option value="24">24 - CE0 </option>
+            <option value="26">26 - CE1 </option>
+         </select>
+         &nbsp;<span id="pitype"></span>
+    </div>
+    <div class="form-row">
+        <label for="node-input-intype"><i class="fa fa-level-up"></i> Resistor ?</label>
+        <select type="text" id="node-input-intype" style="width: 150px;">
+        <option value="tri">none</option>
+        <option value="up">pullup</option>
+        <option value="down">pulldown</option>
+        </select>
+    </div>
+    <div class="form-row">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-read" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-read" style="width: 70%;">Read initial state of pin on deploy/restart ?</label>
+    </div>
+    <br/>
+    <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="Name">
+    </div>
+    <div class="form-tips" id="pin-tip"><b>Pins in Use</b>: </div>
+    <div class="form-tips">Tip: Only Digital Input is supported - input must be 0 or 1.</div>
+</script>
+
+<script type="text/x-red" data-help-name="rpi-gpio in">
+    <p>Raspberry Pi input node. Generates a <b>msg.payload</b> with either a 0 or 1 depending on the state of the input pin. Requires the gpio command to work.</p>
+    <p>You may also enable the input pullup resistor or the pulldown resistor.</p>
+    <p>The <b>msg.topic</b> is set to <i>pi/{the pin number}</i></p>
+    <p>Requires the RPi.GPIO python library version 0.5.8 (or better) in order to work.</p>
+    <p><b>Note:</b> we are using the actual physical pin numbers on connector P1 as they are easier to locate.</p>
+    </script>
+
+<script type="text/javascript">
+    var pinsInUse = {};
+    RED.nodes.registerType('rpi-gpio in',{
+        category: 'Raspberry Pi',
+        color:"#c6dbef",
+        defaults: {
+            name: { value:"" },
+            pin: { value:"",required:true,validate:RED.validators.number() },
+            intype: { value: "in" },
+            read: { value:false }
+        },
+        inputs:0,
+        outputs:1,
+        icon: "rpi.png",
+        info: function() {
+            if ( Object.keys(pinsInUse).length !== 0 ) {
+                return "**Pins in use** : "+Object.keys(pinsInUse);
+            }
+            else { return ""; }
+        },
+        label: function() {
+            return this.name||"Pin: "+this.pin ;
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            var pinnow = this.pin;
+            $.getJSON('rpi-gpio/'+this.id,function(data) {
+                $('#pitype').text(data.type);
+                if ((data.type === "Model B+") || (data.type === "Model A+")) {
+                    $('#node-input-pin').append($("<option></option>").attr("value",27).text("27 - SDA0"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",28).text("28 - SCL0"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",29).text("29 - GPIO5"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",31).text("31 - GPIO6"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",32).text("32 - GPIO12"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",33).text("33 - GPIO13"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",35).text("35 - GPIO19"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",36).text("36 - GPIO16"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",37).text("37 - GPIO26"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",38).text("38 - GPIO20"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",40).text("40 - GPIO21"));
+                    $('#node-input-pin').val(pinnow);
+                }
+            });
+
+            $.getJSON('rpi-pins/'+this.id,function(data) {
+                pinsInUse = data || {};
+                $('#pin-tip').html("<b>Pins in Use</b>: "+Object.keys(data));
+            });
+
+            $("#node-input-pin").change(function() {
+                var pinnew = $("#node-input-pin").val();
+                if ((pinnew) && (pinnew !== pinnow)) {
+                    if (pinsInUse.hasOwnProperty(pinnew)) {
+                        RED.notify("Pin "+pinnew+" already in use.","warn");
+                    }
+                    pinnow = pinnew;
+                }
+            });
+
+            $("#node-input-intype").change(function() {
+                var newtype = $("#node-input-intype option:selected").val();
+                if ((pinsInUse.hasOwnProperty(pinnow)) && (pinsInUse[pinnow] !== newtype)) {
+                    RED.notify("Pin "+pinnow+" already set as "+pinsInUse[pinnow],"error");
+                }
+            });
+        }
+    });
+</script>
+
+<script type="text/x-red" data-template-name="rpi-gpio out">
+    <div class="form-row">
+        <label for="node-input-pin"><i class="fa fa-circle"></i> GPIO Pin</label>
+        <select type="text" id="node-input-pin" style="width: 250px;">
+            <option value='' disabled selected style='display:none;'>select pin</option>
+            <option value="3">3 - SDA1 </option>
+            <option value="5">5 - SCL1 </option>
+            <option value="7">7 - GPIO7</option>
+            <option value="8">8 - TxD </option>
+            <option value="10">10 - RxD </option>
+            <option value="11">11 - GPIO0</option>
+            <option value="12">12 - GPIO1</option>
+            <option value="13">13 - GPIO2</option>
+            <option value="15">15 - GPIO3</option>
+            <option value="16">16 - GPIO4</option>
+            <option value="18">18 - GPIO5</option>
+            <option value="19">19 - MOSI </option>
+            <option value="21">21 - MISO </option>
+            <option value="22">22 - GPIO6</option>
+            <option value="23">23 - SCLK </option>
+            <option value="24">24 - CE0 </option>
+            <option value="26">26 - CE1 </option>
+         </select>
+         &nbsp;<span id="pitype"></span>
+    </div>
+    <div class="form-row" id="node-set-pwm">
+        <label>&nbsp;&nbsp;&nbsp;&nbsp;Type</label>
+        <select id="node-input-out" style="width: 250px;">
+            <option value="out">Digital output</option>
+            <option value="pwm">PWM output</option>
+        </select>
+    </div>
+    <div class="form-row" id="node-set-tick">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-set" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-set" style="width: 70%;">Initialise pin state ?</label>
+    </div>
+    <div class="form-row" id="node-set-state">
+        <label for="node-input-level">&nbsp;</label>
+        <select id="node-input-level" style="width: 250px;">
+            <option value="0">initial level of pin - low (0)</option>
+            <option value="1">initial level of pin - high (1)</option>
+        </select>
+    </div>
+    <br/>
+    <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="Name">
+    </div>
+    <div class="form-tips" id="pin-tip"><b>Pins in Use</b>: </div>
+    <div class="form-tips" id="dig-tip"><b>Tip</b>: For digital output - input must be 0 or 1.</div>
+    <div class="form-tips" id="pwm-tip"><b>Tip</b>: For PWM output - input must be between 0 to 1023.</div>
+</script>
+
+<script type="text/x-red" data-help-name="rpi-gpio out">
+    <p>Raspberry Pi output node. Expects a <b>msg.payload</b> with either a 0 or 1 (or true or false). Requires the gpio command to work.</p>
+    <p>Will set the selected physical pin high or low depending on the value passed in.</p>
+    <p>The initial value of the pin at deploy time can also be set to 0 or 1.</p>
+    <p>When using PWM mode - expects an input value of a number 0 - 100.</p>
+    <p>Requires the RPi.GPIO python library version 0.5.8 (or better) in order to work.</p>
+    <p><b>Note:</b> we are using the actual physical pin numbers on connector P1 as they are easier to locate.</p>
+</script>
+
+<script type="text/javascript">
+    var pinsInUse = {};
+    RED.nodes.registerType('rpi-gpio out',{
+        category: 'Raspberry Pi',
+        color:"#c6dbef",
+        defaults: {
+            name: { value:"" },
+            pin: { value:"",required:true,validate:RED.validators.number() },
+            set: { value:"" },
+            level: { value:"0" },
+            out: { value:"out" }
+        },
+        inputs:1,
+        outputs:0,
+        icon: "rpi.png",
+        info: function() {
+            if ( Object.keys(pinsInUse).length !== 0 ) {
+                return "**Pins in use** : "+Object.keys(pinsInUse);
+            }
+            else { return ""; }
+        },
+        align: "right",
+        label: function() {
+            if (this.out === "pwm") { return this.name || "PWM: "+this.pin; }
+            else { return this.name||"Pin: "+this.pin ; }
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            var pinnow = this.pin;
+            if (!$("#node-input-out").val()) { $("#node-input-out").val("out"); }
+            $.getJSON('rpi-gpio/'+this.id,function(data) {
+                $('#pitype').text(data.type);
+                if ((data.type === "Model B+") || (data.type === "Model A+")) {
+                    $('#node-input-pin').append($("<option></option>").attr("value",27).text("27 - SDA0"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",28).text("28 - SCL0"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",29).text("29 - GPIO5"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",31).text("31 - GPIO6"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",32).text("32 - GPIO12"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",33).text("33 - GPIO13"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",35).text("35 - GPIO19"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",36).text("36 - GPIO16"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",37).text("37 - GPIO26"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",38).text("38 - GPIO20"));
+                    $('#node-input-pin').append($("<option></option>").attr("value",40).text("40 - GPIO21"));
+                    $('#node-input-pin').val(pinnow);
+                }
+            });
+
+            $.getJSON('rpi-pins/'+this.id,function(data) {
+                pinsInUse = data || {};
+                $('#pin-tip').html("<b>Pins in Use</b>: "+Object.keys(data));
+            });
+
+            $("#node-input-pin").change(function() {
+                var pinnew = $("#node-input-pin").val();
+                if ((pinnew) && (pinnew !== pinnow)) {
+                    if (pinsInUse.hasOwnProperty(pinnew)) {
+                        RED.notify("Pin "+pinnew+" already in use.","warn");
+                    }
+                    pinnow = pinnew;
+                }
+            });
+
+            $("#node-input-out").change(function() {
+                var newtype = $("#node-input-out option:selected").val();
+                if ((pinsInUse.hasOwnProperty(pinnow)) && (pinsInUse[pinnow] !== newtype)) {
+                    RED.notify("Pin "+pinnow+" already set as "+pinsInUse[pinnow],"error");
+                }
+            });
+
+            var hidestate = function () {
+                if ($("#node-input-out").val() === "pwm") {
+                    $('#node-set-tick').hide();
+                    $('#node-set-state').hide();
+                    $('#node-input-set').prop('checked', false);
+                    $("#dig-tip").hide();
+                    $("#pwm-tip").show();
+                }
+                else {
+                    $('#node-set-tick').show();
+                    $("#dig-tip").show();
+                    $("#pwm-tip").hide();
+                }
+            };
+            $("#node-input-out").change(function () { hidestate(); });
+            hidestate();
+
+            var setstate = function () {
+                if ($('#node-input-set').is(":checked")) {
+                    $("#node-set-state").show();
+                } else {
+                    $("#node-set-state").hide();
+                }
+            };
+            $("#node-input-set").change(function () { setstate(); });
+            setstate();
+        }
+    });
+</script>
+
+<script type="text/x-red" data-template-name="rpi-mouse">
+    <div class="form-row">
+        <label for="node-input-butt"><i class="fa fa-circle"></i> Button</label>
+        <select type="text" id="node-input-butt" style="width: 250px;">
+            <option value="1">left</option>
+            <option value="2">right</option>
+            <option value="4">middle</option>
+            <option value="7">any</option>
+         </select>
+    </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="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="rpi-mouse">
+    <p>Raspberry Pi mouse button node. Generates a <b>msg.payload</b> with
+    either a 1 or 0 when the selected mouse button is pressed and released</p>
+    <p>Also sets <b>msg.button</b> to the code value, 1 = left, 2 = right, 4 = middle,
+    so you can work out which button or combination was pressed.</p>
+    <p>And sets <b>msg.topic</b> to <i>pi/mouse</i>.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('rpi-mouse',{
+        category: 'Raspberry Pi',
+        color:"#c6dbef",
+        defaults: {
+            name: { value:"" },
+            butt: { value:"1",required:true }
+        },
+        inputs:0,
+        outputs:1,
+        icon: "rpi.png",
+        label: function() {
+            var na = "Pi Mouse";
+            if (this.butt === "1") { na += " Left"; }
+            if (this.butt === "2") { na += " Right"; }
+            if (this.butt === "4") { na += " Middle"; }
+            return this.name||na;
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        }
+    });
+</script>

nodes/core/hardware/36-rpi-gpio.js

@@ -0,0 +1,283 @@
+/**
+ * Copyright 2013,2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var exec = require('child_process').exec;
+    var spawn = require('child_process').spawn;
+    var fs =  require('fs');
+
+    var gpioCommand = __dirname+'/nrgpio';
+
+    if (!fs.existsSync("/dev/ttyAMA0")) { // unlikely if not on a Pi
+        //RED.log.info("Ignoring Raspberry Pi specific node.");
+        throw "Info : Ignoring Raspberry Pi specific node.";
+    }
+
+    if (!fs.existsSync("/usr/share/doc/python-rpi.gpio")) {
+        RED.log.warn("Can't find Pi RPi.GPIO python library.");
+        throw "Warning : Can't find Pi RPi.GPIO python library.";
+    }
+
+    if ( !(1 & parseInt ((fs.statSync(gpioCommand).mode & parseInt ("777", 8)).toString (8)[0]) )) {
+        RED.log.error(gpioCommand+" needs to be executable.");
+        throw "Error : nrgpio must to be executable.";
+    }
+
+    // the magic to make python print stuff immediately
+    process.env.PYTHONUNBUFFERED = 1;
+
+    var pinsInUse = {};
+    var pinTypes = {"out":"digital output", "tri":"input", "up":"input with pull up", "down":"input with pull down", "pwm":"PWM output"};
+
+    function GPIOInNode(n) {
+        RED.nodes.createNode(this,n);
+        this.buttonState = -1;
+        this.pin = n.pin;
+        this.intype = n.intype;
+        this.read = n.read || false;
+        if (this.read) { this.buttonState = -2; }
+        var node = this;
+        if (!pinsInUse.hasOwnProperty(this.pin)) {
+            pinsInUse[this.pin] = this.intype;
+        }
+        else {
+            if ((pinsInUse[this.pin] !== this.intype)||(pinsInUse[this.pin] === "pwm")) {
+                node.warn("GPIO pin "+this.pin+" already set as "+pinTypes[pinsInUse[this.pin]]);
+            }
+        }
+
+        if (node.pin !== undefined) {
+            if (node.intype === "tri") {
+                node.child = spawn(gpioCommand, ["in",node.pin]);
+            } else {
+                node.child = spawn(gpioCommand, ["in",node.pin,node.intype]);
+            }
+            node.running = true;
+            node.status({fill:"green",shape:"dot",text:"OK"});
+
+            node.child.stdout.on('data', function (data) {
+                data = data.toString().trim();
+                if (data.length > 0) {
+                    if (node.buttonState !== -1) {
+                        node.send({ topic:"pi/"+node.pin, payload:Number(data) });
+                    }
+                    node.buttonState = data;
+                    node.status({fill:"green",shape:"dot",text:data});
+                    if (RED.settings.verbose) { node.log("out: "+data+" :"); }
+                }
+            });
+
+            node.child.stderr.on('data', function (data) {
+                if (RED.settings.verbose) { node.log("err: "+data+" :"); }
+            });
+
+            node.child.on('close', function (code) {
+                node.child = null;
+                node.running = false;
+                if (RED.settings.verbose) { node.log("closed"); }
+                if (node.done) {
+                    node.status({fill:"grey",shape:"ring",text:"closed"});
+                    node.done();
+                }
+                else { node.status({fill:"red",shape:"ring",text:"stopped"}); }
+            });
+
+            node.child.on('error', function (err) {
+                if (err.errno === "ENOENT") { node.error('nrgpio command not found'); }
+                else if (err.errno === "EACCES") { node.error('nrgpio command not executable'); }
+                else { node.error('error: ' + err.errno); }
+            });
+
+        }
+        else {
+            node.warn("Invalid GPIO pin: "+node.pin);
+        }
+
+        node.on("close", function(done) {
+            node.status({fill:"grey",shape:"ring",text:"close"});
+            delete pinsInUse[node.pin];
+            if (node.child != null) {
+                node.done = done;
+                node.child.stdin.write("close "+node.pin);
+                node.child.kill('SIGKILL');
+            }
+            else { done(); }
+        });
+    }
+    RED.nodes.registerType("rpi-gpio in",GPIOInNode);
+
+
+    function GPIOOutNode(n) {
+        RED.nodes.createNode(this,n);
+        this.pin = n.pin;
+        this.set = n.set || false;
+        this.level = n.level || 0;
+        this.out = n.out || "out";
+        var node = this;
+        if (!pinsInUse.hasOwnProperty(this.pin)) {
+            pinsInUse[this.pin] = this.out;
+        }
+        else {
+            if ((pinsInUse[this.pin] !== this.out)||(pinsInUse[this.pin] === "pwm")) {
+                node.warn("GPIO pin "+this.pin+" already set as "+pinTypes[pinsInUse[this.pin]]);
+            }
+        }
+
+        function inputlistener(msg) {
+            if (msg.payload === "true") { msg.payload = true; }
+            if (msg.payload === "false") { msg.payload = false; }
+            var out = Number(msg.payload);
+            var limit = 1;
+            if (node.out === "pwm") { limit = 100; }
+            if ((out >= 0) && (out <= limit)) {
+                if (RED.settings.verbose) { node.log("out: "+msg.payload); }
+                if (node.child !== null) {
+                    node.child.stdin.write(msg.payload+"\n");
+                    node.status({fill:"green",shape:"dot",text:msg.payload.toString()});
+                }
+                else {
+                    node.error("nrpgio python command not running");
+                    node.status({fill:"red",shape:"ring",text:"not running"});
+                }
+            }
+            else { node.warn("Invalid input: "+out); }
+        }
+
+        if (node.pin !== undefined) {
+            if (node.set && (node.out === "out")) {
+                node.child = spawn(gpioCommand, [node.out,node.pin,node.level]);
+                } else {
+                node.child = spawn(gpioCommand, [node.out,node.pin]);
+            }
+            node.running = true;
+            node.status({fill:"green",shape:"dot",text:"OK"});
+
+            node.on("input", inputlistener);
+
+            node.child.stdout.on('data', function (data) {
+                if (RED.settings.verbose) { node.log("out: "+data+" :"); }
+            });
+
+            node.child.stderr.on('data', function (data) {
+                if (RED.settings.verbose) { node.log("err: "+data+" :"); }
+            });
+
+            node.child.on('close', function (code) {
+                node.child = null;
+                node.running = false;
+                if (RED.settings.verbose) { node.log("closed"); }
+                if (node.done) {
+                    node.status({fill:"grey",shape:"ring",text:"closed"});
+                    node.done();
+                }
+                else { node.status({fill:"red",shape:"ring",text:"stopped"}); }
+            });
+
+            node.child.on('error', function (err) {
+                if (err.errno === "ENOENT") { node.error('nrgpio command not found'); }
+                else if (err.errno === "EACCES") { node.error('nrgpio command not executable'); }
+                else { node.error('error: ' + err.errno); }
+            });
+
+        }
+        else {
+            node.warn("Invalid GPIO pin: "+node.pin);
+        }
+
+        node.on("close", function(done) {
+            node.status({fill:"grey",shape:"ring",text:"close"});
+            delete pinsInUse[node.pin];
+            if (node.child != null) {
+                node.done = done;
+                node.child.stdin.write("close "+node.pin);
+                node.child.kill('SIGKILL');
+            }
+            else { done(); }
+        });
+
+    }
+
+    var pitype = { type:"" };
+    exec(gpioCommand+" rev 0", function(err,stdout,stderr) {
+        if (err) {
+            RED.log.info('Version command failed for some reason.');
+        }
+        else {
+            if (stdout.trim() == "0") { pitype = { type:"Compute" }; }
+            else if (stdout.trim() == "1") { pitype = { type:"A/B v1" }; }
+            else if (stdout.trim() == "2") { pitype = { type:"A/B v2" }; }
+            else if (stdout.trim() == "3") { pitype = { type:"Model B+" }; }
+            else { RED.log.info("Saw Pi Type",stdout.trim()); }
+        }
+    });
+    RED.nodes.registerType("rpi-gpio out",GPIOOutNode);
+
+    function PiMouseNode(n) {
+        RED.nodes.createNode(this,n);
+        this.butt = n.butt || 7;
+        var node = this;
+
+        node.child = spawn(gpioCommand+".py", ["mouse",node.butt]);
+        node.status({fill:"green",shape:"dot",text:"OK"});
+
+        node.child.stdout.on('data', function (data) {
+            data = Number(data);
+            if (data === 0) { node.send({ topic:"pi/mouse", button:data, payload:0 }); }
+            else { node.send({ topic:"pi/mouse", button:data, payload:1 }); }
+        });
+
+        node.child.stderr.on('data', function (data) {
+            if (RED.settings.verbose) { node.log("err: "+data+" :"); }
+        });
+
+        node.child.on('close', function (code) {
+            node.child = null;
+            node.running = false;
+            if (RED.settings.verbose) { node.log("closed"); }
+            if (node.done) {
+                node.status({fill:"grey",shape:"ring",text:"closed"});
+                node.done();
+            }
+            else { node.status({fill:"red",shape:"ring",text:"stopped"}); }
+        });
+
+        node.child.on('error', function (err) {
+            if (err.errno === "ENOENT") { node.error('nrgpio command not found'); }
+            else if (err.errno === "EACCES") { node.error('nrgpio ommand not executable'); }
+            else { node.error('error: ' + err.errno); }
+        });
+
+        node.on("close", function(done) {
+            node.status({fill:"grey",shape:"ring",text:"close"});
+            if (node.child != null) {
+                node.done = done;
+                node.child.kill('SIGINT');
+                node.child = null;
+            }
+            else { done(); }
+        });
+    }
+    RED.nodes.registerType("rpi-mouse",PiMouseNode);
+
+    RED.httpAdmin.get('/rpi-gpio/:id', RED.auth.needsPermission('rpi-gpio.read'), function(req,res) {
+        res.json(pitype);
+    });
+
+    RED.httpAdmin.get('/rpi-pins/:id', RED.auth.needsPermission('rpi-gpio.read'), function(req,res) {
+        res.json(pinsInUse);
+    });
+}

nodes/core/hardware/nrgpio

@@ -0,0 +1,16 @@
+#
+# Copyright 2014 IBM Corp.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+BASEDIR=$(dirname $0)
+sudo python -u $BASEDIR/nrgpio.py $@

nodes/core/hardware/nrgpio.py

@@ -0,0 +1,197 @@
+#!/usr/bin/python
+#
+# Copyright 2014 IBM Corp.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Import library functions we need
+import RPi.GPIO as GPIO
+import sys
+
+bounce = 20     # bounce time in mS to apply
+
+if sys.version_info >= (3,0):
+    print("Sorry - currently only configured to work with python 2.x")
+    sys.exit(1)
+
+if len(sys.argv) > 1:
+    cmd = sys.argv[1].lower()
+    pin = int(sys.argv[2])
+    GPIO.setmode(GPIO.BOARD)
+    GPIO.setwarnings(False)
+
+    if cmd == "pwm":
+        #print "Initialised pin "+str(pin)+" to PWM"
+        GPIO.setup(pin,GPIO.OUT)
+        p = GPIO.PWM(pin, 100)
+        p.start(0)
+
+        while True:
+            try:
+                data = raw_input()
+                if 'close' in data:
+                    sys.exit(0)
+                p.ChangeDutyCycle(float(data))
+            except (EOFError, SystemExit):        # hopefully always caused by us sigint'ing the program
+                GPIO.cleanup(pin)
+                sys.exit(0)
+            except Exception as ex:
+                print "bad data: "+data
+
+    elif cmd == "buzz":
+        #print "Initialised pin "+str(pin)+" to Buzz"
+        GPIO.setup(pin,GPIO.OUT)
+        p = GPIO.PWM(pin, 100)
+        p.stop()
+
+        while True:
+            try:
+                data = raw_input()
+                if 'close' in data:
+                    sys.exit(0)
+                elif float(data) == 0:
+                    p.stop()
+                else:
+                    p.start(50)
+                    p.ChangeFrequency(float(data))
+            except (EOFError, SystemExit):        # hopefully always caused by us sigint'ing the program
+                GPIO.cleanup(pin)
+                sys.exit(0)
+            except Exception as ex:
+                print "bad data: "+data
+
+    elif cmd == "out":
+        #print "Initialised pin "+str(pin)+" to OUT"
+        GPIO.setup(pin,GPIO.OUT)
+        if len(sys.argv) == 4:
+            GPIO.output(pin,int(sys.argv[3]))
+
+        while True:
+            try:
+                data = raw_input()
+                if 'close' in data:
+                    sys.exit(0)
+                data = int(data)
+            except (EOFError, SystemExit):        # hopefully always caused by us sigint'ing the program
+                GPIO.cleanup(pin)
+                sys.exit(0)
+            except:
+                data = 0
+            if data != 0:
+                data = 1
+            GPIO.output(pin,data)
+
+    elif cmd == "in":
+        #print "Initialised pin "+str(pin)+" to IN"
+        def handle_callback(chan):
+            print GPIO.input(chan)
+
+        if len(sys.argv) == 4:
+            if sys.argv[3].lower() == "up":
+                GPIO.setup(pin,GPIO.IN,GPIO.PUD_UP)
+            elif sys.argv[3].lower() == "down":
+                GPIO.setup(pin,GPIO.IN,GPIO.PUD_DOWN)
+            else:
+                GPIO.setup(pin,GPIO.IN)
+        else:
+            GPIO.setup(pin,GPIO.IN)
+        print GPIO.input(pin)
+        GPIO.add_event_detect(pin, GPIO.BOTH, callback=handle_callback, bouncetime=bounce)
+
+        while True:
+            try:
+                data = raw_input()
+                if 'close' in data:
+                    sys.exit(0)
+            except (EOFError, SystemExit):        # hopefully always caused by us sigint'ing the program
+                GPIO.cleanup(pin)
+                sys.exit(0)
+
+    elif cmd == "byte":
+        #print "Initialised BYTE mode - "+str(pin)+
+        list = [7,11,13,12,15,16,18,22]
+        GPIO.setup(list,GPIO.OUT)
+
+        while True:
+            try:
+                data = raw_input()
+                if 'close' in data:
+                    sys.exit(0)
+                data = int(data)
+            except (EOFError, SystemExit):        # hopefully always caused by us sigint'ing the program
+                GPIO.cleanup()
+                sys.exit(0)
+            except:
+                data = 0
+            for bit in range(8):
+                if pin == 1:
+                    mask = 1 << (7 - bit)
+                else:
+                    mask = 1 << bit
+                GPIO.output(list[bit], data & mask)
+
+    elif cmd == "borg":
+        #print "Initialised BORG mode - "+str(pin)+
+        GPIO.setup(11,GPIO.OUT)
+        GPIO.setup(13,GPIO.OUT)
+        GPIO.setup(15,GPIO.OUT)
+        r = GPIO.PWM(11, 100)
+        g = GPIO.PWM(13, 100)
+        b = GPIO.PWM(15, 100)
+        r.start(0)
+        g.start(0)
+        b.start(0)
+
+        while True:
+            try:
+                data = raw_input()
+                if 'close' in data:
+                    sys.exit(0)
+                c = data.split(",")
+                r.ChangeDutyCycle(float(c[0]))
+                g.ChangeDutyCycle(float(c[1]))
+                b.ChangeDutyCycle(float(c[2]))
+            except (EOFError, SystemExit):        # hopefully always caused by us sigint'ing the program
+                GPIO.cleanup()
+                sys.exit(0)
+            except:
+                data = 0
+
+    elif cmd == "rev":
+        print GPIO.RPI_REVISION
+
+    elif cmd == "ver":
+        print GPIO.VERSION
+
+    elif cmd == "mouse":  # catch mice button events
+        file = open( "/dev/input/mice", "rb" )
+        oldbutt = 0
+
+        def getMouseEvent():
+          global oldbutt
+          global pin
+          buf = file.read(3)
+          pin = pin & 0x07
+          button = ord( buf[0] ) & pin # mask out just the required button(s)
+          if button != oldbutt:  # only send if changed
+              oldbutt = button
+              print button
+
+        while True:
+            try:
+                getMouseEvent()
+            except:
+                file.close()
+                sys.exit(0)
+
+else:
+    print "Bad parameters - {in|out|pwm} {pin} {value|up|down}"

nodes/core/io/10-mqtt.html

@@ -0,0 +1,157 @@
+<!--
+  Copyright 2013,2014 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="mqtt in">
+    <div class="form-row">
+        <label for="node-input-broker"><i class="fa fa-globe"></i> Broker</label>
+        <input type="text" id="node-input-broker">
+    </div>
+    <div class="form-row">
+        <label for="node-input-topic"><i class="fa fa-tasks"></i> Topic</label>
+        <input type="text" id="node-input-topic" placeholder="Topic">
+    </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="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="mqtt in">
+    <p>MQTT input node. Connects to a broker and subscribes to the specified topic. The topic may contain MQTT wildcards.</p>
+    <p>Outputs an object called <b>msg</b> containing <b>msg.topic, msg.payload, msg.qos</b> and <b>msg.retain</b>.</p>
+    <p><b>msg.payload</b> is a String.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('mqtt in',{
+        category: 'input',
+        defaults: {
+            name: {value:""},
+            topic: {value:"",required:true},
+            broker: {type:"mqtt-broker", required:true}
+        },
+        color:"#d8bfd8",
+        inputs:0,
+        outputs:1,
+        icon: "bridge.png",
+        label: function() {
+            return this.name||this.topic||"mqtt";
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        }
+    });
+</script>
+
+<script type="text/x-red" data-template-name="mqtt out">
+    <div class="form-row">
+        <label for="node-input-broker"><i class="fa fa-globe"></i> Broker</label>
+        <input type="text" id="node-input-broker">
+    </div>
+    <div class="form-row">
+        <label for="node-input-topic"><i class="fa fa-tasks"></i> Topic</label>
+        <input type="text" id="node-input-topic" placeholder="Topic">
+    </div>
+    <div class="form-row">
+        <label for="node-input-qos"><i class="fa fa-empire"></i> QoS</label>
+        <select id="node-input-qos" style="width:125px !important">
+            <option value=""></option>
+            <option value="0">0</option>
+            <option value="1">1</option>
+            <option value="2">2</option>
+        </select>
+        &nbsp;&nbsp;<i class="fa fa-history"></i>&nbsp;Retain &nbsp;<select id="node-input-retain" style="width:125px !important">
+            <option value=""></option>
+            <option value="false">false</option>
+            <option value="true">true</option>
+        </select>
+    </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="Name">
+    </div>
+    <div class="form-tips">Tip: Leave topic, qos or retain blank if you want to set them via msg properties.</div>
+</script>
+
+<script type="text/x-red" data-help-name="mqtt out">
+    <p>Connects to a MQTT broker and publishes <b>msg.payload</b> either to the <b>msg.topic</b> or to the topic specified in the edit window. The value in the edit window has precedence.</p>
+    <p>Likewise QoS and/or retain values in the edit panel will overwrite any <b>msg.qos</b> and <b>msg.retain</b> properties. If nothing is set they default to <i>0</i> and <i>false</i> respectively.</p>
+    <p>If <b>msg.payload</b> contains an object it will be stringified before being sent.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('mqtt out',{
+        category: 'output',
+        defaults: {
+            name: {value:""},
+            topic: {value:""},
+            qos: {value:""},
+            retain: {value:""},
+            broker: {type:"mqtt-broker", required:true}
+        },
+        color:"#d8bfd8",
+        inputs:1,
+        outputs:0,
+        icon: "bridge.png",
+        align: "right",
+        label: function() {
+            return this.name||this.topic||"mqtt";
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        }
+    });
+</script>
+
+<script type="text/x-red" data-template-name="mqtt-broker">
+    <div class="form-row node-input-broker">
+        <label for="node-config-input-broker"><i class="fa fa-globe"></i> Broker</label>
+        <input class="input-append-left" type="text" id="node-config-input-broker" placeholder="localhost" style="width: 40%;" >
+        <label for="node-config-input-port" style="margin-left: 10px; width: 35px; "> Port</label>
+        <input type="text" id="node-config-input-port" placeholder="Port" style="width:45px">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-clientid"><i class="fa fa-tag"></i> Client ID</label>
+        <input type="text" id="node-config-input-clientid" placeholder="Leave blank for auto generated">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-user"><i class="fa fa-user"></i> Username</label>
+        <input type="text" id="node-config-input-user">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-password"><i class="fa fa-lock"></i> Password</label>
+        <input type="password" id="node-config-input-password">
+    </div>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('mqtt-broker',{
+        category: 'config',
+        defaults: {
+            broker: {value:"",required:true},
+            port: {value:1883,required:true,validate:RED.validators.number()},
+            clientid: { value:"" }
+        },
+        credentials: {
+            user: {type:"text"},
+            password: {type: "password"}
+        },
+        label: function() {
+            if (this.broker == "") { this.broker = "localhost"; }
+            return (this.clientid?this.clientid+"@":"")+this.broker+":"+this.port;
+        }
+    });
+</script>

nodes/core/io/10-mqtt.js

@@ -0,0 +1,121 @@
+/**
+ * Copyright 2013,2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var connectionPool = require("./lib/mqttConnectionPool");
+    var isUtf8 = require('is-utf8');
+
+    function MQTTBrokerNode(n) {
+        RED.nodes.createNode(this,n);
+        this.broker = n.broker;
+        this.port = n.port;
+        this.clientid = n.clientid;
+        if (this.credentials) {
+            this.username = this.credentials.user;
+            this.password = this.credentials.password;
+        }
+    }
+    RED.nodes.registerType("mqtt-broker",MQTTBrokerNode,{
+        credentials: {
+            user: {type:"text"},
+            password: {type: "password"}
+        }
+    });
+
+    function MQTTInNode(n) {
+        RED.nodes.createNode(this,n);
+        this.topic = n.topic;
+        this.broker = n.broker;
+        this.brokerConfig = RED.nodes.getNode(this.broker);
+        if (this.brokerConfig) {
+            this.status({fill:"red",shape:"ring",text:"disconnected"});
+            this.client = connectionPool.get(this.brokerConfig.broker,this.brokerConfig.port,this.brokerConfig.clientid,this.brokerConfig.username,this.brokerConfig.password);
+            var node = this;
+            this.client.subscribe(this.topic,2,function(topic,payload,qos,retain) {
+                if (isUtf8(payload)) { payload = payload.toString(); }
+                var msg = {topic:topic,payload:payload,qos:qos,retain:retain};
+                if ((node.brokerConfig.broker === "localhost")||(node.brokerConfig.broker === "127.0.0.1")) {
+                    msg._topic = topic;
+                }
+                node.send(msg);
+            });
+            this.client.on("connectionlost",function() {
+                node.status({fill:"red",shape:"ring",text:"disconnected"});
+            });
+            this.client.on("connect",function() {
+                node.status({fill:"green",shape:"dot",text:"connected"});
+            });
+            this.client.connect();
+        } else {
+            this.error("missing broker configuration");
+        }
+        this.on('close', function() {
+            if (this.client) {
+                this.client.disconnect();
+            }
+        });
+    }
+    RED.nodes.registerType("mqtt in",MQTTInNode);
+
+    function MQTTOutNode(n) {
+        RED.nodes.createNode(this,n);
+        this.topic = n.topic;
+        this.qos = n.qos || null;
+        this.retain = n.retain;
+        this.broker = n.broker;
+        this.brokerConfig = RED.nodes.getNode(this.broker);
+
+        if (this.brokerConfig) {
+            this.status({fill:"red",shape:"ring",text:"disconnected"});
+            this.client = connectionPool.get(this.brokerConfig.broker,this.brokerConfig.port,this.brokerConfig.clientid,this.brokerConfig.username,this.brokerConfig.password);
+            var node = this;
+            this.on("input",function(msg) {
+                if (msg.qos) {
+                    msg.qos = parseInt(msg.qos);
+                    if ((msg.qos !== 0) && (msg.qos !== 1) && (msg.qos !== 2)) {
+                        msg.qos = null;
+                    }
+                }
+                msg.qos = Number(node.qos || msg.qos || 0);
+                msg.retain = node.retain || msg.retain || false;
+                msg.retain = ((msg.retain === true) || (msg.retain === "true")) || false;
+                if (node.topic) {
+                    msg.topic = node.topic;
+                }
+                if ((msg.hasOwnProperty("topic")) && (typeof msg.topic === "string") && (msg.topic !== "")) { // topic must exist
+                    this.client.publish(msg);  // send the message
+                }
+                else { node.warn("Invalid topic specified"); }
+            });
+            this.client.on("connectionlost",function() {
+                node.status({fill:"red",shape:"ring",text:"disconnected"});
+            });
+            this.client.on("connect",function() {
+                node.status({fill:"green",shape:"dot",text:"connected"});
+            });
+            this.client.connect();
+        } else {
+            this.error("missing broker configuration");
+        }
+        this.on('close', function() {
+            if (this.client) {
+                this.client.disconnect();
+            }
+        });
+    }
+    RED.nodes.registerType("mqtt out",MQTTOutNode);
+}

nodes/core/io/21-httpin.html

@@ -0,0 +1,272 @@
+<!--
+  Copyright 2013 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="http in">
+    <div class="form-row">
+        <label for="node-input-method"><i class="fa fa-tasks"></i> Method</label>
+        <select type="text" id="node-input-method" style="width:72%;">
+        <option value="get">GET</option>
+        <option value="post">POST</option>
+        <option value="put">PUT</option>
+        <option value="delete">DELETE</option>
+        </select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-url"><i class="fa fa-globe"></i> url</label>
+        <input type="text" id="node-input-url" placeholder="/url">
+    </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="Name">
+    </div>
+    <div id="node-input-tip" class="form-tips">The url will be relative to <code><span id="node-input-path"></span></code>.</div>
+</script>
+
+<script type="text/x-red" data-help-name="http in">
+    <p>Provides an input node for http requests, allowing the creation of simple web services.</p>
+    <p>The resulting message has the following properties:
+        <ul>
+            <li>msg.req : <a href="http://expressjs.com/api.html#req">http request</a></li>
+            <li>msg.res : <a href="http://expressjs.com/api.html#res">http response</a></li>
+        </ul>
+    </p>
+    <p>For POST/PUT requests, the body is available under <code>msg.req.body</code>. This
+       uses the <a href="http://expressjs.com/api.html#bodyParser">Express bodyParser middleware</a> to parse the content to a JSON object.
+    </p>
+    <p>
+       By default, this expects the body of the request to be url encoded:
+       <pre>foo=bar&amp;this=that</pre>
+    </p>
+    <p>
+       To send JSON encoded data to the node, the content-type header of the request must be set to
+       <code>application/json</code>.
+    </p>
+    <p>
+       <b>Note: </b>This node does not send any response to the http request. This should be done with
+       a subsequent HTTP Response node, or Function node.
+       In the case of a Function node, the <a href="http://expressjs.com/api.html#res">Express response documentation</a>
+       describes how this should be done. For example:
+       <pre>msg.res.send(200, 'Thanks for the request ');<br/>return msg;</pre>
+    </p>
+
+</script>
+
+<script type="text/x-red" data-template-name="http response">
+    <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="Name">
+    </div>
+    <div class="form-tips">The messages sent to this node <b>must</b> originate from an <i>http input</i> node</div>
+</script>
+
+<script type="text/x-red" data-help-name="http response">
+    <p>Sends responses back to http requests received from an HTTP Input node.</p>
+    <p>The response can be customised using the following message properties:</p>
+    <ul>
+        <li><code>payload</code> is sent as the body of the response</li>
+        <li><code>statusCode</code>, if set, is used as the response status code (default: 200)</li>
+        <li><code>headers</code>, if set, should be an object containing field/value
+        pairs to be added as response headers.</li>
+    </ul>
+</script>
+
+<script type="text/x-red" data-template-name="http request">
+    <div class="form-row">
+        <label for="node-input-method"><i class="fa fa-tasks"></i> Method</label>
+        <select type="text" id="node-input-method" style="width:72%;">
+        <option value="GET">GET</option>
+        <option value="POST">POST</option>
+        <option value="PUT">PUT</option>
+        <option value="DELETE">DELETE</option>
+        <option value="use">- set by msg.method -</option>
+        </select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-url"><i class="fa fa-globe"></i> URL</label>
+        <input type="text" id="node-input-url" placeholder="http://">
+    </div>
+    <div class="form-row">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-useAuth" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-useAuth" style="width: 70%;">Use basic authentication ?</label>
+    </div>
+    <div class="form-row node-input-useAuth-row">
+        <label for="node-input-user"><i class="fa fa-user"></i> Username</label>
+        <input type="text" id="node-input-user">
+    </div>
+    <div class="form-row node-input-useAuth-row">
+        <label for="node-input-password"><i class="fa fa-lock"></i> Password</label>
+        <input type="password" id="node-input-password">
+    </div>
+    <div class="form-row">
+        <label for="node-input-ret"><i class="fa fa-arrow-left"></i> Return</label>
+        <select type="text" id="node-input-ret" style="width:72%;">
+        <option value="txt">a UTF-8 string</option>
+        <option value="bin">a binary buffer</option>
+        <option value="obj">a parsed JSON object</option>
+        </select>
+    </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="Name">
+    </div>
+    <div class="form-tips" id="tip-json" hidden>Tip: If the JSON parse fails the fetched string is returned as-is.</div>
+</script>
+
+<script type="text/x-red" data-help-name="http request">
+    <p>Provides a node for making http requests.</p>
+    <p>The URL and HTTP method can be configured in the node, if they are left blank they should be set in an incoming message on <code>msg.url</code> and <code>msg.method</code>:</p>
+    <ul>
+        <li><code>url</code>, if set, is used as the url of the request. Must start with http: or https:</li>
+        <li><code>method</code>, if set, is used as the HTTP method of the request.
+        Must be one of <code>GET</code>, <code>PUT</code>, <code>POST</code>, <code>PATCH</code> or <code>DELETE</code> (default: GET)</li>
+        <li><code>headers</code>, if set, should be an object containing field/value
+        pairs to be added as request headers</li>
+        <li><code>payload</code> is sent as the body of the request</li>
+    </ul>
+    <p>When configured within the node, the URL property can contain <a href="http://mustache.github.io/mustache.5.html" target="_new">mustache-style</a> tags. These allow the
+    url to be constructed using values of the incoming message. For example, if the url is set to
+    <code>example.com/{{topic}}</code>, it will have the value of <code>msg.topic</code> automatically inserted.</p>
+    <p>
+    The output message contains the following properties:
+    <ul>
+        <li><code>payload</code> is the body of the response</li>
+        <li><code>statusCode</code> is the status code of the response, or the error code if the request could not be completed</li>
+        <li><code>headers</code> is an object containing the response headers</li>
+    </ul>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('http in',{
+        category: 'input',
+        color:"rgb(231, 231, 174)",
+        defaults: {
+            name: {value:""},
+            url: {value:"",required:true},
+            method: {value:"get",required:true}
+        },
+        inputs:0,
+        outputs:1,
+        icon: "white-globe.png",
+        label: function() {
+            if (this.name) {
+                return this.name;
+            } else if (this.url) {
+                var root = RED.settings.httpNodeRoot;
+                if (root.slice(-1) != "/") {
+                    root = root+"/";
+                }
+                if (this.url.charAt(0) == "/") {
+                    root += this.url.slice(1);
+                } else {
+                    root += this.url;
+                }
+                return "["+this.method+"] "+root;
+            } else {
+                return "http";
+            }
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            var root = RED.settings.httpNodeRoot;
+            if (root.slice(-1) == "/") {
+                root = root.slice(0,-1);
+            }
+            if (root == "") {
+                $("#node-input-tip").hide();
+            } else {
+                $("#node-input-path").html(root);
+                $("#node-input-tip").show();
+            }
+            //document.getElementById("node-config-wsdocpath").innerHTML=
+        }
+
+    });
+
+    RED.nodes.registerType('http response',{
+        category: 'output',
+        color:"rgb(231, 231, 174)",
+        defaults: {
+            name: {value:""}
+        },
+        inputs:1,
+        outputs:0,
+        align: "right",
+        icon: "white-globe.png",
+        label: function() {
+            return this.name||"http";
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        }
+    });
+
+    RED.nodes.registerType('http request',{
+        category: 'function',
+        color:"rgb(231, 231, 174)",
+        defaults: {
+            name: {value:""},
+            method:{value:"GET"},
+            ret: {value:"txt"},
+            url:{value:""},
+            //user -> credentials
+            //pass -> credentials
+        },
+        credentials: {
+            user: {type:"text"},
+            password: {type: "password"}
+        },
+        inputs:1,
+        outputs:1,
+        align: "right",
+        icon: "white-globe.png",
+        label: function() {
+            return this.name||"http request";
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            if (this.credentials.user || this.credentials.has_password) {
+                $('#node-input-useAuth').prop('checked', true);
+                $(".node-input-useAuth-row").show();
+            } else {
+                $('#node-input-useAuth').prop('checked', false);
+                $(".node-input-useAuth-row").hide();
+            }
+
+            $("#node-input-useAuth").change(function() {
+                if ($(this).is(":checked")) {
+                    $(".node-input-useAuth-row").show();
+                } else {
+                    $(".node-input-useAuth-row").hide();
+                    $('#node-input-user').val('');
+                    $('#node-input-password').val('');
+                }
+            });
+
+            $("#node-input-ret").change(function() {
+                if ($("#node-input-ret").val() === "obj") {
+                    $("#tip-json").show();
+                } else {
+                    $("#tip-json").hide();
+                }
+            });
+        }
+    });
+</script>

nodes/core/io/21-httpin.js

@@ -0,0 +1,299 @@
+/**
+ * Copyright 2013,2015 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var http = require("follow-redirects").http;
+    var https = require("follow-redirects").https;
+    var urllib = require("url");
+    var express = require("express");
+    var getBody = require('raw-body');
+    var mustache = require("mustache");
+    var querystring = require("querystring");
+    var cors = require('cors');
+    var jsonParser = express.json();
+    var urlencParser = express.urlencoded();
+    var onHeaders = require('on-headers');
+
+    function rawBodyParser(req, res, next) {
+        if (req._body) { return next(); }
+        req.body = "";
+        req._body = true;
+        getBody(req, {
+            limit: '1mb',
+            length: req.headers['content-length'],
+            encoding: 'utf8'
+        }, function (err, buf) {
+            if (err) { return next(err); }
+            req.body = buf;
+            next();
+        });
+    }
+
+
+    function HTTPIn(n) {
+        RED.nodes.createNode(this,n);
+        if (RED.settings.httpNodeRoot !== false) {
+
+            this.url = n.url;
+            this.method = n.method;
+
+            var node = this;
+
+            this.errorHandler = function(err,req,res,next) {
+                node.warn(err);
+                res.send(500);
+            };
+
+            this.callback = function(req,res) {
+                if (node.method == "post") {
+                    node.send({req:req,res:res,payload:req.body});
+                } else if (node.method == "get") {
+                    node.send({req:req,res:res,payload:req.query});
+                } else {
+                    node.send({req:req,res:res});
+                }
+            };
+
+            var corsHandler = function(req,res,next) { next(); }
+
+            if (RED.settings.httpNodeCors) {
+                corsHandler = cors(RED.settings.httpNodeCors);
+                RED.httpNode.options(this.url,corsHandler);
+            }
+            
+            var metricsHandler = function(req,res,next) { next(); }
+
+            if (this.metric()) {
+                metricsHandler = function(req, res, next) {
+                    var startAt = process.hrtime();
+                    onHeaders(res, function() {
+                        if(res._msgId) {
+                            var diff = process.hrtime(startAt);
+                            var ms = diff[0] * 1e3 + diff[1] * 1e-6;
+                            var metricResponseTime = ms.toFixed(3);
+                            var metricContentLength = res._headers["content-length"];
+                            //assuming that _id has been set for res._metrics in HttpOut node!
+                            node.metric("response.time.millis", {_id:res._msgId} , metricResponseTime);
+                            node.metric("response.content-length.bytes", {_id:res._msgId} , metricContentLength);
+                        }
+                    });
+                    next();
+                };
+            }
+            
+            if (this.method == "get") {
+                RED.httpNode.get(this.url,corsHandler,metricsHandler,this.callback,this.errorHandler);
+            } else if (this.method == "post") {
+                RED.httpNode.post(this.url,corsHandler,metricsHandler,jsonParser,urlencParser,rawBodyParser,this.callback,this.errorHandler);
+            } else if (this.method == "put") {
+                RED.httpNode.put(this.url,corsHandler,metricsHandler,jsonParser,urlencParser,rawBodyParser,this.callback,this.errorHandler);
+            } else if (this.method == "delete") {
+                RED.httpNode.delete(this.url,corsHandler,metricsHandler,this.callback,this.errorHandler);
+            }
+
+            this.on("close",function() {
+                var routes = RED.httpNode.routes[this.method];
+                for (var i = 0; i<routes.length; i++) {
+                    if (routes[i].path == this.url) {
+                        routes.splice(i,1);
+                        //break;
+                    }
+                }
+                if (RED.settings.httpNodeCors) {
+                    var routes = RED.httpNode.routes['options'];
+                    if (routes) {
+                        for (var j = 0; j<routes.length; j++) {
+                            if (routes[j].path == this.url) {
+                                routes.splice(j,1);
+                                //break;
+                            }
+                        }
+                    }
+                }
+            });
+        } else {
+            this.warn("Cannot create http-in node when httpNodeRoot set to false");
+        }
+    }
+    RED.nodes.registerType("http in",HTTPIn);
+
+
+    function HTTPOut(n) {
+        RED.nodes.createNode(this,n);
+        var node = this;
+        this.on("input",function(msg) {
+            if (msg.res) {
+                if (msg.headers) {
+                    msg.res.set(msg.headers);
+                }
+                var statusCode = msg.statusCode || 200;
+                if (typeof msg.payload == "object" && !Buffer.isBuffer(msg.payload)) {
+                    msg.res.jsonp(statusCode,msg.payload);
+                } else {
+                    if (msg.res.get('content-length') == null) {
+                        var len;
+                        if (msg.payload == null) {
+                            len = 0;
+                        } else if (typeof msg.payload == "number") {
+                            len = Buffer.byteLength(""+msg.payload);
+                        } else {
+                            len = Buffer.byteLength(msg.payload);
+                        }
+                        msg.res.set('content-length', len);
+                    }
+                    
+                    msg.res._msgId = msg._id;
+                    msg.res.send(statusCode,msg.payload);
+                }
+            } else {
+                node.warn("No response object");
+            }
+        });
+    }
+    RED.nodes.registerType("http response",HTTPOut);
+
+
+    function HTTPRequest(n) {
+        RED.nodes.createNode(this,n);
+        var nodeUrl = n.url;
+        var isTemplatedUrl = (nodeUrl||"").indexOf("{{") != -1;
+        var nodeMethod = n.method || "GET";
+        this.ret = n.ret || "txt";
+        var node = this;
+        this.on("input",function(msg) {
+            var preRequestTimestamp = process.hrtime();
+            node.status({fill:"blue",shape:"dot",text:"requesting"});
+            var url;
+            if (msg.url) {
+                if (n.url && (n.url !== msg.url)) {
+                    node.warn("Deprecated: msg properties should not override set node properties. See bit.ly/nr-override-msg-props");
+                }
+                url = msg.url;
+            } else if (isTemplatedUrl) {
+                url = mustache.render(nodeUrl,msg);
+            } else {
+                url = nodeUrl;
+            }
+            // url must start http:// or https:// so assume http:// if not set
+            if (!((url.indexOf("http://")===0) || (url.indexOf("https://")===0))) {
+                url = "http://"+url;
+            }
+
+            var method;
+            if (msg.method) {                               // if method set in msg
+                if (n.method && (n.method !== "use")) {     // warn if override option not set
+                    node.warn("Deprecated: msg properties should not override fixed node properties. Use explicit override option. See bit.ly/nr-override-msg-props");
+                }
+                method = msg.method.toUpperCase();          // but use it anyway
+            } else {
+                if (n.method !== "use") {
+                    method = nodeMethod.toUpperCase();      // otherwise use the selected method
+                } else {                                    // unless they selected override
+                    method = "GET";                         // - in which case default to GET
+                }
+            }
+            var opts = urllib.parse(url);
+            opts.method = method;
+            opts.headers = {};
+            if (msg.headers) {
+                for (var v in msg.headers) {
+                    if (msg.headers.hasOwnProperty(v)) {
+                        var name = v.toLowerCase();
+                        if (name !== "content-type" && name !== "content-length") {
+                            // only normalise the known headers used later in this
+                            // function. Otherwise leave them alone.
+                            name = v;
+                        }
+                        opts.headers[name] = msg.headers[v];
+                    }
+                }
+            }
+            if (this.credentials && this.credentials.user) {
+                opts.auth = this.credentials.user+":"+(this.credentials.password||"");
+            }
+            var payload = null;
+
+            if (msg.payload && (method == "POST" || method == "PUT" || method == "PATCH" ) ) {
+                if (typeof msg.payload === "string" || Buffer.isBuffer(msg.payload)) {
+                    payload = msg.payload;
+                } else if (typeof msg.payload == "number") {
+                    payload = msg.payload+"";
+                } else {
+                    if (opts.headers['content-type'] == 'application/x-www-form-urlencoded') {
+                        payload = querystring.stringify(msg.payload);
+                    } else {
+                        payload = JSON.stringify(msg.payload);
+                        if (opts.headers['content-type'] == null) {
+                            opts.headers['content-type'] = "application/json";
+                        }
+                    }
+                }
+                if (opts.headers['content-length'] == null) {
+                    opts.headers['content-length'] = Buffer.byteLength(payload);
+                }
+            }
+            var req = ((/^https/.test(url))?https:http).request(opts,function(res) {
+                (node.ret === "bin") ? res.setEncoding('binary') : res.setEncoding('utf8');
+                msg.statusCode = res.statusCode;
+                msg.headers = res.headers;
+                msg.payload = "";
+                msg.url = url;
+                res.on('data',function(chunk) {
+                    msg.payload += chunk;
+                });
+                res.on('end',function() {
+                    if (node.metric()) {
+                        // Calculate request time
+                        var diff = process.hrtime(preRequestTimestamp);
+                        var ms = diff[0] * 1e3 + diff[1] * 1e-6;
+                        var metricRequestDurationMillis = ms.toFixed(3);
+                        node.metric("duration.millis", msg, metricRequestDurationMillis);
+                        if(res.client && res.client.bytesRead) {
+                            node.metric("size.bytes", msg, res.client.bytesRead);
+                        }
+                    }
+                    if (node.ret === "bin") {
+                        msg.payload = new Buffer(msg.payload,"binary");
+                    }
+                    else if (node.ret === "obj") {
+                        try { msg.payload = JSON.parse(msg.payload); }
+                        catch(e) { node.warn("JSON parse error"); }
+                    }
+                    node.send(msg);
+                    node.status({});
+                });
+            });
+            req.on('error',function(err) {
+                msg.payload = err.toString() + " : " + url;
+                msg.statusCode = err.code;
+                node.send(msg);
+                node.status({fill:"red",shape:"ring",text:err.code});
+            });
+            if (payload) {
+                req.write(payload);
+            }
+            req.end();
+        });
+    }
+
+    RED.nodes.registerType("http request",HTTPRequest,{
+        credentials: {
+            user: {type:"text"},
+            password: {type: "password"}
+        }
+    });
+}

nodes/core/io/22-websocket.html

@@ -0,0 +1,279 @@
+<!--
+  Copyright 2013 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<script type="text/javascript">
+function ws_oneditprepare() {
+    $("#websocket-client-row").hide();            
+    $("#node-input-mode").change(function(){
+        if( $("#node-input-mode").val() === 'client') {
+            $("#websocket-server-row").hide();
+            $("#websocket-client-row").show();
+        }
+        else {
+            $("#websocket-server-row").show();
+            $("#websocket-client-row").hide();
+        }
+    });
+
+    if(this.client) {
+        $("#node-input-mode").val('client').change();
+    }
+    else {
+        $("#node-input-mode").val('server').change();
+    }
+}
+
+function ws_oneditsave() {
+    if($("#node-input-mode").val() === 'client') {
+        $("#node-input-server").append('<option value="">Dummy</option>');
+        $("#node-input-server").val('');                
+    }
+    else {
+        $("#node-input-client").append('<option value="">Dummy</option>');
+        $("#node-input-client").val('');                
+    }
+}
+
+function ws_label() {
+    var nodeid = (this.client)?this.client:this.server;
+    var wsNode = RED.nodes.node(nodeid);
+    return this.name||(wsNode?"[ws] "+wsNode.label():"websocket");
+}
+
+function ws_validateserver() {
+    if($("#node-input-mode").val() === 'client' || (this.client && !this.server)) {
+        return true;
+    }
+    else {
+        return RED.nodes.node(this.server) != null;
+    }
+}
+
+function ws_validateclient() {
+    if($("#node-input-mode").val() === 'client' || (this.client && !this.server)) {
+        return RED.nodes.node(this.client) != null;
+    }
+    else {
+        return true;
+    }
+}
+</script>
+<!-- WebSocket Input Node -->
+<script type="text/x-red" data-template-name="websocket in">
+    <div class="form-row">
+        <label for="node-input-mode"><i class="fa fa-dot-circle-o"></i> Type</label>
+        <select id="node-input-mode">
+            <option value="server">Listen on</option>
+            <option value="client">Connect to</option>
+        </select>
+    </div>
+    <div class="form-row" id="websocket-server-row">
+        <label for="node-input-server"><i class="fa fa-bookmark"></i> Path</label>
+        <input type="text" id="node-input-server">
+    </div>
+    <div class="form-row" id="websocket-client-row">
+        <label for="node-input-client"><i class="fa fa-bookmark"></i> URL</label>
+        <input type="text" id="node-input-client">
+    </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="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="websocket in">
+    <p>WebSocket input node.</p>
+    <p>By default, the data received from the WebSocket will be in <b>msg.payload</b>.
+    The socket can be configured to expect a properly formed JSON string, in which
+    case it will parse the JSON and send on the resulting object as the entire message.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('websocket in',{
+        category: 'input',
+        defaults: {
+            name: {value:""},
+            server: {type:"websocket-listener", validate: ws_validateserver},
+            client: {type:"websocket-client", validate: ws_validateclient}
+        },
+        color:"rgb(215, 215, 160)",
+        inputs:0,
+        outputs:1,
+        icon: "white-globe.png",
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        label: ws_label,
+        oneditsave: ws_oneditsave,
+        oneditprepare: ws_oneditprepare
+    });
+</script>
+
+<!-- WebSocket out Node -->
+<script type="text/x-red" data-template-name="websocket out">
+    <div class="form-row">
+        <label for="node-input-mode"><i class="fa fa-dot-circle-o"></i> Type</label>
+        <select id="node-input-mode">
+            <option value="server">Listen on</option>
+            <option value="client">Connect to</option>
+        </select>
+    </div>
+    <div class="form-row" id="websocket-server-row">
+        <label for="node-input-server"><i class="fa fa-bookmark"></i> Path</label>
+        <input type="text" id="node-input-server">
+    </div>
+    <div class="form-row" id="websocket-client-row">
+        <label for="node-input-client"><i class="fa fa-bookmark"></i> URL</label>
+        <input type="text" id="node-input-client">
+    </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="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="websocket out">
+    <p>WebSocket out node.</p>
+    <p>By default, <b>msg.payload</b> will be sent over the WebSocket. The socket
+    can be configured to encode the entire message object as a JSON string and send that
+    over the WebSocket.</p>
+
+    <p>If the message arriving at this node started at a WebSocket In node, the message
+    will be sent back to the client that triggered the flow. Otherwise, the message
+    will be broadcast to all connected clients.</p>
+    <p>If you want to broadcast a message that started at a WebSocket In node, you
+    should delete the <b>msg._session</b> property within the flow</p>.
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('websocket out',{
+        category: 'output',
+        defaults: {
+            name: {value:""},
+            server: {type:"websocket-listener", validate: ws_validateserver},
+            client: {type:"websocket-client", validate: ws_validateclient}
+        },
+        color:"rgb(215, 215, 160)",
+        inputs:1,
+        outputs:0,
+        icon: "white-globe.png",
+        align: "right",
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        label: ws_label,
+        oneditsave: ws_oneditsave,
+        oneditprepare: ws_oneditprepare
+    });
+</script>
+
+<!-- WebSocket Server configuration node -->
+<script type="text/x-red" data-template-name="websocket-listener">
+    <div class="form-row">
+        <label for="node-config-input-path"><i class="fa fa-bookmark"></i> Path</label>
+        <input type="text" id="node-config-input-path" placeholder="/ws/example">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-wholemsg">&nbsp;</label>
+        <select type="text" id="node-config-input-wholemsg" style="width: 70%;">
+            <option value="false">Send/Receive payload</option>
+            <option value="true">Send/Receive entire message</option>
+        </select>
+    </div>
+    <div class="form-tips">
+    By default, <code>payload</code> will contain the data to be sent over, or received from a websocket.
+    The listener can be configured to send or receive the entire message object as a JSON formatted string.
+    <p id="node-config-ws-tip">This path will be relative to <code><span id="node-config-ws-path"></span></code>.</p>
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="websocket-listener">
+   <p>This configuration node creates a WebSocket Server using the specified path</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('websocket-listener',{
+        category: 'config',
+        defaults: {
+            path: {value:"",required:true,validate:RED.validators.regex(/^((?!\/debug\/ws).)*$/) },
+            wholemsg: {value:"false"}
+        },
+        inputs:0,
+        outputs:0,
+        label: function() {
+            var root = RED.settings.httpNodeRoot;
+            if (root.slice(-1) != "/") { 
+                root = root+"/";
+            }
+            if (this.path.charAt(0) == "/") {
+                root += this.path.slice(1);
+            } else {
+                root += this.path;
+            }
+            return root;
+        },
+        oneditprepare: function() {
+            var root = RED.settings.httpNodeRoot;
+            if (root.slice(-1) == "/") { 
+                root = root.slice(0,-1);
+            }
+            if (root == "") {
+                $("#node-config-ws-tip").hide();
+            } else {
+                $("#node-config-ws-path").html(root);
+                $("#node-config-ws-tip").show();
+            }
+        }
+    });
+</script>
+
+<!-- WebSocket Client configuration node -->
+<script type="text/x-red" data-template-name="websocket-client">
+    <div class="form-row">
+        <label for="node-config-input-path"><i class="fa fa-bookmark"></i> URL</label>
+        <input type="text" id="node-config-input-path" placeholder="ws://example.com/ws">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-wholemsg">&nbsp;</label>
+        <select type="text" id="node-config-input-wholemsg" style="width: 70%;">
+            <option value="false">Send/Receive payload</option>
+            <option value="true">Send/Receive entire message</option>
+        </select>
+    </div>
+    <div class="form-tips">
+    <p>URL should use ws:&#47;&#47; or wss:&#47;&#47; scheme and point to an existing websocket listener.</p>
+    By default, <code>payload</code> will contain the data to be sent over, or received from a websocket.
+    The client can be configured to send or receive the entire message object as a JSON formatted string.
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="websocket-client">
+   <p>This configuration node connects a WebSocket client to the specified URL.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('websocket-client',{
+        category: 'config',
+        defaults: {
+            path: {value:"",required:true,validate:RED.validators.regex(/^((?!\/debug\/ws).)*$/) },
+            wholemsg: {value:"false"}
+        },
+        inputs:0,
+        outputs:0,
+        label: function() {
+            return this.path;
+        }
+    });
+</script>

nodes/core/io/22-websocket.js

@@ -0,0 +1,204 @@
+/**
+ * Copyright 2013 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var ws = require("ws"),
+        inspect = require("sys").inspect;
+
+    // A node red node that sets up a local websocket server
+    function WebSocketListenerNode(n) {
+        // Create a RED node
+        RED.nodes.createNode(this,n);
+
+        var node = this;
+
+        // Store local copies of the node configuration (as defined in the .html)
+        node.path = n.path;
+        node.wholemsg = (n.wholemsg === "true");
+
+        node._inputNodes = [];    // collection of nodes that want to receive events
+        node._clients = {};
+
+        function handleConnection(/*socket*/socket) {
+            var id = (1+Math.random()*4294967295).toString(16);
+            node._clients[id] = socket;
+            socket.on('close',function() {
+                delete node._clients[id];
+            });
+            socket.on('message',function(data,flags){
+                node.handleEvent(id,socket,'message',data,flags);
+            });
+            socket.on('error', function(err) {
+                node.warn("An error occured on the ws connection: "+inspect(err));
+            });
+        }
+
+        // match absolute url
+        node.isServer = !/^ws{1,2}:\/\//i.test(node.path);
+        if(node.isServer)
+        {
+            var path = RED.settings.httpNodeRoot || "/";
+            path = path + (path.slice(-1) == "/" ? "":"/") + (node.path.charAt(0) == "/" ? node.path.substring(1) : node.path);
+
+            // Workaround https://github.com/einaros/ws/pull/253
+            // Listen for 'newListener' events from RED.server
+            node._serverListeners = {};
+
+            var storeListener = function(/*String*/event,/*function*/listener){
+                if(event == "error" || event == "upgrade" || event == "listening"){
+                    node._serverListeners[event] = listener;
+                }
+            }
+
+            RED.server.addListener('newListener',storeListener);
+
+            // Create a WebSocket Server
+            node.server = new ws.Server({server:RED.server,path:path});
+
+            // Workaround https://github.com/einaros/ws/pull/253
+            // Stop listening for new listener events
+            RED.server.removeListener('newListener',storeListener);
+
+            node.server.on('connection', handleConnection);
+        }
+        else
+        {
+            // Connect to remote endpoint
+            var socket = new ws(node.path);
+            node.server = socket; // keep for closing
+            handleConnection(socket);
+        }
+
+        node.on("close", function() {
+            // Workaround https://github.com/einaros/ws/pull/253
+            // Remove listeners from RED.server
+            var listener = null;
+            for(var event in node._serverListeners) {
+                if (node._serverListeners.hasOwnProperty(event)) {
+                    listener = node._serverListeners[event];
+                    if(typeof listener === "function"){
+                        RED.server.removeListener(event,listener);
+                    }
+                }
+            }
+            node._serverListeners = {};
+            node.server.close();
+            node._inputNodes = [];
+        });
+    }
+    RED.nodes.registerType("websocket-listener",WebSocketListenerNode);
+    RED.nodes.registerType("websocket-client",WebSocketListenerNode);
+
+    WebSocketListenerNode.prototype.registerInputNode = function(/*Node*/handler){
+        this._inputNodes.push(handler);
+    }
+
+    WebSocketListenerNode.prototype.handleEvent = function(id,/*socket*/socket,/*String*/event,/*Object*/data,/*Object*/flags){
+        var msg;
+        if (this.wholemsg) {
+            try {
+                msg = JSON.parse(data);
+            }
+            catch(err) {
+                msg = { payload:data };
+            }
+        } else {
+            msg = {
+                payload:data
+            };
+        }
+        msg._session = {type:"websocket",id:id};
+
+        for (var i = 0; i < this._inputNodes.length; i++) {
+            this._inputNodes[i].send(msg);
+        }
+    }
+
+    WebSocketListenerNode.prototype.broadcast = function(data){
+        try {
+            if(this.isServer) {
+                for (var i = 0; i < this.server.clients.length; i++) {
+                    this.server.clients[i].send(data);
+                }                
+            }
+            else {
+                this.server.send(data);
+            }
+        }
+        catch(e) { // swallow any errors
+            this.warn("ws:"+i+" : "+e);
+        }
+    }
+
+    WebSocketListenerNode.prototype.reply = function(id,data) {
+        var session = this._clients[id];
+        if (session) {
+            try {
+                session.send(data);
+            }
+            catch(e) { // swallow any errors
+            }
+        }
+    }
+
+    function WebSocketInNode(n) {
+        RED.nodes.createNode(this,n);
+        this.server = (n.client)?n.client:n.server;
+        var node = this;
+        this.serverConfig = RED.nodes.getNode(this.server);
+        if (this.serverConfig) {
+            this.serverConfig.registerInputNode(this);
+        } else {
+            this.error("Missing server configuration");
+        }
+    }
+    RED.nodes.registerType("websocket in",WebSocketInNode);
+
+    function WebSocketOutNode(n) {
+        RED.nodes.createNode(this,n);
+        var node = this;
+        this.server = (n.client)?n.client:n.server;
+        this.serverConfig = RED.nodes.getNode(this.server);
+        if (!this.serverConfig) {
+            this.error("Missing server configuration");
+        }
+        this.on("input", function(msg) {
+            var payload;
+            if (this.serverConfig.wholemsg) {
+                delete msg._session;
+                payload = JSON.stringify(msg);
+            } else {
+                if (!Buffer.isBuffer(msg.payload)) { // if it's not a buffer make sure it's a string.
+                    payload = RED.util.ensureString(msg.payload);
+                }
+                else {
+                    payload = msg.payload;
+                }
+            }
+            if (msg._session && msg._session.type == "websocket") {
+                node.serverConfig.reply(msg._session.id,payload);
+            } else {
+                node.serverConfig.broadcast(payload,function(error){
+                    if (!!error) {
+                        node.warn("An error occurred while sending:" + inspect(error));
+                    }
+                });
+            }
+        });
+    }
+    RED.nodes.registerType("websocket out",WebSocketOutNode);
+}

nodes/core/io/23-watch.html

@@ -16,20 +16,27 @@
 
 <script type="text/x-red" data-template-name="watch">
     <div class="form-row node-input-filename">
-         <label for="node-input-files"><i class="icon-file"></i> File(s)</label>
+         <label for="node-input-files"><i class="fa fa-file"></i> File(s)</label>
          <input type="text" id="node-input-files" placeholder="File(s) or Directory">
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
+     <div id="node-input-tip" class="form-tips">On Windows you must use double back-slashes \\ in any directory names.</div>
 </script>
 
 <script type="text/x-red" data-help-name="watch">
-	<p>Watches a file or directory for any changes.</p>
-	<p>You can enter a list of comma separated files, or directories if you like. You will need to put " around any that have spaces in.</p>
-	<p>The filename of the file that actually changed is put into <b>msg.payload</b>, while a stringified version of the watched criteria is returned in <b>msg.topic</b>.</p>
-	<p>Of course in Linux, <i>everything</i> could be a file and thus watched...</p>
+    <p>Watches a directory or file for changes.</p>
+    <p>You can enter a list of comma separated directories and/or files. You will
+    need to put quotes "..." around any that have spaces in.</p>
+    <p>On Windows you must use double back-slashes \\ in any directory names.</p>
+    <p>The full filename of the file that actually changed is put into <b>msg.payload</b>,
+    while a stringified version of the watch list is returned in <b>msg.topic</b>.</p>
+    <p><b>msg.file</b> contains just the short filename of the file that changed.</p>
+    <p>Of course in Linux, <i>everything</i> is a file and thus can be watched...</p>
+    <p><b>Note: </b>The directory or file must exist in order to be watched. If the file
+    or directory gets deleted it may no longer be monitored even if it gets re-created.</p>
 </script>
 
 <script type="text/javascript">

nodes/core/io/23-watch.js

@@ -0,0 +1,51 @@
+/**
+ * Copyright 2013 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var Notify = require("fs.notify");
+    var fs = require("fs");
+    var sep = require("path").sep;
+
+    function WatchNode(n) {
+        RED.nodes.createNode(this,n);
+
+        this.files = n.files.split(",");
+        for (var f =0; f < this.files.length; f++) {
+            this.files[f] = this.files[f].trim();
+        }
+        this.p = (this.files.length == 1) ? this.files[0] : JSON.stringify(this.files);
+        var node = this;
+
+        var notifications = new Notify(node.files);
+        notifications.on('change', function (file, event, path) {
+            try {
+                if (fs.statSync(path).isDirectory()) { path = path + sep + file; }
+            } catch(e) { }
+            var msg = { payload: path, topic: node.p, file: file };
+            node.send(msg);
+        });
+
+        notifications.on('error', function (error, path) {
+            node.warn(error);
+        });
+
+        this.close = function() {
+            notifications.close();
+        }
+    }
+    RED.nodes.registerType("watch",WatchNode);
+}

nodes/core/io/25-serial.html

@@ -0,0 +1,266 @@
+<!--
+  Copyright 2013,2014 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="serial in">
+    <div class="form-row node-input-serial">
+        <label for="node-input-serial"><i class="fa fa-random"></i> Serial Port</label>
+        <input type="text" id="node-input-serial">
+    </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="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="serial in">
+    <p>Reads data from a local serial port.</p>
+    <p>Can either <ul><li>wait for a "split" character (default \n). Also accepts hex notation (0x0a).</li>
+    <li>Wait for a timeout in milliseconds for the first character received</li>
+    <li>Wait to fill a fixed sized buffer</li></ul></p>
+    <p>It then outputs <b>msg.payload</b> as either a UTF8 ascii string or a binary Buffer object.</p>
+    <p>If no split character is specified, or a timeout or buffer size of 0, then a stream of single characters is sent - again either as ascii chars or size 1 binary buffers.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('serial in',{
+        category: 'input',
+        defaults: {
+            name: {name:""},
+            serial: {type:"serial-port",required:true}
+        },
+        color:"BurlyWood",
+        inputs:0,
+        outputs:1,
+        icon: "serial.png",
+        label: function() {
+            var serialNode = RED.nodes.node(this.serial);
+            return this.name||(serialNode?serialNode.label().split(":")[0]:"serial");
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        }
+    });
+</script>
+
+<script type="text/x-red" data-template-name="serial out">
+    <div class="form-row node-input-serial">
+        <label for="node-input-serial"><i class="fa fa-random"></i> Serial Port</label>
+        <input type="text" id="node-input-serial">
+    </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="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="serial out">
+    <p>Provides a connection to an outbound serial port.</p>
+    <p>Only the <b>msg.payload</b> is sent.</p>
+    <p>Optionally the new line character used to split the input can be appended to every message sent out to the serial port.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('serial out',{
+        category: 'output',
+        defaults: {
+            name: {name:""},
+            serial: {type:"serial-port",required:true}
+        },
+        color:"BurlyWood",
+        inputs:1,
+        outputs:0,
+        icon: "serial.png",
+        align: "right",
+        label: function() {
+            var serialNode = RED.nodes.node(this.serial);
+            return this.name||(serialNode?serialNode.label().split(":")[0]:"serial");
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        }
+    });
+</script>
+
+
+<script type="text/x-red" data-template-name="serial-port">
+    <div class="form-row">
+        <label for="node-config-input-serialport"><i class="fa fa-random"></i> Serial Port</label>
+        <input type="text" id="node-config-input-serialport" style="width:60%;" placeholder="/dev/ttyUSB0"/>
+        <a id="node-config-lookup-serial" class="btn"><i id="node-config-lookup-serial-icon" class="fa fa-search"></i></a>
+    </div>
+    <div class="form-row">
+        <table><tr>
+            <td width="102px"><i class="fa fa-wrench"></i> Settings</td>
+            <td width="100px">Baud Rate</td>
+            <td width="80px">Data Bits</td>
+            <td width="80px">Parity</td>
+            <td width="80px">Stop Bits</td>
+        </tr><tr><td>&nbsp;</td>
+        <td>
+        <select type="text" id="node-config-input-serialbaud" style="width: 100px;">
+            <option value="115200">115200</option>
+            <option value="57600">57600</option>
+            <option value="38400">38400</option>
+            <option value="19200">19200</option>
+            <option value="9600">9600</option>
+            <option value="4800">4800</option>
+            <option value="2400">2400</option>
+            <option value="1800">1800</option>
+            <option value="1200">1200</option>
+            <option value="600">600</option>
+            <option value="300">300</option>
+            <option value="200">200</option>
+            <option value="150">150</option>
+            <option value="134">134</option>
+            <option value="110">110</option>
+            <option value="75">75</option>
+            <option value="50">50</option>
+        </select>
+        </td><td>
+        <select type="text" id="node-config-input-databits" style="width: 80px;">
+            <option value="8">8</option>
+            <option value="7">7</option>
+            <option value="6">6</option>
+            <option value="5">5</option>
+        </select>
+        </td><td>
+        <select type="text" id="node-config-input-parity" style="width: 80px;">
+            <option value="none">None</option>
+            <option value="even">Even</option>
+            <option value="mark">Mark</option>
+            <option value="odd">Odd</option>
+            <option value="space">Space</option>
+        </select>
+        </td><td>
+        <select type="text" id="node-config-input-stopbits" style="width: 80px;">
+            <option value="2">2</option>
+            <option value="1">1</option>
+        </select>
+    </td>
+    </tr></table><br/>
+
+    <div class="form-row">
+        <label><i class="fa fa-sign-in"></i> Input</label>
+    </div>
+    <div class="form-row" style="padding-left: 10px;">
+        Split input
+        <select type="text" id="node-config-input-out" style="margin-left: 5px; width:200px;">
+            <option value="char">on the character</option>
+            <option value="time">after a timeout of</option>
+            <option value="count">into fixed lengths of</option>
+        </select>
+        <input type="text" id="node-config-input-newline"  style="width:50px;">
+        <span id="node-units"></span>
+    </div>
+    <div class="form-row" style="padding-left: 10px;">
+        and deliver
+        <select type="text" id="node-config-input-bin" style="margin-left: 5px; width: 150px;">
+            <option value="false">ascii strings</option>
+            <option value="bin">binary buffers</option>
+        </select>
+    </div>
+    <br/>
+    <div id="node-config-addchar">
+        <div class="form-row">
+            <label><i class="fa fa-sign-out"></i> Output</label>
+        </div>
+        <div class="form-row">
+            <input style="width: 30px;margin-left: 10px; vertical-align: top;" type="checkbox" id="node-config-input-addchar"><label style="width: auto;" for="node-config-input-addchar">add split character to output messages</label>
+        </div>
+    </div>
+    <div class="form-tips" id="tip-split">Tip: the "Split on" character is used to split the input into separate messages. It can also be added to every message sent out to the serial port.</div>
+    <div class="form-tips" id="tip-bin" hidden>Tip: In timeout mode timeout starts from arrival of first character.</div>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('serial-port',{
+        category: 'config',
+        defaults: {
+            //name: {value:""},
+            serialport: {value:"",required:true},
+            serialbaud: {value:57600,required:true},
+            databits: {value:8,required:true},
+            parity: {value:"none",required:true},
+            stopbits: {value:1,required:true},
+            newline: {value:"\\n"},
+            bin: {value:"false"},
+            out: {value:"char"},
+            addchar: {value:false}
+        },
+        label: function() {
+            this.serialbaud = this.serialbaud || 57600;
+            this.databits = this.databits || 8;
+            this.parity = this.parity || 'none';
+            this.stopbits = this.stopbits || 1;
+            return this.serialport+":"+this.serialbaud+"-"+this.databits+this.parity.charAt(0).toUpperCase()+this.stopbits;
+        },
+        oneditprepare: function() {
+            var previous = null;
+            $("#node-config-input-out").on('focus', function () { previous = this.value; }).change(function() {
+                if (previous == null) { previous = $("#node-config-input-out").val(); }
+                if ($("#node-config-input-out").val() == "char") {
+                    if (previous != "char") { $("#node-config-input-newline").val("\\n"); }
+                    $("#node-units").text("");
+                    $("#node-config-addchar").show();
+                    $("#tip-split").show();
+                    $("#tip-bin").hide();
+                }
+                else if ($("#node-config-input-out").val() == "time") {
+                    if (previous != "time") { $("#node-config-input-newline").val("0"); }
+                    $("#node-units").text("ms");
+                    $("#node-config-addchar").hide();
+                    $("#node-config-input-addchar").val("false");
+                    $("#tip-split").hide();
+                    $("#tip-bin").show();
+                }
+                else {
+                    if (previous != "count") { $("#node-config-input-newline").val(""); }
+                    $("#node-units").text("chars");
+                    $("#node-config-addchar").hide();
+                    $("#node-config-input-addchar").val("false");
+                    $("#tip-split").hide();
+                    $("#tip-bin").hide();
+                }
+            });
+
+            try {
+                $("#node-config-input-serialport").autocomplete( "destroy" );
+            } catch(err) {
+            }
+            $("#node-config-lookup-serial").click(function() {
+                //$("#node-config-lookup-serial-icon").removeClass('fa fa-search');
+                //$("#node-config-lookup-serial-icon").addClass('fa fa-spinner');
+                $("#node-config-lookup-serial").addClass('disabled');
+                $.getJSON('serialports',function(data) {
+                    //$("#node-config-lookup-serial-icon").addClass('fa fa-search');
+                    //$("#node-config-lookup-serial-icon").removeClass('fa fa-spinner');
+                    $("#node-config-lookup-serial").removeClass('disabled');
+                    var ports = [];
+                    $.each(data, function(i, port){
+                        ports.push(port.comName);
+                    });
+                    $("#node-config-input-serialport").autocomplete({
+                        source:ports,
+                        minLength:0,
+                        close: function( event, ui ) {
+                            $("#node-config-input-serialport").autocomplete( "destroy" );
+                        }
+                    }).autocomplete("search","");
+                });
+            });
+        }
+    });
+</script>

nodes/core/io/25-serial.js

@@ -0,0 +1,306 @@
+/**
+* Copyright 2013,2014 IBM Corp.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+**/
+
+module.exports = function(RED) {
+    "use strict";
+    var settings = RED.settings;
+    var events = require("events");
+    var serialp = require("serialport");
+    var bufMaxSize = 32768;  // Max serial buffer size, for inputs...
+
+    // TODO: 'serialPool' should be encapsulated in SerialPortNode
+
+    function SerialPortNode(n) {
+        RED.nodes.createNode(this,n);
+        this.serialport = n.serialport;
+        this.newline = n.newline;
+        this.addchar = n.addchar || "false";
+        this.serialbaud = parseInt(n.serialbaud) || 57600;
+        this.databits = parseInt(n.databits) || 8;
+        this.parity = n.parity || "none";
+        this.stopbits = parseInt(n.stopbits) || 1;
+        this.bin = n.bin || "false";
+        this.out = n.out || "char";
+    }
+    RED.nodes.registerType("serial-port",SerialPortNode);
+
+    function SerialOutNode(n) {
+        RED.nodes.createNode(this,n);
+        this.serial = n.serial;
+        this.serialConfig = RED.nodes.getNode(this.serial);
+
+        if (this.serialConfig) {
+            var node = this;
+            node.port = serialPool.get(this.serialConfig.serialport,
+                this.serialConfig.serialbaud,
+                this.serialConfig.databits,
+                this.serialConfig.parity,
+                this.serialConfig.stopbits,
+                this.serialConfig.newline);
+            node.addCh = "";
+            if (node.serialConfig.addchar == "true") {
+                node.addCh = this.serialConfig.newline.replace("\\n","\n").replace("\\r","\r").replace("\\t","\t").replace("\\e","\e").replace("\\f","\f").replace("\\0","\0");
+            }
+            node.on("input",function(msg) {
+                var payload = msg.payload;
+                if (!Buffer.isBuffer(payload)) {
+                    if (typeof payload === "object") {
+                        payload = JSON.stringify(payload);
+                    } else {
+                        payload = payload.toString();
+                    }
+                    payload += node.addCh;
+                } else if (node.addCh !== "") {
+                    payload = Buffer.concat([payload,new Buffer(node.addCh)]);
+                }
+                node.port.write(payload,function(err,res) {
+                    if (err) {
+                        node.error(err);
+                    }
+                });
+            });
+            node.port.on('ready', function() {
+                node.status({fill:"green",shape:"dot",text:"connected"});
+            });
+            node.port.on('closed', function() {
+                node.status({fill:"red",shape:"ring",text:"not connected"});
+            });
+        } else {
+            this.error("missing serial config");
+        }
+
+        this.on("close", function(done) {
+            if (this.serialConfig) {
+                serialPool.close(this.serialConfig.serialport,done);
+            } else {
+                done();
+            }
+        });
+    }
+    RED.nodes.registerType("serial out",SerialOutNode);
+
+
+    function SerialInNode(n) {
+        RED.nodes.createNode(this,n);
+        this.serial = n.serial;
+        this.serialConfig = RED.nodes.getNode(this.serial);
+
+        if (this.serialConfig) {
+            var node = this;
+            node.tout = null;
+            var buf;
+            if (node.serialConfig.out != "count") { buf = new Buffer(bufMaxSize); }
+            else { buf = new Buffer(Number(node.serialConfig.newline)); }
+            var i = 0;
+            node.status({fill:"grey",shape:"dot",text:"unknown"});
+            node.port = serialPool.get(this.serialConfig.serialport,
+                this.serialConfig.serialbaud,
+                this.serialConfig.databits,
+                this.serialConfig.parity,
+                this.serialConfig.stopbits,
+                this.serialConfig.newline
+            );
+
+            var splitc;
+            if (node.serialConfig.newline.substr(0,2) == "0x") {
+                splitc = new Buffer([parseInt(node.serialConfig.newline)]);
+            } else {
+                splitc = new Buffer(node.serialConfig.newline.replace("\\n","\n").replace("\\r","\r").replace("\\t","\t").replace("\\e","\e").replace("\\f","\f").replace("\\0","\0"));
+            }
+
+            this.port.on('data', function(msg) {
+                // single char buffer
+                if ((node.serialConfig.newline === 0)||(node.serialConfig.newline === "")) {
+                    if (node.serialConfig.bin !== "bin") { node.send({"payload": String.fromCharCode(msg)}); }
+                    else { node.send({"payload": new Buffer([msg])}); }
+                }
+                else {
+                    // do the timer thing
+                    if (node.serialConfig.out === "time")  {
+                        if (node.tout) {
+                            i += 1;
+                            buf[i] = msg;
+                        }
+                        else {
+                            node.tout = setTimeout(function () {
+                                node.tout = null;
+                                var m = new Buffer(i+1);
+                                buf.copy(m,0,0,i+1);
+                                if (node.serialConfig.bin !== "bin") { m = m.toString(); }
+                                node.send({"payload": m});
+                                m = null;
+                            }, node.serialConfig.newline);
+                            i = 0;
+                            buf[0] = msg;
+                        }
+                    }
+                    // count bytes into a buffer...
+                    else if (node.serialConfig.out === "count") {
+                        buf[i] = msg;
+                        i += 1;
+                        if ( i >= parseInt(node.serialConfig.newline)) {
+                            var m = new Buffer(i);
+                            buf.copy(m,0,0,i);
+                            if (node.serialConfig.bin !== "bin") { m = m.toString(); }
+                            node.send({"payload":m});
+                            m = null;
+                            i = 0;
+                        }
+                    }
+                    // look to match char...
+                    else if (node.serialConfig.out === "char") {
+                        buf[i] = msg;
+                        i += 1;
+                        if ((msg === splitc[0]) || (i === bufMaxSize)) {
+                            var m = new Buffer(i);
+                            buf.copy(m,0,0,i);
+                            if (node.serialConfig.bin !== "bin") { m = m.toString(); }
+                            node.send({"payload":m});
+                            m = null;
+                            i = 0;
+                        }
+                    }
+                    else { node.log("should never get here"); }
+                }
+            });
+            this.port.on('ready', function() {
+                node.status({fill:"green",shape:"dot",text:"connected"});
+            });
+            this.port.on('closed', function() {
+                node.status({fill:"red",shape:"ring",text:"not connected"});
+            });
+        } else {
+            this.error("missing serial config");
+        }
+
+        this.on("close", function(done) {
+            if (this.serialConfig) {
+                serialPool.close(this.serialConfig.serialport,done);
+            } else {
+                done();
+            }
+        });
+    }
+    RED.nodes.registerType("serial in",SerialInNode);
+
+
+    var serialPool = function() {
+        var connections = {};
+        return {
+            get:function(port,baud,databits,parity,stopbits,newline,callback) {
+                var id = port;
+                if (!connections[id]) {
+                    connections[id] = function() {
+                        var obj = {
+                            _emitter: new events.EventEmitter(),
+                            serial: null,
+                            _closing: false,
+                            tout: null,
+                            on: function(a,b) { this._emitter.on(a,b); },
+                            close: function(cb) { this.serial.close(cb); },
+                            write: function(m,cb) { this.serial.write(m,cb); },
+                        }
+                        //newline = newline.replace("\\n","\n").replace("\\r","\r");
+                        var setupSerial = function() {
+                            //if (newline == "") {
+                                obj.serial = new serialp.SerialPort(port,{
+                                    baudrate: baud,
+                                    databits: databits,
+                                    parity: parity,
+                                    stopbits: stopbits,
+                                    parser: serialp.parsers.raw
+                                },true, function(err, results) { if (err) { obj.serial.emit('error',err); } });
+                            //}
+                            //else {
+                            //    obj.serial = new serialp.SerialPort(port,{
+                            //        baudrate: baud,
+                            //        databits: databits,
+                            //        parity: parity,
+                            //        stopbits: stopbits,
+                            //        parser: serialp.parsers.readline(newline)
+                            //    },true, function(err, results) { if (err) obj.serial.emit('error',err); });
+                            //}
+                            obj.serial.on('error', function(err) {
+                                RED.log.error("serial port "+port+" error "+err);
+                                obj._emitter.emit('closed');
+                                obj.tout = setTimeout(function() {
+                                    setupSerial();
+                                }, settings.serialReconnectTime);
+                            });
+                            obj.serial.on('close', function() {
+                                if (!obj._closing) {
+                                    RED.log.error("serial port "+port+" closed unexpectedly");
+                                    obj._emitter.emit('closed');
+                                    obj.tout = setTimeout(function() {
+                                        setupSerial();
+                                    }, settings.serialReconnectTime);
+                                }
+                            });
+                            obj.serial.on('open',function() {
+                                RED.log.info("serial port "+port+" opened at "+baud+" baud "+databits+""+parity.charAt(0).toUpperCase()+stopbits);
+                                if (obj.tout) { clearTimeout(obj.tout); }
+                                //obj.serial.flush();
+                                obj._emitter.emit('ready');
+                            });
+                            obj.serial.on('data',function(d) {
+                                //console.log(Buffer.isBuffer(d),d.length,d);
+                                //if (typeof d !== "string") {
+                                //    //d = d.toString();
+                                    for (var z=0; z<d.length; z++) {
+                                        obj._emitter.emit('data',d[z]);
+                                    }
+                                //}
+                                //else {
+                                //    obj._emitter.emit('data',d);
+                                //}
+                            });
+                            obj.serial.on("disconnect",function() {
+                                RED.log.error("serial port "+port+" gone away");
+                            });
+                        }
+                        setupSerial();
+                        return obj;
+                    }();
+                }
+                return connections[id];
+            },
+            close: function(port,done) {
+                if (connections[port]) {
+                    if (connections[port].tout != null) {
+                        clearTimeout(connections[port].tout);
+                    }
+                    connections[port]._closing = true;
+                    try {
+                        connections[port].close(function() {
+                            RED.log.info("serial port closed");
+                            done();
+                        });
+                    }
+                    catch(err) { }
+                    delete connections[port];
+                } else {
+                    done();
+                }
+            }
+        }
+    }();
+
+    RED.httpAdmin.get("/serialports", RED.auth.needsPermission('serial.read'), function(req,res) {
+        serialp.list(function (err, ports) {
+            res.json(ports);
+        });
+    });
+}

nodes/core/io/31-tcpin.html

@@ -0,0 +1,300 @@
+<!--
+  Copyright 2013 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="tcp in">
+    <div class="form-row">
+        <label for="node-input-server"><i class="fa fa-dot-circle-o"></i> Type</label>
+        <select id="node-input-server" style="width:120px; margin-right:5px;">
+            <option value="server">Listen on</option>
+            <option value="client">Connect to</option>
+        </select>
+        port <input type="text" id="node-input-port" style="width: 50px">
+    </div>
+    <div class="form-row hidden" id="node-input-host-row" style="padding-left: 110px;">
+        at host <input type="text" id="node-input-host" placeholder="localhost" style="width: 60%;">
+    </div>
+
+    <div class="form-row">
+        <label><i class="fa fa-sign-out"></i> Output</label>
+        a
+        <select id="node-input-datamode" style="width:110px;">
+            <option value="stream">stream of</option>
+            <option value="single">single</option>
+        </select>
+        <select id="node-input-datatype" style="width:140px;">
+            <option value="buffer">Buffer</option>
+            <option value="utf8">String</option>
+            <option value="base64">Base64 String</option>
+        </select>
+        payload<span id="node-input-datamode-plural">s</span>
+    </div>
+
+    <div id="node-row-newline" class="form-row hidden" style="padding-left: 110px;">
+        delimited by <input type="text" id="node-input-newline" style="width: 110px;">
+    </div>
+
+    <div class="form-row">
+        <label for="node-input-topic"><i class="fa fa-tasks"></i> Topic</label>
+        <input type="text" id="node-input-topic" placeholder="Topic">
+    </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="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="tcp in">
+    <p>Provides a choice of tcp inputs. Can either connect to a remote tcp port,
+       or accept incoming connections.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('tcp in',{
+        category: 'input',
+        color:"Silver",
+        defaults: {
+            server: {value:"server",required:true},
+            host: {value:"",validate:function(v) { return (this.server == "server")||v.length > 0;} },
+            port: {value:"",required:true,validate:RED.validators.number()},
+            datamode:{value:"stream"},
+            datatype:{value:"buffer"},
+            newline:{value:""},
+            topic: {value:""},
+            name: {value:""},
+            base64: {/*deprecated*/ value:false,required:true}
+        },
+        inputs:0,
+        outputs:1,
+        icon: "bridge-dash.png",
+        label: function() {
+            return this.name || "tcp:"+(this.host?this.host+":":"")+this.port;
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            var updateOptions = function() {
+                var sockettype = $("#node-input-server option:selected").val();
+                if (sockettype == "client") {
+                    $("#node-input-host-row").show();
+                } else {
+                    $("#node-input-host-row").hide();
+                }
+                var datamode = $("#node-input-datamode option:selected").val();
+                var datatype = $("#node-input-datatype option:selected").val();
+                if (datamode == "stream") {
+                    $("#node-input-datamode-plural").show();
+                    if (datatype == "utf8") {
+                        $("#node-row-newline").show();
+                    } else {
+                        $("#node-row-newline").hide();
+                    }
+                } else {
+                    $("#node-input-datamode-plural").hide();
+                    $("#node-row-newline").hide();
+                }
+            };
+            updateOptions();
+            $("#node-input-server").change(updateOptions);
+            $("#node-input-datatype").change(updateOptions);
+            $("#node-input-datamode").change(updateOptions);
+        }
+    });
+</script>
+
+
+<script type="text/x-red" data-template-name="tcp out">
+    <div class="form-row">
+        <label for="node-input-beserver"><i class="fa fa-dot-circle-o"></i> Type</label>
+        <select id="node-input-beserver" style="width:150px; margin-right:5px;">
+            <option value="server">Listen on</option>
+            <option value="client">Connect to</option>
+            <option value="reply">Reply to TCP</option>
+        </select>
+        <span id="node-input-port-row">port <input type="text" id="node-input-port" style="width: 50px"></span>
+    </div>
+
+    <div class="form-row hidden" id="node-input-host-row" style="padding-left: 110px;">
+        at host <input type="text" id="node-input-host" placeholder="localhost" style="width: 60%;">
+    </div>
+
+    <div class="form-row hidden" id="node-input-end-row">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-end" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-end" style="width: 70%;">Close connection after each message is sent ?</label>
+    </div>
+
+    <div class="form-row">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-base64" placeholder="base64" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-base64" style="width: 70%;">Decode Base64 message ?</label>
+    </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="Name">
+    </div>
+
+    <div class="form-tips hidden" id="fin-tip">
+        <b>Note:</b> Closing the connection after each message is generally not a good thing - but is useful to indicate an end-of-file for example.
+    </div>
+    <div class="form-tips hidden" id="fin-tip2">
+        <b>Note:</b> Closing the connection after each message is generally not a good thing - but is useful to indicate an end-of-file for example. The receiving client will need to reconnect.
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="tcp out">
+    <p>Provides a choice of tcp outputs. Can either connect to a remote tcp port,
+    accept incoming connections, or reply to messages received from a TCP In node.</p>
+    <p>Only <b>msg.payload</b> is sent.</p>
+    <p>If <b>msg.payload</b> is a string containing a Base64 encoding of binary
+    data, the Base64 decoding option will cause it to be converted back to binary
+    before being sent.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('tcp out',{
+        category: 'output',
+        color:"Silver",
+        defaults: {
+            host: {value:"",validate:function(v) { return (this.beserver != "client")||v.length > 0;} },
+            port: {value:"",validate:function(v) { return (this.beserver == "reply")||RED.validators.number()(v) } },
+            beserver: {value:"client",required:true},
+            base64: {value:false,required:true},
+            end: {value:false,required:true},
+            name: {value:""}
+        },
+        inputs:1,
+        outputs:0,
+        icon: "bridge-dash.png",
+        align: "right",
+        label: function() {
+            return this.name || "tcp:"+(this.host?this.host+":":"")+this.port;
+        },
+        labelStyle: function() {
+            return (this.name)?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            var updateOptions = function() {
+                var sockettype = $("#node-input-beserver option:selected").val();
+                if (sockettype == "reply") {
+                    $("#node-input-port-row").hide();
+                    $("#node-input-host-row").hide();
+                    $("#node-input-end-row").hide();
+                } else {
+                    $("#node-input-port-row").show();
+                    $("#node-input-end-row").show();
+                }
+
+                if (sockettype == "client") {
+                    $("#node-input-host-row").show();
+                    $("#fin-tip").show();
+                } else {
+                    $("#node-input-host-row").hide();
+                    $("#fin-tip").hide();
+                }
+
+                if (sockettype == "server") {
+                    $("#fin-tip2").show();
+                }
+                else {
+                    $("#fin-tip2").hide();
+                }
+            };
+            updateOptions();
+            $("#node-input-beserver").change(updateOptions);
+        }
+    });
+</script>
+
+
+<script type="text/x-red" data-template-name="tcp request">
+    <div class="form-row">
+        <label for="node-input-server"><i class="fa fa-globe"></i> Server</label>
+        <input type="text" id="node-input-server" placeholder="ip.address" style="width:45%">
+        &nbsp;port <input type="text" id="node-input-port" placeholder="number" style="width:60px">
+    </div>
+    <div class="form-row">
+        <label for="node-input-out"><i class="fa fa-sign-out"></i> Return</label>
+        <select type="text" id="node-input-out" style="width:52%;">
+            <option value="time">after a fixed timeout of</option>
+            <option value="char">when character received is</option>
+            <option value="count">a fixed number of characters</option>
+            <option value="sit">never. Keep connection open</option>
+        </select>
+        <input type="text" id="node-input-splitc"  style="width:50px;">
+        <span id="node-units"></span>
+    </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="Name">
+    </div>
+    <div class="form-tips"><b>Tip:</b> Outputs a binary <b>Buffer</b>, so you may want to .toString() it.</br/>
+    <b>Tip:</b> Leave host and port blank if you want to overide with msg.host and msg.port properties.</div>
+    <script>
+        var previous = null;
+        $("#node-input-out").on('focus', function () { previous = this.value; }).change(function() {
+            if (previous == null) { previous = $("#node-input-out").val(); }
+            if ($("#node-input-out").val() == "char") {
+                if (previous != "char") $("#node-input-splitc").val("\\n");
+                $("#node-units").text("");
+            }
+            else if ($("#node-input-out").val() == "time") {
+                if (previous != "time") $("#node-input-splitc").val("0");
+                $("#node-units").text("ms");
+            }
+            else if ($("#node-input-out").val() == "count") {
+                if (previous != "count") $("#node-input-splitc").val("12");
+                $("#node-units").text("chars");
+            }
+            else {
+                if (previous != "sit") $("#node-input-splitc").val("0");
+                $("#node-units").text("");
+            }
+        });
+</script>
+
+<script type="text/x-red" data-help-name="tcp request">
+    <p>A simple TCP request node - sends the <b>msg.payload</b> to a server tcp port and expects a response.</p>
+    <p>Connects, sends the "request", reads the "response". It can either count a number of
+    returned characters into a fixed buffer, match a specified character before returning,
+    wait a fixed timeout from first reply and then return, or just sit and wait for data.</p>
+    <p>The response will be output in <b>msg.payload</b> as a buffer, so you may want to .toString() it.</p>
+    <p>If you leave tcp host or port blank they must be set by using the <b>msg.host</b> and <b>msg.port</b> properties.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('tcp request',{
+        category: 'function',
+        color:"Silver",
+        defaults: {
+            server: {value:""},
+            port: {value:"",validate:RED.validators.regex(/^(\d*|)$/)},
+            out: {value:"time",required:true},
+            splitc: {value:"0",required:true},
+            name: {value:""}
+        },
+        inputs:1,
+        outputs:1,
+        icon: "bridge-dash.png",
+        label: function() {
+            return this.name || "tcp:"+(this.server?this.server+":":"")+this.port;
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        }
+    });
+</script>

nodes/core/io/31-tcpin.js

@@ -0,0 +1,506 @@
+/**
+ * Copyright 2013,2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var reconnectTime = RED.settings.socketReconnectTime||10000;
+    var socketTimeout = RED.settings.socketTimeout||null;
+    var net = require('net');
+
+    var connectionPool = {};
+
+    function TcpIn(n) {
+        RED.nodes.createNode(this,n);
+        this.host = n.host;
+        this.port = n.port * 1;
+        this.topic = n.topic;
+        this.stream = (!n.datamode||n.datamode=='stream'); /* stream,single*/
+        this.datatype = n.datatype||'buffer'; /* buffer,utf8,base64 */
+        this.newline = (n.newline||"").replace("\\n","\n").replace("\\r","\r");
+        this.base64 = n.base64;
+        this.server = (typeof n.server == 'boolean')?n.server:(n.server == "server");
+        this.closing = false;
+        this.connected = false;
+        var node = this;
+        var count = 0;
+
+        if (!node.server) {
+            var buffer = null;
+            var client;
+            var reconnectTimeout;
+            var end = false;
+            var setupTcpClient = function() {
+                node.log("connecting to "+node.host+":"+node.port);
+                node.status({fill:"grey",shape:"dot",text:"connecting"});
+                var id = (1+Math.random()*4294967295).toString(16);
+                client = net.connect(node.port, node.host, function() {
+                    buffer = (node.datatype == 'buffer')? new Buffer(0):"";
+                    node.connected = true;
+                    node.log("connected to "+node.host+":"+node.port);
+                    node.status({fill:"green",shape:"dot",text:"connected"});
+                });
+                connectionPool[id] = client;
+
+                client.on('data', function (data) {
+                    if (node.datatype != 'buffer') {
+                        data = data.toString(node.datatype);
+                    }
+                    if (node.stream) {
+                        if ((node.datatype) === "utf8" && node.newline != "") {
+                            buffer = buffer+data;
+                            var parts = buffer.split(node.newline);
+                            for (var i = 0;i<parts.length-1;i+=1) {
+                                var msg = {topic:node.topic, payload:parts[i]};
+                                msg._session = {type:"tcp",id:id};
+                                node.send(msg);
+                            }
+                            buffer = parts[parts.length-1];
+                        } else {
+                            var msg = {topic:node.topic, payload:data};
+                            msg._session = {type:"tcp",id:id};
+                            node.send(msg);
+                        }
+                    } else {
+                        if ((typeof data) === "string") {
+                            buffer = buffer+data;
+                        } else {
+                            buffer = Buffer.concat([buffer,data],buffer.length+data.length);
+                        }
+                    }
+                });
+                client.on('end', function() {
+                    if (!node.stream || (node.datatype == "utf8" && node.newline != "" && buffer.length > 0)) {
+                        var msg = {topic:node.topic,payload:buffer};
+                        msg._session = {type:"tcp",id:id};
+                        if (buffer.length !== 0) {
+                            end = true; // only ask for fast re-connect if we actually got something
+                            node.send(msg);
+                        }
+                        buffer = null;
+                    }
+                });
+                client.on('close', function() {
+                    delete connectionPool[id];
+                    node.connected = false;
+                    node.status({fill:"red",shape:"ring",text:"disconnected"});
+                    if (!node.closing) {
+                        if (end) { // if we were asked to close then try to reconnect once very quick.
+                            end = false;
+                            reconnectTimeout = setTimeout(setupTcpClient, 20);
+                        }
+                        else {
+                            node.log("connection lost to "+node.host+":"+node.port);
+                            reconnectTimeout = setTimeout(setupTcpClient, reconnectTime);
+                        }
+                    } else {
+                        if (node.done) { node.done(); }
+                    }
+                });
+                client.on('error', function(err) {
+                    node.log(err);
+                });
+            }
+            setupTcpClient();
+
+            this.on('close', function(done) {
+                node.done = done;
+                this.closing = true;
+                client.end();
+                clearTimeout(reconnectTimeout);
+                if (!node.connected) { done(); }
+            });
+        } else {
+            var server = net.createServer(function (socket) {
+                if (socketTimeout !== null) { socket.setTimeout(socketTimeout); }
+                var id = (1+Math.random()*4294967295).toString(16);
+                connectionPool[id] = socket;
+                node.status({text:++count+" connections"});
+
+                var buffer = (node.datatype == 'buffer')? new Buffer(0):"";
+                socket.on('data', function (data) {
+                    if (node.datatype != 'buffer') {
+                        data = data.toString(node.datatype);
+                    }
+                    if (node.stream) {
+                        if ((typeof data) === "string" && node.newline != "") {
+                            buffer = buffer+data;
+                            var parts = buffer.split(node.newline);
+                            for (var i = 0;i<parts.length-1;i+=1) {
+                                var msg = {topic:node.topic, payload:parts[i],ip:socket.remoteAddress,port:socket.remotePort};
+                                msg._session = {type:"tcp",id:id};
+                                node.send(msg);
+                            }
+                            buffer = parts[parts.length-1];
+                        } else {
+                            var msg = {topic:node.topic, payload:data};
+                            msg._session = {type:"tcp",id:id};
+                            node.send(msg);
+                        }
+                    } else {
+                        if ((typeof data) === "string") {
+                            buffer = buffer+data;
+                        } else {
+                            buffer = Buffer.concat([buffer,data],buffer.length+data.length);
+                        }
+                    }
+                });
+                socket.on('end', function() {
+                    if (!node.stream || (node.datatype === "utf8" && node.newline !== "")) {
+                        if (buffer.length > 0) {
+                            var msg = {topic:node.topic,payload:buffer};
+                            msg._session = {type:"tcp",id:id};
+                            node.send(msg);
+                        }
+                        buffer = null;
+                    }
+                });
+                socket.on('timeout', function() {
+                    node.log('timeout closed socket port '+node.port);
+                    socket.end();
+                });
+                socket.on('close', function() {
+                    delete connectionPool[id];
+                    node.status({text:--count+" connections"});
+                });
+                socket.on('error',function(err) {
+                    node.log(err);
+                });
+            });
+            server.on('error', function(err) {
+                if (err) {
+                    node.error('unable to listen on port '+node.port+' : '+err);
+                }
+            });
+            server.listen(node.port, function(err) {
+                if (err) {
+                    node.error('unable to listen on port '+node.port+' : '+err);
+                } else {
+                    node.log('listening on port '+node.port);
+                    node.on('close', function() {
+                        for (var c in connectionPool) {
+                            connectionPool[c].end();
+                            connectionPool[c].unref();
+                        }
+                        node.closing = true;
+                        server.close();
+                        node.log('stopped listening on port '+node.port);
+                    });
+                }
+            });
+        }
+
+    }
+    RED.nodes.registerType("tcp in",TcpIn);
+
+    function TcpOut(n) {
+        RED.nodes.createNode(this,n);
+        this.host = n.host;
+        this.port = n.port * 1;
+        this.base64 = n.base64;
+        this.doend = n.end || false;
+        this.beserver = n.beserver;
+        this.name = n.name;
+        this.closing = false;
+        this.connected = false;
+        var node = this;
+
+        if (!node.beserver||node.beserver=="client") {
+            var reconnectTimeout;
+            var client = null;
+            var end = false;
+
+            var setupTcpClient = function() {
+                node.log("connecting to "+node.host+":"+node.port);
+                node.status({fill:"grey",shape:"dot",text:"connecting"});
+                client = net.connect(node.port, node.host, function() {
+                    node.connected = true;
+                    node.log("connected to "+node.host+":"+node.port);
+                    node.status({fill:"green",shape:"dot",text:"connected"});
+                });
+                client.on('error', function (err) {
+                    node.log('error : '+err);
+                });
+                client.on('end', function (err) {
+                });
+                client.on('close', function() {
+                    node.status({fill:"red",shape:"ring",text:"disconnected"});
+                    node.connected = false;
+                    client.destroy();
+                    if (!node.closing) {
+                        if (end) {
+                            end = false;
+                            reconnectTimeout = setTimeout(setupTcpClient,20);
+                        }
+                        else {
+                            node.log("connection lost to "+node.host+":"+node.port);
+                            reconnectTimeout = setTimeout(setupTcpClient,reconnectTime);
+                        }
+                    } else {
+                        if (node.done) { node.done(); }
+                    }
+                });
+            }
+            setupTcpClient();
+
+            node.on("input", function(msg) {
+                if (node.connected && msg.payload != null) {
+                    if (Buffer.isBuffer(msg.payload)) {
+                        client.write(msg.payload);
+                    } else if (typeof msg.payload === "string" && node.base64) {
+                        client.write(new Buffer(msg.payload,'base64'));
+                    } else {
+                        client.write(new Buffer(""+msg.payload));
+                    }
+                    if (node.doend === true) {
+                        end = true;
+                        client.end();
+                    }
+                }
+            });
+
+            node.on("close", function(done) {
+                node.done = done;
+                this.closing = true;
+                client.end();
+                clearTimeout(reconnectTimeout);
+                if (!node.connected) { done(); }
+            });
+
+        } else if (node.beserver == "reply") {
+            node.on("input",function(msg) {
+                if (msg._session && msg._session.type == "tcp") {
+                    var client = connectionPool[msg._session.id];
+                    if (client) {
+                        if (Buffer.isBuffer(msg.payload)) {
+                            client.write(msg.payload);
+                        } else if (typeof msg.payload === "string" && node.base64) {
+                            client.write(new Buffer(msg.payload,'base64'));
+                        } else {
+                            client.write(new Buffer(""+msg.payload));
+                        }
+                    }
+                }
+            });
+        } else {
+            var connectedSockets = [];
+            node.status({text:"0 connections"});
+            var server = net.createServer(function (socket) {
+                if (socketTimeout !== null) { socket.setTimeout(socketTimeout); }
+                var remoteDetails = socket.remoteAddress+":"+socket.remotePort;
+                node.log("connection from "+remoteDetails);
+                connectedSockets.push(socket);
+                node.status({text:connectedSockets.length+" connections"});
+                socket.on('timeout', function() {
+                    node.log('timeout closed socket port '+node.port);
+                    socket.end();
+                });
+                socket.on('close',function() {
+                    node.log("connection closed from "+remoteDetails);
+                    connectedSockets.splice(connectedSockets.indexOf(socket),1);
+                    node.status({text:connectedSockets.length+" connections"});
+                });
+                socket.on('error',function() {
+                    node.log("socket error from "+remoteDetails);
+                    connectedSockets.splice(connectedSockets.indexOf(socket),1);
+                    node.status({text:connectedSockets.length+" connections"});
+                });
+            });
+
+            node.on("input", function(msg) {
+                if (msg.payload != null) {
+                    var buffer;
+                    if (Buffer.isBuffer(msg.payload)) {
+                        buffer = msg.payload;
+                    } else if (typeof msg.payload === "string" && node.base64) {
+                        buffer = new Buffer(msg.payload,'base64');
+                    } else {
+                        buffer = new Buffer(""+msg.payload);
+                    }
+                    for (var i = 0; i<connectedSockets.length;i+=1) {
+                        if (node.doend === true) { connectedSockets[i].end(buffer); }
+                        else { connectedSockets[i].write(buffer); }
+                    }
+                }
+            });
+
+            server.on('error', function(err) {
+                if (err) {
+                    node.error('unable to listen on port '+node.port+' : '+err);
+                }
+            });
+
+            server.listen(node.port, function(err) {
+                if (err) {
+                    node.error('unable to listen on port '+node.port+' : '+err);
+                } else {
+                    node.log('listening on port '+node.port);
+                    node.on('close', function() {
+                        for (var c in connectedSockets) {
+                            connectedSockets[c].end();
+                            connectedSockets[c].unref();
+                        }
+                        server.close();
+                        node.log('stopped listening on port '+node.port);
+                    });
+                }
+            });
+        }
+    }
+    RED.nodes.registerType("tcp out",TcpOut);
+
+    function TcpGet(n) {
+        RED.nodes.createNode(this,n);
+        this.server = n.server;
+        this.port = Number(n.port);
+        this.out = n.out;
+        this.splitc = n.splitc;
+
+        if (this.out != "char") { this.splitc = Number(this.splitc); }
+        else { this.splitc.replace("\\n","\n").replace("\\r","\r").replace("\\t","\t").replace("\\e","\e").replace("\\f","\f").replace("\\0","\0"); }
+
+        var buf;
+        if (this.out == "count") { buf = new Buffer(this.splitc); }
+        else { buf = new Buffer(32768); } // set it to 32k... hopefully big enough for most.... but only hopefully
+
+        this.connected = false;
+        var node = this;
+        var client;
+
+        this.on("input", function(msg) {
+            var i = 0;
+            if ((!Buffer.isBuffer(msg.payload)) && (typeof msg.payload !== "string")) {
+                msg.payload = msg.payload.toString();
+            }
+            if (!node.connected) {
+                client = net.Socket();
+                client.setTimeout(socketTimeout);
+                node.status({});
+                var host = node.server || msg.host;
+                var port = node.port || msg.port;
+                if (host && port) {
+                    client.connect(port, host, function() {
+                        //node.log('client connected');
+                        node.status({fill:"green",shape:"dot",text:"connected"});
+                        node.connected = true;
+                        client.write(msg.payload);
+                    });
+                }
+                else {
+                    node.warn("Host and/or port not set");
+                }
+
+                client.on('data', function(data) {
+                    //node.log("data:"+ data.length+":"+ data);
+                    if (node.splitc === 0) {
+                        node.send({"payload": data});
+                    }
+                    else if (node.out === "sit") { // if we are staying connected just send the buffer
+                        node.send({"payload": data});
+                    }
+                    else {
+                        for (var j = 0; j < data.length; j++ ) {
+                            if (node.out === "time")  {
+                                // do the timer thing
+                                if (node.tout) {
+                                    i += 1;
+                                    buf[i] = data[j];
+                                }
+                                else {
+                                    node.tout = setTimeout(function () {
+                                        node.tout = null;
+                                        var m = new Buffer(i+1);
+                                        buf.copy(m,0,0,i+1);
+                                        node.send({"payload": m});
+                                        client.end();
+                                        m = null;
+                                    }, node.splitc);
+                                    i = 0;
+                                    buf[0] = data[j];
+                                }
+                            }
+                            // count bytes into a buffer...
+                            else if (node.out == "count") {
+                                buf[i] = data[j];
+                                i += 1;
+                                if ( i >= node.serialConfig.count) {
+                                    node.send({"payload": buf});
+                                    client.end();
+                                    i = 0;
+                                }
+                            }
+                            // look for a char
+                            else {
+                                buf[i] = data[j];
+                                i += 1;
+                                if (data[j] == node.splitc) {
+                                    var m = new Buffer(i);
+                                    buf.copy(m,0,0,i);
+                                    node.send({"payload": m});
+                                    client.end();
+                                    m = null;
+                                    i = 0;
+                                }
+                            }
+                        }
+                    }
+                });
+
+                client.on('end', function() {
+                    //node.log('client disconnected');
+                    node.connected = false;
+                    node.status({});
+                    client = null;
+                });
+
+                client.on('close', function() {
+                    if (node.done) { node.done(); }
+                });
+
+                client.on('error', function() {
+                    node.log('connect failed');
+                    node.status({fill:"red",shape:"ring",text:"error"});
+                    if (client) { client.end(); }
+                });
+
+                client.on('timeout',function() {
+                    node.log('connect timeout');
+                    if (client) {
+                        client.end();
+                        setTimeout(function() {
+                            client.connect(port, host, function() {
+                                //node.log('client connected');
+                                node.connected = true;
+                                client.write(msg.payload);
+                            });
+                        },reconnectTime);
+                    }
+                });
+            }
+            else { client.write(msg.payload); }
+        });
+
+        this.on("close", function(done) {
+            node.done = done;
+            if (client) {
+                buf = null;
+                client.end();
+            }
+            if (!node.connected) { done(); }
+        });
+
+    }
+    RED.nodes.registerType("tcp request",TcpGet);
+}

nodes/core/io/32-udp.html

@@ -17,7 +17,7 @@
 <!--  The Input Node  -->
 <script type="text/x-red" data-template-name="udp in">
     <div class="form-row">
-        <label for="node-input-port"><i class="icon-inbox"></i> Listen</label>
+        <label for="node-input-port"><i class="fa fa-sign-in"></i> Listen</label>
         on port <input type="text" id="node-input-port" placeholder="Port" style="width: 45px">
         for <select id="node-input-multicast" style='width:40%'>
           <option value="false">udp messages</option>
@@ -25,15 +25,15 @@
         </select>
     </div>
     <div class="form-row node-input-group">
-        <label for="node-input-group"><i class="icon-list"></i> Group</label>
+        <label for="node-input-group"><i class="fa fa-list"></i> Group</label>
         <input type="text" id="node-input-group" placeholder="225.0.18.83">
     </div>
     <div class="form-row node-input-iface">
-        <label for="node-input-iface"><i class="icon-random"></i> Interface</label>
-        <input type="text" id="node-input-iface" placeholder="eth0">
+        <label for="node-input-iface"><i class="fa fa-random"></i> Interface</label>
+        <input type="text" id="node-input-iface" placeholder="(optional) ip address of eth0">
     </div>
     <div class="form-row">
-        <label for="node-input-datatype"><i class="icon-file"></i> Output</label>
+        <label for="node-input-datatype"><i class="fa fa-sign-out"></i> Output</label>
         <select id="node-input-datatype" style="width: 70%;">
             <option value="buffer">a Buffer</option>
             <option value="utf8">a String</option>
@@ -41,7 +41,7 @@
         </select>
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-tips">Tip: Make sure your firewall will allow the data in.</div>
@@ -62,7 +62,7 @@
 
 <script type="text/x-red" data-help-name="udp in">
     <p>A udp input node, that produces a <b>msg.payload</b> containing a <i>BUFFER</i>, string, or base64 encoded string. Supports multicast.</p>
-    <p>It also provides <b>msg.ip</b> and <b>msg.port</b> to the ip address and port from which the message was received.</b>
+    <p>It also provides <b>msg.ip</b> and <b>msg.port</b> to the ip address and port from which the message was received.</p>
     <p>On some systems you may need to be root to use ports below 1024 and/or broadcast.</p>
 </script>
 
@@ -72,7 +72,6 @@
         color:"Silver",
         defaults: {
             name: {value:""},
-            host: {value:""},
             iface: {value:""},
             port: {value:"",required:true,validate:RED.validators.number()},
             datatype: {value:"buffer",required:true},
@@ -98,44 +97,51 @@
 <!--  The Output Node  -->
 <script type="text/x-red" data-template-name="udp out">
     <div class="form-row">
-        <label for="node-input-port"><i class="icon-envelope"></i> Send a</label>
+        <label for="node-input-port"><i class="fa fa-envelope"></i> Send a</label>
         <select id="node-input-multicast" style='width:40%'>
           <option value="false">udp message</option>
           <option value="broad">broadcast message</option>
           <option value="multi">multicast message</option>
         </select>
-        to port <input type="text" id="node-input-port" placeholder="Port" style="width: 45px">
+        to port <input type="text" id="node-input-port" placeholder="port" style="width: 70px">
     </div>
     <div class="form-row node-input-addr">
-        <label for="node-input-addr" id="node-input-addr-label"><i class="icon-list"></i> Address</label>
+        <label for="node-input-addr" id="node-input-addr-label"><i class="fa fa-list"></i> Address</label>
         <input type="text" id="node-input-addr" placeholder="destination ip" style="width: 70%;">
     </div>
     <div class="form-row node-input-iface">
-        <label for="node-input-iface"><i class="icon-random"></i> Interface</label>
-        <input type="text" id="node-input-iface" placeholder="eth0">
+        <label for="node-input-iface"><i class="fa fa-random"></i> Interface</label>
+        <input type="text" id="node-input-iface" placeholder="(optional) ip address of eth0">
+    </div>
+    <div class="form-row">
+        <label for="node-input-outport-type">&nbsp;</label>
+        <select id="node-input-outport-type">
+          <option id="node-input-outport-type-random" value="random">use random local port</option>
+          <option value="fixed">bind to local port</option>
+        </select>
+        <input type="text" id="node-input-outport"  style="width: 70px;" placeholder="port">
     </div>
     <div class="form-row">
         <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-base64" placeholder="base64" style="display: inline-block; width: auto; vertical-align: top;">
+        <input type="checkbox" id="node-input-base64" style="display: inline-block; width: auto; vertical-align: top;">
         <label for="node-input-base64" style="width: 70%;">Decode Base64 encoded payload ?</label>
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-tips">Tip: leave address and port blank if you want to set using <b>msg.ip</b> and <b>msg.port</b>.</div>
     <script>
         $("#node-input-multicast").change(function() {
             var id = $("#node-input-multicast option:selected").val();
-            console.log(id,$("#node-input-addr")[0].placeholder);
             if (id !== "multi") {
                 $(".node-input-iface").hide();
-                $("#node-input-addr-label").html('<i class="icon-list"></i> Address');
+                $("#node-input-addr-label").html('<i class="fa fa-list"></i> Address');
                 $("#node-input-addr")[0].placeholder = 'destination ip';
             }
             else {
                 $(".node-input-iface").show();
-                $("#node-input-addr-label").html('<i class="icon-list"></i> Group');
+                $("#node-input-addr-label").html('<i class="fa fa-list"></i> Group');
                 $("#node-input-addr")[0].placeholder = '225.0.18.83';
             }
             if (id === "broad") {
@@ -161,6 +167,7 @@
             addr: {value:""},
             iface: {value:""},
             port: {value:""},
+            outport: {value:""},
             base64: {value:false,required:true},
             multicast: {value:"false"}
         },
@@ -173,6 +180,33 @@
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            var type = this.outport==""?"random":"fixed";
+            $("#node-input-outport-type option").filter(function() {
+                return $(this).val() == type;
+            }).attr('selected',true);
+
+            $("#node-input-outport-type").change(function() {
+                var type = $(this).children("option:selected").val();
+                if (type == "random") {
+                    $("#node-input-outport").val("").hide();
+                } else {
+                    $("#node-input-outport").show();
+                }
+            });
+
+            $("#node-input-outport-type").change();
+
+            $("#node-input-multicast").change(function() {
+                var type = $(this).children("option:selected").val();
+                if (type == "false") {
+                    $("#node-input-outport-type-random").html("bind to random local port");
+                } else {
+                    $("#node-input-outport-type-random").html("bind to target port");
+                }
+            });
+            $("#node-input-multicast").change();
         }
     });
 </script>

nodes/core/io/32-udp.js

@@ -0,0 +1,173 @@
+/**
+ * Copyright 2013 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var dgram = require('dgram');
+
+    // The Input Node
+    function UDPin(n) {
+        RED.nodes.createNode(this,n);
+        this.group = n.group;
+        this.port = n.port;
+        this.datatype = n.datatype;
+        this.iface = n.iface || null;
+        this.multicast = n.multicast;
+        var node = this;
+
+        var server = dgram.createSocket('udp4');
+
+        server.on("error", function (err) {
+            if ((err.code == "EACCES") && (node.port < 1024)) {
+                node.error("UDP access error, you may need root access for ports below 1024");
+            } else {
+                node.error("UDP error : "+err.code);
+            }
+            server.close();
+        });
+
+        server.on('message', function (message, remote) {
+            var msg;
+            if (node.datatype =="base64") {
+                msg = { payload:message.toString('base64'), fromip:remote.address+':'+remote.port, ip:remote.address, port:remote.port };
+            } else if (node.datatype =="utf8") {
+                msg = { payload:message.toString('utf8'), fromip:remote.address+':'+remote.port, ip:remote.address, port:remote.port };
+            } else {
+                msg = { payload:message, fromip:remote.address+':'+remote.port, ip:remote.address, port:remote.port };
+            }
+            node.send(msg);
+        });
+
+        server.on('listening', function () {
+            var address = server.address();
+            node.log('udp listener at ' + address.address + ":" + address.port);
+            if (node.multicast == "true") {
+                server.setBroadcast(true);
+                try {
+                    server.setMulticastTTL(128);
+                    server.addMembership(node.group,node.iface);
+                    node.log("udp multicast group "+node.group);
+                } catch (e) {
+                    if (e.errno == "EINVAL") {
+                        node.error("Bad Multicast Address");
+                    } else if (e.errno == "ENODEV") {
+                        node.error("Must be ip address of the required interface");
+                    } else {
+                        node.error("Error :"+e.errno);
+                    }
+                }
+            }
+        });
+
+        node.on("close", function() {
+            try {
+                server.close();
+                node.log('udp listener stopped');
+            } catch (err) {
+                node.error(err);
+            }
+        });
+
+        // Hack for when you have both in and out udp nodes sharing a port
+        //   if udp in starts last it shares better - so give it a chance to be last
+        setTimeout( function() { server.bind(node.port,node.iface); }, 250);;
+    }
+    RED.nodes.registerType("udp in",UDPin);
+
+
+    // The Output Node
+    function UDPout(n) {
+        RED.nodes.createNode(this,n);
+        //this.group = n.group;
+        this.port = n.port;
+        this.outport = n.outport||"";
+        this.base64 = n.base64;
+        this.addr = n.addr;
+        this.iface = n.iface || null;
+        this.multicast = n.multicast;
+        var node = this;
+
+        var sock = dgram.createSocket('udp4');  // only use ipv4 for now
+
+        if (node.multicast != "false") {
+            if (node.outport == "") { node.outport = node.port; }
+            sock.bind(node.outport, function() {    // have to bind before you can enable broadcast...
+                sock.setBroadcast(true);            // turn on broadcast
+                if (node.multicast == "multi") {
+                    try {
+                        sock.setMulticastTTL(128);
+                        sock.addMembership(node.addr,node.iface);   // Add to the multicast group
+                        node.log('udp multicast ready : '+node.outport+' -> '+node.addr+":"+node.port);
+                    } catch (e) {
+                        if (e.errno == "EINVAL") {
+                            node.error("Bad Multicast Address");
+                        } else if (e.errno == "ENODEV") {
+                            node.error("Must be ip address of the required interface");
+                        } else {
+                            node.error("Error :"+e.errno);
+                        }
+                    }
+                } else {
+                    node.log('udp broadcast ready : '+node.outport+' -> '+node.addr+":"+node.port);
+                }
+            });
+        } else if (node.outport != "") {
+            sock.bind(node.outport);
+            node.log('udp ready : '+node.outport+' -> '+node.addr+":"+node.port);
+        } else {
+            node.log('udp ready : '+node.addr+":"+node.port);
+        }
+
+        node.on("input", function(msg) {
+            if (msg.payload != null) {
+                var add = node.addr || msg.ip || "";
+                var por = node.port || msg.port || 0;
+                if (add == "") {
+                    node.warn("udp: ip address not set");
+                } else if (por == 0) {
+                    node.warn("udp: port not set");
+                } else if (isNaN(por) || (por < 1) || (por > 65535)) {
+                    node.warn("udp: port number not valid");
+                } else {
+                    var message;
+                    if (node.base64) {
+                        message = new Buffer(msg.payload, 'base64');
+                    } else if (msg.payload instanceof Buffer) {
+                        message = msg.payload;
+                    } else {
+                        message = new Buffer(""+msg.payload);
+                    }
+                    sock.send(message, 0, message.length, por, add, function(err, bytes) {
+                        if (err) {
+                            node.error("udp : "+err);
+                        }
+                        message = null;
+                    });
+                }
+            }
+        });
+
+        node.on("close", function() {
+            try {
+                sock.close();
+                node.log('udp output stopped');
+            } catch (err) {
+                node.error(err);
+            }
+        });
+    }
+    RED.nodes.registerType("udp out",UDPout);
+}

nodes/core/io/lib/mqtt.js

@@ -0,0 +1,254 @@
+/**
+ * Copyright 2013 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+var util = require("util");
+var mqtt = require("mqtt");
+var events = require("events");
+//var inspect = require("sys").inspect;
+
+//var Client = module.exports.Client = function(
+
+var port = 1883;
+var host = "localhost";
+
+function MQTTClient(port,host) {
+   this.port = port||1883;
+   this.host = host||"localhost";
+   this.messageId = 1;
+   this.pendingSubscriptions = {};
+   this.inboundMessages = {};
+   this.lastOutbound = (new Date()).getTime();
+   this.lastInbound = (new Date()).getTime();
+   this.connected = false;
+
+   this._nextMessageId = function() {
+      this.messageId += 1;
+      if (this.messageId > 0xFFFF) {
+         this.messageId = 1;
+      }
+      return this.messageId;
+   }
+   events.EventEmitter.call(this);
+}
+util.inherits(MQTTClient, events.EventEmitter);
+
+MQTTClient.prototype.connect = function(options) {
+   if (!this.connected) {
+       var self = this;
+       options = options||{};
+       self.options = options;
+       self.options.keepalive = options.keepalive||15;
+       self.options.clean = self.options.clean||true;
+       self.options.protocolId = 'MQIsdp';
+       self.options.protocolVersion = 3;
+
+       self.client = mqtt.createConnection(this.port,this.host,function(err,client) {
+             if (err) {
+                self.connected = false;
+                clearInterval(self.watchdog);
+                self.connectionError = true;
+                //util.log('[mqtt] ['+self.uid+'] connection error 1 : '+inspect(err));
+                self.emit('connectionlost',err);
+                return;
+             }
+             client.on('close',function(e) {
+                   //util.log('[mqtt] ['+self.uid+'] on close');
+                   clearInterval(self.watchdog);
+                   if (!self.connectionError) {
+                       if (self.connected) {
+                          self.connected = false;
+                          self.emit('connectionlost',e);
+                       } else {
+                          self.emit('disconnect');
+                       }
+                   }
+             });
+             client.on('error',function(e) {
+                   //util.log('[mqtt] ['+self.uid+'] on error : '+inspect(e));
+                   clearInterval(self.watchdog);
+                   if (self.connected) {
+                      self.connected = false;
+                      self.emit('connectionlost',e);
+                   }
+             });
+             client.on('connack',function(packet) {
+                   if (packet.returnCode == 0) {
+                      self.watchdog = setInterval(function(self) {
+                            var now = (new Date()).getTime();
+
+                            //util.log('[mqtt] ['+self.uid+'] watchdog '+inspect({connected:self.connected,connectionError:self.connectionError,pingOutstanding:self.pingOutstanding,now:now,lastOutbound:self.lastOutbound,lastInbound:self.lastInbound}));
+
+                            if (now - self.lastOutbound > self.options.keepalive*500 || now - self.lastInbound > self.options.keepalive*500) {
+                               if (self.pingOutstanding) {
+                                  //util.log('[mqtt] ['+self.uid+'] watchdog pingOustanding - disconnect');
+                                  try {
+                                     self.client.disconnect();
+                                  } catch (err) {
+                                  }
+                               } else {
+                                  //util.log('[mqtt] ['+self.uid+'] watchdog pinging');
+                                  self.lastOutbound = (new Date()).getTime();
+                                  self.lastInbound = (new Date()).getTime();
+                                  self.pingOutstanding = true;
+                                  self.client.pingreq();
+                               }
+                            }
+
+                      },self.options.keepalive*500,self);
+                      self.pingOutstanding = false;
+                      self.lastInbound = (new Date()).getTime()
+                      self.lastOutbound = (new Date()).getTime()
+                      self.connected = true;
+                      self.connectionError = false;
+                      self.emit('connect');
+                   } else {
+                      self.connected = false;
+                      self.emit('connectionlost');
+                   }
+             });
+             client.on('suback',function(packet) {
+                   self.lastInbound = (new Date()).getTime()
+                   var topic = self.pendingSubscriptions[packet.messageId];
+                   self.emit('subscribe',topic,packet.granted[0]);
+                   delete self.pendingSubscriptions[packet.messageId];
+             });
+             client.on('unsuback',function(packet) {
+                   self.lastInbound = (new Date()).getTime()
+                   var topic = self.pendingSubscriptions[packet.messageId];
+                   self.emit('unsubscribe',topic,packet.granted[0]);
+                   delete self.pendingSubscriptions[packet.messageId];
+             });
+             client.on('publish',function(packet) {
+                   self.lastInbound = (new Date()).getTime();
+                   if (packet.qos < 2) {
+                      var p = packet;
+                      self.emit('message',p.topic,p.payload,p.qos,p.retain);
+                   } else {
+                      self.inboundMessages[packet.messageId] = packet;
+                      this.lastOutbound = (new Date()).getTime()
+                      self.client.pubrec(packet);
+                   }
+                   if (packet.qos == 1) {
+                      this.lastOutbound = (new Date()).getTime()
+                      self.client.puback(packet);
+                   }
+             });
+
+             client.on('pubrel',function(packet) {
+                   self.lastInbound = (new Date()).getTime()
+                   var p = self.inboundMessages[packet.messageId];
+                   if (p) {
+                       self.emit('message',p.topic,p.payload,p.qos,p.retain);
+                       delete self.inboundMessages[packet.messageId];
+                   }
+                   self.lastOutbound = (new Date()).getTime()
+                   self.client.pubcomp(packet);
+             });
+
+             client.on('puback',function(packet) {
+                   self.lastInbound = (new Date()).getTime()
+                   // outbound qos-1 complete
+             });
+
+             client.on('pubrec',function(packet) {
+                   self.lastInbound = (new Date()).getTime()
+                   self.lastOutbound = (new Date()).getTime()
+                   self.client.pubrel(packet);
+             });
+             client.on('pubcomp',function(packet) {
+                   self.lastInbound = (new Date()).getTime()
+                   // outbound qos-2 complete
+             });
+             client.on('pingresp',function(packet) {
+                   //util.log('[mqtt] ['+self.uid+'] received pingresp');
+                   self.lastInbound = (new Date()).getTime()
+                   self.pingOutstanding = false;
+             });
+
+             this.lastOutbound = (new Date()).getTime()
+             this.connectionError = false;
+             client.connect(self.options);
+       });
+   }
+}
+
+MQTTClient.prototype.subscribe = function(topic,qos) {
+   var self = this;
+   if (self.connected) {
+      var options = {
+         subscriptions:[{topic:topic,qos:qos}],
+         messageId: self._nextMessageId()
+      };
+      this.pendingSubscriptions[options.messageId] = topic;
+      this.lastOutbound = (new Date()).getTime();
+      self.client.subscribe(options);
+      self.client.setPacketEncoding('binary');
+   }
+}
+MQTTClient.prototype.unsubscribe = function(topic) {
+   var self = this;
+   if (self.connected) {
+      var options = {
+         topic:topic,
+         messageId: self._nextMessageId()
+      };
+      this.pendingSubscriptions[options.messageId] = topic;
+      this.lastOutbound = (new Date()).getTime()
+      self.client.unsubscribe(options);
+   }
+}
+
+MQTTClient.prototype.publish = function(topic,payload,qos,retain) {
+   var self = this;
+   if (self.connected) {
+
+      if (!Buffer.isBuffer(payload)) {
+         if (typeof payload === "object") {
+            payload = JSON.stringify(payload);
+         } else if (typeof payload !== "string") {
+            payload = ""+payload;
+         }
+      }
+      var options = {
+         topic: topic,
+         payload: payload,
+         qos: qos||0,
+         retain:retain||false
+      };
+      if (options.qos != 0) {
+         options.messageId = self._nextMessageId();
+      }
+      this.lastOutbound = (new Date()).getTime()
+      self.client.publish(options);
+   }
+}
+
+MQTTClient.prototype.disconnect = function() {
+   var self = this;
+   if (this.connected) {
+       this.connected = false;
+       try {
+           this.client.disconnect();
+       } catch(err) {
+       }
+   }
+}
+MQTTClient.prototype.isConnected = function() {
+    return this.connected;
+}
+module.exports.createClient = function(port,host) {
+   var mqtt_client = new MQTTClient(port,host);
+   return mqtt_client;
+}

nodes/core/io/lib/mqttConnectionPool.js

@@ -15,22 +15,32 @@
  **/
 var util = require("util");
 var mqtt = require("./mqtt");
-var settings = require("../../../red/red").settings;
+var settings = require(process.env.NODE_RED_HOME+"/red/red").settings;
 
 var connections = {};
 
-function matchTopic(ts,t) { 
-    var re = new RegExp("^"+ts.replace(/([\[\]\?\(\)\\\\$\^\*\.|])/g,"\\$1").replace(/\+/g,"[^/]+").replace(/#$/,".*"));
+function matchTopic(ts,t) {
+    if (ts == "#") {
+        return true;
+    }
+    var re = new RegExp("^"+ts.replace(/([\[\]\?\(\)\\\\$\^\*\.|])/g,"\\$1").replace(/\+/g,"[^/]+").replace(/\/#$/,"(\/.*)?")+"$");
     return re.test(t);
 }
 
 module.exports = {
-    get: function(broker,port) {
-        var id = broker+":"+port;
+    get: function(broker,port,clientid,username,password,will) {
+        var id = "["+(username||"")+":"+(password||"")+"]["+(clientid||"")+"]@"+broker+":"+port;
         if (!connections[id]) {
             connections[id] = function() {
+                var uid = (1+Math.random()*4294967295).toString(16);
                 var client = mqtt.createClient(port,broker);
-                var options = {keepalive:15,clientId:'mqtt_' + (1+Math.random()*4294967295).toString(16)};
+                client.uid = uid;
+                client.setMaxListeners(0);
+                var options = {keepalive:15};
+                options.clientId = clientid || 'mqtt_' + (1+Math.random()*4294967295).toString(16);
+                options.username = username;
+                options.password = password;
+                options.will = will;
                 var queue = [];
                 var subscriptions = [];
                 var connecting = false;
@@ -65,7 +75,7 @@ module.exports = {
                         client.once(a,b);
                     },
                     connect: function() {
-                        if (!client.isConnected() && !connecting) {
+                        if (client && !client.isConnected() && !connecting) {
                             connecting = true;
                             client.connect(options);
                         }
@@ -80,33 +90,33 @@ module.exports = {
                     }
                 };
                 client.on('connect',function() {
-                        
-                        util.log('[mqtt] connected to broker tcp://'+broker+':'+port);
-
-                        connecting = false;
-                        for (var s in subscriptions) {
-                            var topic = subscriptions[s].topic;
-                            var qos = subscriptions[s].qos;
-                            var callback = subscriptions[s].callback;
-                            client.subscribe(topic,qos);
-                        }
-                        //console.log("connected - publishing",queue.length,"messages");
-                        while(queue.length) {
-                            var msg = queue.shift();
-                            //console.log(msg);
-                            client.publish(msg.topic,msg.payload,msg.qos,msg.retain);
+                        if (client) {
+                            util.log('[mqtt] ['+uid+'] connected to broker tcp://'+broker+':'+port);
+                            connecting = false;
+                            for (var s in subscriptions) {
+                                var topic = subscriptions[s].topic;
+                                var qos = subscriptions[s].qos;
+                                var callback = subscriptions[s].callback;
+                                client.subscribe(topic,qos);
+                            }
+                            //console.log("connected - publishing",queue.length,"messages");
+                            while(queue.length) {
+                                var msg = queue.shift();
+                                //console.log(msg);
+                                client.publish(msg.topic,msg.payload,msg.qos,msg.retain);
+                            }
                         }
                 });
                 client.on('connectionlost', function(err) {
-                        util.log('[mqtt] connection lost to broker tcp://'+broker+':'+port);
+                        util.log('[mqtt] ['+uid+'] connection lost to broker tcp://'+broker+':'+port);
+                        connecting = false;
                         setTimeout(function() {
-                                if (client) {
-                                    client.connect(options);
-                                }
+                            obj.connect();
                         }, settings.mqttReconnectTime||5000);
                 });
                 client.on('disconnect', function() {
-                        util.log('[mqtt] disconnected from broker tcp://'+broker+':'+port);
+                        connecting = false;
+                        util.log('[mqtt] ['+uid+'] disconnected from broker tcp://'+broker+':'+port);
                 });
 
                 return obj
@@ -116,4 +126,3 @@ module.exports = {
         return connections[id];
     }
 };
-

nodes/core/logic/10-switch.html

@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013 IBM Corp.
+  Copyright 2013, 2015 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -16,47 +16,55 @@
 
 <script type="text/x-red" data-template-name="switch">
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
-    <div class="form-row" style="padding-top:10px;">
+    <div class="form-row">
         If msg.<input type="text" id="node-input-property" style="width: 200px;"/>
     </div>
-    <div class="form-row">
-        <div id="node-input-rule-container-div" style="border-radius: 5px; height: 310px; padding: 5px; border: 1px solid #ccc; overflow-y:scroll;">
-        <ol id="node-input-rule-container" style=" list-style-type:none; margin: 0;">
-        </ol>
+    <div class="form-row node-input-rule-container-row" style="margin-bottom: 0px;">
+        <div id="node-input-rule-container-div" style="box-sizing: border-box; border-radius: 5px; height: 310px; padding: 5px; border: 1px solid #ccc; overflow-y:scroll;">
+            <ol id="node-input-rule-container" style=" list-style-type:none; margin: 0;"></ol>
         </div>
-        <a href="#" class="btn btn-mini" id="node-input-add-rule" style="margin-top: 4px;"><i class="icon-plus"></i> Add</a>
     </div>
-    
+    <div class="form-row">
+        <a href="#" class="btn btn-mini" id="node-input-add-rule" style="margin-top: 4px;"><i class="fa fa-plus"></i> rule</a>
+    </div>
+    <div class="form-row">
+        <select id="node-input-checkall" style="width:100%; margin-right:5px;">
+            <option value="true">checking all rules</option>
+            <option value="false">stopping after first match</option>
+        </select>
+    </div>
 </script>
 
 <script type="text/x-red" data-help-name="switch">
-	<p>A simple function node to route messages based on its properties.</p>
-	<p>When a message arrives, the selected property is evaluated against each
-	of the defined rules. The message is then sent to the output of <i>all</i>
-	rules that pass.</p>
+    <p>A simple function node to route messages based on its properties.</p>
+    <p>When a message arrives, the selected property is evaluated against each
+    of the defined rules. The message is then sent to the output of <i>all</i>
+    rules that pass.</p>
+    <p>Note: the <i>otherwise</i> rule applies as a "not any of" the rules preceding it.</p>
 </script>
 
 <script type="text/javascript">
-    RED.nodes.registerType('switch',{
-        color:"#E2D96E",
+    RED.nodes.registerType('switch', {
+        color: "#E2D96E",
         category: 'function',
         defaults: {
             name: {value:""},
-            property: {value: "payload",required:true},
-            rules:{value:[{t:"eq",v:""}]},
-            outputs:{value:1}
+            property: {value:"payload", required:true},
+            rules: {value:[{t:"eq", v:""}]},
+            checkall: {value:"true", required:true},
+            outputs: {value:1}
         },
-        inputs:1,
-        outputs:1,
+        inputs: 1,
+        outputs: 1,
         icon: "switch.png",
         label: function() {
-            return this.name;
+            return this.name||"switch";
         },
         oneditprepare: function() {
-        
+
             var operators = [
                 {v:"eq",t:"=="},
                 {v:"neq",t:"!="},
@@ -70,30 +78,33 @@
                 {v:"true",t:"is true"},
                 {v:"false",t:"is false"},
                 {v:"null",t:"is null"},
-                {v:"nnull",t:"is not null"}
+                {v:"nnull",t:"is not null"},
+                {v:"else",t:"otherwise"}
             ];
-            
+
             function generateRule(i,rule) {
-                var container = $('<li/>',{style:"margin:0; padding:8px 0px; border-bottom: 1px solid #ccc;"});
+                var container = $('<li/>',{style:"background: #fff; margin:0; padding:8px 0px; border-bottom: 1px solid #ccc;"});
                 var row = $('<div/>').appendTo(container);
                 var row2 = $('<div/>',{style:"padding-top: 5px; text-align: right;"}).appendTo(container);
-                
+                $('<i style="color: #eee; cursor: move;" class="node-input-rule-handle fa fa-bars"></i>').appendTo(row);
+
                 var selectField = $('<select/>',{style:"width:120px; margin-left: 5px; text-align: center;"}).appendTo(row);
                 for (var d in operators) {
                     selectField.append($("<option></option>").val(operators[d].v).text(operators[d].t));
                 }
-                
+
                 var valueField = $('<input/>',{class:"node-input-rule-value",type:"text",style:"margin-left: 5px; width: 145px;"}).appendTo(row);
-                
                 var btwnField = $('<span/>').appendTo(row);
                 var btwnValueField = $('<input/>',{class:"node-input-rule-btwn-value",type:"text",style:"margin-left: 5px; width: 50px;"}).appendTo(btwnField);
                 btwnField.append(" and ");
                 var btwnValue2Field = $('<input/>',{class:"node-input-rule-btwn-value2",type:"text",style:"width: 50px;margin-left:2px;"}).appendTo(btwnField);
-                
-                 
+
                 var finalspan = $('<span/>',{style:"float: right; margin-top: 3px;margin-right: 10px;"}).appendTo(row);
-                finalspan.append(' send to <span class="node-input-rule-index">'+i+'</span> ');
-                
+                finalspan.append(' &#8594; <span class="node-input-rule-index">'+i+'</span> ');
+
+                var deleteButton = $('<a/>',{href:"#",class:"btn btn-mini", style:"margin-left: 5px;"}).appendTo(finalspan);
+                $('<i/>',{class:"fa fa-remove"}).appendTo(deleteButton);
+
                 selectField.change(function() {
                     var type = selectField.children("option:selected").val();
                     if (type.length < 4) {
@@ -108,17 +119,15 @@
                         btwnField.show();
                     } else {
                         btwnField.hide();
-                        if (type === "true" || type === "false" || type === "null" || type === "nnull") {
+                        if (type === "true" || type === "false" || type === "null" || type === "nnull" || type === "else") {
                             valueField.hide();
                         } else {
                             valueField.show();
                         }
                     }
                 });
-                
-                var deleteButton = $('<a/>',{href:"#",class:"btn btn-mini", style:"margin-left: 5px;"}).appendTo(finalspan);
-                $('<i/>',{class:"icon-remove"}).appendTo(deleteButton);
-                
+
+
                 deleteButton.click(function() {
                     container.css({"background":"#fee"});
                     container.fadeOut(300, function() {
@@ -126,43 +135,63 @@
                         $("#node-input-rule-container").children().each(function(i) {
                             $(this).find(".node-input-rule-index").html(i+1);
                         });
-                    
+
                     });
                 });
-                
+
                 $("#node-input-rule-container").append(container);
-                
+
                 selectField.find("option").filter(function() {return $(this).val() == rule.t;}).attr('selected',true);
                 if (rule.t == "btwn") {
                     btwnValueField.val(rule.v);
                     btwnValue2Field.val(rule.v2);
-                } else if (rule.v) {
+                } else if (typeof rule.v != "undefined") {
                     valueField.val(rule.v);
                 }
                 selectField.change();
-                
             }
-            
+
             $("#node-input-add-rule").click(function() {
                 generateRule($("#node-input-rule-container").children().length+1,{t:"",v:"",v2:""});
                 $("#node-input-rule-container-div").scrollTop($("#node-input-rule-container-div").get(0).scrollHeight);
-                
             });
-            
+
             for (var i=0;i<this.rules.length;i++) {
                 var rule = this.rules[i];
                 generateRule(i+1,rule);
             }
-            
-            function switchDialogResize(ev,ui) {
-                $("#node-input-rule-container-div").css("height",(ui.size.height-260)+"px");
+
+            function switchDialogResize() {
+                var rows = $("#dialog-form>div:not(.node-input-rule-container-row)");
+                var height = $("#dialog-form").height();
+                for (var i=0;i<rows.size();i++) {
+                    height -= $(rows[i]).outerHeight(true);
+                }
+                var editorRow = $("#dialog-form>div.node-input-rule-container-row");
+                height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+                $("#node-input-rule-container-div").css("height",height+"px");
             };
+            
+            $( "#node-input-rule-container" ).sortable({
+                axis: "y",
+                update: function( event, ui ) {
+                    var rules = $("#node-input-rule-container").children();
+                    rules.each(function(i) {
+                        $(this).find(".node-input-rule-index").html(i+1);
+                    });
+                },
+                handle:".node-input-rule-handle",
+                cursor: "move"
+            });
+            $( "#node-input-rule-container .node-input-rule-handle" ).disableSelection();
 
             $( "#dialog" ).on("dialogresize", switchDialogResize);
             $( "#dialog" ).one("dialogopen", function(ev) {
                 var size = $( "#dialog" ).dialog('option','sizeCache-switch');
                 if (size) {
-                    switchDialogResize(null,{size:size});
+                    $("#dialog").dialog('option','width',size.width);
+                    $("#dialog").dialog('option','height',size.height);
+                    switchDialogResize();
                 }
             });
             $( "#dialog" ).one("dialogclose", function(ev,ui) {
@@ -172,15 +201,13 @@
         oneditsave: function() {
             var rules = $("#node-input-rule-container").children();
             var ruleset;
-            
             var node = this;
             node.rules= [];
-            
             rules.each(function(i) {
                 var rule = $(this);
                 var type = rule.find("select option:selected").val();
                 var r = {t:type};
-                if (!(type === "true" || type === "false" || type === "null" || type === "nnull")) {
+                if (!(type === "true" || type === "false" || type === "null" || type === "nnull" || type === "else")) {
                     if (type === "btwn") {
                         r.v = rule.find(".node-input-rule-btwn-value").val();
                         r.v2 = rule.find(".node-input-rule-btwn-value2").val();
@@ -189,11 +216,8 @@
                     }
                 }
                 node.rules.push(r);
-                
             });
-            
             node.outputs = node.rules.length;
-        
         }
     });
 </script>

nodes/core/logic/10-switch.js

@@ -0,0 +1,78 @@
+/**
+ * Copyright 2013 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var operators = {
+        'eq': function(a, b) { return a == b; },
+        'neq': function(a, b) { return a != b; },
+        'lt': function(a, b) { return a < b; },
+        'lte': function(a, b) { return a <= b; },
+        'gt': function(a, b) { return a > b; },
+        'gte': function(a, b) { return a >= b; },
+        'btwn': function(a, b, c) { return a >= b && a <= c; },
+        'cont': function(a, b) { return (a + "").indexOf(b) != -1; },
+        'regex': function(a, b) { return (a + "").match(new RegExp(b)); },
+        'true': function(a) { return a === true; },
+        'false': function(a) { return a === false; },
+        'null': function(a) { return typeof a == "undefined"; },
+        'nnull': function(a) { return typeof a != "undefined"; },
+        'else': function(a) { return a === true; }
+    };
+
+    function SwitchNode(n) {
+        RED.nodes.createNode(this, n);
+        this.rules = n.rules;
+        this.property = n.property;
+        this.checkall = n.checkall || "true";
+        var propertyParts = n.property.split(".");
+        var node = this;
+
+        for (var i=0; i<this.rules.length; i+=1) {
+            var rule = this.rules[i];
+            if (!isNaN(Number(rule.v))) {
+                rule.v = Number(rule.v);
+                rule.v2 = Number(rule.v2);
+            }
+        }
+
+        this.on('input', function (msg) {
+            var onward = [];
+            try {
+                var prop = propertyParts.reduce(function (obj, i) {
+                    return obj[i]
+                }, msg);
+                var elseflag = true;
+                for (var i=0; i<node.rules.length; i+=1) {
+                    var rule = node.rules[i];
+                    var test = prop;
+                    if (rule.t == "else") { test = elseflag; elseflag = true; }
+                    if (operators[rule.t](test,rule.v, rule.v2)) {
+                        onward.push(msg);
+                        elseflag = false;
+                        if (node.checkall == "false") { break; }
+                    } else {
+                        onward.push(null);
+                    }
+                }
+                this.send(onward);
+            } catch(err) {
+                node.warn(err);
+            }
+        });
+    }
+    RED.nodes.registerType("switch", SwitchNode);
+}

nodes/core/logic/15-change.html

@@ -0,0 +1,143 @@
+<!--
+  Copyright 2013 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="change">
+    <div>
+        <select id="node-input-action" style="width:95%; margin-right:5px;">
+            <option value="replace">Set the value of the message property</option>
+            <option value="change">Search/replace the value of the message property</option>
+            <option value="delete">Delete the message property</option>
+        </select>
+    </div>
+    <div class="form-row" style="padding-top:10px;" id="node-prop1-row">
+        <label for="node-input-property">called</label> msg.<input type="text" id="node-input-property" style="width: 63%;"/>
+    </div>
+    <div class="form-row" id="node-from-row">
+        <label for="node-input-from" id="node-input-f"></label>
+        <input type="text" id="node-input-from" placeholder="this"/>
+    </div>
+    <div class="form-row" id="node-to-row">
+        <label for="node-input-to" id="node-input-t"></label>
+        <input type="text" id="node-input-to" placeholder="that"/>
+    </div>
+    <div class="form-row" id="node-reg-row">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-reg" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-reg" style="width: 70%;">Use regular expressions</label>
+    </div>
+    <div class="form-tips" id="node-tip"></div>
+    <br/>
+    <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="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="change">
+    <p>A simple function node to set, replace or delete properties of a message.</p>
+    <p>When a message arrives, the selected property is modified by the defined rules.
+    The message is then sent to the output.</p>
+    <p><b>Note:</b> Set and replace only operate using <b>strings</b>. Anything else will be passed straight through.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('change', {
+        color: "#E2D96E",
+        category: 'function',
+        defaults: {
+            action: {value:"replace",required:true},
+            property: {value:"payload",required:true},
+            from: {value:"",validate: function(v) {
+                if (this.action === "change" && !this.from) {
+                    return false;
+                } else if (this.action === "change" && this.reg) {
+                    try {
+                        var re = new RegExp(this.from, "g");
+                        return true;
+                    } catch(err) {
+                        return false;
+                    }
+                }
+                return true;
+            }},
+            to: {value:""},
+            reg: {value:false},
+            name: {value:""}
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: "swap.png",
+        label: function() {
+            if (this.name) {
+                return this.name;
+            }
+            if (this.action === "replace") {
+                return "set msg."+this.property;
+            } else if (this.action === "change") {
+                return "replace msg."+this.property;
+            } else {
+                return this.action+" msg."+this.property
+            }
+        },
+        labelStyle: function() {
+            return this.name ? "node_label_italic" : "";
+        },
+        oneditprepare: function() {
+            if (this.reg === null) { $("#node-input-reg").prop('checked', true); }
+            $("#node-input-action").change( function() {
+                var a = $("#node-input-action").val();
+                if (a === "replace") {
+                    $("#node-input-todo").html("called");
+                    //$("#node-input-f").html("name");
+                    $("#node-input-t").html("to");
+                    $("#node-from-row").hide();
+                    $("#node-to-row").show();
+                    $("#node-reg-row").hide();
+                    $("#node-tip").show();
+                    $("#node-tip").html("Tip: expects a new property name and either a fixed value OR the full name of another message property eg: msg.sentiment.score");
+                }
+                if (a === "delete") {
+                    $("#node-input-todo").html("called");
+                    //$("#node-input-f").html("called");
+                    //$("#node-input-t").html("to");
+                    $("#node-from-row").hide();
+                    $("#node-to-row").hide();
+                    $("#node-reg-row").hide();
+                    $("#node-tip").hide();
+                }
+                if (a === "change") {
+                    $("#node-input-todo").html("called");
+                    $("#node-input-f").html("Search for");
+                    $("#node-input-t").html("replace with");
+                    $("#node-from-row").show();
+                    $("#node-to-row").show();
+                    $("#node-reg-row").show();
+                    $("#node-tip").show();
+                    $("#node-tip").html("Tip: only works on string properties. If regular expressions are used, the <i>replace with</i> field can contain capture results, eg $1.");
+                }
+                //if (a === "replace") {
+                 //   $("#node-input-todo").html("called");
+                 //   //$("#node-input-f").html("with");
+                 //   $("#node-input-t").html("with");
+                 //   $("#node-from-row").hide();
+                 //   $("#node-to-row").show();
+                 //   $("#node-tip").html("Tip: accepts either a fixed value OR the full name of another msg.property eg: msg.sentiment.score");
+                //}
+            });
+            $("#node-input-action").change();
+        }
+    });
+</script>

nodes/core/logic/15-change.js

@@ -0,0 +1,90 @@
+/**
+ * Copyright 2013 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+
+    function ChangeNode(n) {
+        RED.nodes.createNode(this, n);
+        this.action = n.action;
+        this.property = n.property || "";
+        this.from = n.from || "";
+        this.to = n.to || "";
+        this.reg = (n.reg === null || n.reg);
+        var node = this;
+        if (node.reg === false) {
+            this.from = this.from.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+        }
+
+        this.on('input', function(msg) {
+            var propertyParts;
+            var depth = 0;
+
+            if (node.action === "change") {
+                try {
+                    node.re = new RegExp(this.from, "g");
+                } catch (e) {
+                    node.error(e.message);
+                }
+            }
+
+            propertyParts = node.property.split(".");
+            try {
+                propertyParts.reduce(function(obj, i) {
+                    var to = node.to;
+                    // Set msg from property to another msg property
+                    if (node.action === "replace" && node.to.indexOf("msg.") === 0) {
+                        var parts = to.substring(4);
+                        var msgPropParts = parts.split(".");
+                        try {
+                            msgPropParts.reduce(function(ob, j) {
+                                to = (typeof ob[j] !== "undefined" ? ob[j] : undefined);
+                                return to;
+                            }, msg);
+                        } catch (err) {}
+                    }
+
+                    if (++depth === propertyParts.length) {
+                        if (node.action === "change") {
+                            if (typeof obj[i] === "string") {
+                                obj[i] = obj[i].replace(node.re, node.to);
+                            }
+                        } else if (node.action === "replace") {
+                            if (typeof to === "undefined") {
+                                delete(obj[i]);
+                            } else {
+                                obj[i] = to;
+                            }
+                        } else if (node.action === "delete") {
+                            delete(obj[i]);
+                        }
+                    } else {
+                        // to property doesn't exist, don't create empty object
+                        if (typeof to === "undefined") {
+                            return;
+                        // setting a non-existent multilevel object, create empty parent
+                        } else if (!obj[i]) {
+                            obj[i] = {};
+                        }
+                        return obj[i];
+                    }
+                }, msg);
+            } catch (err) {}
+            node.send(msg);
+        });
+    }
+    RED.nodes.registerType("change", ChangeNode);
+};

nodes/core/logic/16-range.html

@@ -0,0 +1,81 @@
+<!--
+  Copyright 2013 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="range">
+    <div class="form-row">
+        <label for="node-input-action"><i class="fa fa-dot-circle-o"></i> Action</label>
+        <select id="node-input-action" style="width:70%; margin-right:5px;">
+            <option value="scale">Scale msg.payload</option>
+            <option value="clamp">Scale and limit to the target range</option>
+            <option value="roll">Scale and wrap within the target range</option>
+        </select>
+    </div>
+    <br/>
+    <div class="form-row"><i class="fa fa-sign-in"></i> Map the input range:</div>
+    <div class="form-row"><label></label>
+        from: <input type="text" id="node-input-minin" placeholder="e.g. 0" style="width:100px;"/>
+        &nbsp;&nbsp;to: <input type="text" id="node-input-maxin" placeholder="e.g. 99" style="width:100px;"/>
+    </div>
+    <div class="form-row"><i class="fa fa-sign-out"></i> to the result range:</div>
+    <div class="form-row"><label></label>
+        from: <input type="text" id="node-input-minout" placeholder="e.g. 0" style="width:100px;"/>
+        &nbsp;&nbsp;to: <input type="text" id="node-input-maxout" placeholder="e.g. 255" style="width:100px;"/>
+    </div>
+    <br/>
+    <div class="form-row"><label></label>
+        <input type="checkbox" id="node-input-round" style="display: inline-block; width: auto; vertical-align: top;">
+        <label style="width: auto;" for="node-input-round">Round result to the nearest integer?</label></input>
+    </div>
+    <br/>
+    <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="Name">
+    </div>
+    <div class="form-tips" id="node-tip">Tip: This node ONLY works with numbers.</div>
+</script>
+
+<script type="text/x-red" data-help-name="range">
+    <p>A simple function node to remap numeric input values to another scale.</p>
+    <p>Currently only does a linear scaling.</p>
+    <p><b>Note:</b> This only operates on <b>numbers</b>. Anything else will try to be made into a number and rejected if that fails.</p>
+    <p><i>Scale and limit to target range</i> means that the result will never be outside the range specified within the result range.</p>
+    <p><i>Scale and wrap within the target range</i> means that the result will essentially be a "modulo-style" wrap-around within the result range.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('range', {
+        color: "#E2D96E",
+        category: 'function',
+        defaults: {
+            minin: {value:"",required:true,validate:RED.validators.number()},
+            maxin: {value:"",required:true,validate:RED.validators.number()},
+            minout: {value:"",required:true,validate:RED.validators.number()},
+            maxout: {value:"",required:true,validate:RED.validators.number()},
+            action: {value:"scale"},
+            round: {value:false},
+            name: {value:""}
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: "range.png",
+        label: function() {
+            return this.name || "range";
+        },
+        labelStyle: function() {
+            return this.name ? "node_label_italic" : "";
+        }
+    });
+</script>

nodes/core/logic/16-range.js

@@ -0,0 +1,48 @@
+/**
+ * Copyright 2013 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    function RangeNode(n) {
+        RED.nodes.createNode(this, n);
+        this.action = n.action;
+        this.round = n.round || false;
+        this.minin = Number(n.minin);
+        this.maxin = Number(n.maxin);
+        this.minout = Number(n.minout);
+        this.maxout = Number(n.maxout);
+        var node = this;
+
+        this.on('input', function (msg) {
+            var n = Number(msg.payload);
+            if (!isNaN(n)) {
+                if (node.action == "clamp") {
+                    if (n < node.minin) { n = node.minin; }
+                    if (n > node.maxin) { n = node.maxin; }
+                }
+                if (node.action == "roll") {
+                    if (n >= node.maxin) { n = (n - node.minin) % (node.maxin - node.minin) + node.minin; }
+                    if (n <  node.minin) { n = (n - node.minin) % (node.maxin - node.minin) + node.maxin; }
+                }
+                msg.payload = ((n - node.minin) / (node.maxin - node.minin) * (node.maxout - node.minout)) + node.minout;
+                if (node.round) { msg.payload = Math.round(msg.payload); }
+                node.send(msg);
+            }
+            else { node.log("Not a number: "+msg.payload); }
+        });
+    }
+    RED.nodes.registerType("range", RangeNode);
+}

nodes/core/parsers/70-CSV.html

@@ -0,0 +1,124 @@
+
+<!--
+  Copyright 2014 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="csv">
+    <div class="form-row">
+        <label for="node-input-temp"><i class="fa fa-list"></i> Columns</label>
+        <input type="text" id="node-input-temp" placeholder="comma-separated column names">
+    </div>
+    <div class="form-row">
+        <label for="node-input-select-sep"><i class="fa fa-text-width"></i> Separator</label>
+            <select style="width: 150px" id="node-input-select-sep">
+                <option value=",">comma</option>
+                <option value="\t">tab</option>
+                <option value=" ">space</option>
+                <option value=";">semicolon</option>
+                <option value=":">colon</option>
+                <option value="#">hashtag</option>
+                <option value="">other...</option>
+           </select>
+           <input style="width: 40px;" type="text" id="node-input-sep" pattern=".">
+    </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="Name">
+    </div>
+    <hr align="middle"/>
+    <div class="form-row">
+        <label style="width: 100%;"><i class="fa fa-gears"></i> CSV-to-Object options</label>
+        <label style="margin-left: 10px; margin-right: -10px;"><i class="fa fa-sign-in"></i> Input</label>
+        <input style="width: 30px" type="checkbox" id="node-input-hdrin"><label style="width: auto;" for="node-input-hdrin">first row contains column names</span>
+    </div>
+    <div class="form-row">
+        <label style="margin-left: 10px; margin-right: -10px;"><i class="fa fa-sign-out"></i> Output</label>
+        <select type="text" id="node-input-multi" style="width: 250px;">
+            <option value="one">a message per row</option>
+            <option value="mult">a single message [array]</option>
+        </select>
+    </div>
+    <hr align="middle"/>
+    <div class="form-row">
+        <label style="width: 100%;"><i class="fa fa-gears"></i> Object-to-CSV options</label>
+        <label style="margin-left: 10px; margin-right: -10px;"><i class="fa fa-sign-in"></i> Output</label>
+        <input style="width: 30px" type="checkbox" id="node-input-hdrout"><label style="width: auto;" for="node-input-hdrout">include column name row</span>
+    </div>
+    <div class="form-row">
+        <label style="margin-left: 10px; margin-right: -10px;"><i class="fa fa-align-left"></i> Newline</label>
+        <select style="width: 150px" id="node-input-ret">
+            <option value='\n'>Linux (\n)</option>
+            <option value='\r'>Mac (\r)</option>
+            <option value='\r\n'>Windows (\r\n)</option>
+       </select>
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="csv">
+    <p>A function that parses the <b>msg.payload</b> to convert csv to/from a javascript object.
+    Places the result in the payload.</p>
+    <p>If the input is a string it tries to parse it as CSV and creates a javascript object.</p>
+    <p>If the input is a javascript object it tries to build a CSV string.</p>
+    <p>The columns template should contain an ordered list of column headers. For csv input these become the property names.
+    For csv output these specify the properties to extract from the object and the order for the csv.</p>
+    <p><b>Note:</b> the columns should always be specified comma separated - even if another separator is chosen for the data.</p>
+    </script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('csv',{
+        category: 'function',
+        color:"#DEBD5C",
+        defaults: {
+            name: {value:""},
+            sep: {value:',',required:true,validate:RED.validators.regex(/^.{1,2}$/)},
+            //quo: {value:'"',required:true},
+            hdrin: {value:""},
+            hdrout: {value:""},
+            multi: {value:"one",required:true},
+            ret: {value:'\\n'},
+            temp: {value:""}
+        },
+        inputs:1,
+        outputs:1,
+        icon: "arrow-in.png",
+        label: function() {
+            return this.name||"csv";
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            if (this.sep == "," || this.sep == "\\t" || this.sep == ";" || this.sep == ":" || this.sep == " " || this.sep == "#") {
+                $("#node-input-select-sep").val(this.sep);
+                $("#node-input-sep").hide();
+            } else {
+                $("#node-input-select-sep").val("");
+                $("#node-input-sep").val(this.sep);
+                $("#node-input-sep").show();
+            }
+            $("#node-input-select-sep").change(function() {
+                var v = $("#node-input-select-sep option:selected").val();
+                $("#node-input-sep").val(v);
+                if (v == "") {
+                    $("#node-input-sep").val("");
+                    $("#node-input-sep").show().focus();
+                } else {
+                    $("#node-input-sep").hide();
+                }
+            });
+        }
+    });
+</script>

nodes/core/parsers/70-CSV.js

@@ -0,0 +1,170 @@
+/**
+ * Copyright 2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    function CSVNode(n) {
+        RED.nodes.createNode(this,n);
+        this.template = n.temp.split(",");
+        this.sep = (n.sep || ',').replace("\\t","\t").replace("\\n","\n").replace("\\r","\r");
+        this.quo = '"';
+        this.ret = (n.ret || "\n").replace("\\n","\n").replace("\\r","\r");
+        this.winflag = (this.ret === "\r\n");
+        this.lineend = "\n";
+        this.multi = n.multi || "one";
+        this.hdrin = n.hdrin || false;
+        this.hdrout = n.hdrout || false;
+        this.goodtmpl = true;
+        var node = this;
+
+        // pass in an array of column names to be trimed, de-quoted and retrimed
+        var clean = function(col) {
+            for (var t = 0; t < col.length; t++) {
+                col[t] = col[t].trim(); // remove leading and trailing whitespace
+                if (col[t].charAt(0) === '"' && col[t].charAt(col[t].length -1) === '"') {
+                    // remove leading and trailing quotes (if they exist) - and remove whitepace again.
+                    col[t] = col[t].substr(1,col[t].length -2).trim();
+                }
+            }
+            if ((col.length === 1) && (col[0] === "")) { node.goodtmpl = false; }
+            else { node.goodtmpl = true; }
+            return col;
+        }
+        node.template = clean(node.template);
+
+        this.on("input", function(msg) {
+            if (msg.hasOwnProperty("payload")) {
+                if (typeof msg.payload == "object") { // convert object to CSV string
+                    try {
+                        var ou = "";
+                        if (node.hdrout) {
+                            ou += node.template.join(node.sep) + node.ret;
+                        }
+                        if (!Array.isArray(msg.payload)) { msg.payload = [ msg.payload ]; }
+                        for (var s = 0; s < msg.payload.length; s++) {
+                            for (var t=0; t < node.template.length; t++) {
+
+                                // aaargh - resorting to eval here - but fairly contained front and back.
+                                var p = RED.util.ensureString(eval("msg.payload[s]."+node.template[t]));
+
+                                if (p === "undefined") { p = ""; }
+                                if (p.indexOf(node.sep) != -1) { // add quotes if any "commas"
+                                    ou += node.quo + p + node.quo + node.sep;
+                                }
+                                else if (p.indexOf(node.quo) != -1) { // add double quotes if any quotes
+                                    p = p.replace(/"/g, '""');
+                                    ou += node.quo + p + node.quo + node.sep;
+                                }
+                                else { ou += p + node.sep; } // otherwise just add
+                            }
+                            ou = ou.slice(0,-1) + node.ret; // remove final "comma" and add "newline"
+                        }
+                        msg.payload = ou;
+                        node.send(msg);
+                    }
+                    catch(e) { node.error(e); }
+                }
+                else if (typeof msg.payload == "string") { // convert CSV string to object
+                    try {
+                        var f = true; // flag to indicate if inside or outside a pair of quotes true = outside.
+                        var j = 0; // pointer into array of template items
+                        var k = [""]; // array of data for each of the template items
+                        var o = {}; // output object to build up
+                        var a = []; // output array is needed for multiline option
+                        var first = true; // is this the first line
+                        var line = msg.payload;
+                        var tmp = "";
+
+                        // For now we are just going to assume that any \r or \n means an end of line...
+                        //   got to be a weird csv that has singleton \r \n in it for another reason...
+
+                        // Now process the whole file/line
+                        for (var i = 0; i < line.length; i++) {
+                            if ((node.hdrin === true) && first) { // if the template is in the first line
+                                if ((line[i] === "\n")||(line[i] === "\r")) { // look for first line break
+                                    node.template = clean(tmp.split(node.sep));
+                                    first = false;
+                                }
+                                else { tmp += line[i]; }
+                            }
+                            else {
+                                if (line[i] === node.quo) { // if it's a quote toggle inside or outside
+                                    f = !f;
+                                    if (line[i-1] === node.quo) { k[j] += '\"'; } // if it's a quotequote then it's actually a quote
+                                    if ((line[i-1] !== node.sep) && (line[i+1] !== node.sep)) { k[j] += line[i]; }
+                                }
+                                else if ((line[i] === node.sep) && f) { // if we are outside of quote (ie valid separator
+                                    if (!node.goodtmpl) { node.template[j] = "col"+(j+1); }
+                                    if ( node.template[j] && (node.template[j] !== "") && (k[j] !== "" ) ) {
+                                        if ( (k[j].charAt(0) !== "+") && !isNaN(Number(k[j])) ) { k[j] = Number(k[j]); }
+                                        o[node.template[j]] = k[j];
+                                    }
+                                    j += 1;
+                                    k[j] = "";
+                                }
+                                else if (f && ((line[i] === "\n") || (line[i] === "\r"))) { // handle multiple lines
+                                    //console.log(j,k,o,k[j]);
+                                    if ( node.template[j] && (node.template[j] !== "") && (k[j] !== "") ) {
+                                        if ( (k[j].charAt(0) !== "+") && !isNaN(Number(k[j])) ) { k[j] = Number(k[j]); }
+                                        else { k[j].replace(/\r$/,''); }
+                                        o[node.template[j]] = k[j];
+                                    }
+                                    if (JSON.stringify(o) !== "{}") { // don't send empty objects
+                                        if (node.multi === "one") {
+                                            var newMessage = RED.util.cloneMessage(msg);
+                                            newMessage.payload = o;
+                                            node.send(newMessage); // either send
+                                        }
+                                        else { a.push(o); } // or add to the array
+                                    }
+                                    j = 0;
+                                    k = [""];
+                                    o = {};
+                                }
+                                else { // just add to the part of the message
+                                    k[j] += line[i];
+                                }
+                            }
+                        }
+                        // Finished so finalize and send anything left
+                        //console.log(j,k,o,k[j]);
+                        if (!node.goodtmpl) { node.template[j] = "col"+(j+1); }
+                        if ( node.template[j] && (node.template[j] !== "") && (k[j] !== "") ) {
+                            if ( (k[j].charAt(0) !== "+") && !isNaN(Number(k[j])) ) { k[j] = Number(k[j]); }
+                            else { k[j].replace(/\r$/,''); }
+                            o[node.template[j]] = k[j];
+                        }
+                        if (JSON.stringify(o) !== "{}") { // don't send empty objects
+                            if (node.multi === "one") {
+                                var newMessage = RED.util.cloneMessage(msg);
+                                newMessage.payload = o;
+                                node.send(newMessage); // either send
+                            }
+                            else { a.push(o); } // or add to the aray
+                        }
+                        if (node.multi !== "one") {
+                            msg.payload = a;
+                            node.send(msg); // finally send the array
+                        }
+                    }
+                    catch(e) { node.error(e); }
+                }
+                else { node.warn("This node only handles csv strings or js objects."); }
+            }
+        });
+    }
+    RED.nodes.registerType("csv",CSVNode);
+}

nodes/core/parsers/70-HTML.html

@@ -0,0 +1,74 @@
+<!--
+  Copyright 2014 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="html">
+    <div class="form-row">
+        <label for="node-input-tag"><i class="fa fa-filter"></i> Select</label>
+        <input type="text" id="node-input-tag" placeholder="h1">
+    </div>
+    <div class="form-row">
+        <label for="node-input-ret"><i class="fa fa-sign-out"></i> Output</label>
+        <select id="node-input-ret" style="width:73% !important">
+            <option value="html">the html content of the elements</option>
+            <option value="text">only the text content of the elements</option>
+            <!-- <option value="attr">an object of any attributes</option> -->
+            <!-- <option value="val">return the value from a form element</option> -->
+        </select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-as">&nbsp;</label>
+        <select id="node-input-as" style="width:73% !important">
+            <option value="single">as a single message containing an array</option>
+            <option value="multi">as multiple messages, one for each element</option>
+        </select>
+    </div>
+    <br/>
+    <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="Name">
+    </div>
+    <div class="form-tips">Tip: The <b>Select</b> value is a <a href="https://github.com/fb55/CSSselect#user-content-supported-selectors" target="_new"><i><u>CSS Selector</u></i></a>, similar to a jQuery selector.</div>
+</script>
+
+<script type="text/x-red" data-help-name="html">
+    <p>Extracts elements from an html document held in <b>msg.payload</b> using a selector.</p>
+    <p>The selector uses <a href=="https://github.com/cheeriojs/cheerio/blob/master/Readme.md" target="_new">Cheerio</a>
+     which uses the <a href="https://github.com/fb55/CSSselect#user-content-supported-selectors" target="_new">CSS selector</a> syntax.</p>
+    <p>The result can be either a single message with a payload containing an array of the matched elements, or multiple
+       messages that each contain a matched element.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('html',{
+        category: 'function',
+        color:"#DEBD5C",
+        defaults: {
+            name: {value:""},
+            tag: {value:""},
+            ret: {value:"html"},
+            as: {value:"single"}
+        },
+        inputs:1,
+        outputs:1,
+        icon: "jq.png",
+        label: function() {
+            return this.name||this.tag||"html";
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        }
+    });
+</script>

nodes/core/parsers/70-HTML.js

@@ -0,0 +1,60 @@
+/**
+ * Copyright 2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var cheerio = require('cheerio');
+
+    function CheerioNode(n) {
+        RED.nodes.createNode(this,n);
+        this.tag = n.tag || "h1";
+        this.ret = n.ret || "html";
+        this.as = n.as || "single";
+        var node = this;
+        this.on("input", function(msg) {
+            try {
+                var $ = cheerio.load(msg.payload);
+                var pay = [];
+                $(node.tag).each(function() {
+                    if (node.as === "multi") {
+                        var pay2 = null;
+                        if (node.ret === "html") { pay2 = $(this).html(); }
+                        if (node.ret === "text") { pay2 = $(this).text(); }
+                        //if (node.ret === "attr") { pay2 = $(this)[0]["attribs"]; }
+                        //if (node.ret === "val")  { pay2 = $(this).val(); }
+                        if (pay2) {
+                            msg.payload = pay2;
+                            node.send(msg);
+                        }
+                    }
+                    if (node.as === "single") {
+                        if (node.ret === "html") { pay.push( $(this).html() ); }
+                        if (node.ret === "text") { pay.push( $(this).text() ); }
+                        //if (node.ret === "attr") { pay.push( $(this)[0]["attribs"] ); }
+                        //if (node.ret === "val")  { pay.push( $(this).val() ); }
+                    }
+                });
+                if ((node.as === "single") && (pay.length !== 0)) {
+                    msg.payload = pay;
+                    node.send(msg);
+                }
+            } catch (error) {
+                node.error('Error: '+error.message);
+            }
+        });
+    }
+    RED.nodes.registerType("html",CheerioNode);
+}

nodes/core/parsers/70-JSON.html

@@ -0,0 +1,47 @@
+<!--
+  Copyright 2014 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="json">
+    <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="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="json">
+    <p>A function that parses the <b>msg.payload</b> to convert a JSON string to/from a javascript object. Places the result back into the payload.</p>
+    <p>If the input is a JSON string it tries to parse it to a javascript object.</p>
+    <p>If the input is a javascript object it creates a JSON string.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('json',{
+        category: 'function',
+        color:"#DEBD5C",
+        defaults: {
+            name: {value:""}
+        },
+        inputs:1,
+        outputs:1,
+        icon: "arrow-in.png",
+        label: function() {
+            return this.name||"json";
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        }
+    });
+</script>

nodes/core/parsers/70-JSON.js

@@ -0,0 +1,46 @@
+/**
+ * Copyright 2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var util = require("util");
+
+    function JSONNode(n) {
+        RED.nodes.createNode(this,n);
+        var node = this;
+        this.on("input", function(msg) {
+            if (msg.hasOwnProperty("payload")) {
+                if (typeof msg.payload === "string") {
+                    try {
+                        msg.payload = JSON.parse(msg.payload);
+                        node.send(msg);
+                    }
+                    catch(e) { node.error(e+ "\n"+msg.payload); }
+                }
+                else if (typeof msg.payload === "object") {
+                    if (!Buffer.isBuffer(msg.payload) ) {
+                        if (!util.isArray(msg.payload)) {
+                            msg.payload = JSON.stringify(msg.payload);
+                            node.send(msg);
+                        }
+                    }
+                }
+                else { node.warn("dropped: "+msg.payload); }
+            }
+        });
+    }
+    RED.nodes.registerType("json",JSONNode);
+}

nodes/core/parsers/70-XML.html

@@ -0,0 +1,78 @@
+<!--
+  Copyright 2014 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="xml">
+    <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="Name" style="width:280px !important">
+    </div>
+    <div class="form-row" id="advanced">
+    </div>
+    <div id="advanced-options">
+        <div class="form-row">
+            <i class="fa fa-key"></i> Represent XML tag attributes as a property named <input type="text" id="node-input-attr" style="width:20px !important">
+        </div>
+        <div class="form-row">
+            <i class="fa fa-key"></i> Prefix to access character content <input type="text" id="node-input-chr" style="width:20px !important">
+        </div>
+        <div class="form-tips">There is no simple way to convert XML attributes to JSON
+        so the approach taken here is to add a property, named $ by default, to the JSON structure.</div>
+    </div>
+    <script> {
+        var showadvanced = showadvanced || true;
+        var showall = function() {
+            showadvanced = !showadvanced;
+            if (showadvanced) {
+                $("#advanced-options").show();
+                $("#advanced").html('<label for="node-advanced" style="width:200px !important"><i class="fa fa-minus-square"></i> Advanced options</label>');
+            }
+            else {
+                $("#advanced-options").hide();
+                $("#advanced").html('<label for="node-advanced" style="width:200px !important"><i class="fa fa-plus-square"></i> Advanced options ...</label>');
+            }
+        };
+        showall();
+        $("#advanced").click( function() { showall(); });
+    } </script>
+</script>
+
+<script type="text/x-red" data-help-name="xml">
+    <p>A function that parses the <b>msg.payload</b> to convert xml to/from a javascript object. Places the result in the payload.</p>
+    <p>If the input is a string it tries to parse it as XML and creates a javascript object.</p>
+    <p>If the input is a javascript object it tries to build an XML string.</p>
+    <p>See <a href="https://github.com/Leonidas-from-XIV/node-xml2js/blob/master/README.md" target="_new">the xml2js docs <i>here</i></a> for more information.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('xml',{
+        category: 'function',
+        color:"#DEBD5C",
+        defaults: {
+            name: {value:""},
+            attr: {value:'$',required:true},
+            chr: {value:'_',required:true}
+        },
+        inputs:1,
+        outputs:1,
+        icon: "arrow-in.png",
+        label: function() {
+            return this.name||"xml";
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        }
+    });
+</script>

nodes/core/parsers/70-XML.js

@@ -0,0 +1,48 @@
+/**
+ * Copyright 2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var xml2js = require('xml2js');
+    var parseString = xml2js.parseString;
+    var builder = new xml2js.Builder({renderOpts:{pretty:false}});
+
+    function XMLNode(n) {
+        RED.nodes.createNode(this,n);
+        this.attrkey = n.attr || '$';
+        this.charkey = n.chr || '_';
+        var node = this;
+        this.on("input", function(msg) {
+            if (msg.hasOwnProperty("payload")) {
+                if (typeof msg.payload == "object") {
+                    msg.payload = builder.buildObject(msg.payload);
+                    node.send(msg);
+                }
+                else if (typeof msg.payload == "string") {
+                    parseString(msg.payload, {strict:true,async:true,attrkey:node.attrkey,charkey:node.charkey}, function (err, result) {
+                        if (err) { node.error(err); }
+                        else {
+                            msg.payload = result;
+                            node.send(msg);
+                        }
+                    });
+                }
+                else { node.warn("This node only handles xml strings or js objects."); }
+            }
+        });
+    }
+    RED.nodes.registerType("xml",XMLNode);
+}

nodes/core/social/27-twitter.html

@@ -0,0 +1,222 @@
+<!--
+  Copyright 2013 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="twitter-credentials">
+    <div class="form-row" id="node-config-twitter-row"></div>
+    <input type="hidden" id="node-config-input-screen_name">
+</script>
+
+<script type="text/javascript">
+(function() {
+    var twitterConfigNodeId = null;
+    var twitterConfigNodeIntervalId = null;
+
+    function showTwitterAuthStart() {
+        var pathname = document.location.pathname;
+        if (pathname.slice(-1) != "/") {
+            pathname += "/";
+        }
+        var callback = encodeURIComponent(location.protocol+"//"+location.hostname+":"+location.port+pathname+"twitter-credentials/"+twitterConfigNodeId+"/auth/callback");
+        $("#node-config-dialog-ok").button("disable");
+        $("#node-config-twitter-row").html('<div style="text-align: center; margin-top: 20px; "><a class="btn" id="node-config-twitter-start" href="twitter-credentials/'+twitterConfigNodeId+'/auth?callback='+callback+'" target="_blank">Click here to authenticate with Twitter.</a></div>');
+        $("#node-config-twitter-start").click(function() {
+            twitterConfigNodeIntervalId = window.setTimeout(pollTwitterCredentials,2000);
+        });
+    }
+    function updateTwitterScreenName(sn) {
+        $("#node-config-input-screen_name").val(sn);
+        $("#node-config-twitter-row").html('<label><i class="fa fa-user"></i> Twitter ID</label><span class="input-xlarge uneditable-input">'+sn+'</span>');
+    }
+    function pollTwitterCredentials(e) {
+        $.getJSON('credentials/twitter-credentials/'+twitterConfigNodeId,function(data) {
+            if (data.screen_name) {
+                updateTwitterScreenName(data.screen_name);
+                twitterConfigNodeIntervalId = null;
+                $("#node-config-dialog-ok").button("enable");
+            } else {
+                twitterConfigNodeIntervalId = window.setTimeout(pollTwitterCredentials,2000);
+            }
+        })
+    }
+    RED.nodes.registerType('twitter-credentials',{
+        category: 'config',
+        defaults: {
+            screen_name: {value:""}
+        },
+        credentials: {
+            screen_name: {type:"text"},
+            access_token: {type: "password"},
+            access_token_secret: {type:"password"}
+        },
+        label: function() {
+            return this.screen_name;
+        },
+        exportable: false,
+        oneditprepare: function() {
+            twitterConfigNodeId = this.id;
+            if (!this.screen_name || this.screen_name == "") {
+                showTwitterAuthStart();
+            } else {
+                if (this.credentials.screen_name) {
+                    updateTwitterScreenName(this.credentials.screen_name);
+                } else {
+                    showTwitterAuthStart();
+                }
+            }
+        },
+        oneditsave: function() {
+            if (twitterConfigNodeIntervalId) {
+                window.clearTimeout(twitterConfigNodeIntervalId);
+            }
+        },
+        oneditcancel: function(adding) {
+            if (twitterConfigNodeIntervalId) {
+                window.clearTimeout(twitterConfigNodeIntervalId);
+            }
+        }
+    });
+})();
+</script>
+
+<script type="text/x-red" data-template-name="twitter in">
+    <div class="form-row">
+        <label for="node-input-twitter"><i class="fa fa-user"></i> Log in as</label>
+        <input type="text" id="node-input-twitter">
+    </div>
+    <div class="form-row">
+        <label for="node-input-user"><i class="fa fa-search"></i> Search</label>
+        <select type="text" id="node-input-user" style="display: inline-block; vertical-align: middle; width:60%;">
+            <option value="false">all public tweets</option>
+            <option value="true">the tweets of who you follow</option>
+            <option value="user">the tweets of specific users</option>
+            <option value="dm">your direct messages</option>
+        </select>
+    </div>
+    <div class="form-row" id="node-input-tags-row">
+        <label for="node-input-tags"><i class="fa fa-tags"></i> <span id="node-input-tags-label">for</span></label>
+        <input type="text" id="node-input-tags" placeholder="comma-separated words, @ids, #tags">
+    </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="Name">
+    </div>
+    <div class="form-tips">Tip: Use commas without spaces between multiple search terms. Comma = OR, Space = AND.
+    <br/>The Twitter API WILL NOT deliver 100% of all tweets.
+    <br/>Tweets of who you follow will include their retweets and favourites.</div>
+</script>
+
+<script type="text/x-red" data-help-name="twitter in">
+    <p>Twitter input node. Can be used to search either:
+    <ul><li>the public or a user's stream for tweets containing the configured search term</li>
+        <li>all tweets by specific users</li>
+        <li>direct messages received by the authenticated user</li>
+    </ul></p>
+    <p>Use space for <i>and</i> and comma , for <i>or</i> when searching for multiple terms.</p>
+    <p>Sets the <b>msg.topic</b> to <i>tweets/</i> and then appends the senders screen name.</p>
+    <p>Sets <b>msg.location</b> to the tweeters location if known.</p>
+    <p>Sets <b>msg.tweet</b> to the full tweet object as documented by <a href="https://dev.twitter.com/docs/platform-objects/tweets">Twitter</a>.
+    <p><b>Note:</b> when set to a specific user's tweets, or your direct messages, the node is subject to
+      Twitter's API rate limiting. If you deploy the flows multiple times within a 15 minute window, you may
+      exceed the limit and will see errors from the node. These errors will clear when the current 15 minute window
+      passes.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('twitter in',{
+        category: 'social-input',
+        color:"#C0DEED",
+        defaults: {
+            twitter: {type:"twitter-credentials",required:true},
+            tags: {value:"",validate:function(v) { return this.user == "dm" || v.length > 0;}},
+            user: {value:"false",required:true},
+            name: {value:""},
+            topic: {value:"tweets"}
+        },
+        inputs:0,
+        outputs:1,
+        icon: "twitter.png",
+        label: function() {
+            if (this.name) {
+                return this.name;
+            }
+            if (this.user == "dm") {
+                var user = RED.nodes.node(this.twitter);
+                return (user?user.label()+" ":"")+"DMs";
+            } else if (this.user == "user") {
+                return this.tags+" tweets";
+            }
+            return this.tags;
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            $("#node-input-user").change(function() {
+                var type = $("#node-input-user option:selected").val();
+                if (type == "user") {
+                    $("#node-input-tags-row").show();
+                    $("#node-input-tags-label").html("User");
+                    $("#node-input-tags").attr("placeholder","comma-separated @twitter handles");
+                } else if (type == "dm") {
+                    $("#node-input-tags-row").hide();
+                } else {
+                    $("#node-input-tags-row").show();
+                    $("#node-input-tags-label").html("for");
+                    $("#node-input-tags").attr("placeholder","comma-separated words, @ids, #hashtags");
+                }
+
+            });
+            $("#node-input-user").change();
+        }
+    });
+</script>
+
+
+<script type="text/x-red" data-template-name="twitter out">
+    <div class="form-row">
+        <label for="node-input-twitter"><i class="fa fa-user"></i> Twitter</label>
+        <input type="text" id="node-input-twitter">
+    </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="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="twitter out">
+    <p>Twitter out node. Tweets the <b>msg.payload</b>.</p>
+    <p>To send a Direct Message (DM) - use a payload like "D {username} {message}"</p>
+    <p>If <b>msg.media</b> exists and is a Buffer object, this node will treat it
+       as an image and attach it to the tweet.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('twitter out',{
+        category: 'social-output',
+        color:"#C0DEED",
+        defaults: {
+            twitter: {type:"twitter-credentials",required:true},
+            name: {value:"Tweet"}
+        },
+        inputs:1,
+        outputs:0,
+        icon: "twitter.png",
+        align: "right",
+        label: function() {
+            return this.name;
+        }
+    });
+</script>

nodes/core/social/27-twitter.js

@@ -0,0 +1,383 @@
+/**
+ * Copyright 2013 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var ntwitter = require('twitter-ng');
+    var OAuth= require('oauth').OAuth;
+    var request = require('request');
+
+    function TwitterNode(n) {
+        RED.nodes.createNode(this,n);
+        this.screen_name = n.screen_name;
+    }
+    RED.nodes.registerType("twitter-credentials",TwitterNode,{
+        credentials: {
+            screen_name: {type:"text"},
+            access_token: {type: "password"},
+            access_token_secret: {type:"password"}
+        }
+    });
+
+
+    /**
+     * Populate msg.location based on data found in msg.tweet.
+     */
+    function addLocationToTweet(msg) {
+        if(msg.tweet) {
+            if(msg.tweet.geo) { // if geo is set, always set location from geo
+                if(msg.tweet.geo.coordinates && msg.tweet.geo.coordinates.length === 2) {
+                    if (!msg.location) { msg.location = {}; }
+                    // coordinates[0] is lat, coordinates[1] is lon
+                    msg.location.lat = msg.tweet.geo.coordinates[0];
+                    msg.location.lon = msg.tweet.geo.coordinates[1];
+                    msg.location.icon = "twitter";
+                }
+            } else if(msg.tweet.coordinates) { // otherwise attempt go get it from coordinates
+                if(msg.tweet.coordinates.coordinates && msg.tweet.coordinates.coordinates.length === 2) {
+                    if (!msg.location) { msg.location = {}; }
+                    // WARNING! coordinates[1] is lat, coordinates[0] is lon!!!
+                    msg.location.lat = msg.tweet.coordinates.coordinates[1];
+                    msg.location.lon = msg.tweet.coordinates.coordinates[0];
+                    msg.location.icon = "twitter";
+                }
+            } // if none of these found then just do nothing
+        } // if no msg.tweet then just do nothing
+    }
+
+    function TwitterInNode(n) {
+        RED.nodes.createNode(this,n);
+        this.active = true;
+        this.user = n.user;
+        //this.tags = n.tags.replace(/ /g,'');
+        this.tags = n.tags;
+        this.twitter = n.twitter;
+        this.topic = n.topic||"tweets";
+        this.twitterConfig = RED.nodes.getNode(this.twitter);
+        var credentials = RED.nodes.getCredentials(this.twitter);
+
+        if (credentials && credentials.screen_name == this.twitterConfig.screen_name) {
+            var twit = new ntwitter({
+                consumer_key: "OKjYEd1ef2bfFolV25G5nQ",
+                consumer_secret: "meRsltCktVMUI8gmggpXett7WBLd1k0qidYazoML6g",
+                access_token_key: credentials.access_token,
+                access_token_secret: credentials.access_token_secret
+            });
+
+            //setInterval(function() {
+            //        twit.get("/application/rate_limit_status.json",null,function(err,cb) {
+            //                console.log("direct_messages:",cb["resources"]["direct_messages"]);
+            //        });
+            //
+            //},10000);
+
+            var node = this;
+            if (this.user === "user") {
+                node.poll_ids = [];
+                node.since_ids = {};
+                var users = node.tags.split(",");
+                for (var i=0;i<users.length;i++) {
+                    var user = users[i].replace(" ","");
+                    twit.getUserTimeline({
+                            screen_name:user,
+                            trim_user:0,
+                            count:1
+                    },function() {
+                        var u = user+"";
+                        return function(err,cb) {
+                            if (err) {
+                                node.error(err);
+                                return;
+                            }
+                            if (cb[0]) {
+                                node.since_ids[u] = cb[0].id_str;
+                            } else {
+                                node.since_ids[u] = '0';
+                            }
+                            node.poll_ids.push(setInterval(function() {
+                                twit.getUserTimeline({
+                                        screen_name:u,
+                                        trim_user:0,
+                                        since_id:node.since_ids[u]
+                                },function(err,cb) {
+                                    if (cb) {
+                                        for (var t=cb.length-1;t>=0;t-=1) {
+                                            var tweet = cb[t];
+                                            var where = tweet.user.location;
+                                            var la = tweet.lang || tweet.user.lang;
+                                            var msg = { topic:node.topic+"/"+tweet.user.screen_name, payload:tweet.text, lang:la, tweet:tweet };
+                                            if (where) {
+                                                msg.location = {place:where};
+                                                addLocationToTweet(msg);
+                                            }
+                                            node.send(msg);
+                                            if (t == 0) {
+                                                node.since_ids[u] = tweet.id_str;
+                                            }
+                                        }
+                                    }
+                                    if (err) {
+                                        node.error(err);
+                                    }
+                                });
+                            },60000));
+                        }
+                    }());
+                }
+            } else if (this.user === "dm") {
+                node.poll_ids = [];
+                twit.getDirectMessages({
+                        screen_name:node.twitterConfig.screen_name,
+                        trim_user:0,
+                        count:1
+                },function(err,cb) {
+                    if (err) {
+                        node.error(err);
+                        return;
+                    }
+                    if (cb[0]) {
+                        node.since_id = cb[0].id_str;
+                    } else {
+                        node.since_id = '0';
+                    }
+                    node.poll_ids.push(setInterval(function() {
+                            twit.getDirectMessages({
+                                    screen_name:node.twitterConfig.screen_name,
+                                    trim_user:0,
+                                    since_id:node.since_id
+                            },function(err,cb) {
+                                if (cb) {
+                                    for (var t=cb.length-1;t>=0;t-=1) {
+                                        var tweet = cb[t];
+                                        var where = tweet.sender.location;
+                                        var la = tweet.lang || tweet.sender.lang;
+                                        var msg = { topic:node.topic+"/"+tweet.sender.screen_name, payload:tweet.text, lang:la, tweet:tweet };
+                                        if (where) {
+                                            msg.location = {place:where};
+                                            addLocationToTweet(msg);
+                                        }
+                                        node.send(msg);
+                                        if (t == 0) {
+                                            node.since_id = tweet.id_str;
+                                        }
+                                    }
+                                }
+                                if (err) {
+                                    node.error(err);
+                                }
+                            });
+                    },120000));
+                });
+
+            } else if (this.tags !== "") {
+                try {
+                    var thing = 'statuses/filter';
+                    if (this.user === "true") { thing = 'user'; }
+                    var st = { track: [node.tags] };
+                    var bits = node.tags.split(",");
+                    if (bits.length == 4) {
+                        if ((Number(bits[0]) < Number(bits[2])) && (Number(bits[1]) < Number(bits[3]))) {
+                            st = { locations: node.tags };
+                        }
+                        else {
+                            node.log("possible bad geo area format. Should be lower-left lon, lat, upper-right lon, lat");
+                        }
+                    }
+
+                    var setupStream = function() {
+                        if (node.active) {
+                            twit.stream(thing, st, function(stream) {
+                                //console.log(st);
+                                //twit.stream('user', { track: [node.tags] }, function(stream) {
+                                //twit.stream('site', { track: [node.tags] }, function(stream) {
+                                //twit.stream('statuses/filter', { track: [node.tags] }, function(stream) {
+                                node.stream = stream;
+                                stream.on('data', function(tweet) {
+                                    if (tweet.user !== undefined) {
+                                        var where = tweet.user.location;
+                                        var la = tweet.lang || tweet.user.lang;
+                                        var msg = { topic:node.topic+"/"+tweet.user.screen_name, payload:tweet.text, lang:la, tweet:tweet };
+                                        if (where) {
+                                            msg.location = {place:where};
+                                            addLocationToTweet(msg);
+                                        }
+                                        node.send(msg);
+                                    }
+                                });
+                                stream.on('limit', function(tweet) {
+                                    node.warn("tweet rate limit hit");
+                                });
+                                stream.on('error', function(tweet,rc) {
+                                    if (rc == 420) {
+                                        node.warn("Twitter rate limit hit");
+                                    } else {
+                                        node.warn("Stream error:"+tweet.toString()+" ("+rc+")");
+                                    }
+                                    setTimeout(setupStream,10000);
+                                });
+                                stream.on('destroy', function (response) {
+                                    if (this.active) {
+                                        node.warn("twitter ended unexpectedly");
+                                        setTimeout(setupStream,10000);
+                                    }
+                                });
+                            });
+                        }
+                    }
+                    setupStream();
+                }
+                catch (err) {
+                    node.error(err);
+                }
+            } else {
+                this.error("Invalid tag property");
+            }
+        } else {
+            this.error("missing twitter credentials");
+        }
+
+        this.on('close', function() {
+            if (this.stream) {
+                this.active = false;
+                this.stream.destroy();
+            }
+            if (this.poll_ids) {
+                for (var i=0;i<this.poll_ids.length;i++) {
+                    clearInterval(this.poll_ids[i]);
+                }
+            }
+        });
+    }
+    RED.nodes.registerType("twitter in",TwitterInNode);
+
+
+    function TwitterOutNode(n) {
+        RED.nodes.createNode(this,n);
+        this.topic = n.topic;
+        this.twitter = n.twitter;
+        this.twitterConfig = RED.nodes.getNode(this.twitter);
+        var credentials = RED.nodes.getCredentials(this.twitter);
+        var node = this;
+
+        if (credentials && credentials.screen_name == this.twitterConfig.screen_name) {
+            var twit = new ntwitter({
+                consumer_key: "OKjYEd1ef2bfFolV25G5nQ",
+                consumer_secret: "meRsltCktVMUI8gmggpXett7WBLd1k0qidYazoML6g",
+                access_token_key: credentials.access_token,
+                access_token_secret: credentials.access_token_secret
+            });
+            node.on("input", function(msg) {
+                node.status({fill:"blue",shape:"dot",text:"tweeting"});
+
+                if (msg.payload.length > 140) {
+                    msg.payload = msg.payload.slice(0,139);
+                    node.warn("Tweet greater than 140 : truncated");
+                }
+
+                if (msg.media && Buffer.isBuffer(msg.media)) {
+                    var apiUrl = "https://api.twitter.com/1.1/statuses/update_with_media.json";
+                    var signedUrl = oa.signUrl(apiUrl,
+                        credentials.access_token,
+                        credentials.access_token_secret,
+                        "POST");
+
+                    var r = request.post(signedUrl,function(err,httpResponse,body) {
+                        if (err) {
+                            node.error(err.toString());
+                            node.status({fill:"red",shape:"ring",text:"failed"});
+                        } else {
+                            var response = JSON.parse(body);
+                            if (response.errors) {
+                                var errorList = response.errors.map(function(er) { return er.code+": "+er.message }).join(", ");
+                                node.error("tweet failed: "+errorList);
+                                node.status({fill:"red",shape:"ring",text:"failed"});
+                            } else {
+                                node.status({});
+                            }
+                        }
+                    });
+                    var form = r.form();
+                    form.append("status",msg.payload);
+                    form.append("media[]",msg.media,{filename:"image"});
+
+                } else {
+                    twit.updateStatus(msg.payload, function (err, data) {
+                        if (err) {
+                            node.status({fill:"red",shape:"ring",text:"failed"});
+                            node.error(err);
+                        }
+                        node.status({});
+                    });
+                }
+            });
+        }
+    }
+    RED.nodes.registerType("twitter out",TwitterOutNode);
+
+    var oa = new OAuth(
+        "https://api.twitter.com/oauth/request_token",
+        "https://api.twitter.com/oauth/access_token",
+        "OKjYEd1ef2bfFolV25G5nQ",
+        "meRsltCktVMUI8gmggpXett7WBLd1k0qidYazoML6g",
+        "1.0",
+        null,
+        "HMAC-SHA1"
+    );
+
+    RED.httpAdmin.get('/twitter-credentials/:id/auth', function(req, res){
+        var credentials = {};
+        oa.getOAuthRequestToken({
+                oauth_callback: req.query.callback
+        },function(error, oauth_token, oauth_token_secret, results){
+            if (error) {
+                var resp = '<h2>Oh no!</h2>'+
+                '<p>Something went wrong with the authentication process. The following error was returned:<p>'+
+                '<p><b>'+error.statusCode+'</b>: '+error.data+'</p>'+
+                '<p>One known cause of this type of failure is if the clock is wrong on system running Node-RED.';
+                res.send(resp)
+            } else {
+                credentials.oauth_token = oauth_token;
+                credentials.oauth_token_secret = oauth_token_secret;
+                res.redirect('https://twitter.com/oauth/authorize?oauth_token='+oauth_token)
+                RED.nodes.addCredentials(req.params.id,credentials);
+            }
+        });
+    });
+
+    RED.httpAdmin.get('/twitter-credentials/:id/auth/callback', function(req, res, next){
+        var credentials = RED.nodes.getCredentials(req.params.id);
+        credentials.oauth_verifier = req.query.oauth_verifier;
+
+        oa.getOAuthAccessToken(
+            credentials.oauth_token,
+            credentials.token_secret,
+            credentials.oauth_verifier,
+            function(error, oauth_access_token, oauth_access_token_secret, results){
+                if (error){
+                    RED.log.error(error);
+                    res.send("something in twitter oauth broke.");
+                } else {
+                    credentials = {};
+                    credentials.access_token = oauth_access_token;
+                    credentials.access_token_secret = oauth_access_token_secret;
+                    credentials.screen_name = "@"+results.screen_name;
+                    RED.nodes.addCredentials(req.params.id,credentials);
+                    res.send("<html><head></head><body>Authorised - you can close this window and return to Node-RED</body></html>");
+                }
+            }
+        );
+    });
+}

nodes/core/social/32-feedparse.html

@@ -16,22 +16,22 @@
 
 <script type="text/x-red" data-template-name="feedparse">
     <div class="form-row">
-        <label for="node-input-url"><i class="icon-globe"></i> Feed url</label>
+        <label for="node-input-url"><i class="fa fa-globe"></i> Feed url</label>
         <input type="text" id="node-input-url">
     </div>
     <div class="form-row">
-        <label for="node-input-interval"><i class="icon-repeat"></i> Repeat <span style="font-size: 0.9em;">(M)</span></label>
+        <label for="node-input-interval"><i class="fa fa-repeat"></i> Repeat <span style="font-size: 0.9em;">(M)</span></label>
         <input type="text" id="node-input-interval" placeholder="minutes">
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <!-- <div class="form-tips"></div> -->
 </script>
 
 <script type="text/x-red" data-help-name="feedparse">
-	<p>Monitors an RSS/atom feed for new entries.</p>
+    <p>Monitors an RSS/atom feed for new entries.</p>
 </script>
 
 <script type="text/javascript">
@@ -53,5 +53,4 @@
             return this.name?"node_label_italic":"";
         }
     });
-
 </script>

nodes/core/social/32-feedparse.js

@@ -0,0 +1,79 @@
+/**
+ * Copyright 2013,2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var FeedParser = require("feedparser");
+    var request = require("request");
+
+    function FeedParseNode(n) {
+        RED.nodes.createNode(this,n);
+        this.url = n.url;
+        this.interval = (parseInt(n.interval)||15) * 60000;
+        var node = this;
+        this.interval_id = null;
+        this.seen = {};
+        if (this.url !== "") {
+            var getFeed = function() {
+                var req = request(node.url, {timeout: 10000, pool: false});
+                //req.setMaxListeners(50);
+                //req.setHeader('user-agent', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.63 Safari/537.36');
+                req.setHeader('accept', 'text/html,application/xhtml+xml');
+
+                var feedparser = new FeedParser();
+
+                req.on('error', function(err) { node.error(err); });
+
+                req.on('response', function(res) {
+                    if (res.statusCode != 200) { node.warn('error - Bad status code'); }
+                    else { res.pipe(feedparser); }
+                });
+
+                feedparser.on('error', function(error) { node.error(error); });
+
+                feedparser.on('readable', function () {
+                    var stream = this, article;
+                    while (article = stream.read()) {
+                        if (!(article.guid in node.seen) || ( node.seen[article.guid] !== 0 && node.seen[article.guid] != article.date.getTime())) {
+                            node.seen[article.guid] = article.date?article.date.getTime():0;
+                            var msg = {
+                                topic: article.origlink || article.link,
+                                payload: article.description,
+                                article: article
+                            };
+                            node.send(msg);
+                        }
+                    }
+                });
+
+                feedparser.on('meta', function (meta) {});
+                feedparser.on('end', function () {});
+            };
+            this.interval_id = setInterval(function() { getFeed(); }, node.interval);
+            getFeed();
+        } else {
+            this.error("Invalid url");
+        }
+
+        this.on("close", function() {
+            if (this.interval_id != null) {
+                clearInterval(this.interval_id);
+            }
+        });
+    }
+
+    RED.nodes.registerType("feedparse",FeedParseNode);
+}

nodes/core/social/61-email.html

@@ -0,0 +1,193 @@
+<!--
+  Copyright 2013,2014 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="e-mail">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-envelope"></i> To</label>
+        <input type="text" id="node-input-name" placeholder="email@address.com">
+    </div>
+    <!-- <div class="form-row">
+        <label for="node-input-pin"><i class="fa fa-asterisk"></i> Service</label>
+        <select type="text" id="node-input-pin" style="width: 150px;">
+            <option value="-" disabled> </option>
+            <option value="DynectEmail">DynectEmail</option>
+            <option value="Gmail">Gmail</option>
+            <option value="hot.ee">hot.ee</option>
+            <option value="Hotmail">Hotmail</option>
+            <option value="iCloud">iCloud</option>
+            <option value="mail.ee">mail.ee</option>
+            <option value="Mail.Ru">Mail.Ru</option>
+            <option value="Mailgun">Mailgun</option>
+            <option value="Mailjet">Mailjet</option>
+            <option value="Mandrill">Mandrill</option>
+            <option value="Postmark">Postmark</option>
+            <option value="QQ">QQ</option>
+            <option value="QQex">QQex</option>
+            <option value="SendGrid">SendGrid</option>
+            <option value="SendCloud">SendCloud</option>
+            <option value="SES">SES</option>
+            <option value="Yahoo">Yahoo</option>
+            <option value="yandex">yandex</option>
+            <option value="Zoho">Zoho</option>
+         </select>
+    </div> -->
+    <div class="form-row">
+        <label for="node-input-server"><i class="fa fa-globe"></i> Server</label>
+        <input type="text" id="node-input-server" placeholder="smtp.gmail.com">
+    </div>
+    <div class="form-row">
+        <label for="node-input-port"><i class="fa fa-random"></i> Port</label>
+        <input type="text" id="node-input-port" placeholder="465">
+    </div>
+    <div class="form-row">
+        <label for="node-input-userid"><i class="fa fa-user"></i> Userid</label>
+        <input type="text" id="node-input-userid">
+    </div>
+    <div class="form-row">
+        <label for="node-input-password"><i class="fa fa-lock"></i> Password</label>
+        <input type="password" id="node-input-password">
+    </div>
+    <br/>
+    <div class="form-row">
+        <label for="node-input-dname"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-dname" placeholder="Name">
+    </div>
+    <div class="form-tips" id="node-tip"><b>Note:</b> Copied credentials from global emailkeys.js file.</div>
+</script>
+
+<script type="text/x-red" data-help-name="e-mail">
+    <p>Sends the <b>msg.payload</b> as an email, with a subject of <b>msg.topic</b>.</p>
+    <p>The default message recipient can be configured in the node, if it is left
+    blank it should be set using the <b>msg.to</b> property of the incoming message.</p>
+    <p>The payload can be html format.</p>
+    <p>If the payload is a binary buffer then it will be converted to an attachment.
+    The filename should be set using <b>msg.filename</b>. Optionally <b>msg.description</b> can be added for the body text.</p>
+    <p>Alternatively you may provide <b>msg.attachments</b> which should contain an array of one or
+    more attachments in <a href="https://www.npmjs.com/package/nodemailer#attachments" target="_new">nodemailer</a> format.</p>
+</script>
+
+<script type="text/javascript">
+(function() {
+    RED.nodes.registerType('e-mail',{
+        category: 'social-output',
+        color:"#c7e9c0",
+        defaults: {
+            server: {value:"smtp.gmail.com",required:true},
+            port: {value:"465",required:true},
+            name: {value:"",required:true},
+            dname: {value:""}
+        },
+        credentials: {
+            userid: {type:"text"},
+            password: {type: "password"},
+            global: { type:"boolean"}
+        },
+
+        inputs:1,
+        outputs:0,
+        icon: "envelope.png",
+        align: "right",
+        label: function() {
+            return this.dname||this.name||"email";
+        },
+        labelStyle: function() {
+            return (this.dname||!this.topic)?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            if (this.credentials.global) {
+                $('#node-tip').show();
+            } else {
+                $('#node-tip').hide();
+            };
+        }
+    });
+})();
+</script>
+
+
+<script type="text/x-red" data-template-name="e-mail in">
+    <div class="form-row node-input-repeat">
+        <label for="node-input-repeat"><i class="fa fa-repeat"></i> Check Repeat (S)</label>
+        <input type="text" id="node-input-repeat" placeholder="300">
+    </div>
+    <div class="form-row">
+        <label for="node-input-server"><i class="fa fa-globe"></i> Server</label>
+        <input type="text" id="node-input-server" placeholder="imap.gmail.com">
+    </div>
+    <div class="form-row">
+        <label for="node-input-port"><i class="fa fa-random"></i> Port</label>
+        <input type="text" id="node-input-port" placeholder="993">
+    </div>
+    <div class="form-row">
+        <label for="node-input-userid"><i class="fa fa-user"></i> Userid</label>
+        <input type="text" id="node-input-userid">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-password"><i class="fa fa-lock"></i> Password</label>
+        <input type="password" id="node-input-password">
+    </div>
+    <br/>
+    <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="Name">
+    </div>
+    <div class="form-tips" id="node-tip"><b>Note:</b> Copied credentials from global emailkeys.js file.</div>
+    <div id="node-input-tip" class="form-tips">Tip: <b>ONLY</b> retrieves the single most recent email.</div>
+</script>
+
+<script type="text/x-red" data-help-name="e-mail in">
+    <p>Repeatedly gets a <b>single email</b> from an IMAP server and forwards on as a msg if not already seen.</p>
+    <p>The subject is loaded into <b>msg.topic</b> and <b>msg.payload</b> is the plain text body.
+       If there is text/html then that is returned in <b>msg.html</b>. <b>msg.from</b> and <b>msg.date</b> are also set if you need them.</p>
+    <p>Uses the imap module.</p>
+    <p><b>Note:</b> this node <i>only</i> gets the most recent single email from the inbox, so set the repeat (polling) time appropriately.</p>
+</script>
+
+<script type="text/javascript">
+(function() {
+    RED.nodes.registerType('e-mail in',{
+        category: 'social-input',
+        color:"#c7e9c0",
+        defaults: {
+            repeat: {value:"300",required:true},
+            server: {value:"imap.gmail.com",required:true},
+            port: {value:"993",required:true},
+            name: {value:""}
+        },
+        credentials: {
+            userid: {type:"text"},
+            password: {type: "password"},
+            global: { type:"boolean"}
+        },
+        inputs:0,
+        outputs:1,
+        icon: "envelope.png",
+        label: function() {
+            return this.name||"email";
+        },
+        labelStyle: function() {
+            return (this.name||!this.topic)?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            if (this.credentials.global) {
+                $('#node-tip').show();
+            } else {
+                $('#node-tip').hide();
+            };
+        }
+    });
+})();
+</script>

nodes/core/social/61-email.js

@@ -0,0 +1,260 @@
+/**
+ * Copyright 2013,2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var nodemailer = require("nodemailer");
+    var Imap = require('imap');
+
+    //console.log(nodemailer.Transport.transports.SMTP.wellKnownHosts);
+
+    try {
+        var globalkeys = RED.settings.email || require(process.env.NODE_RED_HOME+"/../emailkeys.js");
+    } catch(err) {
+    }
+
+    function EmailNode(n) {
+        RED.nodes.createNode(this,n);
+        this.topic = n.topic;
+        this.name = n.name;
+        this.outserver = n.server;
+        this.outport = n.port;
+        var flag = false;
+        if (this.credentials && this.credentials.hasOwnProperty("userid")) {
+            this.userid = this.credentials.userid;
+        } else {
+            if (globalkeys) {
+                this.userid = globalkeys.user;
+                flag = true;
+            } else {
+                this.error("No e-mail userid set");
+            }
+        }
+        if (this.credentials && this.credentials.hasOwnProperty("password")) {
+            this.password = this.credentials.password;
+        } else {
+            if (globalkeys) {
+                this.password = globalkeys.pass;
+                flag = true;
+            } else {
+                this.error("No e-mail password set");
+            }
+        }
+        if (flag) {
+            RED.nodes.addCredentials(n.id,{userid:this.userid, password:this.password, global:true});
+        }
+        var node = this;
+
+        var smtpTransport = nodemailer.createTransport({
+            host: node.outserver,
+            port: node.outport,
+            secure: true,
+            auth: {
+                user: node.userid,
+                pass: node.password
+            }
+        });
+
+        this.on("input", function(msg) {
+            if (smtpTransport) {
+                node.status({fill:"blue",shape:"dot",text:"sending"});
+                if (msg.to && node.name && (msg.to !== node.name)) {
+                    node.warn("Deprecated: msg properties should not override set node properties. See bit.ly/nr-override-msg-props");
+                }
+                var sendopts = { from: node.userid };   // sender address
+                sendopts.to = msg.to || node.name; // comma separated list of addressees
+                sendopts.subject = msg.topic || msg.title || "Message from Node-RED"; // subject line
+                if (Buffer.isBuffer(msg.payload)) { // if it's a buffer in the payload then auto create an attachment instead
+                    sendopts.attachments = [ { content: msg.payload, filename:(msg.filename.replace(/^.*[\\\/]/, '') || "file.bin") } ];
+                    if (msg.hasOwnProperty("headers") && msg.headers.hasOwnProperty("content-type")) {
+                        sendopts.attachments[0].contentType = msg.headers["content-type"];
+                    }
+                    // Create some body text..
+                    sendopts.text = "Your file from Node-RED is attached : "+(msg.filename.replace(/^.*[\\\/]/, '') || "file.bin")+ (msg.hasOwnProperty("description") ? "\n\n"+msg.description : "");
+                }
+                else {
+                    var payload = RED.util.ensureString(msg.payload);
+                    sendopts.text =  payload; // plaintext body
+                    if (/<[a-z][\s\S]*>/i.test(payload)) { sendopts.html = payload; } // html body
+                    if (msg.attachments) { sendopts.attachments = msg.attachments; } // add attachments
+                }
+                smtpTransport.sendMail(sendopts, function(error, info) {
+                    if (error) {
+                        node.error(error);
+                        node.status({fill:"red",shape:"ring",text:"send failed"});
+                    } else {
+                        node.log("Message sent: " + info.response);
+                        node.status({});
+                    }
+                });
+            }
+            else { node.warn("No Email credentials found. See info panel."); }
+        });
+    }
+    RED.nodes.registerType("e-mail",EmailNode,{
+        credentials: {
+            userid: {type:"text"},
+            password: {type: "password"},
+            global: { type:"boolean"}
+        }
+    });
+
+    function EmailInNode(n) {
+        RED.nodes.createNode(this,n);
+        this.name = n.name;
+        this.repeat = n.repeat * 1000 || 300000;
+        this.inserver = n.server || globalkeys.server || "imap.gmail.com";
+        this.inport = n.port || globalkeys.port || "993";
+        var flag = false;
+
+        if (this.credentials && this.credentials.hasOwnProperty("userid")) {
+            this.userid = this.credentials.userid;
+        } else {
+            if (globalkeys) {
+                this.userid = globalkeys.user;
+                flag = true;
+            } else {
+                this.error("No e-mail userid set");
+            }
+        }
+        if (this.credentials && this.credentials.hasOwnProperty("password")) {
+            this.password = this.credentials.password;
+        } else {
+            if (globalkeys) {
+                this.password = globalkeys.pass;
+                flag = true;
+            } else {
+                this.error("No e-mail password set");
+            }
+        }
+        if (flag) {
+            RED.nodes.addCredentials(n.id,{userid:this.userid, password:this.password, global:true});
+        }
+
+        var node = this;
+        this.interval_id = null;
+        var oldmail = {};
+
+        var imap = new Imap({
+            user: node.userid,
+            password: node.password,
+            host: node.inserver,
+            port: node.inport,
+            tls: true,
+            tlsOptions: { rejectUnauthorized: false },
+            connTimeout: node.repeat,
+            authTimeout: node.repeat
+        });
+
+        if (!isNaN(this.repeat) && this.repeat > 0) {
+            node.log("repeat = "+this.repeat);
+            this.interval_id = setInterval( function() {
+                node.emit("input",{});
+            }, this.repeat );
+        }
+
+        this.on("input", function(msg) {
+            imap.once('ready', function() {
+                node.status({fill:"blue",shape:"dot",text:"fetching"});
+                var pay = {};
+                imap.openBox('INBOX', false, function(err, box) {
+                    if (box.messages.total > 0) {
+                        var f = imap.seq.fetch(box.messages.total + ':*', { markSeen:true, bodies: ['HEADER.FIELDS (FROM SUBJECT DATE)','TEXT'] });
+                        f.on('message', function(msg, seqno) {
+                            node.log('message: #'+ seqno);
+                            var prefix = '(#' + seqno + ') ';
+                            msg.on('body', function(stream, info) {
+                                var buffer = '';
+                                stream.on('data', function(chunk) {
+                                    buffer += chunk.toString('utf8');
+                                });
+                                stream.on('end', function() {
+                                    if (info.which !== 'TEXT') {
+                                        pay.from = Imap.parseHeader(buffer).from[0];
+                                        pay.topic = Imap.parseHeader(buffer).subject[0];
+                                        pay.date = Imap.parseHeader(buffer).date[0];
+                                    } else {
+                                        var parts = buffer.split("Content-Type");
+                                        for (var p = 0; p < parts.length; p++) {
+                                            if (parts[p].indexOf("text/plain") >= 0) {
+                                                pay.payload = parts[p].split("\n").slice(1,-2).join("\n").trim();
+                                            }
+                                            if (parts[p].indexOf("text/html") >= 0) {
+                                                pay.html = parts[p].split("\n").slice(1,-2).join("\n").trim();
+                                            }
+                                        }
+                                        //pay.body = buffer;
+                                    }
+                                });
+                            });
+                            msg.on('end', function() {
+                                //node.log('Finished: '+prefix);
+                            });
+                        });
+                        f.on('error', function(err) {
+                            node.warn('fetch error: ' + err);
+                            node.status({fill:"red",shape:"ring",text:"fetch error"});
+                        });
+                        f.on('end', function() {
+                            if (JSON.stringify(pay) !== oldmail) {
+                                node.send(pay);
+                                oldmail = JSON.stringify(pay);
+                                node.log('received new email: '+pay.topic);
+                            }
+                            else { node.log('duplicate not sent: '+pay.topic); }
+                            //node.status({fill:"green",shape:"dot",text:"ok"});
+                            node.status({});
+                            imap.end();
+                        });
+                    }
+                    else {
+                        node.log("you have achieved inbox zero");
+                        //node.status({fill:"green",shape:"dot",text:"ok"});
+                        node.status({});
+                        imap.end();
+                    }
+                });
+            });
+            node.status({fill:"grey",shape:"dot",text:"connecting"});
+            imap.connect();
+        });
+
+        imap.on('error', function(err) {
+            node.log(err);
+            node.status({fill:"red",shape:"ring",text:"connect error"});
+        });
+
+        this.on("error", function(err) {
+            node.log("error: ",err);
+        });
+
+        this.on("close", function() {
+            if (this.interval_id != null) {
+                clearInterval(this.interval_id);
+            }
+            if (imap) { imap.destroy(); }
+        });
+
+        node.emit("input",{});
+    }
+    RED.nodes.registerType("e-mail in",EmailInNode,{
+        credentials: {
+            userid: {type:"text"},
+            password: {type: "password"},
+            global: { type:"boolean"}
+        }
+    });
+};

nodes/core/social/91-irc.html

@@ -0,0 +1,206 @@
+<!--
+  Copyright 2013,2014 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="irc in">
+    <div class="form-row">
+        <label for="node-input-ircserver"><i class="fa fa-globe"></i> IRC Server</label>
+        <input type="text" id="node-input-ircserver">
+    </div>
+    <div class="form-row">
+        <label for="node-input-channel"><i class="fa fa-random"></i> Channel</label>
+        <input type="text" id="node-input-channel" placeholder="#nodered">
+    </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="Name">
+    </div>
+    <div class="form-tips">The channel to join must start with a # (as per normal irc rules...)<br/>
+    You may join multiple channels by comma separating a list - #chan1,#chan2,etc.</div>
+</script>
+
+<script type="text/x-red" data-help-name="irc in">
+    <p>Connects to a channel on an IRC server.</p>
+    <p>You may join multiple channels by comma separating a list - #chan1,#chan2,#etc.</p>
+    <p>Any messages on that channel will appear on the <code>msg.payload</code> at the output,
+    while <code>msg.topic</code> will contain who it is from.
+    <code>msg.to</code> contains either the name of the channel or PRIV in the case of a pm.</p>
+    <p>The second output provides a <code>msg.payload</code> that has any status messages such as joins, parts, kicks etc.</p>
+    <p>The type of the status message is set as <code>msg.payload.type</code>.</p>
+    <p>The possible status types are: <br />
+    <table border="1" cellpadding="1" cellspacing="1">
+    <thead>
+        <tr>
+            <th scope="col">Type</th>
+            <th scope="col">Description</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>message</td>
+            <td>message is sent into the channel</td>
+        </tr>
+        <tr>
+            <td>pm</td>
+            <td>private message to the bot</td>
+        </tr>
+        <tr>
+            <td>join</td>
+            <td>a user joined the channel (also triggered when the bot joins a channel)</td>
+        </tr>
+        <tr>
+            <td>invite</td>
+            <td>the bot is being invited to a channel</td>
+        </tr>
+        <tr>
+            <td>part</td>
+            <td>a user leaves a channel</td>
+        </tr>
+        <tr>
+            <td>quit</td>
+            <td>a user quits a channel</td>
+        </tr>
+        <tr>
+            <td>kick</td>
+            <td>a user is kicked from a channel</td>
+        </tr>
+        <tr>
+            <td>names</td>
+            <td>retrieves the list of users when the bot joins a channel</td>
+        </tr>
+    </tbody>
+</table>
+</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('irc in',{
+        category: 'social-input',
+        defaults: {
+            name: {value:""},
+            ircserver: {type:"irc-server", required:true},
+            channel: {value:"",required:true,validate:RED.validators.regex(/^#/)}
+        },
+        color:"Silver",
+        inputs:0,
+        outputs:2,
+        icon: "hash.png",
+        label: function() {
+            var ircNode = RED.nodes.node(this.ircserver);
+            return this.name || (ircNode ? ircNode.label() : "irc");
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            if ((this.ircserver !== undefined) && (this.ircserver !== "")) {
+                this.channel = this.channel || RED.nodes.node(this.ircserver).channel;
+                $("#node-input-channel").val(this.channel);
+            }
+            else { this.channel = this.channel; }
+            $("#node-input-channel").val(this.channel);
+        }
+    });
+</script>
+
+
+<script type="text/x-red" data-template-name="irc out">
+    <div class="form-row">
+        <label for="node-input-ircserver"><i class="fa fa-globe"></i> IRC Server</label>
+        <input type="text" id="node-input-ircserver">
+    </div>
+    <div class="form-row">
+        <label for="node-input-channel"><i class="fa fa-random"></i> Channel</label>
+        <input type="text" id="node-input-channel" placeholder="#nodered">
+    </div>
+    <div class="form-row">
+        <label for="node-input-sendObject"><i class="fa fa-arrows"></i> Action</label>
+        <select type="text" id="node-input-sendObject" style="display: inline-block; vertical-align: middle; width:70%;">
+            <option value="pay">Send payload to channel(s)</option>
+            <option value="true">Use msg.topic to set nickname or channel(s)</option>
+            <option value="false">Send complete msg object to channel(s)</option>
+        </select>
+    </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="Name">
+    </div>
+    <div class="form-tips">The channel to join must start with a # (as per normal irc rules...)<br/>
+    Sending the complete object will stringify the whole msg object before sending.</div>
+</script>
+
+<script type="text/x-red" data-help-name="irc out">
+    <p>Sends messages to a channel on an IRC server</p>
+    <p>You can send just the <code>msg.payload</code>, or the complete <code>msg</code> object to the selected channel,
+    or you can select to use <code>msg.topic</code> to send the <code>msg.payload</code> to a specific user (private message) or channel.</p>
+    <p>If multiple output channels are listed (eg. #chan1,#chan2), then the message will be sent to all of them.</p>
+    <p><b>Note:</b> you can only send to channels you have previously joined so they MUST be specified in the node - even if you then decide to use a subset in msg.topic</p>
+    <p>You may send RAW commands using <code>msg.raw</code> - This must contain an array of parameters - eg. <pre>["privmsg","#nodered","Hello world"]</pre></p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('irc out',{
+        category: 'social-output',
+        defaults: {
+            name: {value:""},
+            sendObject: {value:"pay", required:true},
+            ircserver: {type:"irc-server", required:true},
+            channel: {value:"",required:true,validate:RED.validators.regex(/^#/)}
+        },
+        color:"Silver",
+        inputs:1,
+        outputs:0,
+        icon: "hash.png",
+        align: "right",
+        label: function() {
+            return this.name || (this.ircserver ? RED.nodes.node(this.ircserver).label() : "irc");
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            if ((this.ircserver !== undefined) && (this.ircserver !== "")) {
+                this.channel = this.channel || RED.nodes.node(this.ircserver).channel;
+                $("#node-input-channel").val(this.channel);
+            }
+            else { this.channel = this.channel; }
+        }
+    });
+</script>
+
+
+<script type="text/x-red" data-template-name="irc-server">
+    <div class="form-row">
+        <label for="node-config-input-server"><i class="fa fa-globe"></i> IRC Server</label>
+        <input type="text" id="node-config-input-server" placeholder="irc.freenode.net">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-nickname"><i class="fa fa-user"></i> Nickname</label>
+        <input type="text" id="node-config-input-nickname" placeholder="joe123">
+    </div>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('irc-server',{
+        category: 'config',
+        defaults: {
+            server: {value:"",required:true},
+            nickname: {value:"",required:true}
+        },
+        label: function() {
+            return this.server;
+        }
+    });
+</script>

nodes/core/social/91-irc.js

@@ -0,0 +1,277 @@
+/**
+ * Copyright 2013,2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var irc = require("irc");
+
+    // The Server Definition - this opens (and closes) the connection
+    function IRCServerNode(n) {
+        RED.nodes.createNode(this,n);
+        this.server = n.server;
+        this.channel = n.channel;
+        this.nickname = n.nickname;
+        this.lastseen = 0;
+        this.ircclient = null;
+        this.on("close", function() {
+            if (this.ircclient != null) {
+                this.ircclient.removeAllListeners();
+                this.ircclient.disconnect();
+            }
+        });
+    }
+    RED.nodes.registerType("irc-server",IRCServerNode);
+
+
+    // The Input Node
+    function IrcInNode(n) {
+        RED.nodes.createNode(this,n);
+        this.ircserver = n.ircserver;
+        this.serverConfig = RED.nodes.getNode(this.ircserver);
+        this.channel = n.channel || this.serverConfig.channel;
+        var node = this;
+        if (node.serverConfig.ircclient === null) {
+            node.log("CONNECT: "+node.serverConfig.server);
+            node.status({fill:"grey",shape:"dot",text:"connecting"});
+            node.serverConfig.ircclient = new irc.Client(node.serverConfig.server, node.serverConfig.nickname,{autoConnect:true,autoRejoin:false,floodProtection:true,retryDelay:20000});
+            node.serverConfig.ircclient.setMaxListeners(0);
+            node.serverConfig.ircclient.addListener('error', function(message) {
+                if (RED.settings.verbose) { node.log("ERR: "+JSON.stringify(message)); }
+            });
+            node.serverConfig.ircclient.addListener('netError', function(message) {
+                node.serverConfig.lastseen = Date.now();
+                if (RED.settings.verbose) { node.log("NET: "+JSON.stringify(message)); }
+                node.status({fill:"red",shape:"ring",text:"net error"});
+            });
+            node.serverConfig.ircclient.addListener('connect', function() {
+                node.serverConfig.lastseen = Date.now();
+                if (RED.settings.verbose) { node.log("CONNECTED "); }
+            });
+            node.serverConfig.ircclient.addListener('registered', function(message) {
+                node.serverConfig.lastseen = Date.now();
+                node.log(node.serverConfig.ircclient.nick+" ONLINE: "+message.server);
+                node.status({fill:"yellow",shape:"dot",text:"connected"});
+                node.serverConfig.ircclient.join( node.channel, function(data) {
+                    node.log(data+" JOINED: "+node.channel);
+                    node.status({fill:"green",shape:"dot",text:"joined"});
+                });
+            });
+            node.serverConfig.ircclient.addListener('ping', function(server) {
+                node.serverConfig.lastseen = Date.now();
+                if (RED.settings.verbose) { node.log("PING from "+JSON.stringify(server)); }
+                node.status({fill:"green",shape:"dot",text:"ok"});
+            });
+            node.serverConfig.ircclient.addListener('quit', function(nick, reason, channels, message) {
+                node.serverConfig.lastseen = Date.now();
+                if (RED.settings.verbose) { node.log("QUIT: "+nick+" "+reason+" "+channels+" "+JSON.stringify(message)); }
+                node.status({fill:"grey",shape:"ring",text:"quit"});
+                //node.serverConfig.ircclient.disconnect( function() {
+                //    node.serverConfig.ircclient.connect();
+                //});
+                //if (RED.settings.verbose) { node.log("restart"); }          // then retry
+            });
+            node.serverConfig.ircclient.addListener('raw', function (message) { // any message received means we are alive
+                //console.log("RAW:"+JSON.stringify(message));
+                if (message.commandType === "reply") {
+                    //console.log("RAW:"+JSON.stringify(message));
+                    node.serverConfig.lastseen = Date.now();
+                }
+            });
+            node.recon = setInterval( function() {
+                //console.log("CHK ",(Date.now()-node.serverConfig.lastseen)/1000);
+                if ((Date.now()-node.serverConfig.lastseen) > 240000) {     // if more than 4 mins since last seen
+                    node.serverConfig.ircclient.send.apply(node.serverConfig.ircclient,["TIME"]);     // request time to check link
+                }
+                if ((Date.now()-node.serverConfig.lastseen) > 300000) {     // If more than 5 mins
+                    //node.serverConfig.ircclient.disconnect();
+                    //node.serverConfig.ircclient.connect();
+                    node.status({fill:"grey",shape:"ring",text:"no connection"});
+                    if (RED.settings.verbose) { node.log("CONNECTION LOST ?"); }
+                }
+                //node.serverConfig.ircclient.send.apply(node.serverConfig.ircclient,["TIME"]); // request time to check link
+            }, 60000); // check every 1 min
+            //node.serverConfig.ircclient.connect();
+        }
+        else { node.status({text:""}); }
+        node.ircclient = node.serverConfig.ircclient;
+
+        node.ircclient.addListener('registered', function(message) {
+            //node.log(node.ircclient.nick+" ONLINE");
+            node.status({fill:"yellow",shape:"dot",text:"connected"});
+            node.ircclient.join( node.channel, function(data) {
+                // node.log(data+" JOINED "+node.channel);
+                node.status({fill:"green",shape:"dot",text:"joined"});
+            });
+        });
+        node.ircclient.addListener('message', function (from, to, message) {
+            //node.log(from + ' => ' + to + ' : ' + message);
+            if (~node.channel.toLowerCase().indexOf(to.toLowerCase())) {
+                var msg = { "topic":from, "from":from, "to":to, "payload":message };
+                node.send([msg,null]);
+            }
+            //else { console.log(node.channel,to); }
+        });
+        node.ircclient.addListener('pm', function(from, message) {
+            //node.log("PM => "+from + ': ' + message);
+            var msg = { "topic":from, "from":from, "to":"PRIV", "payload":message };
+            node.send([msg,null]);
+        });
+        node.ircclient.addListener('join', function(channel, who) {
+            var msg = { "payload": { "type":"join", "who":who, "channel":channel } };
+            node.send([null,msg]);
+            //node.log(who+' has joined '+channel);
+        });
+        node.ircclient.addListener('invite', function(channel, from, message) {
+            var msg = { "payload": { "type":"invite", "who":from, "channel":channel, "message":message } };
+            node.send([null,msg]);
+            //node.log(from+' sent invite to '+channel+': '+message);
+        });
+        node.ircclient.addListener('part', function(channel, who, reason) {
+            var msg = { "payload": { "type":"part", "who":who, "channel":channel, "reason":reason } };
+            node.send([null,msg]);
+            //node.log(who+' has left '+channel+': '+reason);
+        });
+        node.ircclient.addListener('quit', function(nick, reason, channels, message) {
+            var msg = { "payload": { "type":"quit", "who":nick, "channel":channels, "reason":reason } };
+            node.send([null,msg]);
+            //node.log(nick+' has quit '+channels+': '+reason);
+        });
+        node.ircclient.addListener('kick', function(channel, who, by, reason) {
+            var msg = { "payload": { "type":"kick", "who":who, "channel":channel, "by":by, "reason":reason } };
+            node.send([null,msg]);
+            //node.log(who+' was kicked from '+channel+' by '+by+': '+reason);
+        });
+        node.ircclient.addListener('names', function (channel, nicks) {
+            var msg = { "payload": { "type": "names", "channel": channel, "names": nicks} };
+            node.send([null, msg]);
+        });
+        node.ircclient.addListener('raw', function (message) { // any message means we are alive
+            node.serverConfig.lastseen = Date.now();
+        });
+        node.on("close", function() {
+            node.ircclient.removeAllListeners();
+            if (node.recon) { clearInterval(node.recon); }
+        });
+    }
+    RED.nodes.registerType("irc in",IrcInNode);
+
+
+    // The Output Node
+    function IrcOutNode(n) {
+        RED.nodes.createNode(this,n);
+        this.sendFlag = n.sendObject;
+        this.ircserver = n.ircserver;
+        this.serverConfig = RED.nodes.getNode(this.ircserver);
+        this.channel = n.channel || this.serverConfig.channel;
+        var node = this;
+        if (node.serverConfig.ircclient === null) {
+            node.log("CONNECT: "+node.serverConfig.server);
+            node.status({fill:"grey",shape:"dot",text:"connecting"});
+            node.serverConfig.ircclient = new irc.Client(node.serverConfig.server, node.serverConfig.nickname,{autoConnect:true,autoRejoin:false,floodProtection:true,retryDelay:20000});
+            node.serverConfig.ircclient.setMaxListeners(0);
+            node.serverConfig.ircclient.addListener('error', function(message) {
+                if (RED.settings.verbose) { node.log("ERR: "+JSON.stringify(message)); }
+            });
+            node.serverConfig.ircclient.addListener('netError', function(message) {
+                node.serverConfig.lastseen = Date.now();
+                if (RED.settings.verbose) { node.log("NET: "+JSON.stringify(message)); }
+                node.status({fill:"red",shape:"ring",text:"net error"});
+            });
+            node.serverConfig.ircclient.addListener('connect', function() {
+                node.serverConfig.lastseen = Date.now();
+                if (RED.settings.verbose) { node.log("CONNECTED "); }
+            });
+            node.serverConfig.ircclient.addListener('registered', function(message) {
+                node.serverConfig.lastseen = Date.now();
+                node.log(node.serverConfig.ircclient.nick+" ONLINE: "+message.server);
+                node.status({fill:"yellow",shape:"dot",text:"connected"});
+                node.serverConfig.ircclient.join( node.channel, function(data) {
+                    node.log(data+" JOINED: "+node.channel);
+                    node.status({fill:"green",shape:"dot",text:"joined"});
+                });
+            });
+            node.serverConfig.ircclient.addListener('ping', function(server) {
+                node.serverConfig.lastseen = Date.now();
+                if (RED.settings.verbose) { node.log("PING from "+JSON.stringify(server)); }
+                node.status({fill:"green",shape:"dot",text:"ok"});
+            });
+            node.serverConfig.ircclient.addListener('quit', function(nick, reason, channels, message) {
+                node.serverConfig.lastseen = Date.now();
+                if (RED.settings.verbose) { node.log("QUIT: "+nick+" "+reason+" "+channels+" "+JSON.stringify(message)); }
+                node.status({fill:"grey",shape:"ring",text:"quit"});
+                //node.serverConfig.ircclient.disconnect( function() {
+                //    node.serverConfig.ircclient.connect();
+                //});
+                //if (RED.settings.verbose) { node.log("restart"); }          // then retry
+            });
+            node.serverConfig.ircclient.addListener('raw', function (message) { // any message received means we are alive
+                //console.log("RAW:"+JSON.stringify(message));
+                if (message.commandType === "reply") {
+                    //console.log("RAW:"+JSON.stringify(message));
+                    node.serverConfig.lastseen = Date.now();
+                }
+            });
+            node.recon = setInterval( function() {
+                //console.log("CHK ",(Date.now()-node.serverConfig.lastseen)/1000);
+                if ((Date.now()-node.serverConfig.lastseen) > 240000) {     // if more than 4 mins since last seen
+                    node.serverConfig.ircclient.send.apply(node.serverConfig.ircclient,["TIME"]);     // request time to check link
+                }
+                if ((Date.now()-node.serverConfig.lastseen) > 300000) {     // If more than 5 mins
+                    //node.serverConfig.ircclient.disconnect();
+                    //node.serverConfig.ircclient.connect();
+                    node.status({fill:"grey",shape:"ring",text:"no connection"});
+                    if (RED.settings.verbose) { node.log("CONNECTION LOST ?"); }
+                }
+                //node.serverConfig.ircclient.send.apply(node.serverConfig.ircclient,["TIME"]); // request time to check link
+            }, 60000); // check every 1 min
+            //node.serverConfig.ircclient.connect();
+        }
+        else { node.status({text:""}); }
+        node.ircclient = node.serverConfig.ircclient;
+
+        node.on("input", function(msg) {
+            if (Object.prototype.toString.call( msg.raw ) === '[object Array]') {
+                if (RED.settings.verbose) { node.log("RAW command:"+msg.raw); }
+                node.ircclient.send.apply(node.ircclient,msg.raw);
+            }
+            else {
+                if (msg._topic) { delete msg._topic; }
+                var ch = node.channel.split(","); // split on , so we can send to multiple
+                if (node.sendFlag == "true") { // override channels with msg.topic
+                    if ((msg.hasOwnProperty('topic'))&&(typeof msg.topic === "string")) {
+                        ch = msg.topic.split(","); // split on , so we can send to multiple
+                    }
+                    else { node.warn("msg.topic not set"); }
+                }
+                for (var c = 0; c < ch.length; c++) {
+                    if (node.sendFlag == "false") { // send whole message object to each channel
+                        node.ircclient.say(ch[c], JSON.stringify(msg));
+                    }
+                    else { // send just the payload to each channel
+                        if (typeof msg.payload === "object") { msg.payload = JSON.stringify(msg.payload); }
+                        node.ircclient.say(ch[c], msg.payload);
+                    }
+                }
+            }
+        });
+
+        node.on("close", function() {
+            node.ircclient.removeAllListeners();
+            if (node.recon) { clearInterval(node.recon); }
+        });
+    }
+    RED.nodes.registerType("irc out",IrcOutNode);
+}

nodes/core/storage/28-tail.html

@@ -16,7 +16,7 @@
 
 <script type="text/x-red" data-template-name="tail">
     <div class="form-row node-input-filename">
-         <label for="node-input-filename"><i class="icon-file"></i> Filename</label>
+         <label for="node-input-filename"><i class="fa fa-file"></i> Filename</label>
          <input type="text" id="node-input-filename" placeholder="Filename">
     </div>
     <div class="form-row">
@@ -25,15 +25,15 @@
         <label for="node-input-split" style="width: 70%;">Split lines if we see \n ?</label>
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
-    <div class="form-tips">WON'T work on Windows.</div>
+    <!-- <div class="form-tips">WON'T work on Windows.</div> -->
 </script>
 
 <script type="text/x-red" data-help-name="tail">
-	<p>Tails (watches for things to be added) to the configured file. (Linux/Mac ONLY)</p>
-	<p>This won't work on Windows filesystems (as it relies on the tail -f command) so we will probably have to hide it in future.</p>
+    <p>Tails (watches for things to be added) to the configured file. (Linux/Mac ONLY)</p>
+    <p>This won't work on Windows filesystems, as it relies on the tail -F command.</p>
 </script>
 
 <script type="text/javascript">

nodes/core/storage/28-tail.js

@@ -0,0 +1,69 @@
+/**
+ * Copyright 2013, 2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var spawn = require('child_process').spawn;
+    var plat = require('os').platform();
+
+    if (plat.match(/^win/)) {
+        throw "Info : Currently not supported on Windows.";
+    }
+
+    function TailNode(n) {
+        RED.nodes.createNode(this,n);
+
+        this.filename = n.filename;
+        this.split = n.split;
+        var node = this;
+
+        var err = "";
+        // TODO: rewrite to use node-tail
+        var tail = spawn("tail", ["-F", "-n", "0", this.filename]);
+        tail.stdout.on("data", function (data) {
+            if (node.split) {
+                // TODO: allow customisation of the line break - as we do elsewhere
+                var strings = data.toString().split("\n");
+                for (var s in strings) {
+                    //TODO: should we really filter blanks? Is that expected?
+                    if (strings[s] !== "") {
+                        node.send({
+                            topic: node.filename,
+                            payload: strings[s]
+                        });
+                    }
+                }
+            }
+            else {
+                var msg = {
+                    topic:node.filename,
+                    payload: data.toString()
+                };
+                node.send(msg);
+            }
+        });
+
+        tail.stderr.on("data", function(data) {
+            node.error(data.toString());
+        });
+
+        this.on("close", function() {
+            if (tail) { tail.kill(); }
+        });
+    }
+
+    RED.nodes.registerType("tail",TailNode);
+}

nodes/core/storage/50-file.html

@@ -0,0 +1,120 @@
+<!--
+  Copyright 2013, 2014 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="file">
+    <div class="form-row node-input-filename">
+         <label for="node-input-filename"><i class="fa fa-file"></i> Filename</label>
+         <input type="text" id="node-input-filename" placeholder="Filename">
+    </div>
+    <div class="form-row">
+        <label for="node-input-overwriteFile"><i class="fa fa-random"></i> Action</label>
+        <select type="text" id="node-input-overwriteFile" style="display: inline-block; width: 250px; vertical-align: top;">
+            <option value="false">append to file</option>
+            <option value="true">overwrite file</option>
+            <option value="delete">delete file</option>
+        </select>
+    </div>
+    <div class="form-row" id="node-appline">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-appendNewline" placeholder="Name" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-appendNewline" style="width: 70%;">Add newline (\n) to each payload ?</label>
+    </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="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="file">
+    <p>Writes <b>msg.payload</b> to the file specified, e.g. to create a log.</p>
+    <p>The filename can be configured in the node, if left blank it should be set in an incoming message on <b>msg.filename</b>.</p>
+    <p>A newline is added to every message. But this can be turned off if required, for example, to allow binary files to be written.</p>
+    <p>The default behaviour is to append to the file. This can be changed to overwrite the file each time, for example if you want to output a "static" web page or report.</p>
+    <p>This node can also be configured to delete a file if required. <i>Note:</i> Using msg.delete is now deprecated.</p>
+</script>
+
+<script type="text/x-red" data-template-name="file in">
+    <div class="form-row">
+         <label for="node-input-filename"><i class="fa fa-file"></i> Filename</label>
+         <input type="text" id="node-input-filename" placeholder="Filename">
+    </div>
+    <div class="form-row">
+        <label for="node-input-format"><i class="fa fa-sign-out"></i> Output as</label>
+        <select id="node-input-format">
+            <option value="utf8">a utf8 string</option>
+            <option value="">a Buffer</option>
+        </select>
+    </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="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="file in">
+    <p>Reads the specified file and sends the content as <b>msg.payload</b>, and the filename as <b>msg.filename</b>.</p>
+    <p>The filename can be configured in the node, if left blank it should be set in an incoming message on <b>msg.filename</b>.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('file',{
+        category: 'storage-output',
+        defaults: {
+            name: {value:""},
+            filename: {value:""},
+            appendNewline: {value:true},
+            overwriteFile: {value:"false"}
+        },
+        color:"BurlyWood",
+        inputs:1,
+        outputs:0,
+        icon: "file.png",
+        align: "right",
+        label: function() {
+            if (this.overwriteFile === "delete") { return this.name||"delete "+this.filename; }
+            else { return this.name||this.filename; }
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+          $("#node-input-overwriteFile").on("change",function() {
+            if (this.value === "delete") { $("#node-appline").hide(); }
+            else { $("#node-appline").show(); }
+          });
+        }
+    });
+
+    RED.nodes.registerType('file in',{
+        category: 'storage-input',
+        defaults: {
+            name: {value:""},
+            filename: {value:""},
+            format: {value:"utf8"},
+        },
+        color:"BurlyWood",
+        inputs:1,
+        outputs:1,
+        icon: "file.png",
+        label: function() {
+            return this.name||this.filename;
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        }
+    });
+
+</script>

nodes/core/storage/50-file.js

@@ -0,0 +1,119 @@
+/**
+ * Copyright 2013, 2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var fs = require("fs");
+
+    function FileNode(n) {
+        RED.nodes.createNode(this,n);
+        this.filename = n.filename || "";
+        this.appendNewline = n.appendNewline;
+        this.overwriteFile = n.overwriteFile.toString();
+        var node = this;
+        this.on("input",function(msg) {
+            var filename;
+            if (msg.filename) {
+                if (n.filename && (n.filename !== msg.filename)) {
+                    node.warn("Deprecated: msg properties should not override set node properties. See bit.ly/nr-override-msg-props");
+                }
+                filename = msg.filename;
+                node.status({fill:"grey",shape:"dot",text:msg.filename});
+            } else {
+                filename = this.filename;
+            }
+            if (filename === "") {
+                node.warn('No filename specified');
+            } else if (msg.hasOwnProperty('delete')) {
+                node.warn("Deprecated: please use specific delete option in config dialog.");
+                fs.unlink(filename, function (err) {
+                    if (err) { node.error('Failed to delete file : '+err); }
+                });
+            } else if (typeof msg.payload != "undefined") {
+                var data = msg.payload;
+                if ((typeof data === "object")&&(!Buffer.isBuffer(data))) {
+                    data = JSON.stringify(data);
+                }
+                if (typeof data === "boolean") { data = data.toString(); }
+                if ((this.appendNewline)&&(!Buffer.isBuffer(data))) { data += "\n"; }
+                if (this.overwriteFile === "true") {
+                    // using "binary" not {encoding:"binary"} to be 0.8 compatible for a while
+                    //fs.writeFile(filename, data, {encoding:"binary"}, function (err) {
+                    fs.writeFile(filename, data, "binary", function (err) {
+                        if (err) { node.error('Failed to write to file : '+err); }
+                        else if (RED.settings.verbose) { node.log('wrote to file: '+filename); }
+                    });
+                }
+                else if (this.overwriteFile === "delete") {
+                    fs.unlink(filename, function (err) {
+                        if (err) { node.error('Failed to delete file : '+err); }
+                        else if (RED.settings.verbose) { node.log("deleted file: "+filename); }
+                    });
+                }
+                else {
+                    // using "binary" not {encoding:"binary"} to be 0.8 compatible for a while longer
+                    //fs.appendFile(filename, data, {encoding:"binary"}, function (err) {
+                    fs.appendFile(filename, data, "binary", function (err) {
+                        if (err) { node.error('Failed to append to file : '+err); }
+                        else if (RED.settings.verbose) { node.log('appended to file: '+filename); }
+                    });
+                }
+            }
+        });
+    }
+    RED.nodes.registerType("file",FileNode);
+
+
+    function FileInNode(n) {
+        RED.nodes.createNode(this,n);
+
+        this.filename = n.filename || "";
+        this.format = n.format;
+        var node = this;
+        var options = {};
+        if (this.format) {
+            options['encoding'] = this.format;
+        }
+        this.on("input",function(msg) {
+            var filename;
+            if (msg.filename) {
+                if (n.filename && (n.filename !== msg.filename)) {
+                    node.warn("Deprecated: msg properties should not override set node properties. See bit.ly/nr-override-msg-props");
+                }
+                filename = msg.filename;
+            } else {
+                filename = this.filename;
+            }
+            if (filename === "") {
+                node.warn('No filename specified');
+            } else {
+                msg.filename = filename;
+                fs.readFile(filename,options,function(err,data) {
+                    if (err) {
+                        node.error(err);
+                        msg.error = err;
+                        delete msg.payload;
+                    } else {
+                        msg.payload = data;
+                        delete msg.error;
+                    }
+                    node.send(msg);
+                });
+            }
+        });
+    }
+    RED.nodes.registerType("file in",FileInNode);
+}

nodes/core/storage/65-redisout.html

@@ -16,17 +16,17 @@
 
 <script type="text/x-red" data-template-name="redis out">
     <div class="form-row node-input-hostname">
-        <label for="node-input-hostname"><i class="icon-bookmark"></i> Host</label>
+        <label for="node-input-hostname"><i class="fa fa-bookmark"></i> Host</label>
         <input class="input-append-left" type="text" id="node-input-hostname" placeholder="127.0.0.1" style="width: 40%;" ><button id="node-input-hostname-lookup" class="btn input-append-right"><span class="caret"></span></button>
         <label for="node-input-port" style="margin-left: 10px; width: 35px; "> Port</label>
         <input type="text" id="node-input-port" placeholder="6379" style="width:45px">
     </div>
     <div class="form-row">
-        <label for="node-input-key"><i class="icon-briefcase"></i> Key</label>
+        <label for="node-input-key"><i class="fa fa-key"></i> Key</label>
         <input type="text" id="node-input-key" placeholder="Redis Key">
     </div>
     <div class="form-row">
-        <label for="node-input-type"><i class="icon-th"></i> Type</label>
+        <label for="node-input-type"><i class="fa fa-th"></i> Type</label>
         <select type="text" id="node-input-structtype" style="width: 150px;">
         <option value="string">String</option>
         <option value="hash">Hash</option>
@@ -35,18 +35,18 @@
         </select>
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-tips">
         If key is blank, the topic will be used as the key.<br>
-        If type is hash, payload should be field=value.
+        If type is hash, payload should be an object or field=value string.
     </div>
 </script>
 
 <script type="text/x-red" data-help-name="redis out">
-	<p>A Redis output node. Options include Hash, Set, List and String.</p>
-	<p>To run this you need a local Redis server running. For details see <a href="http://redis.io/" target="_new">the Redis site</a>.</p>
+    <p>A Redis output node. Options include Hash, Set, List and String.</p>
+    <p>To run this you need a local Redis server running. For details see <a href="http://redis.io/" target="_new">the Redis site</a>.</p>
 </script>
 
 <script type="text/javascript">

nodes/core/storage/65-redisout.js

@@ -0,0 +1,110 @@
+/**
+ * Copyright 2013 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var redis = require("redis");
+
+    var hashFieldRE = /^([^=]+)=(.*)$/;
+
+    var redisConnectionPool = function() {
+        var connections = {};
+        var obj = {
+            get: function(host,port) {
+                var id = host+":"+port;
+                if (!connections[id]) {
+                    connections[id] = redis.createClient(port,host);
+                    connections[id].on("error",function(err) {
+                        RED.log.error(err);
+                    });
+                    connections[id].on("connect",function() {
+                        if (RED.settings.verbose) { RED.log.info("connected to "+host+":"+port); }
+                    });
+                    connections[id]._id = id;
+                    connections[id]._nodeCount = 0;
+                }
+                connections[id]._nodeCount += 1;
+                return connections[id];
+            },
+            close: function(connection) {
+                connection._nodeCount -= 1;
+                if (connection._nodeCount === 0) {
+                    if (connection) {
+                        clearTimeout(connection.retry_timer);
+                        connection.end();
+                    }
+                    delete connections[connection._id];
+                }
+            }
+        };
+        return obj;
+    }();
+
+
+    function RedisOutNode(n) {
+        RED.nodes.createNode(this,n);
+        this.port = n.port||"6379";
+        this.hostname = n.hostname||"127.0.0.1";
+        this.key = n.key;
+        this.structtype = n.structtype;
+
+        this.client = redisConnectionPool.get(this.hostname,this.port);
+
+        if (this.client.connected) {
+            this.status({fill:"green",shape:"dot",text:"connected"});
+        } else {
+            this.status({fill:"red",shape:"ring",text:"disconnected"},true);
+        }
+
+        var node = this;
+        this.client.on("end", function() {
+            node.status({fill:"red",shape:"ring",text:"disconnected"});
+        });
+        this.client.on("connect", function() {
+            node.status({fill:"green",shape:"dot",text:"connected"});
+        });
+
+        this.on("input", function(msg) {
+            var k = this.key || msg.topic;
+            if (k) {
+                if (this.structtype == "string") {
+                    this.client.set(k,RED.util.ensureString(msg.payload));
+                } else if (this.structtype == "hash") {
+                    if (typeof msg.payload == "object") {
+                        this.client.hmset(k,msg.payload);
+                    } else {
+                        var r = hashFieldRE.exec(msg.payload);
+                        if (r) {
+                            this.client.hset(k,r[1],r[2]);
+                        } else {
+                            this.warn("Invalid payload for redis hash");
+                        }
+                    }
+                } else if (this.structtype == "set") {
+                    this.client.sadd(k,msg.payload);
+                } else if (this.structtype == "list") {
+                    this.client.rpush(k,msg.payload);
+                }
+            } else {
+                this.warn("No key or topic set");
+            }
+        });
+        this.on("close", function() {
+            redisConnectionPool.close(node.client);
+        });
+    }
+    RED.nodes.registerType("redis out",RedisOutNode);
+}

nodes/core/storage/66-mongodb.html

@@ -0,0 +1,231 @@
+<!--
+  Copyright 2013,2014 IBM Corp.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="mongodb">
+    <div class="form-row">
+        <label for="node-config-input-hostname"><i class="fa fa-bookmark"></i> Host</label>
+        <input class="input-append-left" type="text" id="node-config-input-hostname" placeholder="localhost" style="width: 40%;" >
+        <label for="node-config-input-port" style="margin-left: 10px; width: 35px; "> Port</label>
+        <input type="text" id="node-config-input-port" placeholder="27017" style="width:45px">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-db"><i class="fa fa-database"></i> Database</label>
+        <input type="text" id="node-config-input-db" placeholder="test">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-user"><i class="fa fa-user"></i> Username</label>
+        <input type="text" id="node-config-input-user">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-password"><i class="fa fa-lock"></i> Password</label>
+        <input type="password" id="node-config-input-password">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-config-input-name" placeholder="Name">
+    </div>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('mongodb', {
+        category: 'config',
+        color: "rgb(218, 196, 180)",
+        defaults: {
+            hostname: {value: "127.0.0.1", required: true},
+            port: {value: 27017, required: true},
+            db: {value: "", required: true},
+            name: {value: ""}
+        },
+        credentials: {
+            user: {type: "text"},
+            password: {type: "password"}
+        },
+        label: function() {
+            return this.name || this.hostname + ":" + this.port + "/" + this.db;
+        }
+    });
+</script>
+
+
+<script type="text/x-red" data-template-name="mongodb out">
+    <div class="form-row">
+        <label for="node-input-mongodb"><i class="fa fa-bookmark"></i> Server</label>
+        <input type="text" id="node-input-mongodb">
+    </div>
+    <div class="form-row">
+        <label for="node-input-collection"><i class="fa fa-briefcase"></i> Collection</label>
+        <input type="text" id="node-input-collection" placeholder="collection">
+    </div>
+    <div class="form-row">
+        <label for="node-input-operation"><i class="fa fa-wrench"></i> Operation</label>
+        <select type="text" id="node-input-operation" style="display: inline-block; vertical-align: top;">
+            <option value="store">save</option>
+            <option value="insert">insert</option>
+            <option value="update">update</option>
+            <option value="delete">remove</option>
+        </select>
+    </div>
+    <div class="form-row node-input-payonly">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-payonly" placeholder="Only" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-payonly" style="width: 70%;">Only store msg.payload object</label>
+    </div>
+    <div class="form-row node-input-upsert">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-upsert" placeholder="Only" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-upsert" style="width: 70%;">Create a new document if no match found</label>
+    </div>
+    <div class="form-row node-input-multi">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-multi" placeholder="Only" style="display: inline-block; width: auto; vertical-align: top;;">
+        <label for="node-input-multi" style="width: 70%;">Update all matching documents</label>
+    </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="Name">
+    </div>
+    <div class="form-tips" id="node-warning" style="display: none"><b> Tip:</b> If no collection is set, ensure <b>msg.collection</b> will contain the collection name
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="mongodb out">
+    <p>A simple MongoDB output node. Can save, insert, update and remove objects from a chosen collection.</p>
+    <p>Save will update an existing object or insert a new object if one does not already exist.</p>
+    <p>Insert will insert a new object.</p>
+    <p>Save and insert either store <b>msg</b> or <b>msg.payload</b>.</p>
+    <p>Update will modify an existing object or objects. The query to select objects to update uses <b>msg.query</b> and the update to the element uses <b>msg.payload</b>.</p>
+    <p>Update can add a object if it does not exist or update multiple objects.</p>
+    <p>Remove will remove objects that match the query passed in on <b>msg.payload</b>. A blank query will delete <i>all of the objects</i> in the collection.</p>
+    <p>You can either set the collection method in the node config or on <b>msg.collection</b>. Setting it in the node will override <b>msg.collection</b>.</p>
+    <p>By default MongoDB creates an <i>_id</i> property as the primary key - so repeated injections of the same <b>msg</b> will result in many database entries.</p>
+    <p>If this is NOT the desired behaviour - ie. you want repeated entries to overwrite, then you must set the <b>msg._id</b> property to be a constant by the use of a previous function node.</p>
+    <p>This could be a unique constant or you could create one based on some other msg property.</p>
+    <p>Currently we do not limit or cap the collection size at all... this may well change.</p>
+</script>
+
+<script type="text/javascript">
+
+    function oneditprepare() {
+        $("#node-input-operation").change(function () {
+            var id = $("#node-input-operation option:selected").val();
+
+            if (id === "update") {
+                $(".node-input-payonly").hide();
+                $(".node-input-upsert, .node-input-multi").show();
+            } else if (id === "delete") {
+                $(".node-input-payonly, .node-input-upsert, .node-input-multi").hide();
+            } else {
+                $(".node-input-payonly").show();
+                $(".node-input-upsert, .node-input-multi").hide();
+            }
+        });
+
+        $("#node-input-collection").change(function () {
+            if($("#node-input-collection").val() === "") {
+                $("#node-warning").show();
+            } else {
+                $("#node-warning").hide();
+            }
+        });
+    }
+
+    RED.nodes.registerType('mongodb out', {
+        category: 'storage-output',
+        color: "rgb(218, 196, 180)",
+        defaults: {
+            mongodb: {type: "mongodb", required: true},
+            name: {value: ""},
+            collection: {value: ""},
+            payonly: {value: false},
+            upsert: {value: false},
+            multi: {value: false},
+            operation: {value: "store"}
+        },
+        inputs: 1,
+        outputs: 0,
+        icon: "mongodb.png",
+        align: "right",
+        label: function() {
+            var mongoNode = RED.nodes.node(this.mongodb);
+            return this.name || (mongoNode ? mongoNode.label() + " " + this.collection: "mongodb");
+        },
+        labelStyle: function() {
+            return this.name ? "node_label_italic" : "";
+        },
+        oneditprepare: oneditprepare
+    });
+</script>
+
+
+<script type="text/x-red" data-template-name="mongodb in">
+    <div class="form-row">
+        <label for="node-input-mongodb"><i class="fa fa-bookmark"></i> Server</label>
+        <input type="text" id="node-input-mongodb">
+    </div>
+    <div class="form-row">
+        <label for="node-input-collection"><i class="fa fa-briefcase"></i> Collection</label>
+        <input type="text" id="node-input-collection" placeholder="collection">
+    </div>
+    <div class="form-row">
+        <label for="node-input-operation"><i class="fa fa-wrench"></i> Operation</label>
+        <select type="text" id="node-input-operation" style="display: inline-block; vertical-align: top;">
+            <option value="find">find</option>
+            <option value="count">count</option>
+            <option value="aggregate">aggregate</option>
+        </select>
+    </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="Name">
+    </div>
+    <div class="form-tips" id="node-warning" style="display: none"><b> Tip:</b> If no collection is set, ensure <b>msg.collection</b> will contain the collection name
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="mongodb in">
+    <p>Calls a MongoDB collection method based on the selected operator.</p>
+        <p>Find queries a collection using the <b>msg.payload</b> as the query statement as per the .find() function. Optionally, you may also (via a function) set a <b>msg.projection</b> object to constrain the returned fields, a <b>msg.sort</b> object, a <b>msg.limit</b> number and a <b>msg.skip</b> number.</p>
+    <p>Count returns a count of the number of documents in a collection or matching a query using the <b>msg.payload</b> as the query statement.</p>
+    <p>Aggregate provides access to the aggregation pipeline using the <b>msg.payload</b> as the pipeline array.</p>
+    <p>You can either set the collection method in the node config or on <b>msg.collection</b>. Setting it in the node will override <b>msg.collection</b>.</p>
+    <p>See the <a href="http://docs.mongodb.org/manual/reference/method/db.collection.find/" target="new"><i>MongoDB collection methods docs</i></a> for examples.</p>
+    <p>The result is returned in <b>msg.payload</b>.</p>
+</script>
+
+<script type="text/javascript">
+
+    RED.nodes.registerType('mongodb in', {
+        category: 'storage-input',
+        color: "rgb(218, 196, 180)",
+        defaults: {
+            mongodb: {type: "mongodb", required: true},
+            name: {value: ""},
+            collection: {value: ""},
+            operation: {value: "find"}
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: "mongodb.png",
+        label: function() {
+            var mongoNode = RED.nodes.node(this.mongodb);
+            return this.name || (mongoNode ? mongoNode.label() + " " + this.collection: "mongodb");
+        },
+        labelStyle: function() {
+            return this.name ? "node_label_italic" : "";
+        },
+        oneditprepare: oneditprepare
+    });
+</script>

nodes/core/storage/66-mongodb.js

@@ -0,0 +1,243 @@
+/**
+ * Copyright 2013,2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = function(RED) {
+    "use strict";
+    var mongo = require('mongodb');
+    var MongoClient = mongo.MongoClient;
+
+    function MongoNode(n) {
+        RED.nodes.createNode(this,n);
+        this.hostname = n.hostname;
+        this.port = n.port;
+        this.db = n.db;
+        this.name = n.name;
+
+        var url = "mongodb://";
+        if (this.credentials && this.credentials.user && this.credentials.password) {
+            url += this.credentials.user+":"+this.credentials.password+"@";
+        }
+        url += this.hostname+":"+this.port+"/"+this.db;
+
+        this.url = url;
+    }
+
+    RED.nodes.registerType("mongodb",MongoNode,{
+        credentials: {
+            user: {type:"text"},
+            password: {type: "password"}
+        }
+    });
+
+    function ensureValidSelectorObject(selector) {
+        if (selector != null && (typeof selector != 'object' || Buffer.isBuffer(selector))) {
+            return {};
+        }
+        return selector;
+    }
+
+
+    function MongoOutNode(n) {
+        RED.nodes.createNode(this,n);
+        this.collection = n.collection;
+        this.mongodb = n.mongodb;
+        this.payonly = n.payonly || false;
+        this.upsert = n.upsert || false;
+        this.multi = n.multi || false;
+        this.operation = n.operation;
+        this.mongoConfig = RED.nodes.getNode(this.mongodb);
+
+        if (this.mongoConfig) {
+            var node = this;
+            MongoClient.connect(this.mongoConfig.url, function(err, db) {
+                if (err) {
+                    node.error(err);
+                } else {
+                    node.clientDb = db;
+                    var coll;
+                    if (node.collection) {
+                        coll = db.collection(node.collection);
+                    }
+                    node.on("input",function(msg) {
+                        if (!node.collection) {
+                            if (msg.collection) {
+                                coll = db.collection(msg.collection);
+                            } else {
+                                node.error("No collection defined");
+                                return;
+                            }
+                        }
+                        delete msg._topic;
+                        delete msg.collection;
+                        if (node.operation === "store") {
+                            if (node.payonly) {
+                                if (typeof msg.payload !== "object") {
+                                    msg.payload = {"payload": msg.payload};
+                                }
+                                coll.save(msg.payload,function(err, item) {
+                                    if (err) {
+                                        node.error(err);
+                                    }
+                                });
+                            } else {
+                                coll.save(msg,function(err, item) {
+                                    if (err) {
+                                        node.error(err);
+                                    }
+                                });
+                            }
+                        } else if (node.operation === "insert") {
+                            if (node.payonly) {
+                                if (typeof msg.payload !== "object") {
+                                    msg.payload = {"payload": msg.payload};
+                                }
+                                coll.insert(msg.payload, function(err, item) {
+                                    if (err) {
+                                        node.error(err);
+                                    }
+                                });
+                            } else {
+                                coll.insert(msg, function(err,item) {
+                                    if (err) {
+                                        node.error(err);
+                                    }
+                                });
+                            }
+                        } else if (node.operation === "update") {
+                            if (typeof msg.payload !== "object") {
+                                msg.payload = {"payload": msg.payload};
+                            }
+                            var query = msg.query || {};
+                            var payload = msg.payload || {};
+                            var options = {
+                                upsert: node.upsert,
+                                multi: node.multi
+                            };
+
+                            coll.update(query, payload, options, function(err, item) {
+                                if (err) {
+                                    node.error(err + " " + payload);
+                                }
+                            });
+                        } else if (node.operation === "delete") {
+                            coll.remove(msg.payload, function(err, items) {
+                                if (err) {
+                                    node.error(err);
+                                }
+                            });
+                        }
+                    });
+                }
+            });
+        } else {
+            this.error("missing mongodb configuration");
+        }
+
+        this.on("close", function() {
+            if (this.clientDb) {
+                this.clientDb.close();
+            }
+        });
+    }
+    RED.nodes.registerType("mongodb out",MongoOutNode);
+
+    function MongoInNode(n) {
+        RED.nodes.createNode(this,n);
+        this.collection = n.collection;
+        this.mongodb = n.mongodb;
+        this.operation = n.operation || "find";
+        this.mongoConfig = RED.nodes.getNode(this.mongodb);
+
+        if (this.mongoConfig) {
+            var node = this;
+            MongoClient.connect(this.mongoConfig.url, function(err,db) {
+                if (err) {
+                    node.error(err);
+                } else {
+                    node.clientDb = db;
+                    var coll;
+                    if (node.collection) {
+                        coll = db.collection(node.collection);
+                    }
+                    node.on("input", function(msg) {
+                        if (!node.collection) {
+                            if (msg.collection) {
+                                coll = db.collection(msg.collection);
+                            } else {
+                                node.error("No collection defined");
+                                return;
+                            }
+                        }
+                        if (node.operation === "find") {
+                            msg.projection = msg.projection || {};
+                            var selector = ensureValidSelectorObject(msg.payload);
+                            var limit = msg.limit;
+                            if (typeof limit === "string" && !isNaN(limit)) {
+                                limit = Number(limit);
+                            }
+                            var skip = msg.skip;
+                            if (typeof skip === "string" && !isNaN(skip)) {
+                                skip = Number(skip);
+                            }
+
+                            coll.find(selector,msg.projection).sort(msg.sort).limit(limit).skip(skip).toArray(function(err, items) {
+                                if (err) {
+                                    node.error(err);
+                                } else {
+                                    msg.payload = items;
+                                    delete msg.projection;
+                                    delete msg.sort;
+                                    delete msg.limit;
+                                    delete msg.skip;
+                                    node.send(msg);
+                                }
+                            });
+                        } else if (node.operation === "count") {
+                            var selector = ensureValidSelectorObject(msg.payload);
+                            coll.count(selector, function(err, count) {
+                                if (err) {
+                                    node.error(err);
+                                } else {
+                                    msg.payload = count;
+                                    node.send(msg);
+                                }
+                            });
+                        } else if (node.operation === "aggregate") {
+                            msg.payload = (Array.isArray(msg.payload)) ? msg.payload : [];
+                            coll.aggregate(msg.payload, function(err, result) {
+                                if (err) {
+                                    node.error(err);
+                                } else {
+                                    msg.payload = result;
+                                    node.send(msg);
+                                }
+                            });
+                        }
+                    });
+                }
+            });
+        } else {
+            this.error("missing mongodb configuration");
+        }
+
+        this.on("close", function() {
+            if (this.clientDb) {
+                this.clientDb.close();
+            }
+        });
+    }
+    RED.nodes.registerType("mongodb in",MongoInNode);
+}

nodes/deprecated/30-socketin.html

@@ -1,69 +0,0 @@
-<!--
-  Copyright 2013 IBM Corp.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<script type="text/x-red" data-template-name="socket in">
-    <div class="form-row">
-        <label for="node-input-transport"><i class="icon-tasks"></i> Type</label>
-        <select type="text" id="node-input-transport" style="width: 150px;">
-        <option value="http">http listen</option>
-        <option value="tcp">tcp server</option>
-        <!-- <option value="tcpc">tcp client</option> -->
-        <option value="udp">udp socket</option>
-        </select>
-    </div>
-    <div class="form-row">
-        <label for="node-input-port"><i class="icon-random"></i> Port</label>
-        <input type="text" id="node-input-port" placeholder="Port">
-    </div>
-    <div class="form-row">
-        <label for="node-input-topic"><i class="icon-tasks"></i> Topic</label>
-        <input type="text" id="node-input-topic" placeholder="Topic">
-    </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
-    <div class="form-tips">Tip: sends the received data as a Buffer object.</div>
-</script>
-
-<script type="text/x-red" data-help-name="socket in">
-	<p>Provides a input node for http, tcp or udp sockets. Topic is optional. These are server like sockets.</p>
-	<p>The TCP and UDP sockets produce a <i>BUFFER</i> object msg.payload and NOT a String. If you need a String then use .toString() on msg.payload in your next function block.</p>
-	<p>TCP and UDP sockets also provide <b>msg.fromip</b> of the form ipaddress:port</p>
-</script>
-
-<script type="text/javascript">
-    RED.nodes.registerType('socket in',{
-        category: 'deprecated',
-        color:"Silver",
-        defaults: {
-            name: {value:""},
-            topic: {value:""},
-            port: {value:"",required:true},
-            transport: {value:"tcp",required:true}
-        },
-        inputs:0,
-        outputs:1,
-        icon: "bridge-dash.png",
-        label: function() {
-            return this.name||this.topic||("socket "+this.transport+":"+this.port);
-        },
-        labelStyle: function() {
-            return this.name?"node_label_italic":"";
-        }
-    });
-
-</script>

nodes/deprecated/30-socketin.js

@@ -1,152 +0,0 @@
-/**
- * Copyright 2013 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-var RED = require(process.env.NODE_RED_HOME+"/red/red");
-
-function SocketIn(n) {
-    RED.nodes.createNode(this,n);
-    this.warn("node type deprecated - will be removed in a future release");
-    this.port = n.port;
-    this.topic = n.topic;
-    this.trans = (n.transport||n.trans||"").toLowerCase();
-    var node = this;
-    if (this.trans == "http") {
-        var http = require('http');
-        var server = http.createServer(function (req, res) {
-            //node.log("http "+req.url);
-            var msg = {topic:node.topic,payload:req.url.slice(1)};
-            node.send(msg);
-            res.writeHead(304, {'Content-Type': 'text/plain'});
-            res.end('\n');
-        }).listen(node.port);
-        server.on('error', function (e) {
-            if (e.code == 'EADDRINUSE') {
-                setTimeout(node.error('TCP port is already in use - please reconfigure socket.'),250);
-            }
-            else { console.log(e); }
-            server = null;
-        });
-        node.log('http listener at http://127.0.0.1:'+node.port+'/');
-
-        this._close = function() {
-            if (server) server.close();
-            node.log('http listener stopped');
-        }
-    }
-
-    if (this.trans == "tcp") {
-        var net = require('net');
-        var server = net.createServer(function (socket) {
-            var buffer = null;
-            socket.on('data', function (chunk) {
-                if (buffer == null) {
-                    buffer = chunk;
-                } else {
-                    buffer = Buffer.concat([buffer,chunk]);
-                }
-            });
-            socket.on('end', function() {
-                var msg = {topic:node.topic, payload:buffer, fromip:socket.remoteAddress+':'+socket.remotePort};
-                node.send(msg);
-            });
-        });
-        server.on('error', function (e) {
-            if (e.code == 'EADDRINUSE') {
-                setTimeout(node.error('TCP port is already in use - please reconfigure socket.'),250);
-            }
-            else { console.log(e); }
-            server = null;
-        });
-        server.listen(node.port);
-        node.log('tcp listener on port :'+node.port);
-
-        this._close = function() {
-            if (server) server.close();
-            node.log('tcp listener stopped');
-        }
-    }
-
-    if (this.trans == "tcpc") {
-        var net = require('net');
-        var client;
-        var to;
-        function setupTcpClient() {
-            node.log('tcpc connecting to port :'+node.port);
-            client = net.connect({port: node.port}, function() {
-                node.log("tcpc connected");
-            });
-
-            client.on('data', function (data) {
-                var msg = {topic:node.topic, payload:data};
-                node.send(msg);
-            });
-
-            client.on('end', function() {
-                node.log("tcpc socket ended");
-            });
-
-            client.on('close', function() {
-                node.log('tcpc socket closed');
-                to = setTimeout(setupTcpClient, 10000); //Try to reconnect
-            });
-
-            client.on('error', function() {
-                node.log('tcpc socket error');
-                client = null;
-                to = setTimeout(setupTcpClient, 10000); //Try to reconnect
-            });
-        }
-        setupTcpClient();
-
-        this._close = function() {
-            if (client) client.end();
-            //client.destroy();
-            clearTimeout(to);
-            node.log('tcpc stopped client');
-        }
-        setupTcpClient();
-    }
-
-    if (this.trans == "udp") {
-        var dgram = require('dgram');
-        var server = dgram.createSocket('udp4');
-        server.on('listening', function () {
-            var address = server.address();
-            node.log('udp listener at ' + address.address + ":" + address.port);
-        });
-        server.on('message', function (message, remote) {
-            var msg = {topic:node.topic,payload:message,fromip:remote.address+':'+remote.port};
-            node.send(msg);
-        });
-        server.on('error', function (e) {
-            console.log(e);
-            server = null;
-        });
-        server.bind(node.port);
-
-        this._close = function() {
-            if (server) server.close();
-            node.log('udp listener stopped');
-        }
-    }
-
-}
-
-RED.nodes.registerType("socket in",SocketIn);
-
-SocketIn.prototype.close = function() {
-    this._close();
-}

nodes/deprecated/30-socketout.html

@@ -1,66 +0,0 @@
-<!--
-  Copyright 2013 IBM Corp.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<script type="text/x-red" data-template-name="socket out">
-    <div class="form-row">
-        <label for="node-input-host"><i class="icon-bookmark"></i> Host</label>
-        <input type="text" id="node-input-host" placeholder="localhost" style="width: 40%;" >
-
-        <label for="node-input-port" style="margin-left: 10px; width: 35px;"> Port</label>
-        <input type="text" id="node-input-port" placeholder="Port" style="width: 45px">
-    </div>
-    <div class="form-row">
-        <label for="node-input-transport"><i class="icon-tasks"></i> Type</label>
-        <select type="text" id="node-input-transport" style="width: 150px;">
-        <option value="http">http</option>
-        <option value="tcp">tcp</option>
-        <option value="udp">udp</option>
-        </select>
-    </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
-</script>
-
-<script type="text/x-red" data-help-name="socket out">
-	<p>Provides a choice of http, tcp or udp output connections. All connect, send their <b>msg.payload</b> and disconnect.</p>
-	<p>To use broadcast select udp and set the host to be either the subnet broadcast address required or 255.255.255.255</p>
-	<p>If you need a response from an http request use the httpget node instead.</p>
-</script>
-
-<script type="text/javascript">
-    RED.nodes.registerType('socket out',{
-        category: 'deprecated',
-        color:"Silver",
-        defaults: {
-            host: {value:"127.0.0.1",required:true},
-            port: {value:"",required:true},
-            name: {value:""},
-            transport: {value:"tcp",required:true}
-        },
-        inputs:1,
-        outputs:0,
-        icon: "bridge-dash.png",
-        align: "right",
-        label: function() {
-            return this.name||this.topic||("socket "+this.transport+":"+this.port);
-        },
-        labelStyle: function() {
-            return (this.name||!this.topic)?"node_label_italic":"";
-        }
-    });
-</script>

nodes/deprecated/30-socketout.js

@@ -1,65 +0,0 @@
-/**
- * Copyright 2013 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-var RED = require(process.env.NODE_RED_HOME+"/red/red");
-
-function SocketOut(n) {
-    RED.nodes.createNode(this,n);
-    this.warn("node type deprecated - will be removed in a future release");
-    this.host = n.host;
-    this.port = n.port * 1;
-    this.name = n.name;
-    this.trans = n.transport||n.trans||"";
-    var node = this;
-    this.on("input", function(msg) {
-        if (msg != null) {
-            if (this.trans == "http") {
-                var http = require("http");
-                http.get(msg.payload, function(res) {
-                    node.log("http : response : " + res.statusCode);
-                }).on('error', function(e) {
-                    node.error("http : error : " + e.message);
-                });
-            }
-            if (this.trans == "tcp") {
-                var net = require('net');
-                var client = new net.Socket();
-                client.on('error', function (err) {
-                    node.error('tcp : '+err);
-                });
-                client.connect(this.port, this.host, function() {
-                    try { client.end(msg.payload); }
-                    catch (e) { node.error(e); }
-                });
-            }
-            if (this.trans == "udp") {
-                var dgram = require('dgram');
-                var sock = dgram.createSocket('udp4');  // only use ipv4 for now
-                sock.bind(this.port);  // have to bind before you can enable broadcast...
-                sock.setBroadcast(true);  // turn on broadcast
-                var buf = new Buffer(msg.payload);
-                sock.send(buf, 0, buf.length, this.port, this.host, function(err, bytes) {
-                    if (err) node.error("udp : "+err);
-                    //util.log('[socket out] udp :' +bytes);
-                    sock.close();
-                });
-            }
-        }
-    });
-    var node = this;
-}
-
-RED.nodes.registerType("socket out",SocketOut);

nodes/deprecated/32-multicast.html

@@ -1,131 +0,0 @@
-<!--
-  Copyright 2013 IBM Corp.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!--  The Input Node  -->
-<script type="text/x-red" data-template-name="multicast in">
-    <div class="form-row">
-        <label for="node-input-group"><i class="icon-tasks"></i> Group</label>
-        <input type="text" id="node-input-group" placeholder="225.0.18.83" style="width: 40%;">
-        <label for="node-input-port" style="margin-left: 10px; width: 35px;"> Port</label>
-        <input type="text" id="node-input-port" placeholder="Port" style="width: 45px">
-    </div>
-    <div class="form-row">
-        <label for="node-input-iface"><i class="icon-globe"></i> Interface</label>
-        <input type="text" id="node-input-iface" placeholder="eth0">
-    </div>
-    <div class="form-row">
-        <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-base64" placeholder="base64" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-base64" style="width: 70%;">Base64 encode payload ?</label>
-    </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
-    <div class="form-tips">Tip: sends the received data as a Buffer object (not a String).<br/>Make sure your firewall will allow the data in.</div>
-</script>
-
-<script type="text/x-red" data-help-name="multicast in">
-	<p>A multicast udp input node, that produces a <b>msg.payload</b> containing a <i>BUFFER</i> object and NOT a String.</p>
-	<p>If you need a String then use <i>.toString()</i> on <b>msg.payload</b> in your next function block.</p>
-	<p>It also provides <b>msg.fromip</b> of the form ipaddress:port .</p>
-</script>
-
-<script type="text/javascript">
-    RED.nodes.registerType('multicast in',{
-        category: 'deprecated',
-        color:"Silver",
-        defaults: {
-            name: {value:""},
-            group: {value:"",required:true},
-            host: {value:""},
-            iface: {value:""},
-            port: {value:"",required:true,validate:RED.validators.number()},
-            base64: {value:false,required:true},
-            multicast: {value:"true"}
-        },
-        inputs:0,
-        outputs:1,
-        icon: "bridge-dash.png",
-        label: function() {
-            if ((this.group!="") & (this.port!="")) {
-                return this.name||(this.group+":"+this.port);
-            }
-            else { return "multicast in"; }
-        },
-        labelStyle: function() {
-            return this.name?"node_label_italic":"";
-        }
-    });
-</script>
-
-<!--  The Output Node  -->
-<script type="text/x-red" data-template-name="multicast out">
-    <div class="form-row">
-        <label for="node-input-group"><i class="icon-tasks"></i> Group</label>
-        <input type="text" id="node-input-group" placeholder="225.0.18.83" style="width: 40%;">
-        <label for="node-input-port" style="margin-left: 10px; width: 35px;"> Port</label>
-        <input type="text" id="node-input-port" placeholder="Port" style="width: 45px">
-    </div>
-
-    <div class="form-row">
-        <label for="node-input-iface"><i class="icon-globe"></i> Interface</label>
-        <input type="text" id="node-input-iface" placeholder="eth0">
-    </div>
-
-    <div class="form-row">
-        <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-base64" placeholder="base64" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-base64" style="width: 70%;">Decode Base64 encoded payload ?</label>
-    </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
-</script>
-
-<script type="text/x-red" data-help-name="multicast out">
-	<p>This node sends <b>msg.payload</b> to the designated multicast group and port.</p>
-</script>
-
-<script type="text/javascript">
-    RED.nodes.registerType('multicast out',{
-        category: 'deprecated',
-        color:"Silver",
-        defaults: {
-            name: {value:""},
-            group: {value:"",required:true},
-            host: {value:""},
-            iface: {value:""},
-            port: {value:"",required:true,validate:RED.validators.number()},
-            base64: {value:false,required:true},
-            multicast: {value:"true"}
-        },
-        inputs:1,
-        outputs:0,
-        icon: "bridge-dash.png",
-        align: "right",
-        label: function() {
-            if ((this.group!="") & (this.port!="")) {
-                return this.name||(this.group+":"+this.port);
-            }
-            else { return "multicast out"; }
-        },
-        labelStyle: function() {
-            return this.name?"node_label_italic":"";
-        }
-    });
-</script>

nodes/deprecated/32-multicast.js

@@ -1,119 +0,0 @@
-/**
- * Copyright 2013 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-var RED = require(process.env.NODE_RED_HOME+"/red/red");
-var dgram = require('dgram');
-
-// The Input Node
-function MCastIn(n) {
-    RED.nodes.createNode(this,n);
-    this.warn("node type deprecated - will be removed in a future release");
-    this.group = n.group;
-    this.port = n.port;
-    this.host = n.host || null;
-    this.base64 = n.base64;
-    this.iface = n.iface || null;
-    this.multicast = n.multicast;
-    var node = this;
-
-    var server = dgram.createSocket('udp4');
-
-    server.on("error", function (err) {
-        console.log("udp listener error:\n" + err.stack);
-        server.close();
-    });
-
-    server.on('message', function (message, remote) {
-        var msg;
-        if (node.base64) { msg = { payload:message.toString('base64'), fromip:remote.address+':'+remote.port }; }
-        else { msg = { payload:message, fromip:remote.address+':'+remote.port }; }
-        node.send(msg);
-    });
-
-    server.on('listening', function () {
-        var address = server.address();
-        node.log('udp listener at ' + address.address + ":" + address.port);
-        if (node.multicast) {
-            server.setBroadcast(true)
-            server.setMulticastTTL(128);
-            server.addMembership(node.group,node.iface);
-            node.log("udp multicast group "+node.group);
-        }
-    });
-
-    //server.bind(node.port,node.host);
-    server.bind(node.port,node.host);
-
-    this._close = function() {
-        server.close();
-        node.log('udp listener stopped');
-    }
-
-}
-
-MCastIn.prototype.close = function() {
-    this._close();
-}
-RED.nodes.registerType("multicast in",MCastIn);
-
-// The Output Node
-function MCastOut(n) {
-    RED.nodes.createNode(this,n);
-    this.warn("node type deprecated");
-    this.group = n.group;
-    this.port = n.port;
-    this.host = n.host || null;
-    this.base64 = n.base64;
-    this.iface = n.iface || null;
-    this.multicast = n.multicast;
-    var node = this;
-
-    var sock = dgram.createSocket('udp4');  // only use ipv4 for now
-    sock.bind(node.port);           // have to bind before you can enable broadcast...
-    sock.setBroadcast(true);        // turn on broadcast
-    sock.setMulticastTTL(128);
-    sock.addMembership(node.group,node.iface);  // Add to the multicast group
-    node.log('udp multicaster ready on '+node.group+":"+node.port);
-
-    node.on("input", function(msg) {
-        if (msg.payload != null) {
-            console.log("MCast:",msg.payload);
-            var message;
-            if (node.base64) {
-                message = new Buffer(msg.payload,'base64');
-            }
-            else {
-                message = new Buffer(msg.payload);
-            }
-            sock.send(message, 0, message.length, node.port, node.group, function(err, bytes) {
-                if (err) node.error("udp : "+err);
-                //util.log('[socket out] udp :' +bytes);
-            });
-        }
-    });
-
-    this._close = function() {
-        sock.close();
-        node.log('udp multicaster stopped');
-    }
-
-}
-
-RED.nodes.registerType("multicast out",MCastOut);
-
-MCastOut.prototype.close = function() {
-    this._close();
-}

nodes/deprecated/35-rpi-gpio-in.html

@@ -1,69 +0,0 @@
-<!--
-  Copyright 2013 IBM Corp.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<script type="text/x-red" data-template-name="rpi-gpio in">
-    <div class="form-row">
-        <label for="node-input-pin"><i class="icon-asterisk"></i> Pin</label>
-        <select type="text" id="node-input-pin" style="width: 150px;">
-            <option value="7">7</option>
-            <option value="11">11</option>
-            <option value="12">12</option>
-            <option value="13">13</option>
-            <option value="15">15</option>
-            <option value="16">16</option>
-            <option value="18">18</option>
-            <option value="22">22</option>
-         </select>
-    </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
-    </div>
-    <div class="form-row">
-        <label for="node-input-resistor"><i class=" icon-resize-full"></i> Resistor?</label>
-        <select type="text" id="node-input-resistor" style="width: 150px;">
-        <option value="no">no</option>
-        <option value="pullup">pullup</option>
-        <option value="pulldown">pulldown</option>
-        </select>
-    </div>
-    <div class="form-tips">Tip: if pull up/down resistor is selected, the <code>gpio-admin</code> command <em>must</em> be used
-    to do the actual enabling. If 'no' resistor is selected, nothing further needs to be done
-    to use this node. See <code>man gpio-admin</code> for more details.</div>
-</script>
-
-<script type="text/javascript">
-    RED.nodes.registerType('rpi-gpio in',{
-        category: 'deprecated',
-        color:"#c6dbef",
-        defaults: {
-            name: { value:""},
-            resistor: { value: "no"},
-            pin: {value:"",required:true},
-        },
-        inputs:0,
-        outputs:1,
-        icon: "rpi.png",
-        label: function() {
-            return this.name||"Pin: "+this.pin;
-            //+(this.resistor == "no"?"":" ("+(this.resistor=="pullup"?"":"&darr;")+")");
-        },
-        labelStyle: function() {
-            return this.name?"node_label_italic":"";
-        }
-    });
-
-</script>

nodes/deprecated/35-rpi-gpio-in.js

@@ -1,70 +0,0 @@
-/**
- * Copyright 2013 IBM Corp.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
-
-var RED = require(process.env.NODE_RED_HOME+"/red/red");
-var gpio = require("pi-gpio");
-
-function GPIOInNode(n) {
-    RED.nodes.createNode(this,n);
-    this.warn("node type deprecated - will be removed in a future release");
-    this.buttonState = -1;
-    this.pin = n.pin;
-    this.resistor = n.resistor;
-
-    var node = this;
-
-    if (this.pin) {
-        var setupPin =  function(err) {
-            if (err) {
-                node.error(err);
-            } else {
-                node._interval = setInterval(function(){
-                        gpio.read(node.pin, function(err, value) {
-                                if(err){
-                                    node.error(err);
-                                } else{
-                                    if(node.buttonState !== value){
-                                        var previousState = node.buttonState;
-                                        node.buttonState = value;
-                                        if (previousState !== -1) {
-                                            var msg = {payload:node.buttonState};
-                                            node.send(msg);
-                                        }
-                                    }
-                                }
-                        });
-                }, 50);
-            }
-        };
-        if (this.resistor == "no") {
-            gpio.open(this.pin,"input",setupPin());
-        } else {
-            // Assume enabled externally via gpio-admin
-            setupPin();
-        }
-    } else {
-        this.error("Invalid GPIO pin: "+this.pin);
-    }
-}
-
-RED.nodes.registerType("rpi-gpio in",GPIOInNode);
-
-GPIOInNode.prototype.close = function() {
-    clearInterval(this._interval);
-    if (this.resistor == "no") {
-        gpio.close(this.pin);
-    }
-}