frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Only declare node variables inside node declaration.

Browse Source 
Fix for Issue #119
(also reformatted with spaces hence what looks like massive changes...)
This commit is contained in:
Dave C-J 2013-12-21 17:31:05 +00:00
parent 95b8600da7
commit 15669b7f1f
1 changed files with 109 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

229
nodes/core/core/89-delay.js
View File

@ -15,143 +15,132 @@
**/ **/
//Simple node to introduce a pause into a flow //Simple node to introduce a pause into a flow
//Require main module
var RED = require(process.env.NODE_RED_HOME+"/red/red"); var RED = require(process.env.NODE_RED_HOME+"/red/red");
var node;
function random() { function random() {
var wait = node.randomFirst + (node.diff * Math.random()); var wait = node.randomFirst + (node.diff * Math.random());
if (node.buffer.length > 0) { if (node.buffer.length > 0) {
node.send(node.buffer.pop()); node.send(node.buffer.pop());
node.randomID = setTimeout(random,wait); node.randomID = setTimeout(random,wait);
} else { } else {
node.randomID = -1; node.randomID = -1;
} }
} }
//main node definition
function DelayNode(n) { function DelayNode(n) {
RED.nodes.createNode(this,n); RED.nodes.createNode(this,n);
this.pauseType = n.pauseType; this.pauseType = n.pauseType;
this.timeoutUnits = n.timeoutUnits; this.timeoutUnits = n.timeoutUnits;
this.randomUnits = n.randomUnits; this.randomUnits = n.randomUnits;
this.rateUnits = n.rateUnits; this.rateUnits = n.rateUnits;
if (n.timeoutUnits === "milliseconds") { if (n.timeoutUnits === "milliseconds") {
this.timeout = n.timeout; this.timeout = n.timeout;
} else if (n.timeoutUnits === "seconds") { } else if (n.timeoutUnits === "seconds") {
this.timeout = n.timeout * 1000; this.timeout = n.timeout * 1000;
} else if (n.timeoutUnits === "minutes") { } else if (n.timeoutUnits === "minutes") {
this.timeout = n.timeout * (60 * 1000); this.timeout = n.timeout * (60 * 1000);
} else if (n.timeoutUnits === "hours") { } else if (n.timeoutUnits === "hours") {
this.timeout = n.timeout * (60 * 60 * 1000); this.timeout = n.timeout * (60 * 60 * 1000);
} else if (n.timeoutUnits === "days") { } else if (n.timeoutUnits === "days") {
this.timeout = n.timeout * (24 * 60 * 60 * 1000); this.timeout = n.timeout * (24 * 60 * 60 * 1000);
} }
if (n.rateUnits === "second") { if (n.rateUnits === "second") {
this.rate = 1000/n.rate; this.rate = 1000/n.rate;
} else if (n.rateUnits === "minute") { } else if (n.rateUnits === "minute") {
this.rate = (60 * 1000)/n.rate; this.rate = (60 * 1000)/n.rate;
} else if (n.rateUnits === "hour") { } else if (n.rateUnits === "hour") {
this.rate = (60 * 60 * 1000)/n.rate; this.rate = (60 * 60 * 1000)/n.rate;
} else if (n.rateUnits === "day") { } else if (n.rateUnits === "day") {
this.rate = (24 * 60 * 60 * 1000)/n.rate; this.rate = (24 * 60 * 60 * 1000)/n.rate;
} }
if (n.randomUnits === "milliseconds") {
this.randomFirst = n.randomFirst;
this.randomLast = n.randomLast;
} 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);
}
if (n.randomUnits === "milliseconds") { this.diff = this.randomLast - this.randomFirst;
this.randomFirst = n.randomFirst; this.name = n.name;
this.randomLast = n.randomLast; this.idList = [];
} else if (n.randomUnits === "seconds") { this.buffer = [];
this.randomFirst = n.randomFirst * 1000; this.intervalID = -1;
this.randomLast = n.randomLast * 1000; this.randomID = -1;
} else if (n.randomUnits === "minutes") { var node = this;
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; if (this.pauseType === "delay") {
this.on("input", function(msg) {
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.name = n.name; this.on("close", function() {
this.idList = []; for (var i=0; i<this.idList.length; i++ ) {
this.buffer = []; clearTimeout(this.idList[i]);
this.intervalID = -1; }
this.randomID = -1; this.idList = [];
node= this; });
if (this.pauseType === "delay") { } else if (this.pauseType === "rate") {
this.on("input", function(msg) { this.on("input", function(msg) {
var node= this; if ( node.intervalID !== -1) {
var id; node.buffer.push(msg);
id = setTimeout(function(){ if (node.buffer.length > 1000) {
node.idList.splice(node.idList.indexOf(id),1); node.warn(this.name + " buffer exceeded 1000 messages");
node.send(msg); }
}, node.timeout); } else {
this.idList.push(id); node.send(msg);
}); node.intervalID = setInterval(function() {
if (node.buffer.length === 0) {
clearInterval(node.intervalID);
node.intervalID = -1;
}
this.on("close", function() { if (node.buffer.length > 0) {
for (var i=0; i<this.idList.length; i++ ) { node.send(node.buffer.shift());
clearTimeout(this.idList[i]); }
} },node.rate);
this.idList = []; }
}); });
} else if (this.pauseType === "rate") {
this.on("input", function(msg) { this.on("close", function() {
if ( node.intervalID !== -1) { clearInterval(this.intervalID);
node.buffer.push(msg); this.buffer = [];
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) { } else if (this.pauseType === "random") {
node.send(node.buffer.shift()); this.on("input",function(msg){
} node.buffer.push(msg);
},node.rate); if (node.randomID === -1) {
} var wait = node.randomFirst + (node.diff * Math.random());
}); node.randomID = setTimeout(random,wait);
}
});
this.on("close", function() { this.on("close", function (){
clearInterval(this.intervalID); if (this.randomID !== -1) {
this.buffer = []; clearTimeout(this.randomID);
}); }
} else if (this.pauseType === "random") { });
}
this.on("input",function(msg){
node.buffer.push(msg);
if (node.randomID === -1) {
var wait = node.randomFirst + (node.diff * Math.random());
node.randomID = setTimeout(random,wait);
}
});
this.on("close", function (){
if (this.randomID !== -1) {
clearTimeout(node.randomID);
}
});
}
} }
//register node
RED.nodes.registerType("delay",DelayNode); RED.nodes.registerType("delay",DelayNode);