diff --git a/lib/timers.js b/lib/timers.js index 2d17bdf27a5d55..c02798f068968f 100644 --- a/lib/timers.js +++ b/lib/timers.js @@ -100,7 +100,7 @@ const unrefedLists = {}; // Schedule or re-schedule a timer. // The item must have been enroll()'d first. -exports.active = function(item) { +const active = exports.active = function(item) { insert(item, false); }; @@ -346,19 +346,19 @@ exports.setTimeout = function(callback, after) { if (process.domain) timer.domain = process.domain; - exports.active(timer); + active(timer); return timer; }; -exports.clearTimeout = function(timer) { +const clearTimeout = exports.clearTimeout = function(timer) { if (timer && (timer[kOnTimeout] || timer._onTimeout)) { timer[kOnTimeout] = timer._onTimeout = null; if (timer instanceof Timeout) { timer.close(); // for after === 0 } else { - exports.unenroll(timer); + unenroll(timer); } } }; @@ -400,7 +400,7 @@ exports.setInterval = function(callback, repeat) { timer._repeat = ontimeout; if (process.domain) timer.domain = process.domain; - exports.active(timer); + active(timer); return timer; @@ -416,7 +416,7 @@ exports.setInterval = function(callback, repeat) { this._handle.start(repeat, 0); } else { timer._idleTimeout = repeat; - exports.active(timer); + active(timer); } } }; @@ -459,7 +459,7 @@ Timeout.prototype.unref = function() { // Prevent running cb again when unref() is called during the same cb if (this._called && !this._repeat) { - exports.unenroll(this); + unenroll(this); return; } @@ -487,7 +487,7 @@ Timeout.prototype.close = function() { this._handle[kOnTimeout] = null; this._handle.close(); } else { - exports.unenroll(this); + unenroll(this); } return this; }; diff --git a/test/parallel/test-timers-api-refs.js b/test/parallel/test-timers-api-refs.js new file mode 100644 index 00000000000000..00d1c1355fe045 --- /dev/null +++ b/test/parallel/test-timers-api-refs.js @@ -0,0 +1,20 @@ +'use strict'; +const common = require('../common'); +const assert = require('assert'); + +// don't verify the globals for this test +common.globalCheck = false; + +// try overriding global APIs to make sure +// they're not relied on by the timers +global.clearTimeout = assert.fail; + +// run timeouts/intervals through the paces +const intv = setInterval(function() {}, 1); + +setTimeout(function() { + clearInterval(intv); +}, 100); + +setTimeout(function() {}, 2); +