express-ext 0.1.18 → 0.1.21

package/lib/GenericController.js

@@ -80,21 +80,23 @@ exports.GenericController = GenericController;
 function validateAndCreate(req, res, status, save, log, validate) {
   var obj = req.body;
   if (!obj || obj === '') {
-    return res.status(400).end('The request body cannot be empty.');
-  }
-  if (validate) {
-    validate(obj).then(function (errors) {
-      if (errors && errors.length > 0) {
-        var r = { status: status.validation_error, errors: errors };
-        res.status(getStatusCode(errors)).json(r).end();
-      }
-      else {
-        edit_1.create(res, status, obj, save, log);
-      }
-    }).catch(function (err) { return http_1.handleError(err, res, log); });
+    res.status(400).end('The request body cannot be empty.');
   }
   else {
-    edit_1.create(res, status, obj, save, log);
+    if (validate) {
+      validate(obj).then(function (errors) {
+        if (errors && errors.length > 0) {
+          var r = { status: status.validation_error, errors: errors };
+          res.status(getStatusCode(errors)).json(r).end();
+        }
+        else {
+          edit_1.create(res, status, obj, save, log);
+        }
+      }).catch(function (err) { return http_1.handleError(err, res, log); });
+    }
+    else {
+      edit_1.create(res, status, obj, save, log);
+    }
   }
 }
 exports.validateAndCreate = validateAndCreate;

package/lib/LoadSearchController.js

@@ -17,6 +17,15 @@ var http_1 = require("./http");
 var LoadController_1 = require("./LoadController");
 var search_1 = require("./search");
 var search_func_1 = require("./search_func");
+function useSearchController(log, find, viewService, array, dates, numbers, keys, config) {
+  var c = new LoadSearchController(log, find, viewService, keys, config, dates, numbers);
+  c.array = array;
+  return c;
+}
+exports.useSearchController = useSearchController;
+exports.useSearchHandler = useSearchController;
+exports.createSearchController = useSearchController;
+exports.createSearchHandler = useSearchController;
 var LoadSearchController = (function (_super) {
   __extends(LoadSearchController, _super);
   function LoadSearchController(log, find, viewService, keys, config, dates, numbers) {

package/lib/LowCodeController.js

@@ -17,9 +17,9 @@ var GenericController_1 = require("./GenericController");
 var http_1 = require("./http");
 var search_1 = require("./search");
 var search_func_1 = require("./search_func");
-var LowCodeController = (function (_super) {
-  __extends(LowCodeController, _super);
-  function LowCodeController(log, lowCodeService, config, validate, dates, numbers) {
+var Controller = (function (_super) {
+  __extends(Controller, _super);
+  function Controller(log, lowCodeService, config, validate, dates, numbers) {
     var _this = _super.call(this, log, lowCodeService, config, validate) || this;
     _this.lowCodeService = lowCodeService;
     _this.search = _this.search.bind(_this);
@@ -39,7 +39,7 @@ var LowCodeController = (function (_super) {
     }
     return _this;
   }
-  LowCodeController.prototype.search = function (req, res) {
+  Controller.prototype.search = function (req, res) {
     var _this = this;
     var s = search_1.fromRequest(req, search_1.buildArray(this.array, this.fields, this.excluding));
     var l = search_1.getParameters(s, this.config);
@@ -48,6 +48,6 @@ var LowCodeController = (function (_super) {
       .then(function (result) { return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config); })
       .catch(function (err) { return http_1.handleError(err, res, _this.log); });
   };
-  return LowCodeController;
+  return Controller;
 }(GenericController_1.GenericController));
-exports.LowCodeController = LowCodeController;
+exports.Controller = Controller;

package/lib/client.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var http = require("http");
+var https = require("https");
+function getHealthSecure(url, timeout) {
+  return new Promise(function (resolve) {
+    https.get(url, { rejectUnauthorized: false }, function (res) {
+      var data = '';
+      res.on('data', function (d) {
+        data += d;
+      });
+      res.on('end', function () {
+        resolve({ statusCode: res.statusCode, data: data, statusMessage: res.statusMessage });
+      });
+    }).on('error', function (e) {
+      return { statusCode: 500, statusMessage: e };
+    });
+    setTimeout(function () { return resolve({ statusCode: 408, statusMessage: 'Time out' }); }, timeout);
+  });
+}
+function getHealth(url, timeout) {
+  return new Promise(function (resolve) {
+    http.get(url, function (res) {
+      var data = '';
+      res.on('data', function (d) {
+        data += d;
+      });
+      res.on('end', function () {
+        resolve({ statusCode: res.statusCode, data: data, statusMessage: res.statusMessage });
+      });
+    }).on('error', function (e) {
+      return { statusCode: 500, statusMessage: e };
+    });
+    setTimeout(function () { return resolve({ statusCode: 408, statusMessage: 'Time out' }); }, timeout);
+  });
+}
+var ClientChecker = (function () {
+  function ClientChecker(service, url, timeout) {
+    this.service = service;
+    this.url = url;
+    this.timeout = (timeout ? timeout : 4200);
+    this.check = this.check.bind(this);
+    this.name = this.name.bind(this);
+    this.build = this.build.bind(this);
+  }
+  ClientChecker.prototype.check = function () {
+    var obj = {};
+    if (this.url.startsWith('https://')) {
+      return getHealthSecure(this.url, this.timeout).then(function (r) { return obj = r; });
+    }
+    else {
+      return getHealth(this.url, this.timeout).then(function (r) { return obj = r; });
+    }
+  };
+  ClientChecker.prototype.name = function () {
+    return this.service;
+  };
+  ClientChecker.prototype.build = function (data, err) {
+    if (err) {
+      if (!data) {
+        data = {};
+      }
+      data['error'] = err;
+    }
+    return data;
+  };
+  return ClientChecker;
+}());
+exports.ClientChecker = ClientChecker;

package/lib/index.js

@@ -1,3 +1,74 @@
-"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 LogController_1=require("./LogController");exports.LogHandler=LogController_1.LogController;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("./LogController"));__export(require("./log"));__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"));function allow(access){return function(req,res,next){res.header('Access-Control-Allow-Origin',access.origin);res.header('Access-Control-Allow-Credentials',access.credentials);res.header('Access-Control-Allow-Methods',access.methods);res.setHeader('Access-Control-Allow-Headers',access.headers);next()}}
-exports.allow=allow
+"use strict";
+function __export(m) {
+  for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+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 LogController_1 = require("./LogController");
+exports.LogHandler = LogController_1.LogController;
+var LowCodeController_1 = require("./LowCodeController");
+exports.LowCodeHandler = LowCodeController_1.Controller;
+exports.LowCodeController = LowCodeController_1.Controller;
+var SearchController_1 = require("./SearchController");
+exports.SearchHandler = SearchController_1.SearchController;
+__export(require("./health"));
+__export(require("./client"));
+__export(require("./HealthController"));
+__export(require("./LogController"));
+__export(require("./log"));
+__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"));
+function allow(access) {
+  var ao = access.origin;
+  if (typeof ao === 'string') {
+    return function (req, res, next) {
+      res.header('Access-Control-Allow-Origin', access.origin);
+      res.header('Access-Control-Allow-Credentials', access.credentials);
+      res.header('Access-Control-Allow-Methods', access.methods);
+      res.setHeader('Access-Control-Allow-Headers', access.headers);
+      next();
+    };
+  }
+  else if (Array.isArray(ao) && ao.length > 0) {
+    return function (req, res, next) {
+      var origin = req.headers.origin;
+      if (origin) {
+        if (ao.includes(origin)) {
+          res.setHeader('Access-Control-Allow-Origin', origin);
+        }
+      }
+      res.header('Access-Control-Allow-Credentials', access.credentials);
+      res.header('Access-Control-Allow-Methods', access.methods);
+      res.setHeader('Access-Control-Allow-Headers', access.headers);
+      next();
+    };
+  }
+  return function (req, res, next) {
+    res.header('Access-Control-Allow-Credentials', access.credentials);
+    res.header('Access-Control-Allow-Methods', access.methods);
+    res.setHeader('Access-Control-Allow-Headers', access.headers);
+    next();
+  };
+}
+exports.allow = allow;

package/lib/resources.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var fs = require("fs");
+var http = require("http");
+var https = require("https");
 var resources = (function () {
   function resources() {
   }
@@ -53,3 +55,35 @@ function loadTemplates(ok, buildTemplates, correct, files) {
   return buildTemplates(mappers, correct);
 }
 exports.loadTemplates = loadTemplates;
+function start(a, s) {
+  process.on('uncaughtException', function (err) {
+    console.log(err);
+  });
+  if (s.https) {
+    if (s.options) {
+      https.createServer(s.options, a).listen(s.port, function () {
+        console.log('Use https and start server at port ' + s.port);
+      });
+    }
+    else if (s.key && s.cert && s.key.length > 0 && s.cert.length > 0) {
+      var options = {
+        key: fs.readFileSync(s.key),
+        cert: fs.readFileSync(s.cert)
+      };
+      https.createServer(options, a).listen(s.port, function () {
+        console.log('Use https and start server at port ' + s.port);
+      });
+    }
+    else {
+      http.createServer(a).listen(s.port, function () {
+        console.log('Start server at port ' + s.port);
+      });
+    }
+  }
+  else {
+    http.createServer(a).listen(s.port, function () {
+      console.log('Start server at port ' + s.port);
+    });
+  }
+}
+exports.start = start;

package/lib/search.js

@@ -139,28 +139,40 @@ function inArray(s, arr) {
   return false;
 }
 exports.inArray = inArray;
-function setValue(obj, path, value) {
-  var paths = path.split('.');
-  if (paths.length === 1) {
-    obj[path] = value;
+function setValue(o, key, value) {
+  var obj = o;
+  var replaceKey = key.replace(/\[/g, '.[').replace(/\.\./g, '.');
+  if (replaceKey.indexOf('.') === 0) {
+    replaceKey = replaceKey.slice(1, replaceKey.length);
+  }
+  var keys = replaceKey.split('.');
+  var firstKey = keys.shift();
+  if (!firstKey) {
+    return;
+  }
+  var isArrayKey = /\[([0-9]+)\]/.test(firstKey);
+  if (keys.length > 0) {
+    var firstKeyValue = obj[firstKey] || {};
+    var returnValue = setValue(firstKeyValue, keys.join('.'), value);
+    return setKey(obj, isArrayKey, firstKey, returnValue);
+  }
+  return setKey(obj, isArrayKey, firstKey, value);
+}
+exports.setValue = setValue;
+var setKey = function (_object, _isArrayKey, _key, _nextValue) {
+  if (_isArrayKey) {
+    if (_object.length > _key) {
+      _object[_key] = _nextValue;
+    }
+    else {
+      _object.push(_nextValue);
+    }
   }
   else {
-    var o = obj;
-    var l = paths.length - 1;
-    for (var i = 0; i < l - 1; i++) {
-      var p = paths[i];
-      if (p in o) {
-        o = o[p];
-      }
-      else {
-        o[p] = {};
-        o = o[p];
-      }
-    }
-    o[paths[paths.length - 1]] = value;
+    _object[_key] = _nextValue;
   }
-}
-exports.setValue = setValue;
+  return _object;
+};
 function getParameters(obj, config) {
   var o = obj;
   if (!config) {

package/package.json

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

package/src/GenericController.ts

@@ -36,25 +36,25 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
       this.validate = v.validate;
     }
   }
-  create(req: Request, res: Response) {
+  create(req: Request, res: Response): void {
     return this.insert(req, res);
   }
-  insert(req: Request, res: Response) {
+  insert(req: Request, res: Response): void {
     validateAndCreate(req, res, this.status, this.service.insert, this.log, this.validate);
   }
-  update(req: Request, res: Response) {
+  update(req: Request, res: Response): void {
     const id = buildAndCheckIdWithBody<T, ID, any>(req, res, this.keys, this.service.update);
     if (id) {
       validateAndUpdate(res, this.status, req.body, false, this.service.update, this.log, this.validate);
     }
   }
-  patch(req: Request, res: Response) {
+  patch(req: Request, res: Response): void {
     const id = buildAndCheckIdWithBody<T, ID, any>(req, res, this.keys, this.service.patch);
     if (id && this.service.patch) {
       validateAndUpdate(res, this.status, req.body, true, this.service.patch, this.log, this.validate);
     }
   }
-  delete(req: Request, res: Response) {
+  delete(req: Request, res: Response): void {
     const id = buildAndCheckId<ID>(req, res, this.keys);
     if (id) {
       if (!this.service.delete) {
@@ -70,19 +70,20 @@ 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: Log, 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.');
-  }
-  if (validate) {
-    validate(obj).then(errors => {
-      if (errors && errors.length > 0) {
-        const r: ResultInfo<T> = {status: status.validation_error, errors};
-        res.status(getStatusCode(errors)).json(r).end();
-      } else {
-        create(res, status, obj, save, log);
-      }
-    }).catch(err => handleError(err, res, log));
+    res.status(400).end('The request body cannot be empty.');
   } else {
-    create(res, status, obj, save, log);
+    if (validate) {
+      validate(obj).then(errors => {
+        if (errors && errors.length > 0) {
+          const r: ResultInfo<T> = {status: status.validation_error, errors};
+          res.status(getStatusCode(errors)).json(r).end();
+        } else {
+          create(res, status, obj, save, log);
+        }
+      }).catch(err => handleError(err, res, log));
+    } else {
+      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: Log, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>):  void {

package/src/LoadController.ts

@@ -44,7 +44,7 @@ export class LoadController<T, ID> {
     this.view = getViewFunc(viewService);
     this.keys = getKeysFunc(viewService, keys);
   }
-  load(req: Request, res: Response) {
+  load(req: Request, res: Response): void {
     const id = buildAndCheckId<ID>(req, res, this.keys);
     if (id) {
       this.view(id)

package/src/LoadSearchController.ts

@@ -5,6 +5,22 @@ import {Attribute, Attributes} from './metadata';
 import {buildArray, Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult} from './search';
 import {getMetadataFunc} from './search_func';
 
+export interface Search {
+  search(req: Request, res: Response): void;
+  load(req: Request, res: Response): void;
+}
+export interface SearchManager {
+  search(req: Request, res: Response): void;
+  load(req: Request, res: Response): void;
+}
+export function useSearchController<T, ID, S extends Filter>(log: Log, find: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>, viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>), array?: string[], dates?: string[], numbers?: string[], keys?: Attributes|Attribute[]|string[], config?: SearchConfig|boolean): Search {
+  const c = new LoadSearchController(log, find, viewService, keys, config, dates, numbers);
+  c.array = array;
+  return c;
+}
+export const useSearchHandler = useSearchController;
+export const createSearchController = useSearchController;
+export const createSearchHandler = useSearchController;
 export class LoadSearchController<T, ID, S extends Filter> extends LoadController<T, ID> {
   config?: SearchConfig;
   csv?: boolean;
@@ -37,7 +53,7 @@ export class LoadSearchController<T, ID, S extends Filter> extends LoadControlle
       this.numbers = m.numbers;
     }
   }
-  search(req: Request, res: Response) {
+  search(req: Request, res: Response): void {
     const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
     const l = getParameters(s, this.config);
     const s2 = format(s, this.dates, this.numbers);

package/src/LowCodeController.ts

@@ -11,7 +11,7 @@ export interface LowCodeConfig extends StatusConfig, SearchConfig {
 export interface Service<T, ID, R, S extends Filter> extends GenericService<T, ID, R> {
   search: (s: S, limit?: number, skip?: number|string, fields?: string[]) => Promise<SearchResult<T>>;
 }
-export class LowCodeController<T, ID, S extends Filter> extends GenericController<T, ID> {
+export class Controller<T, ID, S extends Filter> extends GenericController<T, ID> {
   config?: SearchConfig;
   csv?: boolean;
   dates?: string[];

package/src/client.ts

@@ -0,0 +1,69 @@
+import * as http from 'http';
+import * as https from 'https';
+import { AnyMap, HealthChecker } from './health';
+
+function getHealthSecure(url: string, timeout: number): Promise<AnyMap> {
+  return new Promise((resolve) => {
+    https.get(url, { rejectUnauthorized: false }, (res: any) => {
+      let data = '';
+      res.on('data', (d: any) => {
+        data += d;
+      });
+      res.on('end', () => {
+        resolve({ statusCode: res.statusCode, data, statusMessage: res.statusMessage });
+      });
+    }).on('error', (e: any) => {
+      return { statusCode: 500, statusMessage: e };
+    });
+    setTimeout(() => resolve({ statusCode: 408, statusMessage: 'Time out' }), timeout);
+  });
+}
+function getHealth(url: string, timeout: number): Promise<AnyMap> {
+  return new Promise((resolve) => {
+    http.get(url, (res: any) => {
+      let data = '';
+      res.on('data', (d: any) => {
+        data += d;
+      });
+      res.on('end', () => {
+        resolve({ statusCode: res.statusCode, data, statusMessage: res.statusMessage });
+      });
+    }).on('error', (e: any) => {
+      return { statusCode: 500, statusMessage: e };
+    });
+    setTimeout(() => resolve({ statusCode: 408, statusMessage: 'Time out' }), timeout);
+  });
+}
+export class ClientChecker implements HealthChecker {
+  timeout: number;
+  constructor(private service: string, private url: string, timeout: number) {
+    this.timeout = (timeout ? timeout : 4200);
+    this.check = this.check.bind(this);
+    this.name = this.name.bind(this);
+    this.build = this.build.bind(this);
+  }
+  check(): Promise<AnyMap> {
+    let obj = {} as AnyMap;
+    if (this.url.startsWith('https://')) {
+      return getHealthSecure(this.url, this.timeout).then(
+        r => obj = r
+      );
+    } else {
+      return getHealth(this.url, this.timeout).then(
+        r => obj = r
+      );
+    }
+  }
+  name(): string {
+    return this.service;
+  }
+  build(data: AnyMap, err: any): AnyMap {
+    if (err) {
+      if (!data) {
+        data = {} as AnyMap;
+      }
+      data['error'] = err;
+    }
+    return data;
+  }
+}

package/src/index.ts

@@ -5,7 +5,7 @@ import {HealthController} from './HealthController';
 import {LoadController} from './LoadController';
 import {LoadSearchController} from './LoadSearchController';
 import {LogController} from './LogController';
-import {LowCodeController} from './LowCodeController';
+import {Controller} from './LowCodeController';
 import {Service} from './LowCodeController';
 import {SearchController} from './SearchController';
 
@@ -19,12 +19,13 @@ export {GenericController as GenericHandler};
 export {SearchController as SearchHandler};
 export {LoadSearchController as LoadSearchHandler};
 export {GenericSearchController as GenericSearchHandler};
-export {LowCodeController as LowCodeHandler};
-export {LowCodeController as Handler};
-export {LowCodeController as Controller};
+export {Controller as LowCodeHandler};
+// export {Controller as Handler};
+export {Controller as LowCodeController};
 export {Service as LowCodeService};
 
 export * from './health';
+export * from './client';
 export * from './HealthController';
 export * from './LogController';
 export * from './log';
@@ -43,15 +44,37 @@ export * from './GenericSearchController';
 export * from './LowCodeController';
 
 export interface AccessConfig {
-  origin: string;
-  credentials: string;
-  methods: string;
-  headers: string;
+  origin?: string | string[];
+  credentials?: string | string[];
+  methods?: string | string[];
+  headers: number | string | ReadonlyArray<string>;
 }
 export type AccessControlAllowConfig = AccessConfig;
 export function allow(access: AccessConfig): (req: Request, res: Response, next: NextFunction) => void {
+  const ao = access.origin;
+  if (typeof ao === 'string') {
+    return (req: Request, res: Response, next: NextFunction) => {
+      res.header('Access-Control-Allow-Origin', access.origin);
+      res.header('Access-Control-Allow-Credentials', access.credentials);
+      res.header('Access-Control-Allow-Methods', access.methods);
+      res.setHeader('Access-Control-Allow-Headers', access.headers);
+      next();
+    };
+  } else if (Array.isArray(ao) && ao.length > 0) {
+    return (req: Request, res: Response, next: NextFunction) => {
+      const origin = req.headers.origin;
+      if (origin) {
+        if (ao.includes(origin)) {
+          res.setHeader('Access-Control-Allow-Origin', origin);
+        }
+      }
+      res.header('Access-Control-Allow-Credentials', access.credentials);
+      res.header('Access-Control-Allow-Methods', access.methods);
+      res.setHeader('Access-Control-Allow-Headers', access.headers);
+      next();
+    };
+  }
   return (req: Request, res: Response, next: NextFunction) => {
-    res.header('Access-Control-Allow-Origin', access.origin);
     res.header('Access-Control-Allow-Credentials', access.credentials);
     res.header('Access-Control-Allow-Methods', access.methods);
     res.setHeader('Access-Control-Allow-Headers', access.headers);

package/src/resources.ts

@@ -1,5 +1,7 @@
-import { NextFunction, Request, Response } from 'express';
+import { Application, NextFunction, Request, Response } from 'express';
 import * as fs from 'fs';
+import * as http from 'http';
+import * as https from 'https';
 import { Attributes, ErrorMessage } from './metadata';
 
 // tslint:disable-next-line:class-name
@@ -76,3 +78,38 @@ export function loadTemplates(ok: boolean|undefined, buildTemplates: (streams: s
   }
   return buildTemplates(mappers, correct);
 }
+export interface Server {
+  port: number;
+  https?: boolean;
+  options?: any;
+  key?: string;
+  cert?: string;
+}
+export function start(a: Application, s: Server): void {
+  process.on('uncaughtException', (err) => {
+    console.log(err);
+  });
+  if (s.https) {
+    if (s.options) {
+      https.createServer(s.options, a).listen(s.port, () => {
+        console.log('Use https and start server at port ' + s.port);
+      });
+    } else if (s.key && s.cert && s.key.length > 0 && s.cert.length > 0) {
+      const options = {
+        key: fs.readFileSync(s.key),
+        cert: fs.readFileSync(s.cert)
+      };
+      https.createServer(options, a).listen(s.port, () => {
+        console.log('Use https and start server at port ' + s.port);
+      });
+    } else {
+      http.createServer(a).listen(s.port, () => {
+        console.log('Start server at port ' + s.port);
+      });
+    }
+  } else {
+    http.createServer(a).listen(s.port, () => {
+      console.log('Start server at port ' + s.port);
+    });
+  }
+}

package/src/search.ts

@@ -137,17 +137,17 @@ export function fromUrl<S>(req: Request, arr?: string[]): S {
   }
   */
   const s: any = {};
-    const obj = req.query;
-    const keys = Object.keys(obj);
-    for (const key of keys) {
-      if (inArray(key, arr)) {
-        const x = (obj[key] as string).split(',');
-        setValue(s, key, x);
-      } else {
-        setValue(s, key, obj[key] as string);
-      }
+  const obj = req.query;
+  const keys = Object.keys(obj);
+  for (const key of keys) {
+    if (inArray(key, arr)) {
+      const x = (obj[key] as string).split(',');
+      setValue(s, key, x);
+    } else {
+      setValue(s, key, obj[key] as string);
     }
-    return s;
+  }
+  return s;
 }
 export function inArray(s: string, arr?: string[]): boolean {
   if (!arr || arr.length === 0) {
@@ -179,25 +179,37 @@ export function setValue<T>(obj: T, path: string, value: string): void {
   }
 }
 */
-export function setValue<T, V>(obj: T, path: string, value: V): void {
-  const paths = path.split('.');
-  if (paths.length === 1) {
-    (obj as any)[path] = value;
-  } else {
-    let o: any = obj;
-    const l = paths.length - 1;
-    for (let i = 0; i < l - 1; i++) {
-      const p = paths[i];
-      if (p in o) {
-        o = o[p];
-      } else {
-        o[p] = {};
-        o = o[p];
-      }
+export function setValue<T, V>(o: T, key: string, value: V): any {
+  const obj: any = o;
+  let replaceKey = key.replace(/\[/g, '.[').replace(/\.\./g, '.');
+  if (replaceKey.indexOf('.') === 0) {
+    replaceKey = replaceKey.slice(1, replaceKey.length);
+  }
+  const keys = replaceKey.split('.');
+  const firstKey = keys.shift();
+  if (!firstKey) {
+    return;
+  }
+  const isArrayKey = /\[([0-9]+)\]/.test(firstKey);
+  if (keys.length > 0) {
+    const firstKeyValue = obj[firstKey] || {};
+    const returnValue = setValue(firstKeyValue, keys.join('.'), value);
+    return setKey(obj, isArrayKey, firstKey, returnValue);
+  }
+  return setKey(obj, isArrayKey, firstKey, value);
+}
+const setKey = (_object: any, _isArrayKey: boolean, _key: string, _nextValue: any) => {
+  if (_isArrayKey) {
+    if (_object.length > _key) {
+      _object[_key] = _nextValue;
+    } else {
+      _object.push(_nextValue);
     }
-    o[paths[paths.length - 1]] = value;
+  } else {
+    _object[_key] = _nextValue;
   }
-}
+  return _object;
+};
 export interface Limit {
   limit?: number;
   skip?: number;
@@ -370,7 +382,8 @@ export function getParameters<T>(obj: T, config?: SearchConfig): Limit {
     return r;
   }
 }
-export function deletePageInfo(obj: any, arr?: (string | undefined)[]): void {
+// tslint:disable-next-line:array-type
+export function deletePageInfo(obj: any, arr?: Array<string | undefined>): void {
   if (!arr || arr.length === 0) {
     delete obj['limit'];
     delete obj['firstLimit'];