@typetron/framework 0.4.0-rc6 → 0.4.0-rc8

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;AAElC,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,27 @@ 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 Request_1 = require("../Request");
+const WebsocketRoute_1 = require("./WebsocketRoute");
+const Request_2 = 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);
+        container.set(Request_2.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;AAClC,wCAAmD;AAEnD,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,iBAAW,EAAE,OAAO,CAAC,CAAA;QACnC,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;CACJ;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;IAE/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,46 @@
+"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 {
+    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,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;AArDD,wCAqDC"}

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"}

package/Router/Websockets/types.d.ts

@@ -2,19 +2,19 @@ export declare enum WebsocketMessageStatus {
     OK = "OK",
     Error = "Error"
 }
-export interface Event<T> {
-    event: string;
+export interface Action<T> {
+    action: string;
     message?: T;
 }
-export interface EventRequestMessage {
+export interface ActionRequestMessage {
     parameters?: (string | number)[];
     body?: any;
 }
-export declare type EventRequest = Event<EventRequestMessage>;
-export interface EventResponse<T> extends Event<T> {
+export declare type ActionRequest = Action<ActionRequestMessage>;
+export interface ActionResponse<T> extends Action<T> {
     status: WebsocketMessageStatus;
 }
-export declare type EventErrorResponse<T extends string = string> = EventResponse<{
+export declare type ActionErrorResponse<T extends string = string> = ActionResponse<{
     message: T;
     stack: string;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/types.ts"],"names":[],"mappings":"AAAA,oBAAY,sBAAsB;IAC9B,EAAE,OAAO;IACT,KAAK,UAAU;CAClB;AAED,MAAM,WAAW,KAAK,CAAC,CAAC;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,CAAC,CAAA;CACd;AAED,MAAM,WAAW,mBAAmB;IAChC,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IAEhC,IAAI,CAAC,EAAE,GAAG,CAAA;CACb;AAED,oBAAY,YAAY,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAA;AAErD,MAAM,WAAW,aAAa,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;IAC9C,MAAM,EAAE,sBAAsB,CAAA;CACjC;AAED,oBAAY,kBAAkB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,aAAa,CAAC;IAAC,OAAO,EAAE,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAC,CAAC,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/types.ts"],"names":[],"mappings":"AAAA,oBAAY,sBAAsB;IAC9B,EAAE,OAAO;IACT,KAAK,UAAU;CAClB;AAED,MAAM,WAAW,MAAM,CAAC,CAAC;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,CAAC,CAAA;CACd;AAED,MAAM,WAAW,oBAAoB;IACjC,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IAEhC,IAAI,CAAC,EAAE,GAAG,CAAA;CACb;AAED,oBAAY,aAAa,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAA;AAExD,MAAM,WAAW,cAAc,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,CAAC;IAChD,MAAM,EAAE,sBAAsB,CAAA;CACjC;AAED,oBAAY,mBAAmB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,cAAc,CAAC;IAAC,OAAO,EAAE,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAC,CAAC,CAAA"}

package/Support/index.d.ts

@@ -8,6 +8,7 @@ export declare type KeysOfType<T, Condition> = {
 export declare type ChildKeys<Child, Parent> = Exclude<keyof Child, keyof Parent>;
 export declare type ChildObject<Child, Parent> = Omit<Child, keyof Parent>;
 export declare type Type<T> = new (...args: any[]) => T;
+export declare type AnyFunction<T = any> = (...args: any[]) => T;
 export interface Abstract<T> {
     prototype: T;
 }

package/Support/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../Support/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,CAAA;AAChB,OAAO,UAAU,CAAA;AACjB,OAAO,QAAQ,CAAA;AACf,OAAO,SAAS,CAAA;AAEhB,oBAAY,UAAU,CAAC,CAAC,EAAE,SAAS,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,SAAS,GAAG,CAAC,GAAG,KAAK;CAAE,CAAC,MAAM,CAAC,CAAC,CAAA;AACtG,oBAAY,SAAS,CAAC,KAAK,EAAE,MAAM,IAAI,OAAO,CAAC,MAAM,KAAK,EAAE,MAAM,MAAM,CAAC,CAAA;AACzE,oBAAY,WAAW,CAAC,KAAK,EAAE,MAAM,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,MAAM,CAAC,CAAA;AAGlE,oBAAY,IAAI,CAAC,CAAC,IAAI,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;AAE9C,MAAM,WAAW,QAAQ,CAAC,CAAC;IACvB,SAAS,EAAE,CAAC,CAAC;CAChB;AAGD,oBAAY,WAAW,CAAC,CAAC,GAAG,MAAM,IAAI,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../Support/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,CAAA;AAChB,OAAO,UAAU,CAAA;AACjB,OAAO,QAAQ,CAAA;AACf,OAAO,SAAS,CAAA;AAEhB,oBAAY,UAAU,CAAC,CAAC,EAAE,SAAS,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,SAAS,GAAG,CAAC,GAAG,KAAK;CAAE,CAAC,MAAM,CAAC,CAAC,CAAA;AACtG,oBAAY,SAAS,CAAC,KAAK,EAAE,MAAM,IAAI,OAAO,CAAC,MAAM,KAAK,EAAE,MAAM,MAAM,CAAC,CAAA;AACzE,oBAAY,WAAW,CAAC,KAAK,EAAE,MAAM,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,MAAM,CAAC,CAAA;AAGlE,oBAAY,IAAI,CAAC,CAAC,IAAI,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;AAC9C,oBAAY,WAAW,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;AAExD,MAAM,WAAW,QAAQ,CAAC,CAAC;IACvB,SAAS,EAAE,CAAC,CAAC;CAChB;AAGD,oBAAY,WAAW,CAAC,CAAC,GAAG,MAAM,IAAI,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA"}

package/Testing/TestCase.d.ts

@@ -4,16 +4,17 @@ import { Response } from '../Router/Http';
 import { IncomingHttpHeaders } from 'http';
 import { Application, DatabaseProvider } from '../Framework';
 import { User } from '../Framework/Auth';
-import { EventRequest } from '../Router/Websockets/types';
+import { ActionRequest } from '../Router/Websockets/types';
 import { Container } from '../Container';
 import { ID } from '@Typetron/Database';
 export declare abstract class TestCase {
     static app: Application;
     app: Container;
-    eventListeners: Map<string, (response: any) => void>;
+    actionListeners: Map<string, (response: any) => void>;
     providersNeedingReboot: (typeof DatabaseProvider)[];
     abstract bootstrapApp(): Promise<Application>;
     before(): Promise<void>;
+    after(): Promise<void>;
     loginById(id: ID): Promise<void>;
     /**
      * @deprecated
@@ -25,8 +26,8 @@ export declare abstract class TestCase {
     patch<T extends string | object | undefined>(route: string | [string, Record<string, string | number>], content?: {}, headers?: IncomingHttpHeaders): Promise<Response<T>>;
     put<T extends string | object | undefined>(route: string | [string, Record<string, string | number>], content?: {}, headers?: IncomingHttpHeaders): Promise<Response<T>>;
     delete<T extends string | object | undefined>(route: string | [string, Record<string, string | number>], content?: {}, headers?: IncomingHttpHeaders): Promise<Response<T>>;
-    event<T extends string | object | undefined>(event: string, content?: EventRequest['message']): Promise<Response<T>>;
-    on<T>(event: string, callback: (response: T) => void): void;
+    action<T extends string | object | undefined>(action: string, content?: ActionRequest['message']): Promise<Response<T>>;
+    on<T>(action: string, callback: (response: T) => void): void;
     private request;
     private convertRouteParametersToString;
 }

package/Testing/TestCase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TestCase.d.ts","sourceRoot":"","sources":["../../Testing/TestCase.ts"],"names":[],"mappings":";AAAA,OAAO,iBAAiB,CAAA;AACxB,OAAO,EAA2E,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAClH,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE5D,OAAO,EAAQ,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAIvC,8BAAsB,QAAQ;IAC1B,MAAM,CAAC,GAAG,EAAE,WAAW,CAAA;IACvB,GAAG,EAAE,SAAS,CAAA;IAGd,cAAc,yBAA8B,GAAG,KAAK,IAAI,EAAG;IAE3D,sBAAsB,8BAErB;IAED,QAAQ,CAAC,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC;IAEvC,MAAM;IAcN,SAAS,CAAC,EAAE,EAAE,EAAE;IAItB;;OAEG;IACG,KAAK,CAAC,IAAI,EAAE,IAAI;IAIhB,QAAQ,CAAC,IAAI,EAAE,IAAI;IAIzB,GAAG,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,KAAK,EAAE,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIpI,IAAI,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACtC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,EACzD,OAAO,KAAK,EACZ,OAAO,GAAE,mBAAwB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIvB,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACvC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,EACzD,OAAO,KAAK,EACZ,OAAO,GAAE,mBAAwB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIvB,GAAG,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACrC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,EACzD,OAAO,KAAK,EACZ,OAAO,GAAE,mBAAwB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIvB,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACxC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,EACzD,OAAO,KAAK,EACZ,OAAO,GAAE,mBAAwB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIjB,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAuC1H,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,IAAI;YAItC,OAAO;IAmDrB,OAAO,CAAC,8BAA8B;CAMzC"}
+{"version":3,"file":"TestCase.d.ts","sourceRoot":"","sources":["../../Testing/TestCase.ts"],"names":[],"mappings":";AAAA,OAAO,iBAAiB,CAAA;AACxB,OAAO,EAA0F,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACjI,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE5D,OAAO,EAAQ,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAMvC,8BAAsB,QAAQ;IAC1B,MAAM,CAAC,GAAG,EAAE,WAAW,CAAA;IACvB,GAAG,EAAE,SAAS,CAAA;IAGd,eAAe,yBAA8B,GAAG,KAAK,IAAI,EAAG;IAE5D,sBAAsB,8BAErB;IAED,QAAQ,CAAC,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC;IAGvC,MAAM;IAaN,KAAK;IAEL,SAAS,CAAC,EAAE,EAAE,EAAE;IAItB;;OAEG;IACG,KAAK,CAAC,IAAI,EAAE,IAAI;IAIhB,QAAQ,CAAC,IAAI,EAAE,IAAI;IAIzB,GAAG,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,KAAK,EAAE,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIpI,IAAI,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACtC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,EACzD,OAAO,KAAK,EACZ,OAAO,GAAE,mBAAwB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIvB,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACvC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,EACzD,OAAO,KAAK,EACZ,OAAO,GAAE,mBAAwB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIvB,GAAG,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACrC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,EACzD,OAAO,KAAK,EACZ,OAAO,GAAE,mBAAwB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIvB,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACxC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,EACzD,OAAO,KAAK,EACZ,OAAO,GAAE,mBAAwB,GAClC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAIjB,MAAM,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAmC7H,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,IAAI;YAIvC,OAAO;IAmDrB,OAAO,CAAC,8BAA8B;CAMzC"}

package/Testing/TestCase.js

@@ -9,10 +9,11 @@ const Auth_1 = require("../Framework/Auth");
 const Websockets_1 = require("../Router/Websockets");
 const ts_mockito_1 = require("ts-mockito");
 const Encryption_1 = require("@Typetron/Encryption");
+const Request_1 = require("@Typetron/Router/Request");
 class TestCase {
     constructor() {
         // tslint:disable-next-line:no-any
-        this.eventListeners = new Map();
+        this.actionListeners = new Map();
         this.providersNeedingReboot = [
             Framework_1.DatabaseProvider
         ];
@@ -28,6 +29,7 @@ class TestCase {
         ts_mockito_1.when(crypt.compare(ts_mockito_1.anything(), ts_mockito_1.anything())).thenCall((first, second) => Promise.resolve(`testing-${first}` === second));
         this.app.set(Encryption_1.Crypt, ts_mockito_1.instance(crypt));
     }
+    async after() { }
     async loginById(id) {
         await this.app.get(Auth_1.Auth).loginById(id);
     }
@@ -55,19 +57,19 @@ class TestCase {
     delete(route, content = {}, headers = {}) {
         return this.request(Http_1.Http.Method.DELETE, route, content, headers);
     }
-    async event(event, content) {
+    async action(action, content) {
         const socketMock = ts_mockito_1.mock(Websockets_1.WebSocket);
-        ts_mockito_1.when(socketMock.publishAndSend(ts_mockito_1.anything(), ts_mockito_1.anything(), ts_mockito_1.anything())).thenCall((topic, calledEvent, message) => {
-            const callback = this.eventListeners.get(calledEvent);
+        ts_mockito_1.when(socketMock.publishAndSend(ts_mockito_1.anything(), ts_mockito_1.anything(), ts_mockito_1.anything())).thenCall((topic, calledActon, message) => {
+            const callback = this.actionListeners.get(calledActon);
             callback?.(message);
         });
-        ts_mockito_1.when(socketMock.send(ts_mockito_1.anything(), ts_mockito_1.anything())).thenCall((calledEvent, message) => {
-            const callback = this.eventListeners.get(calledEvent);
+        ts_mockito_1.when(socketMock.send(ts_mockito_1.anything(), ts_mockito_1.anything())).thenCall((calledActon, message) => {
+            const callback = this.actionListeners.get(calledActon);
             callback?.(message);
         });
         const container = this.app.createChildContainer();
         container.set(Websockets_1.WebSocket, ts_mockito_1.instance(socketMock));
-        const request = new Http_1.Request(event, Http_1.Http.Method.GET, {}, {}, content?.body ?? {});
+        const request = new Request_1.Request(action, content?.body);
         // TODO find a way to save parameters so they can be retrieved easily in the Resolvers (check EntityResolver for example)
         content?.parameters?.forEach(parameter => {
             request.parameters[String.random(15)] = parameter;
@@ -84,8 +86,8 @@ class TestCase {
             throw error;
         }
     }
-    on(event, callback) {
-        this.eventListeners.set(event, callback);
+    on(action, callback) {
+        this.actionListeners.set(action, callback);
     }
     async request(method, routeName, content = {}, headers = {}) {
         let routeParameters = {};

package/Testing/TestCase.js.map

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

package/package.json

@@ -2,7 +2,7 @@
     "name": "@typetron/framework",
     "description": "Modern Node.js framework for modern apps written in Typescript",
     "license": "MIT",
-    "version": "0.4.0-rc6",
+    "version": "0.4.0-rc8",
     "keywords": [
         "typetron",
         "framework",