express-ext 0.5.2 → 0.5.4

package/lib/HealthController.js

@@ -1,21 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var health_1 = require("./health");
+"use strict"
+Object.defineProperty(exports, "__esModule", { value: true })
+var health_1 = require("./health")
 var HealthController = (function () {
   function HealthController(checkers) {
-    this.checkers = checkers;
-    this.check = this.check.bind(this);
+    this.checkers = checkers
+    this.check = this.check.bind(this)
   }
   HealthController.prototype.check = function (req, res) {
     health_1.health(this.checkers).then(function (r) {
-      if (r.status === 'UP') {
-        return res.status(200).json(r).end();
+      if (r.status === "UP") {
+        res.status(200).json(r).end()
+      } else {
+        res.status(500).json(r).end()
       }
-      else {
-        return res.status(500).json(r).end();
-      }
-    });
-  };
-  return HealthController;
-}());
-exports.HealthController = HealthController;
+    })
+  }
+  return HealthController
+})()
+exports.HealthController = HealthController

package/lib/LogController.js

@@ -1,5 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict"
+Object.defineProperty(exports, "__esModule", { value: true })
 exports.map = {
   TRACE: -2,
   DEBUG: -1,
@@ -7,84 +7,83 @@ exports.map = {
   WARN: 1,
   ERROR: 2,
   PANIC: 3,
-  FATAL: 4
-};
+  FATAL: 4,
+}
 var LogController = (function () {
   function LogController(logger, updateL, mp) {
-    this.logger = logger;
-    this.map = (mp ? mp : exports.map);
-    this.update = updateL ? updateL : updateLog;
-    this.config = this.config.bind(this);
+    this.logger = logger
+    this.map = mp ? mp : exports.map
+    this.update = updateL ? updateL : updateLog
+    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');
-    }
+    var obj = req.body
     if (!this.logger) {
-      return res.status(503).end('Logger is not available');
+      res.status(503).end("Logger is not available")
+      return
     }
-    if (typeof obj.level === 'string' && obj.level.length > 0) {
+    if (typeof obj.level === "string" && obj.level.length > 0) {
       if (!this.map) {
-        return res.status(503).end('Map is not available');
+        res.status(503).end("Map is not available")
+        return
       }
     }
-    var changed = this.update(this.logger, obj, this.map);
+    var changed = this.update(this.logger, obj, this.map)
     if (changed) {
-      return res.status(200).json(true).end();
-    }
-    else {
-      return res.status(204).json(false).end();
+      res.status(200).json(true).end()
+    } else {
+      res.status(204).json(false).end()
     }
-  };
-  return LogController;
-}());
-exports.LogController = LogController;
+  }
+  return LogController
+})()
+exports.LogController = LogController
 function updateLog(logger, obj, mp) {
-  var changed = false;
-  if (typeof obj.level === 'string' && obj.level.length > 0) {
-    var lv = mp[obj.level.toUpperCase()];
+  var changed = false
+  if (typeof obj.level === "string" && obj.level.length > 0) {
+    var lv = mp[obj.level.toUpperCase()]
     if (lv !== undefined) {
-      logger.level = lv;
-      changed = true;
+      logger.level = lv
+      changed = true
     }
   }
   if (obj.map) {
-    if (typeof obj.map.level === 'string' && obj.map.level.length > 0) {
-      logger.map.level = obj.map.level;
-      changed = true;
+    if (typeof obj.map.level === "string" && obj.map.level.length > 0) {
+      logger.map.level = obj.map.level
+      changed = true
     }
-    if (typeof obj.map.time === 'string' && obj.map.time.length > 0) {
-      logger.map.time = obj.map.time;
-      changed = true;
+    if (typeof obj.map.time === "string" && obj.map.time.length > 0) {
+      logger.map.time = obj.map.time
+      changed = true
     }
-    if (typeof obj.map.msg === 'string' && obj.map.msg.length > 0) {
-      logger.map.msg = obj.map.msg;
-      changed = true;
+    if (typeof obj.map.msg === "string" && obj.map.msg.length > 0) {
+      logger.map.msg = obj.map.msg
+      changed = true
     }
   }
-  if (obj.constants !== undefined && typeof obj.constants === 'object') {
-    var ks = Object.keys(obj.constants);
+  if (obj.constants !== undefined && typeof obj.constants === "object") {
+    var ks = Object.keys(obj.constants)
     if (ks.length > 0) {
-      logger.constants = obj.constants;
-    }
-    else {
-      logger.constants = undefined;
+      logger.constants = obj.constants
+    } else {
+      logger.constants = undefined
     }
-    changed = true;
+    changed = true
   }
   if (obj.name) {
-    if (typeof obj.name.trace === 'string'
-      && typeof obj.name.debug === 'string'
-      && typeof obj.name.info === 'string'
-      && typeof obj.name.warn === 'string'
-      && typeof obj.name.error === 'string'
-      && typeof obj.name.panic === 'string'
-      && typeof obj.name.fatal === 'string') {
-      logger.name = obj.name;
-      changed = true;
+    if (
+      typeof obj.name.trace === "string" &&
+      typeof obj.name.debug === "string" &&
+      typeof obj.name.info === "string" &&
+      typeof obj.name.warn === "string" &&
+      typeof obj.name.error === "string" &&
+      typeof obj.name.panic === "string" &&
+      typeof obj.name.fatal === "string"
+    ) {
+      logger.name = obj.name
+      changed = true
     }
   }
-  return changed;
+  return changed
 }
-exports.updateLog = updateLog;
+exports.updateLog = updateLog

package/lib/index.js

@@ -53,10 +53,12 @@ var SavedController = (function () {
     var userId = res.locals[this.userId]
     var id = req.params[this.id]
     if (!id || id.length === 0) {
-      return res.status(400).end("'" + this.id + "' cannot be empty")
+      res.status(400).end("'" + this.id + "' cannot be empty")
+      return
     }
     if (!userId || userId.length === 0) {
-      return res.status(400).end("'" + this.userId + "' cannot be empty")
+      res.status(400).end("'" + this.userId + "' cannot be empty")
+      return
     }
     this.savedService
       .save(userId, id)
@@ -73,10 +75,12 @@ var SavedController = (function () {
     var userId = res.locals[this.userId]
     var id = req.params[this.id]
     if (!id || id.length === 0) {
-      return res.status(400).end("'" + this.id + "' cannot be empty")
+      res.status(400).end("'" + this.id + "' cannot be empty")
+      return
     }
     if (!userId || userId.length === 0) {
-      return res.status(400).end("'" + this.userId + "' cannot be empty")
+      res.status(400).end("'" + this.userId + "' cannot be empty")
+      return
     }
     this.savedService
       .remove(userId, id)
@@ -105,10 +109,12 @@ var FollowController = (function () {
     var userId = res.locals[this.userId]
     var id = req.params[this.id]
     if (!id || id.length === 0) {
-      return res.status(400).end("'" + this.id + "' cannot be empty")
+      res.status(400).end("'" + this.id + "' cannot be empty")
+      return
     }
     if (!userId || userId.length === 0) {
-      return res.status(400).end("'" + this.userId + "' cannot be empty")
+      res.status(400).end("'" + this.userId + "' cannot be empty")
+      return
     }
     this.service
       .follow(userId, id)
@@ -125,10 +131,12 @@ var FollowController = (function () {
     var userId = res.locals[this.userId]
     var id = req.params[this.id]
     if (!id || id.length === 0) {
-      return res.status(400).end("'" + this.id + "' cannot be empty")
+      res.status(400).end("'" + this.id + "' cannot be empty")
+      return
     }
     if (!userId || userId.length === 0) {
-      return res.status(400).end("'" + this.userId + "' cannot be empty")
+      res.status(400).end("'" + this.userId + "' cannot be empty")
+      return
     }
     this.service
       .unfollow(userId, id)
@@ -174,7 +182,7 @@ var UserReactionController = (function () {
     this.service
       .react(id, author, reaction)
       .then(function (count) {
-        return res.status(200).json(count).end()
+        res.status(200).json(count).end()
       })
       .catch(function (err) {
         return http_1.handleError(err, res, _this.log)
@@ -200,7 +208,7 @@ var UserReactionController = (function () {
     this.service
       .unreact(id, author, reaction)
       .then(function (count) {
-        return res.status(200).json(count).end()
+        res.status(200).json(count).end()
       })
       .catch(function (err) {
         return http_1.handleError(err, res, _this.log)
@@ -221,7 +229,7 @@ var UserReactionController = (function () {
     this.service
       .checkReaction(id, author)
       .then(function (count) {
-        return res.status(200).json(count).end()
+        res.status(200).json(count).end()
       })
       .catch(function (err) {
         return http_1.handleError(err, res, _this.log)

package/lib/log.js

@@ -1,247 +1,242 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var stream_1 = require("stream");
-var resources_1 = require("./resources");
+"use strict"
+Object.defineProperty(exports, "__esModule", { value: true })
+var stream_1 = require("stream")
+var resources_1 = require("./resources")
 function createConfig(c) {
   if (!c) {
-    return { skips: [], duration: 'duration', request: '', response: '', status: '', size: '' };
+    return { skips: [], duration: "duration", request: "", response: "", status: "", size: "" }
   }
   var l = {
     log: c.log,
     separate: c.separate,
-    skips: c.skips ? c.skips.split(',') : [],
-    duration: c.duration ? c.duration : 'duration',
-    request: c.request ? c.request : '',
-    response: c.response ? c.response : '',
-    status: c.status ? c.status : '',
-    size: c.size ? c.size : ''
-  };
-  return l;
+    skips: c.skips ? c.skips.split(",") : [],
+    duration: c.duration ? c.duration : "duration",
+    request: c.request ? c.request : "",
+    response: c.response ? c.response : "",
+    status: c.status ? c.status : "",
+    size: c.size ? c.size : "",
+  }
+  return l
 }
-exports.createConfig = createConfig;
+exports.createConfig = createConfig
 function skip(skips, url) {
   if (skips.length === 0) {
-    return false;
+    return false
   }
-  var u = removeUrlParams(url);
+  var u = removeUrlParams(url)
   for (var _i = 0, skips_1 = skips; _i < skips_1.length; _i++) {
-    var s = skips_1[_i];
+    var s = skips_1[_i]
     if (u.endsWith(s)) {
-      return true;
+      return true
     }
   }
-  return false;
+  return false
 }
-exports.skip = skip;
+exports.skip = skip
 function removeUrlParams(url) {
-  var startParams = url.indexOf('?');
-  return startParams !== -1 ? url.substring(0, startParams) : url;
+  var startParams = url.indexOf("?")
+  return startParams !== -1 ? url.substring(0, startParams) : url
 }
-exports.removeUrlParams = removeUrlParams;
-var o = 'OPTIONS';
+exports.removeUrlParams = removeUrlParams
+var o = "OPTIONS"
 var MiddlewareLogger = (function () {
   function MiddlewareLogger(write, conf, build) {
-    this.write = write;
-    this.build = build;
-    this.log = this.log.bind(this);
-    this.conf = createConfig(conf);
+    this.write = write
+    this.build = build
+    this.log = this.log.bind(this)
+    this.conf = createConfig(conf)
   }
   MiddlewareLogger.prototype.log = function (req, res, next) {
-    var _this = this;
-    var m = req.method;
+    var _this = this
+    var m = req.method
     if (m !== o && this.conf.log && !skip(this.conf.skips, req.originalUrl)) {
-      var start_1 = process.hrtime();
-      var x_1 = this.conf.request;
-      var r_1 = false;
-      if (m !== 'GET' && m !== 'DELETE') {
-        r_1 = true;
+      var start_1 = process.hrtime()
+      var x_1 = this.conf.request
+      var r_1 = false
+      if (m !== "GET" && m !== "DELETE") {
+        r_1 = true
       }
-      var msg_1 = m + " " + req.originalUrl;
+      var msg_1 = m + " " + req.originalUrl
       if (this.conf.separate && r_1) {
         if (this.conf.request.length > 0) {
-          var op = {};
-          op[x_1] = JSON.stringify(req.body);
+          var op = {}
+          op[x_1] = JSON.stringify(req.body)
           if (this.build) {
-            var op2 = this.build(req, op);
-            this.write(msg_1, op2);
-          }
-          else {
-            this.write(msg_1, op);
+            var op2 = this.build(req, op)
+            this.write(msg_1, op2)
+          } else {
+            this.write(msg_1, op)
           }
         }
       }
-      var chunks_1 = [];
-      mapResponseBody(res, chunks_1);
-      res.on('finish', function () {
-        var duration = getDurationInMilliseconds(start_1);
-        var op = {};
+      var chunks_1 = []
+      mapResponseBody(res, chunks_1)
+      res.on("finish", function () {
+        var duration = getDurationInMilliseconds(start_1)
+        var op = {}
         if (r_1 && !_this.conf.separate && _this.conf.request.length > 0) {
-          op[x_1] = JSON.stringify(req.body);
+          op[x_1] = JSON.stringify(req.body)
         }
         if (_this.conf.response.length > 0) {
-          var rsBody = Buffer.concat(chunks_1).toString(resources_1.resources.encoding);
-          op[_this.conf.response] = rsBody;
+          var rsBody = Buffer.concat(chunks_1).toString(resources_1.resources.encoding)
+          op[_this.conf.response] = rsBody
         }
         if (_this.conf.status.length > 0) {
-          op[_this.conf.status] = res.statusCode;
+          op[_this.conf.status] = res.statusCode
         }
         if (_this.conf.size.length > 0) {
-          if ('_contentLength' in res) {
-            op[_this.conf.size] = res['_contentLength'];
-          }
-          else if (res.hasHeader('content-length')) {
-            var l = res.getHeader('content-length');
-            if (typeof l === 'number' || typeof l === 'string') {
-              op[_this.conf.size] = l;
+          if ("_contentLength" in res) {
+            op[_this.conf.size] = res["_contentLength"]
+          } else if (res.hasHeader("content-length")) {
+            var l = res.getHeader("content-length")
+            if (typeof l === "number" || typeof l === "string") {
+              op[_this.conf.size] = l
             }
           }
         }
-        op[_this.conf.duration] = duration;
+        op[_this.conf.duration] = duration
         if (_this.build) {
-          var op2 = _this.build(req, op);
-          _this.write(msg_1, op2);
-        }
-        else {
-          _this.write(msg_1, op);
+          var op2 = _this.build(req, op)
+          _this.write(msg_1, op2)
+        } else {
+          _this.write(msg_1, op)
         }
-      });
-      next();
+      })
+      next()
+    } else {
+      next()
     }
-    else {
-      next();
-    }
-  };
-  return MiddlewareLogger;
-}());
-exports.MiddlewareLogger = MiddlewareLogger;
+  }
+  return MiddlewareLogger
+})()
+exports.MiddlewareLogger = MiddlewareLogger
 var mapResponseBody = function (res, chunks) {
-  var defaultWrite = res.write.bind(res);
-  var defaultEnd = res.end.bind(res);
-  var ps = new stream_1.PassThrough();
-  ps.on('data', function (data) { return chunks.push(data); });
+  var defaultWrite = res.write.bind(res)
+  var defaultEnd = res.end.bind(res)
+  var ps = new stream_1.PassThrough()
+  ps.on("data", function (data) {
+    return chunks.push(data)
+  })
   res.write = function () {
-    var _a;
-    var args = [];
+    var _a
+    var args = []
     for (var _i = 0; _i < arguments.length; _i++) {
-      args[_i] = arguments[_i];
+      args[_i] = arguments[_i]
     }
-    (_a = ps).write.apply(_a, args);
-    defaultWrite.apply(void 0, args);
-  };
+    ;(_a = ps).write.apply(_a, args)
+    defaultWrite.apply(void 0, args)
+  }
   res.end = function () {
-    var args = [];
+    var args = []
     for (var _i = 0; _i < arguments.length; _i++) {
-      args[_i] = arguments[_i];
+      args[_i] = arguments[_i]
     }
-    ps.end.apply(ps, args);
-    defaultEnd.apply(void 0, args);
-  };
-};
-var NS_PER_SEC = 1e9;
-var NS_TO_MS = 1e6;
+    ps.end.apply(ps, args)
+    defaultEnd.apply(void 0, args)
+  }
+}
+var NS_PER_SEC = 1e9
+var NS_TO_MS = 1e6
 var getDurationInMilliseconds = function (start) {
-  var diff = process.hrtime(start);
-  return (diff[0] * NS_PER_SEC + diff[1]) / NS_TO_MS;
-};
+  var diff = process.hrtime(start)
+  return (diff[0] * NS_PER_SEC + diff[1]) / NS_TO_MS
+}
 var MiddlewareController = (function () {
   function MiddlewareController(logger) {
-    this.logger = logger;
-    this.config = this.config.bind(this);
+    this.logger = logger
+    this.config = this.config.bind(this)
   }
   MiddlewareController.prototype.config = function (req, res) {
-    var obj = req.body;
-    if (!obj || obj === '') {
-      return res.status(400).end('The request body cannot be empty');
-    }
+    var obj = req.body
     if (!this.logger) {
-      return res.status(503).end('Logger is not available');
+      res.status(503).end("Logger is not available")
+      return
     }
-    var changed = false;
+    var changed = false
     if (obj.log !== undefined) {
-      this.logger.conf.log = obj.log;
-      changed = true;
+      this.logger.conf.log = obj.log
+      changed = true
     }
     if (obj.separate !== undefined) {
-      this.logger.conf.separate = obj.separate;
-      changed = true;
+      this.logger.conf.separate = obj.separate
+      changed = true
     }
     if (Array.isArray(obj.skips)) {
       if (isValidSkips(obj.skips)) {
-        this.logger.conf.skips = obj.skips;
-        changed = true;
+        this.logger.conf.skips = obj.skips
+        changed = true
       }
     }
-    if (typeof obj.duration === 'string' && obj.duration.length > 0) {
-      this.logger.conf.duration = obj.duration;
-      changed = true;
+    if (typeof obj.duration === "string" && obj.duration.length > 0) {
+      this.logger.conf.duration = obj.duration
+      changed = true
     }
-    if (typeof obj.request === 'string') {
-      this.logger.conf.request = obj.request;
-      changed = true;
+    if (typeof obj.request === "string") {
+      this.logger.conf.request = obj.request
+      changed = true
     }
-    if (typeof obj.response === 'string') {
-      this.logger.conf.response = obj.response;
-      changed = true;
+    if (typeof obj.response === "string") {
+      this.logger.conf.response = obj.response
+      changed = true
     }
-    if (typeof obj.status === 'string') {
-      this.logger.conf.status = obj.status;
-      changed = true;
+    if (typeof obj.status === "string") {
+      this.logger.conf.status = obj.status
+      changed = true
     }
-    if (typeof obj.size === 'string') {
-      this.logger.conf.size = obj.size;
-      changed = true;
+    if (typeof obj.size === "string") {
+      this.logger.conf.size = obj.size
+      changed = true
     }
     if (changed) {
-      return res.status(200).json(true).end();
-    }
-    else {
-      return res.status(204).json(false).end();
+      res.status(200).json(true).end()
+    } else {
+      res.status(204).json(false).end()
     }
-  };
-  return MiddlewareController;
-}());
-exports.MiddlewareController = MiddlewareController;
+  }
+  return MiddlewareController
+})()
+exports.MiddlewareController = MiddlewareController
 function isValidSkips(s) {
   for (var _i = 0, s_1 = s; _i < s_1.length; _i++) {
-    var x = s_1[_i];
-    if (!(typeof x === 'string')) {
-      return false;
+    var x = s_1[_i]
+    if (!(typeof x === "string")) {
+      return false
     }
   }
-  return true;
+  return true
 }
-exports.isValidSkips = isValidSkips;
+exports.isValidSkips = isValidSkips
 function mask(s, start, end, replace) {
   if (start < 0) {
-    start = 0;
+    start = 0
   }
   if (end < 0) {
-    end = 0;
+    end = 0
   }
-  var t = start + end;
+  var t = start + end
   if (t >= s.length) {
-    return replace.repeat(s.length);
+    return replace.repeat(s.length)
   }
-  return s.substr(0, start) + replace.repeat(s.length - t) + s.substr(s.length - end);
+  return s.substr(0, start) + replace.repeat(s.length - t) + s.substr(s.length - end)
 }
-exports.mask = mask;
+exports.mask = mask
 function margin(s, start, end, replace) {
   if (start >= end) {
-    return '';
+    return ""
   }
   if (start < 0) {
-    start = 0;
+    start = 0
   }
   if (end < 0) {
-    end = 0;
+    end = 0
   }
   if (start >= s.length) {
-    return replace.repeat(s.length);
+    return replace.repeat(s.length)
   }
   if (end >= s.length) {
-    return replace.repeat(start) + s.substr(start);
+    return replace.repeat(start) + s.substr(start)
   }
-  return replace.repeat(start) + s.substr(start, end - start) + replace.repeat(s.length - end);
+  return replace.repeat(start) + s.substr(start, end - start) + replace.repeat(s.length - end)
 }
-exports.margin = margin;
-exports.maskMargin = margin;
+exports.margin = margin
+exports.maskMargin = margin

package/lib/search.js

@@ -3,6 +3,114 @@ Object.defineProperty(exports, "__esModule", { value: true })
 var http_1 = require("./http")
 var resources_1 = require("./resources")
 var et = ""
+function getPage(req, filter) {
+  if (filter) {
+    var v0 = filter[resources_1.resources.page]
+    if (v0 == undefined) {
+      var field_1 = req.query[resources_1.resources.page]
+      var v_1 = field_1 ? field_1.toString() : undefined
+      if (!v_1 || v_1.length === 0) {
+        filter[resources_1.resources.page] = 1
+        return 1
+      }
+      if (isNaN(v_1)) {
+        filter[resources_1.resources.page] = 1
+        return 1
+      } else {
+        var n_1 = parseFloat(v_1)
+        if (n_1 < 1) {
+          n_1 = 1
+        }
+        filter[resources_1.resources.page] = n_1
+        return n_1
+      }
+    } else if (typeof v0 === "number") {
+      if (v0 > 0) {
+        return v0
+      } else {
+        filter[resources_1.resources.page] = 1
+        return 1
+      }
+    }
+  }
+  var field = req.query[resources_1.resources.page]
+  var v = field ? field.toString() : undefined
+  if (!v || v.length === 0) {
+    if (filter) {
+      filter[resources_1.resources.page] = 1
+    }
+    return 1
+  }
+  if (isNaN(v)) {
+    if (filter) {
+      filter[resources_1.resources.page] = 1
+    }
+    return 1
+  }
+  var n = parseFloat(v)
+  if (n < 1) {
+    n = 1
+  }
+  if (filter) {
+    filter[resources_1.resources.page] = n
+  }
+  return n
+}
+exports.getPage = getPage
+function getLimit(req, filter) {
+  if (filter) {
+    var v0 = filter[resources_1.resources.limit]
+    if (v0 == undefined) {
+      var field = req.query[resources_1.resources.limit]
+      var v_2 = field ? field.toString() : undefined
+      if (!v_2 || v_2.length === 0) {
+        filter[resources_1.resources.limit] = resources_1.resources.defaultLimit
+        return resources_1.resources.defaultLimit
+      }
+      if (isNaN(v_2)) {
+        filter[resources_1.resources.limit] = resources_1.resources.defaultLimit
+        return 1
+      } else {
+        var n_2 = parseFloat(v_2)
+        if (n_2 < 1) {
+          n_2 = resources_1.resources.defaultLimit
+        }
+        filter[resources_1.resources.limit] = n_2
+        return n_2
+      }
+    } else if (typeof v0 === "number") {
+      if (v0 > 0) {
+        return v0
+      } else {
+        filter[resources_1.resources.limit] = resources_1.resources.defaultLimit
+        return resources_1.resources.defaultLimit
+      }
+    }
+  }
+  var fieldxxx = req.query[resources_1.resources.limit]
+  var v = fieldxxx ? fieldxxx.toString() : undefined
+  if (!v || v.length === 0) {
+    if (filter) {
+      filter[resources_1.resources.limit] = resources_1.resources.defaultLimit
+    }
+    return resources_1.resources.defaultLimit
+  }
+  if (isNaN(v)) {
+    if (filter) {
+      filter[resources_1.resources.limit] = resources_1.resources.defaultLimit
+    }
+    return resources_1.resources.defaultLimit
+  }
+  var n = parseFloat(v)
+  if (n < 1) {
+    n = resources_1.resources.defaultLimit
+  }
+  if (filter) {
+    filter[resources_1.resources.limit] = n
+  }
+  return n
+}
+exports.getLimit = getLimit
 function queryLimit(req) {
   return http_1.queryNumber(req, resources_1.resources.limit, resources_1.resources.defaultLimit)
 }

package/package.json

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

package/src/HealthController.ts

@@ -8,9 +8,9 @@ export class HealthController {
   check(req: Request, res: Response) {
     health(this.checkers).then((r) => {
       if (r.status === "UP") {
-        return res.status(200).json(r).end()
+        res.status(200).json(r).end()
       } else {
-        return res.status(500).json(r).end()
+        res.status(500).json(r).end()
       }
     })
   }

package/src/LogController.ts

@@ -69,22 +69,21 @@ export class LogController {
   }
   config(req: Request, res: Response) {
     const obj: LogConfig = req.body
-    if (!obj || (obj as any) === "") {
-      return res.status(400).end("The request body cannot be empty")
-    }
     if (!this.logger) {
-      return res.status(503).end("Logger is not available")
+      res.status(503).end("Logger is not available")
+      return
     }
     if (typeof obj.level === "string" && obj.level.length > 0) {
       if (!this.map) {
-        return res.status(503).end("Map is not available")
+        res.status(503).end("Map is not available")
+        return
       }
     }
     const changed = this.update(this.logger, obj, this.map)
     if (changed) {
-      return res.status(200).json(true).end()
+      res.status(200).json(true).end()
     } else {
-      return res.status(204).json(false).end()
+      res.status(204).json(false).end()
     }
   }
 }

package/src/access.ts

@@ -1,6 +1,4 @@
-import { NextFunction } from "express"
-import { ParamsDictionary, Request, Response } from "express-serve-static-core"
-import { ParsedQs } from "qs"
+import { NextFunction, Request, Response } from "express"
 
 export interface AccessConfig {
   origin?: string | string[]
@@ -11,10 +9,10 @@ export interface AccessConfig {
 export type AccessControlAllowConfig = AccessConfig
 export function allow(
   access: AccessConfig,
-): (req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>, number>, next: NextFunction) => void {
+): (req: Request, res: Response, next: NextFunction) => void {
   const ao = access.origin
   if (typeof ao === "string") {
-    return (req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>, number>, next: NextFunction) => {
+    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)
@@ -22,7 +20,7 @@ export function allow(
       next()
     }
   } else if (Array.isArray(ao) && ao.length > 0) {
-    return (req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>, number>, next: NextFunction) => {
+    return (req: Request, res: Response, next: NextFunction) => {
       const origin = req.headers.origin
       if (origin) {
         if (ao.includes(origin)) {
@@ -35,7 +33,7 @@ export function allow(
       next()
     }
   }
-  return (req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>, number>, next: NextFunction) => {
+  return (req: Request, res: Response, next: NextFunction) => {
     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/index.ts

@@ -20,7 +20,7 @@ export {
   Controller as Handler,
   LoadSearchController as LoadSearchHandler,
   Service as LowCodeService,
-  SearchController as SearchHandler,
+  SearchController as SearchHandler
 }
 
 export * from "./access"
@@ -59,10 +59,12 @@ export class SavedController {
     const userId: string = res.locals[this.userId]
     const id = req.params[this.id]
     if (!id || id.length === 0) {
-      return res.status(400).end(`'${this.id}' cannot be empty`)
+      res.status(400).end(`'${this.id}' cannot be empty`)
+      return
     }
     if (!userId || userId.length === 0) {
-      return res.status(400).end(`'${this.userId}' cannot be empty`)
+      res.status(400).end(`'${this.userId}' cannot be empty`)
+      return
     }
     this.savedService
       .save(userId, id)
@@ -76,10 +78,12 @@ export class SavedController {
     const userId: string = res.locals[this.userId]
     const id = req.params[this.id]
     if (!id || id.length === 0) {
-      return res.status(400).end(`'${this.id}' cannot be empty`)
+      res.status(400).end(`'${this.id}' cannot be empty`)
+      return
     }
     if (!userId || userId.length === 0) {
-      return res.status(400).end(`'${this.userId}' cannot be empty`)
+      res.status(400).end(`'${this.userId}' cannot be empty`)
+      return
     }
     this.savedService
       .remove(userId, id)
@@ -108,10 +112,12 @@ export class FollowController {
     const userId: string = res.locals[this.userId]
     const id = req.params[this.id]
     if (!id || id.length === 0) {
-      return res.status(400).end(`'${this.id}' cannot be empty`)
+      res.status(400).end(`'${this.id}' cannot be empty`)
+      return
     }
     if (!userId || userId.length === 0) {
-      return res.status(400).end(`'${this.userId}' cannot be empty`)
+      res.status(400).end(`'${this.userId}' cannot be empty`)
+      return
     }
     this.service
       .follow(userId, id)
@@ -125,10 +131,12 @@ export class FollowController {
     const userId: string = res.locals[this.userId]
     const id = req.params[this.id]
     if (!id || id.length === 0) {
-      return res.status(400).end(`'${this.id}' cannot be empty`)
+      res.status(400).end(`'${this.id}' cannot be empty`)
+      return
     }
     if (!userId || userId.length === 0) {
-      return res.status(400).end(`'${this.userId}' cannot be empty`)
+      res.status(400).end(`'${this.userId}' cannot be empty`)
+      return
     }
     this.service
       .unfollow(userId, id)
@@ -172,7 +180,7 @@ export class UserReactionController {
     this.service
       .react(id, author, reaction)
       .then((count) => {
-        return res.status(200).json(count).end()
+        res.status(200).json(count).end()
       })
       .catch((err) => handleError(err, res, this.log))
   }
@@ -195,7 +203,7 @@ export class UserReactionController {
     this.service
       .unreact(id, author, reaction)
       .then((count) => {
-        return res.status(200).json(count).end()
+        res.status(200).json(count).end()
       })
       .catch((err) => handleError(err, res, this.log))
   }
@@ -213,7 +221,7 @@ export class UserReactionController {
     this.service
       .checkReaction(id, author)
       .then((count) => {
-        return res.status(200).json(count).end()
+        res.status(200).json(count).end()
       })
       .catch((err) => handleError(err, res, this.log))
   }

package/src/log.ts

@@ -165,11 +165,9 @@ export class MiddlewareController {
   }
   config(req: Request, res: Response) {
     const obj: MiddleLog = req.body
-    if (!obj || (obj as any) === "") {
-      return res.status(400).end("The request body cannot be empty")
-    }
     if (!this.logger) {
-      return res.status(503).end("Logger is not available")
+      res.status(503).end("Logger is not available")
+      return
     }
     let changed = false
     if (obj.log !== undefined) {
@@ -207,9 +205,9 @@ export class MiddlewareController {
       changed = true
     }
     if (changed) {
-      return res.status(200).json(true).end()
+      res.status(200).json(true).end()
     } else {
-      return res.status(204).json(false).end()
+      res.status(204).json(false).end()
     }
   }
 }

package/src/search.ts

@@ -36,6 +36,113 @@ export interface SearchResult<T> {
   last?: boolean
 }
 
+export function getPage<F extends Filter>(req: Request, filter?: F): number {
+  if (filter) {
+    const v0 = (filter as any)[resources.page]
+    if (v0 == undefined) {
+      const field = req.query[resources.page]
+      const v = field ? field.toString() : undefined
+      if (!v || v.length === 0) {
+        ;(filter as any)[resources.page] = 1
+        return 1
+      }
+      if (isNaN(v as any)) {
+        ;(filter as any)[resources.page] = 1
+        return 1
+      } else {
+        let n = parseFloat(v)
+        if (n < 1) {
+          n = 1
+        }
+        ;(filter as any)[resources.page] = n
+        return n
+      }
+    } else if (typeof v0 === "number") {
+      if (v0 > 0) {
+        return v0
+      } else {
+        ;(filter as any)[resources.page] = 1
+        return 1
+      }
+    }
+  }
+  const field = req.query[resources.page]
+  const v = field ? field.toString() : undefined
+  if (!v || v.length === 0) {
+    if (filter) {
+      ;(filter as any)[resources.page] = 1
+    }
+    return 1
+  }
+  if (isNaN(v as any)) {
+    if (filter) {
+      ;(filter as any)[resources.page] = 1
+    }
+    return 1
+  }
+  let n = parseFloat(v)
+  if (n < 1) {
+    n = 1
+  }
+  if (filter) {
+    ;(filter as any)[resources.page] = n
+  }
+  return n
+}
+
+export function getLimit<F extends Filter>(req: Request, filter?: F): number {
+  if (filter) {
+    const v0 = (filter as any)[resources.limit]
+    if (v0 == undefined) {
+      const field = req.query[resources.limit]
+      const v = field ? field.toString() : undefined
+      if (!v || v.length === 0) {
+        ;(filter as any)[resources.limit] = resources.defaultLimit
+        return resources.defaultLimit
+      }
+      if (isNaN(v as any)) {
+        ;(filter as any)[resources.limit] = resources.defaultLimit
+        return 1
+      } else {
+        let n = parseFloat(v)
+        if (n < 1) {
+          n = resources.defaultLimit
+        }
+        ;(filter as any)[resources.limit] = n
+        return n
+      }
+    } else if (typeof v0 === "number") {
+      if (v0 > 0) {
+        return v0
+      } else {
+        ;(filter as any)[resources.limit] = resources.defaultLimit
+        return resources.defaultLimit
+      }
+    }
+  }
+  const fieldxxx = req.query[resources.limit]
+  const v = fieldxxx ? fieldxxx.toString() : undefined
+  if (!v || v.length === 0) {
+    if (filter) {
+      ;(filter as any)[resources.limit] = resources.defaultLimit
+    }
+    return resources.defaultLimit
+  }
+  if (isNaN(v as any)) {
+    if (filter) {
+      ;(filter as any)[resources.limit] = resources.defaultLimit
+    }
+    return resources.defaultLimit
+  }
+  let n = parseFloat(v)
+  if (n < 1) {
+    n = resources.defaultLimit
+  }
+  if (filter) {
+    ;(filter as any)[resources.limit] = n
+  }
+  return n
+}
 export function queryLimit(req: Request): number {
   return queryNumber(req, resources.limit, resources.defaultLimit)
 }