fastify 5.0.0-alpha.2 → 5.0.0-alpha.4

package/test/internals/request.test.js

@@ -5,7 +5,6 @@ const { test } = require('tap')
 const Request = require('../../lib/request')
 const Context = require('../../lib/context')
 const {
-  kPublicRouteContext,
   kReply,
   kRequest,
   kOptions
@@ -67,15 +66,9 @@ test('Regular request', t => {
   t.equal(request.originalUrl, '/')
   t.equal(request.socket, req.socket)
   t.equal(request.protocol, 'http')
-  t.equal(request.routerPath, context.config.url)
-  t.equal(request.routerMethod, context.config.method)
-  t.equal(request.routeConfig, context[kPublicRouteContext].config)
-  t.equal(request.routeSchema, context[kPublicRouteContext].schema)
   // Aim to not bad property keys (including Symbols)
   t.notOk('undefined' in request)
 
-  // This will be removed, it's deprecated
-  t.equal(request.connection, req.connection)
   t.end()
 })
 
@@ -128,16 +121,10 @@ test('Request with undefined config', t => {
   t.equal(request.originalUrl, '/')
   t.equal(request.socket, req.socket)
   t.equal(request.protocol, 'http')
-  t.equal(request.routeSchema, context[kPublicRouteContext].schema)
-  t.equal(request.routerPath, undefined)
-  t.equal(request.routerMethod, undefined)
-  t.equal(request.routeConfig, undefined)
 
   // Aim to not bad property keys (including Symbols)
   t.notOk('undefined' in request)
 
-  // This will be removed, it's deprecated
-  t.equal(request.connection, req.connection)
   t.end()
 })
 
@@ -178,7 +165,7 @@ test('Regular request - host header has precedence over authority', t => {
 })
 
 test('Request with trust proxy', t => {
-  t.plan(22)
+  t.plan(18)
   const headers = {
     'x-forwarded-for': '2.2.2.2, 1.1.1.1',
     'x-forwarded-host': 'example.com'
@@ -233,10 +220,6 @@ test('Request with trust proxy', t => {
   t.type(request.validateInput, Function)
   t.type(request.getValidationFunction, Function)
   t.type(request.compileValidationSchema, Function)
-  t.equal(request.routerPath, context.config.url)
-  t.equal(request.routerMethod, context.config.method)
-  t.equal(request.routeConfig, context[kPublicRouteContext].config)
-  t.equal(request.routeSchema, context[kPublicRouteContext].schema)
 })
 
 test('Request with trust proxy, encrypted', t => {

package/test/internals/validation.test.js

@@ -63,7 +63,7 @@ test('build schema - output schema', t => {
   t.equal(typeof opts[symbols.responseSchema]['201'], 'function')
 })
 
-test('build schema - payload schema', t => {
+test('build schema - body schema', t => {
   t.plan(1)
   const opts = {
     schema: {
@@ -79,11 +79,35 @@ test('build schema - payload schema', t => {
   t.equal(typeof opts[symbols.bodySchema], 'function')
 })
 
+test('build schema - body with multiple content type schemas', t => {
+  t.plan(2)
+  const opts = {
+    schema: {
+      body: {
+        content: {
+          'application/json': {
+            schema: {
+              type: 'object',
+              properties: {
+                hello: { type: 'string' }
+              }
+            }
+          },
+          'text/plain': {
+            schema: { type: 'string' }
+          }
+        }
+      }
+    }
+  }
+  validation.compileSchemasForValidation(opts, ({ schema, method, url, httpPart }) => ajv.compile(schema))
+  t.type(opts[symbols.bodySchema]['application/json'], 'function')
+  t.type(opts[symbols.bodySchema]['text/plain'], 'function')
+})
+
 test('build schema - avoid repeated normalize schema', t => {
   t.plan(3)
-  const serverConfig = {
-    jsonShorthand: true
-  }
+  const serverConfig = {}
   const opts = {
     schema: {
       query: {
@@ -102,9 +126,7 @@ test('build schema - avoid repeated normalize schema', t => {
 
 test('build schema - query schema', t => {
   t.plan(2)
-  const serverConfig = {
-    jsonShorthand: true
-  }
+  const serverConfig = {}
   const opts = {
     schema: {
       query: {
@@ -123,13 +145,14 @@ test('build schema - query schema', t => {
 
 test('build schema - query schema abbreviated', t => {
   t.plan(2)
-  const serverConfig = {
-    jsonShorthand: true
-  }
+  const serverConfig = {}
   const opts = {
     schema: {
       query: {
-        hello: { type: 'string' }
+        type: 'object',
+        properties: {
+          hello: { type: 'string' }
+        }
       }
     }
   }
@@ -158,13 +181,14 @@ test('build schema - querystring schema', t => {
 
 test('build schema - querystring schema abbreviated', t => {
   t.plan(2)
-  const serverConfig = {
-    jsonShorthand: true
-  }
+  const serverConfig = {}
   const opts = {
     schema: {
       querystring: {
-        hello: { type: 'string' }
+        type: 'object',
+        properties: {
+          hello: { type: 'string' }
+        }
       }
     }
   }
@@ -177,9 +201,7 @@ test('build schema - querystring schema abbreviated', t => {
 test('build schema - must throw if querystring and query schema exist', t => {
   t.plan(2)
   try {
-    const serverConfig = {
-      jsonShorthand: true
-    }
+    const serverConfig = {}
     const opts = {
       schema: {
         query: {
@@ -249,14 +271,14 @@ test('build schema - headers are lowercase', t => {
   }
   validation.compileSchemasForValidation(opts, ({ schema, method, url, httpPart }) => {
     t.ok(schema.properties['content-type'], 'lowercase content-type exists')
-    return () => {}
+    return () => { }
   })
 })
 
 test('build schema - headers are not lowercased in case of custom object', t => {
   t.plan(1)
 
-  class Headers {}
+  class Headers { }
   const opts = {
     schema: {
       headers: new Headers()
@@ -264,14 +286,14 @@ test('build schema - headers are not lowercased in case of custom object', t =>
   }
   validation.compileSchemasForValidation(opts, ({ schema, method, url, httpPart }) => {
     t.type(schema, Headers)
-    return () => {}
+    return () => { }
   })
 })
 
 test('build schema - headers are not lowercased in case of custom validator provided', t => {
   t.plan(1)
 
-  class Headers {}
+  class Headers { }
   const opts = {
     schema: {
       headers: new Headers()
@@ -279,7 +301,7 @@ test('build schema - headers are not lowercased in case of custom validator prov
   }
   validation.compileSchemasForValidation(opts, ({ schema, method, url, httpPart }) => {
     t.type(schema, Headers)
-    return () => {}
+    return () => { }
   }, true)
 })
 
@@ -297,21 +319,14 @@ test('build schema - uppercased headers are not included', t => {
   }
   validation.compileSchemasForValidation(opts, ({ schema, method, url, httpPart }) => {
     t.notOk('Content-Type' in schema.properties, 'uppercase does not exist')
-    return () => {}
+    return () => { }
   })
 })
 
 test('build schema - mixed schema types are individually skipped or normalized', t => {
-  t.plan(6)
+  t.plan(2)
 
-  class CustomSchemaClass {}
-  const nonNormalizedSchema = {
-    hello: { type: 'string' }
-  }
-  const normalizedSchema = {
-    type: 'object',
-    properties: nonNormalizedSchema
-  }
+  class CustomSchemaClass { }
 
   const testCases = [{
     schema: {
@@ -329,32 +344,10 @@ test('build schema - mixed schema types are individually skipped or normalized',
     assertions: (schema) => {
       t.type(schema.response[200], CustomSchemaClass)
     }
-  }, {
-    schema: {
-      body: nonNormalizedSchema,
-      response: {
-        200: new CustomSchemaClass()
-      }
-    },
-    assertions: (schema) => {
-      t.same(schema.body, normalizedSchema)
-      t.type(schema.response[200], CustomSchemaClass)
-    }
-  }, {
-    schema: {
-      body: new CustomSchemaClass(),
-      response: {
-        200: nonNormalizedSchema
-      }
-    },
-    assertions: (schema) => {
-      t.type(schema.body, CustomSchemaClass)
-      t.same(schema.response[200], normalizedSchema)
-    }
   }]
 
   testCases.forEach((testCase) => {
-    const result = normalizeSchema(testCase.schema, { jsonShorthand: true })
+    const result = normalizeSchema(testCase.schema, {})
     testCase.assertions(result)
   })
 })

package/test/listen.1.test.js

@@ -12,12 +12,16 @@ before(async function () {
 })
 
 test('listen works without arguments', async t => {
-  process.on('warning', () => {
+  const doNotWarn = () => {
     t.fail('should not be deprecated')
-  })
+  }
+  process.on('warning', doNotWarn)
 
   const fastify = Fastify()
-  t.teardown(fastify.close.bind(fastify))
+  t.teardown(() => {
+    fastify.close()
+    process.removeListener('warning', doNotWarn)
+  })
   await fastify.listen()
   const address = fastify.server.address()
   t.equal(address.address, localhost)
@@ -25,12 +29,16 @@ test('listen works without arguments', async t => {
 })
 
 test('Async/await listen with arguments', async t => {
-  process.on('warning', () => {
+  const doNotWarn = () => {
     t.fail('should not be deprecated')
-  })
+  }
+  process.on('warning', doNotWarn)
 
   const fastify = Fastify()
-  t.teardown(fastify.close.bind(fastify))
+  t.teardown(() => {
+    fastify.close()
+    process.removeListener('warning', doNotWarn)
+  })
   const addr = await fastify.listen({ port: 0, host: '0.0.0.0' })
   const address = fastify.server.address()
   t.equal(addr, `http://127.0.0.1:${address.port}`)
@@ -42,13 +50,17 @@ test('Async/await listen with arguments', async t => {
 })
 
 test('listen accepts a callback', t => {
-  process.on('warning', () => {
+  t.plan(2)
+  const doNotWarn = () => {
     t.fail('should not be deprecated')
-  })
+  }
+  process.on('warning', doNotWarn)
 
-  t.plan(2)
   const fastify = Fastify()
-  t.teardown(fastify.close.bind(fastify))
+  t.teardown(() => {
+    fastify.close()
+    process.removeListener('warning', doNotWarn)
+  })
   fastify.listen({ port: 0 }, (err) => {
     t.equal(fastify.server.address().address, localhost)
     t.error(err)
@@ -56,13 +68,17 @@ test('listen accepts a callback', t => {
 })
 
 test('listen accepts options and a callback', t => {
-  process.on('warning', () => {
+  t.plan(1)
+  const doNotWarn = () => {
     t.fail('should not be deprecated')
-  })
+  }
+  process.on('warning', doNotWarn)
 
-  t.plan(1)
   const fastify = Fastify()
-  t.teardown(fastify.close.bind(fastify))
+  t.teardown(() => {
+    fastify.close()
+    process.removeListener('warning', doNotWarn)
+  })
   fastify.listen({
     port: 0,
     host: 'localhost',
@@ -89,3 +105,39 @@ test('listen after Promise.resolve()', t => {
       })
     })
 })
+
+test('listen works with undefined host', async t => {
+  const doNotWarn = () => {
+    t.fail('should not be deprecated')
+  }
+  process.on('warning', doNotWarn)
+
+  const fastify = Fastify()
+  t.teardown(fastify.close.bind(fastify))
+  t.teardown(() => {
+    fastify.close()
+    process.removeListener('warning', doNotWarn)
+  })
+  await fastify.listen({ host: undefined, port: 0 })
+  const address = fastify.server.address()
+  t.equal(address.address, localhost)
+  t.ok(address.port > 0)
+})
+
+test('listen works with null host', async t => {
+  const doNotWarn = () => {
+    t.fail('should not be deprecated')
+  }
+  process.on('warning', doNotWarn)
+
+  const fastify = Fastify()
+  t.teardown(fastify.close.bind(fastify))
+  t.teardown(() => {
+    fastify.close()
+    process.removeListener('warning', doNotWarn)
+  })
+  await fastify.listen({ host: null, port: 0 })
+  const address = fastify.server.address()
+  t.equal(address.address, localhost)
+  t.ok(address.port > 0)
+})

package/test/listen.5.test.js

@@ -5,6 +5,14 @@ const net = require('node:net')
 const Fastify = require('../fastify')
 const { once } = require('node:events')
 
+function createDeferredPromise () {
+  const promise = {}
+  promise.promise = new Promise((resolve) => {
+    promise.resolve = resolve
+  })
+  return promise
+}
+
 test('same port conflict and success should not fire callback multiple times - callback', async (t) => {
   t.plan(7)
   const server = net.createServer()
@@ -13,6 +21,7 @@ test('same port conflict and success should not fire callback multiple times - c
   const option = { port: server.address().port, host: server.address().address }
   let count = 0
   const fastify = Fastify()
+  const promise = createDeferredPromise()
   function callback (err) {
     switch (count) {
       case 6: {
@@ -20,6 +29,7 @@ test('same port conflict and success should not fire callback multiple times - c
         t.error(err)
         fastify.close((err) => {
           t.error(err)
+          promise.resolve()
         })
         break
       }
@@ -41,6 +51,7 @@ test('same port conflict and success should not fire callback multiple times - c
     count++
   }
   fastify.listen(option, callback)
+  await promise.promise
 })
 
 test('same port conflict and success should not fire callback multiple times - promise', async (t) => {

package/test/reply-trailers.test.js

@@ -186,37 +186,6 @@ test('error in trailers should be ignored', t => {
   })
 })
 
-test('should emit deprecation warning when using direct return', t => {
-  t.plan(7)
-
-  const fastify = Fastify()
-
-  fastify.get('/', function (request, reply) {
-    reply.trailer('ETag', function (reply, payload) {
-      return 'custom-etag'
-    })
-    reply.send('')
-  })
-
-  process.on('warning', onWarning)
-  function onWarning (warning) {
-    t.equal(warning.name, 'DeprecationWarning')
-    t.equal(warning.code, 'FSTDEP013')
-  }
-  t.teardown(() => process.removeListener('warning', onWarning))
-
-  fastify.inject({
-    method: 'GET',
-    url: '/'
-  }, (error, res) => {
-    t.error(error)
-    t.equal(res.statusCode, 200)
-    t.equal(res.headers.trailer, 'etag')
-    t.equal(res.trailers.etag, 'custom-etag')
-    t.notHas(res.headers, 'content-length')
-  })
-})
-
 test('trailer handler counter', t => {
   t.plan(2)
 
@@ -412,7 +381,7 @@ test('throw error when trailer header name is not allowed', t => {
   fastify.get('/', function (request, reply) {
     for (const key of INVALID_TRAILERS) {
       try {
-        reply.trailer(key, () => {})
+        reply.trailer(key, () => { })
       } catch (err) {
         t.equal(err.message, `Called reply.trailer with an invalid header name: ${key}`)
       }

package/test/route-shorthand.test.js

@@ -4,9 +4,11 @@ const t = require('tap')
 const test = t.test
 const sget = require('simple-get').concat
 const Fastify = require('../fastify')
-const supportedMethods = require('../lib/httpMethods').supportedMethods
 
 test('route-shorthand', t => {
+  const methodsReader = new Fastify()
+  const supportedMethods = methodsReader.supportedMethods
+
   t.plan(supportedMethods.length + 1)
   const test = t.test
 

package/test/route.3.test.js

@@ -54,7 +54,10 @@ test('multiple routes with one schema', t => {
 
   const schema = {
     query: {
-      id: { type: 'number' }
+      type: 'object',
+      properties: {
+        id: { type: 'number' }
+      }
     }
   }
 

package/test/route.7.test.js

@@ -5,7 +5,6 @@ const split = require('split2')
 const t = require('tap')
 const test = t.test
 const Fastify = require('..')
-const proxyquire = require('proxyquire')
 
 test("HEAD route should handle stream.on('error')", t => {
   t.plan(6)
@@ -176,18 +175,9 @@ test('Set a custom HEAD route before GET one without disabling exposeHeadRoutes
 })
 
 test('Set a custom HEAD route before GET one without disabling exposeHeadRoutes (route)', t => {
-  t.plan(7)
-
-  function onWarning () {
-    t.pass('warning emitted')
-  }
+  t.plan(6)
 
-  const route = proxyquire('../lib/route', {
-    './warnings': {
-      FSTDEP007: onWarning
-    }
-  })
-  const fastify = proxyquire('..', { './lib/route.js': route })()
+  const fastify = Fastify()
 
   const resBuffer = Buffer.from('I am a coffee!')
 

package/test/route.8.test.js

@@ -4,10 +4,12 @@ const t = require('tap')
 const test = t.test
 const sget = require('simple-get').concat
 const Fastify = require('../fastify')
-const { FST_ERR_INVALID_URL } = require('../lib/errors')
+const {
+  FST_ERR_INVALID_URL
+} = require('../lib/errors')
 const { getServerUrl } = require('./helper')
 
-test('Request and Reply share the route config', async t => {
+test('Request and Reply share the route options', async t => {
   t.plan(3)
 
   const fastify = Fastify()
@@ -22,9 +24,9 @@ test('Request and Reply share the route config', async t => {
     url: '/',
     config,
     handler: (req, reply) => {
-      t.same(req.context, reply.context)
-      t.same(req.context.config, reply.context.config)
-      t.match(req.context.config, config, 'there are url and method additional properties')
+      t.same(req.routeOptions, reply.routeOptions)
+      t.same(req.routeOptions.config, reply.routeOptions.config)
+      t.match(req.routeOptions.config, config, 'there are url and method additional properties')
 
       reply.send({ hello: 'world' })
     }
@@ -140,3 +142,30 @@ test('using fastify.all when a catchall is defined does not degrade performance'
 
   t.pass()
 })
+
+test('Adding manually HEAD route after GET with the same path throws Fastify duplicated route instance error', t => {
+  t.plan(1)
+
+  const fastify = Fastify()
+
+  fastify.route({
+    method: 'GET',
+    path: '/:param1',
+    handler: (req, reply) => {
+      reply.send({ hello: 'world' })
+    }
+  })
+
+  try {
+    fastify.route({
+      method: 'HEAD',
+      path: '/:param2',
+      handler: (req, reply) => {
+        reply.send({ hello: 'world' })
+      }
+    })
+    t.fail('Should throw fastify duplicated route declaration')
+  } catch (error) {
+    t.equal(error.code, 'FST_ERR_DUPLICATED_ROUTE')
+  }
+})

package/test/router-options.test.js

@@ -96,15 +96,18 @@ test('Should expose router options via getters on request and reply', t => {
   const fastify = Fastify()
   const expectedSchema = {
     params: {
-      id: { type: 'integer' }
+      type: 'object',
+      properties: {
+        id: { type: 'integer' }
+      }
     }
   }
 
   fastify.get('/test/:id', {
     schema: expectedSchema
   }, (req, reply) => {
-    t.equal(reply.context.config.url, '/test/:id')
-    t.equal(reply.context.config.method, 'GET')
+    t.equal(reply.routeOptions.config.url, '/test/:id')
+    t.equal(reply.routeOptions.config.method, 'GET')
     t.same(req.routeOptions.schema, expectedSchema)
     t.equal(typeof req.routeOptions.handler, 'function')
     t.equal(req.routeOptions.config.url, '/test/:id')

package/test/schema-examples.test.js

@@ -137,13 +137,19 @@ test('Example - validation', t => {
   }
 
   const queryStringJsonSchema = {
-    name: { type: 'string' },
-    excitement: { type: 'integer' }
+    type: 'object',
+    properties: {
+      name: { type: 'string' },
+      excitement: { type: 'integer' }
+    }
   }
 
   const paramsJsonSchema = {
-    par1: { type: 'string' },
-    par2: { type: 'number' }
+    type: 'object',
+    properties: {
+      par1: { type: 'string' },
+      par2: { type: 'number' }
+    }
   }
 
   const headersJsonSchema = {
@@ -345,8 +351,11 @@ test('Example - serializator', t => {
     schema: {
       response: {
         '2xx': {
-          id: { type: 'number' },
-          name: { type: 'string' }
+          type: 'object',
+          properties: {
+            id: { type: 'number' },
+            name: { type: 'string' }
+          }
         }
       }
     }