Use types from fastify-reply-from. fix #102 (#103)

* Use types from fastify-reply-from. fix #102

* Remove http2 option from FastifyHttpProxyOptions interface as it is inherited from FastifyReplyFromOptions

Co-authored-by: Gyula Szalai <[email protected]@gmail.com>

Author: gyszalai

index.d.ts

@@ -5,11 +5,14 @@ import {
   preHandlerHookHandler
 } from "fastify";
 
-export interface FastifyHttpProxyOptions {
+import {
+  FastifyReplyFromOptions
+} from "fastify-reply-from"
+
+export interface FastifyHttpProxyOptions extends FastifyReplyFromOptions {
   upstream: string;
   prefix?: string;
   rewritePrefix?: string;
-  http2?: boolean;
   proxyPayloads?: boolean;
   preHandler?: preHandlerHookHandler;
   beforeHandler?: preHandlerHookHandler;

test/index.test-d.ts

@@ -22,5 +22,21 @@ app.register(fastifyHttpProxy, {
   beforeHandler: (request, reply) => {
     expectType<RawRequestDefaultExpression>(request.raw);
     expectType<RawReplyDefaultExpression>(reply.raw);
-  }
+  },
+  base: 'whatever',
+  cacheURLs: 10,
+  undici: { dummy: true }, // undici has no TS declarations yet
+  http: {
+    agentOptions: {
+      keepAliveMsecs: 10 * 60 * 1000
+    },
+    requestOptions: {
+      timeout: 20000
+    }
+  },
+  keepAliveMsecs: 60000,
+  maxFreeSockets: 10,
+  maxSockets: 20,
+  rejectUnauthorized: true,
+  sessionTimeout: 30000
 });

test/test.js

@@ -29,6 +29,11 @@ async function run () {
     return 'this is /api2/a'
   })
 
+  origin.get('/timeout', async (request, reply) => {
+    await new Promise((resolve) => setTimeout(resolve, 600))
+    return 'this is never received'
+  })
+
   await origin.listen(0)
 
   tearDown(origin.close.bind(origin))
@@ -373,6 +378,33 @@ async function run () {
     )
     t.equal(location, '/something')
   })
+
+  test('proxy request timeout', async t => {
+    const server = Fastify()
+    server.register(proxy, {
+      upstream: `http://localhost:${origin.server.address().port}`,
+      http: {
+        requestOptions: {
+          timeout: 300
+        }
+      }
+    })
+
+    await server.listen(0)
+    t.tearDown(server.close.bind(server))
+
+    try {
+      await got(
+        `http://localhost:${server.server.address().port}/timeout`,
+        { retry: 0 }
+      )
+    } catch (err) {
+      t.equal(err.response.statusCode, 504)
+      t.equal(err.response.statusMessage, 'Gateway Timeout')
+      return
+    }
+    t.fail()
+  })
 }
 
 run()