@typetron/framework 0.4.0-rc1 → 0.4.0-rc10

package/Router/Http/Route.js

@@ -0,0 +1,111 @@
+"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;
+        this.name = name;
+        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/Http/Route.js.map

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

package/Router/Metadata.d.ts

@@ -2,17 +2,23 @@ import { Abstract, Type } from '../Support';
 import { MiddlewareInterface } from './Middleware';
 import { Http } from './Http';
 import { Guard } from './Guard';
-export declare class EventMetadata {
+import { Container } from '@Typetron/Container';
+export declare class MethodMetadata {
     middleware: Abstract<MiddlewareInterface>[];
-    parametersTypes: (Type<Function> | FunctionConstructor)[];
+    parametersTypes: (Type<(...args: any[]) => any> | FunctionConstructor)[];
     name: string;
-    parametersOverrides: Function[];
+    parametersOverrides: ((container: Container) => any)[];
     guards: typeof Guard[];
 }
-export declare class RouteMetadata extends EventMetadata {
+export declare class ActionMetadata extends MethodMetadata {
+}
+export declare class RouteMetadata extends MethodMetadata {
     path: string;
     method: Http.Method;
 }
+export declare class ControllerOptions {
+    prefix?: string;
+}
 declare const ControllerMetadata_base: {
     new (): {};
     get<T extends {}>(this: any & import("../Support").Constructor<T>, target: any, defaultValue?: T | undefined): T;
@@ -23,8 +29,11 @@ export declare class ControllerMetadata extends ControllerMetadata_base {
     routes: {
         [key: string]: RouteMetadata;
     };
-    events: {
-        [key: string]: EventMetadata;
+    actions: {
+        [key: string]: ActionMetadata;
+    };
+    methods: {
+        [key: string]: MethodMetadata;
     };
     guards: typeof Guard[];
 }

package/Router/Metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Metadata.d.ts","sourceRoot":"","sources":["../../Router/Metadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,qBAAa,aAAa;IACtB,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAK;IAChD,eAAe,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,mBAAmB,CAAC,EAAE,CAAA;IACzD,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB,EAAE,QAAQ,EAAE,CAAK;IACpC,MAAM,EAAE,OAAO,KAAK,EAAE,CAAK;CAC9B;AAED,qBAAa,aAAc,SAAQ,aAAa;IAC5C,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;CACtB;;;;;;AAED,qBAAa,kBAAmB,SAAQ,uBAAmC;IACvE,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAK;IAChD,MAAM,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;KAAC,CAAK;IAC3C,MAAM,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;KAAC,CAAK;IAC3C,MAAM,EAAE,OAAO,KAAK,EAAE,CAAK;CAC9B"}
+{"version":3,"file":"Metadata.d.ts","sourceRoot":"","sources":["../../Router/Metadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,qBAAa,cAAc;IACvB,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAK;IAChD,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,mBAAmB,CAAC,EAAE,CAAA;IACxE,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,KAAK,GAAG,CAAC,EAAE,CAAK;IAC3D,MAAM,EAAE,OAAO,KAAK,EAAE,CAAK;CAC9B;AAED,qBAAa,cAAe,SAAQ,cAAc;CACjD;AAED,qBAAa,aAAc,SAAQ,cAAc;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;CACtB;AAED,qBAAa,iBAAiB;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;CAClB;;;;;;AAED,qBAAa,kBAAmB,SAAQ,uBAAmC;IACvE,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAK;IAChD,MAAM,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;KAAC,CAAK;IAC3C,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAA;KAAC,CAAK;IAC7C,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAA;KAAC,CAAK;IAC7C,MAAM,EAAE,OAAO,KAAK,EAAE,CAAK;CAC9B"}

package/Router/Metadata.js

@@ -1,24 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControllerMetadata = exports.RouteMetadata = exports.EventMetadata = void 0;
+exports.ControllerMetadata = exports.ControllerOptions = exports.RouteMetadata = exports.ActionMetadata = exports.MethodMetadata = void 0;
 const Metadata_1 = require("../Support/Metadata");
-class EventMetadata {
+class MethodMetadata {
     constructor() {
         this.middleware = [];
         this.parametersOverrides = [];
         this.guards = [];
     }
 }
-exports.EventMetadata = EventMetadata;
-class RouteMetadata extends EventMetadata {
+exports.MethodMetadata = MethodMetadata;
+class ActionMetadata extends MethodMetadata {
+}
+exports.ActionMetadata = ActionMetadata;
+class RouteMetadata extends MethodMetadata {
 }
 exports.RouteMetadata = RouteMetadata;
+class ControllerOptions {
+}
+exports.ControllerOptions = ControllerOptions;
 class ControllerMetadata extends Metadata_1.MetadataKey('framework:controller') {
     constructor() {
         super(...arguments);
         this.middleware = [];
         this.routes = {};
-        this.events = {};
+        this.actions = {};
+        this.methods = {};
         this.guards = [];
     }
 }

package/Router/Metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"Metadata.js","sourceRoot":"","sources":["../../Router/Metadata.ts"],"names":[],"mappings":";;;AAAA,kDAAiD;AAMjD,MAAa,aAAa;IAA1B;QACI,eAAU,GAAoC,EAAE,CAAA;QAGhD,wBAAmB,GAAe,EAAE,CAAA;QACpC,WAAM,GAAmB,EAAE,CAAA;IAC/B,CAAC;CAAA;AAND,sCAMC;AAED,MAAa,aAAc,SAAQ,aAAa;CAG/C;AAHD,sCAGC;AAED,MAAa,kBAAmB,SAAQ,sBAAW,CAAC,sBAAsB,CAAC;IAA3E;;QACI,eAAU,GAAoC,EAAE,CAAA;QAChD,WAAM,GAAmC,EAAE,CAAA;QAC3C,WAAM,GAAmC,EAAE,CAAA;QAC3C,WAAM,GAAmB,EAAE,CAAA;IAC/B,CAAC;CAAA;AALD,gDAKC"}
+{"version":3,"file":"Metadata.js","sourceRoot":"","sources":["../../Router/Metadata.ts"],"names":[],"mappings":";;;AAAA,kDAAiD;AAOjD,MAAa,cAAc;IAA3B;QACI,eAAU,GAAoC,EAAE,CAAA;QAGhD,wBAAmB,GAAsC,EAAE,CAAA;QAC3D,WAAM,GAAmB,EAAE,CAAA;IAC/B,CAAC;CAAA;AAND,wCAMC;AAED,MAAa,cAAe,SAAQ,cAAc;CACjD;AADD,wCACC;AAED,MAAa,aAAc,SAAQ,cAAc;CAGhD;AAHD,sCAGC;AAED,MAAa,iBAAiB;CAE7B;AAFD,8CAEC;AAED,MAAa,kBAAmB,SAAQ,sBAAW,CAAC,sBAAsB,CAAC;IAA3E;;QACI,eAAU,GAAoC,EAAE,CAAA;QAChD,WAAM,GAAmC,EAAE,CAAA;QAC3C,YAAO,GAAoC,EAAE,CAAA;QAC7C,YAAO,GAAoC,EAAE,CAAA;QAC7C,WAAM,GAAmB,EAAE,CAAA;IAC/B,CAAC;CAAA;AAND,gDAMC"}

package/Router/Middleware.d.ts

@@ -1,6 +1,13 @@
-import { Request, Response } from './Http';
+import { Response } from './Http';
+import { Request } from '@Typetron/Router/Request';
 export declare type RequestHandler = (request: Request) => Promise<Response>;
-export interface MiddlewareInterface {
+/**
+ * @deprecated Please use the Middleware, HttpMiddleware or WebsocketMiddleware classes instead
+ */
+export declare type MiddlewareInterface = {
     handle(request: Request, next: RequestHandler): Promise<Response>;
+};
+export declare abstract class GlobalMiddleware {
+    abstract handle(request: Request, next: RequestHandler): Promise<Response>;
 }
 //# sourceMappingURL=Middleware.d.ts.map

package/Router/Middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Middleware.d.ts","sourceRoot":"","sources":["../../Router/Middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAE1C,oBAAY,cAAc,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAErE,MAAM,WAAW,mBAAmB;IAChC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACrE"}
+{"version":3,"file":"Middleware.d.ts","sourceRoot":"","sources":["../../Router/Middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAElD,oBAAY,cAAc,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AAEpE;;GAEG;AACH,oBAAY,mBAAmB,GAAI;IAC/B,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;CACpE,CAAA;AAED,8BAAsB,gBAAgB;IAClC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC;CAC7E"}

package/Router/Middleware.js

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

package/Router/Middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"Middleware.js","sourceRoot":"","sources":["../../Router/Middleware.ts"],"names":[],"mappings":""}
+{"version":3,"file":"Middleware.js","sourceRoot":"","sources":["../../Router/Middleware.ts"],"names":[],"mappings":";;;AAYA,MAAsB,gBAAgB;CAErC;AAFD,4CAEC"}

package/Router/Request.d.ts

@@ -0,0 +1,24 @@
+import { File } from '../Storage';
+export declare class Request {
+    parameters: Record<string, string | number>;
+    protected raw: {
+        name: string;
+        body?: string | object;
+        cookies?: Record<string, string | undefined> | string;
+        files?: Record<string, File | File[]>;
+    };
+    protected details: {
+        name: string;
+        body: string | object | undefined;
+        cookies: Record<string, string | undefined>;
+        files: Record<string, File | File[]>;
+    };
+    constructor(name: string, body?: string | object, cookies?: string | Record<string, string | undefined>, files?: Record<string, File | File[]>);
+    get name(): string;
+    get body(): string | object | undefined;
+    set body(body: string | object | undefined);
+    get cookies(): Record<string, string | undefined>;
+    get files(): Record<string, File | File[]>;
+    set files(files: Record<string, File | File[]>);
+}
+//# sourceMappingURL=Request.d.ts.map

package/Router/Request.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../Router/Request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEjC,qBAAa,OAAO;IACT,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAK;IAEvD,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACvB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,MAAM,CAAC;QACtD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;KACzC,CAAA;IAID,SAAS,CAAC,OAAO,EAAE;QACf,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;QAClC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;QAC5C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;KACxC,CAAK;gBAGF,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EACtB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACrD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC;IAUzC,IAAI,IAAI,IAAI,MAAM,CAIjB;IAED,IAAI,IAAI,IAMO,MAAM,GAAG,MAAM,GAAG,SAAS,CAFzC;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAEzC;IAED,IAAI,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAIhD;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;CACJ"}

package/Router/Request.js

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

package/Router/Request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../Router/Request.ts"],"names":[],"mappings":";;;AAEA,MAAa,OAAO;IAmBhB,YACI,IAAY,EACZ,IAAsB,EACtB,OAAqD,EACrD,KAAqC;QAtBlC,eAAU,GAAoC,EAAE,CAAA;QASvD,6DAA6D;QAC7D,aAAa;QACH,YAAO,GAKb,EAAE,CAAA;QAQF,IAAI,CAAC,GAAG,GAAG;YACP,IAAI;YACJ,OAAO;YACP,IAAI;YACJ,KAAK;SACR,CAAA;IACL,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,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,IAAI,CAAC,IAAiC;QACtC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAA;IAC5B,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,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;CACJ;AA9DD,0BA8DC"}

package/Router/Route.d.ts

@@ -1,24 +1,14 @@
-import { Container } from '../Container';
-import { Abstract, Constructor, Type } from '../Support';
-import { MiddlewareInterface } from './Middleware';
+import { Abstract, AnyFunction, Constructor, Type } from '../Support';
+import { GlobalMiddleware } from './Middleware';
 import { Guard } from './Guard';
-export declare class Route {
-    uri: string;
-    method: string;
-    controller: Constructor;
-    action: string;
+export declare abstract class Route {
     name: string;
-    parametersTypes: (Type<Function> | FunctionConstructor)[];
-    middleware: Abstract<MiddlewareInterface>[];
+    controller: Constructor;
+    controllerMethod: string;
+    parametersTypes: (Type<AnyFunction> | FunctionConstructor)[];
+    middleware: Abstract<GlobalMiddleware>[];
     parameters: Record<string, string>;
     guards: (typeof Guard)[];
-    private readonly uriParts;
-    constructor(uri: string, method: string, controller: Constructor, action: string, name?: string, parametersTypes?: (Type<Function> | FunctionConstructor)[], middleware?: Abstract<MiddlewareInterface>[]);
-    run(container: Container): Promise<object | string>;
-    matches(uri: string): boolean;
-    splitUriParts(): void;
-    getUrl(): string;
-    private resolveParameters;
-    private hasCorrectPrimitiveType;
+    constructor(name: string, controller: Constructor, controllerMethod: string, parametersTypes?: (Type<AnyFunction> | FunctionConstructor)[], middleware?: Abstract<GlobalMiddleware>[]);
 }
 //# sourceMappingURL=Route.d.ts.map

package/Router/Route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../Router/Route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,qBAAa,KAAK;IAOH,GAAG,EAAE,MAAM;IACX,MAAM,EAAE,MAAM;IACd,UAAU,EAAE,WAAW;IACvB,MAAM,EAAE,MAAM;IACd,IAAI;IACJ,eAAe,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,mBAAmB,CAAC,EAAE;IACzD,UAAU,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE;IAZtD,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;IACvC,MAAM,EAAE,CAAC,OAAO,KAAK,CAAC,EAAE,CAAK;IAE7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmD;gBAGjE,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,WAAW,EACvB,MAAM,EAAE,MAAM,EACd,IAAI,SAAK,EACT,eAAe,GAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,mBAAmB,CAAC,EAAO,EAC9D,UAAU,GAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAO;IAKrD,GAAG,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;IAqBzD,OAAO,CAAC,GAAG,EAAE,MAAM;IAyBnB,aAAa;IAiBb,MAAM,IAAI,MAAM;YASF,iBAAiB;IAmB/B,OAAO,CAAC,uBAAuB;CAIlC"}
+{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../Router/Route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,8BAAsB,KAAK;IAKZ,IAAI;IACJ,UAAU,EAAE,WAAW;IACvB,gBAAgB,EAAE,MAAM;IACxB,eAAe,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,mBAAmB,CAAC,EAAE;IAC5D,UAAU,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE;IARnD,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;IACvC,MAAM,EAAE,CAAC,OAAO,KAAK,CAAC,EAAE,CAAK;gBAGlB,IAAI,QAAK,EACT,UAAU,EAAE,WAAW,EACvB,gBAAgB,EAAE,MAAM,EACxB,eAAe,GAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,mBAAmB,CAAC,EAAO,EACjE,UAAU,GAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAO;CAG3D"}

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;
-        }).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,kBAA+D,EAAE,EACjE,aAA2C,EAAE;QAJ7C,SAAI,GAAJ,IAAI,CAAK;QACT,eAAU,GAAV,UAAU,CAAa;QACvB,qBAAgB,GAAhB,gBAAgB,CAAQ;QACxB,oBAAe,GAAf,eAAe,CAAkD;QACjE,eAAU,GAAV,UAAU,CAAmC;QARxD,eAAU,GAA2B,EAAE,CAAA;QACvC,WAAM,GAAqB,EAAE,CAAA;IAS7B,CAAC;CACJ;AAZD,sBAYC"}

package/Router/Router.d.ts

@@ -1,13 +1,19 @@
 import { Container } from '../Container';
 import { Abstract } from '../Support';
-import { MiddlewareInterface } from './Middleware';
-import { Route } from './Route';
-import { WebsocketEvent } from './Websockets/WebsocketEvent';
+import { GlobalMiddleware } from './Middleware';
+import { WebsocketRoute } from './Websockets/WebsocketRoute';
+import { HttpRoute } from '@Typetron/Router/Http/HttpRoute';
+import { HttpMiddleware } from '@Typetron/Router/Http/Middleware';
+import { WebsocketMiddleware } from '@Typetron/Router/Websockets/Middleware';
 export declare class Router {
     app: Container;
-    routes: Route[];
-    events: Map<string, WebsocketEvent>;
-    middleware: Abstract<MiddlewareInterface>[];
+    routes: HttpRoute[];
+    actions: Map<string, WebsocketRoute>;
+    middleware: {
+        global: Abstract<GlobalMiddleware>[];
+        http: Abstract<HttpMiddleware>[];
+        websocket: Abstract<WebsocketMiddleware>[];
+    };
     loadControllers(directory: string): void;
 }
 //# sourceMappingURL=Router.d.ts.map

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,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAE5E,qBAAa,MAAM;IAGf,GAAG,EAAE,SAAS,CAAA;IAEd,MAAM,EAAE,SAAS,EAAE,CAAK;IACxB,OAAO,8BAAoC;IAE3C,UAAU,EAAE;QACR,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACrC,IAAI,EAAE,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QACjC,SAAS,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;KAC9C,CAIA;IAEM,eAAe,CAAC,SAAS,EAAE,MAAM;CAO3C"}

package/Router/Router.js

@@ -15,8 +15,12 @@ const Storage_1 = require("../Storage");
 class Router {
     constructor() {
         this.routes = [];
-        this.events = new Map();
-        this.middleware = [];
+        this.actions = new Map();
+        this.middleware = {
+            global: [],
+            http: [],
+            websocket: [],
+        };
     }
     loadControllers(directory) {
         this.app.get(Storage_1.Storage)

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;AAQpC,MAAa,MAAM;IAAnB;QAKI,WAAM,GAAgB,EAAE,CAAA;QACxB,YAAO,GAAG,IAAI,GAAG,EAA0B,CAAA;QAE3C,eAAU,GAIN;YACA,MAAM,EAAE,EAAE;YACV,IAAI,EAAE,EAAE;YACR,SAAS,EAAE,EAAE;SAChB,CAAA;IASL,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;AAtBG;IADC,kBAAM,EAAE;8BACJ,qBAAS;mCAAA;AAHlB,wBAyBC"}

package/Router/Servers/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../Router/Servers/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAGzD,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,QAQxF"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../Router/Servers/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAI/D,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,QA6CxF"}

package/Router/Servers/node.js

@@ -3,11 +3,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nodeServer = void 0;
 const Http_1 = require("@Typetron/Router/Http");
 const http_1 = require("http");
+const buffer_1 = require("buffer");
 function nodeServer(port, handler) {
     const server = http_1.createServer(async (incomingMessage, serverResponse) => {
-        const request = await Http_1.Request.capture(incomingMessage);
+        const request = new Http_1.Request(incomingMessage.url ?? '', incomingMessage.method || Http_1.Http.Method.GET);
+        request.setHeadersLoader(() => incomingMessage.headers);
+        request.getHeader = (name) => {
+            return incomingMessage.headers[String(name).toLowerCase()];
+        };
+        if (request.method.toLowerCase() !== Http_1.Http.Method.GET.toLowerCase()) {
+            if (request.isMultipartRequest()) {
+                [request.body, request.files] = await Http_1.Request.loadMultipartContent(incomingMessage);
+            }
+            else {
+                request.body = await Http_1.Request.loadSimpleContent(incomingMessage);
+            }
+            // 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);
-        Http_1.Response.send(serverResponse, response.status, response.body, response.headers);
+        let content = response.body;
+        if (!(content instanceof buffer_1.Buffer)) {
+            if (content instanceof Object) {
+                content = JSON.stringify(content);
+                serverResponse.setHeader('Content-Type', 'application/json');
+            }
+            content = String(content ?? '');
+        }
+        for (const header in response.headers) {
+            serverResponse.setHeader(header, response.headers[header] || '');
+        }
+        serverResponse.statusCode = response.status;
+        serverResponse.end(content);
     });
     server.listen(port);
 }

package/Router/Servers/node.js.map

@@ -1 +1 @@
-{"version":3,"file":"node.js","sourceRoot":"","sources":["../../../Router/Servers/node.ts"],"names":[],"mappings":";;;AAAA,gDAAyD;AACzD,+BAAoE;AAEpE,SAAgB,UAAU,CAAC,IAAY,EAAE,OAAgD;IACrF,MAAM,MAAM,GAAG,mBAAY,CAAC,KAAK,EAAE,eAAgC,EAAE,cAA8B,EAAE,EAAE;QACnG,MAAM,OAAO,GAAG,MAAM,cAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QACtD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;QACvC,eAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;IACnF,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AACvB,CAAC;AARD,gCAQC"}
+{"version":3,"file":"node.js","sourceRoot":"","sources":["../../../Router/Servers/node.ts"],"names":[],"mappings":";;;AAAA,gDAA+D;AAC/D,+BAAyF;AACzF,mCAA+B;AAE/B,SAAgB,UAAU,CAAC,IAAY,EAAE,OAAgD;IACrF,MAAM,MAAM,GAAG,mBAAY,CAAC,KAAK,EAAE,eAAgC,EAAE,cAA8B,EAAE,EAAE;QACnG,MAAM,OAAO,GAAG,IAAI,cAAO,CACvB,eAAe,CAAC,GAAG,IAAI,EAAE,EACzB,eAAe,CAAC,MAAqB,IAAI,WAAI,CAAC,MAAM,CAAC,GAAG,CAC3D,CAAA;QAED,OAAO,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QACvD,OAAO,CAAC,SAAS,GAAG,CAA0C,IAAwC,EAAK,EAAE;YACzG,OAAO,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAM,CAAA;QACnE,CAAC,CAAA;QAED,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,WAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE;YAChE,IAAI,OAAO,CAAC,kBAAkB,EAAE,EAAE;gBAC9B,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,MAAM,cAAO,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAA;aACtF;iBAAM;gBACH,OAAO,CAAC,IAAI,GAAG,MAAM,cAAO,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAA;aAClE;YAED,4GAA4G;YAC5G,iGAAiG;SACpG;QAGD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;QAEvC,IAAI,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAA;QAE3B,IAAI,CAAC,CAAC,OAAO,YAAY,eAAM,CAAC,EAAE;YAC9B,IAAI,OAAO,YAAY,MAAM,EAAE;gBAC3B,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;gBACjC,cAAc,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;aAC/D;YACD,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAA;SAClC;QAED,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE;YACnC,cAAc,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;SACnE;QAED,cAAc,CAAC,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAA;QAC3C,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC/B,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AACvB,CAAC;AA7CD,gCA6CC"}

package/Router/Servers/uNetworking.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uNetworking.d.ts","sourceRoot":"","sources":["../../../Router/Servers/uNetworking.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAE/D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,QAwB/F"}
+{"version":3,"file":"uNetworking.d.ts","sourceRoot":"","sources":["../../../Router/Servers/uNetworking.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AA6D/D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,QAiB/F"}