fix: handle invalid url

fastify.js

@@ -168,11 +168,7 @@ function fastify (options) {
   })
 
   // 404 router, used for handling encapsulated 404 handlers
-  const fourOhFour = build404({
-    logger: options.logger,
-    genReqId: options.genReqId,
-    onBadUrl: onBadUrl
-  })
+  const fourOhFour = build404(options)
 
   // HTTP server and its handler
   const httpHandler = wrapRouting(router.routing, options)

lib/fourOhFour.js

@@ -34,7 +34,7 @@ const fourOhFourContext = {
  * kFourOhFourContext: the context in the reply object where the handler will be executed
  */
 function fourOhFour (options) {
-  const { logger, genReqId, onBadUrl } = options
+  const { logger, genReqId } = options
 
   // 404 router, used for handling encapsulated 404 handlers
   const router = FindMyWay({ onBadUrl: onBadUrl, defaultRoute: fourOhFourFallBack })
@@ -58,6 +58,24 @@ function fourOhFour (options) {
     })
   }
 
+  function onBadUrl (path, req, res) {
+    const { url, method } = req
+    const message = `Route ${method}:${url} not found`
+    const body = `{"error":"Not Found","message":"${message}","statusCode":404}`
+
+    // simulate normal route logging
+    const id = genReqId(req)
+    const childLogger = logger.child({ reqId: id })
+    childLogger.info({ req }, 'incoming request')
+    childLogger.info({ req }, message)
+
+    res.writeHead(404, {
+      'Content-Type': 'application/json',
+      'Content-Length': body.length
+    })
+    res.end(body)
+  }
+
   function setContext (instance, context) {
     const _404Context = Object.assign({}, instance[kFourOhFourContext])
     _404Context.onSend = context.onSend

test/404s.test.js

@@ -1746,29 +1746,29 @@ test('400 in case of bad url (pre find-my-way v2.2.0 was a 404)', t => {
       method: 'GET'
     }, (err, response) => {
       t.error(err)
-      t.equal(response.statusCode, 400)
+      t.equal(response.statusCode, 404)
       t.same(JSON.parse(response.payload), {
-        error: 'Bad Request',
-        message: "'%c0' is not a valid url component",
-        statusCode: 400
+        error: 'Not Found',
+        message: 'Route GET:/%c0 not found',
+        statusCode: 404
       })
     })
   })
 
   t.test('Only / is registered', t => {
     t.plan(3)
-    const fastify = Fastify()
+    const fastify = Fastify({ logger: true })
     fastify.get('/', () => t.fail('we should not be here'))
     fastify.inject({
       url: '/%c0',
       method: 'GET'
     }, (err, response) => {
       t.error(err)
-      t.equal(response.statusCode, 400)
+      t.equal(response.statusCode, 404)
       t.same(JSON.parse(response.payload), {
-        error: 'Bad Request',
-        message: "'%c0' is not a valid url component",
-        statusCode: 400
+        error: 'Not Found',
+        message: 'Route GET:/%c0 not found',
+        statusCode: 404
       })
     })
   })