@fastify/reply-from 9.0.2 → 9.2.0

package/README.md

@@ -246,6 +246,15 @@ fastify.register(FastifyReplyFrom, {
 
 ---
 
+#### `destroyAgent`
+
+If set to `true`, it will destroy all agents when the Fastify is closed.
+If set to `false`, it will not destroy the agents.
+
+By Default: `false`
+
+---
+
 #### `maxRetriesOn503`
 
 This plugin will always retry on `GET` requests that returns 503 errors, _unless_ `retryMethods` does not contain `GET`.

package/index.js

@@ -39,7 +39,8 @@ const fastifyReplyFrom = fp(function from (fastify, opts, next) {
     http2: opts.http2,
     base,
     undici: opts.undici,
-    globalAgent: opts.globalAgent
+    globalAgent: opts.globalAgent,
+    destroyAgent: opts.destroyAgent
   })
   if (requestBuilt instanceof Error) {
     next(requestBuilt)

package/lib/request.js

@@ -42,6 +42,7 @@ function buildRequest (opts) {
   const baseUrl = opts.base && new URL(opts.base).origin
   const undiciOpts = opts.undici || {}
   const globalAgent = opts.globalAgent
+  const destroyAgent = opts.destroyAgent
   let http2Client
   let undiciAgent
   let undiciInstance
@@ -85,7 +86,7 @@ function buildRequest (opts) {
   }
 
   function close () {
-    if (globalAgent) {
+    if (globalAgent || destroyAgent === false) {
       return
     }
 

package/lib/utils.js

@@ -57,6 +57,12 @@ function stripHttp1ConnectionHeaders (headers) {
 // issue ref: https://github.com/fastify/fast-proxy/issues/42
 function buildURL (source, reqBase) {
   let baseOrigin = reqBase ? new URL(reqBase).href : undefined
+
+  // To make sure we don't accidentally override the base path
+  if (baseOrigin && source.length > 1 && source[0] === '/' && source[1] === '/') {
+    source = '.' + source
+  }
+
   const dest = new URL(source, reqBase)
 
   // if base is specified, source url should not override it

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/reply-from",
-  "version": "9.0.2",
+  "version": "9.2.0",
   "description": "forward your HTTP request to another server, for fastify",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -41,6 +41,7 @@
     "msgpack5": "^6.0.1",
     "nock": "^13.2.6",
     "proxyquire": "^2.1.3",
+    "semver": "^7.5.1",
     "simple-get": "^4.0.1",
     "snazzy": "^9.0.0",
     "split2": "^4.1.0",

package/test/build-url.test.js

@@ -42,12 +42,19 @@ test('should handle default port in base', (t) => {
   t.equal(url.href, 'https://localhost/hi')
 })
 
+test('should append instead of override base', (t) => {
+  t.plan(2)
+  let url = buildURL('//10.0.0.10/hi', 'http://localhost')
+  t.equal(url.href, 'http://localhost//10.0.0.10/hi')
+
+  url = buildURL('//httpbin.org/hi', 'http://localhost')
+  t.equal(url.href, 'http://localhost//httpbin.org/hi')
+})
+
 const errorInputs = [
-  { source: '//10.0.0.10/hi', base: 'http://localhost' },
   { source: 'http://10.0.0.10/hi', base: 'http://localhost' },
   { source: 'https://10.0.0.10/hi', base: 'http://localhost' },
   { source: 'blah://10.0.0.10/hi', base: 'http://localhost' },
-  { source: '//httpbin.org/hi', base: 'http://localhost' },
   { source: 'urn:foo:bar', base: 'http://localhost' },
   { source: 'http://localhost/private', base: 'http://localhost/exposed/' },
   { source: 'http://localhost/exposed-extra', base: 'http://localhost/exposed' },

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

@@ -5,6 +5,12 @@ const Fastify = require('fastify')
 const From = require('..')
 const http = require('http')
 const get = require('simple-get').concat
+const semver = require('semver')
+
+if (semver.gte(process.version, '20.2.0')) {
+  t.comment('skip this test on node >= 20.2.0 as it is current broken')
+  process.exit(0)
+}
 
 const instance = Fastify()
 

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

@@ -0,0 +1,29 @@
+'use strict'
+
+const { test } = require('tap')
+const Fastify = require('fastify')
+const undici = require('undici')
+const From = require('..')
+
+test('destroyAgent false', async (t) => {
+  const mockAgent = new undici.Agent()
+  mockAgent.destroy = () => {
+    t.fail()
+  }
+  const instance = Fastify()
+
+  t.teardown(instance.close.bind(instance))
+
+  instance.get('/', (request, reply) => {
+    reply.from()
+  })
+
+  instance.register(From, {
+    base: 'http://localhost:4242',
+    undici: mockAgent,
+    destroyAgent: false
+  })
+
+  await instance.ready()
+  await instance.close()
+})

package/types/index.d.ts

@@ -94,6 +94,7 @@ declare namespace fastifyReplyFrom {
     maxRetriesOn503?: number;
     disableRequestLogging?: boolean;
     globalAgent?: boolean;
+    destroyAgent?: boolean;
   }
 
   export const fastifyReplyFrom: FastifyReplyFrom

package/types/index.test-d.ts

@@ -45,6 +45,7 @@ const fullOptions: FastifyReplyFromOptions = {
   maxRetriesOn503: 10,
   disableRequestLogging: false,
   globalAgent: false,
+  destroyAgent: true
 };
 tap.autoend(false);