@art-ws/fastify-http-server 2.0.18 → 2.0.20

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

@@ -1,4 +1,4 @@
-import { type RouteDef } from "@art-ws/http-server";
+import { type HttpContext, type RouteDef } from "@art-ws/http-server";
 import Fastify, { type FastifyInstance, type FastifyReply, type FastifyRequest, type RouteShorthandOptions as FastifyRouteShorthandOptions } from "fastify";
 export type { FastifyInstance, FastifyReply, FastifyRequest, FastifyRouteShorthandOptions, };
 export type FastifyHook = (options: {
@@ -10,6 +10,10 @@ export declare function createHttpServer({ routes, port, handlers, plugins, onWe
     handlers?: {
         errorHandler?: boolean;
         notFoundHandler?: boolean;
+        preHandler: (o?: {
+            context: HttpContext;
+            route: unknown;
+        }) => Promise<void>;
     };
     plugins?: {
         formbody?: boolean;

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

@@ -1,10 +1,10 @@
 import { getRootInjector } from "@art-ws/di";
 import { CONTEXT, REQUEST, REQUEST_ID, RESPONSE, } from "@art-ws/http-server";
-import ws from "@fastify/websocket";
 import cors from "@fastify/cors";
 import formbody from "@fastify/formbody";
 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, }) {
     const fastify = Fastify({
@@ -34,8 +34,11 @@ export async function createHttpServer({ routes, port, handlers, plugins, onWebs
     }
     if (handlers?.notFoundHandler) {
         // https://fastify.dev/docs/latest/Reference/Server/#setnotfoundhandler
-        fastify.setNotFoundHandler((_req, reply) => {
-            reply.code(404).type("text/json").send({ message: "Not Found" });
+        fastify.setNotFoundHandler((req, reply) => {
+            reply
+                .status(404)
+                .type("application/json")
+                .send({ message: "Not Found", url: req.url });
         });
     }
     // https://www.npmjs.com/package/@fastify/websocket
@@ -55,19 +58,25 @@ export async function createHttpServer({ routes, port, handlers, plugins, onWebs
     if (plugins?.cors) {
         await fastify.register(cors);
     }
-    routes.forEach(({ method, path, handler, options }) => {
+    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) => {
                 resolveFunc = resolve;
             });
             const context = new FastifyHttpContext(promise, new FastifyHttpReq(req), new FastifyHttpRes(res), new FastifyHttpServer(fastify));
-            const result = await getRootInjector().runScope(() => handler(context), {
+            const result = await getRootInjector().runScope(async () => {
+                if (handlers?.preHandler) {
+                    await handlers.preHandler({ context, route });
+                }
+                return handler(context);
+            }, {
                 onEnd: ({ injector }) => {
                     res.headers({
                         "x-req-id": req_id,
@@ -116,6 +125,15 @@ class FastifyHttpReq {
     constructor(raw) {
         this.raw = raw;
     }
+    get url() {
+        return this.raw.url;
+    }
+    get method() {
+        return this.raw.method;
+    }
+    get params() {
+        return this.raw.params;
+    }
     get query() {
         return this.raw.query;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@art-ws/fastify-http-server",
-  "version": "2.0.18",
+  "version": "2.0.20",
   "description": "Fastify Http server",
   "license": "UNLICENSED",
   "author": "Alexander Shagin",
@@ -17,8 +17,9 @@
     "@fastify/static": "^8.2.0",
     "@fastify/websocket": "^11.2.0",
     "fastify": "^5.5.0",
-    "@art-ws/di": "2.0.22",
-    "@art-ws/http-server": "2.0.15"
+    "fastify-multer": "^2.0.3",
+    "@art-ws/http-server": "2.0.17",
+    "@art-ws/di": "2.0.24"
   },
   "devDependencies": {
     "eslint": "^9.34.0",