@fastify/reply-from 12.0.0 → 12.0.2

package/test/undici-timeout-body-partial.test.js

@@ -37,7 +37,7 @@ t.test('undici body timeout', async (t) => {
     }
   })
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from()
   })
 

package/test/undici-timeout-body.test.js

@@ -35,7 +35,7 @@ t.test('undici body timeout', async (t) => {
     }
   })
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from()
   })
 

package/test/undici-timeout.test.js

@@ -12,7 +12,7 @@ t.test('undici request timeout', async (t) => {
   const target = Fastify()
   t.teardown(target.close.bind(target))
 
-  target.get('/', (request, reply) => {
+  target.get('/', (_request, reply) => {
     t.pass('request arrives')
 
     clock.setTimeout(() => {
@@ -33,7 +33,7 @@ t.test('undici request timeout', async (t) => {
     }
   })
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.from()
   })
 

package/test/undici-with-path-in-base.test.js

@@ -22,7 +22,7 @@ const target = http.createServer((req, res) => {
   res.end('hello world')
 })
 
-instance.get('/', (request, reply) => {
+instance.get('/', (_request, reply) => {
   reply.from('/hello')
 })
 

package/test/undici.test.js

@@ -22,7 +22,7 @@ const target = http.createServer((req, res) => {
   res.end('hello world')
 })
 
-instance.get('/', (request, reply) => {
+instance.get('/', (_request, reply) => {
   reply.from()
 })
 

package/test/unexpected-error.test.js

@@ -9,7 +9,7 @@ const proxyquire = require('proxyquire')
 const From = proxyquire('..', {
   './lib/request': function () {
     return {
-      request: (opts, callback) => { callback(new Error('foo')) },
+      request: (_opts, callback) => { callback(new Error('foo')) },
       close: () => {}
     }
   }
@@ -20,7 +20,7 @@ test('unexpected error renders 500', async (t) => {
 
   t.teardown(instance.close.bind(instance))
 
-  instance.get('/', (request, reply) => {
+  instance.get('/', (_request, reply) => {
     reply.code(201)
     reply.from()
   })

package/test/unix-http-undici-from.test.js

@@ -26,12 +26,12 @@ try {
 } catch (_) {
 }
 
-const target = http.createServer((req, res) => {
+const target = http.createServer((_req, res) => {
   t.fail('no response')
   res.end()
 })
 
-instance.get('/', (request, reply) => {
+instance.get('/', (_request, reply) => {
   reply.from(`unix+http://${querystring.escape(socketPath)}/hello`)
 })
 
@@ -43,7 +43,7 @@ instance.listen({ port: 0 }, (err) => {
   target.listen(socketPath, (err) => {
     t.error(err)
 
-    get(`http://localhost:${instance.server.address().port}`, (err, res, data) => {
+    get(`http://localhost:${instance.server.address().port}`, (err, res) => {
       t.error(err)
       t.equal(res.statusCode, 500)
     })

package/test/unix-http-undici.test.js

@@ -39,7 +39,7 @@ const target = http.createServer((req, res) => {
   res.end('hello world')
 })
 
-instance.get('/', (request, reply) => {
+instance.get('/', (_request, reply) => {
   reply.from('hello')
 })
 

package/test/unix-http.test.js

@@ -42,7 +42,7 @@ const target = http.createServer((req, res) => {
   res.end('hello world')
 })
 
-instance.get('/', (request, reply) => {
+instance.get('/', (_request, reply) => {
   reply.from('hello')
 })
 

package/test/unix-https-undici.test.js

@@ -45,7 +45,7 @@ const target = https.createServer(certs, (req, res) => {
   res.end('hello world')
 })
 
-instance.get('/', (request, reply) => {
+instance.get('/', (_request, reply) => {
   reply.from('hello')
 })
 

package/test/unix-https.test.js

@@ -45,7 +45,7 @@ const target = https.createServer(certs, (req, res) => {
   res.end('hello world')
 })
 
-instance.get('/', (request, reply) => {
+instance.get('/', (_request, reply) => {
   reply.from(`unix+https://${querystring.escape(socketPath)}/hello`)
 })
 

package/types/index.d.ts

@@ -9,29 +9,28 @@ import {
   RawServerBase,
   RequestGenericInterface,
   RouteGenericInterface
-} from 'fastify';
+} from 'fastify'
 
 import {
   Agent,
   AgentOptions,
   IncomingHttpHeaders,
   RequestOptions,
-} from "http";
+} from 'http'
 import {
   ClientSessionOptions,
   ClientSessionRequestOptions,
   IncomingHttpHeaders as Http2IncomingHttpHeaders,
   SecureClientSessionOptions,
-} from "http2";
+} from 'http2'
 import {
   Agent as SecureAgent,
   AgentOptions as SecureAgentOptions,
   RequestOptions as SecureRequestOptions
-} from "https";
-import { Pool } from 'undici';
-import { ProxyAgent } from 'undici';
+} from 'https'
+import { Pool, ProxyAgent, Dispatcher } from 'undici'
 
-declare module "fastify" {
+declare module 'fastify' {
   interface FastifyReply {
     from(
       source?: string,
@@ -46,7 +45,7 @@ declare namespace fastifyReplyFrom {
     search: string | undefined,
     reqUrl: string,
     request: FastifyRequest<RequestGenericInterface, RawServerBase>
-  ) => string;
+  ) => string
 
   export type RetryDetails = {
     err: Error;
@@ -105,7 +104,7 @@ declare namespace fastifyReplyFrom {
     disableCache?: boolean;
     http?: HttpOptions;
     http2?: Http2Options | boolean;
-    undici?: Pool.Options & { proxy?: string  | URL | ProxyAgent.Options };
+    undici?: Pool.Options & { proxy?: string | URL | ProxyAgent.Options } | { request: Dispatcher['request'] };
     contentTypesToEncode?: string[];
     retryMethods?: (HTTPMethods | 'TRACE')[];
     maxRetriesOn503?: number;
@@ -115,8 +114,8 @@ declare namespace fastifyReplyFrom {
   }
 
   export const fastifyReplyFrom: FastifyReplyFrom
-  export { fastifyReplyFrom as default };
+  export { fastifyReplyFrom as default }
 }
 
-declare function fastifyReplyFrom(...params: Parameters<FastifyReplyFrom>): ReturnType<FastifyReplyFrom>
+declare function fastifyReplyFrom (...params: Parameters<FastifyReplyFrom>): ReturnType<FastifyReplyFrom>
 export = fastifyReplyFrom

package/types/index.test-d.ts

@@ -1,15 +1,16 @@
-import fastify, { FastifyReply, FastifyRequest, RawReplyDefaultExpression, RawServerBase, RequestGenericInterface, RouteGenericInterface } from "fastify";
-import * as http from 'http';
-import { IncomingHttpHeaders } from "http2";
-import * as https from 'https';
-import { AddressInfo } from "net";
-import { expectType } from 'tsd';
-import replyFrom, { FastifyReplyFromOptions } from "..";
+import fastify, { FastifyReply, FastifyRequest, RawReplyDefaultExpression, RawServerBase, RequestGenericInterface, RouteGenericInterface } from 'fastify'
+import * as http from 'node:http'
+import { IncomingHttpHeaders } from 'http2'
+import * as https from 'node:https'
+import { AddressInfo } from 'net'
+import { expectType } from 'tsd'
+import { Agent, Client, Dispatcher, Pool } from 'undici'
+import replyFrom, { FastifyReplyFromOptions } from '..'
 // @ts-ignore
-import tap from 'tap';
+import tap from 'tap'
 
 const fullOptions: FastifyReplyFromOptions = {
-  base: "http://example2.com",
+  base: 'http://example2.com',
   http: {
     agentOptions: {
       keepAliveMsecs: 60 * 1000,
@@ -47,118 +48,147 @@ const fullOptions: FastifyReplyFromOptions = {
   disableRequestLogging: false,
   globalAgent: false,
   destroyAgent: true
-};
-
-async function main() {
-  const server = fastify();
-
-  server.register(replyFrom);
-
-  server.register(replyFrom, {});
-
-  server.register(replyFrom, {http2: true});
-
-  server.register(replyFrom, fullOptions);
-
-  server.register(replyFrom, { undici: { proxy: new URL('http://example2.com:8080') } });
-
-  server.register(replyFrom, { undici: { proxy: { uri: 'http://example2.com:8080' } } });
-
-  server.get("/v1", (request, reply) => {
-      expectType<FastifyReply>(reply.from());
-  });
-  server.get("/v3", (request, reply) => {
-      reply.from("/v3", {
-          body: {hello: "world"},
-          rewriteRequestHeaders(req, headers) {
-              expectType<FastifyRequest<RequestGenericInterface, RawServerBase>>(req);
-              return headers;
-          },
-          getUpstream(req, base) {
-              expectType<FastifyRequest<RequestGenericInterface, RawServerBase>>(req);
-              return base;
-          },
-          onResponse(request, reply, res) {
-            expectType<FastifyRequest<RequestGenericInterface, RawServerBase>>(request);
-            expectType<FastifyReply<RouteGenericInterface, RawServerBase>>(reply);
-            expectType<RawReplyDefaultExpression<RawServerBase>>(res);
-            expectType<number>(res.statusCode);
-          }
-      });
-  });
-
-// http2
-  const instance = fastify({http2: true});
+}
+
+async function main () {
+  const server = fastify()
+
+  server.register(replyFrom)
+
+  server.register(replyFrom, {})
+
+  server.register(replyFrom, { http2: true })
+
+  server.register(replyFrom, fullOptions)
+
+  server.register(replyFrom, { undici: { proxy: new URL('http://example2.com:8080') } })
+
+  server.register(replyFrom, { undici: { proxy: { uri: 'http://example2.com:8080' } } })
+
+  server.get('/v1', (_request, reply) => {
+    expectType<FastifyReply>(reply.from())
+  })
+  server.get('/v3', (_request, reply) => {
+    reply.from('/v3', {
+      body: { hello: 'world' },
+      rewriteRequestHeaders (req, headers) {
+        expectType<FastifyRequest<RequestGenericInterface, RawServerBase>>(req)
+        return headers
+      },
+      getUpstream (req, base) {
+        expectType<FastifyRequest<RequestGenericInterface, RawServerBase>>(req)
+        return base
+      },
+      onResponse (request, reply, res) {
+        expectType<FastifyRequest<RequestGenericInterface, RawServerBase>>(request)
+        expectType<FastifyReply<RouteGenericInterface, RawServerBase>>(reply)
+        expectType<RawReplyDefaultExpression<RawServerBase>>(res)
+        expectType<number>(res.statusCode)
+      }
+    })
+  })
+
+  // http2
+  const instance = fastify({ http2: true })
   // @ts-ignore
-  tap.tearDown(instance.close.bind(instance));
-  const target = fastify({http2: true});
+  tap.tearDown(instance.close.bind(instance))
+  const target = fastify({ http2: true })
   // @ts-ignore
-  tap.tearDown(target.close.bind(target));
-  instance.get("/", (request, reply) => {
-      reply.from();
-  });
-
-  instance.get("/http2", (request, reply) => {
-      reply.from("/", {
-          method: "POST",
-          retryDelay: ({err, req, res, attempt, retriesCount, getDefaultDelay }) => {
-              const defaultDelay = getDefaultDelay();
-              if (defaultDelay) return defaultDelay;
-
-              if (res && res.statusCode === 500 && req.method === "GET") {
-                return 300;
-              }
-              return null;
-            },
-          rewriteHeaders(headers, req) {
-              return headers;
-          },
-          rewriteRequestHeaders(req, headers: IncomingHttpHeaders) {
-              return headers;
-          },
-          getUpstream(req, base) {
-              return base;
-          },
-          onError(reply: FastifyReply<RouteGenericInterface, RawServerBase>, error) {
-              return reply.send(error.error);
-          },
-          queryString(search, reqUrl, request) {
-              expectType<string | undefined>(search);
-              expectType<string>(reqUrl);
-              expectType<FastifyRequest<RequestGenericInterface, RawServerBase>>(request);
-              return '';
-          },
-      });
-  });
-
-  await target.listen({ port: 0 });
-  const port = (target.server.address() as AddressInfo).port;
+  tap.tearDown(target.close.bind(target))
+  instance.get('/', (_request, reply) => {
+    reply.from()
+  })
+
+  instance.get('/http2', (_request, reply) => {
+    reply.from('/', {
+      method: 'POST',
+      // eslint-disable-next-line n/handle-callback-err -- Not a real request, not handling errors
+      retryDelay: ({ req, res, getDefaultDelay }) => {
+        const defaultDelay = getDefaultDelay()
+        if (defaultDelay) return defaultDelay
+
+        if (res && res.statusCode === 500 && req.method === 'GET') {
+          return 300
+        }
+        return null
+      },
+      rewriteHeaders (headers) {
+        return headers
+      },
+      rewriteRequestHeaders (_req, headers: IncomingHttpHeaders) {
+        return headers
+      },
+      getUpstream (_req, base) {
+        return base
+      },
+      onError (reply: FastifyReply<RouteGenericInterface, RawServerBase>, error) {
+        return reply.send(error.error)
+      },
+      queryString (search, reqUrl, request) {
+        expectType<string | undefined>(search)
+        expectType<string>(reqUrl)
+        expectType<FastifyRequest<RequestGenericInterface, RawServerBase>>(request)
+        return ''
+      },
+    })
+  })
+
+  await target.listen({ port: 0 })
+  const port = (target.server.address() as AddressInfo).port
   instance.register(replyFrom, {
-      base: `http://localhost:${port}`,
-      http2: {
-        sessionOptions: {
-          rejectUnauthorized: false,
-        },
+    base: `http://localhost:${port}`,
+    http2: {
+      sessionOptions: {
+        rejectUnauthorized: false,
       },
-  });
+    },
+  })
   instance.register(replyFrom, {
     base: `http://localhost:${port}`,
     http2: true,
-});
-  await instance.listen({ port: 0 });
+  })
+  await instance.listen({ port: 0 })
 
-  const undiciInstance = fastify();
+  const undiciInstance = fastify()
   undiciInstance.register(replyFrom, {
-    base: "http://example2.com",
+    base: 'http://example2.com',
     undici: {
       pipelining: 10,
       connections: 10
     }
-  });
-  await undiciInstance.ready();
+  })
+  await undiciInstance.ready()
+
+  const undiciInstanceAgent = fastify()
+  undiciInstance.register(replyFrom, {
+    base: 'http://example2.com',
+    undici: new Agent()
+  })
+  await undiciInstanceAgent.ready()
+
+  const undiciInstancePool = fastify()
+  undiciInstance.register(replyFrom, {
+    base: 'http://example2.com',
+    undici: new Pool('http://example2.com')
+  })
+  await undiciInstancePool.ready()
+
+  const undiciInstanceClient = fastify()
+  undiciInstance.register(replyFrom, {
+    base: 'http://example2.com',
+    undici: new Client('http://example2.com')
+  })
+  await undiciInstanceClient.ready()
+
+  const undiciInstanceDispatcher = fastify()
+  undiciInstance.register(replyFrom, {
+    base: 'http://example2.com',
+    undici: new Dispatcher()
+  })
+  await undiciInstanceDispatcher.ready()
 
-  tap.pass('done');
-  tap.end();
+  tap.pass('done')
+  tap.end()
 }
 
-main();
+main()