Skip to content
Open
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
61 changes: 55 additions & 6 deletions lib/internal/test_runner/mock/mock_timers.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const {
validateAbortSignal,
validateNumber,
validateStringArray,
validateUint32,
} = require('internal/validators');

const {
Expand All @@ -34,6 +35,7 @@ const {
} = require('internal/errors');

const { addAbortListener } = require('internal/events/abort_listener');
const { AbortController, AbortSignal } = require('internal/abort_controller');

const { TIMEOUT_MAX } = require('internal/timers');

Expand All @@ -60,9 +62,17 @@ function abortIt(signal) {
}

/**
* @enum {('setTimeout'|'setInterval'|'setImmediate'|'Date'|'scheduler.wait')[]} Supported timers
* @typedef {('setTimeout'|'setInterval'|'setImmediate'|'Date'|'scheduler.wait'|'AbortSignal.timeout')[]} SupportedApis
* Supported timers that can be enabled via MockTimers.enable({ apis: [...] })
*/
const SUPPORTED_APIS = ['setTimeout', 'setInterval', 'setImmediate', 'Date', 'scheduler.wait'];
const SUPPORTED_APIS = [
'setTimeout',
'setInterval',
'setImmediate',
'Date',
'scheduler.wait',
'AbortSignal.timeout',
];
const TIMERS_DEFAULT_INTERVAL = {
__proto__: null,
setImmediate: -1,
Expand Down Expand Up @@ -115,6 +125,7 @@ class MockTimers {
#realPromisifiedSetImmediate;

#nativeDateDescriptor;
#realAbortSignalTimeout;

#timersInContext = [];
#isEnabled = false;
Expand Down Expand Up @@ -297,6 +308,18 @@ class MockTimers {
);
}

#storeOriginalAbortSignalTimeout() {
this.#realAbortSignalTimeout = ObjectGetOwnPropertyDescriptor(AbortSignal, 'timeout');
}

#restoreOriginalAbortSignalTimeout() {
if (this.#realAbortSignalTimeout) {
ObjectDefineProperty(AbortSignal, 'timeout', this.#realAbortSignalTimeout);
} else {
delete AbortSignal.timeout;
}
Comment on lines +316 to +320
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (this.#realAbortSignalTimeout) {
ObjectDefineProperty(AbortSignal, 'timeout', this.#realAbortSignalTimeout);
} else {
delete AbortSignal.timeout;
}
ObjectDefineProperty(AbortSignal, 'timeout', this.#realAbortSignalTimeout);

AbortSignal.timeout() exists in all supported versions of Node.js, so this conditional is unnecessary; the internal property will always be defined if this code is reached.

}

#createTimer(isInterval, callback, delay, ...args) {
if (delay > TIMEOUT_MAX) {
delay = 1;
Expand Down Expand Up @@ -604,6 +627,27 @@ class MockTimers {
this.#nativeDateDescriptor = ObjectGetOwnPropertyDescriptor(globalThis, 'Date');
globalThis.Date = this.#createDate();
},
'AbortSignal.timeout': () => {
this.#storeOriginalAbortSignalTimeout();
const mock = this;
ObjectDefineProperty(AbortSignal, 'timeout', {
__proto__: null,
configurable: true,
writable: true,
value: function value(delay) {
validateUint32(delay, 'delay', false);
const controller = new AbortController();
// Don't keep an unused binding to the timer; mock tick controls it
mock.#setTimeout(
() => {
controller.abort();
},
delay,
);
return controller.signal;
},
});
},
},
toReal: {
'__proto__': null,
Expand All @@ -622,6 +666,9 @@ class MockTimers {
'Date': () => {
ObjectDefineProperty(globalThis, 'Date', this.#nativeDateDescriptor);
},
'AbortSignal.timeout': () => {
this.#restoreOriginalAbortSignalTimeout();
},
},
};

Expand Down Expand Up @@ -664,10 +711,12 @@ class MockTimers {
}

/**
* @typedef {{apis: SUPPORTED_APIS;now: number | Date;}} EnableOptions Options to enable the timers
* @property {SUPPORTED_APIS} apis List of timers to enable, defaults to all
* @property {number | Date} now The epoch to which the timers should be set to, defaults to 0
* EnableOptions type:
* @typedef {object} EnableOptions
* @property {Array<string>} apis List of timers to enable, defaults to all
* @property {number|Date} now The epoch to which the timers should be set, defaults to 0
*/

/**
* Enables the MockTimers replacing the native timers with the fake ones.
* @param {EnableOptions} [options]
Expand All @@ -686,8 +735,8 @@ class MockTimers {

internalOptions.apis ||= SUPPORTED_APIS;

validateStringArray(internalOptions.apis, 'options.apis');
// Check that the timers passed are supported
validateStringArray(internalOptions.apis, 'options.apis');
ArrayPrototypeForEach(internalOptions.apis, (timer) => {
if (!ArrayPrototypeIncludes(SUPPORTED_APIS, timer)) {
throw new ERR_INVALID_ARG_VALUE(
Expand Down
26 changes: 26 additions & 0 deletions test/parallel/test-mock-timers-abortsignal-timeout.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
'use strict';

// eslint-disable-next-line no-unused-vars
const common = require('../common');
const assert = require('assert');
const { MockTimers } = require('internal/test_runner/mock/mock_timers');

Check failure on line 6 in test/parallel/test-mock-timers-abortsignal-timeout.js

View workflow job for this annotation

GitHub Actions / test-linux (ubuntu-24.04-arm)

--- stderr --- node:internal/modules/cjs/loader:1423 throw err; ^ Error: Cannot find module 'internal/test_runner/mock/mock_timers' Require stack: - /home/runner/work/node/node/node/test/parallel/test-mock-timers-abortsignal-timeout.js at Module._resolveFilename (node:internal/modules/cjs/loader:1420:15) at defaultResolveImpl (node:internal/modules/cjs/loader:1058:19) at resolveForCJSWithHooks (node:internal/modules/cjs/loader:1063:22) at Module._load (node:internal/modules/cjs/loader:1226:37) at TracingChannel.traceSync (node:diagnostics_channel:328:14) at wrapModuleLoad (node:internal/modules/cjs/loader:245:24) at Module.require (node:internal/modules/cjs/loader:1503:12) at require (node:internal/modules/helpers:152:16) at Object.<anonymous> (/home/runner/work/node/node/node/test/parallel/test-mock-timers-abortsignal-timeout.js:6:24) at Module._compile (node:internal/modules/cjs/loader:1760:14) { code: 'MODULE_NOT_FOUND', requireStack: [ '/home/runner/work/node/node/node/test/parallel/test-mock-timers-abortsignal-timeout.js' ] } Node.js v26.0.0-pre Command: out/Release/node /home/runner/work/node/node/node/test/parallel/test-mock-timers-abortsignal-timeout.js

Check failure on line 6 in test/parallel/test-mock-timers-abortsignal-timeout.js

View workflow job for this annotation

GitHub Actions / test-linux (ubuntu-24.04)

--- stderr --- node:internal/modules/cjs/loader:1423 throw err; ^ Error: Cannot find module 'internal/test_runner/mock/mock_timers' Require stack: - /home/runner/work/node/node/node/test/parallel/test-mock-timers-abortsignal-timeout.js at Module._resolveFilename (node:internal/modules/cjs/loader:1420:15) at defaultResolveImpl (node:internal/modules/cjs/loader:1058:19) at resolveForCJSWithHooks (node:internal/modules/cjs/loader:1063:22) at Module._load (node:internal/modules/cjs/loader:1226:37) at TracingChannel.traceSync (node:diagnostics_channel:328:14) at wrapModuleLoad (node:internal/modules/cjs/loader:245:24) at Module.require (node:internal/modules/cjs/loader:1503:12) at require (node:internal/modules/helpers:152:16) at Object.<anonymous> (/home/runner/work/node/node/node/test/parallel/test-mock-timers-abortsignal-timeout.js:6:24) at Module._compile (node:internal/modules/cjs/loader:1760:14) { code: 'MODULE_NOT_FOUND', requireStack: [ '/home/runner/work/node/node/node/test/parallel/test-mock-timers-abortsignal-timeout.js' ] } Node.js v26.0.0-pre Command: out/Release/node /home/runner/work/node/node/node/test/parallel/test-mock-timers-abortsignal-timeout.js

Check failure on line 6 in test/parallel/test-mock-timers-abortsignal-timeout.js

View workflow job for this annotation

GitHub Actions / test-macOS

--- stderr --- node:internal/modules/cjs/loader:1423 throw err; ^ Error: Cannot find module 'internal/test_runner/mock/mock_timers' Require stack: - /Users/runner/work/node/node/node/test/parallel/test-mock-timers-abortsignal-timeout.js at Module._resolveFilename (node:internal/modules/cjs/loader:1420:15) at defaultResolveImpl (node:internal/modules/cjs/loader:1058:19) at resolveForCJSWithHooks (node:internal/modules/cjs/loader:1063:22) at Module._load (node:internal/modules/cjs/loader:1226:37) at TracingChannel.traceSync (node:diagnostics_channel:328:14) at wrapModuleLoad (node:internal/modules/cjs/loader:245:24) at Module.require (node:internal/modules/cjs/loader:1503:12) at require (node:internal/modules/helpers:152:16) at Object.<anonymous> (/Users/runner/work/node/node/node/test/parallel/test-mock-timers-abortsignal-timeout.js:6:24) at Module._compile (node:internal/modules/cjs/loader:1760:14) { code: 'MODULE_NOT_FOUND', requireStack: [ '/Users/runner/work/node/node/node/test/parallel/test-mock-timers-abortsignal-timeout.js' ] } Node.js v26.0.0-pre Command: out/Release/node /Users/runner/work/node/node/node/test/parallel/test-mock-timers-abortsignal-timeout.js

Check failure on line 6 in test/parallel/test-mock-timers-abortsignal-timeout.js

View workflow job for this annotation

GitHub Actions / aarch64-linux: with shared libraries

--- stderr --- node:internal/modules/cjs/loader:1423 throw err; ^ Error: Cannot find module 'internal/test_runner/mock/mock_timers' Require stack: - /home/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js at Module._resolveFilename (node:internal/modules/cjs/loader:1420:15) at defaultResolveImpl (node:internal/modules/cjs/loader:1058:19) at resolveForCJSWithHooks (node:internal/modules/cjs/loader:1063:22) at Module._load (node:internal/modules/cjs/loader:1226:37) at TracingChannel.traceSync (node:diagnostics_channel:328:14) at wrapModuleLoad (node:internal/modules/cjs/loader:245:24) at Module.require (node:internal/modules/cjs/loader:1503:12) at require (node:internal/modules/helpers:152:16) at Object.<anonymous> (/home/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js:6:24) at Module._compile (node:internal/modules/cjs/loader:1760:14) { code: 'MODULE_NOT_FOUND', requireStack: [ '/home/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js' ] } Node.js v26.0.0-pre Command: out/Release/node /home/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js

Check failure on line 6 in test/parallel/test-mock-timers-abortsignal-timeout.js

View workflow job for this annotation

GitHub Actions / aarch64-darwin: with shared libraries

--- stderr --- node:internal/modules/cjs/loader:1423 throw err; ^ Error: Cannot find module 'internal/test_runner/mock/mock_timers' Require stack: - /Users/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js at Module._resolveFilename (node:internal/modules/cjs/loader:1420:15) at defaultResolveImpl (node:internal/modules/cjs/loader:1058:19) at resolveForCJSWithHooks (node:internal/modules/cjs/loader:1063:22) at Module._load (node:internal/modules/cjs/loader:1226:37) at TracingChannel.traceSync (node:diagnostics_channel:328:14) at wrapModuleLoad (node:internal/modules/cjs/loader:245:24) at Module.require (node:internal/modules/cjs/loader:1503:12) at require (node:internal/modules/helpers:152:16) at Object.<anonymous> (/Users/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js:6:24) at Module._compile (node:internal/modules/cjs/loader:1760:14) { code: 'MODULE_NOT_FOUND', requireStack: [ '/Users/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js' ] } Node.js v26.0.0-pre Command: out/Release/node /Users/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js

Check failure on line 6 in test/parallel/test-mock-timers-abortsignal-timeout.js

View workflow job for this annotation

GitHub Actions / x86_64-linux: with shared libraries

--- stderr --- node:internal/modules/cjs/loader:1423 throw err; ^ Error: Cannot find module 'internal/test_runner/mock/mock_timers' Require stack: - /home/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js at Module._resolveFilename (node:internal/modules/cjs/loader:1420:15) at defaultResolveImpl (node:internal/modules/cjs/loader:1058:19) at resolveForCJSWithHooks (node:internal/modules/cjs/loader:1063:22) at Module._load (node:internal/modules/cjs/loader:1226:37) at TracingChannel.traceSync (node:diagnostics_channel:328:14) at wrapModuleLoad (node:internal/modules/cjs/loader:245:24) at Module.require (node:internal/modules/cjs/loader:1503:12) at require (node:internal/modules/helpers:152:16) at Object.<anonymous> (/home/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js:6:24) at Module._compile (node:internal/modules/cjs/loader:1760:14) { code: 'MODULE_NOT_FOUND', requireStack: [ '/home/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js' ] } Node.js v26.0.0-pre Command: out/Release/node /home/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js

Check failure on line 6 in test/parallel/test-mock-timers-abortsignal-timeout.js

View workflow job for this annotation

GitHub Actions / x86_64-darwin: with shared libraries

--- stderr --- node:internal/modules/cjs/loader:1423 throw err; ^ Error: Cannot find module 'internal/test_runner/mock/mock_timers' Require stack: - /Users/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js at Module._resolveFilename (node:internal/modules/cjs/loader:1420:15) at defaultResolveImpl (node:internal/modules/cjs/loader:1058:19) at resolveForCJSWithHooks (node:internal/modules/cjs/loader:1063:22) at Module._load (node:internal/modules/cjs/loader:1226:37) at TracingChannel.traceSync (node:diagnostics_channel:328:14) at wrapModuleLoad (node:internal/modules/cjs/loader:245:24) at Module.require (node:internal/modules/cjs/loader:1503:12) at require (node:internal/modules/helpers:152:16) at Object.<anonymous> (/Users/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js:6:24) at Module._compile (node:internal/modules/cjs/loader:1760:14) { code: 'MODULE_NOT_FOUND', requireStack: [ '/Users/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js' ] } Node.js v26.0.0-pre Command: out/Release/node /Users/runner/work/_temp/node-v26.0.0-nightly2025-11-17ce0cdb1277-slim/test/parallel/test-mock-timers-abortsignal-timeout.js
const { AbortSignal } = require('internal/abort_controller');

{
const mock = new MockTimers();
mock.enable({ apis: ['AbortSignal.timeout'] });

try {
const signal = AbortSignal.timeout(50);

assert.strictEqual(signal.aborted, false);

mock.tick(49);
assert.strictEqual(signal.aborted, false);

mock.tick(1);
assert.strictEqual(signal.aborted, true);
} finally {
mock.reset();
}
}
Loading