@fastify/reply-from 9.5.0 → 9.7.0

package/README.md

@@ -281,6 +281,7 @@ If a `handler` is passed to the `retryDelay` object the onus is on the client to
 - `res` is the raw response returned by the underlying agent (if available) __Note__: this object is not a Fastify response, but instead the low-level response from the agent. This property may be null if no response was obtained at all, like from a connection reset or timeout.
 - `attempt` in the object callback refers to the current retriesAttempt number. You are given the freedom to use this in concert with the retryCount property set to handle retries
 - `getDefaultRetry` refers to the default retry handler. If this callback returns not null and you wish to handle those case of errors simply invoke it as done below.
+- `retriesCount` refers to the retriesCount property a client passes to reply-from. Note if the client does not explicitly set this value it will default to 0. The objective value here is to avoid hard-coding and seeing the retriesCount set. It is your perogative to ensure that you ensure the value here is as you wish (and not `0` if not intended to be as a result of a lack of not setting it).
 
 Given example
 

package/index.js

@@ -3,6 +3,7 @@
 const fp = require('fastify-plugin')
 const { lru } = require('tiny-lru')
 const querystring = require('fast-querystring')
+const fastContentTypeParse = require('fast-content-type-parse')
 const Stream = require('node:stream')
 const buildRequest = require('./lib/request')
 const {
@@ -107,15 +108,13 @@ const fastifyReplyFrom = fp(function from (fastify, opts, next) {
         body = this.request.body
       } else {
         // Per RFC 7231 §3.1.1.5 if this header is not present we MAY assume application/octet-stream
-        const contentType = req.headers['content-type'] || 'application/octet-stream'
-        // detect if body should be encoded as JSON
-        // supporting extended content-type header formats:
-        // - https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type
-        const lowerCaseContentType = contentType.toLowerCase()
-        const plainContentType = lowerCaseContentType.indexOf(';') > -1
-          ? lowerCaseContentType.slice(0, lowerCaseContentType.indexOf(';'))
-          : lowerCaseContentType
-        const shouldEncodeJSON = contentTypesToEncode.has(plainContentType)
+        let contentType = 'application/octet-stream'
+        if (req.headers['content-type']) {
+          const plainContentType = fastContentTypeParse.parse(req.headers['content-type'])
+          contentType = plainContentType.type
+        }
+
+        const shouldEncodeJSON = contentTypesToEncode.has(contentType)
         // transparently support JSON encoding
         body = shouldEncodeJSON ? JSON.stringify(this.request.body) : this.request.body
         // update origin request headers after encoding
@@ -164,7 +163,7 @@ const fastifyReplyFrom = fp(function from (fastify, opts, next) {
 
     if (retryDelay) {
       requestImpl = createRequestRetry(request, this, (req, res, err, retries) => {
-        return retryDelay({ err, req, res, attempt: retries, getDefaultDelay })
+        return retryDelay({ err, req, res, attempt: retries, getDefaultDelay, retriesCount })
       })
     } else {
       requestImpl = createRequestRetry(request, this, getDefaultDelay)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/reply-from",
-  "version": "9.5.0",
+  "version": "9.7.0",
   "description": "forward your HTTP request to another server, for fastify",
   "main": "index.js",
   "type": "commonjs",
@@ -53,6 +53,7 @@
   "dependencies": {
     "@fastify/error": "^3.0.0",
     "end-of-stream": "^1.4.4",
+    "fast-content-type-parse": "^1.1.0",
     "fast-querystring": "^1.0.0",
     "fastify-plugin": "^4.0.0",
     "pump": "^3.0.0",

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/retry-with-a-custom-handler.test.js

@@ -160,3 +160,27 @@ test('we can exceed our retryCount and introspect attempts independently', async
   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!')
+})