@typetron/framework 0.4.0-rc1 → 0.4.0-rc13

package/Router/Http/Handler.js

@@ -14,7 +14,9 @@ const Container_1 = require("../../Container");
 const __1 = require("../");
 const _1 = require("./");
 const Request_1 = require("./Request");
+const HttpRoute_1 = require("./HttpRoute");
 const Framework_1 = require("../../Framework");
+const Request_2 = require("../Request");
 const Servers_1 = require("@Typetron/Router/Servers");
 const httpServers = {
     node: Servers_1.nodeServer,
@@ -26,7 +28,7 @@ class Handler {
     }
     addRoute(uri, method, controller, action, name, parametersTypes = [], middleware = []) {
         uri = this.prepareUri(uri);
-        const route = new __1.Route(uri, method, controller, action, name, parametersTypes, middleware);
+        const route = new HttpRoute_1.HttpRoute(uri, method, name, controller, action, parametersTypes, middleware);
         if (this.router.routes.find(item => item.uri === uri && item.method === method)) {
             throw new Error(`There is already a route with the same url: [${method}] '${uri}'`);
         }
@@ -54,15 +56,15 @@ class Handler {
     }
     async handle(app, request) {
         const container = app.createChildContainer();
+        container.set(Request_2.Request, request);
         container.set(Request_1.Request, request);
         let stack = async () => {
-            const routeIndex = this.cachedRoutes[`${request.method} ${request.uri}`]
+            const [route, parameters] = this.cachedRoutes[`${request.method} ${request.uri}`]
                 ?? this.findRouteIndex(request.uri ?? '', request.method);
-            const route = this.router.routes[routeIndex];
-            container.set(__1.Route, route);
-            request.parameters = route.parameters;
+            container.set(HttpRoute_1.HttpRoute, route);
+            request.parameters = parameters;
             let routeStack = async () => {
-                const content = await route.run(container);
+                const content = await route.run(container, request.parameters);
                 if (content instanceof _1.Response) {
                     return content;
                 }
@@ -74,22 +76,51 @@ class Handler {
             });
             return routeStack(request);
         };
-        this.router.middleware.forEach(middlewareClass => {
+        this.router.middleware.global?.forEach(middlewareClass => {
+            const middleware = container.get(middlewareClass);
+            stack = middleware.handle.bind(middleware, request, stack);
+        });
+        this.router.middleware.http?.forEach(middlewareClass => {
             const middleware = container.get(middlewareClass);
             stack = middleware.handle.bind(middleware, request, stack);
         });
         return stack(request);
     }
+    matches(uri, route) {
+        const uriParts = uri.split('/'); // ex: ['users', '1', 'posts'];
+        let part;
+        let parameterTypeIndex = 0;
+        const parameters = {};
+        for (part = 0; part < uriParts.length; part++) {
+            if (!route.uriParts[part]) {
+                return false;
+            }
+            if (route.uriParts[part].type === 'parameter' && route.hasCorrectPrimitiveType(parameterTypeIndex, uriParts[part])) {
+                parameterTypeIndex++;
+                parameters[route.uriParts[part].name] = uriParts[part];
+                continue;
+            }
+            if (route.uriParts[part].name !== uriParts[part]) {
+                return false;
+            }
+        }
+        if (part !== route.uriParts.length) {
+            return false;
+        }
+        return parameters;
+    }
     findRouteIndex(uri, method) {
         const preparedUri = this.prepareUri(uri);
-        const index = this.router.routes.findIndex(route => {
-            return route.method.toLowerCase() === method.toLowerCase() && route.matches(preparedUri);
-        });
-        if (index === -1) {
-            throw new __1.RouteNotFoundError(`[${method}] ${uri}`);
+        for (const route of this.router.routes) {
+            if (route.method.toLowerCase() === method.toLowerCase()) {
+                const parameters = this.matches(preparedUri, route);
+                if (parameters) {
+                    this.cachedRoutes[`${method} ${uri}`] = [route, parameters];
+                    return [route, parameters];
+                }
+            }
         }
-        this.cachedRoutes[`${method} ${uri}`] = index;
-        return index;
+        throw new __1.RouteNotFoundError(`[${method}] ${uri}`);
         // return this.routes
         //     .where('uri', uri)
         //     .findWhere('method', method) || this.routeNotFound(uri);

package/Router/Http/Handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"Handler.js","sourceRoot":"","sources":["../../../Router/Http/Handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Handler.js","sourceRoot":"","sources":["../../../Router/Http/Handler.ts"],"names":[],"mappings":"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"}

package/Router/Http/HttpRoute.d.ts

@@ -0,0 +1,25 @@
+import { Container } from '../../Container';
+import { Abstract, Constructor, Type } from '../../Support';
+import { Route } from '@Typetron/Router';
+import { AnyFunction } from '@Typetron/Support';
+import { HttpMiddleware } from '@Typetron/Router/Http/Middleware';
+export declare class HttpRoute extends Route {
+    uri: string;
+    method: string;
+    name: string;
+    controller: Constructor;
+    controllerMethod: string;
+    parametersTypes: (Type<AnyFunction> | FunctionConstructor)[];
+    middleware: Abstract<HttpMiddleware>[];
+    readonly uriParts: {
+        name: string;
+        type: 'part' | 'parameter';
+    }[];
+    constructor(uri: string, method: string, name: string, controller: Constructor, controllerMethod: string, parametersTypes?: (Type<AnyFunction> | FunctionConstructor)[], middleware?: Abstract<HttpMiddleware>[]);
+    run(container: Container, requestParameters: Record<string, string | number>): Promise<object | string>;
+    splitUriParts(): void;
+    getUrl(parameters: Record<string, string>): string;
+    hasCorrectPrimitiveType(parameterTypeIndex: number, uriPart: string): boolean;
+    private resolveParameters;
+}
+//# sourceMappingURL=HttpRoute.d.ts.map

package/Router/Http/HttpRoute.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"HttpRoute.d.ts","sourceRoot":"","sources":["../../../Router/Http/HttpRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAE3D,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAEjE,qBAAa,SAAU,SAAQ,KAAK;IAKrB,GAAG,EAAE,MAAM;IACX,MAAM,EAAE,MAAM;IACd,IAAI;IACJ,UAAU,EAAE,WAAW;IACvB,gBAAgB,EAAE,MAAM;IACxB,eAAe,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,mBAAmB,CAAC,EAAE;IAC5D,UAAU,EAAE,QAAQ,CAAC,cAAc,CAAC,EAAE;IATjD,SAAgB,QAAQ,EAAE;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAA;KAAC,EAAE,CAAK;gBAGhE,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,IAAI,QAAK,EACT,UAAU,EAAE,WAAW,EACvB,gBAAgB,EAAE,MAAM,EACxB,eAAe,GAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,mBAAmB,CAAC,EAAO,EACjE,UAAU,GAAE,QAAQ,CAAC,cAAc,CAAC,EAAO;IAMhD,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;IA0B7G,aAAa;IAiBb,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;IASlD,uBAAuB,CAAC,kBAAkB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;YAKrD,iBAAiB;CAuBlC"}

package/Router/Http/HttpRoute.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpRoute = void 0;
+const Metadata_1 = require("./../Metadata");
+const Router_1 = require("@Typetron/Router");
+class HttpRoute extends Router_1.Route {
+    constructor(uri, method, name = '', controller, controllerMethod, parametersTypes = [], middleware = []) {
+        super(name, controller, controllerMethod, parametersTypes, middleware);
+        this.uri = uri;
+        this.method = method;
+        this.name = name;
+        this.controller = controller;
+        this.controllerMethod = controllerMethod;
+        this.parametersTypes = parametersTypes;
+        this.middleware = middleware;
+        this.uriParts = [];
+        this.splitUriParts();
+    }
+    async run(container, requestParameters) {
+        const controller = await container.get(this.controller);
+        try {
+            const metadata = Metadata_1.ControllerMetadata.get(this.controller).routes[this.controllerMethod];
+            const parameters = await this.resolveParameters(requestParameters, metadata.parametersTypes, metadata.parametersOverrides, container);
+            for await (const guardClass of this.guards) {
+                const guard = container.get(guardClass);
+                if (!await guard.condition(...parameters)) {
+                    guard.onFail();
+                }
+            }
+            return controller[this.controllerMethod].apply(controller, parameters);
+        }
+        catch (error) {
+            error.stack = `Controller: ${controller.constructor.name}.${this.controllerMethod} \n at ` + error.stack;
+            throw error;
+        }
+    }
+    splitUriParts() {
+        this.uri.split('/').forEach(uriPart => {
+            const matches = uriPart.match(/:(\w+)/);
+            if (matches) {
+                this.uriParts.push({
+                    name: matches[1],
+                    type: 'parameter'
+                });
+            }
+            else {
+                this.uriParts.push({
+                    name: uriPart,
+                    type: 'part'
+                });
+            }
+        });
+    }
+    getUrl(parameters) {
+        return this.uriParts.map(part => {
+            if (part.type === 'parameter') {
+                return parameters[part.name];
+            }
+            return part.name;
+        }).filter(Boolean).join('/');
+    }
+    hasCorrectPrimitiveType(parameterTypeIndex, uriPart) {
+        const parameterType = this.parametersTypes[parameterTypeIndex];
+        return (primitiveTypes[parameterType.name] || (value => value))(uriPart);
+    }
+    async resolveParameters(requestParameters, parameters, overrides, container) {
+        let parameterIndex = 0;
+        const routeParameters = Object.values(requestParameters);
+        return parameters.mapAsync(async (parameter, index) => {
+            const newValueFunction = overrides[index];
+            if (newValueFunction) {
+                return await newValueFunction.call(undefined, container);
+            }
+            if (parameter.name === 'String') {
+                return routeParameters[parameterIndex++];
+            }
+            if (parameter.name === 'Number') {
+                const value = routeParameters[parameterIndex++];
+                return value === undefined || value === 'undefined' ? undefined : Number(value);
+            }
+            return container.get(parameter);
+        });
+    }
+}
+exports.HttpRoute = HttpRoute;
+const primitiveTypes = {
+    Number: (value) => !isNaN(Number(value)),
+};
+//# sourceMappingURL=HttpRoute.js.map

package/Router/Http/HttpRoute.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HttpRoute.js","sourceRoot":"","sources":["../../../Router/Http/HttpRoute.ts"],"names":[],"mappings":"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"}

package/Router/Http/Middleware.d.ts

@@ -0,0 +1,7 @@
+import { Request } from '@Typetron/Router/Request';
+import { Response } from '.';
+import { GlobalMiddleware, RequestHandler } from '..';
+export declare abstract class HttpMiddleware extends GlobalMiddleware {
+    abstract handle(request: Request, next: RequestHandler): Promise<Response>;
+}
+//# sourceMappingURL=Middleware.d.ts.map

package/Router/Http/Middleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Middleware.d.ts","sourceRoot":"","sources":["../../../Router/Http/Middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAA;AAC5B,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,IAAI,CAAA;AAErD,8BAAsB,cAAe,SAAQ,gBAAgB;IACzD,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC;CAC7E"}

package/Router/Http/Middleware.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpMiddleware = void 0;
+const __1 = require("..");
+class HttpMiddleware extends __1.GlobalMiddleware {
+}
+exports.HttpMiddleware = HttpMiddleware;
+//# sourceMappingURL=Middleware.js.map

package/Router/Http/Middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Middleware.js","sourceRoot":"","sources":["../../../Router/Http/Middleware.ts"],"names":[],"mappings":";;;AAEA,0BAAqD;AAErD,MAAsB,cAAe,SAAQ,oBAAgB;CAE5D;AAFD,wCAEC"}

package/Router/Http/Request.d.ts

@@ -4,25 +4,36 @@ import { Http } from '.';
 import { Parameters } from './Contracts';
 import { ParsedUrlQuery } from 'querystring';
 import { File } from '../../Storage';
-export declare class Request {
+import { Request as BaseRequest } from '@Typetron/Router/Request';
+export declare class Request extends BaseRequest {
     parameters: Record<string, string | number>;
-    private raw;
-    private details;
-    constructor(urlOrUri: string, method: Http.Method, headers?: IncomingHttpHeaders, query?: string | ParsedUrlQuery, cookies?: string | Parameters, body?: string | object, files?: Record<string, File | File[]>);
+    protected raw: BaseRequest['raw'] & {
+        urlOrUri: string;
+        method: Http.Method;
+        query?: string | ParsedUrlQuery;
+    };
+    protected details: BaseRequest['details'] & {
+        url: string;
+        uri: string;
+        method: Http.Method;
+        query: ParsedUrlQuery;
+    };
+    getHeader: <T extends string | string[]>(name: keyof IncomingHttpHeaders | string) => T | undefined;
+    constructor(urlOrUri: string, method: Http.Method, query?: string | ParsedUrlQuery, cookies?: string | Parameters, body?: string | object, files?: Record<string, File | File[]>);
     get headers(): IncomingHttpHeaders;
+    get url(): string;
     get uri(): string;
     get method(): Http.Method;
     get query(): ParsedUrlQuery;
-    get cookies(): Parameters;
     get body(): string | object | undefined;
+    get cookies(): Parameters;
+    static loadMultipartContent(incomingMessage: IncomingMessage): Promise<[string | object, Record<string, File | File[]>]>;
     set body(body: string | object | undefined);
     get files(): Record<string, File | File[]>;
     set files(files: Record<string, File | File[]>);
-    static capture(message: IncomingMessage): Promise<Request>;
-    static loadMultipartContent(incomingMessage: IncomingMessage): Promise<[string | object, Record<string, File | File[]>]>;
-    static loadSimpleContent(incomingMessage: IncomingMessage): Promise<string | object | undefined>;
-    getHeader(name: string): IncomingHttpHeaders;
     private static isJSONRequest;
-    private static isMultipartRequest;
+    static loadSimpleContent(incomingMessage: IncomingMessage): Promise<string | object | undefined>;
+    setHeadersLoader(loader: () => IncomingHttpHeaders): void;
+    isMultipartRequest(): boolean;
 }
 //# sourceMappingURL=Request.d.ts.map

package/Router/Http/Request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../../Router/Http/Request.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAQpC,qBAAa,OAAO;IAGT,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAK;IAEvD,OAAO,CAAC,GAAG,CAQV;IAID,OAAO,CAAC,OAAO,CAST;gBAGF,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,OAAO,CAAC,EAAE,mBAAmB,EAC7B,KAAK,CAAC,EAAE,MAAM,GAAG,cAAc,EAC/B,OAAO,CAAC,EAAE,MAAM,GAAG,UAAU,EAC7B,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC;IAazC,IAAI,OAAO,IAAI,mBAAmB,CAEjC;IAED,IAAI,GAAG,IAAI,MAAM,CAchB;IAED,IAAI,MAAM,IAAI,IAAI,CAAC,MAAM,CAExB;IAQD,IAAI,KAAK,IAAI,cAAc,CAU1B;IAED,IAAI,OAAO,IAAI,UAAU,CAIxB;IAED,IAAI,IAAI,IAIO,MAAM,GAAG,MAAM,GAAG,SAAS,CAFzC;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAEzC;IAED,IAAI,KAAK,IAIQ,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAF7C;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,EAE7C;WAEY,OAAO,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;WAqBnD,oBAAoB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;WAuCjH,iBAAiB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IA6BtG,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB;IAI5C,OAAO,CAAC,MAAM,CAAC,aAAa;IAI5B,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAGpC"}
+{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../../Router/Http/Request.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAMpC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAIjE,qBAAa,OAAQ,SAAQ,WAAW;IAG7B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAK;IAEvD,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC,KAAK,CAAC,GAAG;QAChC,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QACpB,KAAK,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;KACnC,CAAA;IAID,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG;QACxC,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QACpB,KAAK,EAAE,cAAc,CAAC;KACzB,CAAK;IAEN,SAAS,EAAE,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,mBAAmB,GAAG,MAAM,KAAK,CAAC,GAAG,SAAS,CAAA;gBAG/F,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,KAAK,CAAC,EAAE,MAAM,GAAG,cAAc,EAC/B,OAAO,CAAC,EAAE,MAAM,GAAG,UAAU,EAC7B,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC;IAQzC,IAAI,OAAO,IAAI,mBAAmB,CAEjC;IAED,IAAI,GAAG,IAAI,MAAM,CAKhB;IAED,IAAI,GAAG,IAAI,MAAM,CAchB;IAED,IAAI,MAAM,IAAI,IAAI,CAAC,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,cAAc,CAU1B;IAED,IAAI,IAAI,IAmDO,MAAM,GAAG,MAAM,GAAG,SAAS,CA/CzC;IAED,IAAI,OAAO,IAAI,UAAU,CAIxB;WAEY,oBAAoB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;IAuC9H,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAEzC;IAED,IAAI,KAAK,IAIQ,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAF7C;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,EAE7C;IAuBD,OAAO,CAAC,MAAM,CAAC,aAAa;WAIf,iBAAiB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IA6BtG,gBAAgB,CAAC,MAAM,EAAE,MAAM,mBAAmB,GAAG,IAAI;IAUzD,kBAAkB;CAGrB"}

package/Router/Http/Request.js

@@ -23,33 +23,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Request = void 0;
-const _1 = require(".");
 const querystring = __importStar(require("querystring"));
 const Storage_1 = require("../../Storage");
 const busboy_1 = __importDefault(require("busboy"));
 const os = __importStar(require("os"));
 const fs = __importStar(require("fs"));
 const Url = __importStar(require("fast-url-parser"));
+const Request_1 = require("@Typetron/Router/Request");
 const cacheURLs = new Array(100);
-class Request {
-    constructor(urlOrUri, method, headers, query, cookies, body, files) {
+class Request extends Request_1.Request {
+    constructor(urlOrUri, method, query, cookies, body, files) {
+        super(urlOrUri, body, cookies, files);
         // static methodField = '_method'
         this.parameters = {};
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         this.details = {};
-        this.raw = {
-            urlOrUri,
-            method,
-            headers,
-            query,
-            cookies,
-            body,
-            files,
-        };
+        this.raw.urlOrUri = urlOrUri;
+        this.raw.method = method;
+        this.raw.query = query;
     }
     get headers() {
-        return this.details.headers ?? (this.details.headers = {});
+        return {};
+    }
+    get url() {
+        return this.details.url ?? (() => {
+            const url = Url.parse(this.raw.urlOrUri);
+            return this.details.url = url.format();
+        })();
     }
     get uri() {
         return this.details.uri ?? (() => {
@@ -68,18 +69,18 @@ class Request {
     get method() {
         return this.raw.method;
     }
-    // get url(): string {
-    //     return this.details.url (() => {
-    //         return this.details.url = this.raw.url
-    //     })()
-    // }
     get query() {
         return this.details.query ?? (() => {
             return this.details.query = typeof this.raw.query === 'object'
                 ? this.raw.query
                 : querystring.parse(typeof this.raw.query === 'string'
                     ? this.raw.query
-                    : Url.parse(this.raw.urlOrUri).search ?? '');
+                    : Url.parse(this.raw.urlOrUri).query ?? '');
+        })();
+    }
+    get body() {
+        return this.details.body ?? (() => {
+            return this.details.body = this.raw.body;
         })();
     }
     get cookies() {
@@ -87,41 +88,15 @@ class Request {
             return { todo: 'parse cookies' };
         })();
     }
-    get body() {
-        return this.details.body;
-    }
-    set body(body) {
-        this.details.body = body;
-    }
-    get files() {
-        return this.raw.files ?? {};
-    }
-    set files(files) {
-        this.raw.files = files;
-    }
-    static async capture(message) {
-        const request = new this(message.url ?? '', message.method || _1.Http.Method.GET, message.headers);
-        if (request.method !== _1.Http.Method.GET) {
-            if (this.isMultipartRequest(message)) {
-                [request.body, request.files] = await Request.loadMultipartContent(message);
-            }
-            else {
-                request.body = await Request.loadSimpleContent(message);
-            }
-            // const overwrittenMethod = (request.body as Record<string, string | undefined>)[Request.methodField] || ''
-            // request.method = Http.Method[overwrittenMethod.toUpperCase() as Http.Method] || request.method
-        }
-        return request;
-    }
     static async loadMultipartContent(incomingMessage) {
         return new Promise((resolve, reject) => {
-            const busboy = new busboy_1.default({ headers: incomingMessage.headers });
+            const formDataParser = busboy_1.default({ headers: incomingMessage.headers });
             const files = {};
             const content = {};
-            busboy.on('file', function (fieldName, file, fileName, encoding, mimetype) {
-                const extension = fileName.split('.').pop();
+            formDataParser.on('file', function (fieldName, file, { filename, encoding, mimeType }) {
+                const extension = filename.split('.').pop();
                 const fileInstance = new Storage_1.File(`upload_${new Date().getTime().toString()}_${String.randomAlphaNum(9)}.${extension}`);
-                fileInstance.originalName = fileName;
+                fileInstance.originalName = filename;
                 fileInstance.directory = os.tmpdir();
                 fileInstance.saved = true;
                 const stream = fs.createWriteStream(fileInstance.path);
@@ -135,15 +110,47 @@ class Request {
                     files[fieldName] = field instanceof Array ? [...field, fileInstance] : field ? [field, fileInstance] : fileInstance;
                 });
             });
-            busboy.on('field', function (fieldName, value) {
+            formDataParser.on('field', function (fieldName, value) {
                 content[fieldName] = value;
             });
-            busboy.on('finish', function () {
+            formDataParser.on('finish', function () {
                 resolve([content, files]);
             });
-            incomingMessage.pipe(busboy);
+            incomingMessage.pipe(formDataParser);
         });
     }
+    set body(body) {
+        this.details.body = body;
+    }
+    get files() {
+        return this.raw.files ?? {};
+    }
+    set files(files) {
+        this.raw.files = files;
+    }
+    // static async capture(message: IncomingMessage): Promise<Request> {
+    //     const request = new this(
+    //         message.url ?? '',
+    //         message.method as Http.Method || Http.Method.GET,
+    //         message.headers
+    //     )
+    //
+    //     if (request.method !== Http.Method.GET) {
+    //         if (this.isMultipartRequest(message)) {
+    //             [request.body, request.files] = await Request.loadMultipartContent(message)
+    //         } else {
+    //             request.body = await Request.loadSimpleContent(message)
+    //         }
+    //
+    //         // const overwrittenMethod = (request.body as Record<string, string | undefined>)[Request.methodField] || ''
+    //         // request.method = Http.Method[overwrittenMethod.toUpperCase() as Http.Method] || request.method
+    //     }
+    //
+    //     return request
+    // }
+    static isJSONRequest(incomingMessage) {
+        return Boolean(incomingMessage.headers['content-type']?.includes('application/json'));
+    }
     static async loadSimpleContent(incomingMessage) {
         let rawData = '';
         incomingMessage.on('data', chunk => {
@@ -172,14 +179,17 @@ class Request {
             });
         });
     }
-    getHeader(name) {
-        return this.details.headers ?? (this.details.headers = {});
-    }
-    static isJSONRequest(incomingMessage) {
-        return incomingMessage.headers['content-type']?.includes('application/json');
+    setHeadersLoader(loader) {
+        Object.defineProperty(this, 'headers', {
+            get: function () {
+                return loader();
+            },
+            enumerable: true,
+            configurable: true
+        });
     }
-    static isMultipartRequest(message) {
-        return message.headers['content-type']?.includes('multipart/form-data');
+    isMultipartRequest() {
+        return Boolean(this.getHeader('content-type')?.includes('multipart/form-data'));
     }
 }
 exports.Request = Request;

package/Router/Http/Request.js.map

@@ -1 +1 @@
-{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../Router/Http/Request.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../Router/Http/Request.ts"],"names":[],"mappings":"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"}

package/Router/Http/Response.d.ts

@@ -1,8 +1,6 @@
 /// <reference types="node" />
-import { OutgoingHttpHeaders, ServerResponse } from 'http';
+import { OutgoingHttpHeaders } from 'http';
 import { Http } from '.';
-import { Buffer } from 'buffer';
-declare type Content = unknown | undefined | number | string | object | Buffer;
 export declare class Response<T = unknown> {
     body: T;
     status: Http.Status;
@@ -11,9 +9,7 @@ export declare class Response<T = unknown> {
     static ok(content: string | object): Response<string | object>;
     static notFound(content: string | object): Response<string | object>;
     static badRequest(content: string | object): Response<string | object>;
-    static send(serverResponse: ServerResponse, status: Http.Status, content: Content, headers?: OutgoingHttpHeaders): void;
     setHeader(name: string, value: string): void;
     setHeaders(headers: OutgoingHttpHeaders): void;
 }
-export {};
 //# sourceMappingURL=Response.d.ts.map

package/Router/Http/Response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Response.d.ts","sourceRoot":"","sources":["../../../Router/Http/Response.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,CAAA;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,aAAK,OAAO,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;AAEtE,qBAAa,QAAQ,CAAC,CAAC,GAAG,OAAO;IAGlB,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,IAAI,CAAC,MAAM;IACnB,OAAO,EAAE,mBAAmB;gBAF5B,IAAI,EAAE,CAAC,EACP,MAAM,GAAE,IAAI,CAAC,MAAuB,EACpC,OAAO,GAAE,mBAAwB;IAI5C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIlC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIxC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAI1C,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,mBAAmB;IAiBhH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAIrC,UAAU,CAAC,OAAO,EAAE,mBAAmB;CAG1C"}
+{"version":3,"file":"Response.d.ts","sourceRoot":"","sources":["../../../Router/Http/Response.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAA;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,CAAA;AAKxB,qBAAa,QAAQ,CAAC,CAAC,GAAG,OAAO;IAGlB,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,IAAI,CAAC,MAAM;IACnB,OAAO,EAAE,mBAAmB;gBAF5B,IAAI,EAAE,CAAC,EACP,MAAM,GAAE,IAAI,CAAC,MAAuB,EACpC,OAAO,GAAE,mBAAwB;IAI5C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIlC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIxC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAI1C,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAIrC,UAAU,CAAC,OAAO,EAAE,mBAAmB;CAG1C"}

package/Router/Http/Response.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Response = void 0;
 const _1 = require(".");
-const buffer_1 = require("buffer");
 class Response {
     constructor(body, status = _1.Http.Status.OK, headers = {}) {
         this.body = body;
@@ -18,20 +17,6 @@ class Response {
     static badRequest(content) {
         return new Response(content, _1.Http.Status.BAD_REQUEST);
     }
-    static send(serverResponse, status, content, headers) {
-        if (!(content instanceof buffer_1.Buffer)) {
-            if (content instanceof Object) {
-                content = JSON.stringify(content);
-                serverResponse.setHeader('Content-Type', 'application/json');
-            }
-            content = String(content ?? '');
-        }
-        for (const header in headers) {
-            serverResponse.setHeader(header, headers[header] || '');
-        }
-        serverResponse.statusCode = status;
-        serverResponse.end(content);
-    }
     setHeader(name, value) {
         this.headers[name] = value;
     }

package/Router/Http/Response.js.map

@@ -1 +1 @@
-{"version":3,"file":"Response.js","sourceRoot":"","sources":["../../../Router/Http/Response.ts"],"names":[],"mappings":";;;AACA,wBAAwB;AACxB,mCAA+B;AAI/B,MAAa,QAAQ;IAEjB,YACW,IAAO,EACP,SAAsB,OAAI,CAAC,MAAM,CAAC,EAAE,EACpC,UAA+B,EAAE;QAFjC,SAAI,GAAJ,IAAI,CAAG;QACP,WAAM,GAAN,MAAM,CAA8B;QACpC,YAAO,GAAP,OAAO,CAA0B;IAE5C,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,OAAwB;QAC9B,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,OAAwB;QACpC,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACvD,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,OAAwB;QACtC,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;IACzD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,cAA8B,EAAE,MAAmB,EAAE,OAAgB,EAAE,OAA6B;QAC5G,IAAI,CAAC,CAAC,OAAO,YAAY,eAAM,CAAC,EAAE;YAC9B,IAAI,OAAO,YAAY,MAAM,EAAE;gBAC3B,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;gBACjC,cAAc,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;aAC/D;YACD,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAA;SAClC;QAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC1B,cAAc,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;SAC1D;QAED,cAAc,CAAC,UAAU,GAAG,MAAM,CAAA;QAClC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC/B,CAAC;IAED,SAAS,CAAC,IAAY,EAAE,KAAa;QACjC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;IAC9B,CAAC;IAED,UAAU,CAAC,OAA4B;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;CACJ;AA7CD,4BA6CC"}
+{"version":3,"file":"Response.js","sourceRoot":"","sources":["../../../Router/Http/Response.ts"],"names":[],"mappings":";;;AACA,wBAAwB;AAKxB,MAAa,QAAQ;IAEjB,YACW,IAAO,EACP,SAAsB,OAAI,CAAC,MAAM,CAAC,EAAE,EACpC,UAA+B,EAAE;QAFjC,SAAI,GAAJ,IAAI,CAAG;QACP,WAAM,GAAN,MAAM,CAA8B;QACpC,YAAO,GAAP,OAAO,CAA0B;IAE5C,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,OAAwB;QAC9B,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,OAAwB;QACpC,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACvD,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,OAAwB;QACtC,OAAO,IAAI,QAAQ,CAAC,OAAO,EAAE,OAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;IACzD,CAAC;IAED,SAAS,CAAC,IAAY,EAAE,KAAa;QACjC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;IAC9B,CAAC;IAED,UAAU,CAAC,OAA4B;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;CACJ;AA5BD,4BA4BC"}