fastify 5.2.0 → 5.2.2

package/test/upgrade.test.js

@@ -1,53 +1,55 @@
 'use strict'
 
-const { test, skip } = require('tap')
+const { describe, test } = require('node:test')
 const Fastify = require('..')
 const { connect } = require('node:net')
 const { once } = require('node:events')
 const dns = require('node:dns').promises
 
-async function setup () {
+describe('upgrade to both servers', async t => {
   const localAddresses = await dns.lookup('localhost', { all: true })
   if (localAddresses.length === 1) {
-    skip('requires both IPv4 and IPv6')
+    t.skip('requires both IPv4 and IPv6')
     return
   }
 
-  test('upgrade to both servers', async t => {
+  await test('upgrade IPv4 and IPv6', async t => {
     t.plan(2)
-    const app = Fastify()
-    app.server.on('upgrade', (req, socket, head) => {
-      t.pass(`upgrade event ${JSON.stringify(socket.address())}`)
+
+    const fastify = Fastify()
+    fastify.server.on('upgrade', (req, socket, head) => {
+      t.assert.ok(`upgrade event ${JSON.stringify(socket.address())}`)
       socket.end()
     })
-    app.get('/', (req, res) => {
+
+    fastify.get('/', (req, res) => {
+      res.send()
     })
-    await app.listen()
-    t.teardown(app.close.bind(app))
+
+    await fastify.listen()
+    t.after(() => fastify.close())
 
     {
-      const client = connect(app.server.address().port, '127.0.0.1')
-      client.write('GET / HTTP/1.1\r\n')
-      client.write('Upgrade: websocket\r\n')
-      client.write('Connection: Upgrade\r\n')
-      client.write('Sec-WebSocket-Key: x3JJHMbDL1EzLkh9GBhXDw==\r\n')
-      client.write('Sec-WebSocket-Protocol: com.xxx.service.v1\r\n')
-      client.write('Sec-WebSocket-Version: 13\r\n\r\n')
-      client.write('\r\n\r\n')
-      await once(client, 'close')
+      const clientIPv4 = connect(fastify.server.address().port, '127.0.0.1')
+      clientIPv4.write('GET / HTTP/1.1\r\n')
+      clientIPv4.write('Upgrade: websocket\r\n')
+      clientIPv4.write('Connection: Upgrade\r\n')
+      clientIPv4.write('Sec-WebSocket-Key: x3JJHMbDL1EzLkh9GBhXDw==\r\n')
+      clientIPv4.write('Sec-WebSocket-Protocol: com.xxx.service.v1\r\n')
+      clientIPv4.write('Sec-WebSocket-Version: 13\r\n\r\n')
+      clientIPv4.write('\r\n\r\n')
+      await once(clientIPv4, 'close')
     }
 
     {
-      const client = connect(app.server.address().port, '::1')
-      client.write('GET / HTTP/1.1\r\n')
-      client.write('Upgrade: websocket\r\n')
-      client.write('Connection: Upgrade\r\n')
-      client.write('Sec-WebSocket-Key: x3JJHMbDL1EzLkh9GBhXDw==\r\n')
-      client.write('Sec-WebSocket-Protocol: com.xxx.service.v1\r\n')
-      client.write('Sec-WebSocket-Version: 13\r\n\r\n')
-      await once(client, 'close')
+      const clientIPv6 = connect(fastify.server.address().port, '::1')
+      clientIPv6.write('GET / HTTP/1.1\r\n')
+      clientIPv6.write('Upgrade: websocket\r\n')
+      clientIPv6.write('Connection: Upgrade\r\n')
+      clientIPv6.write('Sec-WebSocket-Key: x3JJHMbDL1EzLkh9GBhXDw==\r\n')
+      clientIPv6.write('Sec-WebSocket-Protocol: com.xxx.service.v1\r\n')
+      clientIPv6.write('Sec-WebSocket-Version: 13\r\n\r\n')
+      await once(clientIPv6, 'close')
     }
   })
-}
-
-setup()
+})

package/test/web-api.test.js

@@ -227,6 +227,50 @@ test('Error when Response.bodyUsed', async (t) => {
   t.assert.strictEqual(body.code, 'FST_ERR_REP_RESPONSE_BODY_CONSUMED')
 })
 
+test('Error when Response.body.locked', async (t) => {
+  t.plan(3)
+
+  const fastify = Fastify()
+
+  fastify.get('/', async function (request, reply) {
+    const stream = Readable.toWeb(fs.createReadStream(__filename))
+    const response = new Response(stream, {
+      status: 200,
+      headers: {
+        hello: 'world'
+      }
+    })
+    stream.getReader()
+    t.assert.strictEqual(stream.locked, true)
+    return reply.send(response)
+  })
+
+  const response = await fastify.inject({ method: 'GET', path: '/' })
+
+  t.assert.strictEqual(response.statusCode, 500)
+  const body = response.json()
+  t.assert.strictEqual(body.code, 'FST_ERR_REP_READABLE_STREAM_LOCKED')
+})
+
+test('Error when ReadableStream.locked', async (t) => {
+  t.plan(3)
+
+  const fastify = Fastify()
+
+  fastify.get('/', async function (request, reply) {
+    const stream = Readable.toWeb(fs.createReadStream(__filename))
+    stream.getReader()
+    t.assert.strictEqual(stream.locked, true)
+    return reply.send(stream)
+  })
+
+  const response = await fastify.inject({ method: 'GET', path: '/' })
+
+  t.assert.strictEqual(response.statusCode, 500)
+  const body = response.json()
+  t.assert.strictEqual(body.code, 'FST_ERR_REP_READABLE_STREAM_LOCKED')
+})
+
 test('allow to pipe with fetch', async (t) => {
   t.plan(2)
   const abortController = new AbortController()

package/types/instance.d.ts

@@ -548,6 +548,10 @@ export interface FastifyInstance<
    * Remove all content type parsers, including the default ones
    */
   removeAllContentTypeParsers: removeAllContentTypeParsers
+  /**
+   * Returns an array of strings containing the list of supported HTTP methods
+   */
+  supportedMethods: string[]
   /**
    * Add a non-standard HTTP method
    *

package/test/test-reporter.mjs

@@ -1,68 +0,0 @@
-function colorize (type, text) {
-  if (type === 'pass') {
-    const blackText = `\x1b[30m${text}`
-    const boldblackText = `\x1b[1m${blackText}`
-    // Green background with black text
-    return `\x1b[42m${boldblackText}\x1b[0m`
-  }
-
-  if (type === 'fail') {
-    const whiteText = `\x1b[37m${text}`
-    const boldWhiteText = `\x1b[1m${whiteText}`
-    // Red background with white text
-    return `\x1b[41m${boldWhiteText}\x1b[0m`
-  }
-
-  return text
-}
-
-function formatDiagnosticStr (str) {
-  return str.replace(/^(\w+)(\s*\d*)/i, (_, firstWord, rest) => {
-    return firstWord.charAt(0).toUpperCase() + firstWord.slice(1).toLowerCase() + ':' + rest
-  })
-}
-
-async function * reporter (source) {
-  const failed = new Set()
-  const diagnostics = new Set()
-
-  for await (const event of source) {
-    switch (event.type) {
-      case 'test:pass': {
-        yield `${colorize('pass', 'PASSED')}: ${event.data.file || event.data.name}\n`
-        break
-      }
-
-      case 'test:fail': {
-        failed.add(event.data.name || event.data.file)
-        yield `${colorize('fail', 'FAILED')}: ${event.data.file || event.data.name}\n`
-        break
-      }
-
-      case 'test:diagnostic': {
-        diagnostics.add(`${formatDiagnosticStr(event.data.message)}\n`)
-        break
-      }
-
-      default: {
-        yield ''
-      }
-    }
-  }
-
-  if (failed.size > 0) {
-    yield `\n\n${colorize('fail', 'Failed tests:')}\n`
-    for (const file of failed) {
-      yield `${file}\n`
-    }
-  }
-
-  yield '\n'
-
-  for (const diagnostic of diagnostics) {
-    yield `${diagnostic}`
-  }
-  yield '\n'
-}
-
-export default reporter