@fastify/reply-from 10.0.0 → 11.0.0

package/test/http2-http2.test.js

@@ -4,8 +4,8 @@ const h2url = require('h2url')
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 const certs = {
   key: fs.readFileSync(path.join(__dirname, 'fixtures', 'fastify.key')),
   cert: fs.readFileSync(path.join(__dirname, 'fixtures', 'fastify.cert'))
@@ -54,4 +54,6 @@ t.test('http2 -> http2', async (t) => {
   t.equal(headers['x-my-header'], 'hello!')
   t.match(headers['content-type'], /application\/json/)
   t.same(JSON.parse(body), { hello: 'world' })
+  instance.close()
+  target.close()
 })

package/test/http2-https.test.js

@@ -5,8 +5,8 @@ const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
 const got = require('got')
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 const certs = {
   allowHTTP1: true, // fallback support for HTTP1
   key: fs.readFileSync(path.join(__dirname, 'fixtures', 'fastify.key')),

package/test/http2-invalid-base.test.js

@@ -7,7 +7,7 @@ const From = require('../index')
 test('http2 invalid base', async (t) => {
   const instance = Fastify()
 
-  await t.rejects(instance.register(From, {
+  await t.rejects(async () => instance.register(From, {
     http2: { requestTimeout: 100 }
   }), new Error('Option base is required when http2 is true'))
 })

package/test/http2-timeout-disabled.test.js

@@ -0,0 +1,85 @@
+'use strict'
+
+const { test } = require('tap')
+const Fastify = require('fastify')
+const From = require('..')
+const got = require('got')
+
+test('http2 request timeout disabled', async (t) => {
+  const target = Fastify({ http2: true })
+  t.teardown(target.close.bind(target))
+
+  target.get('/', () => {
+    t.pass('request arrives')
+  })
+
+  await target.listen({ port: 0 })
+
+  const instance = Fastify()
+  t.teardown(instance.close.bind(instance))
+
+  instance.register(From, {
+    base: `http://localhost:${target.server.address().port}`,
+    http2: { requestTimeout: 0, sessionTimeout: 16000 }
+  })
+
+  instance.get('/', (request, reply) => {
+    reply.from(`http://localhost:${target.server.address().port}/`)
+  })
+
+  await instance.listen({ port: 0 })
+
+  const result = await Promise.race([
+    got.get(`http://localhost:${instance.server.address().port}/`, {
+      retry: 0
+    }),
+    new Promise(resolve => setTimeout(resolve, 11000, 'passed'))
+  ])
+
+  // if we wait 11000 ms without a timeout error, we assume disabling the timeout worked
+  // 10000 ms is the default timeout
+  t.equal(result, 'passed')
+})
+
+test('http2 session timeout disabled', async (t) => {
+  const target = Fastify({ http2: true })
+
+  target.get('/', () => {
+    t.pass('request arrives')
+  })
+
+  await target.listen({ port: 0 })
+
+  const instance = Fastify()
+
+  instance.register(From, {
+    sessionTimeout: 3000,
+    destroyAgent: true,
+    base: `http://localhost:${target.server.address().port}`,
+    http2: { requestTimeout: 0, sessionTimeout: 0 }
+  })
+
+  instance.get('/', (request, reply) => {
+    reply.from(`http://localhost:${target.server.address().port}/`)
+  })
+
+  await instance.listen({ port: 0 })
+
+  const request = got.get(`http://localhost:${instance.server.address().port}/`, {
+    retry: 0
+  })
+
+  const result = await Promise.race([
+    request,
+    new Promise(resolve => setTimeout(resolve, 4000, 'passed'))
+  ])
+
+  // clean up right after the timeout, otherwise test will hang
+  request.cancel()
+  target.close()
+  instance.close()
+
+  // if we wait 4000 ms without a timeout error, we assume disabling the session timeout for reply-from worked
+  // because we pass 3000 ms as session timeout to the Fastify options itself
+  t.equal(result, 'passed')
+})

package/test/http2-timeout.test.js

@@ -122,4 +122,6 @@ test('http2 sse removes request and session timeout test', async (t) => {
 
   const { statusCode } = await got.get(`http://localhost:${instance.server.address().port}/`, { retry: 0 })
   t.equal(statusCode, 200)
+  instance.close()
+  target.close()
 })

package/test/http2-unix-socket.test.js

@@ -9,7 +9,7 @@ test('throw an error if http2 is used with a Unix socket destination', async t =
 
   const instance = Fastify()
 
-  await t.rejects(instance.register(From, {
+  await t.rejects(async () => instance.register(From, {
     base: 'unix+http://localhost:1337',
     http2: { requestTimeout: 100 }
   }), new Error('Unix socket destination is not supported when http2 is true'))

package/test/https-agents.test.js

@@ -3,12 +3,12 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
-const https = require('https')
+const http = require('node:http')
+const https = require('node:https')
 const get = require('simple-get').concat
 
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 const certs = {
   key: fs.readFileSync(path.join(__dirname, 'fixtures', 'fastify.key')),
   cert: fs.readFileSync(path.join(__dirname, 'fixtures', 'fastify.cert'))

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

@@ -3,11 +3,11 @@
 const { test } = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const https = require('https')
+const https = require('node:https')
 const get = require('simple-get').concat
 
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 const certs = {
   key: fs.readFileSync(path.join(__dirname, 'fixtures', 'fastify.key')),
   cert: fs.readFileSync(path.join(__dirname, 'fixtures', 'fastify.cert'))

package/test/method.test.js

@@ -0,0 +1,70 @@
+'use strict'
+
+const t = require('tap')
+const Fastify = require('fastify')
+const From = require('..')
+const http = require('node:http')
+const get = require('simple-get').concat
+
+const instance = Fastify()
+
+t.plan(9)
+t.teardown(instance.close.bind(instance))
+
+const bodyString = JSON.stringify({ hello: 'world' })
+
+const parsedLength = Buffer.byteLength(bodyString)
+
+const target = http.createServer((req, res) => {
+  t.pass('request proxied')
+  t.equal(req.method, 'POST')
+  t.equal(req.headers['content-type'], 'application/json')
+  t.same(req.headers['content-length'], parsedLength)
+  let data = ''
+  req.setEncoding('utf8')
+  req.on('data', (d) => {
+    data += d
+  })
+  req.on('end', () => {
+    t.same(JSON.parse(data), { hello: 'world' })
+    res.statusCode = 200
+    res.setHeader('content-type', 'application/json')
+    res.end(JSON.stringify({ something: 'else' }))
+  })
+})
+
+instance.patch('/', (request, reply) => {
+  reply.from(`http://localhost:${target.address().port}`, { method: 'POST' })
+})
+
+t.teardown(target.close.bind(target))
+
+target.listen({ port: 0 }, (err) => {
+  t.error(err)
+
+  instance.addContentTypeParser('application/json', function (req, payload, done) {
+    done(null, payload)
+  })
+
+  instance.register(From, {
+    base: `http://localhost:${target.address().port}`,
+    undici: true
+  })
+
+  instance.listen({ port: 0 }, (err) => {
+    t.error(err)
+
+    get({
+      url: `http://localhost:${instance.server.address().port}`,
+      method: 'PATCH',
+      headers: {
+        'content-type': 'application/json'
+      },
+      body: bodyString
+    }, (err, res, data) => {
+      t.error(err)
+      const parsed = JSON.parse(data)
+      t.same(parsed, { something: 'else' })
+    })
+  })
+})

package/test/modifyCoreObjects-false.test.js

@@ -3,7 +3,7 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
 
 const instance = Fastify({ modifyCoreObjects: false })

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

@@ -3,7 +3,7 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
 
 const instance = Fastify()

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

@@ -3,7 +3,7 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
 
 const instance = Fastify()

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

@@ -3,9 +3,9 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
-const Readable = require('stream').Readable
+const Readable = require('node:stream').Readable
 
 const instance = Fastify()
 instance.register(From)

package/test/on-error.test.js

@@ -8,21 +8,19 @@ const FakeTimers = require('@sinonjs/fake-timers')
 
 const clock = FakeTimers.createClock()
 
-t.autoend(false)
+t.test('on-error', async (t) => {
+  const target = Fastify()
+  t.teardown(target.close.bind(target))
 
-const target = Fastify()
-t.teardown(target.close.bind(target))
+  target.get('/', (request, reply) => {
+    t.pass('request arrives')
 
-target.get('/', (request, reply) => {
-  t.pass('request arrives')
-
-  clock.setTimeout(() => {
-    reply.status(200).send('hello world')
-    t.end()
-  }, 1000)
-})
+    clock.setTimeout(() => {
+      reply.status(200).send('hello world')
+      t.end()
+    }, 1000)
+  })
 
-async function main () {
   await target.listen({ port: 0 })
 
   const instance = Fastify()
@@ -63,6 +61,4 @@ async function main () {
   }
 
   t.fail()
-}
-
-main()
+})

package/test/onResponse.test.js

@@ -3,13 +3,13 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
 
 const instance = Fastify()
 instance.register(From)
 
-t.plan(8)
+t.plan(9)
 t.teardown(instance.close.bind(instance))
 
 const target = http.createServer((req, res) => {
@@ -22,8 +22,9 @@ const target = http.createServer((req, res) => {
 instance.get('/', (request1, reply) => {
   reply.from(`http://localhost:${target.address().port}`, {
     onResponse: (request2, reply, res) => {
+      t.equal(res.statusCode, 200)
       t.equal(request1.raw, request2.raw)
-      reply.send(res)
+      reply.send(res.stream)
     }
   })
 })

package/test/padded-body.test.js

@@ -3,7 +3,7 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
 
 const instance = Fastify()

package/test/post-formbody.test.js

@@ -3,7 +3,7 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
 
 const instance = Fastify()

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

@@ -3,7 +3,7 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
 
 const instance = Fastify()

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

@@ -3,9 +3,9 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
-const { parse } = require('querystring')
+const { parse } = require('node:querystring')
 
 const instance = Fastify()
 instance.register(From, {

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

@@ -3,9 +3,9 @@
 const test = require('tap').test
 const Fastify = require('fastify')
 const From = require('../index')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
-const { parse } = require('querystring')
+const { parse } = require('node:querystring')
 
 test('with explicitly set content-type application/octet-stream', t => {
   const instance = Fastify()

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

@@ -3,7 +3,7 @@
 const { test } = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const got = require('got')
 
 function createTargetServer (withRetryAfterHeader, stopAfter = 1) {

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

@@ -0,0 +1,186 @@
+'use strict'
+
+const { test } = require('tap')
+const Fastify = require('fastify')
+const From = require('..')
+const http = require('node:http')
+const got = require('got')
+
+function serverWithCustomError (stopAfter, statusCodeToFailOn, closeSocket) {
+  let requestCount = 0
+  return http.createServer((req, res) => {
+    if (requestCount++ < stopAfter) {
+      if (closeSocket) req.socket.end()
+      res.statusCode = statusCodeToFailOn
+      res.setHeader('Content-Type', 'text/plain')
+      return res.end('This Service is Unavailable')
+    } else {
+      res.statusCode = 205
+      res.setHeader('Content-Type', 'text/plain')
+      return res.end(`Hello World ${requestCount}!`)
+    }
+  })
+}
+
+async function setupServer (t, fromOptions = {}, statusCodeToFailOn = 500, stopAfter = 4, closeSocket = false) {
+  const target = serverWithCustomError(stopAfter, statusCodeToFailOn, closeSocket)
+
+  await target.listen({ port: 0 })
+  t.teardown(target.close.bind(target))
+
+  const instance = Fastify()
+  instance.register(From, {
+    base: `http://localhost:${target.address().port}`
+  })
+
+  instance.get('/', (request, reply) => {
+    reply.from(`http://localhost:${target.address().port}`, fromOptions)
+  })
+
+  t.teardown(instance.close.bind(instance))
+  await instance.listen({ port: 0 })
+
+  return {
+    instance
+  }
+}
+
+test('a 500 status code with no custom handler should fail', async (t) => {
+  const { instance } = await setupServer(t)
+
+  let errorMessage
+  try {
+    await got.get(`http://localhost:${instance.server.address().port}`, { retry: 3 })
+  } catch (error) {
+    errorMessage = error.message
+  }
+
+  t.equal(errorMessage, 'Response code 500 (Internal Server Error)')
+})
+
+test("a server 500's with a custom handler and should revive", async (t) => {
+  const customRetryLogic = ({ req, res, err, attempt, getDefaultDelay }) => {
+    const defaultDelay = getDefaultDelay()
+    if (defaultDelay) return defaultDelay
+
+    if (res && res.statusCode === 500 && req.method === 'GET') {
+      return 0.1
+    }
+    return null
+  }
+
+  const { instance } = await setupServer(t, { retryDelay: customRetryLogic })
+
+  const res = await got.get(`http://localhost:${instance.server.address().port}`, { retry: 5 })
+
+  t.equal(res.headers['content-type'], 'text/plain')
+  t.equal(res.statusCode, 205)
+  t.equal(res.body.toString(), 'Hello World 5!')
+})
+
+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 }) => {
+    if (res && res.statusCode === 500 && req.method === 'GET') {
+      return 0
+    }
+    return null
+  }
+
+  const { instance } = await setupServer(t, { retryDelay: customRetryLogic }, 501)
+
+  let errorMessage
+  try {
+    await got.get(`http://localhost:${instance.server.address().port}`, { retry: 5 })
+  } catch (error) {
+    errorMessage = error.message
+  }
+
+  t.equal(errorMessage, 'Response code 501 (Not Implemented)')
+})
+
+test('custom retry delay functions can invoke the default delay', async (t) => {
+  const customRetryLogic = ({ req, res, err, attempt, getDefaultDelay }) => {
+    // registering the default retry logic for non 500 errors if it occurs
+    const defaultDelay = getDefaultDelay()
+    if (defaultDelay) return defaultDelay
+
+    if (res && res.statusCode === 500 && req.method === 'GET') {
+      return 0.1
+    }
+
+    return null
+  }
+
+  const { instance } = await setupServer(t, { retryDelay: customRetryLogic }, 500)
+
+  const res = await got.get(`http://localhost:${instance.server.address().port}`, { retry: 5 })
+
+  t.equal(res.headers['content-type'], 'text/plain')
+  t.equal(res.statusCode, 205)
+  t.equal(res.body.toString(), 'Hello World 5!')
+})
+
+test('custom retry delay function inspects the err paramater', async (t) => {
+  const customRetryLogic = ({ req, res, err, attempt, getDefaultDelay }) => {
+    if (err && (err.code === 'UND_ERR_SOCKET' || err.code === 'ECONNRESET')) {
+      return 0.1
+    }
+    return null
+  }
+
+  const { instance } = await setupServer(t, { retryDelay: customRetryLogic }, 500, 4, true)
+
+  const res = await got.get(`http://localhost:${instance.server.address().port}`, { retry: 5 })
+
+  t.equal(res.headers['content-type'], 'text/plain')
+  t.equal(res.statusCode, 205)
+  t.equal(res.body.toString(), 'Hello World 5!')
+})
+
+test('we can exceed our retryCount and introspect attempts independently', async (t) => {
+  const attemptCounter = []
+
+  const customRetryLogic = ({ req, res, err, attempt, getDefaultDelay }) => {
+    attemptCounter.push(attempt)
+
+    if (err && (err.code === 'UND_ERR_SOCKET' || err.code === 'ECONNRESET')) {
+      return 0.1
+    }
+
+    return null
+  }
+
+  const { instance } = await setupServer(t, { retryDelay: customRetryLogic }, 500, 4, true)
+
+  const res = await got.get(`http://localhost:${instance.server.address().port}`, { retry: 5 })
+
+  t.match(attemptCounter, [0, 1, 2, 3, 4])
+  t.equal(res.headers['content-type'], 'text/plain')
+  t.equal(res.statusCode, 205)
+  t.equal(res.body.toString(), 'Hello World 5!')
+})
+
+test('we handle our retries based on the retryCount', async (t) => {
+  const attemptCounter = []
+  const customRetryLogic = ({ req, res, err, attempt, getDefaultDelay, retriesCount }) => {
+    if (retriesCount < attempt) {
+      return null
+    }
+
+    if (res && res.statusCode === 500 && req.method === 'GET') {
+      attemptCounter.push(attempt)
+      return 0.1
+    }
+    return null
+  }
+
+  const { instance } = await setupServer(t, { retryDelay: customRetryLogic, retriesCount: 2 }, 500)
+
+  const res = await got.get(`http://localhost:${instance.server.address().port}`, { retry: 5 })
+
+  t.match(attemptCounter, [0, 1])
+  t.equal(res.headers['content-type'], 'text/plain')
+  t.equal(res.statusCode, 205)
+  t.equal(res.body.toString(), 'Hello World 5!')
+})

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

@@ -3,7 +3,7 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
 
 const instance = Fastify()

package/test/rewrite-headers.test.js

@@ -3,7 +3,7 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
 
 const instance = Fastify()

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

@@ -3,7 +3,7 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
 
 const instance = Fastify()

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

@@ -3,7 +3,7 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
 
 const instance = Fastify()

package/test/transform-body.test.js

@@ -3,9 +3,9 @@
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
-const Transform = require('stream').Transform
+const Transform = require('node:stream').Transform
 
 const instance = Fastify()
 instance.register(From)
@@ -26,7 +26,7 @@ instance.get('/', (request, reply) => {
   reply.from(`http://localhost:${target.address().port}`, {
     onResponse: (request, reply, res) => {
       reply.send(
-        res.pipe(
+        res.stream.pipe(
           new Transform({
             transform: function (chunk, enc, cb) {
               this.push(chunk.toString().toUpperCase())