fastify 4.5.2 → 4.6.0

package/lib/error-serializer.js

@@ -23,14 +23,6 @@ class Serializer {
     }
   }
 
-  asAny (i) {
-    return JSON.stringify(i)
-  }
-
-  asNull () {
-    return 'null'
-  }
-
   asInteger (i) {
     if (typeof i === 'bigint') {
       return i.toString()
@@ -47,10 +39,6 @@ class Serializer {
     }
   }
 
-  asIntegerNullable (i) {
-    return i === null ? 'null' : this.asInteger(i)
-  }
-
   asNumber (i) {
     const num = Number(i)
     if (Number.isNaN(num)) {
@@ -62,54 +50,43 @@ class Serializer {
     }
   }
 
-  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) {
     if (date === null) return '""'
     if (date instanceof Date) {
       return '"' + date.toISOString() + '"'
     }
+    if (typeof date === 'string') {
+      return '"' + date + '"'
+    }
     throw new Error(`The value "${date}" cannot be converted to a date-time.`)
   }
 
-  asDateTimeNullable (date) {
-    return date === null ? 'null' : this.asDateTime(date)
-  }
-
   asDate (date) {
     if (date === null) return '""'
     if (date instanceof Date) {
       return '"' + new Date(date.getTime() - (date.getTimezoneOffset() * 60000)).toISOString().slice(0, 10) + '"'
     }
+    if (typeof date === 'string') {
+      return '"' + date + '"'
+    }
     throw new Error(`The value "${date}" cannot be converted to a date.`)
   }
 
-  asDateNullable (date) {
-    return date === null ? 'null' : this.asDate(date)
-  }
-
   asTime (date) {
     if (date === null) return '""'
     if (date instanceof Date) {
       return '"' + new Date(date.getTime() - (date.getTimezoneOffset() * 60000)).toISOString().slice(11, 19) + '"'
     }
+    if (typeof date === 'string') {
+      return '"' + date + '"'
+    }
     throw new Error(`The value "${date}" cannot be converted to a time.`)
   }
 
-  asTimeNullable (date) {
-    return date === null ? 'null' : this.asTime(date)
-  }
-
   asString (str) {
     const quotes = '"'
     if (str instanceof Date) {
@@ -129,10 +106,6 @@ class Serializer {
     }
   }
 
-  asStringNullable (str) {
-    return str === null ? 'null' : this.asString(str)
-  }
-
   // magically escape strings for json
   // relying on their charCodeAt
   // everything below 32 needs JSON.stringify()
@@ -200,7 +173,7 @@ class Serializer {
   }
 
         json += "\"statusCode\"" + ':'
-      json += serializer.asNumber.bind(serializer)(obj["statusCode"])
+      json += serializer.asNumber(obj["statusCode"])
       }
     
       if (obj["code"] !== undefined) {
@@ -212,7 +185,7 @@ class Serializer {
   }
 
         json += "\"code\"" + ':'
-      json += serializer.asString.bind(serializer)(obj["code"])
+      json += serializer.asString(obj["code"])
       }
     
       if (obj["error"] !== undefined) {
@@ -224,7 +197,7 @@ class Serializer {
   }
 
         json += "\"error\"" + ':'
-      json += serializer.asString.bind(serializer)(obj["error"])
+      json += serializer.asString(obj["error"])
       }
     
       if (obj["message"] !== undefined) {
@@ -236,7 +209,7 @@ class Serializer {
   }
 
         json += "\"message\"" + ':'
-      json += serializer.asString.bind(serializer)(obj["message"])
+      json += serializer.asString(obj["message"])
       }
     
       json += '}'

package/lib/route.js

@@ -83,6 +83,7 @@ function buildRouting (options) {
     },
     routing: router.lookup.bind(router), // router func to find the right handler to call
     route, // configure a route in the fastify instance
+    hasRoute,
     prepareRoute,
     getDefaultRoute: function () {
       return router.defaultRoute
@@ -141,6 +142,14 @@ function buildRouting (options) {
     return route.call(this, { options, isFastify })
   }
 
+  function hasRoute ({ options }) {
+    return router.find(
+      options.method,
+      options.url || '',
+      options.constraints
+    ) !== null
+  }
+
   // Route management
   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

package/lib/schemas.js

@@ -62,6 +62,7 @@ function normalizeSchema (routeSchemas, serverOptions) {
   // let's check if our schemas have a custom prototype
   for (const key of ['headers', 'querystring', 'params', 'body']) {
     if (typeof routeSchemas[key] === 'object' && Object.getPrototypeOf(routeSchemas[key]) !== Object.prototype) {
+      routeSchemas[kSchemaVisited] = true
       return routeSchemas
     }
   }

package/lib/server.js

@@ -319,7 +319,7 @@ function normalizeListenArgs (args) {
     options.backlog = argsLength > 1 ? lastArg : undefined
   } else {
     /* Deal with listen ([port[, host[, backlog]]]) */
-    options.port = argsLength >= 1 && Number.isInteger(firstArg) ? firstArg : 0
+    options.port = argsLength >= 1 && Number.isInteger(firstArg) ? firstArg : normalizePort(firstArg)
     // This will listen to what localhost is.
     // It can be 127.0.0.1 or ::1, depending on the operating system.
     // Fixes https://github.com/fastify/fastify/issues/1022.
@@ -330,6 +330,11 @@ function normalizeListenArgs (args) {
   return options
 }
 
+function normalizePort (firstArg) {
+  const port = parseInt(firstArg, 10)
+  return port >= 0 && !Number.isNaN(port) ? port : 0
+}
+
 function logServerAddress (server) {
   let address = server.address()
   const isUnixSocket = typeof address === 'string'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify",
-  "version": "4.5.2",
+  "version": "4.6.0",
   "description": "Fast and low overhead web framework, for Node.js",
   "main": "fastify.js",
   "type": "commonjs",
@@ -164,7 +164,7 @@
     "split2": "^4.1.0",
     "standard": "^17.0.0-2",
     "tap": "^16.2.0",
-    "tsd": "^0.22.0",
+    "tsd": "^0.23.0",
     "typescript": "^4.7.2",
     "undici": "^5.4.0",
     "vary": "^1.1.2",
@@ -177,7 +177,7 @@
     "abstract-logging": "^2.0.1",
     "avvio": "^8.1.3",
     "find-my-way": "^7.0.0",
-    "light-my-request": "^5.0.0",
+    "light-my-request": "^5.5.1",
     "pino": "^8.0.0",
     "process-warning": "^2.0.0",
     "proxy-addr": "^2.0.7",

package/test/404s.test.js

@@ -1945,7 +1945,7 @@ test('Send 404 when frameworkError calls reply.callNotFound', t => {
   t.end()
 })
 
-test('hooks are applied to not found handlers', async ({ equal }) => {
+test('hooks are applied to not found handlers /1', async ({ equal }) => {
   const fastify = Fastify()
 
   // adding await here is fundamental for this test

package/test/async-await.test.js

@@ -423,6 +423,28 @@ test('promise was fulfilled with undefined', t => {
   })
 })
 
+test('promise was fulfilled with undefined using inject', async (t) => {
+  const stream = split(JSON.parse)
+  const fastify = Fastify({
+    logger: {
+      stream,
+      level: 'error'
+    }
+  })
+
+  fastify.get('/', async (req, reply) => {
+  })
+
+  stream.once('data', line => {
+    t.fail('should not log an error')
+  })
+
+  const res = await fastify.inject('/')
+
+  t.equal(res.body, '')
+  t.equal(res.statusCode, 200)
+})
+
 test('error is not logged because promise was fulfilled with undefined but response was sent before promise resolution', t => {
   t.plan(4)
 

package/test/decorator.test.js

@@ -642,7 +642,7 @@ test('should register empty values', t => {
 
   fastify.register((instance, opts, done) => {
     instance.decorate('test', null)
-    t.ok(instance.hasOwnProperty('test'))
+    t.ok(Object.prototype.hasOwnProperty.call(instance, 'test'))
     done()
   })
 

package/test/has-route.test.js

@@ -0,0 +1,77 @@
+'use strict'
+
+const t = require('tap')
+const test = t.test
+const Fastify = require('../fastify')
+
+test('hasRoute', t => {
+  t.plan(4)
+  const test = t.test
+  const fastify = Fastify()
+
+  test('hasRoute - invalid options', t => {
+    t.plan(3)
+
+    t.equal(fastify.hasRoute({ }), false)
+
+    t.equal(fastify.hasRoute({ method: 'GET' }), false)
+
+    t.equal(fastify.hasRoute({ constraints: [] }), false)
+  })
+
+  test('hasRoute - primitive method', t => {
+    t.plan(2)
+    fastify.route({
+      method: 'GET',
+      url: '/',
+      handler: function (req, reply) {
+        reply.send({ hello: 'world' })
+      }
+    })
+
+    t.equal(fastify.hasRoute({
+      method: 'GET',
+      url: '/'
+    }), true)
+
+    t.equal(fastify.hasRoute({
+      method: 'POST',
+      url: '/'
+    }), false)
+  })
+
+  test('hasRoute - with constraints', t => {
+    t.plan(2)
+    fastify.route({
+      method: 'GET',
+      url: '/',
+      constraints: { version: '1.2.0' },
+      handler: (req, reply) => {
+        reply.send({ hello: 'world' })
+      }
+    })
+
+    t.equal(fastify.hasRoute({
+      method: 'GET',
+      url: '/',
+      constraints: { version: '1.2.0' }
+    }), true)
+
+    t.equal(fastify.hasRoute({
+      method: 'GET',
+      url: '/',
+      constraints: { version: '1.3.0' }
+    }), false)
+  })
+
+  test('hasRoute - parametric route regexp with constraints', t => {
+    t.plan(1)
+    // parametric with regexp
+    fastify.get('/example/:file(^\\d+).png', function (request, reply) { })
+
+    t.equal(fastify.hasRoute({
+      method: 'GET',
+      url: '/example/12345.png'
+    }), true)
+  })
+})

package/test/internals/decorator.test.js

@@ -138,7 +138,7 @@ test('decorate should recognize getter/setter objects', t => {
       this._a = val
     }
   })
-  t.equal(one.hasOwnProperty('foo'), true)
+  t.equal(Object.prototype.hasOwnProperty.call(one, 'foo'), true)
   t.equal(one.foo, undefined)
   one.foo = 'a'
   t.equal(one.foo, 'a')
@@ -154,6 +154,6 @@ test('decorate should recognize getter/setter objects', t => {
   decorator.add.call(two, 'foo', {
     getter: () => 'a getter'
   })
-  t.equal(two.hasOwnProperty('foo'), true)
+  t.equal(Object.prototype.hasOwnProperty.call(two, 'foo'), true)
   t.equal(two.foo, 'a getter')
 })

package/test/listen.deprecated.test.js

@@ -200,3 +200,36 @@ test('listen when firstArg is { path: string(pipe) } and with backlog and callba
     t.equal(address, '\\\\.\\pipe\\testPipe3')
   })
 })
+
+test('listen accepts a port as string, and callback', t => {
+  t.plan(2)
+  const fastify = Fastify()
+  t.teardown(fastify.close.bind(fastify))
+  const port = 3000
+  fastify.listen(port.toString(), localhost, (err) => {
+    t.equal(fastify.server.address().port, port)
+    t.error(err)
+  })
+})
+
+test('listen accepts a port as string, address and callback', t => {
+  t.plan(3)
+  const fastify = Fastify()
+  t.teardown(fastify.close.bind(fastify))
+  const port = 3000
+  fastify.listen(port.toString(), localhost, (err) => {
+    t.equal(fastify.server.address().port, port)
+    t.equal(fastify.server.address().address, localhost)
+    t.error(err)
+  })
+})
+
+test('listen with invalid port string without callback with (address)', t => {
+  t.plan(1)
+  const fastify = Fastify()
+  t.teardown(fastify.close.bind(fastify))
+  fastify.listen('-1')
+    .then(address => {
+      t.equal(address, `http://${localhostForURL}:${fastify.server.address().port}`)
+    })
+})

package/test/schema-special-usage.test.js

@@ -2,6 +2,7 @@
 
 const { test } = require('tap')
 const Joi = require('joi')
+const yup = require('yup')
 const AJV = require('ajv')
 const S = require('fluent-json-schema')
 const Fastify = require('..')
@@ -673,3 +674,31 @@ test('JOI validation overwrite request headers', t => {
     })
   })
 })
+
+test('Custom schema object should not trigger FST_ERR_SCH_DUPLICATE', async t => {
+  const fastify = Fastify()
+  const handler = () => { }
+
+  fastify.get('/the/url', {
+    schema: {
+      query: yup.object({
+        foo: yup.string()
+      })
+    },
+    validatorCompiler: ({ schema, method, url, httpPart }) => {
+      return function (data) {
+        // with option strict = false, yup `validateSync` function returns the coerced value if validation was successful, or throws if validation failed
+        try {
+          const result = schema.validateSync(data, {})
+          return { value: result }
+        } catch (e) {
+          return { error: e }
+        }
+      }
+    },
+    handler
+  })
+
+  await fastify.ready()
+  t.pass('fastify is ready')
+})

package/test/types/fastify.test-d.ts

@@ -8,6 +8,7 @@ import fastify, {
   LightMyRequestResponse,
   LightMyRequestCallback,
   InjectOptions, FastifyBaseLogger,
+  RouteGenericInterface,
   ValidationResult
 } from '../../fastify'
 import { ErrorObject as AjvErrorObject } from 'ajv'
@@ -24,6 +25,7 @@ expectType<FastifyInstance<http.Server, http.IncomingMessage, http.ServerRespons
 expectType<FastifyInstance<http.Server, http.IncomingMessage, http.ServerResponse> & PromiseLike<FastifyInstance<http.Server, http.IncomingMessage, http.ServerResponse>>>(fastify({}))
 // https server
 expectType<FastifyInstance<https.Server, http.IncomingMessage, http.ServerResponse> & PromiseLike<FastifyInstance<https.Server, http.IncomingMessage, http.ServerResponse>>>(fastify({ https: {} }))
+expectType<FastifyInstance<https.Server, http.IncomingMessage, http.ServerResponse> & PromiseLike<FastifyInstance<https.Server, http.IncomingMessage, http.ServerResponse>>>(fastify({ https: null }))
 // http2 server
 expectType<FastifyInstance<http2.Http2Server, http2.Http2ServerRequest, http2.Http2ServerResponse> & PromiseLike<FastifyInstance<http2.Http2Server, http2.Http2ServerRequest, http2.Http2ServerResponse>>>(fastify({ http2: true, http2SessionTimeout: 1000 }))
 expectType<FastifyInstance<http2.Http2SecureServer, http2.Http2ServerRequest, http2.Http2ServerResponse> & PromiseLike<FastifyInstance<http2.Http2SecureServer, http2.Http2ServerRequest, http2.Http2ServerResponse>>>(fastify({ http2: true, https: {}, http2SessionTimeout: 1000 }))
@@ -231,3 +233,10 @@ const ajvErrorObject: AjvErrorObject = {
   message: ''
 }
 expectAssignable<ValidationResult>(ajvErrorObject)
+
+const routeGeneric: RouteGenericInterface = {}
+expectType<unknown>(routeGeneric.Body)
+expectType<unknown>(routeGeneric.Headers)
+expectType<unknown>(routeGeneric.Params)
+expectType<unknown>(routeGeneric.Querystring)
+expectType<unknown>(routeGeneric.Reply)

package/test/types/route.test-d.ts

@@ -230,3 +230,14 @@ expectType<FastifyInstance>(fastify().route({
   method: 'GET',
   handler: routeHandlerWithReturnValue
 }))
+
+expectType<boolean>(fastify().hasRoute({
+  url: '/',
+  method: 'GET'
+}))
+
+expectType<boolean>(fastify().hasRoute({
+  url: '/',
+  method: 'GET',
+  constraints: { version: '1.2.0' }
+}))

package/test/unsupported-httpversion.test.js

@@ -4,32 +4,6 @@ const net = require('net')
 const t = require('tap')
 const Fastify = require('../fastify')
 
-t.test('Will return 505 HTTP error if HTTP version (default) is not supported', t => {
-  const fastify = Fastify()
-
-  t.teardown(fastify.close.bind(fastify))
-
-  fastify.get('/', (req, reply) => {
-    reply.send({ hello: 'world' })
-  })
-
-  fastify.listen({ port: 0 }, err => {
-    t.error(err)
-
-    const port = fastify.server.address().port
-    const client = net.createConnection({ port }, () => {
-      client.write('GET / HTTP/5.1\r\n\r\n')
-
-      client.once('data', data => {
-        t.match(data.toString(), /505 HTTP Version Not Supported/i)
-        client.end(() => {
-          t.end()
-        })
-      })
-    })
-  })
-})
-
 t.test('Will return 505 HTTP error if HTTP version (2.0 when server is 1.1) is not supported', t => {
   const fastify = Fastify()