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.

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

fix node:timers abort callback reset #3380

Merged
merged 1 commit into from
Jan 21, 2025
Merged

fix node:timers abort callback reset #3380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 21 additions & 14 deletions src/node/internal/internal_timers_promises.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ import {

const kScheduler = Symbol.for('kScheduler');

type OnCancelCallback = (() => void) | undefined;

export async function setTimeout<T = void>(
delay: number | undefined,
value?: T,
Expand Down Expand Up @@ -62,17 +64,21 @@ export async function setTimeout<T = void>(
}

const { promise, resolve, reject } = Promise.withResolvers<T>();
let onCancel: OnCancelCallback;

const timer = timers.setTimeout(() => {
resolve(value as T);
}, delay ?? 0);
if (onCancel) {
signal?.removeEventListener('abort', onCancel);
}
anonrig marked this conversation as resolved.
Show resolved Hide resolved
anonrig marked this conversation as resolved.
Show resolved Hide resolved
}, delay ?? 1);

if (signal) {
function onCancel(): void {
onCancel = (): void => {
timers.clearTimeout(timer);
reject(new AbortError(undefined, { cause: signal?.reason }));
}
signal.addEventListener('abort', onCancel);
reject(new AbortError(undefined, { cause: signal.reason }));
};
signal.addEventListener('abort', onCancel, { once: true });
}

return promise;
Expand Down Expand Up @@ -101,18 +107,21 @@ export async function setImmediate<T>(
}

const { promise, resolve, reject } = Promise.withResolvers<T>();
let onCancel: OnCancelCallback;
anonrig marked this conversation as resolved.
Show resolved Hide resolved

const timer = timers.setImmediate(() => {
resolve(value as T);
if (onCancel) {
signal?.removeEventListener('abort', onCancel);
}
});

if (signal) {
function onCancel(): void {
onCancel = (): void => {
timers.clearImmediate(timer);
signal?.removeEventListener('abort', onCancel);
reject(new AbortError(undefined, { cause: signal?.reason }));
}
signal.addEventListener('abort', onCancel);
reject(new AbortError(undefined, { cause: signal.reason }));
};
signal.addEventListener('abort', onCancel, { once: true });
}

return promise;
Expand Down Expand Up @@ -144,7 +153,7 @@ export async function* setInterval<T = void>(
throw new AbortError(undefined, { cause: signal.reason });
}

let onCancel: (() => void) | undefined;
let onCancel: OnCancelCallback;
anonrig marked this conversation as resolved.
Show resolved Hide resolved
let interval: timers.Timeout;
try {
let notYielded = 0;
Expand All @@ -164,14 +173,12 @@ export async function* setInterval<T = void>(
if (signal) {
onCancel = (): void => {
timers.clearInterval(interval);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
signal.removeEventListener('abort', onCancel!);
callback?.(
Promise.reject(new AbortError(undefined, { cause: signal.reason }))
);
callback = undefined;
};
signal.addEventListener('abort', onCancel);
signal.addEventListener('abort', onCancel, { once: true });
}

while (!signal?.aborted) {
Expand Down
Loading
Loading