chyz 2.0.1-rc.2 → 2.0.1-rc.4

package/BaseChyz.js

@@ -51,15 +51,15 @@ const weekOfYear_1 = __importDefault(require("dayjs/plugin/weekOfYear"));
 const isTomorrow_1 = __importDefault(require("dayjs/plugin/isTomorrow"));
 const bodyParser = require("body-parser");
 const fs = require("fs");
-const http_request = require('debug')('http:request');
-const http_request_body = http_request.extend('body');
-const http_request_headers = http_request.extend('headers');
-const compression = require('compression');
+// const http_request = require('debug')('http:request')
+// const http_request_body = http_request.extend('body')
+// const http_request_headers = http_request.extend('headers')
+const compression_1 = __importDefault(require("compression"));
 // const fs = require('fs');
-const ip = require('ip');
+const ip_1 = __importDefault(require("ip"));
+const cors_1 = __importDefault(require("cors"));
 const methodOverride = require('method-override');
 const Server = (0, express_1.default)();
-const cors = require('cors');
 const emitter = require('events').EventEmitter;
 const em = new emitter();
 /**
@@ -350,8 +350,8 @@ class BaseChyz {
     beforeMiddleware(req, res, next, instance, route) {
         return __awaiter(this, void 0, void 0, function* () {
             BaseChyz.debug(`${instance.id}/${route.path}->beforeMiddleware trigger`);
-            http_request_body("Request body " + JSON.stringify(req.body));
-            http_request_headers("Request header " + JSON.stringify(req.headers));
+            // http_request_body("Request body " + JSON.stringify(req.body))
+            // http_request_headers("Request header " + JSON.stringify(req.headers))
             try {
                 yield instance.beforeAction(route, req, res);
                 next();
@@ -486,7 +486,7 @@ class BaseChyz {
         BaseChyz.propvider.use(bodyParser.json({ limit: '1mb' }));
         BaseChyz.propvider.use(bodyParser.urlencoded({ limit: '1mb', extended: true })); // support encoded bodies
         BaseChyz.propvider.use(methodOverride());
-        BaseChyz.propvider.use(cors());
+        BaseChyz.propvider.use((0, cors_1.default)());
         //
         // // CORS
         // BaseChyz.express.use(function (req: any, res: Response, next: any) {
@@ -507,9 +507,9 @@ class BaseChyz {
                 return false;
             }
             // use compression filter function
-            return compression.filter(req, res);
+            return compression_1.default.filter(req, res);
         };
-        BaseChyz.propvider.use(compression({ filter: shouldCompress }));
+        BaseChyz.propvider.use((0, compression_1.default)({ filter: shouldCompress }));
         //
         // //static file path
         if (this.config.staticFilePath) {
@@ -541,7 +541,7 @@ class BaseChyz {
                 BaseChyz.info("Express Server Start ");
                 BaseChyz.info(`Liten Port ${this._port}`);
                 BaseChyz.info(`https://localhost:${this._port}`);
-                BaseChyz.info(`https://${ip.address()}:${this._port}`);
+                BaseChyz.info(`https://${ip_1.default.address()}:${this._port}`);
                 BaseChyz.EventEmitter.emit(base_1.CEvents.ON_START, this);
             });
         }
@@ -551,7 +551,7 @@ class BaseChyz {
                 BaseChyz.info("Express Server Start ");
                 BaseChyz.info(`Liten Port ${this._port}`);
                 BaseChyz.info(`http://localhost:${this._port}`);
-                BaseChyz.info(`http://${ip.address()}:${this._port}`);
+                BaseChyz.info(`http://${ip_1.default.address()}:${this._port}`);
                 BaseChyz.EventEmitter.emit(base_1.CEvents.ON_START, this);
             });
         }

package/base/ActionFilter.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="express" />
 import { Request, Response } from "../index";
 import { CBaseObject } from "./CBaseObject";
 export declare class ActionFilter extends CBaseObject {

package/base/ActionFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ActionFilter.d.ts","sourceRoot":"","sources":["../../src/base/ActionFilter.ts"],"names":[],"mappings":";AAMA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,UAAU,CAAC;AAE3C,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAA;AAEzC,qBAAa,YAAa,SAAQ,WAAW;IAElC,IAAI,EAAE,GAAG,CAAC;IAEjB;;;OAGG;IACI,MAAM,UAAM;IAGZ,IAAI;IAIX;;;;;OAKG;IACU,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ;IASjE;;;;;OAKG;IACU,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ;IAIjE;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG;CA8BjC"}
+{"version":3,"file":"ActionFilter.d.ts","sourceRoot":"","sources":["../../src/base/ActionFilter.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,UAAU,CAAC;AAE3C,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAA;AAGzC,qBAAa,YAAa,SAAQ,WAAW;IAElC,IAAI,EAAE,GAAG,CAAC;IAEjB;;;OAGG;IACI,MAAM,UAAM;IAGZ,IAAI;IAIX;;;;;OAKG;IACU,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ;IAUjE;;;;;OAKG;IACU,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ;IAIjE;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG;CA8BjC"}

package/base/ActionFilter.js

@@ -8,10 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionFilter = void 0;
 const Utils_1 = require("../requiments/Utils");
 const CBaseObject_1 = require("./CBaseObject");
+const BaseChyz_1 = __importDefault(require("../BaseChyz"));
 class ActionFilter extends CBaseObject_1.CBaseObject {
     constructor() {
         super(...arguments);
@@ -31,7 +35,7 @@ class ActionFilter extends CBaseObject_1.CBaseObject {
      */
     beforeFilter(route, req, res) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log("route ", route);
+            BaseChyz_1.default.debug("Controller->beforeFilter ", route);
             if (!this.isActive(route)) {
                 return;
             }

package/base/Logs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Logs.d.ts","sourceRoot":"","sources":["../../src/base/Logs.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAI5C,qBAAa,IAAK,YAAW,YAAY;IAE9B,IAAI,SAAyB;IAC7B,OAAO,EAAE,GAAG,CAA6C;gBAGpD,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG;IASxC,IAAI;IAIJ;;;OAGG;IACI,QAAQ;IAIR,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAInB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIpB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAInB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAInB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIpB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAKpB,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;CAIhC;;AAED,wBAA0B"}
+{"version":3,"file":"Logs.d.ts","sourceRoot":"","sources":["../../src/base/Logs.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAK5C,qBAAa,IAAK,YAAW,YAAY;IAE9B,IAAI,SAAyB;IAC7B,OAAO,EAAE,GAAG,CAA6C;gBAGpD,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG;IA6BxC,IAAI;IAIJ;;;OAGG;IACI,QAAQ;IAIR,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAInB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIpB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAInB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAInB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIpB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAKpB,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;CAIhC;;AAED,wBAA0B"}

package/base/Logs.js

@@ -17,8 +17,27 @@ class Logs {
         this.configs = (_a = require('../log/config/log4js.json')) !== null && _a !== void 0 ? _a : {};
         if (name)
             this.name = name;
-        if (configs)
+        if (configs) {
             this.configs = configs;
+        }
+        // let _conf = Utils.clone(this.configs);
+        // Object.keys(_conf.appenders).forEach(function (appender: string) {
+        //     let _base;
+        //     if (_conf.appenders[appender].layout) {
+        //         if ((_base = _conf.appenders[appender].layout).tokens == null) {
+        //             _base.tokens = {};
+        //         }
+        //         //
+        //         _conf.appenders[appender].layout.tokens = Utils.extend(_conf.appenders[appender].layout.tokens, {
+        //             singleLine: function (logEvent: any) {
+        //                 console.log("singglleeee")
+        //                 // logEvent.data is an array that contains the arguments to the log.info() call
+        //                 return logEvent.data[0] + ', ' + logEvent.data[1].toString();
+        //             }
+        //         });
+        //
+        //     }
+        // });
         this.Provider().configure(this.configs);
     }
     init() {

package/filters/AccessControl.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="express" />
 import { Request, Response } from "../index";
 import { ActionFilter } from "../base";
 import { WebUser } from "../web/WebUser";

package/filters/AccessControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccessControl.d.ts","sourceRoot":"","sources":["../../src/filters/AccessControl.ts"],"names":[],"mappings":";AAMA,OAAO,EAAC,OAAO,EAAC,QAAQ,EAAU,MAAM,UAAU,CAAC;AAEnD,OAAO,EAAC,YAAY,EAAC,MAAM,SAAS,CAAC;AAErC,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC;AAIvC,qBAAa,aAAc,SAAQ,YAAY;IAEpC,IAAI,EAAE,GAAG,CAAQ;IACjB,KAAK,EAAE,GAAG,CAAC;IACX,YAAY,EAAE,GAAG,CAAQ;IAEzB,IAAI;IAgBE,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAC,GAAG,EAAC,QAAQ;IAiC7D,UAAU,CAAC,IAAI,EAAE,OAAO;CAMlC"}
+{"version":3,"file":"AccessControl.d.ts","sourceRoot":"","sources":["../../src/filters/AccessControl.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,OAAO,EAAC,QAAQ,EAAU,MAAM,UAAU,CAAC;AAEnD,OAAO,EAAC,YAAY,EAAC,MAAM,SAAS,CAAC;AAErC,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC;AAIvC,qBAAa,aAAc,SAAQ,YAAY;IAEpC,IAAI,EAAE,GAAG,CAAQ;IACjB,KAAK,EAAE,GAAG,CAAC;IACX,YAAY,EAAE,GAAG,CAAQ;IAEzB,IAAI;IAgBE,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAC,GAAG,EAAC,QAAQ;IAiC7D,UAAU,CAAC,IAAI,EAAE,OAAO;CAMlC"}

package/index.d.ts

@@ -10,10 +10,7 @@ declare module "express-serve-static-core" {
         identity: any;
     }
 }
-/**
- *
- */
-export declare const Chyz_Version = "2.0.1-rc.2";
+export declare const Chyz_Version: any;
 declare const Chyz: BaseChyz;
 export { Request, Response, NextFunction } from "./base/CRequest";
 export { RouteDefinition } from "./model/RouteDefinition";

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC;KAClC;CACJ;AAQD,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,EAAC,UAAU,EAAC,MAAM,QAAQ,CAAC;AAElC,OAAO,QAAQ,2BAA2B,CAAC;IACvC,UAAU,OAAO;QACb,QAAQ,EAAE,GAAG,CAAC;KACjB;CACJ;AAYD;;GAEG;AACH,eAAQ,MAAM,YAAY,eAAa,CAAC;AACxC,QAAA,MAAM,IAAI,UAAiB,CAAC;AAC5B,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAC,eAAe,EAAC,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,CAAA;AAC7B,OAAO,EACH,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,sBAAsB,EACtB,wBAAwB,EACxB,qBAAqB,EACrB,yBAAyB,EACzB,oBAAoB,EACpB,uBAAuB,EACvB,KAAK,EACL,YAAY,EACZ,OAAO,EACV,MAAM,QAAQ,CAAC;AAChB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AAExB,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AAEnC,eAAe,IAAI,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC;KAClC;CACJ;AAQD,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,EAAC,UAAU,EAAC,MAAM,QAAQ,CAAC;AAGlC,OAAO,QAAQ,2BAA2B,CAAC;IACvC,UAAU,OAAO;QACb,QAAQ,EAAE,GAAG,CAAC;KACjB;CACJ;AAgBD,eAAO,MAAM,YAAY,KAAgB,CAAC;AAC1C,QAAA,MAAM,IAAI,UAAiB,CAAC;AAC5B,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAC,eAAe,EAAC,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,CAAA;AAC7B,OAAO,EACH,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,sBAAsB,EACtB,wBAAwB,EACxB,qBAAqB,EACrB,yBAAyB,EACzB,oBAAoB,EACpB,uBAAuB,EACvB,KAAK,EACL,YAAY,EACZ,OAAO,EACV,MAAM,QAAQ,CAAC;AAChB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AAExB,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AAEnC,eAAe,IAAI,CAAC"}

package/index.js

@@ -41,7 +41,8 @@ String.prototype.tokenReplace = function (obj) {
 /**
  *
  */
-exports.Chyz_Version = "2.0.1-rc.2";
+const pjson = require('./package.json');
+exports.Chyz_Version = pjson.version;
 const Chyz = new BaseChyz_1.default();
 var WebUser_1 = require("./web/WebUser");
 Object.defineProperty(exports, "WebUser", { enumerable: true, get: function () { return WebUser_1.WebUser; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chyz",
-  "version": "2.0.1-rc.2",
+  "version": "2.0.1-rc.4",
   "description": "Nodejs Micro service Framework",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -17,6 +17,7 @@
   },
   "homepage": "https://github.com/cihan53/Chy-Nodejs-Framework#readme",
   "dependencies": {
+    "@types/compression": "^1.7.5",
     "axios": "^1.3.5",
     "babel-plugin-transform-decorators-legacy": "^1.3.5",
     "body-parser": "^1.20.2",
@@ -49,7 +50,7 @@
     "nodemon": "^2.0.22",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
-  } ,
+  },
   "keywords": [
     "Framework",
     "RespAPI",