From 6e797f53aa20055b9a8125d886f21319a50810fc Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sat, 4 Feb 2023 16:03:44 +0530
Subject: [PATCH 01/26] lib: add aborted() utility function

Fixes: https://github.com/nodejs/node/issues/37220
Refs: https://github.com/nodejs/node/pull/36607
---
 lib/internal/abort_controller.js   | 18 +++++++++++++++
 lib/util.js                        |  3 +++
 test/parallel/test-aborted-util.js | 37 ++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 test/parallel/test-aborted-util.js

diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
index 7a4381ecd13cb3..82d86f9c59f8fa 100644
--- a/lib/internal/abort_controller.js
+++ b/lib/internal/abort_controller.js
@@ -13,6 +13,7 @@ const {
   Symbol,
   SymbolToStringTag,
   WeakRef,
+  PromiseResolve,
 } = primordials;
 
 const {
@@ -22,11 +23,13 @@ const {
   kTrustEvent,
   kNewListener,
   kRemoveListener,
+  kWeakHandler,
 } = require('internal/event_target');
 const {
   customInspectSymbol,
   kEnumerableProperty,
   kEmptyObject,
+  createDeferredPromise,
 } = require('internal/util');
 const { inspect } = require('internal/util/inspect');
 const {
@@ -357,6 +360,20 @@ function transferableAbortController() {
   return AbortController[kMakeTransferable]();
 }
 
+/**
+ * @param {AbortSignal} signal
+ * @param {any} resource
+ * @returns {Promise<void>}
+ */
+function aborted(signal, resource = null) {
+  validateAbortSignal(signal, 'signal');
+  if (signal.aborted)
+    return PromiseResolve();
+  const abortPromise = createDeferredPromise();
+  signal.addEventListener('abort', abortPromise.resolve, { [kWeakHandler]: resource, once: true });
+  return abortPromise.promise;
+}
+
 ObjectDefineProperties(AbortController.prototype, {
   signal: kEnumerableProperty,
   abort: kEnumerableProperty,
@@ -377,4 +394,5 @@ module.exports = {
   ClonedAbortSignal,
   transferableAbortSignal,
   transferableAbortController,
+  aborted,
 };
diff --git a/lib/util.js b/lib/util.js
index 893a085c90aa3b..4ee13a28f58512 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -393,6 +393,9 @@ module.exports = {
   get transferableAbortController() {
     return lazyAbortController().transferableAbortController;
   },
+  get aborted() {
+    return lazyAbortController().aborted;
+  },
   types
 };
 
diff --git a/test/parallel/test-aborted-util.js b/test/parallel/test-aborted-util.js
new file mode 100644
index 00000000000000..563d9ad922fc71
--- /dev/null
+++ b/test/parallel/test-aborted-util.js
@@ -0,0 +1,37 @@
+// Flags: --expose-gc
+'use strict';
+
+const common = require('../common');
+const { aborted } = require('util');
+const assert = require('assert');
+const { getEventListeners } = require('events');
+
+{
+  // Test aborted works
+  const ac = new AbortController();
+  aborted(ac.signal).then(common.mustCall());
+  ac.abort();
+  assert.strictEqual(ac.signal.aborted, true);
+  assert.strictEqual(getEventListeners(ac.signal, 'abort').length, 0);
+}
+
+{
+  // Test aborted works when provided a resource
+  const ac = new AbortController();
+  aborted(ac.signal, {}).then(common.mustCall());
+  ac.abort();
+  assert.strictEqual(ac.signal.aborted, true);
+  assert.strictEqual(getEventListeners(ac.signal, 'abort').length, 0);
+}
+
+{
+  // Test aborted with gc cleanup
+  const ac = new AbortController();
+  aborted(ac.signal, {}).then(common.mustNotCall());
+  setImmediate(() => {
+    global.gc();
+    ac.abort();
+    assert.strictEqual(ac.signal.aborted, true);
+    assert.strictEqual(getEventListeners(ac.signal, 'abort').length, 0);
+  });
+}

From 3834e9f3e9a948c40087d7f19c63ca59f442688b Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sat, 4 Feb 2023 16:33:30 +0530
Subject: [PATCH 02/26] fixup! update param validation

---
 lib/internal/abort_controller.js   | 8 +++++++-
 test/parallel/test-aborted-util.js | 8 ++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
index 82d86f9c59f8fa..35e9825ec9626a 100644
--- a/lib/internal/abort_controller.js
+++ b/lib/internal/abort_controller.js
@@ -14,6 +14,7 @@ const {
   SymbolToStringTag,
   WeakRef,
   PromiseResolve,
+  PromiseReject,
 } = primordials;
 
 const {
@@ -42,6 +43,7 @@ const {
 
 const {
   validateUint32,
+  validateAbortSignal: abortSignalValidator,
 } = require('internal/validators');
 
 const {
@@ -366,7 +368,11 @@ function transferableAbortController() {
  * @returns {Promise<void>}
  */
 function aborted(signal, resource = null) {
-  validateAbortSignal(signal, 'signal');
+  try {
+    abortSignalValidator(signal, 'signal');
+  } catch (err) {
+    return PromiseReject(err);
+  }
   if (signal.aborted)
     return PromiseResolve();
   const abortPromise = createDeferredPromise();
diff --git a/test/parallel/test-aborted-util.js b/test/parallel/test-aborted-util.js
index 563d9ad922fc71..bf910a0a6a8e45 100644
--- a/test/parallel/test-aborted-util.js
+++ b/test/parallel/test-aborted-util.js
@@ -35,3 +35,11 @@ const { getEventListeners } = require('events');
     assert.strictEqual(getEventListeners(ac.signal, 'abort').length, 0);
   });
 }
+
+{
+  // Fails with error if not provided abort signal
+  const sig = new EventTarget();
+  assert.rejects(aborted(sig), {
+    name: 'TypeError',
+  });
+}

From 1cab0ca4571128ba0808bf6dee433c703f2e724a Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sat, 4 Feb 2023 23:47:48 +0530
Subject: [PATCH 03/26] fixup! make async func

---
 lib/internal/abort_controller.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
index 35e9825ec9626a..f2ccb9f47f6774 100644
--- a/lib/internal/abort_controller.js
+++ b/lib/internal/abort_controller.js
@@ -14,7 +14,6 @@ const {
   SymbolToStringTag,
   WeakRef,
   PromiseResolve,
-  PromiseReject,
 } = primordials;
 
 const {
@@ -367,12 +366,8 @@ function transferableAbortController() {
  * @param {any} resource
  * @returns {Promise<void>}
  */
-function aborted(signal, resource = null) {
-  try {
-    abortSignalValidator(signal, 'signal');
-  } catch (err) {
-    return PromiseReject(err);
-  }
+async function aborted(signal, resource = null) {
+  abortSignalValidator(signal, 'signal');
   if (signal.aborted)
     return PromiseResolve();
   const abortPromise = createDeferredPromise();

From 2e41a14fbf2fb63bd9c580374b2f539ca9aca0c0 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sun, 5 Feb 2023 00:06:52 +0530
Subject: [PATCH 04/26] fixup! make resource compulsory

---
 lib/internal/abort_controller.js   |  4 +++-
 test/parallel/test-aborted-util.js | 19 +++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
index f2ccb9f47f6774..897da06efecd46 100644
--- a/lib/internal/abort_controller.js
+++ b/lib/internal/abort_controller.js
@@ -43,6 +43,7 @@ const {
 const {
   validateUint32,
   validateAbortSignal: abortSignalValidator,
+  validateObject,
 } = require('internal/validators');
 
 const {
@@ -366,8 +367,9 @@ function transferableAbortController() {
  * @param {any} resource
  * @returns {Promise<void>}
  */
-async function aborted(signal, resource = null) {
+async function aborted(signal, resource) {
   abortSignalValidator(signal, 'signal');
+  validateObject(resource, 'resource', { nullable: false, allowFunction: true, allowArray: true });
   if (signal.aborted)
     return PromiseResolve();
   const abortPromise = createDeferredPromise();
diff --git a/test/parallel/test-aborted-util.js b/test/parallel/test-aborted-util.js
index bf910a0a6a8e45..e854079222a452 100644
--- a/test/parallel/test-aborted-util.js
+++ b/test/parallel/test-aborted-util.js
@@ -6,15 +6,6 @@ const { aborted } = require('util');
 const assert = require('assert');
 const { getEventListeners } = require('events');
 
-{
-  // Test aborted works
-  const ac = new AbortController();
-  aborted(ac.signal).then(common.mustCall());
-  ac.abort();
-  assert.strictEqual(ac.signal.aborted, true);
-  assert.strictEqual(getEventListeners(ac.signal, 'abort').length, 0);
-}
-
 {
   // Test aborted works when provided a resource
   const ac = new AbortController();
@@ -39,7 +30,15 @@ const { getEventListeners } = require('events');
 {
   // Fails with error if not provided abort signal
   const sig = new EventTarget();
-  assert.rejects(aborted(sig), {
+  assert.rejects(aborted(sig, {}), {
+    name: 'TypeError',
+  });
+}
+
+{
+  // Fails if not provided a resource
+  const ac = new AbortController();
+  assert.rejects(aborted(ac.signal, null), {
     name: 'TypeError',
   });
 }

From 0a58ffc057cdbecc7965092e95d829d54110ebe1 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sun, 5 Feb 2023 00:25:10 +0530
Subject: [PATCH 05/26] fixup! add doc

---
 doc/api/util.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/doc/api/util.md b/doc/api/util.md
index 49e4d231d05179..99d3867b8396dd 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -1989,6 +1989,35 @@ const channel = new MessageChannel();
 channel.port2.postMessage(signal, [signal]);
 ```
 
+## `util.aborted(signal, resource)`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1 - Experimental
+
+* `signal` {AbortSignal}
+* `resource` {any} Any non-null entity
+* Returns: {Promise}
+
+Listens to abort event on the provided `signal` and returns a promise which is
+resolved if an abort event is triggered. The function cleans up any
+event listeners depending on when the provided `resource` is garbage collected.
+
+```js
+const { aborted } = require('util');
+
+const ac = new AbortController();
+const dependent = {};
+
+aborted(ac.signal, dependent).then(() => {
+  // Do something when the abort event is triggered.
+});
+
+doSomething(dependent, ac.signal); // Can trigger the abort event
+```
+
 ## `util.types`
 
 <!-- YAML

From f3621fd12db26eb4c40d4d348dce0d00a3b5b284 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sun, 5 Feb 2023 00:31:02 +0530
Subject: [PATCH 06/26] fixup! doc fixup

---
 doc/api/util.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/api/util.md b/doc/api/util.md
index 99d3867b8396dd..7b934a84b77b54 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -2002,8 +2002,10 @@ added: REPLACEME
 * Returns: {Promise}
 
 Listens to abort event on the provided `signal` and returns a promise which is
-resolved if an abort event is triggered. The function cleans up any
-event listeners depending on when the provided `resource` is garbage collected.
+resolved if an abort event is triggered. The function is dependent on the `resource`
+entity and will be resolved only if the `resource` is not removed from memory, when 
+`resource` goes out of memory the promise shall remain pending and any event listeners
+attached to the `signal` will be removed.
 
 ```js
 const { aborted } = require('util');

From 3bfeec024f8b6f7f766f69faaee84b0fcec258ee Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sun, 5 Feb 2023 00:32:38 +0530
Subject: [PATCH 07/26] fixup! doc fixup

---
 doc/api/util.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/api/util.md b/doc/api/util.md
index 7b934a84b77b54..fe0c3334cc8ce6 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -2003,9 +2003,10 @@ added: REPLACEME
 
 Listens to abort event on the provided `signal` and returns a promise which is
 resolved if an abort event is triggered. The function is dependent on the `resource`
-entity and will be resolved only if the `resource` is not removed from memory, when 
-`resource` goes out of memory the promise shall remain pending and any event listeners
-attached to the `signal` will be removed.
+entity and will be resolved only if the `resource` is not removed
+from memory, when `resource` goes out of memory the
+promise shall remain pending and any event listeners attached to the `signal`
+will be removed.
 
 ```js
 const { aborted } = require('util');

From a2f2c56e3128ece676728658f78b2e1241b08c0e Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sun, 5 Feb 2023 01:53:51 +0530
Subject: [PATCH 08/26] fixup! doc

---
 doc/api/util.md | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/doc/api/util.md b/doc/api/util.md
index fe0c3334cc8ce6..0d6f743515a55e 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -1998,27 +1998,42 @@ added: REPLACEME
 > Stability: 1 - Experimental
 
 * `signal` {AbortSignal}
-* `resource` {any} Any non-null entity
+* `resource` {Object} Any non-null entity, reference to which is held weakly.
 * Returns: {Promise}
 
-Listens to abort event on the provided `signal` and returns a promise which is
-resolved if an abort event is triggered. The function is dependent on the `resource`
-entity and will be resolved only if the `resource` is not removed
-from memory, when `resource` goes out of memory the
-promise shall remain pending and any event listeners attached to the `signal`
-will be removed.
+Listens to abort event on the provided `signal` and
+returns a promise that resolves when the `signal` is
+aborted. The function is dependent on the `resource` and
+the returned promise shall remain pending if `resource`
+goes out of memory. The function shall automatically
+cleanup any event listeners it attaches to `signal`.
 
 ```js
 const { aborted } = require('util');
 
-const ac = new AbortController();
-const dependent = {};
+const dependent = obtainSomethingAbortable();
 
-aborted(ac.signal, dependent).then(() => {
-  // Do something when the abort event is triggered.
+aborted(dependent.signal, dependent).then(() => {
+  // Do something when dependent is aborted.
 });
 
-doSomething(dependent, ac.signal); // Can trigger the abort event
+dependent.on('event', () => {
+  dependent.abort();
+});
+```
+
+```mjs
+import { aborted } from 'node:util';
+
+const dependent = obtainSomethingAbortable();
+
+aborted(dependent.signal, dependent).then(() => {
+  // Do something when dependent is aborted.
+});
+
+dependent.on('event', () => {
+  dependent.abort();
+});
 ```
 
 ## `util.types`

From f07672960ac265555d5042957a912b1415ac0332 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sun, 5 Feb 2023 11:07:39 +0530
Subject: [PATCH 09/26] Update doc/api/util.md

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 doc/api/util.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/util.md b/doc/api/util.md
index 0d6f743515a55e..54abdf3563a55f 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -2008,7 +2008,7 @@ the returned promise shall remain pending if `resource`
 goes out of memory. The function shall automatically
 cleanup any event listeners it attaches to `signal`.
 
-```js
+```cjs
 const { aborted } = require('util');
 
 const dependent = obtainSomethingAbortable();

From 6334317391dc864f273b76a9334b6aa99cc835d9 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sun, 5 Feb 2023 11:07:50 +0530
Subject: [PATCH 10/26] Update doc/api/util.md

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 doc/api/util.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/util.md b/doc/api/util.md
index 54abdf3563a55f..68e2439d03dbf8 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -2009,7 +2009,7 @@ goes out of memory. The function shall automatically
 cleanup any event listeners it attaches to `signal`.
 
 ```cjs
-const { aborted } = require('util');
+const { aborted } = require('node:util');
 
 const dependent = obtainSomethingAbortable();
 

From 7ff30c8bbdbe368bb360fef00c4ca08f30d72dc2 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sun, 5 Feb 2023 11:08:03 +0530
Subject: [PATCH 11/26] Update test/parallel/test-aborted-util.js

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 test/parallel/test-aborted-util.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/parallel/test-aborted-util.js b/test/parallel/test-aborted-util.js
index e854079222a452..14a9dede5f0a17 100644
--- a/test/parallel/test-aborted-util.js
+++ b/test/parallel/test-aborted-util.js
@@ -29,10 +29,11 @@ const { getEventListeners } = require('events');
 
 {
   // Fails with error if not provided abort signal
-  const sig = new EventTarget();
-  assert.rejects(aborted(sig, {}), {
-    name: 'TypeError',
-  });
+  Promise.all([{}, null, undefined, Symbol(), [], 1, 0, 1n, true, false, 'a', () => {}].map((sig) =>
+    assert.rejects(aborted(sig, {}), {
+      name: 'TypeError',
+    })
+  ).then(common.mustCall());
 }
 
 {

From f1ca1f7477aa505b989ef8857ce3ca92910ccc52 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sun, 5 Feb 2023 11:08:12 +0530
Subject: [PATCH 12/26] Update test/parallel/test-aborted-util.js

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 test/parallel/test-aborted-util.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/parallel/test-aborted-util.js b/test/parallel/test-aborted-util.js
index 14a9dede5f0a17..cdbaa98f3e85a8 100644
--- a/test/parallel/test-aborted-util.js
+++ b/test/parallel/test-aborted-util.js
@@ -39,7 +39,9 @@ const { getEventListeners } = require('events');
 {
   // Fails if not provided a resource
   const ac = new AbortController();
-  assert.rejects(aborted(ac.signal, null), {
-    name: 'TypeError',
-  });
+  Promise.all([null, undefined, 0, 1, 0m, 1n, Symbol(), '', 'a'].map((resource) =>
+    assert.rejects(aborted(ac.signal, resource), {
+      name: 'TypeError',
+    })
+  ).then(common.mustCall());
 }

From 812c723cd15fe1ade4f66cc5f6db472030f54068 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sun, 5 Feb 2023 11:27:32 +0530
Subject: [PATCH 13/26] Update test/parallel/test-aborted-util.js

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 test/parallel/test-aborted-util.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/test/parallel/test-aborted-util.js b/test/parallel/test-aborted-util.js
index cdbaa98f3e85a8..d8b44d004342b8 100644
--- a/test/parallel/test-aborted-util.js
+++ b/test/parallel/test-aborted-util.js
@@ -45,3 +45,14 @@ const { getEventListeners } = require('events');
     })
   ).then(common.mustCall());
 }
+
+{
+  const childProcess = spawn(process.execPath, ['--input-type=module']);
+  childProcess.on('exit', common.mustCall((code) => {
+    assert.strictEqual(code, 13);
+  });
+  childProcess.stdin.end(`
+    import { aborted } from 'node:util';
+    await aborted(new AbortController().signal, {});
+  `);
+}

From b209fe1122c70dc18efdba70850eeee361719675 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sun, 5 Feb 2023 11:30:52 +0530
Subject: [PATCH 14/26] fixup

---
 test/parallel/test-aborted-util.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/parallel/test-aborted-util.js b/test/parallel/test-aborted-util.js
index d8b44d004342b8..681c68130b9c8d 100644
--- a/test/parallel/test-aborted-util.js
+++ b/test/parallel/test-aborted-util.js
@@ -5,6 +5,7 @@ const common = require('../common');
 const { aborted } = require('util');
 const assert = require('assert');
 const { getEventListeners } = require('events');
+const { spawn } = require('child_process');
 
 {
   // Test aborted works when provided a resource
@@ -33,24 +34,24 @@ const { getEventListeners } = require('events');
     assert.rejects(aborted(sig, {}), {
       name: 'TypeError',
     })
-  ).then(common.mustCall());
+  ).then(common.mustCall()));
 }
 
 {
   // Fails if not provided a resource
   const ac = new AbortController();
-  Promise.all([null, undefined, 0, 1, 0m, 1n, Symbol(), '', 'a'].map((resource) =>
+  Promise.all([null, undefined, 0, 1, 0n, 1n, Symbol(), '', 'a'].map((resource) =>
     assert.rejects(aborted(ac.signal, resource), {
       name: 'TypeError',
     })
-  ).then(common.mustCall());
+  ).then(common.mustCall()));
 }
 
 {
   const childProcess = spawn(process.execPath, ['--input-type=module']);
   childProcess.on('exit', common.mustCall((code) => {
     assert.strictEqual(code, 13);
-  });
+  }));
   childProcess.stdin.end(`
     import { aborted } from 'node:util';
     await aborted(new AbortController().signal, {});

From 2f633c631ad58de02f6f92e2a8262ad9b5699858 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Sun, 5 Feb 2023 11:32:19 +0530
Subject: [PATCH 15/26] fixup

---
 test/parallel/test-aborted-util.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/parallel/test-aborted-util.js b/test/parallel/test-aborted-util.js
index 681c68130b9c8d..6a10256c9b1c6a 100644
--- a/test/parallel/test-aborted-util.js
+++ b/test/parallel/test-aborted-util.js
@@ -34,7 +34,7 @@ const { spawn } = require('child_process');
     assert.rejects(aborted(sig, {}), {
       name: 'TypeError',
     })
-  ).then(common.mustCall()));
+  )).then(common.mustCall());
 }
 
 {
@@ -44,7 +44,7 @@ const { spawn } = require('child_process');
     assert.rejects(aborted(ac.signal, resource), {
       name: 'TypeError',
     })
-  ).then(common.mustCall()));
+  )).then(common.mustCall());
 }
 
 {

From b03ab4e976ca3d64e62eda33c14a8b99efe01128 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Mon, 6 Feb 2023 16:55:19 +0530
Subject: [PATCH 16/26] fixup! doc

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 doc/api/util.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/util.md b/doc/api/util.md
index 68e2439d03dbf8..59649c42331f84 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -2002,7 +2002,7 @@ added: REPLACEME
 * Returns: {Promise}
 
 Listens to abort event on the provided `signal` and
-returns a promise that resolves when the `signal` is
+returns a promise that is fulfilled when the `signal` is
 aborted. The function is dependent on the `resource` and
 the returned promise shall remain pending if `resource`
 goes out of memory. The function shall automatically

From bae27659a1ac0ab604e794a170d07ae5894c662b Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Mon, 6 Feb 2023 16:55:47 +0530
Subject: [PATCH 17/26] fixup! doc

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 doc/api/util.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/api/util.md b/doc/api/util.md
index 59649c42331f84..bddfae17cbeca0 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -2003,10 +2003,8 @@ added: REPLACEME
 
 Listens to abort event on the provided `signal` and
 returns a promise that is fulfilled when the `signal` is
-aborted. The function is dependent on the `resource` and
-the returned promise shall remain pending if `resource`
-goes out of memory. The function shall automatically
-cleanup any event listeners it attaches to `signal`.
+aborted. If the passed `resource` is garbage collected before the `signal` is
+aborted, the returned promise shall remain pending indefinitely.
 
 ```cjs
 const { aborted } = require('node:util');

From b1a93a503c39167021b19e80912956bfc0ab3f9d Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Mon, 6 Feb 2023 16:56:32 +0530
Subject: [PATCH 18/26] fixup! ordering

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 lib/internal/abort_controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
index 897da06efecd46..45f4492c05eb0a 100644
--- a/lib/internal/abort_controller.js
+++ b/lib/internal/abort_controller.js
@@ -395,7 +395,7 @@ module.exports = {
   AbortController,
   AbortSignal,
   ClonedAbortSignal,
+  aborted,
   transferableAbortSignal,
   transferableAbortController,
-  aborted,
 };

From 8dfe5b78ae6bda0451b7d4edc430f18c4c905650 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Mon, 6 Feb 2023 16:57:02 +0530
Subject: [PATCH 19/26] fixup! ordering

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 lib/internal/abort_controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
index 45f4492c05eb0a..a2bd05089d2df5 100644
--- a/lib/internal/abort_controller.js
+++ b/lib/internal/abort_controller.js
@@ -26,10 +26,10 @@ const {
   kWeakHandler,
 } = require('internal/event_target');
 const {
+  createDeferredPromise,
   customInspectSymbol,
-  kEnumerableProperty,
   kEmptyObject,
-  createDeferredPromise,
+  kEnumerableProperty,
 } = require('internal/util');
 const { inspect } = require('internal/util/inspect');
 const {

From a5b43fe077f43352e7fc48efac0e25436692c9f3 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Mon, 6 Feb 2023 17:03:57 +0530
Subject: [PATCH 20/26] fixup! ordering

---
 lib/internal/abort_controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
index a2bd05089d2df5..997771f326373d 100644
--- a/lib/internal/abort_controller.js
+++ b/lib/internal/abort_controller.js
@@ -10,10 +10,10 @@ const {
   ObjectDefineProperty,
   SafeFinalizationRegistry,
   SafeSet,
+  PromiseResolve,
   Symbol,
   SymbolToStringTag,
   WeakRef,
-  PromiseResolve,
 } = primordials;
 
 const {

From 24018970b9caa1754511db6dc9367eef4378cf3c Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Mon, 6 Feb 2023 17:05:53 +0530
Subject: [PATCH 21/26] fixup! ordering

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 lib/internal/abort_controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
index 997771f326373d..57a6f9395e291d 100644
--- a/lib/internal/abort_controller.js
+++ b/lib/internal/abort_controller.js
@@ -8,9 +8,9 @@ const {
   ObjectDefineProperties,
   ObjectSetPrototypeOf,
   ObjectDefineProperty,
+  PromiseResolve,
   SafeFinalizationRegistry,
   SafeSet,
-  PromiseResolve,
   Symbol,
   SymbolToStringTag,
   WeakRef,

From 347c252dd3f20c5336d14fa7a069ff97042ee0b1 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Mon, 6 Feb 2023 17:09:40 +0530
Subject: [PATCH 22/26] fixup! ordering

---
 lib/internal/abort_controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
index 57a6f9395e291d..944a9a303a42ed 100644
--- a/lib/internal/abort_controller.js
+++ b/lib/internal/abort_controller.js
@@ -41,9 +41,9 @@ const {
 } = require('internal/errors');
 
 const {
-  validateUint32,
   validateAbortSignal: abortSignalValidator,
   validateObject,
+  validateUint32,
 } = require('internal/validators');
 
 const {

From 2446138c436491b33caa16690c9949e1b8c95d9c Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Mon, 6 Feb 2023 19:03:15 +0530
Subject: [PATCH 23/26] fixup! refactor function

---
 lib/internal/abort_controller.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
index 944a9a303a42ed..05819ddfd088fc 100644
--- a/lib/internal/abort_controller.js
+++ b/lib/internal/abort_controller.js
@@ -41,7 +41,7 @@ const {
 } = require('internal/errors');
 
 const {
-  validateAbortSignal: abortSignalValidator,
+  validateAbortSignal,
   validateObject,
   validateUint32,
 } = require('internal/validators');
@@ -99,7 +99,7 @@ function customInspect(self, obj, depth, options) {
   return `${self.constructor.name} ${inspect(obj, opts)}`;
 }
 
-function validateAbortSignal(obj) {
+function validateThisAbortSignal(obj) {
   if (obj?.[kAborted] === undefined)
     throw new ERR_INVALID_THIS('AbortSignal');
 }
@@ -137,7 +137,7 @@ class AbortSignal extends EventTarget {
    * @type {boolean}
    */
   get aborted() {
-    validateAbortSignal(this);
+    validateThisAbortSignal(this);
     return !!this[kAborted];
   }
 
@@ -145,7 +145,7 @@ class AbortSignal extends EventTarget {
    * @type {any}
    */
   get reason() {
-    validateAbortSignal(this);
+    validateThisAbortSignal(this);
     return this[kReason];
   }
 
@@ -207,7 +207,7 @@ class AbortSignal extends EventTarget {
   }
 
   [kTransfer]() {
-    validateAbortSignal(this);
+    validateThisAbortSignal(this);
     const aborted = this.aborted;
     if (aborted) {
       const reason = this.reason;
@@ -368,7 +368,7 @@ function transferableAbortController() {
  * @returns {Promise<void>}
  */
 async function aborted(signal, resource) {
-  abortSignalValidator(signal, 'signal');
+  validateAbortSignal(signal, 'signal');
   validateObject(resource, 'resource', { nullable: false, allowFunction: true, allowArray: true });
   if (signal.aborted)
     return PromiseResolve();

From 2b6929c496913bf5e219b0482b8208350d09a8e9 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Mon, 6 Feb 2023 20:08:06 +0530
Subject: [PATCH 24/26] Update test/parallel/test-aborted-util.js

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 test/parallel/test-aborted-util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/parallel/test-aborted-util.js b/test/parallel/test-aborted-util.js
index 6a10256c9b1c6a..ca3b1adcb86687 100644
--- a/test/parallel/test-aborted-util.js
+++ b/test/parallel/test-aborted-util.js
@@ -32,7 +32,7 @@ const { spawn } = require('child_process');
   // Fails with error if not provided abort signal
   Promise.all([{}, null, undefined, Symbol(), [], 1, 0, 1n, true, false, 'a', () => {}].map((sig) =>
     assert.rejects(aborted(sig, {}), {
-      name: 'TypeError',
+      code: 'ERR_INVALID_ARG_TYPE',
     })
   )).then(common.mustCall());
 }

From a4a7bef954222cab6ebc984cc95722a24885155d Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Mon, 6 Feb 2023 20:08:13 +0530
Subject: [PATCH 25/26] Update test/parallel/test-aborted-util.js

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 test/parallel/test-aborted-util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/parallel/test-aborted-util.js b/test/parallel/test-aborted-util.js
index ca3b1adcb86687..7991d72cb6c62f 100644
--- a/test/parallel/test-aborted-util.js
+++ b/test/parallel/test-aborted-util.js
@@ -42,7 +42,7 @@ const { spawn } = require('child_process');
   const ac = new AbortController();
   Promise.all([null, undefined, 0, 1, 0n, 1n, Symbol(), '', 'a'].map((resource) =>
     assert.rejects(aborted(ac.signal, resource), {
-      name: 'TypeError',
+      code: 'ERR_INVALID_ARG_TYPE',
     })
   )).then(common.mustCall());
 }

From f106f87bfe5b64f15c37e44d1161b0fab688a3d4 Mon Sep 17 00:00:00 2001
From: Debadree Chatterjee <debadree333@gmail.com>
Date: Mon, 6 Feb 2023 23:21:21 +0530
Subject: [PATCH 26/26] fixup! add undefined check

---
 lib/internal/abort_controller.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
index 05819ddfd088fc..6fec167ffc86c1 100644
--- a/lib/internal/abort_controller.js
+++ b/lib/internal/abort_controller.js
@@ -368,6 +368,9 @@ function transferableAbortController() {
  * @returns {Promise<void>}
  */
 async function aborted(signal, resource) {
+  if (signal === undefined) {
+    throw new ERR_INVALID_ARG_TYPE('signal', 'AbortSignal', signal);
+  }
   validateAbortSignal(signal, 'signal');
   validateObject(resource, 'resource', { nullable: false, allowFunction: true, allowArray: true });
   if (signal.aborted)