@art-ws/fastify-http-server 2.0.19 → 2.0.21

package/dist/es/fastify-http-server.d.ts

@@ -4,13 +4,28 @@ export type { FastifyInstance, FastifyReply, FastifyRequest, FastifyRouteShortha
 export type FastifyHook = (options: {
     fastify: FastifyInstance;
 }) => Promise<void>;
-export declare function createHttpServer({ routes, port, handlers, plugins, onWebsocket, onPlugin, onBeforeReady, onAfterReady, onAfterListen, }: {
+export type FastifyRouteHook<P = unknown> = (options: {
+    context: HttpContext;
+    route: P;
+}) => Promise<void>;
+export type FastifyLifecycleHook<Req = unknown, Res = unknown, P = unknown> = (options: {
+    req?: Req;
+    res: Res;
+    payload?: P;
+}) => Promise<void>;
+export declare function createHttpServer({ routes, port, handlers, plugins, lifecycleHooks, onWebsocket, onPlugin, onBeforeReady, onAfterReady, onAfterListen, }: {
     routes: RouteDef<FastifyRequest, FastifyReply, FastifyInstance>[];
     port?: number;
     handlers?: {
         errorHandler?: boolean;
         notFoundHandler?: boolean;
-        preHandler: (context?: HttpContext) => Promise<void>;
+        preHandler: FastifyRouteHook;
+    };
+    lifecycleHooks?: {
+        onRequest?: FastifyLifecycleHook;
+        preHandler?: FastifyLifecycleHook;
+        onSend?: FastifyLifecycleHook;
+        onResponse?: FastifyLifecycleHook;
     };
     plugins?: {
         formbody?: boolean;

package/dist/es/fastify-http-server.js

@@ -6,7 +6,7 @@ import multipart from "@fastify/multipart";
 import fastifyStatic from "@fastify/static";
 import ws from "@fastify/websocket";
 import Fastify, {} from "fastify";
-export async function createHttpServer({ routes, port, handlers, plugins, onWebsocket, onPlugin, onBeforeReady, onAfterReady, onAfterListen, }) {
+export async function createHttpServer({ routes, port, handlers, plugins, lifecycleHooks, onWebsocket, onPlugin, onBeforeReady, onAfterReady, onAfterListen, }) {
     const fastify = Fastify({
         // https://fastify.dev/docs/latest/Reference/Server/#exposeheadroutes
         exposeHeadRoutes: true,
@@ -58,12 +58,33 @@ export async function createHttpServer({ routes, port, handlers, plugins, onWebs
     if (plugins?.cors) {
         await fastify.register(cors);
     }
-    routes.forEach(({ method, path, handler, options }) => {
+    if (lifecycleHooks?.onRequest) {
+        fastify.addHook("onRequest", async (req, res) => {
+            await lifecycleHooks.onRequest({ req, res });
+        });
+    }
+    if (lifecycleHooks?.preHandler) {
+        fastify.addHook("preHandler", async (req, res) => {
+            await lifecycleHooks.preHandler({ req, res });
+        });
+    }
+    if (lifecycleHooks?.onSend) {
+        fastify.addHook("onSend", async (req, res, payload) => {
+            await lifecycleHooks.onSend({ req, res, payload });
+        });
+    }
+    if (lifecycleHooks?.onResponse) {
+        fastify.addHook("onResponse", async (res) => {
+            await lifecycleHooks.onResponse({ res });
+        });
+    }
+    routes.forEach((route) => {
+        const { method, path, handler, options } = route;
         async function fastifyHandler(req, res) {
             const req_id = req.headers["x-req-id"] ||
                 req.headers["x-request-id"] ||
                 req.id ||
-                "req-" + Date.now();
+                "req-" + Date.now() + "-" + Math.random().toString(36).substring(2, 8);
             req.id = req_id;
             let resolveFunc;
             const promise = new Promise((resolve) => {
@@ -72,7 +93,7 @@ export async function createHttpServer({ routes, port, handlers, plugins, onWebs
             const context = new FastifyHttpContext(promise, new FastifyHttpReq(req), new FastifyHttpRes(res), new FastifyHttpServer(fastify));
             const result = await getRootInjector().runScope(async () => {
                 if (handlers?.preHandler) {
-                    await handlers.preHandler(context);
+                    await handlers.preHandler({ context, route });
                 }
                 return handler(context);
             }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@art-ws/fastify-http-server",
-  "version": "2.0.19",
+  "version": "2.0.21",
   "description": "Fastify Http server",
   "license": "UNLICENSED",
   "author": "Alexander Shagin",
@@ -18,8 +18,8 @@
     "@fastify/websocket": "^11.2.0",
     "fastify": "^5.5.0",
     "fastify-multer": "^2.0.3",
-    "@art-ws/http-server": "2.0.16",
-    "@art-ws/di": "2.0.23"
+    "@art-ws/http-server": "2.0.18",
+    "@art-ws/di": "2.0.25"
   },
   "devDependencies": {
     "eslint": "^9.34.0",