Skip to content

Commit

Permalink
quic,timers: refactor to use validateAbortSignal
Browse files Browse the repository at this point in the history
PR-URL: #36604
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Juan José Arboleda <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
  • Loading branch information
Lxxyx authored and danielleadams committed Jan 12, 2021
1 parent 8a0cdb3 commit 8b7336b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 22 deletions.
7 changes: 3 additions & 4 deletions lib/internal/quic/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ const {
} = require('internal/histogram');

const {
validateAbortSignal,
validateBoolean,
validateInteger,
validateObject,
Expand Down Expand Up @@ -680,8 +681,7 @@ class QuicEndpoint {
return this.address;

const { signal } = { ...options };
if (signal != null && !('aborted' in signal))
throw new ERR_INVALID_ARG_TYPE('options.signal', 'AbortSignal', signal);
validateAbortSignal(signal, 'options.signal');

// If an AbortSignal was passed in, check to make sure it is not already
// aborted before we continue on to do any work.
Expand Down Expand Up @@ -1083,8 +1083,7 @@ class QuicSocket extends EventEmitter {
return;

const { signal } = { ...options };
if (signal != null && !('aborted' in signal))
throw new ERR_INVALID_ARG_TYPE('options.signal', 'AbortSignal', signal);
validateAbortSignal(signal, 'options.signal');

// If an AbotSignal was passed in, check to make sure it is not already
// aborted before we continue on to do any work.
Expand Down
28 changes: 10 additions & 18 deletions lib/timers/promises.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ const {
codes: { ERR_INVALID_ARG_TYPE }
} = require('internal/errors');

const { validateAbortSignal } = require('internal/validators');

function cancelListenerHandler(clear, reject) {
if (!this._destroyed) {
clear(this);
Expand All @@ -35,15 +37,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(
Expand Down Expand Up @@ -85,15 +82,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(
Expand Down

0 comments on commit 8b7336b

Please sign in to comment.