frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix Function node 

accidental leakage of in-progress work
This commit is contained in:
Nick O'Leary 2014-04-02 23:56:46 +01:00
parent bcefa6c9ef
commit 214338eb62
1 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
nodes/core/core/80-function.js
View File

@ -14,59 +14,58 @@
* limitations under the License. * limitations under the License.
**/ **/
module.exports = function(RED) { var RED = require(process.env.NODE_RED_HOME+"/red/red");
var util = require("util"); var util = require("util");
var vm = require("vm"); var vm = require("vm");
var fs = require('fs'); var fs = require('fs');
var fspath = require('path'); var fspath = require('path');
function FunctionNode(n) { function FunctionNode(n) {
RED.nodes.createNode(this,n); RED.nodes.createNode(this,n);
this.name = n.name; this.name = n.name;
this.func = n.func; this.func = n.func;
var functionText = "var results = (function(msg){"+this.func+"\n})(msg);"; var functionText = "var results = (function(msg){"+this.func+"\n})(msg);";
this.topic = n.topic; this.topic = n.topic;
this.context = {global:RED.settings.functionGlobalContext || {}}; this.context = {global:RED.settings.functionGlobalContext || {}};
try { try {
this.script = vm.createScript(functionText); this.script = vm.createScript(functionText);
this.on("input", function(msg) { this.on("input", function(msg) {
if (msg != null) { if (msg != null) {
var sandbox = {msg:msg,console:console,util:util,Buffer:Buffer,context:this.context}; var sandbox = {msg:msg,console:console,util:util,Buffer:Buffer,context:this.context};
try { try {
this.script.runInNewContext(sandbox); this.script.runInNewContext(sandbox);
var results = sandbox.results; var results = sandbox.results;
if (results == null) { if (results == null) {
results = []; results = [];
} else if (results.length == null) { } else if (results.length == null) {
results = [results]; results = [results];
} }
if (msg._topic) { if (msg._topic) {
for (var m in results) { for (var m in results) {
if (results[m]) { if (results[m]) {
if (util.isArray(results[m])) { if (util.isArray(results[m])) {
for (var n in results[m]) { for (var n in results[m]) {
results[m][n]._topic = msg._topic; results[m][n]._topic = msg._topic;
}
} else {
results[m]._topic = msg._topic;
} }
} else {
results[m]._topic = msg._topic;
} }
} }
} }
this.send(results);
} catch(err) {
this.error(err.message);
} }
this.send(results);
} catch(err) {
this.error(err.message);
} }
}); }
} catch(err) { });
this.error(err.message); } catch(err) {
} this.error(err.message);
} }
RED.nodes.registerType("function",FunctionNode);
RED.library.register("functions");
} }
RED.nodes.registerType("function",FunctionNode);
RED.library.register("functions");