timers: refactor to use validateAbortSignal

PR-URL: #36604 Backport-PR-URL: #38386 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com>
nodejs · Apr 30, 2021 · 1b74a08 · 1b74a08
1 parent 385e8e8
commit 1b74a08
Showing 1 changed file with 10 additions and 18 deletions.
diff --git a/lib/internal/timers/promises.js b/lib/internal/timers/promises.js
@@ -16,6 +16,8 @@ const {
   codes: { ERR_INVALID_ARG_TYPE }
 } = require('internal/errors');
 
+const { validateAbortSignal } = require('internal/validators');
+
 let DOMException;
 
 const lazyDOMException = hideStackFrames((message, name) => {
@@ -34,15 +36,10 @@ function setTimeout(after, value, options = {}) {
         options));
   }
   const { signal, ref = true } = options;
-  if (signal !== undefined &&
-      (signal === null ||
-       typeof signal !== 'object' ||
-       !('aborted' in signal))) {
-    return PromiseReject(
-      new ERR_INVALID_ARG_TYPE(
-        'options.signal',
-        'AbortSignal',
-        signal));
+  try {
+    validateAbortSignal(signal, 'options.signal');
+  } catch (err) {
+    return PromiseReject(err);
   }
   if (typeof ref !== 'boolean') {
     return PromiseReject(
@@ -83,15 +80,10 @@ function setImmediate(value, options = {}) {
         options));
   }
   const { signal, ref = true } = options;
-  if (signal !== undefined &&
-    (signal === null ||
-     typeof signal !== 'object' ||
-     !('aborted' in signal))) {
-    return PromiseReject(
-      new ERR_INVALID_ARG_TYPE(
-        'options.signal',
-        'AbortSignal',
-        signal));
+  try {
+    validateAbortSignal(signal, 'options.signal');
+  } catch (err) {
+    return PromiseReject(err);
   }
   if (typeof ref !== 'boolean') {
     return PromiseReject(