Skip to content
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.

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

fix(ext/node): Add Immediate class to mirror NodeJS.Immediate #22808

Merged
merged 2 commits into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 30 additions & 0 deletions ext/node/polyfills/internal/timers.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { ERR_OUT_OF_RANGE } from "ext:deno_node/internal/errors.ts";
import { emitWarning } from "node:process";
import {
clearTimeout as clearTimeout_,
setImmediate as setImmediate_,
setInterval as setInterval_,
setTimeout as setTimeout_,
} from "ext:deno_web/02_timers.js";
Expand Down Expand Up @@ -115,6 +116,35 @@ Timeout.prototype[Symbol.toPrimitive] = function () {
return this[kTimerId];
};

// Immediate constructor function.
export function Immediate(callback, args) {
this._immediateId = setImmediate_(callback, args);
}

// Make sure the linked list only shows the minimal necessary information.
Immediate.prototype[inspect.custom] = function (_, options) {
return inspect(this, {
...options,
// Only inspect one level.
depth: 0,
// It should not recurse.
customInspect: false,
});
};

// FIXME(nathanwhit): actually implement {ref,unref,hasRef} once deno_core supports it
Immediate.prototype.unref = function () {
return this;
};

Immediate.prototype.ref = function () {
return this;
};

Immediate.prototype.hasRef = function () {
return true;
};

/**
* @param {number} msecs
* @param {string} name
Expand Down
16 changes: 11 additions & 5 deletions ext/node/polyfills/timers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const {

import {
activeTimers,
Immediate,
setUnrefTimeout,
Timeout,
} from "ext:deno_node/internal/timers.mjs";
Expand All @@ -21,7 +22,6 @@ import * as timers from "ext:deno_web/02_timers.js";

const clearTimeout_ = timers.clearTimeout;
const clearInterval_ = timers.clearInterval;
const setImmediate_ = timers.setImmediate;

export function setTimeout(
callback: (...args: unknown[]) => void,
Expand Down Expand Up @@ -70,15 +70,21 @@ export function clearInterval(timeout?: Timeout | number | string) {
}
clearInterval_(id);
}
// TODO(bartlomieju): implement the 'NodeJS.Immediate' versions of the timers.
// https://github.com/DefinitelyTyped/DefinitelyTyped/blob/1163ead296d84e7a3c80d71e7c81ecbd1a130e9a/types/node/v12/globals.d.ts#L1120-L1131
export function setImmediate(
cb: (...args: unknown[]) => void,
...args: unknown[]
): Timeout {
return setImmediate_(cb, ...args);
return new Immediate(cb, ...args);
}
export function clearImmediate(immediate: Immediate) {
if (immediate == null) {
return;
}

// FIXME(nathanwhit): will probably change once
// deno_core has proper support for immediates
clearTimeout_(immediate._immediateId);
}
export const clearImmediate = clearTimeout;

export default {
setTimeout,
Expand Down
18 changes: 14 additions & 4 deletions tests/unit_node/timers_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ Deno.test("[node/timers setInterval]", () => {
Deno.test("[node/timers setImmediate]", () => {
{
const { clearImmediate, setImmediate } = timers;
const id = setImmediate(() => {});
clearImmediate(id);
const imm = setImmediate(() => {});
clearImmediate(imm);
}

{
const id = timers.setImmediate(() => {});
timers.clearImmediate(id);
const imm = timers.setImmediate(() => {});
timers.clearImmediate(imm);
}
});

Expand All @@ -60,3 +60,13 @@ Deno.test("[node/timers refresh cancelled timer]", () => {
clearTimeout(p);
p.refresh();
});

Deno.test("[node/timers setImmediate returns Immediate object]", () => {
const { clearImmediate, setImmediate } = timers;

const imm = setImmediate(() => {});
imm.unref();
imm.ref();
imm.hasRef();
clearImmediate(imm);
});