types: improve onResponse hook typing (#423)

Author: t-tajiri

types/index.d.ts

@@ -15,6 +15,7 @@ import {
   Agent,
   AgentOptions,
   IncomingHttpHeaders,
+  IncomingMessage,
   RequestOptions,
 } from 'node:http'
 import {
@@ -55,6 +56,11 @@ declare namespace fastifyReplyFrom {
     retriesCount: number;
     getDefaultDelay: () => number | null;
   }
+
+  export type RawServerResponse<T extends RawServerBase> = RawReplyDefaultExpression<T> & {
+    stream: IncomingMessage
+  }
+
   export interface FastifyReplyFromHooks {
     queryString?: { [key: string]: unknown } | QueryStringFunction;
     contentType?: string;
@@ -63,7 +69,7 @@ declare namespace fastifyReplyFrom {
     onResponse?: (
       request: FastifyRequest<RequestGenericInterface, RawServerBase>,
       reply: FastifyReply<RouteGenericInterface, RawServerBase>,
-      res: RawReplyDefaultExpression<RawServerBase>
+      res: RawServerResponse<RawServerBase>
     ) => void;
     onError?: (
       reply: FastifyReply<RouteGenericInterface, RawServerBase>,

types/index.test-d.ts

@@ -1,11 +1,11 @@
-import fastify, { FastifyReply, FastifyRequest, RawReplyDefaultExpression, RawServerBase, RequestGenericInterface, RouteGenericInterface } from 'fastify'
+import fastify, { FastifyReply, FastifyRequest, RawServerBase, RequestGenericInterface, RouteGenericInterface } from 'fastify'
 import * as http from 'node:http'
 import { IncomingHttpHeaders } from 'node:http2'
 import * as https from 'node:https'
 import { AddressInfo } from 'node:net'
 import { expectType } from 'tsd'
 import { Agent, Client, Dispatcher, Pool } from 'undici'
-import replyFrom, { FastifyReplyFromOptions } from '..'
+import replyFrom, { FastifyReplyFromOptions, RawServerResponse } from '..'
 // @ts-ignore
 import tap from 'tap'
 
@@ -83,7 +83,7 @@ async function main () {
       onResponse (request, reply, res) {
         expectType<FastifyRequest<RequestGenericInterface, RawServerBase>>(request)
         expectType<FastifyReply<RouteGenericInterface, RawServerBase>>(reply)
-        expectType<RawReplyDefaultExpression<RawServerBase>>(res)
+        expectType<RawServerResponse<RawServerBase>>(res)
         expectType<number>(res.statusCode)
       }
     })