Update to Fastify v4 (#247)

* Update to Fastify v4

Signed-off-by: Matteo Collina <hello@matteocollina.com>

* dropped old nodes

Signed-off-by: Matteo Collina <hello@matteocollina.com>

* support node v18 in tests

Signed-off-by: Matteo Collina <hello@matteocollina.com>

Author: mcollina

.github/workflows/ci.yml

@@ -14,9 +14,9 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 12
           - 14
           - 16
+          - 18
         os:
           - macos-latest
           - ubuntu-latest

index.js

@@ -204,8 +204,8 @@ async function httpProxy (fastify, opts) {
 }
 
 httpProxy[Symbol.for('plugin-meta')] = {
-  fastify: '^3.0.0',
-  name: 'fastify-http-proxy'
+  fastify: '^4.0.0',
+  name: '@fastify/http-proxy'
 }
 
 module.exports = httpProxy

package.json

@@ -28,15 +28,15 @@
   "homepage": "https://github.com/fastify/fastify-http-proxy#readme",
   "devDependencies": {
     "@fastify/pre-commit": "^2.0.2",
-    "@fastify/websocket": "^5.0.0",
+    "@fastify/websocket": "^6.0.1",
     "@types/node": "^17.0.8",
     "@types/ws": "^8.2.2",
     "@typescript-eslint/eslint-plugin": "^5.9.1",
     "@typescript-eslint/parser": "^5.9.1",
     "express": "^4.17.2",
     "express-http-proxy": "^1.6.3",
     "fast-proxy": "^2.1.0",
-    "fastify": "^3.25.3",
+    "fastify": "^4.0.0-rc.2",
     "got": "^11.8.3",
     "http-errors": "^2.0.0",
     "http-proxy": "^1.18.1",
@@ -48,10 +48,11 @@
     "standard": "^17.0.0",
     "tap": "^16.0.0",
     "tsd": "^0.20.0",
-    "typescript": "^4.5.4"
+    "typescript": "^4.5.4",
+    "why-is-node-running": "^2.2.2"
   },
   "dependencies": {
-    "@fastify/reply-from": "^7.0.0",
+    "@fastify/reply-from": "^8.0.0",
     "ws": "^8.4.2"
   },
   "tsd": {

test/socket.io.js

@@ -28,7 +28,7 @@ test('proxy socket.io', async t => {
     websocket: true
   })
 
-  await srvProxy.listen(0)
+  await srvProxy.listen({ port: 0 })
 
   srvSocket.on('connection', socket => {
     socket.on('hello', data => {

test/test.js

@@ -38,17 +38,17 @@ async function run () {
     return 'this is never received'
   })
 
-  await origin.listen(0)
+  await origin.listen({ port: 0 })
 
-  teardown(origin.close.bind(origin))
+  teardown(() => origin.close())
 
   test('basic proxy', async t => {
     const server = Fastify()
     server.register(proxy, {
       upstream: `http://localhost:${origin.server.address().port}`
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
 
     const resultRoot = await got(
@@ -73,7 +73,7 @@ async function run () {
       }
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
 
     const resultRoot = await got(
@@ -93,7 +93,7 @@ async function run () {
       upstream: `http://localhost:${origin.server.address().port}`
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
 
     const {
@@ -119,7 +119,7 @@ async function run () {
       }
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
 
     const {
@@ -153,7 +153,7 @@ async function run () {
       prefix: '/my-prefix'
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
 
     const resultRoot = await got(
@@ -184,7 +184,7 @@ async function run () {
       }
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
 
     const resultRoot = await got(
@@ -209,7 +209,7 @@ async function run () {
       upstream: `http://localhost:${origin.server.address().port}`
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
 
     const resultRoot = await got(
@@ -234,7 +234,7 @@ async function run () {
       }
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
 
     const resultRoot = await got(
@@ -259,7 +259,7 @@ async function run () {
       }
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
 
     await got(
@@ -281,7 +281,7 @@ async function run () {
       }
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
 
     let errored = false
@@ -326,7 +326,7 @@ async function run () {
       }
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
 
     let errored = false
@@ -346,7 +346,7 @@ async function run () {
       return 'this is root for origin2'
     })
 
-    await origin2.listen(0)
+    await origin2.listen({ port: 0 })
 
     const proxyServer = Fastify()
 
@@ -362,7 +362,7 @@ async function run () {
       prefix: '/api2'
     })
 
-    await proxyServer.listen(0)
+    await proxyServer.listen({ port: 0 })
 
     t.teardown(() => {
       origin2.close()
@@ -391,7 +391,7 @@ async function run () {
       }
     })
 
-    await proxyServer.listen(0)
+    await proxyServer.listen({ port: 0 })
 
     t.teardown(() => {
       proxyServer.close()
@@ -412,7 +412,7 @@ async function run () {
       rewritePrefix: '/api2'
     })
 
-    await proxyServer.listen(0)
+    await proxyServer.listen({ port: 0 })
 
     t.teardown(() => {
       proxyServer.close()
@@ -432,7 +432,7 @@ async function run () {
       prefix: '/api'
     })
 
-    await proxyServer.listen(0)
+    await proxyServer.listen({ port: 0 })
 
     t.teardown(() => {
       proxyServer.close()
@@ -472,7 +472,7 @@ async function run () {
       }
     })
 
-    await proxyServer.listen(0)
+    await proxyServer.listen({ port: 0 })
 
     t.teardown(() => {
       proxyServer.close()
@@ -493,7 +493,7 @@ async function run () {
       undici: true
     })
 
-    await proxyServer.listen(0)
+    await proxyServer.listen({ port: 0 })
 
     t.teardown(() => {
       proxyServer.close()
@@ -522,7 +522,7 @@ async function run () {
       }
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
 
     try {
@@ -545,7 +545,7 @@ async function run () {
       httpMethods: ['POST']
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
 
     const resultRoot = await got(
@@ -596,7 +596,7 @@ async function run () {
       constraints: { testConstraint: 'valid-value' }
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
     await got(`http://localhost:${server.server.address().port}/a`, {
       headers: {
@@ -637,7 +637,7 @@ async function run () {
       constraints: { testConstraint: 'with-proxy' }
     })
 
-    await server.listen(0)
+    await server.listen({ port: 0 })
     t.teardown(server.close.bind(server))
 
     const resultProxied = await got(`http://localhost:${server.server.address().port}/a`, {
@@ -664,17 +664,18 @@ async function run () {
     appServer.get('/second-service/foo', async (request, reply) => {
       return `Hello World (foo) - lang = ${request.query.lang}`
     })
-    const address = await appServer.listen(0)
+    const address = await appServer.listen({ port: 0 })
+    console.log(address)
 
     const proxyServer = Fastify()
     proxyServer.register(proxy, {
       upstream: `${address}/second-service`,
       prefix: '/second-service'
     })
-    const proxyAddress = await proxyServer.listen(0)
+    const proxyAddress = await proxyServer.listen({ port: 0 })
 
-    t.teardown(appServer.close.bind(appServer))
     t.teardown(proxyServer.close.bind(proxyServer))
+    t.teardown(appServer.close.bind(appServer))
 
     const resultRoot = await got(
       `${proxyAddress}/second-service?lang=en`

test/websocket.js

@@ -26,15 +26,15 @@ test('basic websocket proxy', async (t) => {
     })
   })
 
-  await promisify(origin.listen.bind(origin))(0)
+  await promisify(origin.listen.bind(origin))({ port: 0 })
 
   const server = Fastify()
   server.register(proxy, {
     upstream: `ws://localhost:${origin.address().port}`,
     websocket: true
   })
 
-  await server.listen(0)
+  await server.listen({ port: 0 })
   t.teardown(server.close.bind(server))
 
   const options = { headers: { cookie: cookieValue } }
@@ -58,14 +58,14 @@ test('basic websocket proxy', async (t) => {
 
 test('captures errors on start', async (t) => {
   const app = Fastify()
-  await app.listen(0)
+  await app.listen({ port: 0 })
 
   const app2 = Fastify()
   app2.register(proxy, { upstream: 'ws://localhost', websocket: true })
 
   const appPort = app.server.address().port
 
-  await t.rejects(app2.listen(appPort), /EADDRINUSE/)
+  await t.rejects(app2.listen({ port: appPort }), /EADDRINUSE/)
 
   t.teardown(app.close.bind(app))
   t.teardown(app2.close.bind(app2))

test/ws-prefix-rewrite-core.js

@@ -30,7 +30,7 @@ async function proxyServer (t, backendURL, backendPath, proxyOptions, wrapperOpt
     await registerProxy(frontend)
   }
 
-  return [frontend, await frontend.listen(0)]
+  return [frontend, await frontend.listen({ port: 0, host: '127.0.0.1' })]
 }
 
 async function processRequest (t, frontendURL, path, expected) {
@@ -84,7 +84,7 @@ async function handleProxy (info, { backendPath, proxyOptions, wrapperOptions },
 
     t.teardown(() => backend.close())
 
-    const backendURL = await backend.listen(0)
+    const backendURL = await backend.listen({ port: 0, host: '127.0.0.1' })
 
     const [frontend, frontendURL] = await proxyServer(t, backendURL, backendPath, proxyOptions, wrapperOptions)
 

test/ws-prefix-rewrite.js

@@ -28,7 +28,7 @@ async function proxyServer (t, backendURL, backendPath, proxyOptions, wrapperOpt
     await registerProxy(frontend)
   }
 
-  return [frontend, await frontend.listen(0)]
+  return [frontend, await frontend.listen({ port: 0 })]
 }
 
 async function processRequest (t, frontendURL, path, expected) {
@@ -80,7 +80,7 @@ async function handleProxy (info, { backendPath, proxyOptions, wrapperOptions },
       }
     })
 
-    const backendURL = await backend.listen(0)
+    const backendURL = await backend.listen({ port: 0 })
 
     const [frontend, frontendURL] = await proxyServer(t, backendURL, backendPath, proxyOptions, wrapperOptions)