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.

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

feat: add request.routeOptions object #4397

Merged
merged 20 commits into from Nov 5, 2022
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/Reference/Request.md
Expand Up @@ -42,6 +42,8 @@ Request is a core Fastify object containing the following fields:
handling the request
- `routeConfig` - The route [`config`](./Routes.md#routes-config)
object.
- `routeOptions` - The route [`option`](./Routes.md#routes-options) object
- `bodyLimit` - either server limit or route limit
debadutta98 marked this conversation as resolved.
Show resolved Hide resolved
- [.getValidationFunction(schema | httpPart)](#getvalidationfunction) -
Returns a validation function for the specified schema or http part,
if any of either are set or cached.
Expand Down Expand Up @@ -90,6 +92,7 @@ fastify.post('/:params', options, function (request, reply) {
console.log(request.protocol)
console.log(request.url)
console.log(request.routerMethod)
console.log(request.routeOptions.bodyLimit)
console.log(request.routerPath)
request.log.info('some info')
})
Expand Down
10 changes: 10 additions & 0 deletions lib/request.js
Expand Up @@ -165,6 +165,16 @@ Object.defineProperties(Request.prototype, {
return this[kRouteContext].config.url
}
},
routeOptions: {
get () {
const context = this[kRouteContext]
const serverLimit = context.server.initialConfig.bodyLimit
const routeLimit = context._parserOptions.limit
return {
bodyLimit: ((routeLimit || serverLimit))
}
debadutta98 marked this conversation as resolved.
Show resolved Hide resolved
}
},
routerMethod: {
get () {
return this[kRouteContext].config.method
Expand Down
79 changes: 79 additions & 0 deletions test/bodyLimit.test.js
Expand Up @@ -44,3 +44,82 @@ test('bodyLimit', t => {
})
})
})

test('default request.routeOptions.bodyLimit should be 1048576', t => {
t.plan(4)
const fastify = Fastify()
fastify.post('/default-bodylimit', {
handler (request, reply) {
t.equal(1048576, request.routeOptions.bodyLimit)
reply.send({ })
}
})
fastify.listen({ port: 0 }, function (err) {
t.error(err)
t.teardown(() => { fastify.close() })

sget({
method: 'POST',
url: 'http://localhost:' + fastify.server.address().port + '/default-bodylimit',
headers: { 'Content-Type': 'application/json' },
body: [],
json: true
}, (err, response, body) => {
t.error(err)
t.equal(response.statusCode, 200)
})
})
})

test('request.routeOptions.bodyLimit should be equal to route limit', t => {
t.plan(4)
const fastify = Fastify({ bodyLimit: 1 })
fastify.post('/route-limit', {
bodyLimit: 1000,
handler (request, reply) {
t.equal(1000, request.routeOptions.bodyLimit)
reply.send({})
}
})
fastify.listen({ port: 0 }, function (err) {
t.error(err)
t.teardown(() => { fastify.close() })

sget({
method: 'POST',
url: 'http://localhost:' + fastify.server.address().port + '/route-limit',
headers: { 'Content-Type': 'application/json' },
body: [],
json: true
}, (err, response, body) => {
t.error(err)
t.equal(response.statusCode, 200)
})
})
})

test('request.routeOptions.bodyLimit should be equal to server limit', t => {
t.plan(4)
const fastify = Fastify({ bodyLimit: 100 })
fastify.post('/server-limit', {
handler (request, reply) {
t.equal(100, request.routeOptions.bodyLimit)
reply.send({})
}
})
fastify.listen({ port: 0 }, function (err) {
t.error(err)
t.teardown(() => { fastify.close() })

sget({
method: 'POST',
url: 'http://localhost:' + fastify.server.address().port + '/server-limit',
headers: { 'Content-Type': 'application/json' },
body: [],
json: true
}, (err, response, body) => {
t.error(err)
t.equal(response.statusCode, 200)
})
})
})
1 change: 1 addition & 0 deletions test/types/request.test-d.ts
Expand Up @@ -66,6 +66,7 @@ const getHandler: RouteHandler = function (request, _reply) {
expectType<string>(request.method)
expectType<string>(request.routerPath)
expectType<string>(request.routerMethod)
expectType<number>(request.routeBodyLimit)
expectType<boolean>(request.is404)
expectType<string>(request.hostname)
expectType<string>(request.ip)
Expand Down
1 change: 1 addition & 0 deletions types/request.d.ts
Expand Up @@ -66,6 +66,7 @@ export interface FastifyRequest<RouteGeneric extends RouteGenericInterface = Rou
readonly method: string;
readonly routerPath: string;
readonly routerMethod: string;
readonly routeBodyLimit: number;
readonly is404: boolean;
readonly socket: RawRequest['socket'];

Expand Down