@fastify/reply-from 9.1.0 → 9.3.0

package/README.md

@@ -246,9 +246,9 @@ fastify.register(FastifyReplyFrom, {
 
 ---
 
-#### `destoryAgent`
+#### `destroyAgent`
 
-If set to `true`, it will destory all agents when the Fastify is closed.
+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`

package/lib/request.js

@@ -22,10 +22,17 @@ function shouldUseUndici (opts) {
   return true
 }
 
+function isRequestable (obj) {
+  return obj !== null &&
+    typeof obj === 'object' &&
+    typeof obj.request === 'function'
+}
+
 function isUndiciInstance (obj) {
   return obj instanceof undici.Pool ||
     obj instanceof undici.Client ||
-    obj instanceof undici.Dispatcher
+    obj instanceof undici.Dispatcher ||
+    isRequestable(obj)
 }
 
 function buildRequest (opts) {

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.1.0",
+  "version": "9.3.0",
   "description": "forward your HTTP request to another server, for fastify",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -31,7 +31,7 @@
     "@fastify/formbody": "^7.4.0",
     "@fastify/multipart": "^7.4.0",
     "@fastify/pre-commit": "^2.0.2",
-    "@sinonjs/fake-timers": "^10.0.0",
+    "@sinonjs/fake-timers": "^11.0.0",
     "@types/node": "^20.1.4",
     "@types/tap": "^15.0.7",
     "fastify": "^4.0.2",

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/undici-custom-dispatcher.test.js

@@ -0,0 +1,73 @@
+'use strict'
+
+const { test } = require('tap')
+const undici = require('undici')
+const Fastify = require('fastify')
+const From = require('..')
+
+class CustomDispatcher {
+  constructor (...args) {
+    this._dispatcher = new undici.Pool(...args)
+  }
+
+  request (...args) {
+    return this._dispatcher.request(...args)
+  }
+
+  close (...args) {
+    return this._dispatcher.close(...args)
+  }
+
+  destroy (...args) {
+    return this._dispatcher.destroy(...args)
+  }
+}
+
+test('use a custom instance of \'undici\'', async t => {
+  const target = Fastify({
+    keepAliveTimeout: 1
+  })
+
+  target.get('/', (req, reply) => {
+    t.pass('request proxied')
+
+    reply.headers({
+      'Content-Type': 'text/plain',
+      'x-my-header': 'hello!'
+    })
+
+    reply.statusCode = 205
+    reply.send('hello world')
+  })
+
+  await target.listen({ port: 3001 })
+  t.teardown(async () => {
+    await target.close()
+  })
+
+  const instance = Fastify({
+    keepAliveTimeout: 1
+  })
+
+  instance.register(From, {
+    undici: new CustomDispatcher('http://localhost:3001')
+  })
+
+  instance.get('/', (request, reply) => {
+    reply.from('http://myserver.local')
+  })
+
+  await instance.listen({ port: 0 })
+  t.teardown(async () => {
+    await instance.close()
+  })
+
+  const res = await undici.request(`http://localhost:${instance.server.address().port}`)
+
+  t.equal(res.headers['content-type'], 'text/plain')
+  t.equal(res.headers['x-my-header'], 'hello!')
+  t.equal(res.statusCode, 205)
+
+  const data = await res.body.text()
+  t.equal(data, 'hello world')
+})