equipped 5.2.4 → 5.2.6

package/dist/types/server/impls/base.js

@@ -48,25 +48,27 @@ class Server {
   addRoute(...routes) {
     routes.forEach((route) => {
       this.#queue.push(async () => {
-        const { method, path, schema = {}, onError, middlewares = [] } = route;
+        const { method, path, schema = {}, onError, middlewares = [], responseMiddlewares = [] } = route;
         const key = `(${method.toUpperCase()}) ${this.#openapi.cleanPath(path)}`;
         if (this.#routesByKey.get(key))
           throw new EquippedError(`Route key ${key} already registered. All route keys must be unique`, { route, key });
         middlewares.forEach((m) => m.onSetup?.(route));
         onError?.onSetup?.(route);
+        responseMiddlewares.forEach((m) => m.onSetup?.(route));
         const { validateRequest, validateResponse, jsonSchema } = this.#resolveSchema(method, schema);
         this.#routesByKey.set(key, true);
         await this.#openapi.register(route, jsonSchema);
         this.implementations.registerRoute(method, this.#openapi.cleanPath(path), async (req, res) => {
           const request = await validateRequest(await this.implementations.parseRequest(req));
           try {
-            for (const middleware of middlewares) await middleware.cb(request, this.config);
-            const rawRes = await route.handler(request, this.config);
+            for (const middleware of middlewares) await middleware.cb(request);
+            const rawRes = await route.handler(request);
             const response = rawRes instanceof Response ? rawRes : new Response({ body: rawRes, status: StatusCodes.Ok, headers: {}, piped: false });
+            for (const middleware of responseMiddlewares) await middleware.cb(request, response);
             return await this.implementations.handleResponse(res, await validateResponse(response));
           } catch (error) {
             if (onError?.cb) {
-              const rawResponse = await onError.cb(request, this.config, error);
+              const rawResponse = await onError.cb(request, error);
               const response = rawResponse instanceof Response ? rawResponse : new Response({ body: rawResponse, status: StatusCodes.BadRequest, headers: {} });
               return await this.implementations.handleResponse(res, await validateResponse(response));
             }
@@ -179,6 +181,7 @@ class Server {
           contentType: "text/plain"
         })
       });
+    await Promise.all(this.#queue.map((cb) => cb()));
     this.implementations.registerNotFoundHandler(async (req) => {
       const request = await this.implementations.parseRequest(req);
       throw new NotFoundError(`Route ${request.path} not found`);
@@ -197,7 +200,6 @@ class Server {
       });
       return await this.implementations.handleResponse(res, response);
     });
-    await Promise.all(this.#queue.map((cb) => cb()));
     const started = await this.implementations.start(port);
     if (started) Instance.get().log.info(`${instance.id}(${app.name}) service listening on port ${port}`);
     return started;

package/dist/types/server/impls/express.js

@@ -12,7 +12,6 @@ import { Request } from "../requests.js";
 import { StatusCodes } from "../types.js";
 import { Server } from "./base.js";
 class ExpressServer extends Server {
-  #expressApp;
   constructor(config) {
     const app = express();
     const instance = Instance.get();
@@ -59,13 +58,13 @@ class ExpressServer extends Server {
         }
       },
       registerRoute: (method, path, cb) => {
-        this.#expressApp[method]?.(path, cb);
+        app[method]?.(path, async (req, res) => cb(req, res));
       },
       registerErrorHandler: (cb) => {
-        this.#expressApp.use(async (err, req, res, _next) => cb(err, req, res));
+        app.use(async (err, req, res, _next) => cb(err, req, res));
       },
       registerNotFoundHandler: (cb) => {
-        this.#expressApp.use(cb);
+        app.use(async (req, res, _next) => cb(req, res));
       },
       start: async (port) => new Promise((resolve, reject) => {
         try {
@@ -76,7 +75,6 @@ class ExpressServer extends Server {
         }
       })
     });
-    this.#expressApp = app;
     app.disable("x-powered-by");
     if (config.requests.log) app.use(pinoHttp({ logger: instance.log }));
     app.use(express.json());

package/dist/types/server/index.d.ts

@@ -1,21 +1,21 @@
-export { E as ExpressServer, F as FastifyServer, O as OnJoinFn, R as Router, S as Server, a as SocketCallbacks, b as SocketEmitter } from '../fastify-BizyaCY_.js';
-import { B as BaseRequestAuthMethod, a as Request, c as RouteDefToReqRes, d as RouteDef, S as ServerConfig, e as Route } from '../requestError-MGJ-ojtC.js';
-export { C as CookieVal, i as DefaultCookies, D as DefaultHeaders, I as IncomingFile, l as MergeRouteDefs, M as Methods, g as MethodsEnum, b as Response, j as RouteConfig, m as RouteDefHandler, k as RouterConfig, f as StatusCodes, h as StatusCodesEnum, o as makeErrorMiddleware, n as makeMiddleware, s as serverConfigPipe } from '../requestError-MGJ-ojtC.js';
+import { B as BaseRequestAuthMethod } from '../fastify-DLPUK3vD.js';
+export { E as ExpressServer, F as FastifyServer, O as OnJoinFn, R as Router, S as Server, a as ServerConfig, b as SocketCallbacks, c as SocketEmitter, s as serverConfigPipe } from '../fastify-DLPUK3vD.js';
 import { A as AuthUser } from '../overrides-6Hxg764S.js';
+import { a as Request, c as RouteDefToReqRes, d as RouteDef, e as Route } from '../requestError-C2PNWUrt.js';
+export { C as CookieVal, h as DefaultCookies, D as DefaultHeaders, I as IncomingFile, k as MergeRouteDefs, M as Methods, f as MethodsEnum, b as Response, i as RouteConfig, l as RouteDefHandler, j as RouterConfig, S as StatusCodes, g as StatusCodesEnum, o as makeErrorMiddleware, m as makeMiddleware, n as makeResponseMiddleware } from '../requestError-C2PNWUrt.js';
 import { IncomingHttpHeaders } from 'node:http2';
 import 'express';
 import 'fastify';
+import 'valleyed';
+import '../kafka-Cf-TUJgv.js';
 import 'supertest/lib/agent';
 import 'node:http';
 import '@fastify/cors';
 import 'cors';
 import 'supertest';
 import 'socket.io';
-import '../core-BWUHISEy.js';
+import '../core-BrkNSwvc.js';
 import 'mongodb';
-import 'valleyed';
-import '../kafka-DCpqW_YM.js';
-import '../base-CfeyC14V.js';
 import '../types/index.js';
 import 'node:stream';
 import '@fastify/cookie';
@@ -75,8 +75,8 @@ declare abstract class BaseJwtCookieRequestAuthMethod<T extends {
 }
 
 declare const requireAuthUser: (methods: BaseRequestAuthMethod<AuthUser>[]) => {
-    cb: (req: Request<RouteDefToReqRes<RouteDef>>, config: ServerConfig) => void | Promise<void>;
+    cb: (req: Request<RouteDefToReqRes<RouteDef>>) => void | Promise<void>;
     onSetup: ((route: Route<RouteDef>) => void) | undefined;
 };
 
-export { BaseApiKeyRequestAuthMethod, BaseJwtCookieRequestAuthMethod, BaseJwtHeaderRequestAuthMethod, BaseJwtRequestAuthMethod, type BaseJwtRequestAuthMethodOptions, BaseRequestAuthMethod, Request, Route, RouteDef, RouteDefToReqRes, ServerConfig, requireAuthUser };
+export { BaseApiKeyRequestAuthMethod, BaseJwtCookieRequestAuthMethod, BaseJwtHeaderRequestAuthMethod, BaseJwtRequestAuthMethod, type BaseJwtRequestAuthMethodOptions, BaseRequestAuthMethod, Request, Route, RouteDef, RouteDefToReqRes, requireAuthUser };

package/dist/types/server/routes.js

@@ -36,6 +36,7 @@ const groupRoutes = (config, routes) => routes.map((route) => ({
   path: `${config.path}/${route.path}`,
   groups: [...config.groups ?? [], ...route.groups ?? []],
   middlewares: [...config.middlewares ?? [], ...route.middlewares ?? []],
+  responseMiddlewares: [...config.responseMiddlewares ?? [], ...route.responseMiddlewares ?? []],
   schema: mergeSchemas(config.schema ?? {}, route.schema ?? {}),
   security: [...config.security ?? [], ...route.security ?? []]
 }));

package/dist/types/server/types.js

@@ -22,10 +22,12 @@ function makeMiddlewareHandler(cb, onSetup) {
   return { cb, onSetup };
 }
 const makeMiddleware = (...args) => makeMiddlewareHandler(...args);
+const makeResponseMiddleware = (...args) => makeMiddlewareHandler(...args);
 const makeErrorMiddleware = (...args) => makeMiddlewareHandler(...args);
 export {
   Methods,
   StatusCodes,
   makeErrorMiddleware,
-  makeMiddleware
+  makeMiddleware,
+  makeResponseMiddleware
 };

package/dist/types/{validationError-BbiTIoAh.d.ts → validationError-Bw8OYv5s.d.ts}

@@ -1,4 +1,4 @@
-import { R as RequestError } from './requestError-MGJ-ojtC.js';
+import { R as RequestError } from './requestError-C2PNWUrt.js';
 
 type ValidError = {
     messages: string[];

package/dist/types/validations/index.d.ts

@@ -1,11 +1,10 @@
 import { Pipe, PipeInput, PipeOutput, PipeError } from 'valleyed';
 export * from 'valleyed';
 import { AsyncLocalStorage } from 'node:async_hooks';
-import { I as IncomingFile, a as Request, b as Response, c as RouteDefToReqRes, d as RouteDef } from '../requestError-MGJ-ojtC.js';
-import { V as ValidationError } from '../validationError-BbiTIoAh.js';
+import { I as IncomingFile, a as Request, b as Response, c as RouteDefToReqRes, d as RouteDef } from '../requestError-C2PNWUrt.js';
+import { V as ValidationError } from '../validationError-Bw8OYv5s.js';
 import '../types/index.js';
 import '../overrides-6Hxg764S.js';
-import '../base-CfeyC14V.js';
 import 'node:http2';
 import 'node:stream';
 import '@fastify/cookie';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "equipped",
-	"version": "5.2.4",
+	"version": "5.2.6",
 	"private": false,
 	"description": "",
 	"type": "module",

package/dist/types/base-CfeyC14V.d.ts

@@ -1,14 +0,0 @@
-import { E as Events } from './overrides-6Hxg764S.js';
-
-type StreamOptions = {
-    skipScope?: boolean;
-    fanout: boolean;
-};
-declare abstract class EventBus {
-    abstract createStream<Event extends Events[keyof Events]>(topic: Event['topic'], options?: Partial<StreamOptions>): {
-        publish: (data: Event['data']) => Promise<boolean>;
-        subscribe: (onMessage: (data: Event['data']) => Promise<void>) => void;
-    };
-}
-
-export { EventBus as E, type StreamOptions as S };

package/dist/types/fastify-BizyaCY_.d.ts

@@ -1,80 +0,0 @@
-import express from 'express';
-import { d as RouteDef, k as RouterConfig, j as RouteConfig, m as RouteDefHandler, l as MergeRouteDefs, e as Route, S as ServerConfig, a as Request, b as Response, g as MethodsEnum } from './requestError-MGJ-ojtC.js';
-import { FastifyRequest, FastifyReply } from 'fastify';
-import * as supertest_lib_agent from 'supertest/lib/agent';
-import http from 'node:http';
-import { FastifyCorsOptions } from '@fastify/cors';
-import { CorsOptions } from 'cors';
-import supertest from 'supertest';
-import { Server as Server$1 } from 'socket.io';
-import { E as Entity } from './core-BWUHISEy.js';
-import { A as AuthUser } from './overrides-6Hxg764S.js';
-
-declare class Router<T extends RouteDef> {
-    #private;
-    constructor(config?: RouterConfig<T>);
-    head: <R extends RouteDef>(path: string, config?: RouteConfig<R>) => (handler: RouteDefHandler<MergeRouteDefs<T, R>>) => Route<MergeRouteDefs<T, R>>;
-    get: <R extends RouteDef>(path: string, config?: RouteConfig<R>) => (handler: RouteDefHandler<MergeRouteDefs<T, R>>) => Route<MergeRouteDefs<T, R>>;
-    post: <R extends RouteDef>(path: string, config?: RouteConfig<R>) => (handler: RouteDefHandler<MergeRouteDefs<T, R>>) => Route<MergeRouteDefs<T, R>>;
-    put: <R extends RouteDef>(path: string, config?: RouteConfig<R>) => (handler: RouteDefHandler<MergeRouteDefs<T, R>>) => Route<MergeRouteDefs<T, R>>;
-    patch: <R extends RouteDef>(path: string, config?: RouteConfig<R>) => (handler: RouteDefHandler<MergeRouteDefs<T, R>>) => Route<MergeRouteDefs<T, R>>;
-    delete: <R extends RouteDef>(path: string, config?: RouteConfig<R>) => (handler: RouteDefHandler<MergeRouteDefs<T, R>>) => Route<MergeRouteDefs<T, R>>;
-    options: <R extends RouteDef>(path: string, config?: RouteConfig<R>) => (handler: RouteDefHandler<MergeRouteDefs<T, R>>) => Route<MergeRouteDefs<T, R>>;
-    nest(...routers: Router<any>[]): void;
-    get routes(): Route<any>[];
-}
-
-type OnJoinFn = (data: {
-    channel: string;
-    user: AuthUser | null;
-}, params: Record<string, any>, query: Record<string, any>) => Promise<string | null>;
-type SocketCallbacks = {
-    onConnect: (userId: string, socketId: string) => Promise<void>;
-    onDisconnect: (userId: string, socketId: string) => Promise<void>;
-};
-declare class SocketEmitter {
-    #private;
-    private config;
-    readonly socketInstance: Server$1;
-    constructor(socket: Server$1, config: ServerConfig);
-    created<T extends Entity>(channels: string[], data: T, to: string | string[] | null): Promise<void>;
-    updated<T extends Entity>(channels: string[], { after, before }: {
-        after: T;
-        before: T;
-    }, to: string | string[] | null): Promise<void>;
-    deleted<T extends Entity>(channels: string[], data: T, to: string | string[] | null): Promise<void>;
-    set connectionCallbacks(callbacks: SocketCallbacks);
-    register(channel: string, onJoin: OnJoinFn): this;
-}
-
-declare abstract class Server<Req = any, Res = any> {
-    #private;
-    private config;
-    private implementations;
-    socket: SocketEmitter;
-    protected server: http.Server;
-    protected get cors(): CorsOptions & FastifyCorsOptions;
-    constructor(server: http.Server, config: ServerConfig, implementations: {
-        parseRequest: (req: Req) => Promise<Request<any>>;
-        handleResponse: (res: Res, response: Response<any>) => Promise<void>;
-        registerRoute: (method: MethodsEnum, path: string, cb: (req: Req, res: Res) => Promise<void>) => void;
-        registerErrorHandler: (cb: (error: Error, req: Req, res: Res) => Promise<void>) => void;
-        registerNotFoundHandler: (cb: (req: Req, res: Res) => Promise<void>) => void;
-        start: (port: number) => Promise<boolean>;
-    });
-    addRouter(...routers: Router<any>[]): void;
-    addRoute<T extends RouteDef>(...routes: Route<T>[]): void;
-    test(): supertest_lib_agent<supertest.SuperTestStatic.Test>;
-    start(): Promise<boolean>;
-}
-
-declare class ExpressServer extends Server<express.Request, express.Response> {
-    #private;
-    constructor(config: ServerConfig);
-}
-
-declare class FastifyServer extends Server<FastifyRequest, FastifyReply> {
-    constructor(config: ServerConfig);
-}
-
-export { ExpressServer as E, FastifyServer as F, type OnJoinFn as O, Router as R, Server as S, type SocketCallbacks as a, SocketEmitter as b };