@art-ws/fastify-http-server 2.0.14 → 2.0.16

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

@@ -1,7 +1,10 @@
 import { type RouteDef } from "@art-ws/http-server";
-import Fastify, { type FastifyInstance, type FastifyReply, type FastifyRequest } from "fastify";
-export type { FastifyInstance, FastifyReply, FastifyRequest };
-export declare function createHttpServer({ routes, port, handlers, plugins, onPlugin, }: {
+import Fastify, { type FastifyInstance, type FastifyReply, type FastifyRequest, type RouteShorthandOptions as FastifyRouteShorthandOptions } from "fastify";
+export type { FastifyInstance, FastifyReply, FastifyRequest, FastifyRouteShorthandOptions, };
+export type FastifyHook = (options: {
+    fastify: FastifyInstance;
+}) => Promise<void>;
+export declare function createHttpServer({ routes, port, handlers, plugins, onWebsocket, onPlugin, onBeforeReady, onAfterReady, }: {
     routes: RouteDef<FastifyRequest, FastifyReply, FastifyInstance>[];
     port?: number;
     handlers?: {
@@ -17,9 +20,10 @@ export declare function createHttpServer({ routes, port, handlers, plugins, onPl
             wildcard?: boolean;
         };
     };
-    onPlugin?: (options: {
-        fastify: FastifyInstance;
-    }) => Promise<void>;
+    onWebsocket?: FastifyHook;
+    onPlugin?: FastifyHook;
+    onBeforeReady?: FastifyHook;
+    onAfterReady?: FastifyHook;
 }): Promise<{
     port: number;
     fastify: Fastify.FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, Fastify.FastifyBaseLogger, Fastify.FastifyTypeProviderDefault> & PromiseLike<Fastify.FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, Fastify.FastifyBaseLogger, Fastify.FastifyTypeProviderDefault>> & {

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

@@ -1,11 +1,12 @@
 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 Fastify, {} from "fastify";
-export async function createHttpServer({ routes, port, handlers, plugins, onPlugin, }) {
+export async function createHttpServer({ routes, port, handlers, plugins, onWebsocket, onPlugin, onBeforeReady, onAfterReady, }) {
     const fastify = Fastify({
         // https://fastify.dev/docs/latest/Reference/Server/#exposeheadroutes
         exposeHeadRoutes: true,
@@ -13,11 +14,15 @@ export async function createHttpServer({ routes, port, handlers, plugins, onPlug
     if (handlers?.errorHandler) {
         // https://fastify.dev/docs/latest/Reference/Errors/#uncaught-errors
         fastify.setErrorHandler((err, _req, reply) => {
-            reply
-                .status(500)
-                .type("text/json")
-                .send({
-                error: { name: err.name, message: err.message, stack: err.stack },
+            console.log("Error occurred:", err);
+            let status = 500;
+            const { code = "INTERNAL_SERVER_ERROR", message, name, stack } = err || {};
+            const ex = err;
+            if (ex?.status) {
+                status = ex.status;
+            }
+            reply.status(status).type("application/json").send({
+                error: { code, name, message, stack },
             });
         });
     }
@@ -33,6 +38,12 @@ export async function createHttpServer({ routes, port, handlers, plugins, onPlug
             reply.code(404).type("text/json").send({ message: "Not Found" });
         });
     }
+    // https://www.npmjs.com/package/@fastify/websocket
+    if (onWebsocket) {
+        await fastify.register(ws);
+        console.log("WebSocket plugin registered");
+        onWebsocket({ fastify });
+    }
     await onPlugin?.({ fastify });
     if (plugins?.formbody) {
         await fastify.register(formbody);
@@ -44,7 +55,7 @@ export async function createHttpServer({ routes, port, handlers, plugins, onPlug
     if (plugins?.cors) {
         await fastify.register(cors);
     }
-    routes.forEach(({ method, path, handler }) => {
+    routes.forEach(({ method, path, handler, options }) => {
         async function fastifyHandler(req, res) {
             const req_id = req.headers["x-req-id"] ||
                 req.headers["x-request-id"] ||
@@ -74,8 +85,13 @@ export async function createHttpServer({ routes, port, handlers, plugins, onPlug
             });
             return result;
         }
-        fastify[method](path, fastifyHandler);
+        fastify[method](path, { ...(options || {}) }, fastifyHandler);
     });
+    if (onBeforeReady || onAfterReady) {
+        onBeforeReady?.({ fastify });
+        await fastify.ready();
+        onAfterReady?.({ fastify });
+    }
     if (port) {
         try {
             const host = "0.0.0.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@art-ws/fastify-http-server",
-  "version": "2.0.14",
+  "version": "2.0.16",
   "description": "Fastify Http server",
   "license": "UNLICENSED",
   "author": "Alexander Shagin",
@@ -15,9 +15,10 @@
     "@fastify/formbody": "^8.0.2",
     "@fastify/multipart": "^9.0.3",
     "@fastify/static": "^8.2.0",
+    "@fastify/websocket": "^11.2.0",
     "fastify": "^5.5.0",
-    "@art-ws/di": "2.0.19",
-    "@art-ws/http-server": "2.0.11"
+    "@art-ws/di": "2.0.21",
+    "@art-ws/http-server": "2.0.13"
   },
   "devDependencies": {
     "eslint": "^9.34.0",