@adaas/a-server 0.0.15 → 0.0.17

package/src/components/A-Router/A-Router.component.ts

@@ -1,15 +1,15 @@
 import {
     A_Component,
     A_Concept,
-    A_Config,
     A_Context,
     A_Feature,
     A_Feature_Define,
     A_Feature_Extend,
+    A_IdentityHelper,
     A_Inject,
-    A_Logger,
     A_Meta,
-    A_Scope
+    A_Scope,
+    A_TypeGuards
 } 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";
@@ -24,7 +24,8 @@ import {
 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-utils";
+import { A_TYPES__Required } from "@adaas/a-concept/dist/src/types/A_Common.types";
+import { A_Config, A_Logger } from "@adaas/a-utils";
 
 
 
@@ -142,7 +143,7 @@ export class A_Router extends A_Component {
         const route = typeof config.path === 'string' || config.path instanceof RegExp
             ? new A_Route(
                 `/${config.prefix}/${config.version}${config.path instanceof RegExp ? config.path.source : config.path.startsWith('/') ? config.path : `/${config.path}`}`,
-                 config.method)
+                config.method)
             : config.path;
 
         this.routes.push(route);
@@ -193,9 +194,9 @@ export class A_Router extends A_Component {
     // =======================================================
     // ================ Feature Definition=====================
     // =======================================================
-    @A_Feature.Define({
-        invoke: false
-    })
+    // @A_Feature.Define({
+    //     invoke: false
+    // })
     @A_Feature.Extend({
         name: A_SERVER_TYPES__ServerFeature.onRequest,
         scope: [A_Service],
@@ -225,18 +226,21 @@ export class A_Router extends A_Component {
          * And it will return all stages that are similar to the feature name 
          */
 
-        const feature = A_Context.feature(this, route.toString(), scope);
+        const feature = new A_Feature({
+            name: route.toString(),
+            component: this,
+        })
 
-        for (const stage of feature) {
 
-            for (const step of stage.steps) {
+        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>(step.component);
+                const meta: A_Meta<A_TYPES__ARouterComponentMeta> = A_Context.meta<A_TYPES__ARouterComponentMeta>(stage.definition.component);
 
                 const routes = meta.get(A_SERVER_TYPES__ARouterComponentMetaKey.ROUTES);
 
                 if (routes) {
-                    const currentRoute = routes.get(step.name || '');
+                    const currentRoute = routes.get(stage.definition.name || '');
 
                     if (currentRoute) {
                         request.params = {
@@ -248,10 +252,17 @@ export class A_Router extends A_Component {
             }
 
             const stageScope = new A_Scope({
-                name: `a-route::${Date.now()}`,
+                name: `a-route--${A_IdentityHelper.generateTimeId()}`,
                 entities: [request],
+            }, {
+                parent: scope
             });
+
+
             await stage.process(stageScope);
         }
+
+
+        console.log('Finished processing route for request:', request.method, request.url);
     }
 }

package/src/components/A-Router/A-Router.component.types.ts

@@ -1,4 +1,4 @@
-import { A_Component, A_TYPES__ComponentMeta, A_TYPES__ComponentMetaKey } from "@adaas/a-concept";
+import { A_Component, A_TYPES__ComponentMeta } from "@adaas/a-concept";
 import { A_Route } from "@adaas/a-server/entities/A-Route/A-Route.entity";
 
 

package/src/components/A-ServerCORS/A_ServerCORS.component.ts

@@ -1,9 +1,10 @@
-import { A_Component, A_Config, A_Feature, A_Inject } from '@adaas/a-concept';
+import { A_Component, A_Feature, A_Inject } from '@adaas/a-concept';
 import { A_SERVER_TYPES__CorsConfig } from './A_ServerCORS.component.types';
 import { A_SERVER_DEFAULTS__CorsConfig } from './A_ServerCORS.component.defaults';
 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_Response } from '@adaas/a-server/entities/A-Response/A-Response.entity';
+import { A_Config } from '@adaas/a-utils';
 
 
 export class A_ServerCORS extends A_Component {

package/src/components/A-ServerError/A-ServerError.class.ts

@@ -0,0 +1,98 @@
+import { A_Error } from '@adaas/a-concept';
+import { A_SERVER_TYPES__ServerError_Init, A_SERVER_TYPES__ServerError_Serialized } from './A-ServerError.types';
+
+
+export class A_ServerError extends A_Error<A_SERVER_TYPES__ServerError_Init, A_SERVER_TYPES__ServerError_Serialized> {
+
+    status: number = 500;
+
+
+    // constructor(
+    //     /**
+    //      * A_Error Constructor params
+    //      */
+    //     params: A_SERVER_TYPES__ServerError_Init
+    // )
+    // constructor(
+    //     /**
+    //      * HTTP Status Code of the error
+    //      */
+    //     status: number,
+    //     /**
+    //      * Error message
+    //      */
+    //     message: string
+    // )
+    // constructor(
+    //     /**
+    //      * Original JS Error
+    //      */
+    //     error: Error
+    // )
+    // constructor(
+    //     /**
+    //      * HTTP Status Code of the error
+    //      */
+    //     status: number,
+    //     /**
+    //      * Error message
+    //      */
+    //     title: string,
+    //     /**
+    //      * Detailed description of the error
+    //      */
+    //     description: string
+    // )
+    // constructor(
+    //     param1: A_SERVER_TYPES__ServerError_Init | Error | string | A_Error | number,
+    //     param2?: string | A_Error,
+    //     param3?: string
+    // ) {
+    //   switch (true) {
+    //     case typeof param1 === 'number':
+    //         if (typeof param2 === 'string' && param3) {
+    //             super({
+    //                 title: param2,
+    //                 description: param3
+    //             });
+    //         }
+    //         else if (param2 instanceof A_Error) {
+    //             super(param2);
+    //         }
+    //         else {
+    //             super();
+    //         }
+    //         this.status = param1;
+    //         break;
+
+    //     case param1 instanceof A_Error:
+    //         super (param1);
+    //         break;
+    //     case param1 instanceof Error:
+    //         super (param1);
+    //         break;
+      
+    //     default:
+    //         break;
+    //   }
+
+    // }
+
+
+    protected fromConstructor(params: A_SERVER_TYPES__ServerError_Init): void {
+        super.fromConstructor(params);
+        if (params.status) {
+            this.status = params.status;
+        }
+    }
+
+
+    toJSON(): A_SERVER_TYPES__ServerError_Serialized {
+        return {
+            ...super.toJSON(),
+            status: this.status
+        }
+    }
+}
+
+

package/src/components/A-ServerError/A-ServerError.types.ts

@@ -0,0 +1,22 @@
+import { A_TYPES__Error_Init, A_TYPES__Error_Serialized } from "@adaas/a-concept"
+
+
+
+export type A_SERVER_TYPES__ServerError_Init = {
+    /**
+     * HTTP Status Code of the error
+     */
+    status?: number
+} & A_TYPES__Error_Init
+
+
+
+
+export type A_SERVER_TYPES__ServerError_Serialized = {
+    /**
+     * HTTP Status Code of the error
+     */
+    status: number
+} & A_TYPES__Error_Serialized
+
+

package/src/components/A-ServerHealthMonitor/A-ServerHealthMonitor.component.ts

@@ -1,20 +1,21 @@
-import { A_Component, A_Config, A_Inject, A_Logger } from "@adaas/a-concept";
+import { A_Component, A_Inject } from "@adaas/a-concept";
 import { A_Router } from "../A-Router/A-Router.component";
 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_Config, A_Logger } from "@adaas/a-utils";
 
 
 
 export class A_ServerHealthMonitor extends A_Component {
 
 
-
     // =======================================================
     // ================ Method Definition=====================
     // =======================================================
 
     @A_Router.Get({
-        path: '/health',
+        path: '/',
+        prefix: 'health',
         version: 'v1',
     })
     async get(
@@ -23,6 +24,8 @@ export class A_ServerHealthMonitor extends A_Component {
         @A_Inject(A_Response) response: A_Response,
         @A_Inject(A_Logger) logger: A_Logger
     ): Promise<any> {
+        logger.log('Health check requested', config.get('A_CONCEPT_ROOT_FOLDER'));
+
         const packageJSON = await import(`${config.get('A_CONCEPT_ROOT_FOLDER')}/package.json`);
         const exposedProperties: Array<string> = config.get('EXPOSED_PROPERTIES')?.split(',') || [
             'name',
@@ -31,5 +34,7 @@ export class A_ServerHealthMonitor extends A_Component {
         ];
 
         exposedProperties.forEach(prop => response.add(prop, packageJSON[prop]));
+
+        console.log(`Health check accessed: ${request.method} ${request.url}`);
     }
 }

package/src/components/A-ServerLogger/A_ServerLogger.component.ts

@@ -1,4 +1,4 @@
-import { A_Config, A_Feature, A_Inject, A_Logger, A_Scope } from "@adaas/a-concept";
+import { A_Container, 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_Server } from "@adaas/a-server/context/A-Server/A_Server.context";
 import { A_SERVER_TYPES__ServerLoggerEnvVariables, A_SERVER_TYPES__ServerLoggerRouteParams } from "./A_ServerLogger.component.types";
@@ -8,7 +8,7 @@ import { A_Response } from "@adaas/a-server/entities/A-Response/A-Response.entit
 import { A_SERVER_TYPES__ResponseEvent } from "@adaas/a-server/entities/A-Response/A-Response.entity.types";
 import { A_Route } from "@adaas/a-server/entities/A-Route/A-Route.entity";
 import { A_SERVER_TYPES__RequestEvent } from "@adaas/a-server/entities/A-Request/A-Request.entity.types";
-import { A_TYPES__ConceptENVVariables } from "@adaas/a-concept/dist/src/constants/env.constants";
+import { A_Config, A_Logger } from "@adaas/a-utils";
 
 
 export class A_ServerLogger extends A_Logger {
@@ -16,7 +16,6 @@ export class A_ServerLogger extends A_Logger {
     protected config!: A_Config<A_SERVER_TYPES__ServerLoggerEnvVariables>
 
 
-
     @A_Feature.Extend({
         name: A_SERVER_TYPES__ResponseEvent.Finish,
         scope: [A_Response]
@@ -44,19 +43,17 @@ export class A_ServerLogger extends A_Logger {
     }
 
 
-    @A_Feature.Define({ invoke: false })
     @A_Feature.Extend({
         name: A_SERVER_TYPES__ServerFeature.afterStart,
         scope: [A_Service]
     })
     logStart(
-        @A_Inject(A_Server) server: A_Server,
-    ) {
+        @A_Inject(A_Service) container: A_Service,
+    ): void {
         this.serverReady({
-            port: server.port,
+            port: container.port,
             app: {
-                name: server.name,
-                version: server.version
+                name: container.name,
             }
         })
     }

package/src/components/A-ServerLogger/A_ServerLogger.component.types.ts

@@ -1,5 +1,5 @@
 import { A_TYPES__ConceptENVVariables } from "@adaas/a-concept/dist/src/constants/env.constants"
-
+import { A_SERVER__A_SERVER_LOGGER_ENV_VARIABLES } from "./A-ServerLogger.constants";
 
 export type A_SERVER_TYPES__ServerLoggerRouteParams = {
     method: string,
@@ -10,12 +10,5 @@ export type A_SERVER_TYPES__ServerLoggerRouteParams = {
 
 
 export type A_SERVER_TYPES__ServerLoggerEnvVariables = Array<
-    
-        'SERVER_IGNORE_LOG_200'
-        | 'SERVER_IGNORE_LOG_404'
-        | 'SERVER_IGNORE_LOG_500'
-        | 'SERVER_IGNORE_LOG_400'
-        | 'SERVER_IGNORE_LOG_DEFAULT'
-    
-   
+keyof typeof A_SERVER__A_SERVER_LOGGER_ENV_VARIABLES 
 > | A_TYPES__ConceptENVVariables

package/src/components/A-ServerProxy/A-ServerProxy.component.ts

@@ -1,9 +1,10 @@
-import { A_Component, A_Concept, A_Feature, A_Inject, A_Logger } from "@adaas/a-concept";
+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_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 } from "@adaas/a-utils";
 import http from "http";
 import https from "https";
 

package/src/components/A-StaticLoader/A-StaticLoader.component.ts

@@ -1,4 +1,4 @@
-import { A_Component, A_Concept, A_Feature, A_Inject, A_Logger } from "@adaas/a-concept"
+import { A_Component, A_Concept, A_Feature, A_Inject } from "@adaas/a-concept"
 import fs from "fs";
 import path from "path";
 import { URL } from "url";
@@ -7,6 +7,7 @@ import { A_Response } from "@adaas/a-server/entities/A-Response/A-Response.entit
 import { A_SERVER_TYPES__ServerFeature } from "@adaas/a-server/containers/A-Service/A-Service.container.types";
 import { A_Route } from "@adaas/a-server/entities/A-Route/A-Route.entity";
 import { A_StaticConfig } from "@adaas/a-server/context/A-StaticConfig/A-StaticConfig.context";
+import { A_Logger } from "@adaas/a-utils";
 
 
 export class A_StaticLoader extends A_Component {

package/src/components/A-StaticLoader/A-StaticLoader.component.types.ts

@@ -1,12 +1,11 @@
-import { A_Component, A_Feature, A_Inject, A_Logger } from "@adaas/a-concept"
-import http, { IncomingMessage, ServerResponse } from "http";
+import { A_Component, A_Feature, A_Inject } from "@adaas/a-concept"
 import fs from "fs";
 import path from "path";
 import { URL } from "url";
 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_SERVER_TYPES__ServerFeature } from "@adaas/a-server/containers/A-Service/A-Service.container.types";
-import { A_Route } from "@adaas/a-server/entities/A-Route/A-Route.entity";
+import { A_Logger } from "@adaas/a-utils";
 
 
 export class A_StaticLoader extends A_Component {

package/src/containers/A-Service/A-Service.container.ts

@@ -1,4 +1,3 @@
-import { A_Concept, A_Config, A_Container, A_Context, A_Errors, A_Feature, A_Inject, A_Logger, A_Scope, A_TYPES__ComponentMetaKey, } from "@adaas/a-concept";
 import { createServer, IncomingMessage, Server, ServerResponse } from "http";
 import { A_SERVER_TYPES__ServerFeature, A_SERVER_TYPES__ServerFeatures } from "./A-Service.container.types";
 import { A_Server } from "@adaas/a-server/context/A-Server/A_Server.context";
@@ -6,6 +5,8 @@ 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 crypto from 'crypto';
 import { A_SERVER_CONSTANTS__DEFAULT_ENV_VARIABLES_ARRAY, A_TYPES__ServerENVVariables } from "@adaas/a-server/constants/env.constants";
+import { A_Concept, A_Container, A_Feature, A_IdentityHelper, A_Scope } from "@adaas/a-concept";
+import { A_Config, A_Logger } from "@adaas/a-utils";
 
 
 
@@ -18,20 +19,15 @@ import { A_SERVER_CONSTANTS__DEFAULT_ENV_VARIABLES_ARRAY, A_TYPES__ServerENVVari
 export class A_Service extends A_Container {
 
     private server!: Server;
-    private port: number = 3000;
+    port!: number;
 
     @A_Concept.Load()
     async load() {
-        if (!this.Scope.has(A_Errors)) {
-            const errorsRegistry = new A_Errors({});
-
-            this.Scope.register(errorsRegistry);
-        }
 
         let config: A_Config<A_TYPES__ServerENVVariables>;
         let aServer: A_Server;
 
-        if (!this.Scope.has(A_Config<A_TYPES__ServerENVVariables>)) {
+        if (!this.scope.has(A_Config<A_TYPES__ServerENVVariables>)) {
             const config = new A_Config<A_TYPES__ServerENVVariables>({
                 variables: [...Array.from(A_SERVER_CONSTANTS__DEFAULT_ENV_VARIABLES_ARRAY)],
                 defaults: {
@@ -39,13 +35,13 @@ export class A_Service extends A_Container {
                 }
             });
 
-            this.Scope.register(config);
+            this.scope.register(config);
         }
 
-        config = this.Scope.resolve(A_Config) as A_Config<A_TYPES__ServerENVVariables>;
+        config = this.scope.resolve(A_Config) as A_Config<A_TYPES__ServerENVVariables>;
 
 
-        if (!this.Scope.has(A_Server)) {
+        if (!this.scope.has(A_Server)) {
             aServer = new A_Server({
                 port: config.get('A_SERVER_PORT'),
                 name: this.name,
@@ -53,21 +49,12 @@ export class A_Service extends A_Container {
             });
         }
 
-
-
         // Set the server to listen on port 3000
-        const port = config.get('A_SERVER_PORT');
+        this.port = config.get('A_SERVER_PORT');
 
         // Create the HTTP server
         this.server = createServer(this.onRequest.bind(this));
 
-        const newServer = new A_Server({
-            port,
-            name: this.name,
-            version: 'v1'
-        });
-
-        this.Scope.register(newServer);
     }
 
     protected listen(): Promise<void> {
@@ -120,35 +107,50 @@ export class A_Service extends A_Container {
         await this.call(A_SERVER_TYPES__ServerFeature.afterStop)
     }
 
+    @A_Feature.Define({
+        name: A_SERVER_TYPES__ServerFeature.beforeRequest,
+        invoke: true
+    })
+    async beforeRequest(scope: A_Scope) { }
 
+    @A_Feature.Define({
+        name: A_SERVER_TYPES__ServerFeature.beforeRequest,
+        invoke: true
+    })
+    async afterRequest(scope: A_Scope) { }
 
     @A_Feature.Define({
         name: A_SERVER_TYPES__ServerFeature.onRequest,
         invoke: false
     })
-    /**
-     * Handle incoming requests
-     */
     async onRequest(
         request: IncomingMessage,
         response: ServerResponse
     ) {
+        const scope = new A_Scope({
+            name: `a-server-request::${Date.now()}`,
+        });
+
         // We need it to stop feature execution in case request ends
         const { req, res } = await this.convertToAServer(request, response);
 
         try {
-            const scope = new A_Scope({
-                name: `a-server-request::${Date.now()}`,
-                entities: [req, res],
-            });
+            scope.register(req);
+            scope.register(res);
 
-            await this.call(A_SERVER_TYPES__ServerFeature.beforeRequest, scope);
+            scope.inherit(this.scope);
+
+            await this.beforeRequest(scope);
             await this.call(A_SERVER_TYPES__ServerFeature.onRequest, scope);
-            await this.call(A_SERVER_TYPES__ServerFeature.afterRequest, scope);
+            await this.afterRequest(scope);
 
             await res.status(200).send();
 
         } catch (error) {
+            
+            const logger = this.scope.resolve(A_Logger);
+
+            logger.error(error);
 
             return res.failed(error);
         }
@@ -166,8 +168,8 @@ export class A_Service extends A_Container {
 
         const id = this.generateRequestId(request.method, request.url);
 
-        const req = new A_Request({ id, request, scope: this.Scope.name });
-        const res = new A_Response({ id, response, scope: this.Scope.name });
+        const req = new A_Request({ id, request, scope: this.scope.name });
+        const res = new A_Response({ id, response, scope: this.scope.name });
 
         await req.init();
         await res.init();
@@ -181,11 +183,11 @@ export class A_Service extends A_Container {
     ): string {
         // Use the current time, request URL, and a few other details to create a unique ID
         const hash = crypto.createHash('sha256');
-        const time = Date.now();
+        const timeId = A_IdentityHelper.generateTimeId();
         const randomValue = Math.random().toString(); // Adds extra randomness
 
-        hash.update(`${time}-${method}-${url}-${randomValue}`);
-        return hash.digest('hex');
+        hash.update(`${timeId}-${method}-${url}-${randomValue}`);
+        return `${timeId}-${hash.digest('hex')}`;
     }
 
     @A_Feature.Define({ invoke: true })

package/src/context/A-EntityFactory/A-EntityFactory.context.ts

@@ -1,6 +1,5 @@
-import { A_Entity, A_Fragment } from "@adaas/a-concept"
+import { A_Entity, A_Fragment, ASEID } from "@adaas/a-concept"
 import { A_SERVER_TYPES__AEntityFactoryConstructor1, A_SERVER_TYPES__AEntityFactoryConstructor2 } from "./A-EntityFactory.context.types";
-import { ASEID } from "@adaas/a-utils";
 
 
 export class A_EntityFactory extends A_Fragment {

package/src/context/A-HttpChannel/A-HttpChannel.context.ts

@@ -0,0 +1,36 @@
+import { A_Fragment } from "@adaas/a-concept";
+import { A_SERVER_TYPES__ServerMethod } from "@adaas/a-server/containers/A-Service/A-Service.container.types";
+import { A_SERVER_TYPES__HttpChannelRequestParams } from "@adaas/a-server/channels/A-Http/A-Http.channel.types";
+
+
+
+
+
+export class A_HTTPChannel_RequestContext<
+    T extends any = any
+> extends A_Fragment {
+    url: string;
+    method: A_SERVER_TYPES__ServerMethod;
+    data?: any;
+    config?: Partial<A_SERVER_TYPES__HttpChannelRequestParams['config']>;
+
+    constructor(params: A_SERVER_TYPES__HttpChannelRequestParams) {
+        super();
+
+        const {
+            method,
+            url,
+            data,
+            config,
+        } = params;
+
+        this.url = url;
+        this.method = method;
+        this.data = data;
+        this.config = config;
+    }
+
+    result?: T;
+    error?: any;
+
+}

package/src/context/A-Server/A_Server.context.ts

@@ -1,8 +1,7 @@
-import { A_Entity, A_Fragment } from "@adaas/a-concept";
-import { createServer, Server } from "http";
+import {  A_Fragment } from "@adaas/a-concept";
 import { A_SERVER_TYPES__ServerConstructor } from "./A_Server.context.types";
-import { A_TYPES__Required } from "@adaas/a-utils";
 import { A_Route } from "@adaas/a-server/entities/A-Route/A-Route.entity";
+import { A_TYPES__Required } from "@adaas/a-concept/dist/src/types/A_Common.types";
 
 
 export class A_Server extends A_Fragment {