timers: use AbortController with correct name/message

On the web, `AbortError` is the error name, not the error message. Change the code to match that. PR-URL: #34763 Backport-PR-URL: #38386 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Apr 30, 2021 · 4b04bb8 · 4b04bb8
1 parent 9660a78
commit 4b04bb8
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/lib/internal/timers/promises.js b/lib/internal/timers/promises.js
@@ -18,10 +18,10 @@ const {
 
 let DOMException;
 
-const lazyDOMException = hideStackFrames((message) => {
+const lazyDOMException = hideStackFrames((message, name) => {
   if (DOMException === undefined)
     DOMException = internalBinding('messaging').DOMException;
-  return new DOMException(message);
+  return new DOMException(message, name);
 });
 
 function setTimeout(after, value, options = {}) {
@@ -54,8 +54,10 @@ function setTimeout(after, value, options = {}) {
   // TODO(@jasnell): If a decision is made that this cannot be backported
   // to 12.x, then this can be converted to use optional chaining to
   // simplify the check.
-  if (signal && signal.aborted)
-    return PromiseReject(lazyDOMException('AbortError'));
+  if (signal && signal.aborted) {
+    return PromiseReject(
+      lazyDOMException('The operation was aborted', 'AbortError'));
+  }
   return new Promise((resolve, reject) => {
     const timeout = new Timeout(resolve, after, args, false, true);
     if (!ref) timeout.unref();
@@ -65,7 +67,7 @@ function setTimeout(after, value, options = {}) {
         if (!timeout._destroyed) {
           // eslint-disable-next-line no-undef
           clearTimeout(timeout);
-          reject(lazyDOMException('AbortError'));
+          reject(lazyDOMException('The operation was aborted', 'AbortError'));
         }
       }, { once: true });
     }
@@ -101,8 +103,10 @@ function setImmediate(value, options = {}) {
   // TODO(@jasnell): If a decision is made that this cannot be backported
   // to 12.x, then this can be converted to use optional chaining to
   // simplify the check.
-  if (signal && signal.aborted)
-    return PromiseReject(lazyDOMException('AbortError'));
+  if (signal && signal.aborted) {
+    return PromiseReject(
+      lazyDOMException('The operation was aborted', 'AbortError'));
+  }
   return new Promise((resolve, reject) => {
     const immediate = new Immediate(resolve, [value]);
     if (!ref) immediate.unref();
@@ -111,7 +115,7 @@ function setImmediate(value, options = {}) {
         if (!immediate._destroyed) {
           // eslint-disable-next-line no-undef
           clearImmediate(immediate);
-          reject(lazyDOMException('AbortError'));
+          reject(lazyDOMException('The operation was aborted', 'AbortError'));
         }
       }, { once: true });
     }