Skip to content

timers: introduce timers/promises #33950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jasnell wants to merge 3 commits into from
Closed

timers: introduce timers/promises #33950

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78edbf6
timers: introduce timers/promises
jasnell Jun 18, 2020
5bb0cb4
fixup! timers: introduce timers/promises
jasnell Jun 22, 2020
c17288d
fixup! fixup! timers: introduce timers/promises
jasnell Jun 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! timers: introduce timers/promises
  • Loading branch information
@jasnell
jasnell committed Jun 22, 2020
commit 5bb0cb40fd51d045e8b32bc38ed19fe2d987eeee
23 changes: 20 additions & 3 deletions lib/timers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

const {
MathTrunc,
Object,
} = primordials;

const {
Expand Down Expand Up @@ -52,12 +53,13 @@ const {
promisify: { custom: customPromisify },
deprecate
} = require('internal/util');
const timersPromises = require('timers/promises');
let debug = require('internal/util/debuglog').debuglog('timer', (fn) => {
debug = fn;
});
const { validateCallback } = require('internal/validators');

let timersPromises;

const {
destroyHooksExist,
// The needed emit*() functions.
Expand Down Expand Up @@ -148,7 +150,14 @@ function setTimeout(callback, after, arg1, arg2, arg3) {
return timeout;
}

setTimeout[customPromisify] = timersPromises.setTimeout;
Object.defineProperty(setTimeout, customPromisify, {
enumerable: true,
get() {
if (!timersPromises)
timersPromises = require('timers/promises');
return timersPromises.setTimeout;
}
});

function clearTimeout(timer) {
if (timer && timer._onTimeout) {
Expand Down Expand Up @@ -225,7 +234,15 @@ function setImmediate(callback, arg1, arg2, arg3) {
return new Immediate(callback, args);
}

setImmediate[customPromisify] = timersPromises.setImmediate;
Object.defineProperty(setImmediate, customPromisify, {
enumerable: true,
get() {
if (!timersPromises)
timersPromises = require('timers/promises');
return timersPromises.setImmediate;
}
});


function clearImmediate(immediate) {
if (!immediate || immediate._destroyed)
Expand Down