backendium 0.0.10 → 0.0.12

package/src/index.ts

@@ -1,12 +1,13 @@
 import {Request, RequestHandler} from "express";
 import {Server} from "node:http";
-import {BackendiumRouter, MethodType} from "./router.js";
+import {BackendiumRouter} from "./router.js";
 import {EventEmitter, EventKey} from "event-emitter-typescript";
 import {WebSocketExpress, WSRequestHandler} from "websocket-express";
 import {BackendiumWebSocket} from "./ws.js";
-import Logger from "./logger.js";
+import Logger from "./logger";
 import BackendiumResponse from "./response";
 import {ValidationError} from "checkeasy";
+import type {MethodType} from "./httpRouter.js";
 
 export type BackendiumConfigType = {
     port: number,
@@ -108,5 +109,5 @@ export default class Backendium<GlobalAuthType = any> extends BackendiumRouter<G
     }
 }
 
-export * from "./ws.js";
-export * from "./router.js";
+export * from "./ws";
+export * from "./router";

package/src/request.ts

@@ -1,7 +1,7 @@
 import {Request} from "express";
 import Backendium from "./index.js";
 import {ValidationError, Validator} from "checkeasy";
-import BackendiumResponse from "./response.js";
+import BackendiumResponse from "./response";
 
 export type ValidatorsType<BodyType, ParamsType, QueryType, HeadersType> = {
     bodyValidator?: Validator<BodyType>,
@@ -75,10 +75,10 @@ export default async function parseRequest<BodyType, ParamsType, QueryType, Auth
 ): Promise<Omit<Omit<BackendiumRequestType<BodyType, ParamsType, QueryType, AuthType, HeadersType, any>, "auth">, "globalAuth"> | [Buffer, ValidationError]> {
     let bodyBuffer = await getBody(request);
     try {
-        let body = parse(bodyBuffer, bodyValidator);
-        let params = parse(request.params, paramsValidator);
-        let query = parse(request.query, queryValidator);
-        let headers = parse(request.headers, headersValidator);
+        let body = parse(bodyBuffer, bodyValidator, "body");
+        let params = parse(request.params, paramsValidator, "params");
+        let query = parse(request.query, queryValidator, "query");
+        let headers = parse(request.headers, headersValidator, "headers");
         return {
             expressRequest: request, body, params, query, headers, bodyBuffer, app,
             options: {bodyValidator, paramsValidator, queryValidator, headersValidator, ...other}

package/src/router.ts

@@ -4,201 +4,23 @@ import {NextFunction, Request, RequestHandler} from "express";
 import Backendium from "./index.js";
 import {WebSocketRouteConstructor} from "./ws.js";
 import {WSRequestHandler, WSResponse} from "websocket-express";
+import {BackendiumHttpRouter, type MethodType} from "./httpRouter.js";
 
-export type MethodType = "use" | "all" | "get" | "post" | "put" | "delete" | "patch" | "options" | "head" | "checkout"
-    | "connect" | "copy" | "lock" | "merge" | "mkactivity" | "mkcol" | "move" | "m-search" | "notify" | "propfind"
-    | "proppatch" | "purge" | "report" | "search" | "subscribe" | "unsubscribe" | "trace" | "unlock" | "link" | "unlink"
-    | "useHTTP";
-
-export type BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType> =
-    Array<BackendiumHandlerType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>>
-    | [string, ...Array<BackendiumHandlerType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>>]
-    | [...Array<BackendiumHandlerType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>>,
-    BackendiumRequestOptionsType<BodyType, ParamsType, QueryType, AuthType, HeadersType>]
-    | [string, ...Array<BackendiumHandlerType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>>,
-    BackendiumRequestOptionsType<BodyType, ParamsType, QueryType, AuthType, HeadersType>];
-
-export class BackendiumRouter<GlobalAuthType = undefined> {
+export class BackendiumRouter<GlobalAuthType = undefined> extends BackendiumHttpRouter<GlobalAuthType> {
     protected _handlers: Array<[MethodType, string | undefined, Array<ReturnType<RawHandlerType<GlobalAuthType>>>] | ["ws", string, Array<(app: Backendium) => WSRequestHandler>]> = [];
     public authChecker: AuthCheckerType<GlobalAuthType> | undefined;
     public authFailed: AuthFailedType | undefined;
 
-    constructor() {}
-
-    get handlers() {return this._handlers}
-
-    protected parseArgs<BodyType, ParamsType, QueryType, AuthType, HeadersType>(args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>): [string | undefined, Array<RawHandlerType<GlobalAuthType>>] {
-        let route: string | undefined = undefined, options: BackendiumRequestOptionsType<BodyType, ParamsType, QueryType, AuthType, HeadersType> | undefined = undefined;
-        let handlers: Array<BackendiumHandlerType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>> = args.map(elem => {
-            if (typeof elem === "string") route = elem;
-            if (typeof elem === "function") return elem;
-            // @ts-ignore
-            else options = elem;
-        }).filter(elem => typeof elem === "function");
-        return [route, handlers.map(handler => backendiumHandler(handler, options ?? {auth: false}))];
-    }
-
-    public addHandler<BodyType, ParamsType, QueryType, AuthType, HeadersType>(method: MethodType,
-        ...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        let [route, handlers] = this.parseArgs(args);
-        this._handlers.push([method, route, handlers.map(handler => handler(this))]);
-    }
-
-    use<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("use", ...args);
-    }
-
-    useHTTP<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("useHTTP", ...args);
-    }
-
-    all<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("all", ...args);
-    }
-
-    get<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("get", ...args);
-    }
-
-    post<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("post", ...args);
-    }
-
-    put<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
+    protected pushHandlers<BodyType, ParamsType, QueryType, AuthType, HeadersType>(
+        method: MethodType,
+        path: string | undefined,
+        options: BackendiumRequestOptionsType<BodyType, ParamsType, QueryType, AuthType, HeadersType> | undefined,
+        handlers: Array<BackendiumHandlerType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>>
     ): void {
-        this.addHandler("put", ...args);
+        this._handlers.push([method, path, handlers.map(handler => backendiumHandler(handler, options ?? { auth: false })(this))])
     }
 
-    delete<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("delete", ...args);
-    }
-
-    patch<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("patch", ...args);
-    }
-
-    options<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("options", ...args);
-    }
-
-    head<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("head", ...args);
-    }
-
-    checkout<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("checkout", ...args);
-    }
-
-    connect<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("connect", ...args);
-    }
-
-    copy<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("copy", ...args);
-    }
-
-    lock<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("lock", ...args);
-    }
-
-    merge<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("merge", ...args);
-    }
-
-    mkactivity<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("mkactivity", ...args);
-    }
-
-    mkcol<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("mkcol", ...args);
-    }
-
-    move<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("move", ...args);
-    }
-
-    "m-search"<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("m-search", ...args);
-    }
-
-    notify<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("notify", ...args);
-    }
-
-    propfind<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("propfind", ...args);
-    }
-
-    proppatch<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("proppatch", ...args);
-    }
-
-    purge<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("purge", ...args);
-    }
-
-    report<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("report", ...args);
-    }
-
-    search<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("search", ...args);
-    }
-
-    subscribe<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("subscribe", ...args);
-    }
-
-    unsubscribe<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("unsubscribe", ...args);
-    }
-
-    trace<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("trace", ...args);
-    }
-
-    unlock<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("unlock", ...args);
-    }
-
-    link<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("link", ...args);
-    }
-
-    unlink<BodyType = Buffer, ParamsType = {}, QueryType = {}, AuthType = GlobalAuthType, HeadersType = {}>(...args: BackendiumMethodArgsType<BodyType, ParamsType, QueryType, AuthType, HeadersType, GlobalAuthType>
-    ): void {
-        this.addHandler("unlink", ...args);
-    }
+    get handlers() {return this._handlers}
 
     ws<InitDataType>(route: string) {
         let constructor = new WebSocketRouteConstructor<InitDataType>;

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig to read more about this file */
-    "target": "ES2022",
+    "target": "es2016",
     "module": "ES2022",
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,