util -> async_hooks

nodejs · RaisinTen · Feb 7, 2021 · Apr 19, 2021 · Apr 20, 2021 · Apr 22, 2021
commit 3c40a73c8ce878ea9bc90c817cbeef1baa733689
diff --git a/lib/async_hooks.js b/lib/async_hooks.js
@@ -31,6 +31,7 @@ const { registerDestroyHook } = internal_async_hooks;
 const {
   executionAsyncId,
   triggerAsyncId,
+  getActiveResources,
   // Private API
   hasAsyncIdStack,
   getHookArrays,
@@ -347,6 +348,7 @@ module.exports = {
   createHook,
   executionAsyncId,
   triggerAsyncId,
+  getActiveResources,
   executionAsyncResource,
   // Embedder API
   AsyncResource,

diff --git a/lib/internal/async_hooks.js b/lib/internal/async_hooks.js
@@ -1,10 +1,12 @@
 'use strict';
 
 const {
+  ArrayPrototypeForEach,
   ArrayPrototypeSlice,
   ErrorCaptureStackTrace,
   ObjectPrototypeHasOwnProperty,
   ObjectDefineProperty,
+  ObjectValues,
   Promise,
   Symbol,
 } = primordials;
@@ -544,9 +546,49 @@ function triggerAsyncId() {
 }
 
 
+const {
+  _getActiveHandles,
+  _getActiveRequests,
+} = internalBinding('process_methods');
+
+let internalTimers;
+
+function getActiveResources() {
+  if (internalTimers == null) {
+    internalTimers = require('internal/timers');
+  }
+  const handles = _getActiveHandles();
+  const reqs = _getActiveRequests();
+
+  const timers = {};
+  ArrayPrototypeForEach(ObjectValues(internalTimers.timerListMap), (list) => {
+    let timer = list._idlePrev === list ? null : list._idlePrev;
+
+    while (timer !== null) {
+      timers[timer[internalTimers.async_id_symbol]] = timer;
+
+      timer = timer._idlePrev === list ? null : list._idlePrev;
+    }
+  });
+
+  const immediates = {};
+  const queue = internalTimers.outstandingQueue.head !== null ?
+    internalTimers.outstandingQueue : internalTimers.immediateQueue;
+  let immediate = queue.head;
+  while (immediate !== null) {
+    immediates[immediate[internalTimers.async_id_symbol]] = immediate;
+
+    immediate = immediate._idleNext;
+  }
+
+  return { ...handles, ...reqs, ...timers, ...immediates };
+}
+
+
 module.exports = {
   executionAsyncId,
   triggerAsyncId,
+  getActiveResources,
   // Private API
   getHookArrays,
   symbols: {

diff --git a/lib/internal/util.js b/lib/internal/util.js
@@ -3,7 +3,6 @@
 const {
   ArrayFrom,
   ArrayIsArray,
-  ArrayPrototypeForEach,
   ArrayPrototypePush,
   ArrayPrototypeSlice,
   ArrayPrototypeSort,
@@ -15,7 +14,6 @@ const {
   ObjectGetOwnPropertyDescriptors,
   ObjectGetPrototypeOf,
   ObjectSetPrototypeOf,
-  ObjectValues,
   Promise,
   ReflectApply,
   ReflectConstruct,
@@ -47,10 +45,6 @@ const {
   sleep: _sleep
 } = internalBinding('util');
 const { isNativeError } = internalBinding('types');
-const {
-  _getActiveHandles,
-  _getActiveRequests,
-} = internalBinding('process_methods');
 
 const noCrypto = !process.versions.openssl;
 
@@ -447,39 +441,6 @@ function createDeferredPromise() {
   return { promise, resolve, reject };
 }
 
-let internalTimers;
-
-function getActiveResources() {
-  if (internalTimers == null) {
-    internalTimers = require('internal/timers');
-  }
-  const handles = _getActiveHandles();
-  const reqs = _getActiveRequests();
-
-  const timers = {};
-  ArrayPrototypeForEach(ObjectValues(internalTimers.timerListMap), (list) => {
-    let timer = list._idlePrev === list ? null : list._idlePrev;
-
-    while (timer !== null) {
-      timers[timer[internalTimers.async_id_symbol]] = timer;
-
-      timer = timer._idlePrev === list ? null : list._idlePrev;
-    }
-  });
-
-  const immediates = {};
-  const queue = internalTimers.outstandingQueue.head !== null ?
-    internalTimers.outstandingQueue : internalTimers.immediateQueue;
-  let immediate = queue.head;
-  while (immediate !== null) {
-    immediates[immediate[internalTimers.async_id_symbol]] = immediate;
-
-    immediate = immediate._idleNext;
-  }
-
-  return { ...handles, ...reqs, ...timers, ...immediates };
-}
-
 module.exports = {
   assertCrypto,
   cachedResult,
@@ -490,7 +451,6 @@ module.exports = {
   deprecate,
   emitExperimentalWarning,
   filterDuplicateStrings,
-  getActiveResources,
   getConstructorOf,
   getSystemErrorMap,
   getSystemErrorName,

diff --git a/lib/util.js b/lib/util.js
@@ -67,7 +67,6 @@ const types = require('internal/util/types');
 
 const {
   deprecate,
-  getActiveResources,
   getSystemErrorMap,
   getSystemErrorName: internalErrorName,
   promisify
@@ -258,7 +257,6 @@ module.exports = {
   deprecate,
   format,
   formatWithOptions,
-  getActiveResources,
   getSystemErrorMap,
   getSystemErrorName,
   inherits,

diff --git a/.../test-util-getactiveresources-requests.js → ...sync-hooks-getactiveresources-requests.js b/.../test-util-getactiveresources-requests.js → ...sync-hooks-getactiveresources-requests.js
@@ -3,7 +3,7 @@
 const common = require('../common');
 const assert = require('assert');
 const fs = require('fs');
-const { getActiveResources } = require('util');
+const { getActiveResources } = require('async_hooks');
 
 for (let i = 0; i < 12; i++)
   fs.open(__filename, 'r', common.mustCall());

diff --git a/.../parallel/test-util-getactiveresources.js → ...el/test-async-hooks-getactiveresources.js b/.../parallel/test-util-getactiveresources.js → ...el/test-async-hooks-getactiveresources.js
@@ -3,7 +3,7 @@
 require('../common');
 const assert = require('assert');
 const net = require('net');
-const { getActiveResources } = require('util');
+const { getActiveResources } = require('async_hooks');
 
 const NUM = 8;
 const connections = [];

diff --git a/test/parallel/test-handle-wrap-isrefed.js b/test/parallel/test-handle-wrap-isrefed.js
@@ -4,7 +4,7 @@
 const common = require('../common');
 const strictEqual = require('assert').strictEqual;
 const { internalBinding } = require('internal/test/binding');
-const { getActiveResources } = require('util');
+const { getActiveResources } = require('async_hooks');
 
 // child_process
 {

diff --git a/test/pseudo-tty/ref_keeps_node_running.js b/test/pseudo-tty/ref_keeps_node_running.js
@@ -6,7 +6,7 @@ require('../common');
 const { internalBinding } = require('internal/test/binding');
 const { TTY, isTTY } = internalBinding('tty_wrap');
 const strictEqual = require('assert').strictEqual;
-const { getActiveResources } = require('util');
+const { getActiveResources } = require('async_hooks');
 
 strictEqual(isTTY(0), true, 'fd 0 is not a TTY');