@fastify/reply-from 10.0.0 → 11.0.0

package/lib/utils.js

@@ -1,3 +1,5 @@
+'use strict'
+
 function filterPseudoHeaders (headers) {
   const dest = {}
   const headersKeys = Object.keys(headers)
@@ -57,6 +59,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,12 +1,13 @@
 {
   "name": "@fastify/reply-from",
-  "version": "10.0.0",
+  "version": "11.0.0",
   "description": "forward your HTTP request to another server, for fastify",
   "main": "index.js",
+  "type": "commonjs",
   "types": "types/index.d.ts",
   "scripts": {
     "lint": "standard | snazzy",
-    "lint:fix": "standard --fix",
+    "lint:fix": "standard --fix | snazzy",
     "test": "npm run test:unit && npm run test:typescript",
     "test:unit": "tap",
     "test:typescript": "tsd"
@@ -28,34 +29,36 @@
   },
   "homepage": "https://github.com/fastify/fastify-reply-from#readme",
   "devDependencies": {
-    "@fastify/formbody": "^7.4.0",
-    "@fastify/multipart": "^7.4.0",
-    "@fastify/pre-commit": "^2.0.2",
-    "@sinonjs/fake-timers": "^10.0.0",
-    "@types/node": "^20.1.4",
-    "@types/tap": "^15.0.7",
-    "fastify": "^4.0.2",
+    "@fastify/formbody": "^8.0.0",
+    "@fastify/multipart": "^9.0.0",
+    "@fastify/pre-commit": "^2.1.0",
+    "@sinonjs/fake-timers": "^13.0.1",
+    "@types/node": "^22.0.0",
+    "@types/tap": "^15.0.11",
+    "fastify": "^5.0.0-alpha.4",
     "form-data": "^4.0.0",
-    "got": "^11.8.2",
+    "got": "^11.8.6",
     "h2url": "^0.2.0",
-    "msgpack5": "^6.0.1",
-    "nock": "^13.2.6",
+    "msgpack5": "^6.0.2",
+    "nock": "^13.5.4",
+    "proxy": "^2.1.1",
     "proxyquire": "^2.1.3",
+    "semver": "^7.6.0",
     "simple-get": "^4.0.1",
     "snazzy": "^9.0.0",
-    "split2": "^4.1.0",
-    "standard": "^17.0.0",
-    "tap": "^16.2.0",
-    "tsd": "^0.28.0"
+    "split2": "^4.2.0",
+    "standard": "^17.1.0",
+    "tap": "^18.7.2",
+    "tsd": "^0.31.0"
   },
   "dependencies": {
-    "@fastify/error": "^3.0.0",
+    "@fastify/error": "^4.0.0",
     "end-of-stream": "^1.4.4",
-    "fast-querystring": "^1.0.0",
-    "fastify-plugin": "^4.0.0",
-    "pump": "^3.0.0",
-    "tiny-lru": "^11.0.0",
-    "undici": "^5.19.1"
+    "fast-content-type-parse": "^2.0.0",
+    "fast-querystring": "^1.1.2",
+    "fastify-plugin": "^4.5.1",
+    "toad-cache": "^3.7.0",
+    "undici": "^6.11.1"
   },
   "pre-commit": [
     "lint",

package/test/async-route-handler.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/base-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/base-querystring.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/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/core-with-path-in-base.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/custom-undici-instance.test.js

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

package/test/disable-request-logging.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 split = require('split2')
 

package/test/fastify-multipart-incompatibility.test.js

@@ -1,12 +1,12 @@
 'use strict'
 
-const fs = require('fs')
-const path = require('path')
+const fs = require('node:fs')
+const path = require('node:path')
 const t = require('tap')
 const Fastify = require('fastify')
 const From = require('..')
 const Multipart = require('@fastify/multipart')
-const http = require('http')
+const http = require('node:http')
 const get = require('simple-get').concat
 const FormData = require('form-data')
 

package/test/fix-GHSA-v2v2-hph8-q5xp.test.js

@@ -0,0 +1,47 @@
+'use strict'
+
+const t = require('tap')
+const fastify = require('fastify')
+const get = require('simple-get').concat
+const From = require('..')
+
+const upstream = fastify()
+t.teardown(upstream.close.bind(upstream))
+t.plan(4)
+
+upstream.post('/test', async (request, reply) => {
+  if (typeof request.body === 'object') {
+    return 'not ok'
+  }
+  return 'ok'
+})
+
+upstream.listen({ port: 0 }, function (err) {
+  t.error(err)
+
+  const app = fastify()
+  app.register(From)
+  t.teardown(app.close.bind(app))
+
+  app.post('/test', (request, reply) => {
+    if (request.body.method === 'invalid_method') {
+      return reply.code(400).send({ message: 'payload contains invalid method' })
+    }
+    reply.from(`http://127.0.0.1:${upstream.server.address().port}/test`)
+  })
+
+  app.listen({ port: 0 }, function (err) {
+    t.error(err)
+
+    get({
+      url: `http://127.0.0.1:${app.server.address().port}/test`,
+      headers: { 'content-type': 'application/json ; charset=utf-8' },
+      // eslint-disable-next-line no-useless-escape
+      body: '"{\\\"method\\\":\\\"invalid_method\\\"}"',
+      method: 'POST'
+    }, (err, res, data) => {
+      t.error(err)
+      t.equal(data.toString(), 'ok')
+    })
+  })
+})

package/test/full-delete-http2.test.js

@@ -0,0 +1,52 @@
+'use strict'
+
+const { test } = require('tap')
+const Fastify = require('fastify')
+const From = require('..')
+const got = require('got')
+
+test('http -> http2', async function (t) {
+  const instance = Fastify()
+
+  t.teardown(instance.close.bind(instance))
+
+  const target = Fastify({
+    http2: true
+  })
+
+  target.delete('/', (request, reply) => {
+    t.pass('request proxied')
+    reply.code(200).header('x-my-header', 'hello!').send({
+      hello: 'world'
+    })
+  })
+
+  instance.delete('/', (request, reply) => {
+    reply.from()
+  })
+
+  t.teardown(target.close.bind(target))
+
+  await target.listen({ port: 0 })
+
+  instance.register(From, {
+    base: `http://localhost:${target.server.address().port}`,
+    http2: true
+  })
+
+  await instance.listen({ port: 0 })
+
+  const { headers, body, statusCode } = await got(
+    `http://localhost:${instance.server.address().port}`,
+    {
+      method: 'DELETE',
+      responseType: 'json'
+    }
+  )
+  t.equal(statusCode, 200)
+  t.equal(headers['x-my-header'], 'hello!')
+  t.match(headers['content-type'], /application\/json/)
+  t.same(body, { hello: 'world' })
+  instance.close()
+  target.close()
+})

package/test/full-get-test.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/full-https-get.test.js

@@ -3,10 +3,10 @@
 const t = 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/full-post-extended-content-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')
 
 const instance = Fastify()

package/test/full-post-http2.test.js

@@ -46,4 +46,6 @@ test('http -> http2', async function (t) {
   t.equal(headers['x-my-header'], 'hello!')
   t.match(headers['content-type'], /application\/json/)
   t.same(body, { hello: 'world' })
+  instance.close()
+  target.close()
 })

package/test/full-post-stream-core.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/full-post-stream.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/full-post.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/full-querystring-rewrite-option-complex.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/full-querystring-rewrite-option-function-request.test.js

@@ -0,0 +1,58 @@
+'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 querystring = require('node:querystring')
+
+const instance = Fastify()
+
+instance.addHook('preHandler', (request, reply, done) => {
+  request.addedVal = 'test'
+  done()
+})
+
+t.plan(10)
+t.teardown(instance.close.bind(instance))
+
+const target = http.createServer((req, res) => {
+  t.pass('request proxied')
+  t.equal(req.method, 'GET')
+  t.equal(req.url, '/world?q=test')
+  res.statusCode = 205
+  res.setHeader('Content-Type', 'text/plain')
+  res.setHeader('x-my-header', 'hello!')
+  res.end('hello world')
+})
+
+instance.get('/hello', (request, reply) => {
+  reply.from(`http://localhost:${target.address().port}/world?a=b`, {
+    queryString (search, reqUrl, request) {
+      return querystring.stringify({ q: request.addedVal })
+    }
+  })
+})
+
+t.teardown(target.close.bind(target))
+
+target.listen({ port: 0 }, (err) => {
+  t.error(err)
+
+  instance.register(From)
+
+  instance.listen({ port: 0 }, (err) => {
+    t.error(err)
+
+    get(`http://localhost:${instance.server.address().port}/hello?a=b`, (err, res, data) => {
+      t.error(err)
+      t.equal(res.headers['content-type'], 'text/plain')
+      t.equal(res.headers['x-my-header'], 'hello!')
+      t.equal(res.statusCode, 205)
+      t.equal(data.toString(), 'hello world')
+      instance.close()
+      target.close()
+    })
+  })
+})

package/test/full-querystring-rewrite-option-function.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 querystring = require('querystring')
+const querystring = require('node:querystring')
 
 const instance = Fastify()
 

package/test/full-querystring-rewrite-option.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/full-querystring-rewrite-string.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/full-querystring-rewrite.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/full-querystring.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/full-rewrite-body-content-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 msgpack = require('msgpack5')()
 

package/test/full-rewrite-body-http.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/full-rewrite-body-to-empty-string.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/full-rewrite-body-to-null.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/full-rewrite-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/get-upstream-http.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/get-upstream-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/get-upstream-undici.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/get-with-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/head-with-body.test.js

@@ -3,8 +3,14 @@
 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 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/http-agents.test.js

@@ -3,8 +3,8 @@
 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 instance = Fastify()

package/test/http-global-agent.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 get = require('simple-get').concat
 
 test('http global agent is used, but not destroyed', async (t) => {

package/test/http-http2.test.js

@@ -43,6 +43,8 @@ test('http -> http2', async (t) => {
     t.equal(err.response.headers['x-my-header'], 'hello!')
     t.match(err.response.headers['content-type'], /application\/json/)
     t.same(JSON.parse(err.response.body), { hello: 'world' })
+    instance.close()
+    target.close()
     return
   }
 

package/test/http-retry.test.js

@@ -7,7 +7,7 @@ const { test } = require('tap')
 
 let retryNum = 1
 
-const target = require('http').createServer(function (req, res) {
+const target = require('node:http').createServer(function (req, res) {
   if (retryNum % 2 !== 0) {
     req.socket.destroy()
   } else {

package/test/http-timeout.test.js

@@ -9,8 +9,6 @@ const FakeTimers = require('@sinonjs/fake-timers')
 const clock = FakeTimers.createClock()
 
 test('http request timeout', async (t) => {
-  t.autoend(false)
-
   const target = Fastify()
   t.teardown(target.close.bind(target))