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

Merge pull request #532 from hindessm/random-delay-fixes

Browse Source 
Random delay fixes
This commit is contained in:
Nick O'Leary 2015-01-16 15:46:53 +00:00
commit ffe417976c
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,16 +21,6 @@ module.exports = function(RED) {
var MILLIS_TO_NANOS = 1000000; var MILLIS_TO_NANOS = 1000000;
var SECONDS_TO_NANOS = 1000000000; var SECONDS_TO_NANOS = 1000000000;
function random(n) {
var wait = n.randomFirst + (n.diff * Math.random());
if (n.buffer.length > 0) {
n.send(n.buffer.pop());
n.randomID = setTimeout(function() {random(n);},wait);
} else {
n.randomID = -1;
}
}
function DelayNode(n) { function DelayNode(n) {
RED.nodes.createNode(this,n); RED.nodes.createNode(this,n);
@ -62,8 +52,8 @@ module.exports = function(RED) {
} }
if (n.randomUnits === "milliseconds") { if (n.randomUnits === "milliseconds") {
this.randomFirst = n.randomFirst; this.randomFirst = n.randomFirst * 1;
this.randomLast = n.randomLast; this.randomLast = n.randomLast * 1;
} else if (n.randomUnits === "seconds") { } else if (n.randomUnits === "seconds") {
this.randomFirst = n.randomFirst * 1000; this.randomFirst = n.randomFirst * 1000;
this.randomLast = n.randomLast * 1000; this.randomLast = n.randomLast * 1000;
@ -181,18 +171,21 @@ module.exports = function(RED) {
} else if (this.pauseType === "random") { } else if (this.pauseType === "random") {
this.on("input", function(msg) { this.on("input", function(msg) {
node.buffer.push(msg);
if (node.randomID === -1) {
var wait = node.randomFirst + (node.diff * Math.random()); var wait = node.randomFirst + (node.diff * Math.random());
node.randomID = setTimeout(function() {random(node);},wait); var id = setTimeout(function(){
} node.idList.splice(node.idList.indexOf(id),1);
node.send(msg);
}, wait);
this.idList.push(id);
}); });
this.on("close", function() { this.on("close", function() {
if (this.randomID !== -1) { for (var i=0; i<this.idList.length; i++ ) {
clearTimeout(this.randomID); clearTimeout(this.idList[i]);
} }
this.idList = [];
}); });
} }
} }
RED.nodes.registerType("delay",DelayNode); RED.nodes.registerType("delay",DelayNode);

2
test/nodes/core/core/89-delay_spec.js
View File

@ -368,7 +368,7 @@ describe('delayNode', function() {
}); });
it(' randomly delays the message in milliseconds', function(done) { it(' randomly delays the message in milliseconds', function(done) {
randomDelayTest(400, 800, "milliseconds", done); randomDelayTest("400", "800", "milliseconds", done);
}); });
it('randomly delays the message in minutes', function(done) { it('randomly delays the message in minutes', function(done) {