@fastify/reply-from 8.4.1 → 8.4.3

package/index.js

@@ -74,7 +74,7 @@ const fastifyReplyFrom = fp(function from (fastify, opts, next) {
     }
 
     const sourceHttp2 = req.httpVersionMajor === 2
-    const headers = sourceHttp2 ? filterPseudoHeaders(req.headers) : req.headers
+    const headers = sourceHttp2 ? filterPseudoHeaders(req.headers) : { ...req.headers }
     headers.host = url.host
     const qs = getQueryString(url.search, req.url, opts)
     let body = ''

package/lib/request.js

@@ -5,7 +5,7 @@ const querystring = require('querystring')
 const eos = require('end-of-stream')
 const pump = require('pump')
 const undici = require('undici')
-const { patchUndiciHeaders, stripHttp1ConnectionHeaders } = require('./utils')
+const { stripHttp1ConnectionHeaders } = require('./utils')
 const http2 = require('http2')
 
 const {
@@ -158,7 +158,7 @@ function buildRequest (opts) {
       // using delete, otherwise it will render as an empty string
       delete res.headers['transfer-encoding']
 
-      done(null, { statusCode: res.statusCode, headers: patchUndiciHeaders(res.headers), stream: res.body })
+      done(null, { statusCode: res.statusCode, headers: res.headers, stream: res.body })
     })
   }
 

package/lib/utils.js

@@ -12,31 +12,6 @@ function filterPseudoHeaders (headers) {
   return dest
 }
 
-// http requires the header to be encoded with latin1
-// undici will convert the latin1 buffer to utf8
-// https://github.com/nodejs/undici/blob/2b260c997ad4efe4ed2064b264b4b546a59e7a67/lib/core/util.js#L216-L229
-// after chaining, the header will be serialised using wrong encoding
-// Buffer.from('', 'latin1').toString('utf8') applied
-//
-// in order to persist the encoding, always encode it
-// back to latin1
-function patchUndiciHeaders (headers) {
-  const headersKeys = Object.keys(headers)
-  const dist = {}
-
-  let header
-  let i
-
-  for (i = 0; i < headersKeys.length; i++) {
-    header = headersKeys[i]
-    if (header.charCodeAt(0) !== 58) { // fast path for indexOf(':') === 0
-      dist[header] = Buffer.from(headers[header]).toString('latin1')
-    }
-  }
-
-  return dist
-}
-
 function copyHeaders (headers, reply) {
   const headersKeys = Object.keys(headers)
 
@@ -99,7 +74,6 @@ function buildURL (source, reqBase) {
 }
 
 module.exports = {
-  patchUndiciHeaders,
   copyHeaders,
   stripHttp1ConnectionHeaders,
   filterPseudoHeaders,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/reply-from",
-  "version": "8.4.1",
+  "version": "8.4.3",
   "description": "forward your HTTP request to another server, for fastify",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -55,7 +55,7 @@
     "fastify-plugin": "^4.0.0",
     "pump": "^3.0.0",
     "tiny-lru": "^10.0.0",
-    "undici": "^5.5.1"
+    "undici": "^5.19.1"
   },
   "pre-commit": [
     "lint",

package/test/host-header.js

@@ -18,7 +18,13 @@ test('hostname', async (t) => {
     })
 
   instance.get('*', (request, reply) => {
-    reply.from()
+    reply.from(null, {
+      rewriteRequestHeaders: (originalReq, headers) => {
+        t.equal(headers.host, 'httpbin.org')
+        t.equal(originalReq.headers.host, `localhost:${instance.server.address().port}`)
+        return headers
+      }
+    })
   })
 
   instance.register(From, {