@typetron/framework 0.4.0-rc6 → 0.4.0-rc7

package/Router/Route.js

@@ -1,111 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Route = void 0;
-const Metadata_1 = require("./Metadata");
 class Route {
-    constructor(uri, method, controller, action, name = '', parametersTypes = [], middleware = []) {
-        this.uri = uri;
-        this.method = method;
-        this.controller = controller;
-        this.action = action;
+    constructor(name = '', controller, controllerMethod, parametersTypes = [], middleware = []) {
         this.name = name;
+        this.controller = controller;
+        this.controllerMethod = controllerMethod;
         this.parametersTypes = parametersTypes;
         this.middleware = middleware;
         this.parameters = {};
         this.guards = [];
-        this.uriParts = [];
-        this.splitUriParts();
-    }
-    async run(container) {
-        const controller = await container.get(this.controller);
-        try {
-            const metadata = Metadata_1.ControllerMetadata.get(this.controller).routes[this.action];
-            const parameters = await this.resolveParameters(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.action].apply(controller, parameters);
-        }
-        catch (error) {
-            error.stack = `Controller: ${controller.constructor.name}.${this.action} \n at ` + error.stack;
-            throw error;
-        }
-    }
-    matches(uri) {
-        const uriParts = uri.split('/'); // ex: ['users', '1', 'posts'];
-        let part;
-        let parameterTypeIndex = 0;
-        for (part = 0; part < uriParts.length; part++) {
-            if (!this.uriParts[part]) {
-                return false;
-            }
-            if (this.uriParts[part].type === 'parameter' && this.hasCorrectPrimitiveType(parameterTypeIndex, uriParts[part])) {
-                parameterTypeIndex++;
-                this.parameters[this.uriParts[part].name] = uriParts[part];
-                continue;
-            }
-            if (this.uriParts[part].name !== uriParts[part]) {
-                return false;
-            }
-        }
-        if (part !== this.uriParts.length) {
-            return false;
-        }
-        return true;
-    }
-    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() {
-        return this.uriParts.map(part => {
-            if (part.type === 'parameter') {
-                return this.parameters[part.name];
-            }
-            return part.name;
-        }).filter(Boolean).join('/');
-    }
-    async resolveParameters(parameters, overrides, container) {
-        let parameterIndex = 0;
-        const routeParameters = Object.values(this.parameters);
-        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);
-        });
-    }
-    hasCorrectPrimitiveType(parameterTypeIndex, uriPart) {
-        const parameterType = this.parametersTypes[parameterTypeIndex];
-        return (primitiveTypes[parameterType.name] || (value => value))(uriPart);
     }
 }
 exports.Route = Route;
-const primitiveTypes = {
-    Number: (value) => !isNaN(Number(value)),
-};
 //# sourceMappingURL=Route.js.map

package/Router/Route.js.map

@@ -1 +1 @@
-{"version":3,"file":"Route.js","sourceRoot":"","sources":["../../Router/Route.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Route.js","sourceRoot":"","sources":["../../Router/Route.ts"],"names":[],"mappings":";;;AAIA,MAAsB,KAAK;IAIvB,YACW,OAAO,EAAE,EACT,UAAuB,EACvB,gBAAwB,EACxB,kBAA2E,EAAE,EAC7E,aAA8C,EAAE;QAJhD,SAAI,GAAJ,IAAI,CAAK;QACT,eAAU,GAAV,UAAU,CAAa;QACvB,qBAAgB,GAAhB,gBAAgB,CAAQ;QACxB,oBAAe,GAAf,eAAe,CAA8D;QAC7E,eAAU,GAAV,UAAU,CAAsC;QAR3D,eAAU,GAA2B,EAAE,CAAA;QACvC,WAAM,GAAqB,EAAE,CAAA;IAS7B,CAAC;CACJ;AAZD,sBAYC"}

package/Router/Router.d.ts

@@ -1,12 +1,12 @@
 import { Container } from '../Container';
 import { Abstract } from '../Support';
 import { MiddlewareInterface } from './Middleware';
-import { Route } from './Route';
-import { WebsocketEvent } from './Websockets/WebsocketEvent';
+import { WebsocketRoute } from './Websockets/WebsocketRoute';
+import { HttpRoute } from '@Typetron/Router/Http/HttpRoute';
 export declare class Router {
     app: Container;
-    routes: Route[];
-    events: Map<string, WebsocketEvent>;
+    routes: HttpRoute[];
+    actions: Map<string, WebsocketRoute>;
     middleware: Abstract<MiddlewareInterface>[];
     loadControllers(directory: string): void;
 }

package/Router/Router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../Router/Router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,cAAc,CAAA;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D,qBAAa,MAAM;IAGf,GAAG,EAAE,SAAS,CAAA;IAEd,MAAM,EAAE,KAAK,EAAE,CAAK;IACpB,MAAM,8BAAoC;IAE1C,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAK;IAEzC,eAAe,CAAC,SAAS,EAAE,MAAM;CAO3C"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../Router/Router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,cAAc,CAAA;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAE3D,qBAAa,MAAM;IAGf,GAAG,EAAE,SAAS,CAAA;IAEd,MAAM,EAAE,SAAS,EAAE,CAAK;IACxB,OAAO,8BAAoC;IAE3C,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAK;IAEzC,eAAe,CAAC,SAAS,EAAE,MAAM;CAO3C"}

package/Router/Router.js

@@ -15,7 +15,7 @@ const Storage_1 = require("../Storage");
 class Router {
     constructor() {
         this.routes = [];
-        this.events = new Map();
+        this.actions = new Map();
         this.middleware = [];
     }
     loadControllers(directory) {

package/Router/Router.js.map

@@ -1 +1 @@
-{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../Router/Router.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAgD;AAChD,wCAAoC;AAMpC,MAAa,MAAM;IAAnB;QAKI,WAAM,GAAY,EAAE,CAAA;QACpB,WAAM,GAAG,IAAI,GAAG,EAA0B,CAAA;QAE1C,eAAU,GAAoC,EAAE,CAAA;IASpD,CAAC;IAPU,eAAe,CAAC,SAAiB;QACpC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC;aAChB,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC;aACtB,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC;aAC5B,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC5C,CAAC;CAEJ;AAdG;IADC,kBAAM,EAAE;8BACJ,qBAAS;mCAAA;AAHlB,wBAiBC"}
+{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../Router/Router.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAgD;AAChD,wCAAoC;AAMpC,MAAa,MAAM;IAAnB;QAKI,WAAM,GAAgB,EAAE,CAAA;QACxB,YAAO,GAAG,IAAI,GAAG,EAA0B,CAAA;QAE3C,eAAU,GAAoC,EAAE,CAAA;IASpD,CAAC;IAPU,eAAe,CAAC,SAAiB;QACpC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC;aAChB,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC;aACtB,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC;aAC5B,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC5C,CAAC;CAEJ;AAdG;IADC,kBAAM,EAAE;8BACJ,qBAAS;mCAAA;AAHlB,wBAiBC"}

package/Router/Servers/uNetworking.js

@@ -22,7 +22,7 @@ function uNetworkingServer(port, handler) {
     })
         .listen(port, (token) => {
         if (token) {
-            console.log('Listening to port ' + port);
+            console.log('Listening on port ' + port);
         }
         else {
             console.log('Failed to listen to port ' + port);

package/Router/Websockets/ActionRequest.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="node" />
+import { IncomingHttpHeaders } from 'http';
+import { File } from '../Storage';
+export declare class Action {
+    parameters: Record<string, string | number>;
+    private raw;
+    private details;
+    getHeader: <T extends string | string[]>(name: keyof IncomingHttpHeaders | string) => T | undefined;
+    constructor(name: string, cookies?: string | Record<string, string | undefined>, body?: string | object, files?: Record<string, File | File[]>);
+    get url(): string;
+    get body(): string | object | undefined;
+    get cookies(): Record<string, string | undefined>;
+    set body(body: string | object | undefined);
+    get files(): Record<string, File | File[]>;
+    set files(files: Record<string, File | File[]>);
+}
+//# sourceMappingURL=ActionRequest.d.ts.map

package/Router/Websockets/ActionRequest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ActionRequest.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/ActionRequest.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAA;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEjC,qBAAa,MAAM;IACR,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAK;IAEvD,OAAO,CAAC,GAAG,CAKV;IAID,OAAO,CAAC,OAAO,CAKT;IAEN,SAAS,EAAE,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,mBAAmB,GAAG,MAAM,KAAK,CAAC,GAAG,SAAS,CAAA;gBAG/F,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACrD,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC;IAUzC,IAAI,GAAG,IAAI,MAAM,CAIhB;IAED,IAAI,IAAI,IAYO,MAAM,GAAG,MAAM,GAAG,SAAS,CARzC;IAED,IAAI,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAIhD;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;CAsBJ"}

package/Router/Websockets/ActionRequest.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Action = void 0;
+class Action {
+    constructor(name, cookies, body, files) {
+        this.parameters = {};
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        this.details = {};
+        this.raw = {
+            name: name,
+            cookies,
+            body,
+            files,
+        };
+    }
+    get url() {
+        return this.details.action ?? (() => {
+            return this.details.action = this.raw.name;
+        })();
+    }
+    get body() {
+        return this.details.body ?? (() => {
+            return this.details.body = this.raw.body;
+        })();
+    }
+    get cookies() {
+        return this.details.cookies ?? (() => {
+            return { todo: 'parse cookies' };
+        })();
+    }
+    set body(body) {
+        this.details.body = body;
+    }
+    get files() {
+        return this.raw.files ?? {};
+    }
+    set files(files) {
+        this.raw.files = files;
+    }
+}
+exports.Action = Action;
+//# sourceMappingURL=ActionRequest.js.map

package/Router/Websockets/ActionRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ActionRequest.js","sourceRoot":"","sources":["../../../Router/Websockets/ActionRequest.ts"],"names":[],"mappings":";;;AAGA,MAAa,MAAM;IAqBf,YACI,IAAY,EACZ,OAAqD,EACrD,IAAsB,EACtB,KAAqC;QAxBlC,eAAU,GAAoC,EAAE,CAAA;QASvD,6DAA6D;QAC7D,aAAa;QACL,YAAO,GAKX,EAAE,CAAA;QAUF,IAAI,CAAC,GAAG,GAAG;YACP,IAAI,EAAE,IAAI;YACV,OAAO;YACP,IAAI;YACJ,KAAK;SACR,CAAA;IACL,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE;YAChC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAA;QAC9C,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE;YAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAA;QAC5C,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,GAAG,EAAE;YACjC,OAAO,EAAC,IAAI,EAAE,eAAe,EAAC,CAAA;QAClC,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;IAED,IAAI,IAAI,CAAC,IAAiC;QACtC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAA;IAC5B,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,IAAI,KAAK,CAAC,KAAoC;QAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,KAAK,CAAA;IAC1B,CAAC;CAsBJ;AArFD,wBAqFC"}

package/Router/Websockets/Handler.d.ts

@@ -1,13 +1,14 @@
 import { Container } from '../../Container';
 import { MiddlewareInterface, Router } from '../../Router';
-import { Request, Response } from '../Http';
+import { Response } from '../Http';
 import { Abstract, Constructor, Type } from '../../Support';
-import { WebsocketEvent } from './WebsocketEvent';
+import { WebsocketRoute } from './WebsocketRoute';
+import { Request } from '@Typetron/Router/Websockets/Request';
 export declare class Handler {
     router: Router;
-    onOpen?: WebsocketEvent;
-    onClose?: WebsocketEvent;
-    addEvent(name: string, controller: Constructor, action: string, parametersTypes?: (Type<Function> | FunctionConstructor)[], middleware?: Abstract<MiddlewareInterface>[]): WebsocketEvent;
+    onOpen?: WebsocketRoute;
+    onClose?: WebsocketRoute;
+    addAction(name: string, controller: Constructor, actionName: string, parametersTypes?: (Type<(...args: any[]) => any> | FunctionConstructor)[], middleware?: Abstract<MiddlewareInterface>[]): WebsocketRoute;
     handle<T = unknown>(container: Container, request: Request): Promise<Response<T>>;
 }
 //# sourceMappingURL=Handler.d.ts.map

package/Router/Websockets/Handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Handler.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/Handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAkB,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1E,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,qBAAa,OAAO;IAEhB,MAAM,EAAE,MAAM,CAAA;IAEd,MAAM,CAAC,EAAE,cAAc,CAAA;IACvB,OAAO,CAAC,EAAE,cAAc,CAAA;IAExB,QAAQ,CACJ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,WAAW,EACvB,MAAM,EAAE,MAAM,EACd,eAAe,GAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,mBAAmB,CAAC,EAAO,EAC9D,UAAU,GAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAO;IAgB9C,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;CAwC1F"}
+{"version":3,"file":"Handler.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/Handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAkB,MAAM,EAAE,MAAM,cAAc,CAAA;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAA;AAE7D,qBAAa,OAAO;IAEhB,MAAM,EAAE,MAAM,CAAA;IAEd,MAAM,CAAC,EAAE,cAAc,CAAA;IACvB,OAAO,CAAC,EAAE,cAAc,CAAA;IAExB,SAAS,CACL,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,WAAW,EACvB,UAAU,EAAE,MAAM,EAClB,eAAe,GAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,mBAAmB,CAAC,EAAO,EAC7E,UAAU,GAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAO;IAgB9C,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;CAuC1F"}

package/Router/Websockets/Handler.js

@@ -13,25 +13,25 @@ exports.Handler = void 0;
 const Container_1 = require("../../Container");
 const Router_1 = require("../../Router");
 const Http_1 = require("../Http");
-const WebsocketEvent_1 = require("./WebsocketEvent");
+const WebsocketRoute_1 = require("./WebsocketRoute");
+const Request_1 = require("@Typetron/Router/Websockets/Request");
 class Handler {
-    addEvent(name, controller, action, parametersTypes = [], middleware = []) {
-        const event = new WebsocketEvent_1.WebsocketEvent(name, controller, action, parametersTypes, middleware);
-        if (this.router.events.has(name)) {
-            throw new Error(`There is already an event with the same name: '${name}'`);
+    addAction(name, controller, actionName, parametersTypes = [], middleware = []) {
+        const action = new WebsocketRoute_1.WebsocketRoute(name, controller, actionName, parametersTypes, middleware);
+        if (this.router.actions.has(name)) {
+            throw new Error(`There is already an action with the same name: '${name}'`);
         }
-        this.router.events.set(name, event);
-        return event;
+        this.router.actions.set(name, action);
+        return action;
     }
     async handle(container, request) {
-        container.set(Http_1.Request, request);
+        container.set(Request_1.Request, request);
         let stack = async () => {
-            const route = this.router.events.get(request.uri);
+            const route = this.router.actions.get(request.name);
             if (!route) {
-                throw new Error(`Event '${request.uri}' not found`);
+                throw new Error(`Action '${request.name}' not found`);
             }
-            // TODO - add the Websocket route in the container
-            // container.set(Route, route)
+            container.set(WebsocketRoute_1.WebsocketRoute, route);
             let routeStack = async () => {
                 const content = await route.run(container, request.parameters);
                 if (content instanceof Http_1.Response) {

package/Router/Websockets/Handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"Handler.js","sourceRoot":"","sources":["../../../Router/Websockets/Handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAmD;AACnD,yCAA0E;AAC1E,kCAA2C;AAE3C,qDAAiD;AAEjD,MAAa,OAAO;IAOhB,QAAQ,CACJ,IAAY,EACZ,UAAuB,EACvB,MAAc,EACd,kBAA4D,EAAE,EAC9D,aAA8C,EAAE;QAEhD,MAAM,KAAK,GAAG,IAAI,+BAAc,CAC5B,IAAI,EACJ,UAAU,EACV,MAAM,EACN,eAAe,EACf,UAAU,CACb,CAAA;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,kDAAkD,IAAI,GAAG,CAAC,CAAA;SAC7E;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;QACnC,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,MAAM,CAAc,SAAoB,EAAE,OAAgB;QAE5D,SAAS,CAAC,GAAG,CAAC,cAAO,EAAE,OAAO,CAAC,CAAA;QAE/B,IAAI,KAAK,GAAmB,KAAK,IAAI,EAAE;YACnC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YAEjD,IAAI,CAAC,KAAK,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,UAAU,OAAO,CAAC,GAAG,aAAa,CAAC,CAAA;aACtD;YAED,kDAAkD;YAClD,8BAA8B;YAE9B,IAAI,UAAU,GAAmB,KAAK,IAAI,EAAE;gBACxC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;gBAE9D,IAAI,OAAO,YAAY,eAAQ,EAAE;oBAC7B,OAAO,OAAO,CAAA;iBACjB;gBAED,OAAO,eAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;YAC/B,CAAC,CAAA;YAED,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;gBACvC,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;gBACjD,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;YACxE,CAAC,CAAC,CAAA;YAEF,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC,CAAA;QACpC,CAAC,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;YAC7C,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YACjD,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;QAC9D,CAAC,CAAC,CAAA;QAEF,OAAO,MAAM,KAAK,CAAC,OAAO,CAAgB,CAAA;IAC9C,CAAC;CAEJ;AAlEG;IADC,kBAAM,EAAE;8BACD,eAAM;uCAAA;AAFlB,0BAoEC"}
+{"version":3,"file":"Handler.js","sourceRoot":"","sources":["../../../Router/Websockets/Handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAmD;AACnD,yCAA0E;AAC1E,kCAAkC;AAElC,qDAAiD;AACjD,iEAA6D;AAE7D,MAAa,OAAO;IAOhB,SAAS,CACL,IAAY,EACZ,UAAuB,EACvB,UAAkB,EAClB,kBAA2E,EAAE,EAC7E,aAA8C,EAAE;QAEhD,MAAM,MAAM,GAAG,IAAI,+BAAc,CAC7B,IAAI,EACJ,UAAU,EACV,UAAU,EACV,eAAe,EACf,UAAU,CACb,CAAA;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,mDAAmD,IAAI,GAAG,CAAC,CAAA;SAC9E;QACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACrC,OAAO,MAAM,CAAA;IACjB,CAAC;IAED,KAAK,CAAC,MAAM,CAAc,SAAoB,EAAE,OAAgB;QAE5D,SAAS,CAAC,GAAG,CAAC,iBAAO,EAAE,OAAO,CAAC,CAAA;QAE/B,IAAI,KAAK,GAAmB,KAAK,IAAI,EAAE;YACnC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAEnD,IAAI,CAAC,KAAK,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,WAAW,OAAO,CAAC,IAAI,aAAa,CAAC,CAAA;aACxD;YAED,SAAS,CAAC,GAAG,CAAC,+BAAc,EAAE,KAAK,CAAC,CAAA;YAEpC,IAAI,UAAU,GAAmB,KAAK,IAAI,EAAE;gBACxC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;gBAE9D,IAAI,OAAO,YAAY,eAAQ,EAAE;oBAC7B,OAAO,OAAO,CAAA;iBACjB;gBAED,OAAO,eAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;YAC/B,CAAC,CAAA;YAED,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;gBACvC,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;gBACjD,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;YACxE,CAAC,CAAC,CAAA;YAEF,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC,CAAA;QACpC,CAAC,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;YAC7C,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YACjD,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;QAC9D,CAAC,CAAC,CAAA;QAEF,OAAO,MAAM,KAAK,CAAC,OAAO,CAAgB,CAAA;IAC9C,CAAC;CAEJ;AAjEG;IADC,kBAAM,EAAE;8BACD,eAAM;uCAAA;AAFlB,0BAmEC"}

package/Router/Websockets/Request.d.ts

@@ -0,0 +1,4 @@
+import { Request as BaseRequest } from '@Typetron/Router/Request';
+export declare class Request extends BaseRequest {
+}
+//# sourceMappingURL=Request.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/Request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEjE,qBAAa,OAAQ,SAAQ,WAAW;CAAG"}

package/Router/Websockets/Request.js

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

package/Router/Websockets/Request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../Router/Websockets/Request.ts"],"names":[],"mappings":";;;AAAA,sDAAiE;AAEjE,MAAa,OAAQ,SAAQ,iBAAW;CAAG;AAA3C,0BAA2C"}

package/Router/Websockets/WebsocketAction.d.ts

@@ -0,0 +1,7 @@
+import { Container } from '../../Container';
+import { Route } from '@Typetron/Router';
+export declare class WebsocketAction extends Route {
+    run(container: Container, requestParameters: Record<string, unknown>): Promise<object | string>;
+    private resolveParameters;
+}
+//# sourceMappingURL=WebsocketAction.d.ts.map

package/Router/Websockets/WebsocketAction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebsocketAction.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/WebsocketAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAG3C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAExC,qBAAa,eAAgB,SAAQ,KAAK;IAYhC,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;YA0BvF,iBAAiB;CAyBlC"}

package/Router/Websockets/WebsocketAction.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebsocketAction = void 0;
+const Metadata_1 = require("../Metadata");
+const Router_1 = require("@Typetron/Router");
+class WebsocketAction extends Router_1.Route {
+    // constructor(
+    //     public name = '',
+    //     public controller: Constructor,
+    //     public controllerMethod: string,
+    //     public parametersTypes: (Type<AnyFunction> | FunctionConstructor)[] = [],
+    //     public middleware: Abstract<MiddlewareInterface>[] = []
+    // ) {
+    //     super(name, controller, controllerMethod, parametersTypes, middleware)
+    // }
+    async run(container, requestParameters) {
+        const controller = await container.get(this.controller);
+        try {
+            const metadata = Metadata_1.ControllerMetadata.get(this.controller).actions[this.controllerMethod];
+            const parameters = await this.resolveParameters(requestParameters, this.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;
+        }
+    }
+    async resolveParameters(requestParameters, parametersTypes, overrides, container) {
+        let parameterIndex = 0;
+        // tslint:disable-next-line:no-any
+        const routeParameters = Object.values(requestParameters);
+        return parametersTypes.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, [routeParameters[parameterIndex++]]);
+        });
+    }
+}
+exports.WebsocketAction = WebsocketAction;
+//# sourceMappingURL=WebsocketAction.js.map

package/Router/Websockets/WebsocketAction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebsocketAction.js","sourceRoot":"","sources":["../../../Router/Websockets/WebsocketAction.ts"],"names":[],"mappings":";;;AAEA,0CAAgE;AAChE,6CAAwC;AAExC,MAAa,eAAgB,SAAQ,cAAK;IAEtC,eAAe;IACf,wBAAwB;IACxB,sCAAsC;IACtC,uCAAuC;IACvC,gFAAgF;IAChF,8DAA8D;IAC9D,MAAM;IACN,6EAA6E;IAC7E,IAAI;IAEJ,KAAK,CAAC,GAAG,CAAC,SAAoB,EAAE,iBAA0C;QACtE,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAEvD,IAAI;YACA,MAAM,QAAQ,GAA+B,6BAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;YACnH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAC3C,iBAAiB,EACjB,IAAI,CAAC,eAAe,EACpB,QAAQ,EAAE,mBAAmB,IAAI,EAAE,EACnC,SAAS,CACZ,CAAA;YAED,IAAI,KAAK,EAAE,MAAM,UAAU,IAAI,IAAI,CAAC,MAAM,EAAE;gBACxC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBACvC,IAAI,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,EAAE;oBACvC,KAAK,CAAC,MAAM,EAAE,CAAA;iBACjB;aACJ;YAED,OAAQ,UAAU,CAAC,IAAI,CAAC,gBAAqC,CAAiB,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;SAC/G;QAAC,OAAO,KAAK,EAAE;YACZ,KAAK,CAAC,KAAK,GAAG,eAAe,UAAU,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,gBAAgB,SAAS,GAAG,KAAK,CAAC,KAAK,CAAA;YACxG,MAAM,KAAK,CAAA;SACd;IACL,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC3B,iBAA0C,EAC1C,eAA4D,EAC5D,SAAwB,EACxB,SAAoB;QAEpB,IAAI,cAAc,GAAG,CAAC,CAAA;QACtB,kCAAkC;QAClC,MAAM,eAAe,GAAU,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;QAC/D,OAAO,eAAe,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE;YACvD,MAAM,gBAAgB,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;YACzC,IAAI,gBAAgB,EAAE;gBAClB,OAAO,MAAM,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;aAC3D;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,OAAO,eAAe,CAAC,cAAc,EAAE,CAAC,CAAA;aAC3C;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,MAAM,KAAK,GAAG,eAAe,CAAC,cAAc,EAAE,CAAC,CAAA;gBAC/C,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;aAClF;YACD,OAAO,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAA;QACxE,CAAC,CAAC,CAAA;IACN,CAAC;CAEJ;AA/DD,0CA+DC"}

package/Router/Websockets/WebsocketEvent.js

@@ -14,7 +14,7 @@ class WebsocketEvent {
     async run(container, requestParameters) {
         const controller = await container.get(this.controller);
         try {
-            const metadata = Metadata_1.ControllerMetadata.get(this.controller).events[this.action];
+            const metadata = Metadata_1.ControllerMetadata.get(this.controller).actions[this.action];
             const parameters = await this.resolveParameters(requestParameters, this.parametersTypes, metadata?.parametersOverrides ?? [], container);
             for await (const guardClass of this.guards) {
                 const guard = container.get(guardClass);

package/Router/Websockets/WebsocketEvent.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebsocketEvent.js","sourceRoot":"","sources":["../../../Router/Websockets/WebsocketEvent.ts"],"names":[],"mappings":";;;AAGA,0CAA+D;AAG/D,MAAa,cAAc;IAGvB,YACW,OAAO,EAAE,EACT,UAAuB,EACvB,MAAc,EACd,kBAA4D,EAAE,EAC9D,aAA8C,EAAE;QAJhD,SAAI,GAAJ,IAAI,CAAK;QACT,eAAU,GAAV,UAAU,CAAa;QACvB,WAAM,GAAN,MAAM,CAAQ;QACd,oBAAe,GAAf,eAAe,CAA+C;QAC9D,eAAU,GAAV,UAAU,CAAsC;QAP3D,WAAM,GAAqB,EAAE,CAAA;IAQ1B,CAAC;IAEJ,KAAK,CAAC,GAAG,CAAC,SAAoB,EAAE,iBAA0C;QACtE,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAEvD,IAAI;YACA,MAAM,QAAQ,GAA8B,6BAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACvG,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAC3C,iBAAiB,EACjB,IAAI,CAAC,eAAe,EACpB,QAAQ,EAAE,mBAAmB,IAAI,EAAE,EACnC,SAAS,CACZ,CAAA;YAED,IAAI,KAAK,EAAE,MAAM,UAAU,IAAI,IAAI,CAAC,MAAM,EAAE;gBACxC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBACvC,IAAI,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,EAAE;oBACvC,KAAK,CAAC,MAAM,EAAE,CAAA;iBACjB;aACJ;YAED,OAAQ,UAAU,CAAC,IAAI,CAAC,MAA2B,CAAc,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;SAClG;QAAC,OAAO,KAAK,EAAE;YACZ,KAAK,CAAC,KAAK,GAAG,eAAe,UAAU,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAA;YAC9F,MAAM,KAAK,CAAA;SACd;IACL,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC3B,iBAA0C,EAC1C,eAAiC,EACjC,SAAqB,EACrB,SAAoB;QAEpB,IAAI,cAAc,GAAG,CAAC,CAAA;QACtB,kCAAkC;QAClC,MAAM,eAAe,GAAU,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;QAC/D,OAAO,eAAe,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE;YACvD,MAAM,gBAAgB,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;YACzC,IAAI,gBAAgB,EAAE;gBAClB,OAAO,MAAM,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;aAC3D;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,OAAO,eAAe,CAAC,cAAc,EAAE,CAAC,CAAA;aAC3C;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,MAAM,KAAK,GAAG,eAAe,CAAC,cAAc,EAAE,CAAC,CAAA;gBAC/C,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;aAClF;YACD,OAAO,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAA;QACxE,CAAC,CAAC,CAAA;IACN,CAAC;CAEJ;AA9DD,wCA8DC"}
+{"version":3,"file":"WebsocketEvent.js","sourceRoot":"","sources":["../../../Router/Websockets/WebsocketEvent.ts"],"names":[],"mappings":";;;AAGA,0CAAgE;AAGhE,MAAa,cAAc;IAGvB,YACW,OAAO,EAAE,EACT,UAAuB,EACvB,MAAc,EACd,kBAA4D,EAAE,EAC9D,aAA8C,EAAE;QAJhD,SAAI,GAAJ,IAAI,CAAK;QACT,eAAU,GAAV,UAAU,CAAa;QACvB,WAAM,GAAN,MAAM,CAAQ;QACd,oBAAe,GAAf,eAAe,CAA+C;QAC9D,eAAU,GAAV,UAAU,CAAsC;QAP3D,WAAM,GAAqB,EAAE,CAAA;IAQ1B,CAAC;IAEJ,KAAK,CAAC,GAAG,CAAC,SAAoB,EAAE,iBAA0C;QACtE,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAEvD,IAAI;YACA,MAAM,QAAQ,GAA+B,6BAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACzG,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAC3C,iBAAiB,EACjB,IAAI,CAAC,eAAe,EACpB,QAAQ,EAAE,mBAAmB,IAAI,EAAE,EACnC,SAAS,CACZ,CAAA;YAED,IAAI,KAAK,EAAE,MAAM,UAAU,IAAI,IAAI,CAAC,MAAM,EAAE;gBACxC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBACvC,IAAI,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,EAAE;oBACvC,KAAK,CAAC,MAAM,EAAE,CAAA;iBACjB;aACJ;YAED,OAAQ,UAAU,CAAC,IAAI,CAAC,MAA2B,CAAc,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;SAClG;QAAC,OAAO,KAAK,EAAE;YACZ,KAAK,CAAC,KAAK,GAAG,eAAe,UAAU,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAA;YAC9F,MAAM,KAAK,CAAA;SACd;IACL,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC3B,iBAA0C,EAC1C,eAAiC,EACjC,SAAqB,EACrB,SAAoB;QAEpB,IAAI,cAAc,GAAG,CAAC,CAAA;QACtB,kCAAkC;QAClC,MAAM,eAAe,GAAU,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;QAC/D,OAAO,eAAe,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE;YACvD,MAAM,gBAAgB,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;YACzC,IAAI,gBAAgB,EAAE;gBAClB,OAAO,MAAM,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;aAC3D;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,OAAO,eAAe,CAAC,cAAc,EAAE,CAAC,CAAA;aAC3C;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,MAAM,KAAK,GAAG,eAAe,CAAC,cAAc,EAAE,CAAC,CAAA;gBAC/C,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;aAClF;YACD,OAAO,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAA;QACxE,CAAC,CAAC,CAAA;IACN,CAAC;CAEJ;AA9DD,wCA8DC"}

package/Router/Websockets/WebsocketRequest.d.ts

@@ -0,0 +1,4 @@
+import { Request } from '@Typetron/Router/Request';
+export declare class WebsocketRequest extends Request {
+}
+//# sourceMappingURL=WebsocketRequest.d.ts.map

package/Router/Websockets/WebsocketRequest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebsocketRequest.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/WebsocketRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAElD,qBAAa,gBAAiB,SAAQ,OAAO;CAAG"}

package/Router/Websockets/WebsocketRequest.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebsocketRequest = void 0;
+const Request_1 = require("@Typetron/Router/Request");
+class WebsocketRequest extends Request_1.Request {
+}
+exports.WebsocketRequest = WebsocketRequest;
+//# sourceMappingURL=WebsocketRequest.js.map

package/Router/Websockets/WebsocketRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebsocketRequest.js","sourceRoot":"","sources":["../../../Router/Websockets/WebsocketRequest.ts"],"names":[],"mappings":";;;AAAA,sDAAkD;AAElD,MAAa,gBAAiB,SAAQ,iBAAO;CAAG;AAAhD,4CAAgD"}

package/Router/Websockets/WebsocketRoute.d.ts

@@ -0,0 +1,7 @@
+import { Container } from '../../Container';
+import { Route } from '@Typetron/Router';
+export declare class WebsocketRoute extends Route {
+    run(container: Container, requestParameters: Record<string, unknown>): Promise<object | string>;
+    private resolveParameters;
+}
+//# sourceMappingURL=WebsocketRoute.d.ts.map

package/Router/Websockets/WebsocketRoute.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebsocketRoute.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/WebsocketRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAG3C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAExC,qBAAa,cAAe,SAAQ,KAAK;IAY/B,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;YA0BvF,iBAAiB;CAyBlC"}

package/Router/Websockets/WebsocketRoute.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebsocketRoute = void 0;
+const Metadata_1 = require("../Metadata");
+const Router_1 = require("@Typetron/Router");
+class WebsocketRoute extends Router_1.Route {
+    // constructor(
+    //     public name = '',
+    //     public controller: Constructor,
+    //     public controllerMethod: string,
+    //     public parametersTypes: (Type<AnyFunction> | FunctionConstructor)[] = [],
+    //     public middleware: Abstract<MiddlewareInterface>[] = []
+    // ) {
+    //     super(name, controller, controllerMethod, parametersTypes, middleware)
+    // }
+    async run(container, requestParameters) {
+        const controller = await container.get(this.controller);
+        try {
+            const metadata = Metadata_1.ControllerMetadata.get(this.controller).actions[this.controllerMethod];
+            const parameters = await this.resolveParameters(requestParameters, this.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;
+        }
+    }
+    async resolveParameters(requestParameters, parametersTypes, overrides, container) {
+        let parameterIndex = 0;
+        // tslint:disable-next-line:no-any
+        const routeParameters = Object.values(requestParameters);
+        return parametersTypes.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, [routeParameters[parameterIndex++]]);
+        });
+    }
+}
+exports.WebsocketRoute = WebsocketRoute;
+//# sourceMappingURL=WebsocketRoute.js.map

package/Router/Websockets/WebsocketRoute.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebsocketRoute.js","sourceRoot":"","sources":["../../../Router/Websockets/WebsocketRoute.ts"],"names":[],"mappings":";;;AAEA,0CAAgE;AAChE,6CAAwC;AAExC,MAAa,cAAe,SAAQ,cAAK;IAErC,eAAe;IACf,wBAAwB;IACxB,sCAAsC;IACtC,uCAAuC;IACvC,gFAAgF;IAChF,8DAA8D;IAC9D,MAAM;IACN,6EAA6E;IAC7E,IAAI;IAEJ,KAAK,CAAC,GAAG,CAAC,SAAoB,EAAE,iBAA0C;QACtE,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAEvD,IAAI;YACA,MAAM,QAAQ,GAA+B,6BAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;YACnH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAC3C,iBAAiB,EACjB,IAAI,CAAC,eAAe,EACpB,QAAQ,EAAE,mBAAmB,IAAI,EAAE,EACnC,SAAS,CACZ,CAAA;YAED,IAAI,KAAK,EAAE,MAAM,UAAU,IAAI,IAAI,CAAC,MAAM,EAAE;gBACxC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBACvC,IAAI,CAAC,MAAM,KAAK,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,EAAE;oBACvC,KAAK,CAAC,MAAM,EAAE,CAAA;iBACjB;aACJ;YAED,OAAQ,UAAU,CAAC,IAAI,CAAC,gBAAqC,CAAiB,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;SAC/G;QAAC,OAAO,KAAK,EAAE;YACZ,KAAK,CAAC,KAAK,GAAG,eAAe,UAAU,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,gBAAgB,SAAS,GAAG,KAAK,CAAC,KAAK,CAAA;YACxG,MAAM,KAAK,CAAA;SACd;IACL,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC3B,iBAA0C,EAC1C,eAA4D,EAC5D,SAAwB,EACxB,SAAoB;QAEpB,IAAI,cAAc,GAAG,CAAC,CAAA;QACtB,kCAAkC;QAClC,MAAM,eAAe,GAAU,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;QAC/D,OAAO,eAAe,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE;YACvD,MAAM,gBAAgB,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;YACzC,IAAI,gBAAgB,EAAE;gBAClB,OAAO,MAAM,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;aAC3D;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,OAAO,eAAe,CAAC,cAAc,EAAE,CAAC,CAAA;aAC3C;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC7B,MAAM,KAAK,GAAG,eAAe,CAAC,cAAc,EAAE,CAAC,CAAA;gBAC/C,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;aAClF;YACD,OAAO,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAA;QACxE,CAAC,CAAC,CAAA;IACN,CAAC;CAEJ;AA/DD,wCA+DC"}

package/Router/Websockets/index.d.ts

@@ -10,8 +10,8 @@ export declare class WebSocket {
     subscribe(topic: string): void;
     unsubscribe(topic: string): void;
     reset(container?: Container): void;
-    publish(topic: string, event: string, body?: unknown): void;
-    publishAndSend(topic: string, event: string, body?: unknown): void;
-    send(event: string, body?: unknown): void;
+    publish(topic: string, action: string, body?: unknown): void;
+    publishAndSend(topic: string, action: string, body?: unknown): void;
+    send(action: string, body?: unknown): void;
 }
 //# sourceMappingURL=index.d.ts.map

package/Router/Websockets/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AAEvB,qBAAa,SAAS;IAIC,UAAU,EAAE,UAAU;IAAS,SAAS,EAAE,SAAS;IAFtE,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;gBAED,UAAU,EAAE,UAAU,EAAS,SAAS,EAAE,SAAS;IAItE,SAAS,CAAC,KAAK,EAAE,MAAM;IAIvB,WAAW,CAAC,KAAK,EAAE,MAAM;IAIzB,KAAK,CAAC,SAAS,CAAC,EAAE,SAAS;IAM3B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;IAUpD,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;IAM3D,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;CAQrC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AAEvB,qBAAa,SAAS;IAIC,UAAU,EAAE,UAAU;IAAS,SAAS,EAAE,SAAS;IAFtE,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;gBAED,UAAU,EAAE,UAAU,EAAS,SAAS,EAAE,SAAS;IAItE,SAAS,CAAC,KAAK,EAAE,MAAM;IAIvB,WAAW,CAAC,KAAK,EAAE,MAAM;IAIzB,KAAK,CAAC,SAAS,CAAC,EAAE,SAAS;IAM3B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;IAUrD,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;IAM5D,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;CAQtC"}

package/Router/Websockets/index.js

@@ -31,23 +31,23 @@ class WebSocket {
         this.connection.container.set(WebSocket, this);
     }
     // tslint:disable-next-line:no-any
-    publish(topic, event, body) {
+    publish(topic, action, body) {
         const sentResponse = {
-            event,
+            action,
             message: body,
             status: types_1.WebsocketMessageStatus.OK,
         };
         this.connection.publish(topic, JSON.stringify(sentResponse), false, true);
     }
     // tslint:disable-next-line:no-any
-    publishAndSend(topic, event, body) {
-        this.publish(topic, event, body);
-        this.send(event, body);
+    publishAndSend(topic, action, body) {
+        this.publish(topic, action, body);
+        this.send(action, body);
     }
     // tslint:disable-next-line:no-any
-    send(event, body) {
+    send(action, body) {
         const sentResponse = {
-            event,
+            action,
             message: body,
             status: types_1.WebsocketMessageStatus.OK,
         };

package/Router/Websockets/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../Router/Websockets/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,mCAA+D;AAG/D,4CAAyB;AACzB,0CAAuB;AAEvB,MAAa,SAAS;IAIlB,YAAmB,UAAsB,EAAS,SAAoB;QAAnD,eAAU,GAAV,UAAU,CAAY;QAAS,cAAS,GAAT,SAAS,CAAW;QAClE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IACzB,CAAC;IAED,SAAS,CAAC,KAAa;QACnB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAED,WAAW,CAAC,KAAa;QACrB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,SAAqB;QACvB,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAA;QAChG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAClD,CAAC;IAED,kCAAkC;IAClC,OAAO,CAAC,KAAa,EAAE,KAAa,EAAE,IAAc;QAChD,MAAM,YAAY,GAA2B;YACzC,KAAK;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,8BAAsB,CAAC,EAAE;SACpC,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC7E,CAAC;IAED,kCAAkC;IAClC,cAAc,CAAC,KAAa,EAAE,KAAa,EAAE,IAAc;QACvD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QAChC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IAC1B,CAAC;IAED,kCAAkC;IAClC,IAAI,CAAC,KAAa,EAAE,IAAc;QAC9B,MAAM,YAAY,GAA2B;YACzC,KAAK;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,8BAAsB,CAAC,EAAE;SACpC,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACnE,CAAC;CACJ;AA9CD,8BA8CC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../Router/Websockets/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,mCAAgE;AAGhE,4CAAyB;AACzB,0CAAuB;AAEvB,MAAa,SAAS;IAIlB,YAAmB,UAAsB,EAAS,SAAoB;QAAnD,eAAU,GAAV,UAAU,CAAY;QAAS,cAAS,GAAT,SAAS,CAAW;QAClE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IACzB,CAAC;IAED,SAAS,CAAC,KAAa;QACnB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAED,WAAW,CAAC,KAAa;QACrB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,SAAqB;QACvB,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAA;QAChG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IAClD,CAAC;IAED,kCAAkC;IAClC,OAAO,CAAC,KAAa,EAAE,MAAc,EAAE,IAAc;QACjD,MAAM,YAAY,GAA4B;YAC1C,MAAM;YACN,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,8BAAsB,CAAC,EAAE;SACpC,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC7E,CAAC;IAED,kCAAkC;IAClC,cAAc,CAAC,KAAa,EAAE,MAAc,EAAE,IAAc;QACxD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACjC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAC3B,CAAC;IAED,kCAAkC;IAClC,IAAI,CAAC,MAAc,EAAE,IAAc;QAC/B,MAAM,YAAY,GAA4B;YAC1C,MAAM;YACN,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,8BAAsB,CAAC,EAAE;SACpC,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACnE,CAAC;CACJ;AA9CD,8BA8CC"}