@fastify/reply-from 7.0.1 → 8.0.0

package/.github/workflows/ci.yml

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

package/index.js

@@ -179,7 +179,7 @@ module.exports = fp(function from (fastify, opts, next) {
   })
 
   next()
-}, '>=3')
+}, '4.x')
 
 function getQueryString (search, reqUrl, opts) {
   if (typeof opts.queryString === 'function') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/reply-from",
-  "version": "7.0.1",
+  "version": "8.0.0",
   "description": "forward your HTTP request to another server, for fastify",
   "main": "index.js",
   "types": "index.d.ts",
@@ -31,12 +31,12 @@
   },
   "homepage": "https://github.com/fastify/fastify-reply-from#readme",
   "devDependencies": {
-    "@fastify/formbody": "^6.0.0",
-    "@fastify/multipart": "^6.0.0",
+    "@fastify/formbody": "^7.0.0",
+    "@fastify/multipart": "^7.0.0",
     "@sinonjs/fake-timers": "^9.0.0",
     "@types/node": "^17.0.0",
     "@types/tap": "^15.0.3",
-    "fastify": "^3.17.0",
+    "fastify": "^4.0.0-rc.2",
     "form-data": "^4.0.0",
     "got": "^11.8.2",
     "h2url": "^0.2.0",

package/test/async-route-handler.js

@@ -29,14 +29,14 @@ instance.get('/', async (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From, {
     base: `http://localhost:${target.address().port}`
   })
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {

package/test/base-get.js

@@ -27,14 +27,14 @@ instance.get('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From, {
     base: `http://localhost:${target.address().port}`
   })
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {

package/test/base-path.js

@@ -26,7 +26,7 @@ instance.register(From, {
   undici: false
 })
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
   get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {

package/test/base-querystring.js

@@ -27,14 +27,14 @@ instance.get('/hello', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From, {
     base: `http://localhost:${target.address().port}`
   })
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {

package/test/core-with-path-in-base.js

@@ -28,7 +28,7 @@ instance.get('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From, {
@@ -36,7 +36,7 @@ target.listen(0, (err) => {
     http: true
   })
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {

package/test/custom-undici-instance.js

@@ -21,7 +21,7 @@ const target = http.createServer((req, res) => {
 t.test('use a custom instance of \'undici\'', async t => {
   t.teardown(target.close.bind(target))
 
-  await new Promise((resolve, reject) => target.listen(0, err => err ? reject(err) : resolve()))
+  await new Promise((resolve, reject) => target.listen({ port: 0 }, err => err ? reject(err) : resolve()))
 
   t.test('custom Pool', t => {
     const instance = Fastify()
@@ -35,7 +35,7 @@ t.test('use a custom instance of \'undici\'', async t => {
       reply.from()
     })
 
-    instance.listen(0, (err) => {
+    instance.listen({ port: 0 }, (err) => {
       t.error(err)
 
       get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {
@@ -61,7 +61,7 @@ t.test('use a custom instance of \'undici\'', async t => {
       reply.from()
     })
 
-    instance.listen(0, (err) => {
+    instance.listen({ port: 0 }, (err) => {
       t.error(err)
 
       get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {

package/test/fastify-multipart-incompatibility.js

@@ -56,7 +56,7 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
   logStream.on('data', (log) => {
@@ -68,7 +68,7 @@ instance.listen(0, (err) => {
     }
   })
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     const form = new FormData()

package/test/full-get.js

@@ -28,10 +28,10 @@ instance.get('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {

package/test/full-https-get.js

@@ -35,10 +35,10 @@ instance.get('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

package/test/full-post-extended-content-type.js

@@ -35,10 +35,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get.concat({

package/test/full-post-http2.js

@@ -28,14 +28,14 @@ test('http -> http2', async function (t) {
 
   t.teardown(target.close.bind(target))
 
-  await target.listen(0)
+  await target.listen({ port: 0 })
 
   instance.register(From, {
     base: `http://localhost:${target.server.address().port}`,
     http2: true
   })
 
-  await instance.listen(0)
+  await instance.listen({ port: 0 })
 
   const { headers, body, statusCode } = await got(`http://localhost:${instance.server.address().port}`, {
     method: 'POST',

package/test/full-post-stream-core.js

@@ -43,10 +43,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

package/test/full-post-stream.js

@@ -41,10 +41,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

package/test/full-post.js

@@ -35,10 +35,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

package/test/full-querystring-rewrite-option-complex.js

@@ -29,12 +29,12 @@ instance.get('/hello', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From)
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {

package/test/full-querystring-rewrite-option-function.js

@@ -32,12 +32,12 @@ instance.get('/hello', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From)
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {

package/test/full-querystring-rewrite-option.js

@@ -29,12 +29,12 @@ instance.get('/hello', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From)
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {

package/test/full-querystring-rewrite-string.js

@@ -27,12 +27,12 @@ instance.get('/hello', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From)
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {

package/test/full-querystring-rewrite.js

@@ -27,12 +27,12 @@ instance.get('/hello', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From)
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {

package/test/full-querystring.js

@@ -27,12 +27,12 @@ instance.get('/hello', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From)
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {

package/test/full-rewrite-body-content-type.js

@@ -38,10 +38,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

package/test/full-rewrite-body-http.js

@@ -42,10 +42,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

package/test/full-rewrite-body-to-empty-string.js

@@ -40,10 +40,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

package/test/full-rewrite-body-to-null.js

@@ -40,10 +40,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

package/test/full-rewrite-body.js

@@ -40,10 +40,10 @@ instance.post('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

package/test/get-upstream-http.js

@@ -49,11 +49,11 @@ instanceWithoutBase.get('/test2', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
-  instanceWithoutBase.listen(0, (err) => {
+  instanceWithoutBase.listen({ port: 0 }, (err) => {
     t.error(err)
-    target.listen(0, (err) => {
+    target.listen({ port: 0 }, (err) => {
       t.error(err)
 
       get(`http://localhost:${instance.server.address().port}/test`, (err, res) => {

package/test/get-upstream-undici.js

@@ -31,10 +31,10 @@ instance.get('/test', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-instance.listen(0, (err) => {
+instance.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  target.listen(0, (err) => {
+  target.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}/test`, (err, res) => {

package/test/get-with-body.js

@@ -28,7 +28,7 @@ instance.get('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From, {
@@ -37,7 +37,7 @@ target.listen(0, (err) => {
     http: {}
   })
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

package/test/head-with-body.js

@@ -30,7 +30,7 @@ instance.head('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From, {
@@ -39,7 +39,7 @@ target.listen(0, (err) => {
     http: {}
   })
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get({

package/test/host-header.js

@@ -26,7 +26,7 @@ test('hostname', async (t) => {
     http: {} // force the use of Node.js core
   })
 
-  await instance.listen(0)
+  await instance.listen({ port: 0 })
 
   const res = await got.get(`http://localhost:${instance.server.address().port}/ip`, {
     retry: 0
@@ -56,7 +56,7 @@ test('hostname and port', async (t) => {
     reply.from()
   })
 
-  await instance.listen(0)
+  await instance.listen({ port: 0 })
 
   const res = await got.get(`http://localhost:${instance.server.address().port}/ip`, {
     retry: 0

package/test/http-agents.js

@@ -28,7 +28,7 @@ instance.get('/', (request, reply) => {
 
 t.teardown(target.close.bind(target))
 
-target.listen(0, (err) => {
+target.listen({ port: 0 }, (err) => {
   t.error(err)
 
   instance.register(From, {
@@ -41,7 +41,7 @@ target.listen(0, (err) => {
     }
   })
 
-  instance.listen(0, (err) => {
+  instance.listen({ port: 0 }, (err) => {
     t.error(err)
 
     get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {

package/test/http-http2.js

@@ -27,14 +27,14 @@ test('http -> http2', async (t) => {
 
   t.teardown(target.close.bind(target))
 
-  await target.listen(0)
+  await target.listen({ port: 0 })
 
   instance.register(From, {
     base: `http://localhost:${target.server.address().port}`,
     http2: true
   })
 
-  await instance.listen(0)
+  await instance.listen({ port: 0 })
 
   try {
     await got(`http://localhost:${instance.server.address().port}`)

package/test/http-invalid-target.js

@@ -17,7 +17,7 @@ test('http invalid target', async (t) => {
     base: 'http://abc.xyz1'
   })
 
-  await instance.listen(0)
+  await instance.listen({ port: 0 })
 
   try {
     await got(`http://localhost:${instance.server.address().port}`)

package/test/http-retry.js

@@ -22,7 +22,7 @@ const target = require('http').createServer(function (req, res) {
 test('Will retry', async function (t) {
   t.teardown(() => { retryNum = 1 })
 
-  await target.listen(0)
+  await target.listen({ port: 0 })
   t.teardown(target.close.bind(target))
 
   const instance = Fastify()
@@ -39,7 +39,7 @@ test('Will retry', async function (t) {
     })
   })
 
-  await instance.listen(0)
+  await instance.listen({ port: 0 })
   t.teardown(instance.close.bind(instance))
 
   const { statusCode } = await got.get(`http://localhost:${instance.server.address().port}/`, { retry: 0 })
@@ -49,7 +49,7 @@ test('Will retry', async function (t) {
 test('will not retry', async function (t) {
   t.teardown(() => { retryNum = 1 })
 
-  await target.listen(0)
+  await target.listen({ port: 0 })
   t.teardown(target.close.bind(target))
 
   const instance = Fastify()
@@ -66,7 +66,7 @@ test('will not retry', async function (t) {
     })
   })
 
-  await instance.listen(0)
+  await instance.listen({ port: 0 })
   t.teardown(instance.close.bind(instance))
 
   try {
@@ -80,7 +80,7 @@ test('will not retry', async function (t) {
 test('will not retry unsupported method', async function (t) {
   t.teardown(() => { retryNum = 1 })
 
-  await target.listen(0)
+  await target.listen({ port: 0 })
   t.teardown(target.close.bind(target))
 
   const instance = Fastify()
@@ -97,7 +97,7 @@ test('will not retry unsupported method', async function (t) {
     })
   })
 
-  await instance.listen(0)
+  await instance.listen({ port: 0 })
   t.teardown(instance.close.bind(instance))
 
   try {

package/test/http-timeout.js

@@ -23,7 +23,7 @@ target.get('/', (request, reply) => {
 })
 
 async function main () {
-  await target.listen(0)
+  await target.listen({ port: 0 })
 
   const instance = Fastify()
   t.teardown(instance.close.bind(instance))
@@ -34,7 +34,7 @@ async function main () {
     reply.from(`http://localhost:${target.server.address().port}/`)
   })
 
-  await instance.listen(0)
+  await instance.listen({ port: 0 })
 
   try {
     await got.get(`http://localhost:${instance.server.address().port}/`, { retry: 0 })