chyz 1.0.13-rc.20 → 1.0.13-rc.21

package/BaseChyz.ts

@@ -3,7 +3,8 @@ import {RouteDefinition} from "./model/RouteDefinition";
 import {NextFunction, Request, Response} from "express";
 import {Controller} from "./base/Controller";
 import Utils from "./requiments/Utils";
-import {ModelManager} from "./base";
+import {BaseError, ModelManager} from "./base";
+import {Exception} from "./base/db/Exception";
 
 
 const express = require("express");
@@ -23,7 +24,7 @@ export default class BaseChyz {
     private _port: number = 3001;
     static db: any;
     static routes: any;
-    private static _validate:any=validate;
+    private static _validate: any = validate;
     private _logConfig: any = require('./log/config/log4js.json') ?? {}
     private _controllerpath: string = "Controllers"
     private static controllers: Array<Controller> = []
@@ -48,8 +49,7 @@ export default class BaseChyz {
     }
 
     init() {
-        this.logProvider().level = log4js.levels.ALL;
-        this.logProvider().configure(this._logConfig);
+
 
         /**
          * set request id
@@ -140,16 +140,21 @@ export default class BaseChyz {
         this.config = config;
 
 
+        // logger settin
+        this.logProvider().level = log4js.levels.ALL;
+        this.logProvider().configure(this._logConfig);
+
         let components = Utils.findKeyValue(config, "components")
         if (components) {
             for (const componentsKey in components) {
+
                 let comp = components[componentsKey];
-                BaseChyz.logs().info("Create Component ", componentsKey)
+                BaseChyz.debug("Create Component ", componentsKey)
                 try {
                     BaseChyz.components[componentsKey] = Utils.createObject(new comp.class, comp);
                     BaseChyz.components[componentsKey]?.init();
-                }catch (e) {
-                    console.error(e)
+                } catch (e) {
+                    BaseChyz.error("Create Component ", e)
                 }
 
             }
@@ -166,7 +171,6 @@ export default class BaseChyz {
             }
         }
 
-
         this.init();
 
         return this;
@@ -263,14 +267,14 @@ export default class BaseChyz {
                 // @ts-ignore
                 let className = file.split(".")[0] + "Class";
                 if (model[className])
-                    models[className.replace("Class","")] = new model[className];
+                    models[className.replace("Class", "")] = new model[className];
             }
         })
 
         ModelManager._register(models);
 
         for (const key of Object.keys(ModelManager)) {
-            if(key!="_register"){
+            if (key != "_register") {
                 ModelManager[key].init();
             }
         }
@@ -310,7 +314,7 @@ export default class BaseChyz {
                                 BaseChyz.debug(`Call Request id ${instance.id}`)
                                 await instance.beforeAction(route, req, res)
                                 next()
-                            } catch (e) {
+                            } catch (e: any) {
                                 BaseChyz.error(e);
 
                                 res.status(e.statusCode || 500)

package/Examples/index.ts

@@ -18,11 +18,9 @@ import {AuthManager} from "../rbac/AuthManager";
 
 let config = {
     port: process.env.PORT,
-    controllerpath: "C:\\PROJELER\\github\\Chy-Nodejs-Framework\\Examples\\Controllers",
+    controllerpath:process.env.CONTROLLER_PATH,
     components: {
-        authManager: {
-            class: AuthManager,
-        },
+
         db: {
             class: DbConnection,
             database: process.env.DBDATABASE,
@@ -35,6 +33,21 @@ let config = {
                 logging: (msg: any) => BaseChyz.debug(msg)
             }
         },
+        db2: {
+            class: DbConnection,
+            database: process.env.DBDATABASE,
+            username: process.env.DBUSER,
+            password: process.env.DBPASS,
+            options: {
+                host: process.env.DBHOST,
+                dialect: 'postgres',  /* one of 'mysql' | 'mariadb' | 'postgres' | 'mssql' */
+                // disable logging; default: console.log
+                logging: (msg:any) => BaseChyz.debug('DB2',msg)
+            }
+        },
+        authManager: {
+            class: AuthManager,
+        },
         user: {
             'class': WebUser,
             'identityClass': User

package/base/BaseError.ts

@@ -15,7 +15,7 @@ export class BaseError extends Error {
         this.message= Utils.isString(message)?message: JSON.stringify(message);
         this.name = this.constructor.name // good practice
         this.statusCode = statusCode // error code for responding to client
-        Error.captureStackTrace(this)
+        //Error.captureStackTrace(this)
     }
 
     toString(){

package/base/Model.ts

@@ -9,7 +9,16 @@ import BaseChyz from "../BaseChyz";
 import Utils from "../requiments/Utils";
 import {Component} from "./Component";
 import {InvalidConfigException} from "./InvalidConfigException";
-import {DatabaseError, DataTypes, ExclusionConstraintError, ForeignKeyConstraintError, Model as SModel, TimeoutError, UniqueConstraintError, ValidationError,} from "sequelize";
+import {
+    DatabaseError,
+    DataTypes,
+    ExclusionConstraintError,
+    ForeignKeyConstraintError,
+    Model as SModel,
+    TimeoutError,
+    UniqueConstraintError,
+    ValidationError,
+} from "sequelize";
 import {Exception} from "./db/Exception";
 
 export {DataTypes, NOW} from "sequelize";
@@ -91,11 +100,13 @@ export class Model extends Component {
     constructor(sequelize?: IDBDatabase) {
         super();
         this._tableName = this.alias();
+
+        BaseChyz.debug("Model constructor", this._tableName)
         // this._sequelize = BaseChyz.getComponent("db").db;
         if (sequelize != null)
             this._sequelize = sequelize;
         else
-            this._sequelize = BaseChyz.getComponent("db").db;
+            this._sequelize = Model.getDb();
 
         if (!Utils.isEmpty(this.attributes())) {
 
@@ -208,7 +219,7 @@ export class Model extends Component {
         let result: any;
         try {
             result = await this.model().create(p, options)
-        } catch (e) {
+        } catch (e: any) {
             BaseChyz.debug(`Model[${this.constructor.name}].create`, e)
             if (e instanceof ValidationError) {
                 let validationErrorItems = e.errors;
@@ -242,7 +253,7 @@ export class Model extends Component {
         let result: any;
         try {
             result = await this.model().bulkCreate(p, options)
-        } catch (e) {
+        } catch (e: any) {
             BaseChyz.debug(`Model[${this.constructor.name}].bulkCreate`, e)
             if (e instanceof ValidationError) {
                 let validationErrorItems = e.errors;
@@ -305,7 +316,6 @@ export class Model extends Component {
     }
 
 
-
     public validate() {
 
     }
@@ -367,6 +377,4 @@ export class Model extends Component {
     }
 
 
-
-
 }

package/base/RestClient.ts

@@ -18,7 +18,7 @@ export class RestClient extends Component {
     }
 
     public get(url: string, args: any[],headers:any={}) {
-        return axios.post(url, args ,headers )
+        return axios.get(url, args ,headers )
     }
 
     public Rest(params: any) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chyz",
-  "version": " 1.0.13-rc.20",
+  "version": " 1.0.13-rc.21",
   "description": "Nodejs Micro service Framework",
   "scripts": {
     "dev": "nodemon -t --trace-warnings index.ts",