@typetron/framework 0.4.0-rc1 → 0.4.0-rc13

package/Router/Servers/uNetworking.js

@@ -1,33 +1,159 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uNetworkingServer = void 0;
 const uWebSockets_js_1 = require("uWebSockets.js");
 const Http_1 = require("@Typetron/Router/Http");
+const buffer_1 = require("buffer");
+const console = __importStar(require("console"));
+const busboy_1 = __importDefault(require("busboy"));
+const Storage_1 = require("@Typetron/Storage");
+const os_1 = __importDefault(require("os"));
+const fs_1 = __importDefault(require("fs"));
+async function handleRequest(serverResponse, serverRequest, handler) {
+    serverResponse.onAborted(() => {
+        console.log('uNetworking response aborted ->', serverResponse);
+    });
+    try {
+        const request = new Http_1.Request(serverRequest.getUrl(), serverRequest.getMethod(), serverRequest.getQuery());
+        const headers = {};
+        serverRequest.forEach((name, value) => headers[name] = value);
+        request.setHeadersLoader(() => headers);
+        request.getHeader = (name) => {
+            return serverRequest.getHeader(name.toString());
+        };
+        if (request.method.toLowerCase() !== Http_1.Http.Method.GET.toLowerCase()) {
+            if (request.isMultipartRequest()) {
+                [request.body, request.files] = await readForm(serverResponse, headers);
+            }
+            else {
+                request.body = await readJson(serverResponse, headers['content-type']);
+            }
+            // const overwrittenMethod = (request.body as Record<string, string | undefined>)[Request.methodField] || ''
+            // request.method = Http.Method[overwrittenMethod.toUpperCase() as Http.Method] || request.method
+        }
+        const response = await handler(request);
+        let content = response.body;
+        serverResponse.writeStatus(response.status.toString());
+        if (!(content instanceof buffer_1.Buffer)) {
+            if (content instanceof Object) {
+                content = JSON.stringify(content);
+                serverResponse.writeHeader('Content-Type', 'application/json');
+            }
+            content = String(content ?? '');
+        }
+        Object.keys(response.headers).forEach(header => {
+            const headerValue = response.headers[header];
+            if (headerValue) {
+                serverResponse.writeHeader(header, String(headerValue));
+            }
+        });
+        serverResponse.end(content);
+    }
+    catch (error) {
+        console.log('error ->', error);
+    }
+}
 function uNetworkingServer(port, handler) {
-    const app = uWebSockets_js_1.SSLApp({
+    const app = uWebSockets_js_1.App({ // or maybe SSLApp?
     // key_file_name: 'misc/key.pem',
     // cert_file_name: 'misc/cert.pem',
     // passphrase: '1234'
     })
         .any('*', async (response, request) => {
-        const appRequest = new Http_1.Request(request.getUrl(), request.getMethod(), {});
-        const appResponse = await handler(appRequest);
-        Object.keys(appResponse.headers).forEach(header => {
-            const headerValue = appResponse.headers[header];
-            if (headerValue) {
-                response.writeHeader(header, String(headerValue));
-            }
-        });
-        response.writeStatus(appResponse.status.toString()).end(String(appResponse.body));
+        await handleRequest(response, request, handler);
+    })
+        .any('/*', async (response, request) => {
+        await handleRequest(response, request, handler);
     })
         .listen(port, (token) => {
-        if (token) {
-            console.log('Listening to port ' + port);
-        }
-        else {
+        if (!token) {
             console.log('Failed to listen to port ' + port);
         }
     });
 }
 exports.uNetworkingServer = uNetworkingServer;
+/* Helper function for reading a posted JSON body */
+function readJson(response, contentType) {
+    let buffer;
+    return new Promise((resolve, reject) => {
+        response.onData((ab, isLast) => {
+            const chunk = buffer_1.Buffer.from(ab);
+            if (!isLast) {
+                buffer = buffer_1.Buffer.concat(buffer ? [buffer, chunk] : [chunk]);
+                return;
+            }
+            const content = (buffer ? buffer_1.Buffer.concat([buffer, chunk]) : chunk);
+            if (contentType === 'application/json') {
+                try {
+                    const json = JSON.parse(content.toString());
+                    resolve(json);
+                }
+                catch (e) {
+                    resolve({});
+                }
+            }
+            else {
+                resolve(content);
+            }
+        });
+    });
+}
+function readForm(response, headers) {
+    return new Promise((resolve, reject) => {
+        const formDataParser = busboy_1.default({ headers });
+        const files = {};
+        const content = {};
+        formDataParser.on('file', function (fieldName, file, { filename, encoding, mimeType }) {
+            const extension = filename.split('.').pop();
+            const fileInstance = new Storage_1.File(`upload_${new Date().getTime().toString()}_${String.randomAlphaNum(9)}.${extension}`);
+            fileInstance.originalName = filename;
+            fileInstance.directory = os_1.default.tmpdir();
+            fileInstance.saved = true;
+            const stream = fs_1.default.createWriteStream(fileInstance.path);
+            stream.on('error', reject);
+            file.on('data', function (data) {
+                stream.write(data);
+            });
+            file.on('end', function () {
+                stream.end();
+                const field = files[fieldName];
+                files[fieldName] = field instanceof Array ? [...field, fileInstance] : field ? [field, fileInstance] : fileInstance;
+            });
+        });
+        formDataParser.on('field', function (fieldName, value) {
+            content[fieldName] = value;
+        });
+        formDataParser.on('finish', function () {
+            resolve([content, files]);
+        });
+        response.onData((ab, isLast) => {
+            formDataParser.write(buffer_1.Buffer.from(ab.slice(0)));
+            if (isLast) {
+                formDataParser.end();
+            }
+        });
+    });
+}
 //# sourceMappingURL=uNetworking.js.map

package/Router/Servers/uNetworking.js.map

@@ -1 +1 @@
-{"version":3,"file":"uNetworking.js","sourceRoot":"","sources":["../../../Router/Servers/uNetworking.ts"],"names":[],"mappings":";;;AAAA,mDAAuC;AACvC,gDAA+D;AAE/D,SAAgB,iBAAiB,CAAC,IAAY,EAAE,OAAgD;IAC5F,MAAM,GAAG,GAAG,uBAAM,CAAC;IACf,iCAAiC;IACjC,mCAAmC;IACnC,qBAAqB;KACxB,CAAC;SACG,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;QAClC,MAAM,UAAU,GAAG,IAAI,cAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,SAAS,EAAiB,EAAE,EAAE,CAAC,CAAA;QACxF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,CAAA;QAC7C,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAC9C,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YAC/C,IAAI,WAAW,EAAE;gBACb,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAA;aACpD;QACL,CAAC,CAAC,CAAA;QACF,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAA;IACrF,CAAC,CAAC;SACD,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;QACpB,IAAI,KAAK,EAAE;YACP,OAAO,CAAC,GAAG,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAA;SAC3C;aAAM;YACH,OAAO,CAAC,GAAG,CAAC,2BAA2B,GAAG,IAAI,CAAC,CAAA;SAClD;IACL,CAAC,CAAC,CAAA;AACV,CAAC;AAxBD,8CAwBC"}
+{"version":3,"file":"uNetworking.js","sourceRoot":"","sources":["../../../Router/Servers/uNetworking.ts"],"names":[],"mappings":"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"}

package/Router/Websockets/Handler.d.ts

@@ -1,13 +1,15 @@
 import { Container } from '../../Container';
-import { MiddlewareInterface, Router } from '../../Router';
-import { Request, Response } from '../Http';
+import { Router } from '../../Router';
+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';
+import { WebsocketMiddleware } from '@Typetron/Router/Websockets/Middleware';
 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<WebsocketMiddleware>[]): 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,EAAkB,MAAM,EAAE,MAAM,cAAc,CAAA;AACrD,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;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAE5E,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;CA4C1F"}

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) {
@@ -45,7 +47,11 @@ class Handler {
             });
             return await routeStack(request);
         };
-        this.router.middleware.forEach(middlewareClass => {
+        this.router.middleware.global?.forEach(middlewareClass => {
+            const middleware = container.get(middlewareClass);
+            stack = middleware.handle.bind(middleware, request, stack);
+        });
+        this.router.middleware.websocket?.forEach(middlewareClass => {
             const middleware = container.get(middlewareClass);
             stack = middleware.handle.bind(middleware, request, stack);
         });

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,yCAAqD;AACrD,kCAAkC;AAClC,wCAAmD;AAEnD,qDAAiD;AACjD,iEAA6D;AAG7D,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,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,EAAE;YACrD,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,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,eAAe,CAAC,EAAE;YACxD,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;AAtEG;IADC,kBAAM,EAAE;8BACD,eAAM;uCAAA;AAFlB,0BAwEC"}

package/Router/Websockets/Middleware.d.ts

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"Middleware.d.ts","sourceRoot":"","sources":["../../../Router/Websockets/Middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAEhD,8BAAsB,mBAAoB,SAAQ,gBAAgB;IAC9D,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC;CAC7E"}

package/Router/Websockets/Middleware.js

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

package/Router/Websockets/Middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Middleware.js","sourceRoot":"","sources":["../../../Router/Websockets/Middleware.ts"],"names":[],"mappings":";;;AACA,6CAAmE;AAGnE,MAAsB,mBAAoB,SAAQ,yBAAgB;CAEjE;AAFD,kDAEC"}

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/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/{WebsocketEvent.js → WebsocketRoute.js}

@@ -1,20 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebsocketEvent = void 0;
+exports.WebsocketRoute = void 0;
 const Metadata_1 = require("../Metadata");
-class WebsocketEvent {
-    constructor(name = '', controller, action, parametersTypes = [], middleware = []) {
-        this.name = name;
-        this.controller = controller;
-        this.action = action;
-        this.parametersTypes = parametersTypes;
-        this.middleware = middleware;
-        this.guards = [];
-    }
+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).events[this.action];
+            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);
@@ -22,10 +15,10 @@ class WebsocketEvent {
                     guard.onFail();
                 }
             }
-            return controller[this.action].apply(controller, parameters);
+            return controller[this.controllerMethod].apply(controller, parameters);
         }
         catch (error) {
-            error.stack = `Controller: ${controller.constructor.name}.${this.action} \n at ` + error.stack;
+            error.stack = `Controller: ${controller.constructor.name}.${this.controllerMethod} \n at ` + error.stack;
             throw error;
         }
     }
@@ -49,5 +42,5 @@ class WebsocketEvent {
         });
     }
 }
-exports.WebsocketEvent = WebsocketEvent;
-//# sourceMappingURL=WebsocketEvent.js.map
+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/Storage/Storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Storage.d.ts","sourceRoot":"","sources":["../../Storage/Storage.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAI7B,qBAAa,OAAO;IAChB,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,UAAQ,GAAG,IAAI,EAAE;IAmB/C,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIvC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAS1C,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,GAAE,MAAW,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB/E,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7E,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMjD,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C,OAAO,CAAC,sBAAsB;CAOjC"}
+{"version":3,"file":"Storage.d.ts","sourceRoot":"","sources":["../../Storage/Storage.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAI7B,qBAAa,OAAO;IAChB,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,UAAQ,GAAG,IAAI,EAAE;IAmB/C,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIvC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAS1C,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,GAAE,MAAW,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB/E,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7E,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMjD,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7C,OAAO,CAAC,sBAAsB;CAOjC"}

package/Storage/Storage.js

@@ -67,9 +67,7 @@ class Storage {
                 .createReadStream(file.path)
                 .on('error', reject)
                 .pipe(fileSystemDeprecated.createWriteStream(newPath))
-                .on('finish', () => {
-                resolve(file);
-            })
+                .on('finish', () => resolve(file))
                 .on('error', reject);
         });
     }
@@ -94,6 +92,9 @@ class Storage {
         if (!(await this.exists(filePath))) {
             return;
         }
+        if ((await fileSystem.stat(filePath)).isDirectory()) {
+            throw new Error('Can not delete because this path leads to a directory and not a file.');
+        }
         await fileSystem.unlink(filePath);
     }
     generateRandomFileName() {

package/Storage/Storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"Storage.js","sourceRoot":"","sources":["../../Storage/Storage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,yDAA0C;AAC1C,iCAA6B;AAC7B,2CAA4B;AAC5B,6DAA8C;AAE9C,MAAa,OAAO;IAChB,KAAK,CAAC,SAAiB,EAAE,WAAW,GAAG,KAAK;QACxC,OAAO,oBAAoB;aACtB,WAAW,CAAC,SAAS,CAAC,CAAC,uBAAuB;aAC9C,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;YAC3C,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;YACrD,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE;gBAChB,MAAM,IAAI,GAAG,IAAI,WAAI,CAAC,IAAI,CAAC,CAAA;gBAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;gBAC1B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;aACnB;YAED,IAAI,WAAW,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;gBACpC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;aAC7C;YACD,OAAO,KAAK,CAAA;QAChB,CAAC,EAAE,EAAY,CAAC,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,QAAgB;QACvB,OAAO,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IACxC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAAgB;QACzB,IAAI;YACA,MAAM,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;YACjC,OAAO,IAAI,CAAA;SACd;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,KAAK,CAAA;SACf;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAU,EAAE,YAAoB,EAAE,EAAE,IAAsB;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QAC/C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACZ,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,sBAAsB,EAAE,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;SACnF;QACD,IAAI,SAAS,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE;YAC9C,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;SACtC;QACD,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,oBAAoB;iBACf,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;iBAC3B,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;iBACnB,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;iBACrD,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACf,OAAO,CAAC,IAAI,CAAC,CAAA;YACjB,CAAC,CAAC;iBACD,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAC5B,CAAC,CAAC,CAAA;IACN,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,QAAgB,EAAE,OAAwB,EAAE,OAAa;QAC/D,MAAM,IAAI,GAAG,IAAI,WAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC9C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAEvC,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE;YACxD,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;SAC3C;QAED,MAAM,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;QACtD,OAAO,IAAI,CAAA;IACf,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,SAAiB;QACjC,MAAM,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAA;IACxD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAiB;QACnC,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC9B,MAAM,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAA;SACpD;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAAgB;QACzB,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE;YAChC,OAAM;SACT;QACD,MAAM,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IACrC,CAAC;IAEO,sBAAsB;QAC1B,MAAM,YAAY,GACd,gEAAgE,CAAA;QACpE,OAAO,CACH,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,GAAG,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAC1E,CAAA;IACL,CAAC;CACJ;AAzFD,0BAyFC"}
+{"version":3,"file":"Storage.js","sourceRoot":"","sources":["../../Storage/Storage.ts"],"names":[],"mappings":"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"}

package/Support/Array.js

@@ -26,10 +26,10 @@ Array.prototype.remove = function (...items) {
     });
 };
 Array.prototype.where = function (property, value) {
-    return this.filter(item => value ? item[property] === value : item[property]);
+    return this.filter(item => value !== undefined ? item[property] === value : item[property]);
 };
 Array.prototype.whereNot = function (property, value) {
-    return this.filter(item => value ? item[property] !== value : !item[property]);
+    return this.filter(item => value !== undefined ? item[property] !== value : !item[property]);
 };
 Array.prototype.whereIn = function (property, values) {
     return this.filter(item => values.includes(item[property]));

package/Support/Array.js.map

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

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,CAAC;AACvG,oBAAY,SAAS,CAAC,KAAK,EAAE,MAAM,IAAI,OAAO,CAAC,MAAM,KAAK,EAAE,MAAM,MAAM,CAAC,CAAC;AAC1E,oBAAY,WAAW,CAAC,KAAK,EAAE,MAAM,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,MAAM,CAAC,CAAC;AAGnE,oBAAY,IAAI,CAAC,CAAC,IAAI,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAE/C,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,CAAC"}
+{"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"}