@fastify/reply-from 12.0.0 → 12.0.2

package/test/no-body-opts-with-get.test.js

@@ -11,12 +11,12 @@ const instance = Fastify()
 t.plan(6)
 t.teardown(instance.close.bind(instance))
 
-const target = http.createServer((req, res) => {
+const target = http.createServer((_req, res) => {
   t.fail('this should never get called')
   res.end('hello world')
 })
 
-instance.get('/', (request, reply) => {
+instance.get('/', (_request, reply) => {
   try {
     reply.from(null, { body: 'this is the new body' })
   } catch (e) {

package/test/no-body-opts-with-head.test.js

@@ -11,12 +11,12 @@ const instance = Fastify()
 t.plan(7)
 t.teardown(instance.close.bind(instance))
 
-const target = http.createServer((req, res) => {
+const target = http.createServer((_req, res) => {
   t.fail('this should never get called')
   res.end('hello world')
 })
 
-instance.head('/', (request, reply) => {
+instance.head('/', (_request, reply) => {
   try {
     reply.from(null, { body: 'this is the new body' })
   } catch (e) {

package/test/no-stream-body-option.test.js

@@ -13,12 +13,12 @@ instance.register(From)
 t.plan(5)
 t.teardown(instance.close.bind(instance))
 
-const target = http.createServer((req, res) => {
+const target = http.createServer((_req, res) => {
   t.fail('the target server should never be called')
   res.end()
 })
 
-instance.post('/', (request, reply) => {
+instance.post('/', (_request, reply) => {
   const body = new Readable({
     read: function () {
       t.fail('the read function should never be called')

package/test/on-error.test.js

@@ -12,7 +12,7 @@ t.test('on-error', async (t) => {
   const target = Fastify()
   t.teardown(target.close.bind(target))
 
-  target.get('/', (request, reply) => {
+  target.get('/', (_request, reply) => {
     t.pass('request arrives')
 
     clock.setTimeout(() => {
@@ -28,7 +28,7 @@ t.test('on-error', async (t) => {
 
   instance.register(From, { http: { requestOptions: { timeout: 100 } } })
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from(`http://localhost:${target.server.address().port}/`,
       {
         onError: (reply, { error }) => {

package/test/on-invalid-upstream-response.test.js

@@ -21,7 +21,7 @@ const target = http.createServer((req, res) => {
 
 instance.get('/', (_, reply) => {
   reply.from(`http://localhost:${target.address().port}`, {
-    onResponse: (_, reply, res) => {
+    onResponse: (_, _reply, res) => {
       t.equal(res.statusCode, 888)
     }
   })

package/test/padded-body.test.js

@@ -36,7 +36,7 @@ const target = http.createServer((req, res) => {
   })
 })
 
-instance.post('/', (request, reply) => {
+instance.post('/', (_request, reply) => {
   reply.from(`http://localhost:${target.address().port}`)
 })
 
@@ -55,7 +55,7 @@ instance.listen({ port: 0 }, (err) => {
         'content-type': 'application/json'
       },
       body: bodyString
-    }, (err, res, data) => {
+    }, (err, _res, data) => {
       t.error(err)
       const parsed = JSON.parse(data)
       t.same(parsed, { something: 'else' })

package/test/post-formbody.test.js

@@ -33,7 +33,7 @@ const target = http.createServer((req, res) => {
   })
 })
 
-instance.post('/', (request, reply) => {
+instance.post('/', (_request, reply) => {
   reply.from(`http://localhost:${target.address().port}`)
 })
 

package/test/post-plain-text.test.js

@@ -30,7 +30,7 @@ const target = http.createServer((req, res) => {
   })
 })
 
-instance.post('/', (request, reply) => {
+instance.post('/', (_request, reply) => {
   reply.from(`http://localhost:${target.address().port}`)
 })
 

package/test/post-with-custom-encoded-contenttype.test.js

@@ -15,7 +15,7 @@ instance.register(From, {
 instance.addContentTypeParser(
   'application/x-www-form-urlencoded',
   { parseAs: 'buffer', bodyLimit: 1000 },
-  (req, body, done) => done(null, parse(body.toString()))
+  (_req, body, done) => done(null, parse(body.toString()))
 )
 
 t.plan(9)
@@ -39,7 +39,7 @@ const target = http.createServer((req, res) => {
   })
 })
 
-instance.post('/', (request, reply) => {
+instance.post('/', (_request, reply) => {
   reply.from(`http://localhost:${target.address().port}`)
 })
 

package/test/post-with-octet-stream.test.js

@@ -16,7 +16,7 @@ test('with explicitly set content-type application/octet-stream', t => {
   instance.addContentTypeParser(
     'application/octet-stream',
     { parseAs: 'buffer', bodyLimit: 1000 },
-    (req, body, done) => done(null, parse(body.toString()))
+    (_req, body, done) => done(null, parse(body.toString()))
   )
 
   t.plan(9)
@@ -40,7 +40,7 @@ test('with explicitly set content-type application/octet-stream', t => {
     })
   })
 
-  instance.post('/', (request, reply) => {
+  instance.post('/', (_request, reply) => {
     reply.from(`http://localhost:${target.address().port}`)
   })
 
@@ -75,13 +75,13 @@ test('with implicit content-type application/octet-stream', t => {
   instance.addContentTypeParser(
     'application/octet-stream',
     { parseAs: 'buffer', bodyLimit: 1000 },
-    (req, body, done) => done(null, parse(body.toString()))
+    (_req, body, done) => done(null, parse(body.toString()))
   )
 
   instance.addContentTypeParser(
     '*',
     { parseAs: 'buffer', bodyLimit: 1000 },
-    (req, body, done) => done(null, parse(body.toString()))
+    (_req, body, done) => done(null, parse(body.toString()))
   )
 
   t.plan(9)
@@ -105,7 +105,7 @@ test('with implicit content-type application/octet-stream', t => {
     })
   })
 
-  instance.post('/', (request, reply) => {
+  instance.post('/', (_request, reply) => {
     reply.from(`http://localhost:${target.address().port}`)
   })
 

package/test/retry-on-503.test.js

@@ -8,7 +8,7 @@ const got = require('got')
 
 function createTargetServer (withRetryAfterHeader, stopAfter = 1) {
   let requestCount = 0
-  return http.createServer((req, res) => {
+  return http.createServer((_req, res) => {
     if (requestCount++ < stopAfter) {
       res.statusCode = 503
       res.setHeader('Content-Type', 'text/plain')
@@ -35,7 +35,7 @@ test('Should retry on 503 HTTP error', async function (t) {
     base: `http://localhost:${target.address().port}`
   })
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from()
   })
 
@@ -60,7 +60,7 @@ test('Should retry on 503 HTTP error with Retry-After response header', async fu
     base: `http://localhost:${target.address().port}`
   })
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from()
   })
 
@@ -85,7 +85,7 @@ test('Should abort if server is always returning 503', async function (t) {
     base: `http://localhost:${target.address().port}`
   })
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from()
   })
 

package/test/retry-with-a-custom-handler.test.js

@@ -33,7 +33,7 @@ async function setupServer (t, fromOptions = {}, statusCodeToFailOn = 500, stopA
     base: `http://localhost:${target.address().port}`
   })
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from(`http://localhost:${target.address().port}`, fromOptions)
   })
 
@@ -59,7 +59,7 @@ test('a 500 status code with no custom handler should fail', async (t) => {
 })
 
 test("a server 500's with a custom handler and should revive", async (t) => {
-  const customRetryLogic = ({ req, res, err, attempt, getDefaultDelay }) => {
+  const customRetryLogic = ({ req, res, getDefaultDelay }) => {
     const defaultDelay = getDefaultDelay()
     if (defaultDelay) return defaultDelay
 
@@ -80,7 +80,7 @@ test("a server 500's with a custom handler and should revive", async (t) => {
 
 test('custom retry does not invoke the default delay causing a 501', async (t) => {
   // the key here is our retryDelay doesn't register the deefault handler and as a result it doesn't work
-  const customRetryLogic = ({ req, res, err, attempt, getDefaultDelay }) => {
+  const customRetryLogic = ({ req, res }) => {
     if (res && res.statusCode === 500 && req.method === 'GET') {
       return 0
     }
@@ -100,7 +100,7 @@ test('custom retry does not invoke the default delay causing a 501', async (t) =
 })
 
 test('custom retry delay functions can invoke the default delay', async (t) => {
-  const customRetryLogic = ({ req, res, err, attempt, getDefaultDelay }) => {
+  const customRetryLogic = ({ req, res, getDefaultDelay }) => {
     // registering the default retry logic for non 500 errors if it occurs
     const defaultDelay = getDefaultDelay()
     if (defaultDelay) return defaultDelay
@@ -122,7 +122,7 @@ test('custom retry delay functions can invoke the default delay', async (t) => {
 })
 
 test('custom retry delay function inspects the err paramater', async (t) => {
-  const customRetryLogic = ({ req, res, err, attempt, getDefaultDelay }) => {
+  const customRetryLogic = ({ err }) => {
     if (err && (err.code === 'UND_ERR_SOCKET' || err.code === 'ECONNRESET')) {
       return 0.1
     }
@@ -141,7 +141,7 @@ test('custom retry delay function inspects the err paramater', async (t) => {
 test('we can exceed our retryCount and introspect attempts independently', async (t) => {
   const attemptCounter = []
 
-  const customRetryLogic = ({ req, res, err, attempt, getDefaultDelay }) => {
+  const customRetryLogic = ({ err, attempt }) => {
     attemptCounter.push(attempt)
 
     if (err && (err.code === 'UND_ERR_SOCKET' || err.code === 'ECONNRESET')) {
@@ -163,7 +163,7 @@ test('we can exceed our retryCount and introspect attempts independently', async
 
 test('we handle our retries based on the retryCount', async (t) => {
   const attemptCounter = []
-  const customRetryLogic = ({ req, res, err, attempt, getDefaultDelay, retriesCount }) => {
+  const customRetryLogic = ({ req, res, attempt, retriesCount }) => {
     if (retriesCount < attempt) {
       return null
     }

package/test/rewrite-headers-type.test.js

@@ -21,7 +21,7 @@ const target = http.createServer((req, res) => {
 
 instance.get('/', (request, reply) => {
   reply.from(`http://localhost:${target.address().port}`, {
-    rewriteHeaders: (headers, req) => {
+    rewriteHeaders: (_headers, req) => {
       t.pass('rewriteHeaders called with correct request parameter')
       t.equal(req, request)
       return {}
@@ -37,7 +37,7 @@ instance.listen({ port: 0 }, (err) => {
   target.listen({ port: 0 }, (err) => {
     t.error(err)
 
-    get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {
+    get(`http://localhost:${instance.server.address().port}`, (err, res) => {
       t.error(err)
       t.equal(res.statusCode, 205)
     })

package/test/rewrite-headers.test.js

@@ -21,9 +21,9 @@ const target = http.createServer((req, res) => {
   res.end('hello world')
 })
 
-instance.get('/', (request, reply) => {
+instance.get('/', (_request, reply) => {
   reply.from(`http://localhost:${target.address().port}`, {
-    rewriteHeaders: (headers, req) => {
+    rewriteHeaders: (headers) => {
       t.pass('rewriteHeaders called')
       return {
         'content-type': headers['content-type'],
@@ -41,7 +41,7 @@ instance.listen({ port: 0 }, (err) => {
   target.listen({ port: 0 }, (err) => {
     t.error(err)
 
-    get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {
+    get(`http://localhost:${instance.server.address().port}`, (err, res) => {
       t.error(err)
       t.equal(res.headers['content-type'], 'text/plain')
       t.equal(res.headers['x-another-header'], 'so headers!')

package/test/rewrite-request-headers-type.test.js

@@ -21,7 +21,7 @@ const target = http.createServer((req, res) => {
 
 instance.get('/', (request, reply) => {
   reply.from(`http://localhost:${target.address().port}`, {
-    rewriteRequestHeaders: (originalReq, headers) => {
+    rewriteRequestHeaders: (originalReq) => {
       t.pass('rewriteRequestHeaders called with correct request parameter')
       t.equal(originalReq, request)
       return {}
@@ -37,7 +37,7 @@ instance.listen({ port: 0 }, (err) => {
   target.listen({ port: 0 }, (err) => {
     t.error(err)
 
-    get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {
+    get(`http://localhost:${instance.server.address().port}`, (err, res) => {
       t.error(err)
       t.equal(res.statusCode, 205)
     })

package/test/rewrite-request-headers.test.js

@@ -20,9 +20,9 @@ const target = http.createServer((req, res) => {
   res.end(req.headers.host)
 })
 
-instance.get('/', (request, reply) => {
+instance.get('/', (_request, reply) => {
   reply.from(`http://localhost:${target.address().port}`, {
-    rewriteRequestHeaders: (originalReq, headers) => {
+    rewriteRequestHeaders: (_originalReq, headers) => {
       t.pass('rewriteRequestHeaders called')
       return Object.assign(headers, { host: 'host-override' })
     }

package/test/transform-body.test.js

@@ -22,13 +22,13 @@ const target = http.createServer((req, res) => {
   res.end('hello world')
 })
 
-instance.get('/', (request, reply) => {
+instance.get('/', (_request, reply) => {
   reply.from(`http://localhost:${target.address().port}`, {
-    onResponse: (request, reply, res) => {
+    onResponse: (_request, reply, res) => {
       reply.send(
         res.stream.pipe(
           new Transform({
-            transform: function (chunk, enc, cb) {
+            transform: function (chunk, _enc, cb) {
               this.push(chunk.toString().toUpperCase())
               cb()
             }

package/test/undici-agent.test.js

@@ -13,12 +13,12 @@ t.plan(10)
 const instance = Fastify()
 t.teardown(instance.close.bind(instance))
 
-const target = http.createServer((req, res) => {
+const target = http.createServer((_req, res) => {
   res.statusCode = 200
   res.end('hello world')
 })
 
-instance.get('/', (request, reply) => {
+instance.get('/', (_request, reply) => {
   reply.from()
 })
 

package/test/undici-body.test.js

@@ -33,7 +33,7 @@ const target = http.createServer((req, res) => {
   })
 })
 
-instance.post('/', (request, reply) => {
+instance.post('/', (_request, reply) => {
   reply.from(`http://localhost:${target.address().port}`)
 })
 
@@ -42,7 +42,7 @@ t.teardown(target.close.bind(target))
 target.listen({ port: 0 }, (err) => {
   t.error(err)
 
-  instance.addContentTypeParser('application/json', function (req, payload, done) {
+  instance.addContentTypeParser('application/json', function (_req, payload, done) {
     done(null, payload)
   })
 
@@ -61,7 +61,7 @@ target.listen({ port: 0 }, (err) => {
         'content-type': 'application/json'
       },
       body: bodyString
-    }, (err, res, data) => {
+    }, (err, _res, data) => {
       t.error(err)
       const parsed = JSON.parse(data)
       t.same(parsed, { something: 'else' })

package/test/undici-chaining.test.js

@@ -16,7 +16,7 @@ t.teardown(proxy1.close.bind(proxy1))
 const proxy2 = Fastify()
 t.teardown(proxy2.close.bind(proxy2))
 
-instance.get('/', (request, reply) => {
+instance.get('/', (_request, reply) => {
   reply.header('content-disposition', header).send('OK')
 })
 
@@ -25,7 +25,7 @@ proxy1.register(From, {
     keepAliveMaxTimeout: 10
   }
 })
-proxy1.get('/', (request, reply) => {
+proxy1.get('/', (_request, reply) => {
   return reply.from(`http://localhost:${instance.server.address().port}`)
 })
 
@@ -34,7 +34,7 @@ proxy2.register(From, {
     keepAliveMaxTimeout: 10
   }
 })
-proxy2.get('/', (request, reply) => {
+proxy2.get('/', (_request, reply) => {
   return reply.from(`http://localhost:${proxy1.server.address().port}`)
 })
 

package/test/undici-connect-timeout.test.js

@@ -13,7 +13,7 @@ t.test('undici connect timeout', async (t) => {
     return new net.Socket(options)
   }
 
-  const target = http.createServer((req, res) => {
+  const target = http.createServer(() => {
     t.fail('target never called')
   })
 
@@ -31,7 +31,7 @@ t.test('undici connect timeout', async (t) => {
     }
   })
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from()
   })
 

package/test/undici-custom-dispatcher.test.js

@@ -28,7 +28,7 @@ test('use a custom instance of \'undici\'', async t => {
     keepAliveTimeout: 1
   })
 
-  target.get('/', (req, reply) => {
+  target.get('/', (_req, reply) => {
     t.pass('request proxied')
 
     reply.headers({
@@ -53,7 +53,7 @@ test('use a custom instance of \'undici\'', async t => {
     undici: new CustomDispatcher('http://localhost:3001')
   })
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from('http://myserver.local')
   })
 

package/test/undici-global-agent.test.js

@@ -17,12 +17,12 @@ test('undici global agent is used, but not destroyed', async (t) => {
 
   t.teardown(instance.close.bind(instance))
 
-  const target = http.createServer((req, res) => {
+  const target = http.createServer((_req, res) => {
     res.statusCode = 200
     res.end()
   })
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from()
   })
 

package/test/undici-no-destroy.test.js

@@ -14,7 +14,7 @@ test('destroyAgent false', async (t) => {
 
   t.teardown(instance.close.bind(instance))
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from()
   })
 

package/test/undici-options.test.js

@@ -13,12 +13,12 @@ const instance = Fastify()
 t.plan(6)
 t.teardown(instance.close.bind(instance))
 
-const target = http.createServer((req, res) => {
+const target = http.createServer((_req, res) => {
   res.statusCode = 200
   res.end('hello world')
 })
 
-instance.get('/', (request, reply) => {
+instance.get('/', (_request, reply) => {
   reply.from()
 })
 

package/test/undici-proxy-agent.test.js

@@ -1,11 +1,11 @@
 'use strict'
 
-const { test } = require('tap')
+const { test, after } = require('node:test')
 const { createServer } = require('node:http')
 const Fastify = require('fastify')
-const get = require('simple-get').concat
 const { createProxy } = require('proxy')
-const From = require('..')
+const fastifyProxyFrom = require('..')
+const { isIPv6 } = require('node:net')
 
 const configFormat = {
   string: (value) => value,
@@ -15,54 +15,73 @@ const configFormat = {
 
 for (const [description, format] of Object.entries(configFormat)) {
   test(`use undici ProxyAgent to connect through proxy - configured via ${description}`, async (t) => {
-    t.plan(5)
+    t.plan(3)
+
     const target = await buildServer()
     const proxy = await buildProxy()
-    t.teardown(target.close.bind(target))
-    t.teardown(proxy.close.bind(proxy))
 
-    const targetUrl = `http://localhost:${target.address().port}`
-    const proxyUrl = `http://localhost:${proxy.address().port}`
+    after(() => {
+      target.close()
+      proxy.close()
+    })
+
+    let targetAddress = target.address().address
+
+    if (isIPv6(targetAddress)) {
+      targetAddress = `[${targetAddress}]`
+    }
+
+    let proxyAddress = proxy.address().address
+
+    if (isIPv6(proxyAddress)) {
+      proxyAddress = `[${proxyAddress}]`
+    }
+
+    const targetUrl = `http://${targetAddress}:${target.address().port}`
+    const proxyUrl = `http://${proxyAddress}:${proxy.address().port}`
 
     proxy.on('connect', () => {
-      t.ok(true, 'should connect to proxy')
+      t.assert.ok(true, 'should connect to proxy')
     })
 
-    target.on('request', (req, res) => {
+    target.on('request', (_req, res) => {
       res.setHeader('content-type', 'application/json')
       res.end(JSON.stringify({ hello: 'world' }))
     })
 
     const instance = Fastify()
-    t.teardown(instance.close.bind(instance))
 
-    instance.register(From, {
+    after(() => {
+      instance.close()
+    })
+
+    instance.register(fastifyProxyFrom, {
       base: targetUrl,
       undici: {
         proxy: format(proxyUrl)
       }
     })
 
-    instance.get('/', (request, reply) => {
+    instance.get('/', (_request, reply) => {
       reply.from()
     })
 
-    const executionFlow = () => new Promise((resolve) => {
-      instance.listen({ port: 0 }, err => {
-        t.error(err)
-
-        get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {
-          t.error(err)
-          t.same(res.statusCode, 200)
-          t.match(JSON.parse(data.toString()), { hello: 'world' })
-          resolve()
-          instance.close()
-          target.close()
-        })
-      })
-    })
+    await instance.listen({ port: 0 })
+
+    let instanceAddress = proxy.address().address
+
+    if (isIPv6(instanceAddress)) {
+      if (instanceAddress === '::') {
+        instanceAddress = '::1'
+      } else {
+        instanceAddress = `[${instanceAddress}]`
+      }
+    }
+
+    const response = await fetch(`http://localhost:${instance.server.address().port}`)
 
-    await executionFlow()
+    t.assert.strictEqual(response.status, 200)
+    t.assert.deepStrictEqual(await response.json(), { hello: 'world' })
   })
 }
 

package/test/undici-retry.test.js

@@ -29,7 +29,7 @@ test('Will retry', async function (t) {
 
   instance.register(From, { undici: true })
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from(`http://localhost:${target.address().port}/`, {
       retriesCount: 1,
       onError: (reply, { error }) => {
@@ -56,7 +56,7 @@ test('will not retry', async function (t) {
 
   instance.register(From, { undici: true })
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from(`http://localhost:${target.address().port}/`, {
       retriesCount: 0,
       onError: (reply, { error }) => {
@@ -87,7 +87,7 @@ test('will not retry unsupported method', async function (t) {
 
   instance.register(From, { undici: true, retryMethods: ['DELETE'] })
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from(`http://localhost:${target.address().port}/`, {
       retriesCount: 1,
       onError: (reply, { error }) => {