equipped 5.0.0-beta.9 → 5.0.0-rc.2

package/lib/server/impls/base.js

@@ -1,19 +1,7 @@
 "use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _Server_instances, _Server_schemas, _Server_listener, _Server_regRoute;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Server = void 0;
 const socket_io_1 = __importDefault(require("socket.io"));
@@ -22,73 +10,162 @@ const path_1 = __importDefault(require("path"));
 const instance_1 = require("../../instance");
 const listeners_1 = require("../../listeners");
 const middlewares_1 = require("../middlewares");
+const requests_1 = require("../requests");
 const routes_1 = require("../routes");
+const types_1 = require("../types");
 class Server {
-    constructor(server) {
-        _Server_instances.add(this);
-        _Server_schemas.set(this, {});
-        _Server_listener.set(this, null);
-        this.staticPath = path_1.default.join(process.cwd(), 'public');
-        this.settings = instance_1.Instance.get().settings;
-        this.baseOpenapiDoc = {
-            openapi: '3.0.0',
-            info: { title: this.settings.appId, version: this.settings.openapiDocsVersion },
-            paths: {},
-            components: {
-                schemas: {},
-                securitySchemes: {
-                    AccessToken: {
-                        type: 'apiKey',
-                        name: 'Access-Token',
-                        in: 'header',
-                    },
-                    RefreshToken: {
-                        type: 'apiKey',
-                        name: 'Refresh-Token',
-                        in: 'header',
-                    }
+    #routesByPath = new Map();
+    #routesByKey = new Map();
+    #schemas = {};
+    #listener = null;
+    #registeredTags = {};
+    #registeredTagGroups = {};
+    server;
+    staticPath = path_1.default.join(process.cwd(), 'public');
+    settings = instance_1.Instance.get().settings;
+    openapiJsonUrl = `${this.settings.openapiDocsPath}/openapi.json`;
+    baseOpenapiDoc = {
+        openapi: '3.0.0',
+        info: { title: this.settings.appId, version: this.settings.openapiDocsVersion },
+        servers: this.settings.openapiDocsBaseUrl.map((url) => ({ url })),
+        paths: {},
+        components: {
+            schemas: {},
+            securitySchemes: {
+                AccessToken: {
+                    type: 'apiKey',
+                    name: 'Access-Token',
+                    in: 'header',
                 },
-            }
-        };
+                RefreshToken: {
+                    type: 'apiKey',
+                    name: 'Refresh-Token',
+                    in: 'header',
+                }
+            },
+        },
+        tags: [],
+        'x-tagGroups': [],
+    };
+    constructor(server) {
         this.server = server;
     }
     get listener() {
-        if (!__classPrivateFieldGet(this, _Server_listener, "f")) {
+        if (!this.#listener) {
             const socket = new socket_io_1.default.Server(this.server, { cors: { origin: '*' } });
-            __classPrivateFieldSet(this, _Server_listener, new listeners_1.Listener(socket, {
+            this.#listener = new listeners_1.Listener(socket, {
                 onConnect: async () => { },
                 onDisconnect: async () => { }
-            }), "f");
+            });
         }
-        return __classPrivateFieldGet(this, _Server_listener, "f");
+        return this.#listener;
+    }
+    addRouter(...routers) {
+        routers.map((router) => router.routes).forEach((routes) => this.addRoute(...routes));
     }
-    addRoutes(routes) {
-        routes.forEach((route) => __classPrivateFieldGet(this, _Server_instances, "m", _Server_regRoute).call(this, route));
+    addRoute(...routes) {
+        routes.forEach((route) => this.#regRoute(route));
     }
-    addSchema(schemas) {
-        Object.assign(__classPrivateFieldGet(this, _Server_schemas, "f"), schemas);
+    addSchema(...schemas) {
+        schemas.forEach((schema) => Object.assign(this.#schemas, schema));
     }
     async load() {
         await this.onLoad();
     }
-    register(router) {
-        const routers = Array.isArray(router) ? router : [router];
-        routers.map((router) => router.routes).forEach((routes) => this.addRoutes(routes));
+    #buildTag(groups) {
+        if (!groups.length)
+            return undefined;
+        const parsed = groups.map((g) => typeof g === 'string' ? { name: g } : g);
+        const name = parsed.map((g) => g.name).join(' > ');
+        const displayName = parsed.at(-1)?.name ?? '';
+        const description = parsed.map((g) => g.description?.trim() ?? '').filter(Boolean).join('\n\n\n\n');
+        if (!this.#registeredTags[name]) {
+            this.#registeredTags[name] = true;
+            this.baseOpenapiDoc.tags.push({ name, 'x-displayName': displayName, description });
+            const tagGroups = parsed.slice(0, -1);
+            const groupName = tagGroups.map((g) => g.name).join(' > ') || 'default';
+            if (!this.#registeredTagGroups[groupName]) {
+                const group = { name: groupName, tags: [] };
+                this.baseOpenapiDoc['x-tagGroups'].push(group);
+                this.#registeredTagGroups[groupName] = group;
+            }
+            this.#registeredTagGroups[groupName].tags = [...new Set([...this.#registeredTagGroups[groupName].tags, name])];
+        }
+        return name;
+    }
+    #regRoute(route) {
+        const middlewares = [middlewares_1.parseAuthUser, ...(route.middlewares ?? [])];
+        route.onSetupHandler?.(route);
+        middlewares.forEach((m) => m.onSetup?.(route));
+        route.onError?.onSetup?.(route);
+        const { method, path, handler, schema, security, onError, hideSchema = false } = route;
+        const pathKey = `(${method.toUpperCase()}) ${path}`;
+        const { key = pathKey } = route;
+        const tag = this.#buildTag(route.groups ?? []);
+        const scheme = Object.assign({}, schema, this.#schemas[key]);
+        const fullRoute = {
+            method, middlewares, handler, key,
+            path: (0, routes_1.cleanPath)(path),
+            onError,
+            schema: {
+                ...scheme,
+                ...(scheme.title ? { summary: scheme.title } : {}),
+                summary: scheme.title ?? scheme.summary ?? (0, routes_1.cleanPath)(path),
+                hide: hideSchema,
+                tags: tag ? [tag] : undefined,
+                description: route.descriptions?.join('\n\n'),
+                security,
+            }
+        };
+        if (this.#routesByPath.get(pathKey))
+            throw new Error(`Route path ${pathKey} already registered. All route paths and methods combinations must be unique`);
+        if (this.#routesByKey.get(key))
+            throw new Error(`Route key ${fullRoute.key} already registered. All route keys must be unique`);
+        this.#routesByPath.set(pathKey, fullRoute);
+        this.#routesByKey.set(key, fullRoute);
+        this.registerRoute(fullRoute);
     }
     test() {
         return (0, supertest_1.default)(this.server);
     }
     async start(port) {
-        const postRoutesRouter = new routes_1.Router();
-        postRoutesRouter.get({
+        this.addRoute({
+            method: 'get',
+            path: `${this.settings.openapiDocsPath}/`,
+            handler: () => new requests_1.Response({
+                status: types_1.StatusCodes.Found,
+                headers: { 'Location': './index.html' },
+            }),
+            hideSchema: true,
+        });
+        this.addRoute({
+            method: 'get',
+            path: `${this.settings.openapiDocsPath}/index.html`,
+            handler: () => new requests_1.Response({
+                body: scalarHtml
+                    .replaceAll('__API_TITLE__', this.settings.appId)
+                    .replaceAll('__OPENAPI_JSON_URL__', './openapi.json'),
+                headers: { 'Content-Type': 'text/html' },
+            }),
+            hideSchema: true,
+        });
+        this.addRoute({
+            method: 'get',
+            path: `${this.settings.openapiDocsPath}/redoc.html`,
+            handler: () => new requests_1.Response({
+                body: redocHtml
+                    .replaceAll('__API_TITLE__', this.settings.appId)
+                    .replaceAll('__OPENAPI_JSON_URL__', './openapi.json'),
+                headers: { 'Content-Type': 'text/html' },
+            }),
+            hideSchema: true,
+        });
+        this.addRoute({
+            method: 'get',
             path: '__health',
-            schema: {
-                response: {
-                    200: { type: 'string' },
-                }
-            }
-        })(async () => `${this.settings.appId} service running`);
-        this.register(postRoutesRouter);
+            handler: async () => `${this.settings.appId} service running`,
+            hideSchema: true,
+        });
         const started = await this.startServer(port);
         if (started)
             await instance_1.Instance.get().logger.info(`${this.settings.appId} service listening on port ${port}`);
@@ -96,26 +173,46 @@ class Server {
     }
 }
 exports.Server = Server;
-_Server_schemas = new WeakMap(), _Server_listener = new WeakMap(), _Server_instances = new WeakSet(), _Server_regRoute = function _Server_regRoute(route) {
-    const { method, path, middlewares = [], handler, schema, tags, security, descriptions, onError, hideSchema = false } = route;
-    const { key = `${method.toLowerCase()} ${path}` } = route;
-    const allMiddlewares = [middlewares_1.parseAuthUser, ...middlewares];
-    allMiddlewares.forEach((m) => m.onSetup?.(route));
-    route.onSetupHandler?.(route);
-    onError?.onSetup?.(route);
-    const scheme = schema ?? __classPrivateFieldGet(this, _Server_schemas, "f")[key] ?? {};
-    const fullRoute = {
-        method, middlewares, handler, key,
-        path: path.replace(/(\/\s*)+/g, '/'),
-        onError,
-        schema: {
-            ...scheme,
-            hide: hideSchema,
-            operationId: scheme.operationId ?? handler.name,
-            tags: tags?.length ? [tags.join(' > ')] : undefined,
-            description: descriptions?.join(' | '),
-            security,
-        }
-    };
-    this.registerRoute(fullRoute);
-};
+const scalarHtml = `
+<!doctype html>
+<html>
+  <head>
+    <title>__API_TITLE__</title>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+	<style>
+      .darklight-reference {
+        display: none;
+      }
+    </style>
+  </head>
+  <body>
+    <script id="api-reference" data-url="__OPENAPI_JSON_URL__"></script>
+    <script>
+      const configuration = { theme: 'purple' };
+      document.getElementById('api-reference').dataset.configuration = JSON.stringify(configuration);
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/@scalar/api-reference@1.24.36"></script>
+  </body>
+</html>
+`;
+const redocHtml = `
+<!doctype html>
+<html>
+  <head>
+    <title>__API_TITLE__</title>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+	<style>
+      body {
+        margin: 0;
+        padding: 0;
+      }
+    </style>
+  </head>
+  <body>
+    <redoc spec-url="__OPENAPI_JSON_URL__"></redoc>
+    <script src="https://cdn.redoc.ly/redoc/v2.1.5/bundles/redoc.standalone.js"> </script>
+  </body>
+</html>
+`;

package/lib/server/impls/express.d.ts

@@ -1,6 +1,5 @@
 import express from 'express';
 import { Defined } from '../../types';
-import { Request, Response } from '../requests';
 import { Route } from '../types';
 import { FullRoute, Server } from './base';
 export declare class ExpressServer extends Server<express.Request, express.Response> {

package/lib/server/impls/express.js

@@ -1,19 +1,7 @@
 "use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _ExpressServer_expressApp, _ExpressServer_oapi, _ExpressServer_ref;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpressServer = void 0;
 const utils_1 = require("@fastify/swagger/lib/spec/openapi/utils");
@@ -23,7 +11,6 @@ const cors_1 = __importDefault(require("cors"));
 const express_1 = __importDefault(require("express"));
 const express_fileupload_1 = __importDefault(require("express-fileupload"));
 const express_rate_limit_1 = __importDefault(require("express-rate-limit"));
-const express_slow_down_1 = __importDefault(require("express-slow-down"));
 const helmet_1 = __importDefault(require("helmet"));
 const http_1 = __importDefault(require("http"));
 const json_schema_resolver_1 = __importDefault(require("json-schema-resolver"));
@@ -37,25 +24,27 @@ const requests_1 = require("../requests");
 const types_1 = require("../types");
 const base_1 = require("./base");
 class ExpressServer extends base_1.Server {
+    #expressApp;
+    #oapi = (0, openapi_1.default)(this.openapiJsonUrl.replace('.json', ''), this.baseOpenapiDoc, { coerce: false });
+    #ref = (0, json_schema_resolver_1.default)({ clone: true });
     constructor() {
         const app = (0, express_1.default)();
         super(http_1.default.createServer(app));
-        _ExpressServer_expressApp.set(this, void 0);
-        _ExpressServer_oapi.set(this, (0, openapi_1.default)(`${this.settings.openapiDocsUrl}/json`, this.baseOpenapiDoc, { coerce: false }));
-        _ExpressServer_ref.set(this, (0, json_schema_resolver_1.default)({ clone: true }));
-        __classPrivateFieldSet(this, _ExpressServer_expressApp, app, "f");
+        this.#expressApp = app;
         app.disable('x-powered-by');
         if (this.settings.logRequests)
             app.use((0, pino_http_1.pinoHttp)({ logger: instance_1.Instance.get().logger }));
         app.use(express_1.default.json());
         app.use(express_1.default.text());
         app.use((0, cookie_parser_1.default)());
-        app.use(helmet_1.default.crossOriginResourcePolicy({ policy: 'cross-origin' }));
+        app.use((0, helmet_1.default)({
+            crossOriginResourcePolicy: { policy: 'cross-origin' },
+            contentSecurityPolicy: false
+        }));
         app.use((0, cors_1.default)({ origin: '*' }));
         app.use(express_1.default.urlencoded({ extended: false }));
         app.use(express_1.default.static(this.staticPath));
-        app.use(__classPrivateFieldGet(this, _ExpressServer_oapi, "f"));
-        app.use(this.settings.openapiDocsUrl, __classPrivateFieldGet(this, _ExpressServer_oapi, "f").swaggerui());
+        app.use(this.#oapi);
         app.use((0, express_fileupload_1.default)({
             limits: { fileSize: this.settings.maxFileUploadSizeInMb * 1024 * 1024 },
             useTempFiles: false
@@ -66,21 +55,15 @@ class ExpressServer extends base_1.Server {
                 limit: this.settings.rateLimit,
                 handler: (_, res) => res.status(types_1.StatusCodes.TooManyRequests).json([{ message: 'Too Many Requests' }])
             }));
-        if (this.settings.useSlowDown)
-            app.use((0, express_slow_down_1.default)({
-                windowMs: this.settings.slowDownPeriodInMs,
-                delayAfter: this.settings.slowDownAfter,
-                delayMs: this.settings.slowDownDelayInMs
-            }));
     }
     registerRoute(route) {
-        const openapi = (0, utils_1.prepareOpenapiMethod)(route.schema, __classPrivateFieldGet(this, _ExpressServer_ref, "f"), this.baseOpenapiDoc, route.path);
+        const openapi = (0, utils_1.prepareOpenapiMethod)(route.schema, this.#ref, this.baseOpenapiDoc, route.path);
         const controllers = [
             ...route.middlewares.map((m) => this.makeMiddleware(m.cb)),
             this.makeController(route.handler)
         ];
         if (!route.schema.hide)
-            controllers.unshift(__classPrivateFieldGet(this, _ExpressServer_oapi, "f")[this.settings.requestSchemaValidation ? 'validPath' : 'path'](openapi), (error, _, __, next) => {
+            controllers.unshift(this.#oapi[this.settings.requestSchemaValidation ? 'validPath' : 'path'](openapi), (error, _, __, next) => {
                 if ('validationErrors' in error) {
                     const validationErrors = error.validationErrors;
                     throw new errors_1.ValidationError(validationErrors.map((error) => ({
@@ -92,11 +75,11 @@ class ExpressServer extends base_1.Server {
             });
         if (route.onError)
             controllers.push(this.makeErrorMiddleware(route.onError.cb));
-        __classPrivateFieldGet(this, _ExpressServer_expressApp, "f")[route.method]?.(route.path, ...controllers);
+        this.#expressApp[route.method]?.(route.path, ...controllers);
     }
     async startServer(port) {
-        __classPrivateFieldGet(this, _ExpressServer_expressApp, "f").use(this.makeMiddleware(middlewares_1.notFoundHandler.cb));
-        __classPrivateFieldGet(this, _ExpressServer_expressApp, "f").use(this.makeErrorMiddleware(middlewares_1.errorHandler.cb));
+        this.#expressApp.use(this.makeMiddleware(middlewares_1.notFoundHandler.cb));
+        this.#expressApp.use(this.makeErrorMiddleware(middlewares_1.errorHandler.cb));
         return await new Promise((resolve, reject) => {
             try {
                 const app = this.server.listen({ host: '0.0.0.0', port }, async () => resolve(true));
@@ -130,7 +113,7 @@ class ExpressServer extends base_1.Server {
             })));
             return [key, fileArray];
         })));
-        return req.savedReq || (req.savedReq = new requests_1.Request({
+        return req.savedReq ||= new requests_1.Request({
             ip: req.ip,
             body: req.body ?? {},
             cookies: req.cookies ?? {},
@@ -139,7 +122,7 @@ class ExpressServer extends base_1.Server {
             method: req.method,
             path: req.path,
             headers, files,
-        }, res));
+        }, res);
     }
     makeController(cb) {
         return async (req, res, next) => {
@@ -180,4 +163,3 @@ class ExpressServer extends base_1.Server {
     }
 }
 exports.ExpressServer = ExpressServer;
-_ExpressServer_expressApp = new WeakMap(), _ExpressServer_oapi = new WeakMap(), _ExpressServer_ref = new WeakMap();

package/lib/server/impls/fastify.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node/http" />
-/// <reference types="pino-http" />
 import { FastifyReply, FastifyRequest, preHandlerHookHandler, RouteHandlerMethod } from 'fastify';
 import { Defined } from '../../types';
 import { Request } from '../requests';
@@ -11,10 +9,10 @@ export declare class FastifyServer extends Server<FastifyRequest, FastifyReply>
     protected onLoad(): Promise<void>;
     protected registerRoute(route: FullRoute): void;
     protected startServer(port: number): Promise<boolean>;
-    protected parse(req: FastifyRequest, res: FastifyReply): Promise<Request<import("../types").Api<any, string, import("../types").MethodTypes, any, Record<string, boolean>, Record<string, string>, Record<string, any>, import("../types").SupportedStatusCodes>>>;
+    protected parse(req: FastifyRequest, res: FastifyReply): Promise<Request<import("../types").Api<any, string, import("../types").MethodTypes, any, Record<string, string>, Record<string, any>, Record<string, string | string[]>, Record<string, string | string[]>, import("../types").SupportedStatusCodes>>>;
     makeController(cb: Defined<Route['handler']>): RouteHandlerMethod;
     makeMiddleware(cb: Defined<Route['middlewares']>[number]['cb']): preHandlerHookHandler<import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").RouteGenericInterface, unknown, import("fastify").FastifySchema, import("fastify").FastifyTypeProviderDefault, import("fastify").FastifyBaseLogger>;
-    makeErrorMiddleware(cb: Defined<Route['onError']>['cb']): (error: import("fastify").FastifyError, request: FastifyRequest<import("fastify").RouteGenericInterface, import("fastify").RawServerDefault, import("http").IncomingMessage, import("fastify").FastifySchema, import("fastify").FastifyTypeProviderDefault, unknown, import("fastify").FastifyBaseLogger, import("fastify/types/type-provider").ResolveFastifyRequestType<import("fastify").FastifyTypeProviderDefault, import("fastify").FastifySchema, import("fastify").RouteGenericInterface>>, reply: FastifyReply<import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").RouteGenericInterface, unknown, import("fastify").FastifySchema, import("fastify").FastifyTypeProviderDefault, unknown>) => void;
+    makeErrorMiddleware(cb: Defined<Route['onError']>['cb']): (error: import("fastify").FastifyError, request: FastifyRequest, reply: FastifyReply) => void;
 }
 declare module 'fastify' {
     interface FastifyRequest {

package/lib/server/impls/fastify.js

@@ -1,19 +1,7 @@
 "use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _FastifyServer_fastifyApp;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FastifyServer = void 0;
 const cookie_1 = __importDefault(require("@fastify/cookie"));
@@ -24,9 +12,7 @@ const multipart_1 = __importDefault(require("@fastify/multipart"));
 const rate_limit_1 = __importDefault(require("@fastify/rate-limit"));
 const static_1 = __importDefault(require("@fastify/static"));
 const swagger_1 = __importDefault(require("@fastify/swagger"));
-const swagger_ui_1 = __importDefault(require("@fastify/swagger-ui"));
 const fastify_1 = __importDefault(require("fastify"));
-const fastify_slow_down_1 = __importDefault(require("fastify-slow-down"));
 const qs_1 = __importDefault(require("qs"));
 const errors_1 = require("../../errors");
 const exit_1 = require("../../exit");
@@ -39,25 +25,29 @@ const base_1 = require("./base");
 function getFastifyApp() {
     const instance = instance_1.Instance.get();
     return (0, fastify_1.default)({
+        ignoreTrailingSlash: true,
+        caseSensitive: false,
         logger: instance.settings.logRequests ? instance.logger : false,
         ajv: { customOptions: { coerceTypes: false } },
         schemaErrorFormatter: (errors, data) => new errors_1.ValidationError(errors.map((error) => ({ messages: [error.message ?? ''], field: `${data}${error.instancePath}`.replaceAll('/', '.') })))
     });
 }
 class FastifyServer extends base_1.Server {
+    #fastifyApp;
     constructor() {
         const app = getFastifyApp();
         super(app.server);
-        _FastifyServer_fastifyApp.set(this, void 0);
-        __classPrivateFieldSet(this, _FastifyServer_fastifyApp, app, "f");
+        this.#fastifyApp = app;
         app.decorateRequest('savedReq', null);
         app.register(static_1.default, { root: this.staticPath });
         app.register(cookie_1.default, {});
         app.register(cors_1.default, { origin: '*' });
         app.register(swagger_1.default, { openapi: this.baseOpenapiDoc });
-        app.register(swagger_ui_1.default, { routePrefix: this.settings.openapiDocsUrl });
+        app.get(this.openapiJsonUrl, (_, res) => {
+            res.code(200).send(app.swagger({}));
+        });
         app.register(formbody_1.default, { parser: (str) => qs_1.default.parse(str) });
-        app.register(helmet_1.default, { crossOriginResourcePolicy: { policy: 'cross-origin' } });
+        app.register(helmet_1.default, { crossOriginResourcePolicy: { policy: 'cross-origin' }, contentSecurityPolicy: false });
         app.register(multipart_1.default, {
             attachFieldsToBody: 'keyValues',
             throwFileSizeLimit: false,
@@ -75,12 +65,6 @@ class FastifyServer extends base_1.Server {
                 f.value = parsed;
             }
         });
-        if (this.settings.useSlowDown)
-            app.register(fastify_slow_down_1.default, {
-                timeWindow: this.settings.slowDownPeriodInMs,
-                delayAfter: this.settings.slowDownAfter,
-                delay: this.settings.slowDownDelayInMs
-            });
         if (this.settings.useRateLimit)
             app.register(rate_limit_1.default, {
                 max: this.settings.rateLimit,
@@ -96,10 +80,10 @@ class FastifyServer extends base_1.Server {
         }
     }
     async onLoad() {
-        await __classPrivateFieldGet(this, _FastifyServer_fastifyApp, "f").ready();
+        await this.#fastifyApp.ready();
     }
     registerRoute(route) {
-        __classPrivateFieldGet(this, _FastifyServer_fastifyApp, "f").register(async (inst) => {
+        this.#fastifyApp.register(async (inst) => {
             inst.route({
                 url: route.path,
                 method: route.method,
@@ -111,24 +95,24 @@ class FastifyServer extends base_1.Server {
         });
     }
     async startServer(port) {
-        __classPrivateFieldGet(this, _FastifyServer_fastifyApp, "f").setNotFoundHandler(this.makeController(middlewares_1.notFoundHandler.cb));
-        __classPrivateFieldGet(this, _FastifyServer_fastifyApp, "f").setErrorHandler(this.makeErrorMiddleware(middlewares_1.errorHandler.cb));
-        await __classPrivateFieldGet(this, _FastifyServer_fastifyApp, "f").listen({ port, host: '0.0.0.0' });
-        (0, exit_1.addWaitBeforeExit)(__classPrivateFieldGet(this, _FastifyServer_fastifyApp, "f").close);
+        this.#fastifyApp.setNotFoundHandler(this.makeController(middlewares_1.notFoundHandler.cb));
+        this.#fastifyApp.setErrorHandler(this.makeErrorMiddleware(middlewares_1.errorHandler.cb));
+        await this.#fastifyApp.listen({ port, host: '0.0.0.0' });
+        (0, exit_1.addWaitBeforeExit)(this.#fastifyApp.close);
         return true;
     }
     async parse(req, res) {
         const allHeaders = Object.fromEntries(Object.entries(req.headers).map(([key, val]) => [key, val ?? null]));
         const headers = {
             ...allHeaders,
-            AccessToken: req.headers['Access-Token']?.toString() ?? null,
-            RefreshToken: req.headers['Refresh-Token']?.toString() ?? null,
-            ContentType: req.headers['Content-Type']?.toString() ?? null,
+            AccessToken: req.headers['access-token']?.toString() ?? null,
+            RefreshToken: req.headers['refresh-token']?.toString() ?? null,
+            ContentType: req.headers['content-type']?.toString() ?? null,
             Referer: req.headers['referer']?.toString() ?? null,
-            UserAgent: req.headers['User-Agent']?.toString() ?? null
+            UserAgent: req.headers['user-agent']?.toString() ?? null
         };
         const { body, files } = excludeBufferKeys(req.body ?? {});
-        return req.savedReq || (req.savedReq = new requests_1.Request({
+        return req.savedReq ||= new requests_1.Request({
             ip: req.ip,
             body,
             cookies: req.cookies ?? {},
@@ -138,15 +122,14 @@ class FastifyServer extends base_1.Server {
             path: req.url,
             headers,
             files,
-        }, res.raw));
+        }, res.raw);
     }
     makeController(cb) {
         const handler = async (req, reply) => {
             const rawResponse = await cb(await this.parse(req, reply));
             const response = rawResponse instanceof requests_1.Response ? rawResponse : new requests_1.Response({ body: rawResponse });
-            const type = response.shouldJSONify ? 'json' : 'send';
             if (!response.piped)
-                reply.status(response.status).headers(response.headers)[type](response.body);
+                reply.status(response.status).headers(response.headers).send(response.body);
         };
         return handler;
     }
@@ -167,7 +150,6 @@ class FastifyServer extends base_1.Server {
     }
 }
 exports.FastifyServer = FastifyServer;
-_FastifyServer_fastifyApp = new WeakMap();
 function excludeBufferKeys(body) {
     if (typeof body !== 'object')
         return { body: body, files: {} };

package/lib/server/middlewares/errorHandler.d.ts

@@ -1,4 +1,4 @@
 export declare const errorHandler: {
-    cb: import("../types").ErrorHandler<import("../types").Api<any, string, import("../types").MethodTypes, any, Record<string, boolean>, Record<string, string>, Record<string, any>, import("../types").SupportedStatusCodes>>;
-    onSetup?: import("../types").HandlerSetup | undefined;
+    cb: import("../types").ErrorHandler<import("../types").Api<any, string, import("../types").MethodTypes, any, Record<string, string>, Record<string, any>, Record<string, string | string[]>, Record<string, string | string[]>, import("../types").SupportedStatusCodes>>;
+    onSetup?: import("../types").HandlerSetup;
 };

package/lib/server/middlewares/notFoundHandler.d.ts

@@ -1,4 +1,4 @@
 export declare const notFoundHandler: {
-    cb: import("../types").RouteMiddlewareHandler<import("../types").Api<any, string, import("../types").MethodTypes, any, Record<string, boolean>, Record<string, string>, Record<string, any>, import("../types").SupportedStatusCodes>>;
-    onSetup?: import("../types").HandlerSetup | undefined;
+    cb: import("../types").RouteMiddlewareHandler<import("../types").Api<any, string, import("../types").MethodTypes, any, Record<string, string>, Record<string, any>, Record<string, string | string[]>, Record<string, string | string[]>, import("../types").SupportedStatusCodes>>;
+    onSetup?: import("../types").HandlerSetup;
 };

package/lib/server/middlewares/parseAuthUser.d.ts

@@ -1,4 +1,4 @@
 export declare const parseAuthUser: {
-    cb: import("../types").RouteMiddlewareHandler<import("../types").Api<any, string, import("../types").MethodTypes, any, Record<string, boolean>, Record<string, string>, Record<string, any>, import("../types").SupportedStatusCodes>>;
-    onSetup?: import("../types").HandlerSetup | undefined;
+    cb: import("../types").RouteMiddlewareHandler<import("../types").Api<any, string, import("../types").MethodTypes, any, Record<string, string>, Record<string, any>, Record<string, string | string[]>, Record<string, string | string[]>, import("../types").SupportedStatusCodes>>;
+    onSetup?: import("../types").HandlerSetup;
 };

package/lib/server/middlewares/requireAuthUser.d.ts

@@ -1,4 +1,4 @@
 export declare const requireAuthUser: {
-    cb: import("../types").RouteMiddlewareHandler<import("../types").Api<any, string, import("../types").MethodTypes, any, Record<string, boolean>, Record<string, string>, Record<string, any>, import("../types").SupportedStatusCodes>>;
-    onSetup?: import("../types").HandlerSetup | undefined;
+    cb: import("../types").RouteMiddlewareHandler<import("../types").Api<any, string, import("../types").MethodTypes, any, Record<string, string>, Record<string, any>, Record<string, string | string[]>, Record<string, string | string[]>, import("../types").SupportedStatusCodes>>;
+    onSetup?: import("../types").HandlerSetup;
 };