Commit 8b7336b
quic,timers: refactor to use validateAbortSignal
PR-URL: #36604
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>1 parent 8a0cdb3 commit 8b7336b
2 files changed
Lines changed: 13 additions & 22 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -204,6 +204,7 @@ const { | |||
| 204 | 204 | } = require('internal/histogram'); | |
| 205 | 205 | ||
| 206 | 206 | const { | |
| 207 | + validateAbortSignal, | ||
| 207 | 208 | validateBoolean, | |
| 208 | 209 | validateInteger, | |
| 209 | 210 | validateObject, | |
@@ -680,8 +681,7 @@ class QuicEndpoint { | |||
| 680 | 681 | return this.address; | |
| 681 | 682 | ||
| 682 | 683 | const { signal } = { ...options }; | |
| 683 | - if (signal != null && !('aborted' in signal)) | ||
| 684 | - throw new ERR_INVALID_ARG_TYPE('options.signal', 'AbortSignal', signal); | ||
| 684 | + validateAbortSignal(signal, 'options.signal'); | ||
| 685 | 685 | ||
| 686 | 686 | // If an AbortSignal was passed in, check to make sure it is not already | |
| 687 | 687 | // aborted before we continue on to do any work. | |
@@ -1083,8 +1083,7 @@ class QuicSocket extends EventEmitter { | |||
| 1083 | 1083 | return; | |
| 1084 | 1084 | ||
| 1085 | 1085 | const { signal } = { ...options }; | |
| 1086 | - if (signal != null && !('aborted' in signal)) | ||
| 1087 | - throw new ERR_INVALID_ARG_TYPE('options.signal', 'AbortSignal', signal); | ||
| 1086 | + validateAbortSignal(signal, 'options.signal'); | ||
| 1088 | 1087 | ||
| 1089 | 1088 | // If an AbotSignal was passed in, check to make sure it is not already | |
| 1090 | 1089 | // aborted before we continue on to do any work. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -18,6 +18,8 @@ const { | |||
| 18 | 18 | codes: { ERR_INVALID_ARG_TYPE } | |
| 19 | 19 | } = require('internal/errors'); | |
| 20 | 20 | ||
| 21 | + const { validateAbortSignal } = require('internal/validators'); | ||
| 22 | + | ||
| 21 | 23 | function cancelListenerHandler(clear, reject) { | |
| 22 | 24 | if (!this._destroyed) { | |
| 23 | 25 | clear(this); | |
@@ -35,15 +37,10 @@ function setTimeout(after, value, options = {}) { | |||
| 35 | 37 | options)); | |
| 36 | 38 | } | |
| 37 | 39 | const { signal, ref = true } = options; | |
| 38 | - if (signal !== undefined && | ||
| 39 | - (signal === null || | ||
| 40 | - typeof signal !== 'object' || | ||
| 41 | - !('aborted' in signal))) { | ||
| 42 | - return PromiseReject( | ||
| 43 | - new ERR_INVALID_ARG_TYPE( | ||
| 44 | - 'options.signal', | ||
| 45 | - 'AbortSignal', | ||
| 46 | - signal)); | ||
| 40 | + try { | ||
| 41 | + validateAbortSignal(signal, 'options.signal'); | ||
| 42 | + } catch (err) { | ||
| 43 | + return PromiseReject(err); | ||
| 47 | 44 | } | |
| 48 | 45 | if (typeof ref !== 'boolean') { | |
| 49 | 46 | return PromiseReject( | |
@@ -85,15 +82,10 @@ function setImmediate(value, options = {}) { | |||
| 85 | 82 | options)); | |
| 86 | 83 | } | |
| 87 | 84 | const { signal, ref = true } = options; | |
| 88 | - if (signal !== undefined && | ||
| 89 | - (signal === null || | ||
| 90 | - typeof signal !== 'object' || | ||
| 91 | - !('aborted' in signal))) { | ||
| 92 | - return PromiseReject( | ||
| 93 | - new ERR_INVALID_ARG_TYPE( | ||
| 94 | - 'options.signal', | ||
| 95 | - 'AbortSignal', | ||
| 96 | - signal)); | ||
| 85 | + try { | ||
| 86 | + validateAbortSignal(signal, 'options.signal'); | ||
| 87 | + } catch (err) { | ||
| 88 | + return PromiseReject(err); | ||
| 97 | 89 | } | |
| 98 | 90 | if (typeof ref !== 'boolean') { | |
| 99 | 91 | return PromiseReject( | |
0 commit comments