@azteam/express 1.2.186 → 1.2.187

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.186",
+    "version": "1.2.187",
     "main": "src/index.js",
     "engines": {
         "node": ">= 12.0.0",

package/src/Server.js

@@ -10,7 +10,7 @@ import morgan from 'morgan';
 import cors from 'cors';
 import _ from 'lodash';
 import 'express-async-errors';
-import {errorCatch, ErrorException, NOT_FOUND, UNKNOWN} from '@azteam/error';
+import {errorCatch, ErrorException, NOT_FOUND, UNKNOWN, CORS} from '@azteam/error';
 
 const RES_TYPE = {
     ARRAY: 'ARRAY',
@@ -140,11 +140,11 @@ class Server {
             app.use(
                 cors({
                     credentials: true,
-                    origin: function (origin, callback) {
+                    origin(origin, callback) {
                         if (!origin || !WHITE_LIST.length || WHITE_LIST.some((re) => origin.endsWith(re))) {
                             callback(null, true);
                         } else {
-                            callback(new Error(`${origin} Not allowed by CORS`));
+                            callback(new ErrorException(CORS, `${origin} Not allowed by CORS`));
                         }
                     },
                 })

package/src/SocketServer.js

@@ -56,6 +56,7 @@ class SocketServer {
                     const versionDirs = fs.readdirSync(`${apiDir}/${dirName}`);
 
                     for (const versionName of versionDirs) {
+                        // eslint-disable-next-line import/no-dynamic-require,global-require
                         const controller = require(`${apiDir}/${dirName}/${versionName}/controller`).default;
                         this.addController(dirName, versionName, controller);
                     }
@@ -83,7 +84,7 @@ class SocketServer {
                 },
                 cors: {
                     credentials: true,
-                    origin: function (origin, callback) {
+                    origin(origin, callback) {
                         if (!origin || !WHITE_LIST.length || WHITE_LIST.some((re) => origin.endsWith(re))) {
                             callback(null, true);
                         } else {
@@ -99,7 +100,7 @@ class SocketServer {
 
             const msg = [];
             _.map(this.controllers, (obj) => {
-                const controller = obj.controller;
+                const {controller} = obj;
 
                 _.map(controller, (item, key) => {
                     item.path = obj.version.startsWith('v') ? `/${obj.version}${item.path}` : item.path;
@@ -145,7 +146,7 @@ class SocketServer {
                     throw error;
                 }
 
-                let bind = typeof port === 'string' ? 'Pipe ' + port : 'Port ' + port;
+                let bind = typeof port === 'string' ? `Pipe ${port}` : `Port ${port}`;
 
                 switch (error.code) {
                     case 'EACCES':
@@ -164,10 +165,8 @@ class SocketServer {
             server.listen(port);
 
             return server;
-        } else {
-            throw Error('No controllers in use');
         }
-        return null;
+        throw Error('No controllers in use');
     }
 
     setAlertCallback(callback) {