express-ext 0.1.10 → 0.1.11

package/lib/LogController.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var LogController = (function () {
+  function LogController(logger, mp) {
+    this.logger = logger;
+    this.map = mp;
+    this.config = this.config.bind(this);
+  }
+  LogController.prototype.config = function (req, res) {
+    var obj = req.body;
+    if (!obj || obj === '') {
+      return res.status(400).end('The request body cannot be empty');
+    }
+    if (!this.logger || !this.map) {
+      return res.status(503).end('Logger is not available');
+    }
+    if (!this.map) {
+      return res.status(503).end('Map is not available');
+    }
+    var changed = false;
+    if (obj.level && typeof obj.level === 'string' && obj.level.length > 0) {
+      var lv = this.map[obj.level.toUpperCase()];
+      if (lv !== undefined) {
+        this.logger.level = lv;
+        changed = true;
+      }
+    }
+    if (obj.map) {
+      if (obj.map.level && typeof obj.map.level === 'string' && obj.map.level.length > 0) {
+        this.logger.map.level = obj.map.level;
+        changed = true;
+      }
+      if (obj.map.time && typeof obj.map.time === 'string' && obj.map.time.length > 0) {
+        this.logger.map.time = obj.map.time;
+        changed = true;
+      }
+      if (obj.map.msg && typeof obj.map.msg === 'string' && obj.map.msg.length > 0) {
+        this.logger.map.msg = obj.map.msg;
+        changed = true;
+      }
+    }
+    if (changed) {
+      return res.status(200).end('true');
+    }
+    else {
+      return res.status(204).end('false');
+    }
+  };
+  return LogController;
+}());
+exports.LogController = LogController;

package/lib/index.js

@@ -1,2 +1,2 @@
 "use strict";function __export(m){for(var p in m)if(!exports.hasOwnProperty(p))exports[p]=m[p]}
-Object.defineProperty(exports,"__esModule",{value:!0});var GenericController_1=require("./GenericController");exports.GenericHandler=GenericController_1.GenericController;var GenericSearchController_1=require("./GenericSearchController");exports.GenericSearchHandler=GenericSearchController_1.GenericSearchController;var HealthController_1=require("./HealthController");exports.HealthHandler=HealthController_1.HealthController;var LoadController_1=require("./LoadController");exports.LoadHandler=LoadController_1.LoadController;exports.ViewHandler=LoadController_1.LoadController;exports.ViewController=LoadController_1.LoadController;var LoadSearchController_1=require("./LoadSearchController");exports.LoadSearchHandler=LoadSearchController_1.LoadSearchController;var LowCodeController_1=require("./LowCodeController");exports.LowCodeHandler=LowCodeController_1.LowCodeController;exports.Handler=LowCodeController_1.LowCodeController;exports.Controller=LowCodeController_1.LowCodeController;var SearchController_1=require("./SearchController");exports.SearchHandler=SearchController_1.SearchController;__export(require("./health"));__export(require("./HealthController"));__export(require("./http"));__export(require("./view"));__export(require("./LoadController"));__export(require("./search_func"));__export(require("./search"));__export(require("./SearchController"));__export(require("./LoadSearchController"));__export(require("./resources"));__export(require("./edit"));__export(require("./GenericController"));__export(require("./GenericSearchController"));__export(require("./LowCodeController"))
+Object.defineProperty(exports,"__esModule",{value:!0});var GenericController_1=require("./GenericController");exports.GenericHandler=GenericController_1.GenericController;var GenericSearchController_1=require("./GenericSearchController");exports.GenericSearchHandler=GenericSearchController_1.GenericSearchController;var HealthController_1=require("./HealthController");exports.HealthHandler=HealthController_1.HealthController;var LoadController_1=require("./LoadController");exports.LoadHandler=LoadController_1.LoadController;exports.ViewHandler=LoadController_1.LoadController;exports.ViewController=LoadController_1.LoadController;var LoadSearchController_1=require("./LoadSearchController");exports.LoadSearchHandler=LoadSearchController_1.LoadSearchController;var LowCodeController_1=require("./LowCodeController");exports.LowCodeHandler=LowCodeController_1.LowCodeController;exports.Handler=LowCodeController_1.LowCodeController;exports.Controller=LowCodeController_1.LowCodeController;var SearchController_1=require("./SearchController");exports.SearchHandler=SearchController_1.SearchController;var LogController_1=require("./LogController");exports.LogHandler=LogController_1.LogController;__export(require("./health"));__export(require("./HealthController"));__export(require("./LogController"));__export(require("./http"));__export(require("./view"));__export(require("./LoadController"));__export(require("./search_func"));__export(require("./search"));__export(require("./SearchController"));__export(require("./LoadSearchController"));__export(require("./resources"));__export(require("./edit"));__export(require("./GenericController"));__export(require("./GenericSearchController"));__export(require("./LowCodeController"))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-ext",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "express-ext",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/GenericController.ts

@@ -17,7 +17,7 @@ export interface GenericService<T, ID, R> {
 export class GenericController<T, ID> extends LoadController<T, ID> {
   status: StatusConfig;
   metadata?: Attributes;
-  constructor(log: (msg: any, ctx?: any) => void, public service: GenericService<T, ID, number|ResultInfo<T>>, status?: StatusConfig, public validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>) {
+  constructor(log: (msg: string) => void, public service: GenericService<T, ID, number|ResultInfo<T>>, status?: StatusConfig, public validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>) {
     super(log, service);
     this.status = initializeStatus(status);
     if (service.metadata) {
@@ -67,7 +67,7 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
     }
   }
 }
-export function validateAndCreate<T>(req: Request, res: Response, status: StatusConfig, save: (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>, log: (msg: any, ctx?: any) => void, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>): void {
+export function validateAndCreate<T>(req: Request, res: Response, status: StatusConfig, save: (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>, log: (msg: string) => void, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>): void {
   const obj = req.body;
   if (!obj || obj === '') {
     return res.status(400).end('The request body cannot be empty.');
@@ -85,7 +85,7 @@ export function validateAndCreate<T>(req: Request, res: Response, status: Status
     create(res, status, obj, save, log);
   }
 }
-export function validateAndUpdate<T>(res: Response, status: StatusConfig, obj: T, isPatch: boolean, save: (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>, log: (msg: any, ctx?: any) => void, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>):  void {
+export function validateAndUpdate<T>(res: Response, status: StatusConfig, obj: T, isPatch: boolean, save: (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>, log: (msg: string) => void, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>):  void {
   if (validate) {
     validate(obj, isPatch).then(errors => {
       if (errors && errors.length > 0) {

package/src/GenericSearchController.ts

@@ -15,7 +15,7 @@ export class GenericSearchController<T, ID, S extends Filter> extends GenericCon
   numbers?: string[];
   fields?: string;
   excluding?: string;
-  constructor(log: (msg: any, ctx?: any) => void, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, service: GenericService<T, ID, number|ResultInfo<T>>, config?: Config, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
+  constructor(log: (msg: string) => void, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, service: GenericService<T, ID, number|ResultInfo<T>>, config?: Config, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
     super(log, service, config, validate);
     this.search = this.search.bind(this);
     this.config = initializeConfig(config);

package/src/LoadController.ts

@@ -39,7 +39,7 @@ function getKeysFunc<T, ID>(viewService: ViewService<T, ID> | ((id: ID, ctx?: an
 export class LoadController<T, ID> {
   protected keys?: Attribute[];
   protected view: (id: ID, ctx?: any) => Promise<T|null>;
-  constructor(protected log: (msg: any, ctx?: any) => void, viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T|null>), keys?: Attributes|Attribute[]|string[]) {
+  constructor(protected log: (msg: string) => void, viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T|null>), keys?: Attributes|Attribute[]|string[]) {
     this.load = this.load.bind(this);
     this.view = getViewFunc(viewService);
     this.keys = getKeysFunc(viewService, keys);

package/src/LoadSearchController.ts

@@ -12,7 +12,7 @@ export class LoadSearchController<T, ID, S extends Filter> extends LoadControlle
   numbers?: string[];
   fields?: string;
   excluding?: string;
-  constructor(log: (msg: any, ctx?: any) => void, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>), keys?: Attributes|Attribute[]|string[], config?: SearchConfig|boolean, dates?: string[], numbers?: string[]) {
+  constructor(log: (msg: string) => void, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>), keys?: Attributes|Attribute[]|string[], config?: SearchConfig|boolean, dates?: string[], numbers?: string[]) {
     super(log, viewService, keys);
     this.search = this.search.bind(this);
     if (config) {

package/src/LogController.ts

@@ -0,0 +1,70 @@
+import {Request, Response} from 'express';
+
+export interface NumberMap {
+  [key: string]: number;
+}
+export interface LogConfig {
+  level?: string;
+  map?: LogMapConfig;
+}
+export interface LogMapConfig {
+  time?: string;
+  level?: string;
+  msg?: string;
+}
+export interface LogMap {
+  time: string;
+  level: string;
+  msg: string;
+}
+export interface Logger {
+  level: number;
+  map: LogMap;
+}
+
+export class LogController {
+  map?: NumberMap;
+  constructor(public logger: Logger, mp?: NumberMap) {
+    this.map = mp;
+    this.config = this.config.bind(this);
+  }
+  config(req: Request, res: Response) {
+    const obj: LogConfig = req.body;
+    if (!obj || obj === '') {
+      return res.status(400).end('The request body cannot be empty');
+    }
+    if (!this.logger || !this.map) {
+      return res.status(503).end('Logger is not available');
+    }
+    if (!this.map) {
+      return res.status(503).end('Map is not available');
+    }
+    let changed = false;
+    if (obj.level && typeof obj.level === 'string' && obj.level.length > 0) {
+      const lv = this.map[obj.level.toUpperCase()];
+      if (lv !== undefined) {
+        this.logger.level = lv;
+        changed = true;
+      }
+    }
+    if (obj.map) {
+      if (obj.map.level && typeof obj.map.level === 'string' && obj.map.level.length > 0) {
+        this.logger.map.level = obj.map.level;
+        changed = true;
+      }
+      if (obj.map.time && typeof obj.map.time === 'string' && obj.map.time.length > 0) {
+        this.logger.map.time = obj.map.time;
+        changed = true;
+      }
+      if (obj.map.msg && typeof obj.map.msg === 'string' && obj.map.msg.length > 0) {
+        this.logger.map.msg = obj.map.msg;
+        changed = true;
+      }
+    }
+    if (changed) {
+      return res.status(200).end('true');
+    } else {
+      return res.status(204).end('false');
+    }
+  }
+}

package/src/LowCodeController.ts

@@ -18,7 +18,7 @@ export class LowCodeController<T, ID, S extends Filter> extends GenericControlle
   numbers?: string[];
   fields?: string;
   excluding?: string;
-  constructor(log: (msg: any, ctx?: any) => void, public lowCodeService: Service<T, ID, number|ResultInfo<T>, S>, config?: LowCodeConfig, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
+  constructor(log: (msg: string) => void, public lowCodeService: Service<T, ID, number|ResultInfo<T>, S>, config?: LowCodeConfig, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>, dates?: string[], numbers?: string[]) {
     super(log, lowCodeService, config, validate);
     this.search = this.search.bind(this);
     this.config = initializeConfig(config);

package/src/SearchController.ts

@@ -7,7 +7,7 @@ export class SearchController<T, S extends Filter> {
   csv?: boolean;
   fields?: string;
   excluding?: string;
-  constructor(protected log: (msg: any, ctx?: any) => void, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, config?: SearchConfig|boolean, public dates?: string[], public numbers?: string[]) {
+  constructor(protected log: (msg: string) => void, public find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, config?: SearchConfig|boolean, public dates?: string[], public numbers?: string[]) {
     this.search = this.search.bind(this);
     if (config) {
       if (typeof config === 'boolean') {

package/src/http.ts

@@ -1,7 +1,7 @@
 import {Request, Response} from 'express';
 import {Attribute} from './metadata';
 
-export function handleError(err: any, res: Response, log?: (msg: any, ctx?: any) => void) {
+export function handleError(err: any, res: Response, log?: (msg: string) => void) {
   if (log) {
     log(toString(err));
     res.status(500).end('Internal Server Error');

package/src/index.ts

@@ -6,8 +6,10 @@ import {LoadSearchController} from './LoadSearchController';
 import {LowCodeController} from './LowCodeController';
 import {Service} from './LowCodeController';
 import {SearchController} from './SearchController';
+import {LogController} from './LogController';
 
 export {HealthController as HealthHandler};
+export {LogController as LogHandler};
 export {LoadController as LoadHandler};
 export {LoadController as ViewHandler};
 export {LoadController as ViewController};
@@ -23,6 +25,7 @@ export {Service as LowCodeService};
 
 export * from './health';
 export * from './HealthController';
+export * from './LogController';
 export * from './http';
 export * from './metadata';
 export * from './view';