@azteam/express 1.2.284 → 1.2.286

package/lib/Server.js

@@ -61,57 +61,33 @@ var Server = /*#__PURE__*/function () {
   function Server() {
     var currentDir = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var errorCallback = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
     _classCallCheck(this, Server);
-    this.redis = null;
     this.options = _objectSpread({
-      isAllowEmptyOrigin: true
+      redis: null,
+      isAllowEmptyOrigin: true,
+      whiteList: [],
+      cookieOption: {},
+      debug: process.env.NODE_ENV === 'development'
     }, options);
-    this.cookieOption = {
+    this.redis = this.options.redis;
+    this.isAllowEmptyOrigin = this.options.isAllowEmptyOrigin;
+    this.whiteList = this.options.whiteList;
+    this.debug = this.options.debug;
+    this.cookieOption = _objectSpread({
       domain: null,
       path: '/',
       secure: process.env.NODE_ENV !== 'development',
       httpOnly: true,
       signed: true,
       sameSite: 'Lax'
-    };
+    }, this.options.cookieOption);
     this.middlewares = [];
     this.controllers = [];
-    this.whiteList = [];
-    this.debug = process.env.NODE_ENV === 'development';
     this.initController(currentDir);
+    this.callbackError = errorCallback;
   }
   _createClass(Server, [{
-    key: "setRedis",
-    value: function setRedis(redis) {
-      this.redis = redis;
-      return this;
-    }
-  }, {
-    key: "setCookieOption",
-    value: function setCookieOption(cookieOption) {
-      this.cookieOption = _objectSpread(_objectSpread({}, this.cookieOption), cookieOption);
-      return this;
-    }
-  }, {
-    key: "setCallbackError",
-    value: function setCallbackError() {
-      var callback = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-      this.callbackError = callback;
-      return this;
-    }
-  }, {
-    key: "setWhiteList",
-    value: function setWhiteList(whiteList) {
-      this.whiteList = whiteList;
-      return this;
-    }
-  }, {
-    key: "setDebug",
-    value: function setDebug(debug) {
-      this.debug = debug;
-      return this;
-    }
-  }, {
     key: "addController",
     value: function addController(name, version, controller) {
       this.controllers.push({
@@ -155,7 +131,7 @@ var Server = /*#__PURE__*/function () {
       if (!_lodash["default"].isEmpty(this.controllers)) {
         var WHITE_LIST = this.whiteList;
         var COOKIE_OPTION = this.cookieOption;
-        var isAllowEmptyOrigin = this.options.isAllowEmptyOrigin;
+        var IS_ALLOW_EMPTY = this.isAllowEmptyOrigin;
         var app = (0, _express["default"])();
         app.use((0, _helmet["default"])({
           frameguard: false
@@ -178,7 +154,7 @@ var Server = /*#__PURE__*/function () {
           var error = null;
           if (!authorization && !appSecret && !agent.startsWith('toda')) {
             if (!origin) {
-              if (!isAllowEmptyOrigin) {
+              if (!IS_ALLOW_EMPTY) {
                 error = new _error.ErrorException(_error.CORS, "Not allowed by CORS");
               }
             } else if (!WHITE_LIST.some(function (re) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.284",
+    "version": "1.2.286",
     "main": "./lib/index.js",
     "module": "./src/index.js",
     "scripts": {

package/src/Server.js

@@ -40,13 +40,21 @@ function omitItem(item, guard, allow) {
 }
 
 class Server {
-    constructor(currentDir = '', options = {}) {
-        this.redis = null;
+    constructor(currentDir = '', options = {}, errorCallback = null) {
         this.options = {
+            redis: null,
             isAllowEmptyOrigin: true,
+            whiteList: [],
+            cookieOption: {},
+            debug: process.env.NODE_ENV === 'development',
             ...options,
         };
 
+        this.redis = this.options.redis;
+        this.isAllowEmptyOrigin = this.options.isAllowEmptyOrigin;
+        this.whiteList = this.options.whiteList;
+        this.debug = this.options.debug;
+
         this.cookieOption = {
             domain: null,
             path: '/',
@@ -54,42 +62,15 @@ class Server {
             httpOnly: true,
             signed: true,
             sameSite: 'Lax',
+            ...this.options.cookieOption,
         };
 
         this.middlewares = [];
         this.controllers = [];
-        this.whiteList = [];
-        this.debug = process.env.NODE_ENV === 'development';
 
         this.initController(currentDir);
-    }
-
-    setRedis(redis) {
-        this.redis = redis;
-        return this;
-    }
 
-    setCookieOption(cookieOption) {
-        this.cookieOption = {
-            ...this.cookieOption,
-            ...cookieOption,
-        };
-        return this;
-    }
-
-    setCallbackError(callback = null) {
-        this.callbackError = callback;
-        return this;
-    }
-
-    setWhiteList(whiteList) {
-        this.whiteList = whiteList;
-        return this;
-    }
-
-    setDebug(debug) {
-        this.debug = debug;
-        return this;
+        this.callbackError = errorCallback;
     }
 
     addController(name, version, controller) {
@@ -132,7 +113,7 @@ class Server {
         if (!_.isEmpty(this.controllers)) {
             const WHITE_LIST = this.whiteList;
             const COOKIE_OPTION = this.cookieOption;
-            const {isAllowEmptyOrigin} = this.options;
+            const IS_ALLOW_EMPTY = this.isAllowEmptyOrigin;
 
             const app = express();
             app.use(
@@ -159,7 +140,7 @@ class Server {
                     let error = null;
                     if (!authorization && !appSecret && !agent.startsWith('toda')) {
                         if (!origin) {
-                            if (!isAllowEmptyOrigin) {
+                            if (!IS_ALLOW_EMPTY) {
                                 error = new ErrorException(CORS, `Not allowed by CORS`);
                             }
                         } else if (!WHITE_LIST.some((re) => origin.endsWith(re))) {