FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

lib: extract validateNumber validator · nodejs/node@1eac11f · GitHub

/ node Public

Commit 1eac11f

Browse files
maclover7
authored and
targos
committed
lib: extract validateNumber validator
Pulls out another common argument validator to `internal/validators` PR-URL: #22249 Reviewed-By: Bryan English <bryan@bryanenglish.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 983b578 commit 1eac11f

7 files changed

Lines changed: 31 additions & 52 deletions

File tree

‎lib/dgram.js‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ const {
3737
ERR_SOCKET_CANNOT_SEND,
3838
ERR_SOCKET_DGRAM_NOT_RUNNING
3939
} = errors.codes;
40-
const { validateString } = require('internal/validators');
40+
const {
41+
validateString,
42+
validateNumber
43+
} = require('internal/validators');
4144
const { Buffer } = require('buffer');
4245
const util = require('util');
4346
const { isUint8Array } = require('internal/util/types');
@@ -258,18 +261,9 @@ Socket.prototype.sendto = function(buffer,
258261
port,
259262
address,
260263
callback) {
261-
if (typeof offset !== 'number') {
262-
throw new ERR_INVALID_ARG_TYPE('offset', 'number', offset);
263-
}
264-
265-
if (typeof length !== 'number') {
266-
throw new ERR_INVALID_ARG_TYPE('length', 'number', length);
267-
}
268-
269-
if (typeof port !== 'number') {
270-
throw new ERR_INVALID_ARG_TYPE('port', 'number', port);
271-
}
272-
264+
validateNumber(offset, 'offset');
265+
validateNumber(length, 'length');
266+
validateNumber(port, 'port');
273267
validateString(address, 'address');
274268

275269
this.send(buffer, offset, length, port, address, callback);
@@ -530,9 +524,7 @@ Socket.prototype.setBroadcast = function(arg) {
530524

531525

532526
Socket.prototype.setTTL = function(ttl) {
533-
if (typeof ttl !== 'number') {
534-
throw new ERR_INVALID_ARG_TYPE('ttl', 'number', ttl);
535-
}
527+
validateNumber(ttl, 'ttl');
536528

537529
var err = this[kStateSymbol].handle.setTTL(ttl);
538530
if (err) {
@@ -544,9 +536,7 @@ Socket.prototype.setTTL = function(ttl) {
544536

545537

546538
Socket.prototype.setMulticastTTL = function(ttl) {
547-
if (typeof ttl !== 'number') {
548-
throw new ERR_INVALID_ARG_TYPE('ttl', 'number', ttl);
549-
}
539+
validateNumber(ttl, 'ttl');
550540

551541
var err = this[kStateSymbol].handle.setMulticastTTL(ttl);
552542
if (err) {

‎lib/internal/buffer.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
const binding = process.binding('buffer');
44
const {
55
ERR_BUFFER_OUT_OF_BOUNDS,
6-
ERR_INVALID_ARG_TYPE,
76
ERR_OUT_OF_RANGE
87
} = require('internal/errors').codes;
8+
const { validateNumber } = require('internal/validators');
99
const { setupBufferJS } = binding;
1010

1111
// Remove from the binding so that function is only available as exported here.
@@ -38,9 +38,7 @@ function checkInt(value, min, max, buf, offset, byteLength) {
3838
}
3939

4040
function checkNumberType(value, type) {
41-
if (typeof value !== 'number') {
42-
throw new ERR_INVALID_ARG_TYPE(type || 'offset', 'number', value);
43-
}
41+
validateNumber(value, type || 'offset');
4442
}
4543

4644
function boundsError(value, length, type) {

‎lib/internal/crypto/random.js‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@ const {
88
ERR_INVALID_CALLBACK,
99
ERR_OUT_OF_RANGE
1010
} = require('internal/errors').codes;
11+
const { validateNumber } = require('internal/validators');
1112
const { isArrayBufferView } = require('internal/util/types');
1213

1314
const kMaxUint32 = 2 ** 32 - 1;
1415
const kMaxPossibleLength = Math.min(kMaxLength, kMaxUint32);
1516

1617
function assertOffset(offset, elementSize, length) {
17-
if (typeof offset !== 'number') {
18-
throw new ERR_INVALID_ARG_TYPE('offset', 'number', offset);
19-
}
20-
18+
validateNumber(offset, 'offset');
2119
offset *= elementSize;
2220

2321
const maxLength = Math.min(length, kMaxPossibleLength);
@@ -29,10 +27,7 @@ function assertOffset(offset, elementSize, length) {
2927
}
3028

3129
function assertSize(size, elementSize, offset, length) {
32-
if (typeof size !== 'number') {
33-
throw new ERR_INVALID_ARG_TYPE('size', 'number', size);
34-
}
35-
30+
validateNumber(size, 'size');
3631
size *= elementSize;
3732

3833
if (Number.isNaN(size) || size > kMaxPossibleLength || size < 0) {

‎lib/internal/http2/core.js‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ const {
7575
ERR_SOCKET_CLOSED
7676
}
7777
} = require('internal/errors');
78+
const { validateNumber } = require('internal/validators');
7879
const { utcDate } = require('internal/http');
7980
const { onServerStream,
8081
Http2ServerRequest,
@@ -1001,8 +1002,7 @@ class Http2Session extends EventEmitter {
10011002
if (this.destroyed)
10021003
throw new ERR_HTTP2_INVALID_SESSION();
10031004

1004-
if (typeof id !== 'number')
1005-
throw new ERR_INVALID_ARG_TYPE('id', 'number', id);
1005+
validateNumber(id, 'id');
10061006
if (id <= 0 || id > kMaxStreams)
10071007
throw new ERR_OUT_OF_RANGE('id', `> 0 and <= ${kMaxStreams}`, id);
10081008
this[kHandle].setNextStreamID(id);
@@ -1144,12 +1144,8 @@ class Http2Session extends EventEmitter {
11441144
['Buffer', 'TypedArray', 'DataView'],
11451145
opaqueData);
11461146
}
1147-
if (typeof code !== 'number') {
1148-
throw new ERR_INVALID_ARG_TYPE('code', 'number', code);
1149-
}
1150-
if (typeof lastStreamID !== 'number') {
1151-
throw new ERR_INVALID_ARG_TYPE('lastStreamID', 'number', lastStreamID);
1152-
}
1147+
validateNumber(code, 'code');
1148+
validateNumber(lastStreamID, 'lastStreamID');
11531149

11541150
const goawayFn = submitGoaway.bind(this, code, lastStreamID, opaqueData);
11551151
if (this.connecting) {
@@ -1831,8 +1827,7 @@ class Http2Stream extends Duplex {
18311827
// close, it is still possible to queue up PRIORITY and RST_STREAM frames,
18321828
// but no DATA and HEADERS frames may be sent.
18331829
close(code = NGHTTP2_NO_ERROR, callback) {
1834-
if (typeof code !== 'number')
1835-
throw new ERR_INVALID_ARG_TYPE('code', 'number', code);
1830+
validateNumber(code, 'code');
18361831
if (code < 0 || code > kMaxInt)
18371832
throw new ERR_OUT_OF_RANGE('code', `>= 0 && <= ${kMaxInt}`, code);
18381833
if (callback !== undefined && typeof callback !== 'function')
@@ -2326,8 +2321,7 @@ class ServerHttp2Stream extends Http2Stream {
23262321
this[kState].flags |= STREAM_FLAGS_HAS_TRAILERS;
23272322
}
23282323

2329-
if (typeof fd !== 'number')
2330-
throw new ERR_INVALID_ARG_TYPE('fd', 'number', fd);
2324+
validateNumber(fd, 'fd');
23312325

23322326
debug(`Http2Stream ${this[kID]} [Http2Session ` +
23332327
`${sessionName(session[kType])}]: initiating response from fd`);

‎lib/internal/timers.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ const async_id_symbol = Symbol('asyncId');
1111
const trigger_async_id_symbol = Symbol('triggerId');
1212

1313
const {
14-
ERR_INVALID_ARG_TYPE,
1514
ERR_INVALID_CALLBACK,
1615
ERR_OUT_OF_RANGE
1716
} = require('internal/errors').codes;
17+
const { validateNumber } = require('internal/validators');
1818

1919
// Timeout values > TIMEOUT_MAX are set to 1.
2020
const TIMEOUT_MAX = 2 ** 31 - 1;
@@ -130,10 +130,7 @@ function setUnrefTimeout(callback, after, arg1, arg2, arg3) {
130130

131131
// Type checking used by timers.enroll() and Socket#setTimeout()
132132
function validateTimerDuration(msecs) {
133-
if (typeof msecs !== 'number') {
134-
throw new ERR_INVALID_ARG_TYPE('msecs', 'number', msecs);
135-
}
136-
133+
validateNumber(msecs, 'msecs');
137134
if (msecs < 0 || !isFinite(msecs)) {
138135
throw new ERR_OUT_OF_RANGE('msecs', 'a non-negative finite number', msecs);
139136
}

‎lib/internal/validators.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,18 @@ function validateString(value, name) {
125125
throw new ERR_INVALID_ARG_TYPE(name, 'string', value);
126126
}
127127

128+
function validateNumber(value, name) {
129+
if (typeof value !== 'number')
130+
throw new ERR_INVALID_ARG_TYPE(name, 'number', value);
131+
}
132+
128133
module.exports = {
129134
isInt32,
130135
isUint32,
131136
validateMode,
132137
validateInteger,
133138
validateInt32,
134139
validateUint32,
135-
validateString
140+
validateString,
141+
validateNumber
136142
};

‎lib/util.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const {
2727
ERR_INVALID_ARG_TYPE,
2828
ERR_OUT_OF_RANGE
2929
} = errors.codes;
30+
const { validateNumber } = require('internal/validators');
3031
const { TextDecoder, TextEncoder } = require('internal/encoding');
3132
const { isBuffer } = require('buffer').Buffer;
3233

@@ -1431,9 +1432,7 @@ function callbackify(original) {
14311432
}
14321433

14331434
function getSystemErrorName(err) {
1434-
if (typeof err !== 'number') {
1435-
throw new ERR_INVALID_ARG_TYPE('err', 'number', err);
1436-
}
1435+
validateNumber(err, 'err');
14371436
if (err >= 0 || !Number.isSafeInteger(err)) {
14381437
throw new ERR_OUT_OF_RANGE('err', 'a negative integer', err);
14391438
}

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL