fastify 4.22.2 → 4.23.0

package/fastify.d.ts

@@ -12,7 +12,7 @@ import { Chain as LightMyRequestChain, InjectOptions, Response as LightMyRequest
 import { FastifyBodyParser, FastifyContentTypeParser, AddContentTypeParser, hasContentTypeParser, getDefaultJsonParser, ProtoAction, ConstructorAction } from './types/content-type-parser'
 import { FastifyContext, FastifyContextConfig } from './types/context'
 import { FastifyErrorCodes } from './types/errors'
-import { DoneFuncWithErrOrRes, HookHandlerDoneFunction, RequestPayload, onCloseAsyncHookHandler, onCloseHookHandler, onErrorAsyncHookHandler, onErrorHookHandler, onReadyAsyncHookHandler, onReadyHookHandler, onRegisterHookHandler, onRequestAsyncHookHandler, onRequestHookHandler, onResponseAsyncHookHandler, onResponseHookHandler, onRouteHookHandler, onSendAsyncHookHandler, onSendHookHandler, onTimeoutAsyncHookHandler, onTimeoutHookHandler, preHandlerAsyncHookHandler, preHandlerHookHandler, preParsingAsyncHookHandler, preParsingHookHandler, preSerializationAsyncHookHandler, preSerializationHookHandler, preValidationAsyncHookHandler, preValidationHookHandler, onRequestAbortHookHandler, onRequestAbortAsyncHookHandler } from './types/hooks'
+import { DoneFuncWithErrOrRes, HookHandlerDoneFunction, RequestPayload, onCloseAsyncHookHandler, onCloseHookHandler, onErrorAsyncHookHandler, onErrorHookHandler, onReadyAsyncHookHandler, onReadyHookHandler, onListenAsyncHookHandler, onListenHookHandler, onRegisterHookHandler, onRequestAsyncHookHandler, onRequestHookHandler, onResponseAsyncHookHandler, onResponseHookHandler, onRouteHookHandler, onSendAsyncHookHandler, onSendHookHandler, onTimeoutAsyncHookHandler, onTimeoutHookHandler, preHandlerAsyncHookHandler, preHandlerHookHandler, preParsingAsyncHookHandler, preParsingHookHandler, preSerializationAsyncHookHandler, preSerializationHookHandler, preValidationAsyncHookHandler, preValidationHookHandler, onRequestAbortHookHandler, onRequestAbortAsyncHookHandler } from './types/hooks'
 import { FastifyListenOptions, FastifyInstance, PrintRoutesOptions } from './types/instance'
 import { FastifyBaseLogger, FastifyLoggerInstance, FastifyLoggerOptions, PinoLoggerOptions, FastifyLogFn, LogLevel, Bindings, ChildLoggerOptions } from './types/logger'
 import { FastifyPluginCallback, FastifyPluginAsync, FastifyPluginOptions, FastifyPlugin } from './types/plugin'
@@ -182,7 +182,7 @@ declare namespace fastify {
     FastifyError, // '@fastify/error'
     FastifySchema, FastifySchemaCompiler, // './types/schema'
     HTTPMethods, RawServerBase, RawRequestDefaultExpression, RawReplyDefaultExpression, RawServerDefault, ContextConfigDefault, RequestBodyDefault, RequestQuerystringDefault, RequestParamsDefault, RequestHeadersDefault, // './types/utils'
-    DoneFuncWithErrOrRes, HookHandlerDoneFunction, RequestPayload, onCloseAsyncHookHandler, onCloseHookHandler, onErrorAsyncHookHandler, onErrorHookHandler, onReadyAsyncHookHandler, onReadyHookHandler, onRegisterHookHandler, onRequestAsyncHookHandler, onRequestHookHandler, onResponseAsyncHookHandler, onResponseHookHandler, onRouteHookHandler, onSendAsyncHookHandler, onSendHookHandler, onTimeoutAsyncHookHandler, onTimeoutHookHandler, preHandlerAsyncHookHandler, preHandlerHookHandler, preParsingAsyncHookHandler, preParsingHookHandler, preSerializationAsyncHookHandler, preSerializationHookHandler, preValidationAsyncHookHandler, preValidationHookHandler, onRequestAbortHookHandler, onRequestAbortAsyncHookHandler, // './types/hooks'
+    DoneFuncWithErrOrRes, HookHandlerDoneFunction, RequestPayload, onCloseAsyncHookHandler, onCloseHookHandler, onErrorAsyncHookHandler, onErrorHookHandler, onReadyAsyncHookHandler, onReadyHookHandler, onListenAsyncHookHandler, onListenHookHandler, onRegisterHookHandler, onRequestAsyncHookHandler, onRequestHookHandler, onResponseAsyncHookHandler, onResponseHookHandler, onRouteHookHandler, onSendAsyncHookHandler, onSendHookHandler, onTimeoutAsyncHookHandler, onTimeoutHookHandler, preHandlerAsyncHookHandler, preHandlerHookHandler, preParsingAsyncHookHandler, preParsingHookHandler, preSerializationAsyncHookHandler, preSerializationHookHandler, preValidationAsyncHookHandler, preValidationHookHandler, onRequestAbortHookHandler, onRequestAbortAsyncHookHandler, // './types/hooks'
     FastifyServerFactory, FastifyServerFactoryHandler, // './types/serverFactory'
     FastifyTypeProvider, FastifyTypeProviderDefault, // './types/type-provider'
     FastifyErrorCodes, // './types/errors'

package/fastify.js

@@ -1,9 +1,9 @@
 'use strict'
 
-const VERSION = '4.22.2'
+const VERSION = '4.23.0'
 
 const Avvio = require('avvio')
-const http = require('http')
+const http = require('node:http')
 let lightMyRequest
 
 const {
@@ -496,7 +496,7 @@ function fastify (options) {
   server.on('clientError', options.clientErrorHandler.bind(fastify))
 
   try {
-    const dc = require('diagnostics_channel')
+    const dc = require('node:diagnostics_channel')
     const initChannel = dc.channel('fastify.initialization')
     if (initChannel.hasSubscribers) {
       initChannel.publish({ fastify })
@@ -620,7 +620,7 @@ function fastify (options) {
       if (fn.constructor.name === 'AsyncFunction' && fn.length === 4) {
         throw new errorCodes.FST_ERR_HOOK_INVALID_ASYNC_HANDLER()
       }
-    } else if (name === 'onReady') {
+    } else if (name === 'onReady' || name === 'onListen') {
       if (fn.constructor.name === 'AsyncFunction' && fn.length !== 0) {
         throw new errorCodes.FST_ERR_HOOK_INVALID_ASYNC_HANDLER()
       }
@@ -636,9 +636,7 @@ function fastify (options) {
 
     if (name === 'onClose') {
       this.onClose(fn)
-    } else if (name === 'onReady') {
-      this[kHooks].add(name, fn)
-    } else if (name === 'onRoute') {
+    } else if (name === 'onReady' || name === 'onListen' || name === 'onRoute') {
       this[kHooks].add(name, fn)
     } else {
       this.after((err, done) => {

package/lib/contentTypeParser.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const { AsyncResource } = require('async_hooks')
-const lru = require('tiny-lru').lru
+const { AsyncResource } = require('node:async_hooks')
+const { Fifo } = require('toad-cache')
 const { safeParse: safeParseContentType, defaultContentType } = require('fast-content-type-parse')
 const secureJson = require('secure-json-parse')
 const {
@@ -36,7 +36,7 @@ function ContentTypeParser (bodyLimit, onProtoPoisoning, onConstructorPoisoning)
   this.customParsers.set('text/plain', new Parser(true, false, bodyLimit, defaultPlainTextParser))
   this.parserList = [new ParserListItem('application/json'), new ParserListItem('text/plain')]
   this.parserRegExpList = []
-  this.cache = lru(100)
+  this.cache = new Fifo(100)
 }
 
 ContentTypeParser.prototype.add = function (contentType, opts, parserFn) {
@@ -136,7 +136,7 @@ ContentTypeParser.prototype.removeAll = function () {
   this.customParsers = new Map()
   this.parserRegExpList = []
   this.parserList = []
-  this.cache = lru(100)
+  this.cache = new Fifo(100)
 }
 
 ContentTypeParser.prototype.remove = function (contentType) {

package/lib/error-handler.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const statusCodes = require('http').STATUS_CODES
+const statusCodes = require('node:http').STATUS_CODES
 const wrapThenable = require('./wrapThenable')
 const {
   kReplyHeaders,

package/lib/hooks.js

@@ -4,6 +4,7 @@ const applicationHooks = [
   'onRoute',
   'onRegister',
   'onReady',
+  'onListen',
   'preClose',
   'onClose'
 ]
@@ -48,6 +49,7 @@ function Hooks () {
   this.onRoute = []
   this.onRegister = []
   this.onReady = []
+  this.onListen = []
   this.onTimeout = []
   this.onRequestAbort = []
   this.preClose = []
@@ -83,6 +85,7 @@ function buildHooks (h) {
   hooks.onTimeout = h.onTimeout.slice()
   hooks.onRequestAbort = h.onRequestAbort.slice()
   hooks.onReady = []
+  hooks.onListen = []
   hooks.preClose = []
   return hooks
 }
@@ -174,6 +177,57 @@ function hookRunnerApplication (hookName, boot, server, cb) {
   }
 }
 
+function onListenHookRunner (server) {
+  const hooks = server[kHooks].onListen
+  const hooksLen = hooks.length
+
+  if (hooksLen === 0) {
+    return
+  }
+
+  let i = 0
+  let c = 0
+
+  next()
+
+  function next (err) {
+    err && server.log.error(err)
+
+    if (
+      i === hooksLen
+    ) {
+      if (c < server[kChildren].length) {
+        const child = server[kChildren][c++]
+        onListenHookRunner(child)
+      }
+      return
+    }
+
+    wrap(hooks[i++], server, next)
+  }
+
+  async function wrap (fn, server, done) {
+    if (fn.length === 1) {
+      try {
+        fn.call(server, done)
+      } catch (e) {
+        done(e)
+      }
+      return
+    }
+    try {
+      const ret = fn.call(server)
+      if (ret && typeof ret.then === 'function') {
+        ret.then(done, done)
+        return
+      }
+      done()
+    } catch (error) {
+      done(error)
+    }
+  }
+}
+
 function hookRunnerGenerator (iterator) {
   return function hookRunner (functions, request, reply, cb) {
     let i = 0
@@ -366,6 +420,7 @@ module.exports = {
   onRequestAbortHookRunner,
   hookIterator,
   hookRunnerApplication,
+  onListenHookRunner,
   preHandlerHookRunner,
   preValidationHookRunner,
   onRequestHookRunner,

package/lib/pluginUtils.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const semver = require('semver')
-const assert = require('assert')
+const assert = require('node:assert')
 const kRegisteredPlugins = Symbol.for('registered-plugin')
 const {
   kTestInternals

package/lib/reply.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const eos = require('stream').finished
+const eos = require('node:stream').finished
 
 const {
   kFourOhFourContext,

package/lib/request.js

@@ -172,6 +172,7 @@ Object.defineProperties(Request.prototype, {
   },
   routerPath: {
     get () {
+      warning.emit('FSTDEP017')
       return this[kRouteContext].config?.url
     }
   },
@@ -189,23 +190,37 @@ Object.defineProperties(Request.prototype, {
         logLevel: context.logLevel,
         exposeHeadRoute: context.exposeHeadRoute,
         prefixTrailingSlash: context.prefixTrailingSlash,
+        handler: context.handler,
         version
       }
+
+      Object.defineProperties(options, {
+        config: {
+          get: () => context.config
+        },
+        schema: {
+          get: () => context.schema
+        }
+      })
+
       return Object.freeze(options)
     }
   },
   routerMethod: {
     get () {
+      warning.emit('FSTDEP018')
       return this[kRouteContext].config?.method
     }
   },
   routeConfig: {
     get () {
+      warning.emit('FSTDEP016')
       return this[kRouteContext][kPublicRouteContext]?.config
     }
   },
   routeSchema: {
     get () {
+      warning.emit('FSTDEP015')
       return this[kRouteContext][kPublicRouteContext].schema
     }
   },

package/lib/server.js

@@ -1,11 +1,12 @@
 'use strict'
 
-const http = require('http')
-const https = require('https')
-const dns = require('dns')
+const http = require('node:http')
+const https = require('node:https')
+const dns = require('node:dns')
 
 const warnings = require('./warnings')
 const { kState, kOptions, kServerBindings } = require('./symbols')
+const { onListenHookRunner } = require('./hooks')
 const {
   FST_ERR_HTTP2_INVALID_VERSION,
   FST_ERR_REOPENED_CLOSE_SERVER,
@@ -85,8 +86,20 @@ function createServer (options, httpHandler) {
         multipleBindings.call(this, server, httpHandler, options, listenOptions, () => {
           this[kState].listening = true
           cb(null, address)
+          onListenHookRunner(this)
         })
       }
+    } else {
+      listenOptions.cb = (err, address) => {
+        // the server did not start
+        if (err) {
+          cb(err, address)
+          return
+        }
+        this[kState].listening = true
+        cb(null, address)
+        onListenHookRunner(this)
+      }
     }
 
     // https://github.com/nodejs/node/issues/9390
@@ -97,17 +110,20 @@ function createServer (options, httpHandler) {
     if (cb === undefined) {
       const listening = listenPromise.call(this, server, listenOptions)
       /* istanbul ignore else */
-      if (host === 'localhost') {
-        return listening.then(address => {
-          return new Promise((resolve, reject) => {
+      return listening.then(address => {
+        return new Promise((resolve, reject) => {
+          if (host === 'localhost') {
             multipleBindings.call(this, server, httpHandler, options, listenOptions, () => {
               this[kState].listening = true
               resolve(address)
+              onListenHookRunner(this)
             })
-          })
+          } else {
+            resolve(address)
+            onListenHookRunner(this)
+          }
         })
-      }
-      return listening
+      })
     }
 
     this.ready(listenCallback.call(this, server, listenOptions))
@@ -410,7 +426,7 @@ function logServerAddress (server, listenTextResolver) {
 
 function http2 () {
   try {
-    return require('http2')
+    return require('node:http2')
   } catch (err) {
     throw new FST_ERR_HTTP2_INVALID_VERSION()
   }

package/lib/warnings.js

@@ -27,6 +27,14 @@ warning.create('FastifyDeprecation', 'FSTDEP013', 'Direct return of "trailers" f
 
 warning.create('FastifyDeprecation', 'FSTDEP014', 'You are trying to set/access the default route. This property is deprecated. Please, use setNotFoundHandler if you want to custom a 404 handler or the wildcard (*) to match all routes.')
 
+warning.create('FastifyDeprecation', 'FSTDEP015', 'You are accessing the deprecated "request.routeSchema" property. Use "request.routeOptions.schema" instead. Property "req.routeSchema" will be removed in `fastify@5`.')
+
+warning.create('FastifyDeprecation', 'FSTDEP016', 'You are accessing the deprecated "request.routeConfig" property. Use "request.routeOptions.config" instead. Property "req.routeConfig" will be removed in `fastify@5`.')
+
+warning.create('FastifyDeprecation', 'FSTDEP017', 'You are accessing the deprecated "request.routerPath" property. Use "request.routeOptions.config.url" instead. Property "req.routerPath" will be removed in `fastify@5`.')
+
+warning.create('FastifyDeprecation', 'FSTDEP018', 'You are accessing the deprecated "request.routerMethod" property. Use "request.routeOptions.config.method" instead. Property "req.routerMethod" will be removed in `fastify@5`.')
+
 warning.create('FastifyWarning', 'FSTWRN001', 'The %s schema for %s: %s is missing. This may indicate the schema is not well specified.', { unlimited: true })
 
 module.exports = warning

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify",
-  "version": "4.22.2",
+  "version": "4.23.0",
   "description": "Fast and low overhead web framework, for Node.js",
   "main": "fastify.js",
   "type": "commonjs",
@@ -28,7 +28,8 @@
     "test:watch": "npm run unit -- -w --no-coverage-report -R terse",
     "unit": "c8 tap",
     "unit:junit": "tap-mocha-reporter xunit < out.tap > test/junit-testresults.xml",
-    "unit:report": "tap --cov --coverage-report=html --coverage-report=cobertura | tee out.tap"
+    "unit:report": "tap --cov --coverage-report=html --coverage-report=cobertura | tee out.tap",
+    "citgm": "tap"
   },
   "repository": {
     "type": "git",
@@ -125,13 +126,22 @@
       "name": "Carlos Fuentes",
       "email": "me@metcoder.dev",
       "url": "https://metcoder.dev"
+    },
+    {
+      "name": "Gürgün Dayıoğlu",
+      "email": "gurgun.dayioglu@icloud.com",
+      "url": "https://heyhey.to/G"
+    },
+    {
+      "name": "Aras Abbasi",
+      "email": "aras.abbasi@gmail.com"
     }
   ],
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/fastify/fastify/issues"
   },
-  "homepage": "https://www.fastify.io/",
+  "homepage": "https://www.fastify.dev/",
   "devDependencies": {
     "@fastify/pre-commit": "^2.0.2",
     "@sinclair/typebox": "^0.31.1",
@@ -171,7 +181,7 @@
     "split2": "^4.2.0",
     "standard": "^17.0.0",
     "tap": "^16.3.4",
-    "tsd": "^0.28.1",
+    "tsd": "^0.29.0",
     "typescript": "^5.0.4",
     "undici": "^5.22.0",
     "vary": "^1.1.2",
@@ -193,7 +203,7 @@
     "rfdc": "^1.3.0",
     "secure-json-parse": "^2.5.0",
     "semver": "^7.5.0",
-    "tiny-lru": "^11.0.1"
+    "toad-cache": "^3.2.0"
   },
   "standard": {
     "ignore": [

package/test/404s.test.js

@@ -1031,7 +1031,7 @@ test('setNotFoundHandler should not suppress duplicated routes checking', t => {
 test('log debug for 404', t => {
   t.plan(1)
 
-  const Writable = require('stream').Writable
+  const Writable = require('node:stream').Writable
 
   const logStream = new Writable()
   logStream.logs = []

package/test/als.test.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { AsyncLocalStorage } = require('async_hooks')
+const { AsyncLocalStorage } = require('node:async_hooks')
 const t = require('tap')
 const Fastify = require('..')
 const sget = require('simple-get').concat

package/test/async-await.test.js

@@ -6,7 +6,7 @@ const sget = require('simple-get').concat
 const Fastify = require('..')
 const split = require('split2')
 const pino = require('pino')
-const statusCodes = require('http').STATUS_CODES
+const statusCodes = require('node:http').STATUS_CODES
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
 
 const opts = {

package/test/bodyLimit.test.js

@@ -2,7 +2,7 @@
 
 const Fastify = require('..')
 const sget = require('simple-get').concat
-const zlib = require('zlib')
+const zlib = require('node:zlib')
 const t = require('tap')
 const test = t.test
 

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

@@ -2,8 +2,8 @@
 
 const t = require('tap')
 const test = t.test
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 
 const { code } = require('../../build/build-error-serializer')
 

package/test/build/version.test.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 const t = require('tap')
 const test = t.test
 const fastify = require('../../fastify')()

package/test/bundler/webpack/webpack.config.js

@@ -1,4 +1,4 @@
-const path = require('path')
+const path = require('node:path')
 
 module.exports = {
   entry: { success: './src/index.js', failPlugin: './src/fail-plugin-version.js' },

package/test/client-timeout.test.js

@@ -2,7 +2,7 @@
 
 const { test } = require('tap')
 const fastify = require('..')({ requestTimeout: 5, http: { connectionsCheckingInterval: 1000 } })
-const { connect } = require('net')
+const { connect } = require('node:net')
 
 test('requestTimeout should return 408', t => {
   t.plan(1)

package/test/close.test.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const net = require('net')
-const http = require('http')
+const net = require('node:net')
+const http = require('node:http')
 const { test } = require('tap')
 const Fastify = require('..')
 const { Client } = require('undici')

package/test/connectionTimeout.test.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const Fastify = require('..')
-const http = require('http')
+const http = require('node:http')
 const t = require('tap')
 const test = t.test
 

package/test/custom-http-server.test.js

@@ -3,10 +3,10 @@
 const t = require('tap')
 const test = t.test
 const Fastify = require('..')
-const http = require('http')
+const http = require('node:http')
 const { FST_ERR_FORCE_CLOSE_CONNECTIONS_IDLE_NOT_AVAILABLE } = require('../lib/errors')
 const sget = require('simple-get').concat
-const dns = require('dns').promises
+const dns = require('node:dns').promises
 
 test('Should support a custom http server', async t => {
   const localAddresses = await dns.lookup('localhost', { all: true })

package/test/custom-parser.0.test.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const fs = require('fs')
+const fs = require('node:fs')
 const t = require('tap')
 const test = t.test
 const sget = require('simple-get').concat

package/test/custom-querystring-parser.test.js

@@ -2,7 +2,7 @@
 
 const t = require('tap')
 const test = t.test
-const querystring = require('querystring')
+const querystring = require('node:querystring')
 const sget = require('simple-get').concat
 const Fastify = require('..')
 

package/test/diagnostics-channel.test.js

@@ -24,7 +24,7 @@ test('diagnostics_channel when present and subscribers', t => {
   }
 
   const fastify = proxyquire('../fastify', {
-    diagnostics_channel: dc
+    'node:diagnostics_channel': dc
   })()
   t.equal(fastifyInHook, fastify)
 })
@@ -46,7 +46,7 @@ test('diagnostics_channel when present and no subscribers', t => {
   }
 
   proxyquire('../fastify', {
-    diagnostics_channel: dc
+    'node:diagnostics_channel': dc
   })()
 })
 
@@ -55,7 +55,7 @@ test('diagnostics_channel when not present', t => {
 
   t.doesNotThrow(() => {
     proxyquire('../fastify', {
-      diagnostics_channel: null
+      'node:diagnostics_channel': null
     })()
   })
 })

package/test/fastify-instance.test.js

@@ -3,7 +3,7 @@
 const t = require('tap')
 const test = t.test
 const Fastify = require('..')
-const os = require('os')
+const os = require('node:os')
 
 const {
   kOptions,

package/test/genReqId.test.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { Readable } = require('stream')
+const { Readable } = require('node:stream')
 const { test } = require('tap')
 const Fastify = require('..')
 

package/test/helper.js

@@ -1,8 +1,8 @@
 'use strict'
 
 const sget = require('simple-get').concat
-const dns = require('dns').promises
-const stream = require('stream')
+const dns = require('node:dns').promises
+const stream = require('node:stream')
 const symbols = require('../lib/symbols')
 
 /**

package/test/hooks-async.test.js

@@ -1,11 +1,11 @@
 'use strict'
 
-const { Readable } = require('stream')
+const { Readable } = require('node:stream')
 const t = require('tap')
 const test = t.test
 const sget = require('simple-get').concat
 const Fastify = require('../fastify')
-const fs = require('fs')
+const fs = require('node:fs')
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
 
 process.removeAllListeners('warning')