Skip to content

Commit

Permalink
fix: use TypeError
Browse files Browse the repository at this point in the history
Fixes: #1098
  • Loading branch information
ronag committed Nov 15, 2021
1 parent e659683 commit 64d07c3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
8 changes: 2 additions & 6 deletions lib/fetch/headers.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ const { validateHeaderName, validateHeaderValue } = require('http')
const { kHeadersList } = require('../core/symbols')
const { kGuard } = require('./symbols')
const { kEnumerableProperty } = require('../core/util')
const {
InvalidHTTPTokenError,
HTTPInvalidHeaderValueError
} = require('../core/errors')
const {
forbiddenHeaderNames,
forbiddenResponseHeaderNames
Expand All @@ -34,7 +30,7 @@ function binarySearch (arr, val) {

function normalizeAndValidateHeaderName (name) {
if (name === undefined) {
throw new InvalidHTTPTokenError(`Header name ${name}`)
throw new TypeError(`Header name ${name}`)
}
const normalizedHeaderName = name.toLocaleLowerCase()
validateHeaderName(normalizedHeaderName)
Expand All @@ -43,7 +39,7 @@ function normalizeAndValidateHeaderName (name) {

function normalizeAndValidateHeaderValue (name, value) {
if (value === undefined) {
throw new HTTPInvalidHeaderValueError(value, name)
throw new TypeError(value, name)
}
const normalizedHeaderValue = `${value}`.replace(
/^[\n\t\r\x20]+|[\n\t\r\x20]+$/g,
Expand Down
8 changes: 2 additions & 6 deletions test/fetch/headers.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ const {
fill
} = require('../../lib/fetch/headers')
const { kHeadersList } = require('../../lib/core/symbols')
const {
InvalidHTTPTokenError,
HTTPInvalidHeaderValueError
} = require('../../lib/core/errors')
const { kGuard } = require('../../lib/fetch/symbols')
const {
forbiddenHeaderNames,
Expand Down Expand Up @@ -489,12 +485,12 @@ tap.test('arg validation', (t) => {
// normalizeAndValidateHeaderName
t.throws(() => {
normalizeAndValidateHeaderName()
}, InvalidHTTPTokenError)
}, TypeError)

// normalizeAndValidateHeaderValue
t.throws(() => {
normalizeAndValidateHeaderValue()
}, HTTPInvalidHeaderValueError)
}, TypeError)

// fill
t.throws(() => {
Expand Down

0 comments on commit 64d07c3

Please sign in to comment.