@azteam/express 1.2.185 → 1.2.188

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.185",
+    "version": "1.2.188",
     "main": "src/index.js",
     "engines": {
         "node": ">= 12.0.0",
@@ -10,7 +10,7 @@
     "license": "MIT",
     "dependencies": {
         "@azteam/crypto": "1.0.24",
-        "@azteam/error": "1.0.19",
+        "@azteam/error": "1.0.20",
         "@azteam/http-client": "1.0.93",
         "@grpc/grpc-js": "1.6.7",
         "@grpc/proto-loader": "0.6.12",

package/src/AdminController.js

@@ -1,7 +1,7 @@
 import {NOT_EXISTS} from '@azteam/error';
 
 import {REQUEST_TYPE} from './constant';
-import {rulesID} from './validate';
+import {rulesId} from './validate';
 import Controller from './Controller';
 import {adminRoleMiddleware, paginateMiddleware, validateMiddleware, verifyGoogleAppMiddleware} from './middleware';
 
@@ -64,7 +64,7 @@ class AdminController extends Controller {
         return {
             disabled: !this.roles.READ,
             path: '/:id',
-            method: [adminRoleMiddleware([this.roles.READ]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesID), this.methodGetOnePublic],
+            method: [adminRoleMiddleware([this.roles.READ]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodGetOnePublic],
         };
     }
 
@@ -78,7 +78,7 @@ class AdminController extends Controller {
         return {
             disabled: !this.roles.READ,
             path: '/:id',
-            method: [adminRoleMiddleware([this.roles.READ]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesID), this.methodGetOneTrash],
+            method: [adminRoleMiddleware([this.roles.READ]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodGetOneTrash],
         };
     }
 
@@ -135,7 +135,7 @@ class AdminController extends Controller {
             path: '/:id',
             method: [
                 adminRoleMiddleware([this.roles.UPDATE]),
-                validateMiddleware(REQUEST_TYPE.PARAMS, rulesID),
+                validateMiddleware(REQUEST_TYPE.PARAMS, rulesId),
                 validateMiddleware(REQUEST_TYPE.BODY, this.rulesModify),
                 this.methodPutModifyPublic,
             ],
@@ -154,7 +154,7 @@ class AdminController extends Controller {
         return {
             disabled: !this.roles.DELETE,
             path: '/:id',
-            method: [adminRoleMiddleware([this.roles.DELETE]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesID), this.methodDeletePublic],
+            method: [adminRoleMiddleware([this.roles.DELETE]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodDeletePublic],
         };
     }
 
@@ -170,7 +170,7 @@ class AdminController extends Controller {
         return {
             disabled: !this.roles.RESTORE,
             path: '/:id',
-            method: [adminRoleMiddleware([this.roles.RESTORE]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesID), this.methodPostRestoreTrash],
+            method: [adminRoleMiddleware([this.roles.RESTORE]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodPostRestoreTrash],
         };
     }
 
@@ -186,7 +186,7 @@ class AdminController extends Controller {
         return {
             disabled: !this.roles.DESTROY,
             path: '/:id',
-            method: [adminRoleMiddleware([this.roles.DESTROY]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesID), this.methodDeleteDestroyTrash],
+            method: [adminRoleMiddleware([this.roles.DESTROY]), validateMiddleware(REQUEST_TYPE.PARAMS, rulesId), this.methodDeleteDestroyTrash],
         };
     }
 

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) {

package/src/validate.js

@@ -1,4 +1,4 @@
-export const schemaID = (optional = false) => ({
+export const schemaId = (optional = false) => ({
     type: 'string',
     length: 24,
     pattern: /^[A-Fa-f0-9]{24}$/,
@@ -108,8 +108,8 @@ export const schemaObject = (props = {}, optional = false) => ({
 
 /* rules */
 
-export const rulesID = {
-    id: schemaID(),
+export const rulesId = {
+    id: schemaId(),
 };
 export const rulesSlug = {
     slug: schemaSlug(),