timers: set several methods EOL

nodejs · Feb 8, 2025 · e359ae6 · e359ae6
1 parent b181535
commit e359ae6
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 254 deletions.
diff --git a/doc/api/deprecations.md b/doc/api/deprecations.md
@@ -2065,6 +2065,9 @@ method.
 
 <!-- YAML
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/56966
+    description: End-of-Life.
   - version: v10.0.0
     pr-url: https://github.com/nodejs/node/pull/18066
     description: Runtime deprecation.
@@ -2079,6 +2082,9 @@ Type: Runtime
 
 <!-- YAML
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/56966
+    description: End-of-Life.
   - version: v10.0.0
     pr-url: https://github.com/nodejs/node/pull/18066
     description: Runtime deprecation.
@@ -2613,6 +2619,9 @@ The `node:_stream_wrap` module is deprecated.
 
 <!-- YAML
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/56966
+    description: End-of-Life.
   - version: v11.14.0
     pr-url: https://github.com/nodejs/node/pull/26760
     description: Runtime deprecation.
@@ -2629,6 +2638,9 @@ with no performance impact since Node.js 10.
 
 <!-- YAML
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/56966
+    description: End-of-Life.
   - version: v11.14.0
     pr-url: https://github.com/nodejs/node/pull/26760
     description: Runtime deprecation.

diff --git a/lib/timers.js b/lib/timers.js
@@ -46,18 +46,14 @@ const {
   },
   kRefed,
   kHasPrimitive,
-  getTimerDuration,
   timerListMap,
   timerListQueue,
   immediateQueue,
-  active,
-  unrefActive,
   insert,
   knownTimersById,
 } = require('internal/timers');
 const {
   promisify: { custom: customPromisify },
-  deprecate,
 } = require('internal/util');
 let debug = require('internal/util/debuglog').debuglog('timer', (fn) => {
   debug = fn;
@@ -111,20 +107,6 @@ function unenroll(item) {
   item._idleTimeout = -1;
 }
 
-// Make a regular object able to act as a timer by setting some properties.
-// This function does not start the timer, see `active()`.
-// Using existing objects as timers slightly reduces object overhead.
-function enroll(item, msecs) {
-  msecs = getTimerDuration(msecs, 'msecs');
-
-  // If this item was already in a list somewhere
-  // then we should unenroll it from that
-  if (item._idleNext) unenroll(item);
-
-  L.init(item);
-  item._idleTimeout = msecs;
-}
-
 
 /**
  * Schedules the execution of a one-time `callback`
@@ -351,23 +333,6 @@ module.exports = timers = {
   clearImmediate,
   setInterval,
   clearInterval,
-  _unrefActive: deprecate(
-    unrefActive,
-    'timers._unrefActive() is deprecated.' +
-    ' Please use timeout.refresh() instead.',
-    'DEP0127'),
-  active: deprecate(
-    active,
-    'timers.active() is deprecated. Please use timeout.refresh() instead.',
-    'DEP0126'),
-  unenroll: deprecate(
-    unenroll,
-    'timers.unenroll() is deprecated. Please use clearTimeout instead.',
-    'DEP0096'),
-  enroll: deprecate(
-    enroll,
-    'timers.enroll() is deprecated. Please use setTimeout instead.',
-    'DEP0095'),
 };
 
 ObjectDefineProperties(timers, {

diff --git a/test/parallel/test-timers-active.js b/test/parallel/test-timers-active.js
diff --git a/test/parallel/test-timers-enroll-invalid-msecs.js b/test/parallel/test-timers-enroll-invalid-msecs.js
diff --git a/test/parallel/test-timers-enroll-second-time.js b/test/parallel/test-timers-enroll-second-time.js
diff --git a/test/parallel/test-timers-max-duration-warning.js b/test/parallel/test-timers-max-duration-warning.js
@@ -2,7 +2,6 @@
 
 const common = require('../common');
 const assert = require('assert');
-const timers = require('timers');
 
 const OVERFLOW = Math.pow(2, 31); // TIMEOUT_MAX is 2^31-1
 
@@ -19,7 +18,7 @@ process.on('warning', common.mustCall((warning) => {
   assert.strictEqual(lines[0], `${OVERFLOW} does not fit into a 32-bit signed` +
                                ' integer.');
   assert.strictEqual(lines.length, 2);
-}, 6));
+}, 2));
 
 
 {
@@ -31,12 +30,3 @@ process.on('warning', common.mustCall((warning) => {
   const interval = setInterval(timerNotCanceled, OVERFLOW);
   clearInterval(interval);
 }
-
-{
-  const timer = {
-    _onTimeout: timerNotCanceled
-  };
-  timers.enroll(timer, OVERFLOW);
-  timers.active(timer);
-  timers.unenroll(timer);
-}
diff --git a/test/parallel/test-timers-unenroll-unref-interval.js b/test/parallel/test-timers-unenroll-unref-interval.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const common = require('../common');
-const timers = require('timers');
 
 {
   const interval = setInterval(common.mustCall(() => {
@@ -17,7 +16,7 @@ const timers = require('timers');
 
 {
   const interval = setInterval(common.mustCall(() => {
-    timers.unenroll(interval);
+    clearInterval(interval);
   }), 1).unref();
 }
 

diff --git a/test/parallel/test-timers-unref-active.js b/test/parallel/test-timers-unref-active.js
diff --git a/test/parallel/test-timers-unref-remove-other-unref-timers-only-one-fires.js b/test/parallel/test-timers-unref-remove-other-unref-timers-only-one-fires.js
diff --git a/test/parallel/test-timers-unref-remove-other-unref-timers.js b/test/parallel/test-timers-unref-remove-other-unref-timers.js