@azteam/express 1.2.410 → 1.2.412

package/lib/Server.js

@@ -4,21 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _lodash = _interopRequireDefault(require("lodash"));
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
-var _http = _interopRequireDefault(require("http"));
-var _express = _interopRequireDefault(require("express"));
-var _helmet = _interopRequireDefault(require("helmet"));
-var _methodOverride = _interopRequireDefault(require("method-override"));
 var _bodyParser = _interopRequireDefault(require("body-parser"));
+var _compression = _interopRequireDefault(require("compression"));
 var _cookieParser = _interopRequireDefault(require("cookie-parser"));
-var _morgan = _interopRequireDefault(require("morgan"));
 var _cors = _interopRequireDefault(require("cors"));
-var _psl = _interopRequireDefault(require("psl"));
 var _ejs = _interopRequireDefault(require("ejs"));
-var _compression = _interopRequireDefault(require("compression"));
+var _express = _interopRequireDefault(require("express"));
 require("express-async-errors");
+var _fs = _interopRequireDefault(require("fs"));
+var _helmet = _interopRequireDefault(require("helmet"));
+var _http = _interopRequireDefault(require("http"));
+var _lodash = _interopRequireDefault(require("lodash"));
+var _methodOverride = _interopRequireDefault(require("method-override"));
+var _morgan = _interopRequireDefault(require("morgan"));
+var _path = _interopRequireDefault(require("path"));
+var _psl = _interopRequireDefault(require("psl"));
 var _error = require("@azteam/error");
 var _util = require("@azteam/util");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -70,7 +70,7 @@ var Server = /*#__PURE__*/function () {
     this.middlewares = [];
     this.controllers = [];
     serviceDirs.map(function (dir) {
-      _this.initController(dir);
+      return _this.initController(dir);
     });
     this.callbackError = errorCallback;
   }
@@ -329,10 +329,10 @@ var Server = /*#__PURE__*/function () {
             return _ref3.apply(this, arguments);
           };
         }());
-        app.use(function (req, res) {
+        app.use(function () {
           throw new _error.ErrorException(_error.NOT_FOUND);
         });
-        app.use(function (err, req, res, next) {
+        app.use(function (err, req, res) {
           var error = (0, _error.errorCatch)(err);
           if (process.env.NODE_ENV === 'development') {
             console.log(error.errors);

package/lib/SocketServer.js

@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _fs = _interopRequireDefault(require("fs"));
-var _http = _interopRequireDefault(require("http"));
-var _express = _interopRequireDefault(require("express"));
-var _socket = _interopRequireDefault(require("socket.io"));
+var _redisAdapter = require("@socket.io/redis-adapter");
 var _bodyParser = _interopRequireDefault(require("body-parser"));
 var _cookieParser = _interopRequireDefault(require("cookie-parser"));
-var _redisAdapter = require("@socket.io/redis-adapter");
+var _express = _interopRequireDefault(require("express"));
+var _fs = _interopRequireDefault(require("fs"));
+var _http = _interopRequireDefault(require("http"));
 var _lodash = _interopRequireDefault(require("lodash"));
+var _socket = _interopRequireDefault(require("socket.io"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }

package/lib/controller/AdminController.js

@@ -7,8 +7,8 @@ exports["default"] = void 0;
 var _lodash = _interopRequireDefault(require("lodash"));
 var _error = require("@azteam/error");
 var _validator = require("@azteam/validator");
-var _middleware = require("../middleware");
 var _constant = require("../constant");
+var _middleware = require("../middleware");
 var _Controller2 = _interopRequireDefault(require("./Controller"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }

package/lib/controller/Controller.js

@@ -27,6 +27,8 @@ var Controller = /*#__PURE__*/function () {
     value: function publicRouter() {
       var child = this;
       var result = [];
+
+      // eslint-disable-next-line no-proto
       while (Object.getPrototypeOf(child.__proto__)) {
         var data = Object.getOwnPropertyNames(Object.getPrototypeOf(child));
         data.map(function (methodName) {
@@ -44,6 +46,7 @@ var Controller = /*#__PURE__*/function () {
           }
           return true;
         });
+        // eslint-disable-next-line no-proto
         child = child.__proto__;
       }
       return result;

package/lib/middleware/cacheMiddleware.js

@@ -17,11 +17,11 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _default(key) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  options = _objectSpread({
+  var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var options = _objectSpread({
     ttl: 300,
     limitPage: 5
-  }, options);
+  }, opts);
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res, next) {
       var redis, cacheKey, cacheData;

package/lib/middleware/paginateMiddleware.js

@@ -22,11 +22,14 @@ function omitData(data) {
     if (typeof value === 'string') {
       value = value.trim();
       if (value === '' || value === 'NaN' || value === 'null' || value === 'undefined') {
+        // eslint-disable-next-line no-param-reassign
         delete data[key];
       } else {
+        // eslint-disable-next-line no-param-reassign
         data[key] = value;
       }
     } else if (value === null || value === undefined || Number.isNaN(value)) {
+      // eslint-disable-next-line no-param-reassign
       delete data[key];
     }
     return true;
@@ -34,16 +37,16 @@ function omitData(data) {
   return data;
 }
 function _default() {
-  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  options = _objectSpread({
+  var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var options = _objectSpread({
     limit: 20,
     allowSearchFields: [],
     allowSortFields: ['created_at', 'modified_at', 'status'],
     allowLimits: [20, 40, 80]
-  }, options);
+  }, opts);
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res, next) {
-      var limit, arrKeywords, keywords;
+      var limit, keywords;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -123,8 +126,7 @@ function _default() {
                 }
               });
               if (req.query.keywords) {
-                arrKeywords = _lodash["default"].words(req.query.keywords);
-                keywords = "\"".concat(arrKeywords.join('" "'), "\"");
+                keywords = "\"".concat(_lodash["default"].words(req.query.keywords).join('" "'), "\"");
                 delete req.query.keywords;
                 req.query = _objectSpread(_objectSpread({}, req.query), {}, {
                   $text: {

package/lib/middleware/recaptchaMiddleware.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = _default;
-var _httpClient = _interopRequireDefault(require("@azteam/http-client"));
 var _error = require("@azteam/error");
+var _httpClient = _interopRequireDefault(require("@azteam/http-client"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }

package/lib/middleware/roleMiddleware.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = _default;
 var _jsonwebtoken = _interopRequireDefault(require("jsonwebtoken"));
 var _constant = require("@azteam/constant");
-var _httpClient = _interopRequireDefault(require("@azteam/http-client"));
 var _error = require("@azteam/error");
+var _httpClient = _interopRequireDefault(require("@azteam/http-client"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
@@ -31,19 +31,19 @@ function systemLogin() {
 function _default() {
   var roles = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var minLevel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _constant.USER_LEVEL.USER;
-  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  options = _objectSpread({
+  var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  var options = _objectSpread({
     secretKey: process.env.SECRET_KEY,
     systemURL: process.env.SYSTEM_URL
-  }, options);
+  }, opts);
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res, next) {
-      var headers, _options, secretKey, systemURL, token, apiURL, splitToken, client, response;
+      var headers, secretKey, systemURL, token, apiURL, splitToken, client, response;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              headers = req.headers, _options = options, secretKey = _options.secretKey, systemURL = _options.systemURL;
+              headers = req.headers, secretKey = options.secretKey, systemURL = options.systemURL;
               if (!(headers['x-app-secret'] === secretKey)) {
                 _context.next = 5;
                 break;

package/package.json

@@ -1,20 +1,20 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.410",
+    "version": "1.2.412",
     "license": "MIT",
     "author": "toda <sp.azsolution.net@gmail.com>",
     "main": "./lib/index.js",
     "module": "./src/index.js",
     "scripts": {
-        "build": "babel src  --delete-dir-on-start -d lib"
+        "build": "babel src --delete-dir-on-start -d lib"
     },
     "dependencies": {
-        "@azteam/constant": "1.0.7",
-        "@azteam/crypto": "1.0.34",
-        "@azteam/error": "1.0.33",
-        "@azteam/http-client": "1.0.112",
-        "@azteam/util": "1.0.38",
-        "@azteam/validator": "1.0.19",
+        "@azteam/constant": "1.0.8",
+        "@azteam/crypto": "1.0.35",
+        "@azteam/error": "1.0.34",
+        "@azteam/http-client": "1.0.113",
+        "@azteam/util": "1.0.39",
+        "@azteam/validator": "1.0.20",
         "@grpc/grpc-js": "1.6.7",
         "@grpc/proto-loader": "0.6.12",
         "@socket.io/redis-adapter": "7.2.0",

package/src/Server.js

@@ -1,19 +1,20 @@
-import _ from 'lodash';
-import fs from 'fs';
-import path from 'path';
-import http from 'http';
-import express from 'express';
-import helmet from 'helmet';
-import methodOverride from 'method-override';
 import bodyParser from 'body-parser';
+import compression from 'compression';
 import cookieParser from 'cookie-parser';
-import morgan from 'morgan';
 import cors from 'cors';
-import psl from 'psl';
 import ejs from 'ejs';
-import compression from 'compression';
+import express from 'express';
 import 'express-async-errors';
-import {CORS, errorCatch, ErrorException, NOT_FOUND, UNKNOWN} from '@azteam/error';
+import fs from 'fs';
+import helmet from 'helmet';
+import http from 'http';
+import _ from 'lodash';
+import methodOverride from 'method-override';
+import morgan from 'morgan';
+import path from 'path';
+import psl from 'psl';
+
+import {CORS, ErrorException, NOT_FOUND, UNKNOWN, errorCatch} from '@azteam/error';
 import {omitArrayItem, omitItem} from '@azteam/util';
 
 const RES_TYPE = {
@@ -46,7 +47,7 @@ class Server {
         this.controllers = [];
 
         serviceDirs.map((dir) => {
-            this.initController(dir);
+            return this.initController(dir);
         });
 
         this.callbackError = errorCallback;
@@ -295,11 +296,11 @@ class Server {
                 });
             });
 
-            app.use(function (req, res) {
+            app.use(function () {
                 throw new ErrorException(NOT_FOUND);
             });
 
-            app.use((err, req, res, next) => {
+            app.use((err, req, res) => {
                 const error = errorCatch(err);
 
                 if (process.env.NODE_ENV === 'development') {

package/src/SocketServer.js

@@ -1,11 +1,11 @@
-import fs from 'fs';
-import http from 'http';
-import express from 'express';
-import socketIO from 'socket.io';
+import {createAdapter} from '@socket.io/redis-adapter';
 import bodyParser from 'body-parser';
 import cookieParser from 'cookie-parser';
-import {createAdapter} from '@socket.io/redis-adapter';
+import express from 'express';
+import fs from 'fs';
+import http from 'http';
 import _ from 'lodash';
+import socketIO from 'socket.io';
 
 const wrap = (middleware) => (socket, next) => middleware(socket.request, {}, next);
 

package/src/controller/AdminController.js

@@ -1,10 +1,10 @@
 import _ from 'lodash';
+
 import {NOT_EXISTS} from '@azteam/error';
 import {rulesId} from '@azteam/validator';
 
-import {adminRoleMiddleware, paginateMiddleware, validateMiddleware} from '../middleware';
 import {REQUEST_TYPE} from '../constant';
-
+import {adminRoleMiddleware, paginateMiddleware, validateMiddleware} from '../middleware';
 import Controller from './Controller';
 
 const ALLOW_FIELDS = [

package/src/controller/Controller.js

@@ -13,6 +13,7 @@ class Controller {
         let child = this;
         const result = [];
 
+        // eslint-disable-next-line no-proto
         while (Object.getPrototypeOf(child.__proto__)) {
             const data = Object.getOwnPropertyNames(Object.getPrototypeOf(child));
 
@@ -32,6 +33,7 @@ class Controller {
                 }
                 return true;
             });
+            // eslint-disable-next-line no-proto
             child = child.__proto__;
         }
         return result;

package/src/middleware/cacheMiddleware.js

@@ -1,11 +1,11 @@
 import _ from 'lodash';
 import qs from 'querystring';
 
-export default function (key, options = {}) {
-    options = {
+export default function (key, opts = {}) {
+    const options = {
         ttl: 300,
         limitPage: 5,
-        ...options,
+        ...opts,
     };
 
     return async function (req, res, next) {

package/src/middleware/limitRequestMiddleware.js

@@ -1,4 +1,5 @@
 import rateLimit from 'express-rate-limit';
+
 import {BLOCKED} from '@azteam/error';
 
 export default function limitRequest(max = 10, seconds = 30) {

package/src/middleware/paginateMiddleware.js

@@ -1,4 +1,5 @@
 import _ from 'lodash';
+
 import {ErrorException, INVALID} from '@azteam/error';
 
 function omitData(data) {
@@ -7,11 +8,14 @@ function omitData(data) {
         if (typeof value === 'string') {
             value = value.trim();
             if (value === '' || value === 'NaN' || value === 'null' || value === 'undefined') {
+                // eslint-disable-next-line no-param-reassign
                 delete data[key];
             } else {
+                // eslint-disable-next-line no-param-reassign
                 data[key] = value;
             }
         } else if (value === null || value === undefined || Number.isNaN(value)) {
+            // eslint-disable-next-line no-param-reassign
             delete data[key];
         }
         return true;
@@ -19,13 +23,13 @@ function omitData(data) {
     return data;
 }
 
-export default function (options = {}) {
-    options = {
+export default function (opts = {}) {
+    const options = {
         limit: 20,
         allowSearchFields: [],
         allowSortFields: ['created_at', 'modified_at', 'status'],
         allowLimits: [20, 40, 80],
-        ...options,
+        ...opts,
     };
 
     return async function (req, res, next) {
@@ -108,11 +112,8 @@ export default function (options = {}) {
             });
 
             if (req.query.keywords) {
-                const arrKeywords = _.words(req.query.keywords);
-                const keywords = `"${arrKeywords.join('" "')}"`;
-
+                const keywords = `"${_.words(req.query.keywords).join('" "')}"`;
                 delete req.query.keywords;
-
                 req.query = {
                     ...req.query,
                     $text: {

package/src/middleware/recaptchaMiddleware.js

@@ -1,5 +1,5 @@
-import HttpClient from '@azteam/http-client';
 import {ErrorException, MISSING_PARAM, RECAPTCHA} from '@azteam/error';
+import HttpClient from '@azteam/http-client';
 
 export default function (secretKey) {
     return async function (req, res, next) {

package/src/middleware/roleMiddleware.js

@@ -1,7 +1,8 @@
 import jwt from 'jsonwebtoken';
+
 import {USER_LEVEL} from '@azteam/constant';
-import HttpClient from '@azteam/http-client';
 import {ErrorException, PERMISSION, TOKEN_EXPIRED, TOKEN_FAILED, UNAUTHORIZED} from '@azteam/error';
+import HttpClient from '@azteam/http-client';
 
 function systemLogin(userData = null) {
     let user = {};
@@ -13,11 +14,11 @@ function systemLogin(userData = null) {
     return user;
 }
 
-export default function (roles = null, minLevel = USER_LEVEL.USER, options = {}) {
-    options = {
+export default function (roles = null, minLevel = USER_LEVEL.USER, opts = {}) {
+    const options = {
         secretKey: process.env.SECRET_KEY,
         systemURL: process.env.SYSTEM_URL,
-        ...options,
+        ...opts,
     };
 
     return async function (req, res, next) {