Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lib: refactor to use validators in http2 #46174

Merged
merged 4 commits into from
Jan 24, 2023
Merged

lib: refactor to use validators in http2 #46174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76d9760
lib: refactor to use validators in http2
debadree25 Jan 11, 2023
aa1bc5c
fixup! lint fix
debadree25 Jan 11, 2023
b6ab0d9
fixup! prevent unnecessary checking
debadree25 Jan 12, 2023
293ccd7
fixup! remove message checking in test!
debadree25 Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions lib/internal/http2/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ const {
validateNumber,
validateString,
validateUint32,
validateAbortSignal
validateAbortSignal,
validateBoolean,
} = require('internal/validators');
const fsPromisesInternal = require('internal/fs/promises');
const { utcDate } = require('internal/http');
Expand Down Expand Up @@ -761,26 +762,26 @@ function requestOnConnect(headers, options) {
const setAndValidatePriorityOptions = hideStackFrames((options) => {
if (options.weight === undefined) {
options.weight = NGHTTP2_DEFAULT_WEIGHT;
} else if (typeof options.weight !== 'number') {
throw new ERR_INVALID_ARG_VALUE('options.weight', options.weight);
} else {
validateNumber(options.weight, 'options.weight');
}

if (options.parent === undefined) {
options.parent = 0;
} else if (typeof options.parent !== 'number' || options.parent < 0) {
throw new ERR_INVALID_ARG_VALUE('options.parent', options.parent);
} else {
validateNumber(options.parent, 'options.parent', 0);
}

if (options.exclusive === undefined) {
options.exclusive = false;
} else if (typeof options.exclusive !== 'boolean') {
throw new ERR_INVALID_ARG_VALUE('options.exclusive', options.exclusive);
} else {
validateBoolean(options.exclusive, 'options.exclusive');
}

if (options.silent === undefined) {
options.silent = false;
} else if (typeof options.silent !== 'boolean') {
throw new ERR_INVALID_ARG_VALUE('options.silent', options.silent);
} else {
validateBoolean(options.silent, 'options.silent');
}
});

Expand Down Expand Up @@ -1784,8 +1785,8 @@ class ClientHttp2Session extends Http2Session {
// stream by default if the user has not specifically indicated a
// preference.
options.endStream = isPayloadMeaningless(headers[HTTP2_HEADER_METHOD]);
} else if (typeof options.endStream !== 'boolean') {
throw new ERR_INVALID_ARG_VALUE('options.endStream', options.endStream);
} else {
validateBoolean(options.endStream, 'options.endStream');
}

const headersList = mapToHeaders(headers);
Expand Down
5 changes: 1 addition & 4 deletions test/parallel/test-http2-client-request-options-errors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ if (!common.hasCrypto)
common.skip('missing crypto');
const assert = require('assert');
const http2 = require('http2');
const { inspect } = require('util');

// Check if correct errors are emitted when wrong type of data is passed
// to certain options of ClientHttp2Session request method
Expand Down Expand Up @@ -48,9 +47,7 @@ server.listen(0, common.mustCall(() => {
[option]: types[type]
}), {
name: 'TypeError',
code: 'ERR_INVALID_ARG_VALUE',
message: `The property 'options.${option}' is invalid. ` +
`Received ${inspect(types[type])}`
code: 'ERR_INVALID_ARG_TYPE',
});
});
});
Expand Down