@adaas/a-server 0.0.15 → 0.0.17

package/src/entities/A-Request/A-Request.entity.ts

@@ -1,7 +1,5 @@
-import crypto from 'crypto';
-import { IncomingHttpHeaders, IncomingMessage, ServerResponse } from "http";
-import { A_Context, A_Entity, A_TYPES__Entity_JSON, A_TYPES__EntityBaseMethods } from '@adaas/a-concept';
-import { A_Error, A_ServerError, ASEID } from "@adaas/a-utils";
+import { IncomingHttpHeaders, IncomingMessage } from "http";
+import { A_Context, A_Entity, A_IdentityHelper, ASEID, } from '@adaas/a-concept';
 import {
     A_SERVER_TYPES__RequestConstructor,
     A_SERVER_TYPES__RequestEvent,
@@ -9,6 +7,7 @@ import {
     A_SERVER_TYPES__RequestSerialized
 } from "./A-Request.entity.types";
 import { A_Route } from '../A-Route/A-Route.entity';
+import { A_ServerError } from "@adaas/a-server/components/A-ServerError/A-ServerError.class";
 
 
 export class A_Request<
@@ -21,6 +20,11 @@ export class A_Request<
         A_SERVER_TYPES__RequestConstructor,
         A_SERVER_TYPES__RequestSerialized
     > {
+
+    static get namespace(): string {
+        return 'a-server';
+    }
+
     req!: IncomingMessage;
 
     body: _ReqBodyType = {} as _ReqBodyType;
@@ -39,26 +43,21 @@ export class A_Request<
         this.req = newEntity.request;
 
         this.aseid = new ASEID({
-            namespace: A_Context.root.name,
-            scope: newEntity.scope || 'default',
-            entity: 'a-request',
+            concept: A_Context.root.name,
+            scope: newEntity.scope,
+            entity: (this.constructor as typeof A_Request).entity,
             id: newEntity.id
         });
     }
 
+    get startedAt(): Date | undefined {
+        const timeId = A_IdentityHelper.parseTimeId(this.aseid.id.split('-')[0]);
 
-    protected generateRequestId() {
-        // 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 method = this.method;
-        const url = this.url;
-        const randomValue = Math.random().toString(); // Adds extra randomness
-
-        hash.update(`${time}-${method}-${url}-${randomValue}`);
-        return hash.digest('hex');
+        return timeId ? new Date(timeId.timestamp) : undefined;
     }
 
+
+
     // Getter for request URL
     public get url(): string {
         return this.req.url!;

package/src/entities/A-Request/A-Request.entity.types.ts

@@ -1,6 +1,6 @@
-import { IncomingMessage, ServerResponse } from "http";
+import { IncomingMessage } from "http";
 import { A_Request } from "./A-Request.entity";
-import { A_Feature, A_TYPES__Entity_JSON } from "@adaas/a-concept";
+import { A_TYPES__Entity_Serialized } from "@adaas/a-concept";
 
 
 export type A_SERVER_TYPES__RequestConstructor = {
@@ -13,7 +13,7 @@ export type A_SERVER_TYPES__RequestConstructor = {
 };
 
 export type A_SERVER_TYPES__RequestSerialized = {
-} & A_TYPES__Entity_JSON;
+} & A_TYPES__Entity_Serialized;
 
 
 

package/src/entities/A-Response/A-Response.entity.ts

@@ -1,8 +1,9 @@
 import {
     A_Context,
     A_Entity,
-    A_Logger,
+    A_Error,
     A_Scope,
+    ASEID,
 } from "@adaas/a-concept";
 import {
     IncomingHttpHeaders,
@@ -14,11 +15,9 @@ import {
     A_SERVER_TYPES__ResponseSerialized,
     A_SERVER_TYPES__SendResponseObject
 } from "./A-Response.entity.types";
-import {
-    A_Error,
-    A_ServerError,
-    ASEID
-} from "@adaas/a-utils";
+import { A_ServerError } from "@adaas/a-server/components/A-ServerError/A-ServerError.class";
+import { A_Logger } from "@adaas/a-utils";
+
 
 
 
@@ -28,6 +27,9 @@ export class A_Response<
     A_SERVER_TYPES__ResponseConstructor,
     A_SERVER_TYPES__ResponseSerialized
 > {
+
+
+
     /**
      * Duration of the request in milliseconds
      */
@@ -42,9 +44,9 @@ export class A_Response<
         this.res = newEntity.response;
 
         this.aseid = new ASEID({
-            namespace: A_Context.root.name,
-            scope: newEntity.scope || 'default',
-            entity: 'a-response',
+            concept: A_Context.root.name,
+            scope: newEntity.scope,
+            entity: (this.constructor as typeof A_Response).entity,
             id: newEntity.id
         });
     }
@@ -61,7 +63,7 @@ export class A_Response<
         return this.res.statusCode;
     }
 
-     async init(): Promise<void> {
+    async init(): Promise<void> {
         const startTime = process.hrtime();
 
         this.res.on('finish', async () => {
@@ -80,7 +82,7 @@ export class A_Response<
 
 
 
-    public failed(error: A_ServerError | A_Error | Error | unknown): void {
+    public failed(error: A_ServerError | A_Error | Error | any): void {
         switch (true) {
             case error instanceof A_ServerError:
                 this.error = error;
@@ -98,7 +100,7 @@ export class A_Response<
                 break;
         }
 
-        return this.status(this.error.serverCode).json(this.error);
+        return this.status(this.error.status).json(this.error);
     }
 
     // Send a plain text or JSON response

package/src/entities/A-Response/A-Response.entity.types.ts

@@ -1,4 +1,4 @@
-import { A_TYPES__Entity_JSON } from "@adaas/a-concept";
+import { A_TYPES__Entity_Serialized } from "@adaas/a-concept";
 import { ServerResponse } from "http";
 
 
@@ -19,7 +19,7 @@ export enum A_SERVER_TYPES__ResponseEvent {
     Close = 'close',
 }
 
-export type A_SERVER_TYPES__ResponseSerialized = A_TYPES__Entity_JSON;
+export type A_SERVER_TYPES__ResponseSerialized = A_TYPES__Entity_Serialized;
 
 
 export type A_SERVER_TYPES__SendResponseObject<_ResponseType = any> = 

package/src/entities/A-Route/A-Route.entity.ts

@@ -1,6 +1,3 @@
-import crypto from 'crypto';
-import { A_Context, A_Entity } from "@adaas/a-concept";
-import { ASEID } from "@adaas/a-utils";
 import { A_SERVER_TYPES__RequestMethods } from '../A-Request/A-Request.entity.types';
 
 
@@ -33,7 +30,10 @@ export class A_Route {
      * returns path only without query and hash
      */
     get path(): string {
-        return this.url.split('?')[0].split('#')[0];
+        const p =  this.url.split('?')[0].split('#')[0];
+
+        //  ensure that last char is not /
+        return p.endsWith('/') ? p.slice(0, -1) : p;
     }
 
 

package/src/entities/A_EntityList/A_EntityList.entity.ts

@@ -1,13 +1,12 @@
 import {
     A_Context, A_Entity,
-    A_TYPES__Entity_JSON
+    ASEID,
 } from "@adaas/a-concept";
 import {
     A_SERVER_TYPES__A_EntityListConstructor,
     A_SERVER_TYPES__A_EntityListPagination,
     A_SERVER_TYPES__A_EntityListSerialized
 } from "./A_EntityList.entity.types";
-import { ASEID } from "@adaas/a-utils";
 
 
 
@@ -67,7 +66,7 @@ export class A_EntityList<
      */
     fromNew(newEntity: A_SERVER_TYPES__A_EntityListConstructor): void {
         this.aseid = new ASEID({
-            namespace: A_Context.root.name,
+            concept: A_Context.root.name,
             scope: 'default',
             entity: 'a-list' + (newEntity.name ? `.${newEntity.name}` : ''),
             id: (new Date()).getTime().toString(),

package/src/entities/A_EntityList/A_EntityList.entity.types.ts

@@ -1,4 +1,4 @@
-import { A_Entity, A_TYPES__Entity_JSON } from "@adaas/a-concept";
+import { A_Entity, A_TYPES__Entity_Serialized } from "@adaas/a-concept";
 
 
 export type A_SERVER_TYPES__A_EntityListConstructor = {
@@ -15,13 +15,13 @@ export type A_SERVER_TYPES__A_EntityListSerialized<EntityTypes extends A_Entity
     items: Array<ReturnType<EntityTypes['toJSON']>>,
     type: string,
     pagination: A_SERVER_TYPES__A_EntityListPagination
-} & A_TYPES__Entity_JSON;
+} & A_TYPES__Entity_Serialized;
 
 
 
 export type A_SERVER_TYPES__A_EntityListPagination = {
-        total: number,
-        page: number,
-        pageSize: number,
+    total: number,
+    page: number,
+    pageSize: number,
 }
 

package/tests/A-HttpChannel.test.ts

@@ -0,0 +1,204 @@
+import { A_Context, A_Feature, A_Inject, A_Scope } from '@adaas/a-concept';
+import { A_HTTPChannel } from '@adaas/a-server/channels/A-Http/A-Http.channel';
+import { A_SERVER_CONSTANTS__A_HttpChannel_Lifecycle } from '@adaas/a-server/channels/A-Http/A-Http.channel.constants';
+import { A_HTTPChannel_RequestContext } from '@adaas/a-server/context/A-HttpChannel/A-HttpChannel.context';
+
+jest.retryTimes(0);
+
+
+type MockResponse = Array<{ userId: number; id: number; title: string; body: string; customField: string }>
+
+describe('A-HttpChannel Tests', () => {
+    it('Should be possible to create a new HttpChannel', async () => {
+        const scope = new A_Scope({
+            components: [A_HTTPChannel]
+        });
+
+
+        const channel = scope.resolve(A_HTTPChannel);
+
+        expect(channel).toBeInstanceOf(A_HTTPChannel);
+        expect(channel.processing).toBe(false);
+    });
+    it('Should be possible to create a custom Channel', async () => {
+        class myChannel extends A_HTTPChannel {
+            custom = true;
+
+            constructor() {
+                super();
+                this.baseUrl = "https://jsonplaceholder.typicode.com";
+            }
+        }
+
+        const scope = new A_Scope({
+            components: [myChannel]
+        });
+
+        const channel = scope.resolve(myChannel);
+        expect(channel).toBeInstanceOf(myChannel);
+        expect(channel.custom).toBe(true);
+        expect(channel.processing).toBe(false);
+
+        const response = await channel.get<MockResponse>(
+            '/posts',
+            { userId: 1 }
+        );
+
+        expect(Array.isArray(response.result)).toBe(true);
+        expect(response.result?.length).toBeGreaterThan(0);
+        expect(response.result?.[0].userId).toBe(1);
+    });
+
+    it('Should throw an error if baseUrl is not set', async () => {
+        const scope = new A_Scope({
+            components: [A_HTTPChannel]
+        });
+
+        const channel = scope.resolve(A_HTTPChannel);
+
+        await expect(channel.get('/posts')).rejects.toThrow("Base URL is not set for HTTP Channel");
+    });
+
+    it('Should allow to extend response handler behavior', async () => {
+        class myChannel extends A_HTTPChannel {
+            custom = true;
+            constructor() {
+                super();
+                this.baseUrl = "https://jsonplaceholder.typicode.com";
+            }
+        }
+
+        class myChannelWithCustomResponseHandler extends myChannel {
+
+            @A_Feature.Extend({
+                name: A_SERVER_CONSTANTS__A_HttpChannel_Lifecycle.onAfterRequest
+            })
+            protected async handleResponse<T>(
+                @A_Inject(A_HTTPChannel_RequestContext) context: A_HTTPChannel_RequestContext<MockResponse>
+            ): Promise<void> {
+                context.result = context.result?.map(item => ({
+                    ...item,
+                    customField: 'customValue'
+                })) || [];
+            }
+        }
+
+        const scope = new A_Scope({
+            components: [myChannel, myChannelWithCustomResponseHandler]
+        });
+
+        const channel = scope.resolve(myChannelWithCustomResponseHandler);
+        expect(channel).toBeInstanceOf(myChannelWithCustomResponseHandler);
+        expect(channel.custom).toBe(true);
+        expect(channel.processing).toBe(false);
+
+        const response = await channel.get<MockResponse>('/posts', { userId: 1 });
+
+        expect(Array.isArray(response.result)).toBe(true);
+        expect(response.result?.length).toBeGreaterThan(0);
+        expect(response.result?.[0].userId).toBe(1);
+        expect((response.result?.[0] as any).customField).toBe('customValue');
+    });
+    it('Should allow to extend error handler behavior', async () => {
+        class myChannel extends A_HTTPChannel {
+            custom = true;
+            constructor() {
+                super();
+                this.baseUrl = "https://jsonplaceholder.typicode.com";
+            }
+        }
+
+        class myChannelWithCustomErrorHandler extends myChannel {
+            @A_Feature.Extend({
+                name: A_SERVER_CONSTANTS__A_HttpChannel_Lifecycle.onError
+            })
+            protected async handleError(
+                @A_Inject(A_HTTPChannel_RequestContext) context: A_HTTPChannel_RequestContext<MockResponse>,
+                error: any
+            ): Promise<void> {
+                context.result = [{
+                    userId: -1,
+                    id: -1,
+                    title: 'error',
+                    body: 'error',
+                    customField: 'customValue'
+                }];
+            }
+        }
+
+        const scope = new A_Scope({
+            components: [myChannel, myChannelWithCustomErrorHandler]
+        });
+
+        const channel = scope.resolve(myChannelWithCustomErrorHandler);
+        expect(channel).toBeInstanceOf(myChannelWithCustomErrorHandler);
+        expect(channel.custom).toBe(true);
+        expect(channel.processing).toBe(false);
+
+        const response = await channel.get<MockResponse>('/posts_invalid', { userId: 1 }, { throwOnError: false });
+
+        expect(Array.isArray(response.result)).toBe(true);
+        expect(response.result?.length).toBe(1);
+        expect(response.result?.[0].userId).toBe(-1);
+        expect((response.result?.[0] as any).customField).toBe('customValue');
+    });
+
+    it('Should do a proper filtering with query params', async () => {
+        class myChannel extends A_HTTPChannel {
+            custom = true;
+            constructor() {
+                super();
+                this.baseUrl = "https://jsonplaceholder.typicode.com";
+            }
+        }
+
+        const scope = new A_Scope({
+            components: [myChannel]
+        });
+
+        const channel = scope.resolve(myChannel);
+        expect(channel).toBeInstanceOf(myChannel);
+        expect(channel.custom).toBe(true);
+        expect(channel.processing).toBe(false);
+
+        const response = await channel.get<MockResponse>('/posts', { userId: 1 });
+
+        expect(Array.isArray(response.result)).toBe(true);
+        expect(response.result?.length).toBeGreaterThan(0);
+        expect(response.result?.every(item => item.userId === 1)).toBe(true);
+    });
+
+    it('Should be possible to do a POST request', async () => {
+        class myChannel extends A_HTTPChannel {
+            custom = true;
+            constructor() {
+                super();
+                this.baseUrl = "https://jsonplaceholder.typicode.com";
+            }
+        }
+
+        const scope = new A_Scope({
+            components: [myChannel]
+        });
+
+        const channel = scope.resolve(myChannel);
+        expect(channel).toBeInstanceOf(myChannel);
+        expect(channel.custom).toBe(true);
+        expect(channel.processing).toBe(false);
+
+        const response = await channel.post<MockResponse>(
+            '/posts',
+            {
+                title: 'foo',
+                body: 'bar',
+                userId: 1,
+            }
+        );
+
+        expect(response.result).toBeDefined();
+        expect((response.result as any).id).toBeDefined();
+        expect((response.result as any).title).toBe('foo');
+        expect((response.result as any).body).toBe('bar');
+        expect((response.result as any).userId).toBe(1);
+    });
+});

package/tests/A-Service.test.ts

@@ -1,5 +1,4 @@
 import { A_Service } from '@adaas/a-server/containers/A-Service/A-Service.container';
-import { A_Server } from '@adaas/a-server/context/A-Server/A_Server.context';
 
 jest.retryTimes(0);
 
@@ -13,8 +12,7 @@ describe('A-Server Tests', () => {
         await server1.load();
 
         expect(server1.name).toBe('test-server-1');
-        expect(server1.Scope.resolve(A_Server)).toBeInstanceOf(A_Server);
-        expect(server1.Scope.resolve(A_Server).port).toBe(3000);
+        expect(server1.port).toBe(3000);
     });
 
 });

package/tsconfig.build.json

@@ -36,6 +36,7 @@
       "@adaas/a-server/helpers/*": ["src/helpers/*"],
       "@adaas/a-server/examples/*": ["src/examples/*"],
       "@adaas/a-server/entities/*": ["src/entities/*"],
+      "@adaas/a-server/channels/*": ["src/channels/*"],
 
       "@adaas/a-server/context/*": ["src/context/*"],
       "@adaas/a-server/components/*": ["src/components/*"],

package/tsconfig.json

@@ -36,6 +36,8 @@
       "@adaas/a-server/helpers/*": ["src/helpers/*"],
       "@adaas/a-server/examples/*": ["src/examples/*"],
       "@adaas/a-server/entities/*": ["src/entities/*"],
+      "@adaas/a-server/channels/*": ["src/channels/*"],
+
 
       "@adaas/a-server/context/*": ["src/context/*"],
       "@adaas/a-server/components/*": ["src/components/*"],

package/dist/src/context/A_ProxyConfig/A_ProxyConfig.types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"A_ProxyConfig.types.js","sourceRoot":"","sources":["../../../../src/context/A_ProxyConfig/A_ProxyConfig.types.ts"],"names":[],"mappings":""}

package/dist/src/context/Server.context.types.js

@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=Server.context.types.js.map

package/dist/src/context/Server.context.types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Server.context.types.js","sourceRoot":"","sources":["../../../src/context/Server.context.types.ts"],"names":[],"mappings":""}