timers: reject with AbortError on cancellation

PR-URL: #36317 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Robert Nagy <[email protected]>
nodejs · Jun 11, 2021 · 6799738 · 6799738
1 parent 5acf0a5
commit 6799738
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/lib/internal/timers/promises.js b/lib/internal/timers/promises.js
@@ -14,24 +14,16 @@ const {
 } = require('internal/timers');
 
 const {
-  hideStackFrames,
+  AbortError,
   codes: { ERR_INVALID_ARG_TYPE }
 } = require('internal/errors');
 
 const { validateAbortSignal } = require('internal/validators');
 
-let DOMException;
-
-const lazyDOMException = hideStackFrames((message, name) => {
-  if (DOMException === undefined)
-    DOMException = internalBinding('messaging').DOMException;
-  return new DOMException(message, name);
-});
-
 function cancelListenerHandler(clear, reject) {
   if (!this._destroyed) {
     clear(this);
-    reject(lazyDOMException('The operation was aborted', 'AbortError'));
+    reject(new AbortError());
   }
 }
 
@@ -61,8 +53,7 @@ function setTimeout(after, value, options = {}) {
   // to 12.x, then this can be converted to use optional chaining to
   // simplify the check.
   if (signal && signal.aborted) {
-    return PromiseReject(
-      lazyDOMException('The operation was aborted', 'AbortError'));
+    return PromiseReject(new AbortError());
   }
   let oncancel;
   const ret = new Promise((resolve, reject) => {
@@ -107,8 +98,7 @@ function setImmediate(value, options = {}) {
   // to 12.x, then this can be converted to use optional chaining to
   // simplify the check.
   if (signal && signal.aborted) {
-    return PromiseReject(
-      lazyDOMException('The operation was aborted', 'AbortError'));
+    return PromiseReject(new AbortError());
   }
   let oncancel;
   const ret = new Promise((resolve, reject) => {