@fastify/reply-from 12.3.0 → 12.3.1

package/README.md

@@ -320,7 +320,7 @@ Given example
 ```js
    const customRetryLogic = ({err, req, res, attempt, getDefaultRetry}) => {
     //If this block is not included all non 500 errors will not be retried
-    const defaultDelay = getDefaultDelay();
+    const defaultDelay = getDefaultDelay(req, res, err, attempt);
     if (defaultDelay) return defaultDelay();
 
     //Custom retry logic

package/index.js

@@ -47,6 +47,8 @@ const fastifyReplyFrom = fp(function from (fastify, opts, next) {
     globalAgent: opts.globalAgent,
     destroyAgent: opts.destroyAgent
   })
+
+  const isHttp2 = !!opts.http2
   if (requestBuilt instanceof Error) {
     next(requestBuilt)
     return
@@ -209,7 +211,7 @@ const fastifyReplyFrom = fp(function from (fastify, opts, next) {
         onError(this, { error: new BadGatewayError() })
         this.request.log.warn(err, 'response has invalid status code')
       }
-      if (this.request.raw.aborted && res.stream) {
+      if (this.request.raw.aborted && isHttp2) {
         // the request could have been canceled before we got a response from the target
         // forward this to the upstream server and close the stream to prevent leaks
         res.stream.close(NGHTTP2_CANCEL)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fastify/reply-from",
-  "version": "12.3.0",
+  "version": "12.3.1",
   "description": "forward your HTTP request to another server, for fastify",
   "main": "index.js",
   "type": "commonjs",

package/test/retry-with-a-custom-handler.test.js

@@ -55,8 +55,8 @@ test('a 500 status code with no custom handler should fail', async (t) => {
 })
 
 test("a server 500's with a custom handler and should revive", async (t) => {
-  const customRetryLogic = ({ req, res, getDefaultDelay }) => {
-    const defaultDelay = getDefaultDelay()
+  const customRetryLogic = ({ req, res, err, attempt, getDefaultDelay }) => {
+    const defaultDelay = getDefaultDelay(req, res, err, attempt)
     if (defaultDelay) return defaultDelay
 
     if (res && res.statusCode === 500 && req.method === 'GET') {
@@ -92,9 +92,9 @@ test('custom retry does not invoke the default delay causing a 501', async (t) =
 })
 
 test('custom retry delay functions can invoke the default delay', async (t) => {
-  const customRetryLogic = ({ req, res, getDefaultDelay }) => {
+  const customRetryLogic = ({ req, res, err, attempt, getDefaultDelay }) => {
     // registering the default retry logic for non 500 errors if it occurs
-    const defaultDelay = getDefaultDelay()
+    const defaultDelay = getDefaultDelay(req, res, err, attempt)
     if (defaultDelay) return defaultDelay
 
     if (res && res.statusCode === 500 && req.method === 'GET') {

package/test/utils-filter-pseudo-headers.test.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const test = require('tap').test
+const test = require('node:test')
 const filterPseudoHeaders = require('../lib/utils').filterPseudoHeaders
 
 test('filterPseudoHeaders', t => {
@@ -11,7 +11,7 @@ test('filterPseudoHeaders', t => {
     ':method': 'GET'
   }
 
-  t.strictSame(filterPseudoHeaders(headers), {
+  t.assert.deepStrictEqual(filterPseudoHeaders(headers), {
     accept: '*/*',
     'content-type': 'text/html; charset=UTF-8'
   })

package/types/index.d.ts

@@ -54,7 +54,12 @@ declare namespace fastifyReplyFrom {
     res: FastifyReply<RouteGenericInterface, RawServerBase>;
     attempt: number;
     retriesCount: number;
-    getDefaultDelay: () => number | null;
+    getDefaultDelay: (
+      req: FastifyRequest<RequestGenericInterface, RawServerBase>,
+      res: FastifyReply<RouteGenericInterface, RawServerBase>,
+      err: Error,
+      retries: number,
+    ) => number | null;
   }
 
   export type RawServerResponse<T extends RawServerBase> = RawReplyDefaultExpression<T> & {
@@ -64,7 +69,7 @@ declare namespace fastifyReplyFrom {
   export interface FastifyReplyFromHooks {
     queryString?: { [key: string]: unknown } | QueryStringFunction;
     contentType?: string;
-    retryDelay?: (details: RetryDetails) => {} | null;
+    retryDelay?: (details: RetryDetails) => number | null;
     retriesCount?: number;
     onResponse?: (
       request: FastifyRequest<RequestGenericInterface, RawServerBase>,

package/types/index.test-d.ts

@@ -103,8 +103,8 @@ async function main () {
   instance.get('/http2', (_request, reply) => {
     reply.from('/', {
       method: 'POST',
-      retryDelay: ({ req, res, getDefaultDelay }) => {
-        const defaultDelay = getDefaultDelay()
+      retryDelay: ({ req, res, err, attempt, getDefaultDelay }) => {
+        const defaultDelay = getDefaultDelay(req, res, err, attempt)
         if (defaultDelay) return defaultDelay
 
         if (res && res.statusCode === 500 && req.method === 'GET') {