timers: reject with AbortError on cancellation

benjamingr · targos · commit 679973866d61 · 2021-06-11T09:29:42.000+02:00
PR-URL: #36317 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Robert Nagy <ronagy@icloud.com>
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) => {

-Original file line number
+Diff line change
 }=require('internal/timers');
 const{
 -hideStackFrames,
 +AbortError,
 codes: {ERR_INVALID_ARG_TYPE}
 }=require('internal/errors');
 const{ validateAbortSignal }=require('internal/validators');
 -letDOMException;
+-
 -constlazyDOMException=hideStackFrames((message,name)=>{
 -if(DOMException===undefined)
 -DOMException=internalBinding('messaging').DOMException;
 -returnnewDOMException(message,name);
 -});
+-
 functioncancelListenerHandler(clear,reject){
 if(!this._destroyed){
 clear(this);
 -reject(lazyDOMException('The operation was aborted','AbortError'));
 +reject(newAbortError());
+}
+}
 // to 12.x, then this can be converted to use optional chaining to
 // simplify the check.
 if(signal&&signal.aborted){
 -returnPromiseReject(
 -lazyDOMException('The operation was aborted','AbortError'));
 +returnPromiseReject(newAbortError());
+}
 letoncancel;
 constret=newPromise((resolve,reject)=>{
 // to 12.x, then this can be converted to use optional chaining to
 // simplify the check.
 if(signal&&signal.aborted){
 -returnPromiseReject(
 -lazyDOMException('The operation was aborted','AbortError'));
 +returnPromiseReject(newAbortError());
+}
 letoncancel;
 constret=newPromise((resolve,reject)=>{