fastify 4.0.2 → 4.2.0

package/integration/test.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/bash
+
+set -e
+
+NUMBER=$RANDOM
+curl -i -X GET -H 'Content-Type: application/json' localhost:3000/ > GET
+if [[ ! $(cat GET | head -1| cut -f2 -d" ") == "200" || ! $(cat GET | tail -1| cut -f4 -d"\"") == "home page" ]] ; then
+exit 1
+fi;
+curl -i -X POST -H 'Content-Type: application/json' localhost:3000/post/$NUMBER --data {} > POST
+if [[ ! $(cat POST | head -1| cut -f2 -d" ") == "201" || ! $(cat POST | tail -1| cut -f4 -d"\"") == $(echo $NUMBER) ]]; then
+exit 1
+fi;
+curl -i -X PUT -H 'Content-Type: application/json' localhost:3000/put/$NUMBER --data {} > PUT
+if [[ ! $(cat PUT | head -1| cut -f2 -d" ") == "200" || ! $(cat PUT | tail -1| cut -f4 -d"\"") == $(echo $NUMBER) ]]; then
+exit 1
+fi;
+curl -i -X DELETE -H 'Content-Type: application/json' localhost:3000/delete/$NUMBER --data {} > DELETE
+if [[ ! $(cat DELETE | head -1| cut -f2 -d" ") == "204" ]]; then
+exit 1
+fi;
+
+rm -f GET POST PUT DELETE

package/lib/context.js

@@ -9,7 +9,8 @@ const {
   kRequest,
   kBodyLimit,
   kLogLevel,
-  kContentTypeParser
+  kContentTypeParser,
+  kRouteByFastify
 } = require('./symbols.js')
 
 // Objects that holds the context of every request
@@ -25,7 +26,8 @@ function Context ({
   attachValidation,
   replySerializer,
   schemaErrorFormatter,
-  server
+  server,
+  isFastify
 }) {
   this.schema = schema
   this.handler = handler
@@ -50,6 +52,7 @@ function Context ({
   this.attachValidation = attachValidation
   this[kReplySerializerDefault] = replySerializer
   this.schemaErrorFormatter = schemaErrorFormatter || server[kSchemaErrorFormatter] || defaultSchemaErrorFormatter
+  this[kRouteByFastify] = isFastify
 
   this.server = server
 }

package/lib/error-serializer.js

@@ -1,15 +1,180 @@
 // This file is autogenerated by build/build-error-serializer.js, do not edit
 /* istanbul ignore file */
 
-'use strict'
+  'use strict'
 
-const Serializer = require('fast-json-stringify/serializer')
-const buildAjv = require('fast-json-stringify/ajv')
+  
+
+class Serializer {
+  constructor (options = {}) {
+    switch (options.rounding) {
+      case 'floor':
+        this.parseInteger = Math.floor
+        break
+      case 'ceil':
+        this.parseInteger = Math.ceil
+        break
+      case 'round':
+        this.parseInteger = Math.round
+        break
+      default:
+        this.parseInteger = Math.trunc
+        break
+    }
+  }
+
+  asAny (i) {
+    return JSON.stringify(i)
+  }
+
+  asNull () {
+    return 'null'
+  }
+
+  asInteger (i) {
+    if (typeof i === 'bigint') {
+      return i.toString()
+    } else if (Number.isInteger(i)) {
+      return '' + i
+    } else {
+      /* eslint no-undef: "off" */
+      const integer = this.parseInteger(i)
+      if (Number.isNaN(integer) || !Number.isFinite(integer)) {
+        throw new Error(`The value "${i}" cannot be converted to an integer.`)
+      } else {
+        return '' + integer
+      }
+    }
+  }
+
+  asIntegerNullable (i) {
+    return i === null ? 'null' : this.asInteger(i)
+  }
+
+  asNumber (i) {
+    const num = Number(i)
+    if (Number.isNaN(num)) {
+      throw new Error(`The value "${i}" cannot be converted to a number.`)
+    } else if (!Number.isFinite(num)) {
+      return null
+    } else {
+      return '' + num
+    }
+  }
+
+  asNumberNullable (i) {
+    return i === null ? 'null' : this.asNumber(i)
+  }
+
+  asBoolean (bool) {
+    return bool && 'true' || 'false' // eslint-disable-line
+  }
+
+  asBooleanNullable (bool) {
+    return bool === null ? 'null' : this.asBoolean(bool)
+  }
+
+  asDatetime (date) {
+    const quotes = '"'
+    if (date instanceof Date) {
+      return quotes + date.toISOString() + quotes
+    }
+    return this.asString(date)
+  }
+
+  asDatetimeNullable (date) {
+    return date === null ? 'null' : this.asDatetime(date)
+  }
 
-const serializer = new Serializer({"mode":"standalone"})
-const ajv = buildAjv({})
+  asDate (date) {
+    const quotes = '"'
+    if (date instanceof Date) {
+      return quotes + new Date(date.getTime() - (date.getTimezoneOffset() * 60000)).toISOString().slice(0, 10) + quotes
+    }
+    return this.asString(date)
+  }
+
+  asDateNullable (date) {
+    return date === null ? 'null' : this.asDate(date)
+  }
+
+  asTime (date) {
+    const quotes = '"'
+    if (date instanceof Date) {
+      return quotes + new Date(date.getTime() - (date.getTimezoneOffset() * 60000)).toISOString().slice(11, 19) + quotes
+    }
+    return this.asString(date)
+  }
+
+  asTimeNullable (date) {
+    return date === null ? 'null' : this.asTime(date)
+  }
+
+  asString (str) {
+    const quotes = '"'
+    if (str instanceof Date) {
+      return quotes + str.toISOString() + quotes
+    } else if (str === null) {
+      return quotes + quotes
+    } else if (str instanceof RegExp) {
+      str = str.source
+    } else if (typeof str !== 'string') {
+      str = str.toString()
+    }
+
+    if (str.length < 42) {
+      return this.asStringSmall(str)
+    } else {
+      return JSON.stringify(str)
+    }
+  }
 
+  asStringNullable (str) {
+    return str === null ? 'null' : this.asString(str)
+  }
+
+  // magically escape strings for json
+  // relying on their charCodeAt
+  // everything below 32 needs JSON.stringify()
+  // every string that contain surrogate needs JSON.stringify()
+  // 34 and 92 happens all the time, so we
+  // have a fast case for them
+  asStringSmall (str) {
+    const l = str.length
+    let result = ''
+    let last = 0
+    let found = false
+    let surrogateFound = false
+    let point = 255
+    // eslint-disable-next-line
+    for (var i = 0; i < l && point >= 32; i++) {
+      point = str.charCodeAt(i)
+      if (point >= 0xD800 && point <= 0xDFFF) {
+        // The current character is a surrogate.
+        surrogateFound = true
+      }
+      if (point === 34 || point === 92) {
+        result += str.slice(last, i) + '\\'
+        last = i
+        found = true
+      }
+    }
+
+    if (!found) {
+      result = str
+    } else {
+      result += str.slice(last)
+    }
+    return ((point < 32) || (surrogateFound === true)) ? JSON.stringify(str) : '"' + result + '"'
+  }
+}
+
+  
 
+  const serializer = new Serializer({"mode":"standalone"})
+  
+
+  
     function main (input) {
       let json = ''
       json += anonymous0(input)
@@ -17,7 +182,7 @@ const ajv = buildAjv({})
     }
     
     function anonymous0 (input) {
-      // main
+      // #
   
       var obj = (input && typeof input.toJSON === 'function')
     ? input.toJSON()
@@ -81,5 +246,5 @@ const ajv = buildAjv({})
     
     
 
-module.exports = main
-    
+  module.exports = main
+      

package/lib/handleRequest.js

@@ -90,7 +90,7 @@ function preValidationCallback (err, request, reply) {
   const result = validateSchema(reply.context, request)
   if (result) {
     if (reply.context.attachValidation === false) {
-      reply.code(400).send(result)
+      reply.send(result)
       return
     }
 

package/lib/reply.js

@@ -331,10 +331,12 @@ Reply.prototype.redirect = function (code, url) {
   }
 
   this.header('location', url).code(code).send()
+  return this
 }
 
 Reply.prototype.callNotFound = function () {
   notFound(this)
+  return this
 }
 
 Reply.prototype.getResponseTime = function () {

package/lib/route.js

@@ -8,7 +8,7 @@ const supportedMethods = ['DELETE', 'GET', 'HEAD', 'PATCH', 'POST', 'PUT', 'OPTI
 const { normalizeSchema } = require('./schemas')
 const { parseHeadOnSendHandlers } = require('./headRoute')
 const warning = require('./warnings')
-const { kRequestAcceptVersion } = require('./symbols')
+const { kRequestAcceptVersion, kRouteByFastify } = require('./symbols')
 
 const {
   compileSchemasForValidation,
@@ -113,7 +113,7 @@ function buildRouting (options) {
   }
 
   // Convert shorthand to extended route declaration
-  function prepareRoute (method, url, options, handler) {
+  function prepareRoute ({ method, url, options, handler, isFastify }) {
     if (typeof url !== 'string') {
       throw new FST_ERR_INVALID_URL(typeof url)
     }
@@ -140,11 +140,11 @@ function buildRouting (options) {
       handler: handler || (options && options.handler)
     })
 
-    return route.call(this, options)
+    return route.call(this, { options, isFastify })
   }
 
   // Route management
-  function route (options) {
+  function route ({ options, isFastify }) {
     // Since we are mutating/assigning only top level props, it is fine to have a shallow copy using the spread operator
     const opts = { ...options }
 
@@ -176,30 +176,30 @@ function buildRouting (options) {
     if (path === '/' && prefix.length > 0 && opts.method !== 'HEAD') {
       switch (opts.prefixTrailingSlash) {
         case 'slash':
-          addNewRoute.call(this, path)
+          addNewRoute.call(this, { path, isFastify })
           break
         case 'no-slash':
-          addNewRoute.call(this, '')
+          addNewRoute.call(this, { path: '', isFastify })
           break
         case 'both':
         default:
-          addNewRoute.call(this, '')
+          addNewRoute.call(this, { path: '', isFastify })
           // If ignoreTrailingSlash is set to true we need to add only the '' route to prevent adding an incomplete one.
           if (ignoreTrailingSlash !== true && (ignoreDuplicateSlashes !== true || !prefix.endsWith('/'))) {
-            addNewRoute.call(this, path, true)
+            addNewRoute.call(this, { path, prefixing: true, isFastify })
           }
       }
     } else if (path[0] === '/' && prefix.endsWith('/')) {
       // Ensure that '/prefix/' + '/route' gets registered as '/prefix/route'
-      addNewRoute.call(this, path.slice(1))
+      addNewRoute.call(this, { path: path.slice(1), isFastify })
     } else {
-      addNewRoute.call(this, path)
+      addNewRoute.call(this, { path, isFastify })
     }
 
     // chainable api
     return this
 
-    function addNewRoute (path, prefixing = false) {
+    function addNewRoute ({ path, prefixing = false, isFastify = false }) {
       const url = prefix + path
 
       opts.url = url
@@ -241,7 +241,8 @@ function buildRouting (options) {
         attachValidation: opts.attachValidation,
         schemaErrorFormatter: opts.schemaErrorFormatter,
         replySerializer: this[kReplySerializerDefault],
-        server: this
+        server: this,
+        isFastify
       })
 
       if (opts.version) {
@@ -249,13 +250,20 @@ function buildRouting (options) {
         constraints.version = opts.version
       }
 
-      const headRouteExists = opts.method === 'HEAD' && router.find(opts.method, opts.url, constraints) != null
+      const headHandler = router.find('HEAD', opts.url, constraints)
+      const hasHEADHandler = headHandler != null
 
-      // Check if the current route is not for a sibling HEAD one
-      if (!headRouteExists) {
-        try {
-          router.on(opts.method, opts.url, { constraints }, routeHandler, context)
-        } catch (error) {
+      // remove the head route created by fastify
+      if (hasHEADHandler && !context[kRouteByFastify] && headHandler.store[kRouteByFastify]) {
+        router.off(opts.method, opts.url, { constraints })
+      }
+
+      try {
+        router.on(opts.method, opts.url, { constraints }, routeHandler, context)
+      } catch (error) {
+        // any route insertion error created by fastify can be safely ignore
+        // because it only duplicate route for head
+        if (!context[kRouteByFastify]) {
           const isDuplicatedRoute = error.message.includes(`Method '${opts.method}' already declared for route '${opts.url}'`)
           if (isDuplicatedRoute) {
             throw new FST_ERR_DUPLICATED_ROUTE(opts.method, opts.url)
@@ -320,19 +328,21 @@ function buildRouting (options) {
           }
         })
 
-        const { exposeHeadRoute } = opts
-        const hasRouteExposeHeadRouteFlag = exposeHeadRoute != null
-        const shouldExposeHead = hasRouteExposeHeadRouteFlag ? exposeHeadRoute : globalExposeHeadRoutes
-
-        if (shouldExposeHead && options.method === 'GET' && !headRouteExists) {
-          const onSendHandlers = parseHeadOnSendHandlers(opts.onSend)
-          prepareRoute.call(this, 'HEAD', path, { ...opts, onSend: onSendHandlers })
-        } else if (headRouteExists && exposeHeadRoute) {
-          warning.emit('FSTDEP007')
-        }
-
         done(notHandledErr)
       })
+
+      // register head route in sync
+      // we must place it after the `this.after`
+      const { exposeHeadRoute } = opts
+      const hasRouteExposeHeadRouteFlag = exposeHeadRoute != null
+      const shouldExposeHead = hasRouteExposeHeadRouteFlag ? exposeHeadRoute : globalExposeHeadRoutes
+
+      if (shouldExposeHead && options.method === 'GET' && !hasHEADHandler) {
+        const onSendHandlers = parseHeadOnSendHandlers(opts.onSend)
+        prepareRoute.call(this, { method: 'HEAD', url: path, options: { ...opts, onSend: onSendHandlers }, isFastify: true })
+      } else if (hasHEADHandler && exposeHeadRoute) {
+        warning.emit('FSTDEP007')
+      }
     }
   }
 

package/lib/server.js

@@ -41,7 +41,15 @@ function createServer (options, httpHandler) {
       listenOptions.cb = cb
     }
 
-    const { host = 'localhost' } = listenOptions
+    // If we have a path specified, don't default host to 'localhost' so we don't end up listening
+    // on both path and host
+    // See https://github.com/fastify/fastify/issues/4007
+    let host
+    if (listenOptions.path == null) {
+      host = listenOptions.host ?? 'localhost'
+    } else {
+      host = listenOptions.host
+    }
     if (Object.prototype.hasOwnProperty.call(listenOptions, 'host') === false) {
       listenOptions.host = host
     }

package/lib/symbols.js

@@ -47,7 +47,8 @@ const keys = {
   kTestInternals: Symbol('fastify.testInternals'),
   kErrorHandler: Symbol('fastify.errorHandler'),
   kHasBeenDecorated: Symbol('fastify.hasBeenDecorated'),
-  kKeepAliveConnections: Symbol('fastify.keepAliveConnections')
+  kKeepAliveConnections: Symbol('fastify.keepAliveConnections'),
+  kRouteByFastify: Symbol('fastify.routeByFastify')
 }
 
 module.exports = keys

package/lib/validation.js

@@ -106,11 +106,13 @@ function validate (context, request) {
 
 function wrapValidationError (result, dataVar, schemaErrorFormatter) {
   if (result instanceof Error) {
+    result.statusCode = result.statusCode || 400
     result.validationContext = result.validationContext || dataVar
     return result
   }
 
   const error = schemaErrorFormatter(result, dataVar)
+  error.statusCode = error.statusCode || 400
   error.validation = result
   error.validationContext = dataVar
   return error

package/lib/wrapThenable.js

@@ -11,9 +11,14 @@ function wrapThenable (thenable, reply) {
       return
     }
 
-    // this is for async functions that
-    // are using reply.send directly
-    if (payload !== undefined || reply.sent === false) {
+    // this is for async functions that are using reply.send directly
+    //
+    // since wrap-thenable will be called when using reply.send directly
+    // without actual return. the response can be sent already or
+    // the request may be terminated during the reply. in this situation,
+    // it require an extra checking of request.aborted to see whether
+    // the request is killed by client.
+    if (payload !== undefined || (reply.sent === false && reply.raw.headersSent === false && reply.request.raw.aborted === false)) {
       // we use a try-catch internally to avoid adding a catch to another
       // promise, increase promise perf by 10%
       try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify",
-  "version": "4.0.2",
+  "version": "4.2.0",
   "description": "Fast and low overhead web framework, for Node.js",
   "main": "fastify.js",
   "type": "commonjs",
@@ -128,7 +128,7 @@
     "@fastify/pre-commit": "^2.0.2",
     "@sinclair/typebox": "^0.23.5",
     "@sinonjs/fake-timers": "^9.1.2",
-    "@types/node": "^17.0.38",
+    "@types/node": "^18.0.0",
     "@typescript-eslint/eslint-plugin": "^5.27.0",
     "@typescript-eslint/parser": "^5.27.0",
     "ajv": "^8.11.0",
@@ -146,6 +146,7 @@
     "eslint-plugin-n": "^15.2.0",
     "eslint-plugin-promise": "^6.0.0",
     "fast-json-body": "^1.1.0",
+    "fast-json-stringify": "^5.0.0",
     "fastify-plugin": "^3.0.1",
     "fluent-json-schema": "^3.1.0",
     "form-data": "^4.0.0",
@@ -169,7 +170,7 @@
     "split2": "^4.1.0",
     "standard": "^17.0.0-2",
     "tap": "^16.2.0",
-    "tsd": "^0.20.0",
+    "tsd": "^0.21.0",
     "typescript": "^4.7.2",
     "undici": "^5.4.0",
     "x-xss-protection": "^2.0.0",
@@ -178,11 +179,10 @@
   "dependencies": {
     "@fastify/ajv-compiler": "^3.1.0",
     "@fastify/error": "^3.0.0",
-    "@fastify/fast-json-stringify-compiler": "^3.0.0",
+    "@fastify/fast-json-stringify-compiler": "^4.0.0",
     "abstract-logging": "^2.0.1",
     "avvio": "^8.1.3",
-    "fast-json-stringify": "^4.1.0",
-    "find-my-way": "^6.3.0",
+    "find-my-way": "^7.0.0",
     "light-my-request": "^5.0.0",
     "pino": "^8.0.0",
     "process-warning": "^2.0.0",

package/test/404s.test.js

@@ -1320,7 +1320,7 @@ test('preHandler option for setNotFoundHandler', t => {
 
   // https://github.com/fastify/fastify/issues/2229
   t.test('preHandler hook in setNotFoundHandler should be called when callNotFound', { timeout: 40000 }, t => {
-    t.plan(2)
+    t.plan(3)
     const fastify = Fastify()
 
     fastify.setNotFoundHandler({
@@ -1333,7 +1333,7 @@ test('preHandler option for setNotFoundHandler', t => {
     })
 
     fastify.post('/', function (req, reply) {
-      reply.callNotFound()
+      t.equal(reply.callNotFound(), reply)
     })
 
     fastify.inject({

package/test/build/error-serializer.test.js

@@ -7,6 +7,10 @@ const path = require('path')
 
 const { code } = require('../../build/build-error-serializer')
 
+function unifyLineBreak (str) {
+  return str.toString().replace(/\r\n/g, '\n')
+}
+
 test('check generated code syntax', async (t) => {
   t.plan(1)
 
@@ -24,5 +28,6 @@ test('ensure the current error serializer is latest', async (t) => {
 
   const current = await fs.promises.readFile(path.resolve('lib/error-serializer.js'))
 
-  t.equal(current.toString(), code)
+  // line break should not be a problem depends on system
+  t.equal(unifyLineBreak(current), unifyLineBreak(code))
 })

package/test/hooks.test.js

@@ -799,6 +799,27 @@ test('onRoute hook with many prefix', t => {
   fastify.ready(err => { t.error(err) })
 })
 
+test('onRoute hook should not be called when it registered after route', t => {
+  t.plan(3)
+  const fastify = Fastify()
+
+  fastify.addHook('onRoute', () => {
+    t.pass()
+  })
+
+  fastify.get('/', function (req, reply) {
+    reply.send()
+  })
+
+  fastify.addHook('onRoute', () => {
+    t.fail('should not be called')
+  })
+
+  fastify.ready(err => {
+    t.error(err)
+  })
+})
+
 test('onResponse hook should log request error', t => {
   t.plan(4)
 

package/test/internals/reply.test.js

@@ -233,6 +233,10 @@ test('within an instance', t => {
     reply.redirect('/')
   })
 
+  fastify.get('/redirect-async', async function (req, reply) {
+    return reply.redirect('/')
+  })
+
   fastify.get('/redirect-code', function (req, reply) {
     reply.redirect(301, '/')
   })
@@ -412,6 +416,14 @@ test('within an instance', t => {
       })
     })
 
+    test('redirect with async function to `/` - 10', t => {
+      t.plan(1)
+
+      http.get('http://localhost:' + fastify.server.address().port + '/redirect-async', function (response) {
+        t.equal(response.statusCode, 302)
+      })
+    })
+
     t.end()
   })
 })

package/test/listen.test.js

@@ -196,14 +196,28 @@ if (os.platform() !== 'win32') {
     const fastify = Fastify()
     t.teardown(fastify.close.bind(fastify))
 
-    const sockFile = path.join(os.tmpdir(), `${(Math.random().toString(16) + '0000000').substr(2, 8)}-server.sock`)
+    const sockFile = path.join(os.tmpdir(), `${(Math.random().toString(16) + '0000000').slice(2, 10)}-server.sock`)
     try {
       fs.unlinkSync(sockFile)
     } catch (e) { }
 
     fastify.listen({ path: sockFile }, (err, address) => {
       t.error(err)
-      t.equal(sockFile, fastify.server.address())
+      t.strictSame(fastify.addresses(), [sockFile])
+      t.equal(address, sockFile)
+    })
+  })
+} else {
+  test('listen on socket', t => {
+    t.plan(3)
+    const fastify = Fastify()
+    t.teardown(fastify.close.bind(fastify))
+
+    const sockFile = `\\\\.\\pipe\\${(Math.random().toString(16) + '0000000').slice(2, 10)}-server-sock`
+
+    fastify.listen({ path: sockFile }, (err, address) => {
+      t.error(err)
+      t.strictSame(fastify.addresses(), [sockFile])
       t.equal(address, sockFile)
     })
   })

package/test/pretty-print.test.js

@@ -144,7 +144,7 @@ test('pretty print - commonPrefix', t => {
 `
     const flatExpected = `└── / (-)
     ├── helicopter (GET, HEAD)
-    └── hello (GET, PUT, HEAD)
+    └── hello (GET, HEAD, PUT)
 `
     t.equal(typeof radixTree, 'string')
     t.equal(typeof flatTree, 'string')
@@ -200,7 +200,7 @@ test('pretty print - includeMeta, includeHooks', t => {
     │   • (onTimeout) ["onTimeout()"]
     │   • (onRequest) ["anonymous()"]
     │   • (errorHandler) "defaultErrorHandler()"
-    └── hello (GET, PUT, HEAD)
+    └── hello (GET, HEAD, PUT)
         • (onTimeout) ["onTimeout()"]
         • (onRequest) ["anonymous()"]
         • (errorHandler) "defaultErrorHandler()"
@@ -210,7 +210,7 @@ test('pretty print - includeMeta, includeHooks', t => {
     ├── helicopter (GET, HEAD)
     │   • (onTimeout) ["onTimeout()"]
     │   • (onRequest) ["anonymous()"]
-    └── hello (GET, PUT, HEAD)
+    └── hello (GET, HEAD, PUT)
         • (onTimeout) ["onTimeout()"]
         • (onRequest) ["anonymous()"]
 `