@adaas/a-server 0.0.22 → 0.0.24

package/package.json

@@ -1,21 +1,277 @@
 {
   "name": "@adaas/a-server",
-  "version": "0.0.22",
-  "description": "SDK to create a server with ease. Build your backend server with modular structure and use it within or outside the ADAAS ecosystem.",
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "version": "0.0.24",
+  "description": "A-Server is a powerful server framework designed to work seamlessly with the A-Concept framework. This library provides a robust and flexible server implementation of A-Server, enabling developers to create scalable and efficient server-side applications using the A-Concept architecture.",
+  "keywords": [
+    "adaas",
+    "a-server",
+    "a-concept",
+    "server",
+    "framework",
+    "node",
+    "http",
+    "ai"
+  ],
+  "license": "Apache-2.0",
+  "author": {
+    "name": "ADAAS YAZILIM LİMİTED ŞİRKETİ",
+    "email": "contact-us@adaas.org"
+  },
+  "homepage": "https://github.com/ADAAS-org/adaas-a-server#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ADAAS-org/adaas-a-server.git"
+  },
+  "bugs": {
+    "url": "https://github.com/ADAAS-org/adaas-a-server/issues"
+  },
+  "exports": {
+    ".": {
+      "browser": {
+        "types": "./dist/browser/index.d.mts",
+        "import": "./dist/browser/index.mjs"
+      },
+      "node": {
+        "types": "./dist/node/index.d.ts",
+        "import": "./dist/node/index.mjs",
+        "require": "./dist/node/index.js"
+      },
+      "default": {
+        "types": "./dist/node/index.d.ts",
+        "import": "./dist/node/index.mjs",
+        "require": "./dist/node/index.js"
+      }
+    },
+    "./channels/*": {
+      "node": {
+        "types": "./dist/node/channels/*.d.ts",
+        "import": "./dist/node/channels/*.mjs",
+        "require": "./dist/node/channels/*.js"
+      },
+      "default": {
+        "types": "./dist/node/channels/*.d.ts",
+        "import": "./dist/node/channels/*.mjs",
+        "require": "./dist/node/channels/*.js"
+      }
+    },
+    "./constants/*": {
+      "node": {
+        "types": "./dist/node/constants/*.d.ts",
+        "import": "./dist/node/constants/*.mjs",
+        "require": "./dist/node/constants/*.js"
+      },
+      "default": {
+        "types": "./dist/node/constants/*.d.ts",
+        "import": "./dist/node/constants/*.mjs",
+        "require": "./dist/node/constants/*.js"
+      }
+    },
+    "./controllers/*": {
+      "node": {
+        "types": "./dist/node/controllers/*.d.ts",
+        "import": "./dist/node/controllers/*.mjs",
+        "require": "./dist/node/controllers/*.js"
+      },
+      "default": {
+        "types": "./dist/node/controllers/*.d.ts",
+        "import": "./dist/node/controllers/*.mjs",
+        "require": "./dist/node/controllers/*.js"
+      }
+    },
+    "./helpers/*": {
+      "node": {
+        "types": "./dist/node/helpers/*.d.ts",
+        "import": "./dist/node/helpers/*.mjs",
+        "require": "./dist/node/helpers/*.js"
+      },
+      "default": {
+        "types": "./dist/node/helpers/*.d.ts",
+        "import": "./dist/node/helpers/*.mjs",
+        "require": "./dist/node/helpers/*.js"
+      }
+    },
+    "./middlewares/*": {
+      "node": {
+        "types": "./dist/node/middlewares/*.d.ts",
+        "import": "./dist/node/middlewares/*.mjs",
+        "require": "./dist/node/middlewares/*.js"
+      },
+      "default": {
+        "types": "./dist/node/middlewares/*.d.ts",
+        "import": "./dist/node/middlewares/*.mjs",
+        "require": "./dist/node/middlewares/*.js"
+      }
+    },
+    "./repositories/*": {
+      "node": {
+        "types": "./dist/node/repositories/*.d.ts",
+        "import": "./dist/node/repositories/*.mjs",
+        "require": "./dist/node/repositories/*.js"
+      },
+      "default": {
+        "types": "./dist/node/repositories/*.d.ts",
+        "import": "./dist/node/repositories/*.mjs",
+        "require": "./dist/node/repositories/*.js"
+      }
+    },
+    "./request/*": {
+      "node": {
+        "types": "./dist/node/lib/A-Request/*.d.ts",
+        "import": "./dist/node/lib/A-Request/*.mjs",
+        "require": "./dist/node/lib/A-Request/*.js"
+      },
+      "default": {
+        "types": "./dist/node/lib/A-Request/*.d.ts",
+        "import": "./dist/node/lib/A-Request/*.mjs",
+        "require": "./dist/node/lib/A-Request/*.js"
+      }
+    },
+    "./response/*": {
+      "node": {
+        "types": "./dist/node/lib/A-Response/*.d.ts",
+        "import": "./dist/node/lib/A-Response/*.mjs",
+        "require": "./dist/node/lib/A-Response/*.js"
+      },
+      "default": {
+        "types": "./dist/node/lib/A-Response/*.d.ts",
+        "import": "./dist/node/lib/A-Response/*.mjs",
+        "require": "./dist/node/lib/A-Response/*.js"
+      }
+    },
+    "./server/*": {
+      "node": {
+        "types": "./dist/node/lib/A-Server/*.d.ts",
+        "import": "./dist/node/lib/A-Server/*.mjs",
+        "require": "./dist/node/lib/A-Server/*.js"
+      },
+      "default": {
+        "types": "./dist/node/lib/A-Server/*.d.ts",
+        "import": "./dist/node/lib/A-Server/*.mjs",
+        "require": "./dist/node/lib/A-Server/*.js"
+      }
+    },
+    "./controller/*": {
+      "node": {
+        "types": "./dist/node/lib/A-ServerController/*.d.ts",
+        "import": "./dist/node/lib/A-ServerController/*.mjs",
+        "require": "./dist/node/lib/A-ServerController/*.js"
+      },
+      "default": {
+        "types": "./dist/node/lib/A-ServerController/*.d.ts",
+        "import": "./dist/node/lib/A-ServerController/*.mjs",
+        "require": "./dist/node/lib/A-ServerController/*.js"
+      }
+    },
+    "./entity-list/*": {
+      "node": {
+        "types": "./dist/node/lib/A-ServerEntityList/*.d.ts",
+        "import": "./dist/node/lib/A-ServerEntityList/*.mjs",
+        "require": "./dist/node/lib/A-ServerEntityList/*.js"
+      },
+      "default": {
+        "types": "./dist/node/lib/A-ServerEntityList/*.d.ts",
+        "import": "./dist/node/lib/A-ServerEntityList/*.mjs",
+        "require": "./dist/node/lib/A-ServerEntityList/*.js"
+      }
+    },
+    "./list-query/*": {
+      "node": {
+        "types": "./dist/node/lib/A-ServerListQuery/*.d.ts",
+        "import": "./dist/node/lib/A-ServerListQuery/*.mjs",
+        "require": "./dist/node/lib/A-ServerListQuery/*.js"
+      },
+      "default": {
+        "types": "./dist/node/lib/A-ServerListQuery/*.d.ts",
+        "import": "./dist/node/lib/A-ServerListQuery/*.mjs",
+        "require": "./dist/node/lib/A-ServerListQuery/*.js"
+      }
+    },
+    "./logger/*": {
+      "node": {
+        "types": "./dist/node/lib/A-ServerLogger/*.d.ts",
+        "import": "./dist/node/lib/A-ServerLogger/*.mjs",
+        "require": "./dist/node/lib/A-ServerLogger/*.js"
+      },
+      "default": {
+        "types": "./dist/node/lib/A-ServerLogger/*.d.ts",
+        "import": "./dist/node/lib/A-ServerLogger/*.mjs",
+        "require": "./dist/node/lib/A-ServerLogger/*.js"
+      }
+    },
+    "./middleware/*": {
+      "node": {
+        "types": "./dist/node/lib/A-ServerMiddleware/*.d.ts",
+        "import": "./dist/node/lib/A-ServerMiddleware/*.mjs",
+        "require": "./dist/node/lib/A-ServerMiddleware/*.js"
+      },
+      "default": {
+        "types": "./dist/node/lib/A-ServerMiddleware/*.d.ts",
+        "import": "./dist/node/lib/A-ServerMiddleware/*.mjs",
+        "require": "./dist/node/lib/A-ServerMiddleware/*.js"
+      }
+    },
+    "./proxy/*": {
+      "node": {
+        "types": "./dist/node/lib/A-ServerProxy/*.d.ts",
+        "import": "./dist/node/lib/A-ServerProxy/*.mjs",
+        "require": "./dist/node/lib/A-ServerProxy/*.js"
+      },
+      "default": {
+        "types": "./dist/node/lib/A-ServerProxy/*.d.ts",
+        "import": "./dist/node/lib/A-ServerProxy/*.mjs",
+        "require": "./dist/node/lib/A-ServerProxy/*.js"
+      }
+    },
+    "./route/*": {
+      "node": {
+        "types": "./dist/node/lib/A-ServerRoute/*.d.ts",
+        "import": "./dist/node/lib/A-ServerRoute/*.mjs",
+        "require": "./dist/node/lib/A-ServerRoute/*.js"
+      },
+      "default": {
+        "types": "./dist/node/lib/A-ServerRoute/*.d.ts",
+        "import": "./dist/node/lib/A-ServerRoute/*.mjs",
+        "require": "./dist/node/lib/A-ServerRoute/*.js"
+      }
+    },
+    "./router/*": {
+      "node": {
+        "types": "./dist/node/lib/A-ServerRouter/*.d.ts",
+        "import": "./dist/node/lib/A-ServerRouter/*.mjs",
+        "require": "./dist/node/lib/A-ServerRouter/*.js"
+      },
+      "default": {
+        "types": "./dist/node/lib/A-ServerRouter/*.d.ts",
+        "import": "./dist/node/lib/A-ServerRouter/*.mjs",
+        "require": "./dist/node/lib/A-ServerRouter/*.js"
+      }
+    },
+    "./static/*": {
+      "node": {
+        "types": "./dist/node/lib/A-ServerStatic/*.d.ts",
+        "import": "./dist/node/lib/A-ServerStatic/*.mjs",
+        "require": "./dist/node/lib/A-ServerStatic/*.js"
+      },
+      "default": {
+        "types": "./dist/node/lib/A-ServerStatic/*.d.ts",
+        "import": "./dist/node/lib/A-ServerStatic/*.mjs",
+        "require": "./dist/node/lib/A-ServerStatic/*.js"
+      }
+    }
+  },
   "sideEffects": false,
   "nodemonConfig": {
     "ignore": [
       "**/*.test.ts",
       "**/*.spec.ts",
       ".git",
-      "node_modules"
+      "node_modules",
+      "**/dist/**"
     ],
     "watch": [
       "examples",
-      "src"
+      "src",
+      "src_v2"
     ],
     "exec": "node -r tsconfig-paths/register -r ts-node/register ",
     "ext": "ts, js"
@@ -23,33 +279,19 @@
   "scripts": {
     "test": "jest",
     "example:simple-server": "nodemon ./examples/simple-server/concept.ts",
+    "example:fe-be": "nodemon ./examples/fe-be/concept.ts",
     "example:concept": "nodemon ./examples/concept-server/concept.ts",
     "test:test": "nodemon ./src/test/app.ts",
-    "publish": "npm run build && git add . && git commit -m \"new version created :: $(cat package.json | grep version | head -1  | awk -F: '{ print $2 }'  | sed 's/[\",]//g')\" && npm version patch && npm publish --access public",
+    "release": "npm run test && npm run build && git add . && git commit -m \"new version created :: $(cat package.json | grep version | head -1  | awk -F: '{ print $2 }'  | sed 's/[\",]//g')\" && npm version patch && npm publish --access public",
     "preversion": "echo test",
     "version": "echo git add .",
     "postversion": "git push --no-verify && git push --tags --no-verify && echo \"\n======Version Pushed Successfully=====\n\" ",
     "echo-version": "echo $npm_package_version",
     "build": "tsup --config tsup.config.ts"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ADAAS-org/adaas-a-server.git"
-  },
-  "keywords": [
-    "sdk",
-    "ai",
-    "rag"
-  ],
-  "author": "adaas.org",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/ADAAS-org/adaas-a-server/issues"
-  },
-  "homepage": "https://github.com/ADAAS-org/adaas-a-server#readme",
   "dependencies": {
-    "@adaas/a-concept": "^0.1.24",
-    "@adaas/a-utils": "^0.1.11"
+    "@adaas/a-concept": "^0.3.15",
+    "@adaas/a-utils": "^0.3.19"
   },
   "devDependencies": {
     "@types/chai": "^4.3.14",

package/src/channels/A-Http/A-Http.channel.constants.ts

@@ -1,8 +1,7 @@
+import { A_ChannelFeatures } from '@adaas/a-utils/a-channel';
 
-
-
-export enum A_SERVER_CONSTANTS__A_HttpChannel_Lifecycle {
-    onAfterRequest = 'onAfterHttpChannelRequest',
-    onError = 'onHttpChannelError',
-    onBeforeRequest = 'onBeforeHttpChannelRequest',
-}
+export const A_SERVER_CONSTANTS__A_HttpChannel_Lifecycle = {
+    onAfterRequest: A_ChannelFeatures.onAfterRequest,
+    onError: A_ChannelFeatures.onError,
+    onBeforeRequest: A_ChannelFeatures.onBeforeRequest,
+} as const;

package/src/channels/A-Http/A-Http.channel.error.ts

@@ -1,7 +1,7 @@
-import { A_Error } from "@adaas/a-concept";
+import { A_ChannelError } from "@adaas/a-utils/a-channel";
 
 
-export class A_HTTPChannelError extends A_Error {
+export class A_HTTPChannelError extends A_ChannelError {
 
     static readonly HttpRequestError = 'HTTP Channel Request Error';
 

package/src/channels/A-Http/A-Http.channel.ts

@@ -1,171 +1,123 @@
-import { A_Context, A_Scope } from "@adaas/a-concept";
-import { A_SERVER_TYPES__ServerMethod } from "../../containers/A-Service/A-Service.container.types";
-import { A_HTTPChannel_RequestContext } from "../../context/A-HttpChannel/A-HttpChannel.context";
-import { A_SERVER_CONSTANTS__A_HttpChannel_Lifecycle } from "./A-Http.channel.constants";
-import { A_ServerError } from "@adaas/a-server/components/A-ServerError/A-ServerError.class";
-import { A_Channel } from "@adaas/a-utils";
+import { A_ServerError } from "@adaas/a-server/server/A-Server.error";
 import { A_HTTPChannelError } from "./A-Http.channel.error";
-import { A_SERVER_TYPES__HttpChannelRequestConfig, A_SERVER_TYPES__HttpChannelRequestParams, A_SERVER_TYPES__HttpChannelSendParams } from "./A-Http.channel.types";
-
+import { A_SERVER_TYPES__HttpChannelRequestConfig, A_SERVER_TYPES__HttpChannelRequestParams } from "./A-Http.channel.types";
+import { A_ServerRoute } from "@adaas/a-server/route/A-ServerRoute.entity";
+import { A_Channel, A_ChannelRequest } from '@adaas/a-utils/a-channel'
+import { A_Inject, A_Scope } from "@adaas/a-concept";
 
 
 export class A_HTTPChannel extends A_Channel {
 
     protected baseUrl?: string;
 
-
-    async connect(): Promise<void> {
-        // keep it empty since HTTP channel does not require persistent connection
-        return;
-    }
-
-    /**
-     * Allows to send an HTTP request without expecting a response
-     * 
-     * @param params 
-     */
-    async send(params: A_SERVER_TYPES__HttpChannelSendParams): Promise<void> {
-        this.request(params);
-    }
-
-    /**
-     * Makes an HTTP request
-     * 
-     * @param params 
-     * @returns 
-     */
-    async request<T = any, M extends Record<string, any> = any>(
-        /**
-         * Provide request parameters
-         */
-        params: A_SERVER_TYPES__HttpChannelRequestParams<M>
-    ): Promise<A_HTTPChannel_RequestContext<T>> {
-        const { method, url, data, config } = params;
-
-        await this.initialize;
-
-        this._processing = true;
+    async onBeforeRequest(
+        @A_Inject(A_ChannelRequest) context: A_ChannelRequest<A_SERVER_TYPES__HttpChannelRequestParams>,
+        @A_Inject(A_Scope) scope: A_Scope,
+    ): Promise<void> {
+        const { method, url, data, config } = context.params;
 
         const fullUrl = this.buildURL(url, config?.params);
 
-        const requestScope = new A_Scope({ name: `a-http-channel-request-scope-${method}-${url}-${Date.now()}` });
-        const context = new A_HTTPChannel_RequestContext({
-            method,
-            url,
-            data,
-            config
-        });
+        const route = new A_ServerRoute(fullUrl, method);
+        scope.register(route);
 
-        requestScope.inherit(A_Context.scope(this));
-        requestScope.register(context);
+        context.params.config = context.params.config || {};
 
-        try {
-            await this.call(A_SERVER_CONSTANTS__A_HttpChannel_Lifecycle.onBeforeRequest, requestScope);
+        context.params.config.headers = {
+            "Content-Type": "application/json",
+            ...config?.headers,
+        };
+    }
 
-            const headers: Record<string, string> = {
-                "Content-Type": "application/json",
-                ...config?.headers,
-            };
+    async onRequest(
+        @A_Inject(A_ChannelRequest) context: A_ChannelRequest<A_SERVER_TYPES__HttpChannelRequestParams>,
+        @A_Inject(A_ServerRoute) route: A_ServerRoute,
+    ): Promise<void> {
+        const options: RequestInit = {
+            method: route.method,
+            headers: context.params.config?.headers || {
+            },
+        };
+
+        if (context.params.data && route.method !== 'GET') {
+            options.body = JSON.stringify(context.params.data);
+        }
 
-            const options: RequestInit = {
-                method,
-                headers,
-            };
+        const response = await fetch(route.url, options);
 
-            if (data && method !== A_SERVER_TYPES__ServerMethod.GET) {
-                options.body = JSON.stringify(data);
-            }
+        if (!response.ok) {
+            throw new A_ServerError({
+                status: response.status,
+                title: response.statusText,
+                description: `HTTP request to ${route.url} failed with status ${response.status}`,
+            });
+        }
 
-            const response = await fetch(fullUrl, options);
 
-            if (!response.ok) {
-                throw new A_ServerError({
-                    status: response.status,
-                    title: response.statusText,
-                    description: `HTTP request to ${fullUrl} failed with status ${response.status}`,
+        switch (context.params.config?.params?.responseType) {
+            case "text":
+                context.succeed({
+                    data: await response.text()
                 });
-            }
-
-            context.result =
-                config?.params?.responseType === "text"
-                    ? await response.text()
-                    : config?.params?.responseType === "blob"
-                        ? await response.blob()
-                        : await response.json();
-
-            await this.call(A_SERVER_CONSTANTS__A_HttpChannel_Lifecycle.onAfterRequest, requestScope);
-
-            this._processing = false;
-
-            return context as A_HTTPChannel_RequestContext<T>;
-
-        } catch (error) {
-
-            this._processing = false;
-
-            context.error = error;
-
-            await this.call(A_SERVER_CONSTANTS__A_HttpChannel_Lifecycle.onError, requestScope);
-
-            if (config?.throwOnError === false)
-                return context as A_HTTPChannel_RequestContext<T>;
-            else
-                throw error;
+                break;
+            case "blob":
+                context.succeed(await response.blob());
+                break;
+            default:
+                context.succeed(await response.json());
+                break;
         }
     }
 
-    async post<T, M extends Record<string, any> = any>(
+
+    async post<T extends Record<string, any> = any, M extends Record<string, any> = any>(
         url: string,
         body?: any,
         config?: Partial<A_SERVER_TYPES__HttpChannelRequestConfig>,
-    ): Promise<A_HTTPChannel_RequestContext<T>> {
-        return this.request<T, M>(
-            {
-                method: A_SERVER_TYPES__ServerMethod.POST,
-                url,
-                data: body,
-                config,
-            }
-        );
+    ): Promise<A_ChannelRequest<A_SERVER_TYPES__HttpChannelRequestParams<M>, T>> {
+        return this.request<A_SERVER_TYPES__HttpChannelRequestParams<M>, T>({
+            method: 'POST',
+            url,
+            data: body,
+            config,
+        });
     }
 
-    async get<T, M extends Record<string, any> = any>(
+    async get<T extends Record<string, any> = any, M extends Record<string, any> = any>(
         url: string,
         params?: any,
         config?: Partial<A_SERVER_TYPES__HttpChannelRequestConfig>,
-    ): Promise<A_HTTPChannel_RequestContext<T>> {
-        return this.request<T, M>(
-            {
-                method: A_SERVER_TYPES__ServerMethod.GET,
-                url,
-                config: {
-                    ...config,
-                    params,
-                }
+    ): Promise<A_ChannelRequest<A_SERVER_TYPES__HttpChannelRequestParams<M>, T>> {
+        return this.request<A_SERVER_TYPES__HttpChannelRequestParams<M>, T>({
+            method: 'GET',
+            url,
+            config: {
+                ...config,
+                params,
             }
-        );
+        });
     }
 
-    async put<T, M extends Record<string, any> = any>(
+    async put<T extends Record<string, any> = any, M extends Record<string, any> = any>(
         url: string,
         body?: any,
         config?: Partial<A_SERVER_TYPES__HttpChannelRequestConfig>,
-    ): Promise<A_HTTPChannel_RequestContext<T>> {
-        return this.request<T, M>({
-            method: A_SERVER_TYPES__ServerMethod.PUT,
+    ): Promise<A_ChannelRequest<A_SERVER_TYPES__HttpChannelRequestParams<M>, T>> {
+        return this.request<A_SERVER_TYPES__HttpChannelRequestParams<M>, T>({
+            method: 'PUT',
             url,
             data: body,
             config,
         });
     }
 
-    async delete<T, M extends Record<string, any> = any>(
+    async delete<T extends Record<string, any> = any, M extends Record<string, any> = any>(
         url: string,
         params?: any,
         config?: Partial<A_SERVER_TYPES__HttpChannelRequestConfig>,
-    ): Promise<A_HTTPChannel_RequestContext<T>> {
-        return this.request<T, M>({
-            method: A_SERVER_TYPES__ServerMethod.DELETE,
+    ): Promise<A_ChannelRequest<A_SERVER_TYPES__HttpChannelRequestParams<M>, T>> {
+        return this.request<A_SERVER_TYPES__HttpChannelRequestParams<M>, T>({
+            method: 'DELETE',
             url,
             data: params,
             config,
@@ -174,7 +126,6 @@ export class A_HTTPChannel extends A_Channel {
 
 
     protected buildURL(path: string = '', params: Record<string, any> = {}): string {
-
         if (!this.baseUrl)
             throw new A_HTTPChannelError(
                 A_HTTPChannelError.HttpRequestError,

package/src/channels/A-Http/A-Http.channel.types.ts

@@ -1,10 +1,13 @@
-import { A_SERVER_TYPES__ServerMethod } from "@adaas/a-server/containers/A-Service/A-Service.container.types";
+import { A_HttpServerRequestMethod } from "@adaas/a-server/server/A-HttpServer.types";
+import { A_SERVER_CONSTANTS__A_HttpChannel_Lifecycle } from "./A-Http.channel.constants";
+
+export type A_SERVER_CONSTANTS__A_HttpChannel_LifecycleNames = typeof A_SERVER_CONSTANTS__A_HttpChannel_Lifecycle[keyof typeof A_SERVER_CONSTANTS__A_HttpChannel_Lifecycle];
 
 export type A_SERVER_TYPES__HttpChannelSendParams<M extends Record<string, any> = any> = {
     /**
      * HTTP Method
      */
-    method: A_SERVER_TYPES__ServerMethod,
+    method: A_HttpServerRequestMethod,
     /**
      * Request URL
      */
@@ -24,7 +27,7 @@ export type A_SERVER_TYPES__HttpChannelRequestParams<M extends Record<string, an
     /**
      * HTTP Method
      */
-    method: A_SERVER_TYPES__ServerMethod,
+    method: A_HttpServerRequestMethod,
     /**
      * Request URL
      */

package/src/channels/A-Websockets/A-Websockets.channel.ts

@@ -1,4 +1,4 @@
-import { A_Channel } from "@adaas/a-utils";
+import { A_Channel } from "@adaas/a-utils/a-channel";