express-ext 0.5.18 → 0.6.1

package/lib/GenericController.js

@@ -30,8 +30,8 @@ var resources_1 = require("./resources")
 var view_1 = require("./view")
 var GenericController = (function (_super) {
   __extends(GenericController, _super)
-  function GenericController(log, service, build, validate, returnNumber) {
-    var _this = _super.call(this, log, service) || this
+  function GenericController(service, build, validate, returnNumber) {
+    var _this = _super.call(this, service) || this
     _this.service = service
     _this.build = build
     _this.validate = validate
@@ -53,22 +53,21 @@ var GenericController = (function (_super) {
     return _this
   }
   GenericController.prototype.create = function (req, res) {
-    validateAndCreate(req, res, this.service.create, this.log, this.validate, this.build)
+    validateAndCreate(req, res, this.service.create, this.validate, this.build)
   }
   GenericController.prototype.update = function (req, res) {
     var id = buildAndCheckIdWithBody(req, res, this.keys, this.service.update)
     if (id) {
-      validateAndUpdate(res, req.body, false, this.service.update, this.log, this.validate, undefined, this.build)
+      validateAndUpdate(res, req.body, false, this.service.update, this.validate, undefined, this.build)
     }
   }
   GenericController.prototype.patch = function (req, res) {
     var id = buildAndCheckIdWithBody(req, res, this.keys, this.service.patch)
     if (id && this.service.patch) {
-      validateAndUpdate(res, req.body, true, this.service.patch, this.log, this.validate, undefined, this.build)
+      validateAndUpdate(res, req.body, true, this.service.patch, this.validate, undefined, this.build)
     }
   }
   GenericController.prototype.delete = function (req, res) {
-    var _this = this
     var id = view_1.buildAndCheckId(req, res, this.keys)
     if (id) {
       if (!this.service.delete) {
@@ -80,7 +79,7 @@ var GenericController = (function (_super) {
             res.status(getDeleteStatus(count)).json(count).end()
           })
           .catch(function (err) {
-            return http_1.handleError(err, res, _this.log)
+            return http_1.handleError(err, res)
           })
       }
     }
@@ -88,7 +87,7 @@ var GenericController = (function (_super) {
   return GenericController
 })(LoadController_1.LoadController)
 exports.GenericController = GenericController
-function validateAndCreate(req, res, save, log, validate, build, returnNumber) {
+function validateAndCreate(req, res, save, validate, build, returnNumber) {
   var obj = req.body
   if (!obj || obj === "") {
     res.status(400).end("The request body cannot be empty.")
@@ -102,19 +101,19 @@ function validateAndCreate(req, res, save, log, validate, build, returnNumber) {
             if (build) {
               build(res, obj, true)
             }
-            edit_1.create(res, obj, save, log, returnNumber)
+            edit_1.create(res, obj, save, returnNumber)
           }
         })
         .catch(function (err) {
-          return http_1.handleError(err, res, log)
+          return http_1.handleError(err, res)
         })
     } else {
-      edit_1.create(res, obj, save, log, returnNumber)
+      edit_1.create(res, obj, save, returnNumber)
     }
   }
 }
 exports.validateAndCreate = validateAndCreate
-function validateAndUpdate(res, obj, isPatch, save, log, validate, resource, build, returnNumber) {
+function validateAndUpdate(res, obj, isPatch, save, validate, resource, build, returnNumber) {
   if (validate) {
     validate(obj, resource, isPatch)
       .then(function (errors) {
@@ -124,14 +123,14 @@ function validateAndUpdate(res, obj, isPatch, save, log, validate, resource, bui
           if (build) {
             build(res, obj, false, isPatch)
           }
-          edit_1.update(res, obj, save, log, returnNumber)
+          edit_1.update(res, obj, save, returnNumber)
         }
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, log)
+        return http_1.handleError(err, res)
       })
   } else {
-    edit_1.update(res, obj, save, log, returnNumber)
+    edit_1.update(res, obj, save, returnNumber)
   }
 }
 exports.validateAndUpdate = validateAndUpdate

package/lib/GenericSearchController.js

@@ -29,8 +29,8 @@ var resources_1 = require("./resources")
 var search_1 = require("./search")
 var GenericSearchController = (function (_super) {
   __extends(GenericSearchController, _super)
-  function GenericSearchController(log, find, service, config, build, validate, dates, numbers) {
-    var _this = _super.call(this, log, service, build, validate) || this
+  function GenericSearchController(find, service, config, build, validate, dates, numbers) {
+    var _this = _super.call(this, service, build, validate) || this
     _this.find = find
     _this.search = _this.search.bind(_this)
     _this.config = search_1.initializeConfig(config)
@@ -55,7 +55,7 @@ var GenericSearchController = (function (_super) {
         return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config)
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
+        return http_1.handleError(err, res)
       })
   }
   return GenericSearchController

package/lib/LoadController.js

@@ -1,91 +1,91 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var http_1 = require("./http");
-var view_1 = require("./view");
+"use strict"
+Object.defineProperty(exports, "__esModule", { value: true })
+var http_1 = require("./http")
+var view_1 = require("./view")
 function getViewFunc(viewService) {
-  if (typeof viewService === 'function') {
-    return viewService;
+  if (typeof viewService === "function") {
+    return viewService
   }
-  return viewService.load;
+  return viewService.load
 }
 function getKeysFunc(viewService, keys) {
   if (keys) {
     if (Array.isArray(keys)) {
       if (keys.length > 0) {
-        if (typeof keys[0] === 'string') {
-          return http_1.attrs(keys);
-        }
-        else {
-          return keys;
+        if (typeof keys[0] === "string") {
+          return http_1.attrs(keys)
+        } else {
+          return keys
         }
       }
-      return undefined;
-    }
-    else {
-      return view_1.buildKeys(keys);
+      return undefined
+    } else {
+      return view_1.buildKeys(keys)
     }
   }
-  if (typeof viewService !== 'function' && viewService.metadata) {
-    var metadata = viewService.metadata();
+  if (typeof viewService !== "function" && viewService.metadata) {
+    var metadata = viewService.metadata()
     if (metadata) {
-      return view_1.buildKeys(metadata);
+      return view_1.buildKeys(metadata)
     }
   }
-  return undefined;
+  return undefined
 }
 var LoadController = (function () {
-  function LoadController(log, viewService, keys) {
-    this.log = log;
-    this.load = this.load.bind(this);
-    this.view = getViewFunc(viewService);
-    this.keys = getKeysFunc(viewService, keys);
+  function LoadController(viewService, keys) {
+    this.load = this.load.bind(this)
+    this.view = getViewFunc(viewService)
+    this.keys = getKeysFunc(viewService, keys)
   }
   LoadController.prototype.load = function (req, res) {
-    var _this = this;
-    var id = view_1.buildAndCheckId(req, res, this.keys);
+    var id = view_1.buildAndCheckId(req, res, this.keys)
     if (id) {
       this.view(id)
-        .then(function (obj) { return http_1.respondModel(http_1.minimize(obj), res); })
-        .catch(function (err) { return http_1.handleError(err, res, _this.log); });
+        .then(function (obj) {
+          return http_1.respondModel(http_1.minimize(obj), res)
+        })
+        .catch(function (err) {
+          return http_1.handleError(err, res)
+        })
     }
-  };
-  return LoadController;
-}());
-exports.LoadController = LoadController;
+  }
+  return LoadController
+})()
+exports.LoadController = LoadController
 var ItemController = (function () {
-  function ItemController(log, loadData, name, param, max, maxName) {
-    this.log = log;
-    this.loadData = loadData;
-    this.param = param;
-    this.name = (name && name.length > 0 ? name : 'keyword');
-    this.max = (max && max > 0 ? max : 20);
-    this.maxName = (maxName && maxName.length > 0 ? maxName : 'max');
-    this.load = this.load.bind(this);
-    this.query = this.query.bind(this);
+  function ItemController(loadData, name, param, max, maxName) {
+    this.loadData = loadData
+    this.param = param
+    this.name = name && name.length > 0 ? name : "keyword"
+    this.max = max && max > 0 ? max : 20
+    this.maxName = maxName && maxName.length > 0 ? maxName : "max"
+    this.load = this.load.bind(this)
+    this.query = this.query.bind(this)
   }
   ItemController.prototype.query = function (req, res) {
-    return this.load(req, res);
-  };
+    return this.load(req, res)
+  }
   ItemController.prototype.load = function (req, res) {
-    var _this = this;
-    var v = this.param ? req.params[this.name] : req.query[this.name];
+    var v = this.param ? req.params[this.name] : req.query[this.name]
     if (!v) {
-      res.status(400).end("'" + this.name + "' cannot be empty");
-    }
-    else {
-      var s = v.toString();
+      res.status(400).end("'" + this.name + "' cannot be empty")
+    } else {
+      var s = v.toString()
       if (s.length === 0) {
-        res.status(400).end("'" + this.name + "' cannot be empty");
-      }
-      else {
-        var max = http_1.queryNumber(req, this.maxName, this.max);
+        res.status(400).end("'" + this.name + "' cannot be empty")
+      } else {
+        var max = http_1.queryNumber(req, this.maxName, this.max)
         this.loadData(s, max)
-          .then(function (result) { return http_1.respondModel(http_1.minimize(result), res); })
-          .catch(function (err) { return http_1.handleError(err, res, _this.log); });
+          .then(function (result) {
+            return http_1.respondModel(http_1.minimize(result), res)
+          })
+          .catch(function (err) {
+            return http_1.handleError(err, res)
+          })
       }
     }
-  };
-  return ItemController;
-}());
-exports.ItemController = ItemController;
-exports.ItemHandler = ItemController;
+  }
+  return ItemController
+})()
+exports.ItemController = ItemController
+exports.ItemHandler = ItemController

package/lib/LoadSearchController.js

@@ -27,8 +27,8 @@ var http_1 = require("./http")
 var LoadController_1 = require("./LoadController")
 var resources_1 = require("./resources")
 var search_1 = require("./search")
-function useSearchController(log, find, viewService, array, dates, numbers, keys, config) {
-  var c = new LoadSearchController(log, find, viewService, keys, config, dates, numbers)
+function useSearchController(find, viewService, array, dates, numbers, keys, config) {
+  var c = new LoadSearchController(find, viewService, keys, config, dates, numbers)
   c.array = array
   return c
 }
@@ -38,8 +38,8 @@ exports.createSearchController = useSearchController
 exports.createSearchHandler = useSearchController
 var LoadSearchController = (function (_super) {
   __extends(LoadSearchController, _super)
-  function LoadSearchController(log, find, viewService, keys, config, dates, numbers) {
-    var _this = _super.call(this, log, viewService, keys) || this
+  function LoadSearchController(find, viewService, keys, config, dates, numbers) {
+    var _this = _super.call(this, viewService, keys) || this
     _this.find = find
     _this.search = _this.search.bind(_this)
     if (config) {
@@ -70,7 +70,7 @@ var LoadSearchController = (function (_super) {
         return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config)
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
+        return http_1.handleError(err, res)
       })
   }
   return LoadSearchController
@@ -78,8 +78,8 @@ var LoadSearchController = (function (_super) {
 exports.LoadSearchController = LoadSearchController
 var QueryController = (function (_super) {
   __extends(QueryController, _super)
-  function QueryController(log, query, config, dates, numbers, array) {
-    var _this = _super.call(this, log, query) || this
+  function QueryController(query, config, dates, numbers, array) {
+    var _this = _super.call(this, query) || this
     _this.query = query
     _this.search = _this.search.bind(_this)
     _this.array = array
@@ -112,7 +112,7 @@ var QueryController = (function (_super) {
         return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config)
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
+        return http_1.handleError(err, res)
       })
   }
   return QueryController

package/lib/LowCodeController.js

@@ -29,8 +29,8 @@ var resources_1 = require("./resources")
 var search_1 = require("./search")
 var LowcodeController = (function (_super) {
   __extends(LowcodeController, _super)
-  function LowcodeController(log, lowCodeService, config, build, validate, dates, numbers) {
-    var _this = _super.call(this, log, lowCodeService, build, validate) || this
+  function LowcodeController(lowCodeService, config, build, validate, dates, numbers) {
+    var _this = _super.call(this, lowCodeService, build, validate) || this
     _this.lowCodeService = lowCodeService
     _this.search = _this.search.bind(_this)
     _this.config = search_1.initializeConfig(config)
@@ -56,7 +56,7 @@ var LowcodeController = (function (_super) {
         return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config)
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
+        return http_1.handleError(err, res)
       })
   }
   return LowcodeController
@@ -66,7 +66,7 @@ exports.LowcodeHandler = LowcodeController
 var Controller = (function (_super) {
   __extends(Controller, _super)
   function Controller(log, lowCodeService, build, validate, config, dates, numbers) {
-    var _this = _super.call(this, log, lowCodeService, build, validate) || this
+    var _this = _super.call(this, lowCodeService, build, validate) || this
     _this.lowCodeService = lowCodeService
     _this.search = _this.search.bind(_this)
     _this.config = search_1.initializeConfig(config)
@@ -92,7 +92,7 @@ var Controller = (function (_super) {
         return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config)
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
+        return http_1.handleError(err, res)
       })
   }
   return Controller

package/lib/SearchController.js

@@ -32,7 +32,7 @@ var SearchController = (function () {
         return search_1.jsonResult(res, result, _this.csv, l.fields, _this.config)
       })
       .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
+        return http_1.handleError(err, res)
       })
   }
   return SearchController

package/lib/client.js

@@ -1,90 +1,80 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var http_1 = require("./http");
-function checkId(obj, id, keys) {
-  var n = (keys && keys.length === 1 && keys[0].name ? keys[0].name : 'id');
-  var o = obj;
-  var i = id;
-  if (!keys || keys.length === 1) {
-    var v = o[n];
-    if (!v) {
-      o[n] = i;
-      return true;
-    }
-    if (v != i) {
-      return false;
-    }
-    return true;
-  }
-  var ks = Object.keys(i);
-  for (var _i = 0, ks_1 = ks; _i < ks_1.length; _i++) {
-    var k = ks_1[_i];
-    var v = o[k];
-    if (!v) {
-      o[k] = i[k];
-    }
-    else {
-      if (v != i[k]) {
-        return false;
-      }
-    }
-    o[k] = i[k];
-  }
-  return true;
+"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)
+  })
 }
-exports.checkId = checkId;
-function create(res, obj, insert, log, returnNumber) {
-  insert(obj).then(function (result) {
-    if (typeof result === 'number') {
-      if (result >= 1) {
-        res.status(201).json(returnNumber ? result : obj).end();
-      }
-      else {
-        res.status(409).json(result).end();
-      }
-    }
-    else if (Array.isArray(result)) {
-      res.status(422).json(result).end();
-    }
-    else {
-      res.status(201).json(result).end();
-    }
-  }).catch(function (err) { return http_1.handleError(err, res, log); });
+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)
+  })
 }
-exports.create = create;
-function update(res, obj, save, log, returnNumber) {
-  save(obj).then(function (result) {
-    if (typeof result === 'number') {
-      if (result >= 1) {
-        res.status(200).json(returnNumber ? result : obj).end();
-      }
-      else if (result === 0) {
-        res.status(404).json(result).end();
-      }
-      else {
-        res.status(409).json(result).end();
-      }
-    }
-    else if (Array.isArray(result)) {
-      res.status(422).json(result).end();
-    }
-    else {
-      res.status(200).json(result).end();
+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)
+      })
     }
-  }).catch(function (err) { return http_1.handleError(err, res, log); });
-}
-exports.update = update;
-function isTypeError(errs) {
-  if (!errs) {
-    return false;
   }
-  for (var _i = 0, errs_1 = errs; _i < errs_1.length; _i++) {
-    var err = errs_1[_i];
-    var c = err.code;
-    if (c === 'string' || c === 'number' || c === 'date' || c === 'boolean') {
-      return true;
+  ClientChecker.prototype.name = function () {
+    return this.service
+  }
+  ClientChecker.prototype.build = function (data, err) {
+    if (err) {
+      if (!data) {
+        data = {}
+      }
+      data["error"] = err
     }
+    return data
   }
-  return false;
-}
-exports.isTypeError = isTypeError;
+  return ClientChecker
+})()
+exports.ClientChecker = ClientChecker

package/lib/edit.js

@@ -32,7 +32,7 @@ function checkId(obj, id, keys) {
   return true
 }
 exports.checkId = checkId
-function create(res, obj, insert, log, returnNumber) {
+function create(res, obj, insert, returnNumber) {
   insert(obj)
     .then(function (result) {
       if (typeof result === "number") {
@@ -54,11 +54,11 @@ function create(res, obj, insert, log, returnNumber) {
       }
     })
     .catch(function (err) {
-      return http_1.handleError(err, res, log)
+      return http_1.handleError(err, res)
     })
 }
 exports.create = create
-function update(res, obj, save, log, returnNumber) {
+function update(res, obj, save, returnNumber) {
   save(obj)
     .then(function (result) {
       if (typeof result === "number") {
@@ -82,7 +82,7 @@ function update(res, obj, save, log, returnNumber) {
       }
     })
     .catch(function (err) {
-      return http_1.handleError(err, res, log)
+      return http_1.handleError(err, res)
     })
 }
 exports.update = update