Revert "fix: use TS type inference for hooks"

This reverts commit f948814.

Author: RafaelGSS

test/types/hooks.test-d.ts

@@ -23,13 +23,6 @@ server.addHook('onRequest', (request: FastifyRequest, reply: FastifyReply, done:
   expectType<void>(done(new Error()))
 })
 
-expectError(server.addHook('onRequest', async (request: FastifyRequest, reply: FastifyReply, done: HookHandlerDoneFunction) => {}))
-
-server.addHook('onRequest', async (request: FastifyRequest, reply: FastifyReply) => {
-  expectType<FastifyRequest>(request)
-  expectType<FastifyReply>(reply)
-})
-
 server.addHook('preParsing', (request, reply, payload, done) => {
   expectType<FastifyRequest>(request)
   expectType<FastifyReply>(reply)

types/hooks.d.ts

@@ -1,5 +1,4 @@
 import { Readable } from 'stream'
-import { CallbackOrPromise } from './callback-or-promise'
 import { FastifyInstance } from './instance'
 import { RouteOptions, RouteGenericInterface } from './route'
 import { RawServerBase, RawServerDefault, RawRequestDefaultExpression, RawReplyDefaultExpression, ContextConfigDefault } from './utils'
@@ -20,14 +19,23 @@ interface RequestPayload extends Readable {
  * `onRequest` is the first hook to be executed in the request lifecycle. There was no previous hook, the next hook will be `preParsing`.
  *  Notice: in the `onRequest` hook, request.body will always be null, because the body parsing happens before the `preHandler` hook.
  */
-export type onRequestHookHandler<
+export interface onRequestHookHandler<
   RawServer extends RawServerBase = RawServerDefault,
   RawRequest extends RawRequestDefaultExpression<RawServer> = RawRequestDefaultExpression<RawServer>,
   RawReply extends RawReplyDefaultExpression<RawServer> = RawReplyDefaultExpression<RawServer>,
   RouteGeneric extends RouteGenericInterface = RouteGenericInterface,
-  ContextConfig = ContextConfigDefault,
-  T extends (...args: any[]) => void = (...args: any[]) => void
-> = CallbackOrPromise<T, [ FastifyRequest<RouteGeneric, RawServer, RawRequest>, FastifyReply<RawServer, RawRequest, RawReply, RouteGeneric, ContextConfig> ], HookHandlerDoneFunction>
+  ContextConfig = ContextConfigDefault
+> {
+  (
+    request: FastifyRequest<RouteGeneric, RawServer, RawRequest>,
+    reply: FastifyReply<RawServer, RawRequest, RawReply, RouteGeneric, ContextConfig>,
+    done: HookHandlerDoneFunction
+  ): void;
+  (
+    request: FastifyRequest<RouteGeneric, RawServer, RawRequest>,
+    reply: FastifyReply<RawServer, RawRequest, RawReply, RouteGeneric, ContextConfig>,
+  ): Promise<unknown>;
+}
 
 /**
  * `preParsing` is the second hook to be executed in the request lifecycle. The previous hook was `onRequest`, the next hook will be `preValidation`.

types/instance.d.ts

@@ -83,11 +83,10 @@ export interface FastifyInstance<
    */
   addHook<
     RouteGeneric extends RouteGenericInterface = RouteGenericInterface,
-    ContextConfig = ContextConfigDefault,
-    T extends (...args: any[]) => void = (...args: any[]) => void
+    ContextConfig = ContextConfigDefault
   >(
     name: 'onRequest',
-    hook: onRequestHookHandler<RawServer, RawRequest, RawReply, RouteGeneric, ContextConfig, T>
+    hook: onRequestHookHandler<RawServer, RawRequest, RawReply, RouteGeneric, ContextConfig>
   ): FastifyInstance<RawServer, RawRequest, RawReply, Logger>;
 
   /**