@adaas/a-server 0.0.22 → 0.0.24

package/src/lib/A-ServerLogger/A-ServerLogger.component.ts

@@ -0,0 +1,121 @@
+import { A_Error, A_Feature, A_Inject, } from "@adaas/a-concept";
+import { A_Server } from "@adaas/a-server/server/A-Server.context";
+import { A_Request } from "@adaas/a-server/request/A-Request.entity";
+import { A_Response } from "@adaas/a-server/response/A-Response.entity";
+import { A_ResponseFeatures } from "@adaas/a-server/response/A-Response.constants";
+import { A_HttpServerRequestContext } from "@adaas/a-server/request/A-HttpServerRequest.context";
+import { A_Config } from "@adaas/a-utils/a-config";
+import { A_Logger } from "@adaas/a-utils/a-logger";
+import { A_Service, A_ServiceFeatures } from "@adaas/a-utils/a-service";
+
+
+export class A_ServerLogger extends A_Logger {
+
+    protected declare config: A_Config<any>
+
+
+
+    @A_Feature.Extend({
+        name: A_ResponseFeatures.onSend,
+        scope: [A_Response]
+    })
+    logRequestFinish(
+        @A_Inject(A_Request) request: A_Request,
+        @A_Inject(A_Response) response: A_Response,
+        @A_Inject(A_HttpServerRequestContext) context: A_HttpServerRequestContext,
+    ) {
+
+        this.info('green', `Request ${request.method} ${request.url} finished with status ${response.statusCode} in ${context.processingTime ?? 'N/A'}ms`);
+    }
+
+
+    @A_Feature.Extend({
+        name: A_ResponseFeatures.onError,
+        scope: [A_Response]
+    })
+    logResponseError(
+        @A_Inject(A_Request) request: A_Request,
+        @A_Inject(A_Response) response: A_Response,
+        @A_Inject(A_HttpServerRequestContext) context: A_HttpServerRequestContext,
+        @A_Inject(A_Error) error: A_Error,
+    ) {
+        this.info('red', `Request ${request.method} ${request.url} errored with status ${response.statusCode} in ${context.processingTime ?? 'N/A'}ms`);
+        this.error(error);
+    }
+
+
+
+
+    // @A_Feature.Extend({
+    //     name: A_ServiceFeatures.onAfterStart,
+    //     scope: [A_Service]
+    // })
+    // logStart(
+    //     @A_Inject(A_Service) container: A_Service,
+    // ): void {
+    //     // this.serverReady({
+    //     //     port: container.port,
+    //     //     app: {
+    //     //         name: container.name,
+    //     //     }
+    //     // })
+    // }
+
+
+
+
+    @A_Feature.Extend({
+        name: A_ServiceFeatures.onAfterStop,
+        scope: [A_Service]
+    })
+    logStop(
+        @A_Inject(A_Server) server: A_Server,
+    ) {
+        this.log('red', `Server ${server.name} stopped`);
+    }
+
+
+
+
+    serverReady(
+        params: {
+            port: number,
+
+            app: {
+                name: string,
+                version?: string
+            }
+        }
+    ) {
+        const processId = process.pid;
+
+        this.info('cyan',
+            ` ${params.app.name} v${params.app.version || '0.0.1'} is running on port ${params.port}`,
+            ` Process ID: ${processId}`,
+            ` Open In Browser: http://localhost:${params.port}`,
+            ``,
+            `-------------------------------`,
+            ` ==============================`,
+            `          LISTENING...      `,
+            ` ==============================`
+        );
+    }
+
+
+    /**
+     * Displays a proxy routes 
+     * 
+     * @param params 
+     */
+    proxy(
+        params: {
+            original: string,
+            destination: string,
+        }
+    ) {
+        console.log(`\x1b[35m[${this.scope.name}] |${this.getTime()}| Proxy:
+${' '.repeat(this.scopeLength + 3)}| ${params.original} -> ${params.destination}
+${' '.repeat(this.scopeLength + 3)}|-------------------------------\x1b[0m`);
+    }
+
+}

package/src/lib/A-ServerLogger/A-ServerLogger.types.ts

@@ -0,0 +1,13 @@
+import { A_TYPES__ConceptENVVariables } from "@adaas/a-concept";
+import { A_SERVER__A_SERVER_LOGGER_ENV_VARIABLES } from "./A-ServerLogger.constants";
+
+export type A_SERVER_TYPES__ServerLoggerRouteParams = {
+    method: string,
+    url: string,
+    status: number,
+    responseTime: number
+}
+
+
+export type A_SERVER_TYPES__ServerLoggerEnvVariables = Array<keyof typeof A_SERVER__A_SERVER_LOGGER_ENV_VARIABLES>
+    | A_TYPES__ConceptENVVariables

package/src/lib/A-ServerMiddleware/A-ServerMiddleware.component.ts

@@ -0,0 +1,17 @@
+import { A_Component } from "@adaas/a-concept";
+
+
+
+export class A_ServerMiddleware extends A_Component {
+
+
+    // static get features() {
+    //     // return (target: any, propertyKey: string, descriptor: PropertyDescriptor) => {
+    //     //     return A_Feature.Extend({
+    //     //         name: A_ServerMiddlewareFeatures.onBeforeInit,
+    //     //         scope: [target.constructor],
+    //     //     })(target, propertyKey, descriptor);
+    //     // }
+    // }
+
+}

package/src/{components → lib}/A-ServerProxy/A-ServerProxy.component.ts

@@ -1,10 +1,11 @@
 import { A_Component, A_Concept, A_Feature, A_Inject } from "@adaas/a-concept";
-import { A_SERVER_TYPES__ServerFeature } from "@adaas/a-server/containers/A-Service/A-Service.container.types";
-import { A_ProxyConfig } from "@adaas/a-server/context/A-ProxyConfig/A_ProxyConfig.context";
-import { A_Request } from "@adaas/a-server/entities/A-Request/A-Request.entity";
-import { A_Response } from "@adaas/a-server/entities/A-Response/A-Response.entity";
-import { A_Route } from "@adaas/a-server/entities/A-Route/A-Route.entity";
-import { A_Logger, A_Polyfill } from "@adaas/a-utils";
+import { A_HttpServerFeatures } from "@adaas/a-server/server/A-HttpServer.constants";
+import { A_ProxyConfig } from "./A-ServerProxy.context";
+import { A_Request } from "@adaas/a-server/request/A-Request.entity";
+import { A_Response } from "@adaas/a-server/response/A-Response.entity";
+import { A_ServerRoute } from "@adaas/a-server/route/A-ServerRoute.entity";
+import { A_Logger, A_LOGGER_COLORS } from "@adaas/a-utils/a-logger";
+import { A_Polyfill } from "@adaas/a-utils/a-polyfill";
 
 
 export class A_ServerProxy extends A_Component {
@@ -15,29 +16,31 @@ export class A_ServerProxy extends A_Component {
         @A_Inject(A_Logger) logger: A_Logger,
         @A_Inject(A_ProxyConfig) config: A_ProxyConfig
     ) {
-        logger.log(
-            'pink',
+        logger.info(
+            'green',
             `Proxy routes configured:`,
-            config.configs.map(c => c.route).join('\n')
+            ...config.configs.map(c => `${c.route.toString()} -> ${c.protocol}//${c.hostname}:${c.port}`)
         );
     }
 
 
 
     @A_Feature.Extend({
-        name: A_SERVER_TYPES__ServerFeature.onRequest,
+        name: A_HttpServerFeatures.onRequest,
+        before:/.*/
     })
     async onRequest(
         @A_Inject(A_Request) req: A_Request,
         @A_Inject(A_Response) res: A_Response,
         @A_Inject(A_ProxyConfig) proxyConfig: A_ProxyConfig,
         @A_Inject(A_Logger) logger: A_Logger,
-        @A_Inject(A_Polyfill) polyfill: A_Polyfill
+        @A_Inject(A_Polyfill) polyfill: A_Polyfill,
+        @A_Inject(A_Feature) feature: A_Feature
     ) {
         return new Promise<void>(async (resolve, reject) => {
             const { method, url } = req;
 
-            const route = new A_Route(url, method);
+            const route = new A_ServerRoute(url, method);
             const config = proxyConfig.config(route.toString());
 
             if (!config) {
@@ -80,6 +83,8 @@ export class A_ServerProxy extends A_Component {
             proxyReq.on("error", (err) => reject(err));
 
             req.pipe(proxyReq);
+
+            feature.interrupt();
         });
     }
 

package/src/{context/A-ProxyConfig/A_ProxyConfig.constants.ts → lib/A-ServerProxy/A-ServerProxy.constants.ts}

@@ -1,4 +1,4 @@
-import { A_SERVER_TYPES__ProxyConfigConstructorConfig } from "./A_ProxyConfig.types";
+import { A_SERVER_TYPES__ProxyConfigConstructorConfig } from "./A-ServerProxy.types";
 
 export const PROXY_CONFIG_DEFAULTS: A_SERVER_TYPES__ProxyConfigConstructorConfig = {
     path: '/',

package/src/{context/A-ProxyConfig/A_ProxyConfig.context.ts → lib/A-ServerProxy/A-ServerProxy.context.ts}

@@ -1,7 +1,7 @@
 import { A_Fragment } from "@adaas/a-concept";
-import { A_SERVER_TYPES__ProxyConfigConstructor, A_SERVER_TYPES__ProxyConfigConstructorConfig, A_SERVER_TYPES__RoutesConfig } from "./A_ProxyConfig.types";
-import { PROXY_CONFIG_DEFAULTS } from "./A_ProxyConfig.constants";
-import { A_Route } from "@adaas/a-server/entities/A-Route/A-Route.entity";
+import { A_SERVER_TYPES__ProxyConfigConstructor, A_SERVER_TYPES__ProxyConfigConstructorConfig, A_SERVER_TYPES__RoutesConfig } from "./A-ServerProxy.types";
+import { PROXY_CONFIG_DEFAULTS } from "./A-ServerProxy.constants";
+import { A_ServerRoute } from "@adaas/a-server/route/A-ServerRoute.entity";
 
 
 
@@ -37,7 +37,7 @@ export class A_ProxyConfig extends A_Fragment {
             }
 
             return {
-                route: new A_Route(prepared.path, prepared.method),
+                route: new A_ServerRoute(prepared.path, prepared.method),
                 hostname: prepared.hostname,
                 port: prepared.port,
                 headers: prepared.headers,

package/src/{context/A-ProxyConfig/A_ProxyConfig.types.ts → lib/A-ServerProxy/A-ServerProxy.types.ts}

@@ -1,5 +1,5 @@
-import { A_SERVER_TYPES__RequestMethods } from "@adaas/a-server/entities/A-Request/A-Request.entity.types"
-import { A_Route } from "@adaas/a-server/entities/A-Route/A-Route.entity"
+import { A_ServerRoute } from "@adaas/a-server/route/A-ServerRoute.entity";
+import { A_ServerRouteHttpMethodNames } from "@adaas/a-server/route/A-ServerRoute.types"
 
 
 
@@ -13,13 +13,13 @@ export type A_SERVER_TYPES__ProxyConfigConstructorConfig = {
     protocol: 'http' | 'https' | string,
     port: number,
     path: string,
-    method: A_SERVER_TYPES__RequestMethods,
+    method: A_ServerRouteHttpMethodNames,
     headers: Record<string, string>
 }
 
 
 export type A_SERVER_TYPES__RoutesConfig = {
-    route: A_Route,
+    route: A_ServerRoute,
     protocol: 'http' | 'https' | string,
     hostname: string,
     port: number,

package/src/lib/A-ServerRoute/A-ServerRoute.constants.ts

@@ -0,0 +1,20 @@
+export const A_ServerRouteHttpMethods = {
+    DEFAULT: 'DEFAULT',
+    GET: 'GET',
+    POST: 'POST',
+    PUT: 'PUT',
+    DELETE: 'DELETE',
+    PATCH: 'PATCH',
+    OPTIONS: 'OPTIONS',
+    HEAD: 'HEAD',
+    CONNECT: 'CONNECT',
+    TRACE: 'TRACE',
+} as const
+
+
+export const A_ServerRouteProtocols = {
+    HTTP: 'http',
+    HTTPS: 'https',
+    WS: 'ws',
+    WSS: 'wss',
+} as const

package/src/lib/A-ServerRoute/A-ServerRoute.entity.ts

@@ -0,0 +1,48 @@
+import { A_Route } from '@adaas/a-utils/a-route';
+import { A_ServerRouteHttpMethodNames } from './A-ServerRoute.types';
+
+
+
+export class A_ServerRoute extends A_Route {
+
+    public url!: string;
+    public method!: A_ServerRouteHttpMethodNames;
+
+
+    constructor(
+        url: string | RegExp,
+        method: A_ServerRouteHttpMethodNames
+    )
+    constructor(
+        url: string | RegExp,
+    )
+    constructor(
+        param1: string | RegExp,
+        param2?: A_ServerRouteHttpMethodNames
+    ) {
+        super(param1);
+        this.url = param1 instanceof RegExp ? param1.source : param1;
+        this.method = param2 || 'GET';
+    }
+
+
+    toString(): string {
+        // path can be like /api/v1/users/:id
+        // and because of that :id we need to replace it with regex that matches chars and numbers only   
+        return `${this.method}::${this.path}`;
+
+        // .replace(/\/:([^\/]+)/g, '\\/([^\/]+)')
+    }
+
+    toRegExp(): RegExp {
+        return new RegExp(`^${this.method}::${this.path.replace(/\/:([^\/]+)/g, '/([^/]+)')}$`);
+    }
+
+    toAFeatureExtension(extensionScope: Array<string> = []): RegExp {
+        return new RegExp(`^${extensionScope.length
+            ? `(${extensionScope.join('|')})`
+            : '.*'
+            }\\.${this.method}::${this.path.replace(/\/:([^\/]+)/g, '/([^/]+)')}$`);
+    }
+}
+

package/src/lib/A-ServerRoute/A-ServerRoute.types.ts

@@ -0,0 +1,6 @@
+import { A_ServerRouteHttpMethods, A_ServerRouteProtocols } from "./A-ServerRoute.constants";
+
+
+export type A_serverRouteProtocolNames = typeof A_ServerRouteProtocols[keyof typeof A_ServerRouteProtocols];
+
+export type A_ServerRouteHttpMethodNames = typeof A_ServerRouteHttpMethods[keyof typeof A_ServerRouteHttpMethods]

package/src/{components/A-Router/A-Router.component.ts → lib/A-ServerRouter/A-ServerRouter.component.ts}

@@ -3,33 +3,30 @@ import {
     A_Concept,
     A_Context,
     A_Feature,
-    A_Feature_Define,
-    A_Feature_Extend,
-    A_IdentityHelper,
     A_Inject,
     A_Meta,
     A_Scope,
-    A_TypeGuards
+    A_TypeGuards,
+    A_TYPES__Required
 } from "@adaas/a-concept";
-import { A_Service } from "@adaas/a-server/containers/A-Service/A-Service.container";
-import { A_SERVER_TYPES__ServerFeature } from "@adaas/a-server/containers/A-Service/A-Service.container.types";
-import { A_Request } from "@adaas/a-server/entities/A-Request/A-Request.entity";
-import {
-    A_SERVER_TYPES__ARouterComponentMetaKey,
-    A_SERVER_TYPES__ARouterRouteConfig,
-    A_SERVER_TYPES__RouterMethod,
-    A_TYPES__ARouterComponentMeta,
-    A_TYPES__ARouterDefineRoute
-} from "./A-Router.component.types";
-import { A_Route } from "@adaas/a-server/entities/A-Route/A-Route.entity";
-import { A_Response } from "@adaas/a-server/entities/A-Response/A-Response.entity";
-import { A_ServerLogger } from "../A-ServerLogger/A_ServerLogger.component";
-import { A_TYPES__Required } from "@adaas/a-concept/dist/src/types/A_Common.types";
-import { A_Config, A_Logger } from "@adaas/a-utils";
+import { A_Request } from "@adaas/a-server/request/A-Request.entity";
+import { A_ServerLogger } from "../A-ServerLogger/A-ServerLogger.component";
+import { A_HttpServerFeatures } from "@adaas/a-server/server/A-HttpServer.constants";
+import { A_HttpServerError } from "@adaas/a-server/server/A-HttpServer.error";
+import { A_Config } from "@adaas/a-utils/a-config";
+import { A_Logger } from "@adaas/a-utils/a-logger";
+import { A_Response } from "@adaas/a-server/response/A-Response.entity";
+import { A_ServerRoute } from "@adaas/a-server/route/A-ServerRoute.entity";
+import { A_ServerRouteHttpMethodNames } from "@adaas/a-server/route/A-ServerRoute.types";
+import { A_ServerRouteHttpMethods } from "@adaas/a-server/route/A-ServerRoute.constants";
+import { A_ServerRouterMeta } from "./A-ServerRouter.meta";
+import { A_ServerRouterDefineDecorator } from "./A-ServerRouterDefine.decorator";
+import { A_ServerRouterRouteConfig } from "./A-ServerRouter.types";
 
 
 
-export class A_Router extends A_Component {
+@A_Meta.Define(A_ServerRouterMeta)
+export class A_ServerRouter extends A_Component {
 
     // =======================================================
     // ================ Method Definition=====================
@@ -41,11 +38,9 @@ export class A_Router extends A_Component {
      * @param path 
      * @returns 
      */
-    static Post(path: string | A_Route | RegExp | A_TYPES__Required<Partial<A_SERVER_TYPES__ARouterRouteConfig>, ['path']>) {
-
-
+    static Post(path: string | A_ServerRoute | RegExp | A_TYPES__Required<Partial<A_ServerRouterRouteConfig>, ['path']>) {
         return this.defineRoute({
-            method: A_SERVER_TYPES__RouterMethod.POST,
+            method: A_ServerRouteHttpMethods.POST,
             path: typeof path === 'object' && 'path' in path ? path.path : path,
             version: typeof path === 'object' && 'version' in path && path.version ? path.version : 'v1',
             prefix: typeof path === 'object' && 'prefix' in path && path.prefix ? path.prefix : 'api',
@@ -58,9 +53,9 @@ export class A_Router extends A_Component {
      * @param path 
      * @returns 
      */
-    static Get(path: string | A_Route | RegExp | A_TYPES__Required<Partial<A_SERVER_TYPES__ARouterRouteConfig>, ['path']>) {
+    static Get(path: string | A_ServerRoute | RegExp | A_TYPES__Required<Partial<A_ServerRouterRouteConfig>, ['path']>) {
         return this.defineRoute({
-            method: A_SERVER_TYPES__RouterMethod.GET,
+            method: A_ServerRouteHttpMethods.GET,
             path: typeof path === 'object' && 'path' in path ? path.path : path,
             version: typeof path === 'object' && 'version' in path && path.version ? path.version : 'v1',
             prefix: typeof path === 'object' && 'prefix' in path && path.prefix ? path.prefix : 'api',
@@ -73,9 +68,9 @@ export class A_Router extends A_Component {
      * @param path 
      * @returns 
      */
-    static Put(path: string | A_Route | RegExp | A_TYPES__Required<Partial<A_SERVER_TYPES__ARouterRouteConfig>, ['path']>) {
+    static Put(path: string | A_ServerRoute | RegExp | A_TYPES__Required<Partial<A_ServerRouterRouteConfig>, ['path']>) {
         return this.defineRoute({
-            method: A_SERVER_TYPES__RouterMethod.PUT,
+            method: A_ServerRouteHttpMethods.PUT,
             path: typeof path === 'object' && 'path' in path ? path.path : path,
             version: typeof path === 'object' && 'version' in path && path.version ? path.version : 'v1',
             prefix: typeof path === 'object' && 'prefix' in path && path.prefix ? path.prefix : 'api',
@@ -88,9 +83,9 @@ export class A_Router extends A_Component {
      * @param path 
      * @returns 
      */
-    static Delete(path: string | A_Route | RegExp | A_TYPES__Required<Partial<A_SERVER_TYPES__ARouterRouteConfig>, ['path']>) {
+    static Delete(path: string | A_ServerRoute | RegExp | A_TYPES__Required<Partial<A_ServerRouterRouteConfig>, ['path']>) {
         return this.defineRoute({
-            method: A_SERVER_TYPES__RouterMethod.DELETE,
+            method: A_ServerRouteHttpMethods.DELETE,
             path: typeof path === 'object' && 'path' in path ? path.path : path,
             version: typeof path === 'object' && 'version' in path && path.version ? path.version : 'v1',
             prefix: typeof path === 'object' && 'prefix' in path && path.prefix ? path.prefix : 'api',
@@ -103,9 +98,9 @@ export class A_Router extends A_Component {
      * @param path 
      * @returns 
      */
-    static Patch(path: string | A_Route | RegExp | A_TYPES__Required<Partial<A_SERVER_TYPES__ARouterRouteConfig>, ['path']>) {
+    static Patch(path: string | A_ServerRoute | RegExp | A_TYPES__Required<Partial<A_ServerRouterRouteConfig>, ['path']>) {
         return this.defineRoute({
-            method: A_SERVER_TYPES__RouterMethod.PATCH,
+            method: A_ServerRouteHttpMethods.PATCH,
             path: typeof path === 'object' && 'path' in path ? path.path : path,
             version: typeof path === 'object' && 'version' in path && path.version ? path.version : 'v1',
             prefix: typeof path === 'object' && 'prefix' in path && path.prefix ? path.prefix : 'api',
@@ -118,9 +113,9 @@ export class A_Router extends A_Component {
      * @param path 
      * @returns 
      */
-    static Default(path: string | A_Route | RegExp | A_TYPES__Required<Partial<A_SERVER_TYPES__ARouterRouteConfig>, ['path']>) {
+    static Default(path: string | A_ServerRoute | RegExp | A_TYPES__Required<Partial<A_ServerRouterRouteConfig>, ['path']>) {
         return this.defineRoute({
-            method: A_SERVER_TYPES__RouterMethod.DEFAULT,
+            method: A_ServerRouteHttpMethods.DEFAULT,
             path: typeof path === 'object' && 'path' in path ? path.path : path,
             version: typeof path === 'object' && 'version' in path && path.version ? path.version : 'v1',
             prefix: typeof path === 'object' && 'prefix' in path && path.prefix ? path.prefix : 'api',
@@ -128,7 +123,7 @@ export class A_Router extends A_Component {
     }
 
 
-    static routes: Array<A_Route> = [];
+    // static routes: Array<A_ServerRoute> = [];
 
     /**
      * Private method to have the same signature for all route methods
@@ -138,43 +133,15 @@ export class A_Router extends A_Component {
      * @returns 
      */
     private static defineRoute(
-        config: A_SERVER_TYPES__ARouterRouteConfig & { method: A_SERVER_TYPES__RouterMethod }
+        config: A_ServerRouterRouteConfig & { method: A_ServerRouteHttpMethodNames }
     ) {
         const route = typeof config.path === 'string' || config.path instanceof RegExp
-            ? new A_Route(
+            ? new A_ServerRoute(
                 `/${config.prefix}/${config.version}${config.path instanceof RegExp ? config.path.source : config.path.startsWith('/') ? config.path : `/${config.path}`}`,
                 config.method)
             : config.path;
 
-        this.routes.push(route);
-
-        return function decorator(
-            target: A_Component,
-            propertyKey: string,
-            descriptor: PropertyDescriptor
-        ) {
-
-            const meta: A_Meta<A_TYPES__ARouterComponentMeta> = A_Context.meta<A_TYPES__ARouterComponentMeta>(target as any);
-
-            const routes = meta.get(A_SERVER_TYPES__ARouterComponentMetaKey.ROUTES) || new Map<string, A_TYPES__ARouterDefineRoute>();
-
-            const searchKey = route.toAFeatureExtension(['A_Router', 'A_Service']);
-
-            routes.set(searchKey.source, {
-                component: target,
-                handler: propertyKey,
-                route
-            });
-
-            meta.set(A_SERVER_TYPES__ARouterComponentMetaKey.ROUTES, routes);
-
-            A_Feature_Define({
-                name: searchKey.source,
-                invoke: false
-            })(target, propertyKey, descriptor)
-
-            return A_Feature_Extend(searchKey)(target, propertyKey, descriptor);
-        }
+        return A_ServerRouterDefineDecorator(route);
     }
 
 
@@ -186,7 +153,23 @@ export class A_Router extends A_Component {
     protected async load(
         @A_Inject(A_ServerLogger) logger: A_ServerLogger
     ): Promise<void> {
-        logger.routes(A_Router.routes);
+        const meta = A_Context.meta<A_ServerRouterMeta>(this.constructor as any);
+
+        const routes = meta.routes;
+
+        if (!routes || !routes.length) {
+            logger.warning('yellow', `No routes defined for ${this.constructor.name}`);
+            return;
+        }
+
+
+        logger.info('cyan',
+            `Registered Routes:`,
+            `------------------------------------\n`,
+            ...routes
+                .map(route => `[${route.method.toUpperCase()}]${' '.repeat(7 - route.method.length)} ${route.path}`)
+
+        );
     }
 
 
@@ -198,25 +181,20 @@ export class A_Router extends A_Component {
     //     invoke: false
     // })
     @A_Feature.Extend({
-        name: A_SERVER_TYPES__ServerFeature.onRequest,
-        scope: [A_Service],
+        name: A_HttpServerFeatures.onRequest,
     })
     async identifyRoute(
         @A_Inject(A_Request) request: A_Request,
         @A_Inject(A_Response) response: A_Response,
         @A_Inject(A_Scope) scope: A_Scope,
         @A_Inject(A_Config) config: A_Config,
-        @A_Inject(A_Logger) logger: A_Logger
+        @A_Inject(A_Logger) logger: A_Logger,
+        @A_Inject(A_ServerRoute) route: A_ServerRoute,
     ) {
-
-        const route = request.route;
-
-        if (config.get('A_CONCEPT_ENVIRONMENT') === 'development') {
-            logger.log(`Incoming request: ${request.method} ${request.url}`);
-            logger.log(`Identified route: ${route.toString()}`);
+        if (route.method === 'OPTIONS') {
+            // Ignore OPTIONS requests
+            return;
         }
-
-
         /**
          * just execute all listeners on the Route
          * url example: /api/v1/users/123
@@ -226,34 +204,38 @@ export class A_Router extends A_Component {
          * And it will return all stages that are similar to the feature name 
          */
 
-        const feature = new A_Feature({
-            name: route.toString(),
-            component: this,
-        })
+        const feature = new A_Feature({ name: route.toString(), component: this, })
+
+        if (!feature.size)
+            throw new A_HttpServerError({
+                status: 404,
+                title: 'Route Not Found',
+                description: `No route found for ${request.method} ${request.url}`,
+            })
 
 
         for (const stage of feature) {
-            if (A_TypeGuards.isComponentConstructor(stage.definition.component)) {
 
-                const meta: A_Meta<A_TYPES__ARouterComponentMeta> = A_Context.meta<A_TYPES__ARouterComponentMeta>(stage.definition.component);
+            const targetConstructor = stage.definition.dependency.target;
+
+            if (A_TypeGuards.isComponentConstructor(targetConstructor)) {
+
+                const meta: A_ServerRouterMeta = A_Context.meta<A_ServerRouterMeta>(this.constructor as any);
+
+                const routeDefinitions = meta.definitions;
 
-                const routes = meta.get(A_SERVER_TYPES__ARouterComponentMetaKey.ROUTES);
+                const routeDefinition = routeDefinitions?.get(stage.definition.name || '');
 
-                if (routes) {
-                    const currentRoute = routes.get(stage.definition.name || '');
 
-                    if (currentRoute) {
-                        request.params = {
-                            ...request.params,
-                            ...currentRoute.route.extractParams(request.url)
-                        };
-                    }
+
+
+                if (routeDefinition) {
+                    request.useRoute(routeDefinition.route);
                 }
             }
 
             const stageScope = new A_Scope({
-                name: `a-route--${A_IdentityHelper.generateTimeId()}`,
-                entities: [request],
+                name: `a-route--${request.id}--${stage.definition.name}`,
             }, {
                 parent: scope
             });
@@ -262,7 +244,5 @@ export class A_Router extends A_Component {
             await stage.process(stageScope);
         }
 
-
-        console.log('Finished processing route for request:', request.method, request.url);
     }
 }

package/src/lib/A-ServerRouter/A-ServerRouter.constants.ts

@@ -0,0 +1,8 @@
+
+
+export const A_ServerRouterMetaKeys = {
+    ROUTES: '_A_ServerRouterMeta_ROUTES',
+    ROUTES_CONFIGS: '_A_ServerRouterMeta_ROUTES_CONFIGS',
+} as const
+
+