@azteam/express 1.2.151 → 1.2.154

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.151",
+    "version": "1.2.154",
     "description": "",
     "main": "src/index.js",
     "repository": {
@@ -26,8 +26,6 @@
         "@azteam/crypto": "latest",
         "@azteam/error": "latest",
         "@azteam/http-client": "latest",
-        "@azteam/rabbitmq-async": "latest",
-        "@azteam/redis-async": "latest",
         "@grpc/grpc-js": "1.6.7",
         "@grpc/proto-loader": "0.6.12",
         "body-parser": "1.19.0",
@@ -41,6 +39,7 @@
         "fastest-validator": "1.8.0",
         "helmet": "3.21.2",
         "jsonwebtoken": "8.2.1",
+        "lodash": "4.17.21",
         "method-override": "3.0.0",
         "morgan": "1.10.0",
         "socket.io": "4.4.1",

package/src/AdminController.js

@@ -1,11 +1,10 @@
-import { NOT_EXISTS } from '@azteam/error';
+import {NOT_EXISTS} from '@azteam/error';
 
-import { REQUEST_TYPE, USER_LEVEL } from './constant';
-import { paginateMiddleware, roleMiddleware, validateMiddleware } from './middleware';
-import { rulesID } from './validate';
+import {REQUEST_TYPE, USER_LEVEL} from './constant';
+import {paginateMiddleware, roleMiddleware, validateMiddleware} from './middleware';
+import {rulesID} from './validate';
 import Controller from './Controller';
 
-
 class AdminController extends Controller {
     constructor(pathName, repository, options = {}) {
         super(pathName, repository, {
@@ -15,7 +14,7 @@ class AdminController extends Controller {
                 UPDATE: 3,
                 DELETE: 4,
                 RESTORE: 5,
-                DESTROY: 6
+                DESTROY: 6,
             }, // system roles
 
             paginateOptions: {},
@@ -25,7 +24,7 @@ class AdminController extends Controller {
             guardResponse: {},
             allowResponse: {},
 
-            ...options
+            ...options,
         });
     }
 
@@ -39,10 +38,10 @@ class AdminController extends Controller {
                     const paginateData = await this.repository.find(req.query, req.paginate);
 
                     return res.success(paginateData, this.options.guardResponse, this.options.allowResponse);
-                }
-            ]
+                },
+            ],
         };
-    };
+    }
 
     getPaginateTrash() {
         return {
@@ -54,10 +53,10 @@ class AdminController extends Controller {
                     const paginateData = await this.repository.findTrash(req.query, req.paginate);
 
                     return res.success(paginateData, this.options.guardResponse, this.options.allowResponse);
-                }
-            ]
+                },
+            ],
         };
-    };
+    }
 
     getOnePublic() {
         return {
@@ -69,11 +68,10 @@ class AdminController extends Controller {
                     const item = await this.repository.findOneById(req.params.id);
                     if (!item) return res.error(NOT_EXISTS);
                     return res.success(item, this.options.guardResponse, this.options.allowResponse);
-                }
-            ]
+                },
+            ],
         };
-
-    };
+    }
 
     getOneTrash() {
         return {
@@ -85,20 +83,18 @@ class AdminController extends Controller {
                     const item = await this.repository.findOneTrashById(req.params.id);
                     if (!item) return res.error(NOT_EXISTS);
                     return res.success(item, this.options.guardResponse, this.options.allowResponse);
-                }
-            ]
+                },
+            ],
         };
-
-    };
-
+    }
 
     async beforeCreate(data, user) {
         return data;
-    };
+    }
 
     async afterCreate(item, user) {
         return item;
-    };
+    }
 
     postCreatePublic() {
         return {
@@ -107,7 +103,6 @@ class AdminController extends Controller {
                 roleMiddleware([this.options.roles.CREATE], USER_LEVEL.ADMIN),
                 validateMiddleware(REQUEST_TYPE.BODY, this.options.rulesCreate),
                 async (req, res) => {
-
                     const data = await this.beforeCreate(req.body, req.user);
 
                     let item = await this.repository.createByUser(req.user.id, data);
@@ -115,18 +110,18 @@ class AdminController extends Controller {
                     item = await this.afterCreate(item, req.user);
 
                     return res.success(item, this.options.guardResponse, this.options.allowResponse);
-                }
-            ]
+                },
+            ],
         };
-    };
-
+    }
 
     async beforeModify(data, user) {
         return data;
-    };
+    }
+
     async afterModify(item, user) {
         return item;
-    };
+    }
 
     putModifyPublic() {
         return {
@@ -136,7 +131,6 @@ class AdminController extends Controller {
                 validateMiddleware(REQUEST_TYPE.PARAMS, rulesID),
                 validateMiddleware(REQUEST_TYPE.BODY, this.options.rulesModify),
                 async (req, res) => {
-
                     let item = await this.repository.findOneById(req.params.id);
                     if (!item) return res.error(NOT_EXISTS);
 
@@ -147,10 +141,10 @@ class AdminController extends Controller {
                     item = await this.afterModify(item, req.user);
 
                     return res.success(item, this.options.guardResponse, this.options.allowResponse);
-                }
-            ]
+                },
+            ],
         };
-    };
+    }
 
     deletePublic() {
         return {
@@ -164,10 +158,10 @@ class AdminController extends Controller {
 
                     await this.repository.deleteByUser(req.user.id, item);
                     return res.success(true);
-                }
-            ]
+                },
+            ],
         };
-    };
+    }
 
     postRestoreTrash() {
         return {
@@ -181,10 +175,10 @@ class AdminController extends Controller {
 
                     await this.repository.restoreByUser(req.user.id, item);
                     return res.success(true);
-                }
-            ]
+                },
+            ],
         };
-    };
+    }
 
     deleteDestroyTrash() {
         return {
@@ -198,10 +192,10 @@ class AdminController extends Controller {
 
                     await this.repository.destroy(item);
                     return res.success(true);
-                }
-            ]
+                },
+            ],
         };
-    };
+    }
 }
 
-export default AdminController;
+export default AdminController;

package/src/Controller.js

@@ -4,7 +4,7 @@ class Controller {
         this.repository = repository;
 
         this.options = {
-            ...options
+            ...options,
         };
     }
 
@@ -13,7 +13,6 @@ class Controller {
         let result = [];
 
         while (Object.getPrototypeOf(child.__proto__)) {
-
             const data = Object.getOwnPropertyNames(Object.getPrototypeOf(child));
 
             data.map((methodName) => {
@@ -29,7 +28,7 @@ class Controller {
                     result.push({
                         type: matches[0],
                         name: methodName,
-                        path
+                        path,
                     });
                 }
             });

package/src/Server.js

@@ -12,15 +12,13 @@ import _ from 'lodash';
 import 'express-async-errors';
 import {errorCatch, ErrorException, NOT_FOUND, UNKNOWN} from '@azteam/error';
 
-
 const RES_TYPE = {
     ARRAY: 'ARRAY',
     OBJECT: 'OBJECT',
-    DOCS: 'DOCS'
+    DOCS: 'DOCS',
 };
 
 function omitItem(item, guard, allows) {
-
     if (_.isArray(guard)) {
         guard = _.difference(guard, allows);
     }
@@ -37,7 +35,6 @@ function omitItem(item, guard, allows) {
     return item;
 }
 
-
 class Server {
     constructor(currentDir = '', options = {}) {
         this.redis = null;
@@ -51,7 +48,7 @@ class Server {
             secure: process.env.NODE_ENV !== 'development',
             httpOnly: true,
             signed: true,
-            sameSite: 'Lax'
+            sameSite: 'Lax',
         };
 
         this.middlewares = [];
@@ -62,7 +59,6 @@ class Server {
         this.initController(currentDir);
     }
 
-
     setMessageQueue(messageQueue) {
         this.messageQueue = messageQueue;
         return this;
@@ -76,7 +72,7 @@ class Server {
     setCookieOptions(cookieOptions) {
         this.cookieOptions = {
             ...this.cookieOptions,
-            ...cookieOptions
+            ...cookieOptions,
         };
         return this;
     }
@@ -100,7 +96,7 @@ class Server {
         this.controllers.push({
             name,
             version,
-            controller
+            controller,
         });
         return this;
     }
@@ -128,19 +124,17 @@ class Server {
         return this;
     }
 
-
     startAPI(port) {
-
         if (!_.isEmpty(this.controllers)) {
-
             const WHITE_LIST = this.whiteList;
             const COOKIE_OPTIONS = this.cookieOptions;
 
-
             const app = express();
-            app.use(helmet({
-                frameguard: false
-            }));
+            app.use(
+                helmet({
+                    frameguard: false,
+                })
+            );
 
             app.use(methodOverride());
             app.use(bodyParser.urlencoded({limit: '5mb', extended: true}));
@@ -150,31 +144,29 @@ class Server {
 
             app.use(cookieParser(process.env.SECRET_KEY));
 
-
-            app.use(cors({
-                credentials: true,
-                origin: function(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`));
-                    }
-                }
-            }));
+            app.use(
+                cors({
+                    credentials: true,
+                    origin: function (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`));
+                        }
+                    },
+                })
+            );
 
             if (this.debug) {
                 app.use(morgan('dev'));
             }
 
-            app.get('/robots.txt', function(req, res) {
+            app.get('/robots.txt', function (req, res) {
                 res.type('text/plain');
                 res.send('User-agent: *\nDisallow: /');
             });
             app.get('/favicon.ico', (req, res) => res.status(204).json({}));
 
-
             const {redis} = this;
 
             if (redis) {
@@ -182,13 +174,11 @@ class Server {
                 app.response.redis = redis;
             }
 
-
-            app.response.error = function(code, errors = []) {
+            app.response.error = function (code, errors = []) {
                 throw new ErrorException(code, errors);
             };
 
-            app.response.success = function(data = {}, guard = [], allows = []) {
-
+            app.response.success = function (data = {}, guard = [], allows = []) {
                 let guardData = data;
                 if (data) {
                     let resType = null;
@@ -202,31 +192,17 @@ class Server {
                     }
 
                     if (_.isArray(guard)) {
-                        guard = [
-                            ...guard,
-                            '__v',
-                            '_id',
-                            'deleted_at',
-                            'updated_at',
-                            'created_id',
-                            'modified_id'
-                        ];
+                        guard = [...guard, '__v', '_id', 'deleted_at', 'updated_at', 'created_id', 'modified_id'];
                         if (resType === RES_TYPE.ARRAY || resType === RES_TYPE.DOCS) {
-                            guard = [
-                                ...guard,
-                                'metadata_disable',
-                                'metadata_keywords',
-                                'metadata_description',
-                                'metadata_image_url'
-                            ];
+                            guard = [...guard, 'metadata_disable', 'metadata_keywords', 'metadata_description', 'metadata_image_url'];
                         }
                     }
                     if (resType === RES_TYPE.DOCS) {
-                        guardData.docs = _.map(data.docs, item => {
+                        guardData.docs = _.map(data.docs, (item) => {
                             return omitItem(item, guard, allows);
                         });
                     } else if (resType === RES_TYPE.ARRAY) {
-                        guardData = _.map(data, item => {
+                        guardData = _.map(data, (item) => {
                             return omitItem(item, guard, allows);
                         });
                     } else if (resType === RES_TYPE.OBJECT) {
@@ -237,43 +213,43 @@ class Server {
                 const resData = {
                     success: true,
                     data: guardData,
-                    options: this.resOptions
+                    options: this.resOptions,
                 };
 
                 if (this.redis && this.cache) {
-                    this.redis.set(this.cache.key, resData, this.ttl);
+                    this.redis.set(this.cache.key, resData, this.cache.ttl);
                 }
 
                 return this.json(resData);
             };
 
-            app.response.cleanCookie = function(data) {
+            app.response.cleanCookie = function (data) {
                 _.map(data, (name) => {
                     this.clearCookie(name, {
-                        domain: COOKIE_OPTIONS.domain
+                        domain: COOKIE_OPTIONS.domain,
                     });
                 });
             };
 
-            app.response.addCookie = function(data) {
+            app.response.addCookie = function (data) {
                 _.map(data, (value, key) => {
                     const maxAge = 86400000 * 365; // 1 year
                     this.cookie(key, value, {
                         ...COOKIE_OPTIONS,
                         maxAge,
-                        expires: new Date(Date.now() + maxAge)
+                        expires: new Date(Date.now() + maxAge),
                     });
                 });
             };
 
-            app.use(async function(req, res, next) {
+            app.use(async function (req, res, next) {
                 delete res.cache;
 
                 req.trackDevice = {
                     ip: req.ip,
                     device: req.get('X-DEVICE') || req.get('User-Agent'),
                     device_id: req.get('X-DEVICE-ID') || 'web',
-                    os: req.get('X-OS') || 'web'
+                    os: req.get('X-OS') || 'web',
                 };
 
                 next();
@@ -306,7 +282,7 @@ class Server {
                         version: controllerVersion,
                         type,
                         method: name,
-                        path: router.path
+                        path: router.path,
                     });
                     app[type](router.path, ...router.method);
                 });
@@ -347,9 +323,7 @@ class Server {
                     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':
@@ -368,7 +342,6 @@ class Server {
             server.listen(port);
 
             return server;
-
         } else {
             throw Error('No controllers in use API');
         }
@@ -377,7 +350,6 @@ class Server {
 
     startSocket(port) {
         if (!_.isEmpty(this.controllers)) {
-
         } else {
             throw Error('No controllers in use SOCKET');
         }

package/src/SocketServer.js

@@ -5,17 +5,15 @@ import socketIO from 'socket.io';
 import bodyParser from 'body-parser';
 import cookieParser from 'cookie-parser';
 import redisAdapter from 'socket.io-redis';
-import cors from 'cors';
 import _ from 'lodash';
 
-const wrap = middleware => (socket, next) => middleware(socket.request, {}, next);
+const wrap = (middleware) => (socket, next) => middleware(socket.request, {}, next);
 
 class SocketServer {
-
     constructor(currentDir = '', options = {}) {
         this.options = {
             redisConfig: null,
-            ...options
+            ...options,
         };
 
         this.middlewares = [];
@@ -44,7 +42,7 @@ class SocketServer {
         this.controllers.push({
             name,
             version,
-            controller
+            controller,
         });
         return this;
     }
@@ -74,7 +72,6 @@ class SocketServer {
 
     startPort(port) {
         if (!_.isEmpty(this.controllers)) {
-
             const WHITE_LIST = this.whiteList;
 
             const server = http.Server(express());
@@ -82,23 +79,20 @@ class SocketServer {
             const io = socketIO(server, {
                 wsEngine: 'eiows',
                 perMessageDeflate: {
-                    threshold: 32768
+                    threshold: 32768,
                 },
                 cors: {
                     credentials: true,
-                    origin: function(origin, callback) {
-                        if (
-                            !origin || !WHITE_LIST.length ||
-                            WHITE_LIST.some(re => origin.endsWith(re))) {
-                            callback(null, true)
+                    origin: function (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`));
                         }
                     },
-                }
+                },
             });
 
-
             if (this.options.redisConfig) {
                 io.adapter(redisAdapter(this.options.redisConfig));
             }
@@ -114,26 +108,24 @@ class SocketServer {
 
                     const middlewares = [...this.middlewares, ...(item.middlewares || [])];
 
-                    nsp.use(wrap(bodyParser.urlencoded({ limit: '5mb', extended: true })));
-                    nsp.use(wrap(bodyParser.json({ limit: '5mb' })));
+                    nsp.use(wrap(bodyParser.urlencoded({limit: '5mb', extended: true})));
+                    nsp.use(wrap(bodyParser.json({limit: '5mb'})));
                     nsp.use(wrap(cookieParser(process.env.SECRET_KEY)));
 
                     _.map(middlewares, (middleware) => {
                         nsp.use(wrap(middleware));
                     });
 
-
                     if (item.schedule) {
                         item.schedule(io);
                     }
 
                     if (item.connection) {
-                        nsp.on('connection', socket => {
+                        nsp.on('connection', (socket) => {
                             item.connection(io, socket);
                         });
                     }
 
-
                     msg.push({
                         controller: obj.name,
                         version: obj.version,
@@ -144,7 +136,6 @@ class SocketServer {
 
             console.table(msg);
 
-
             server.on('listening', () => {
                 this._alert('listening', `Server start at http://localhost:${server.address().port}`);
             });
@@ -154,9 +145,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':
@@ -175,7 +164,6 @@ class SocketServer {
             server.listen(port);
 
             return server;
-
         } else {
             throw Error('No controllers in use');
         }
@@ -196,4 +184,4 @@ class SocketServer {
     }
 }
 
-export default SocketServer;
+export default SocketServer;

package/src/constant.js

@@ -2,7 +2,7 @@ export const REQUEST_TYPE = {
     PARAMS: 'params',
     BODY: 'body',
     QUERY: 'query',
-}
+};
 
 export const USER_LEVEL = {
     GUESS: 0,

package/src/index.js

@@ -3,14 +3,10 @@ import Server from './Server';
 import Controller from './Controller';
 import AdminController from './AdminController';
 
-
 export * from './middleware';
 export * from './constant';
 export * from './validate';
 
-export {
-    Controller,
-    AdminController,
-}
+export {Controller, AdminController};
 
-export default Server;
+export default Server;

package/src/middleware/authMiddleware.js

@@ -1,4 +1,3 @@
-import { ErrorException } from '@azteam/error';
 import jwt from 'jsonwebtoken';
 
 function systemLogin(userData = null) {
@@ -11,10 +10,9 @@ function systemLogin(userData = null) {
     return user;
 }
 
-export default function(cbRefreshToken, cbLoginAPI) {
-    return async function(req, res, next) {
-
-        const { headers, signedCookies } = req;
+export default function (cbRefreshToken, cbLoginAPI) {
+    return async function (req, res, next) {
+        const {headers, signedCookies} = req;
 
         if (headers['x-app-secret'] === process.env.SECRET_KEY) {
             req.user = systemLogin(headers['x-app-user']);
@@ -43,7 +41,7 @@ export default function(cbRefreshToken, cbLoginAPI) {
                             if (data) {
                                 jwtData = jwt.decode(data.access_token);
                                 res.addCookie({
-                                    'access_token': data.access_token
+                                    access_token: data.access_token,
                                 });
                                 res.set('Auth-Token', data.access_token);
                             }
@@ -57,8 +55,6 @@ export default function(cbRefreshToken, cbLoginAPI) {
             }
         }
 
-
         return next();
     };
-
-}
+}

package/src/middleware/cacheMiddleware.js

@@ -1,14 +1,35 @@
-export default function(key, ttl = 5) {
-    return async function(req, res, next) {
+import _ from 'lodash';
+import qs from 'querystring';
+
+export default function (key, options = {}) {
+    options = {
+        ttl: 300,
+        limitPage: 5,
+        ...options,
+    };
+
+    return async function (req, res, next) {
         const {redis} = req;
         if (redis) {
-            const cacheData = await redis.get(key);
+            let cacheKey = key;
+
+            if (options.query) {
+                cacheKey += `${cacheKey}:${_.get(req, options.query)}`;
+            }
+            if (req.paginate) {
+                if (_.isEmpty(req.query) && req.paginate.page <= options.limitPage) {
+                    cacheKey = `${cacheKey}:${qs.stringify(req.paginate)}`;
+                } else {
+                    return next();
+                }
+            }
+            const cacheData = await redis.get(cacheKey);
             if (cacheData) {
                 return res.json(cacheData);
             } else {
                 res.cache = {
-                    key,
-                    ttl
+                    key: cacheKey,
+                    ttl: options.ttl,
                 };
             }
         }

package/src/middleware/etagMiddleware.js

@@ -6,8 +6,8 @@ function floorToMinute(time, minutes) {
     return time;
 }
 
-export default function(mTimeout = 5) {
-    return async function(req, res, next) {
+export default function (mTimeout = 5) {
+    return async function (req, res, next) {
         if (req.method === 'GET') {
             const etag_hash = etag(req.url + floorToMinute(Math.floor(Date.now() / 1000), mTimeout));
             if (req.headers['if-none-match'] === etag_hash) {
@@ -16,5 +16,5 @@ export default function(mTimeout = 5) {
             res.setHeader('ETag', etag_hash);
         }
         return next();
-    }
-}
+    };
+}

package/src/middleware/index.js

@@ -6,4 +6,3 @@ export {default as paginateMiddleware} from './paginateMiddleware';
 export {default as validateMiddleware} from './validateMiddleware';
 export {default as limitRequestMiddleware} from './limitRequestMiddleware';
 export {default as cacheMiddleware} from './cacheMiddleware';
-

package/src/middleware/limitRequestMiddleware.js

@@ -1,5 +1,5 @@
 import rateLimit from 'express-rate-limit';
-import { BLOCKED } from '@azteam/error';
+import {BLOCKED} from '@azteam/error';
 
 export default function limitRequest(max = 10, seconds = 30) {
     return rateLimit({
@@ -7,11 +7,12 @@ export default function limitRequest(max = 10, seconds = 30) {
         windowMs: seconds * 1000, // default 30 seconds
         message: {
             success: false,
-            errors: [{
-                'code': BLOCKED,
-                'message': 'Too many request',
-            }]
-        }
+            errors: [
+                {
+                    code: BLOCKED,
+                    message: 'Too many request',
+                },
+            ],
+        },
     });
-
-}
+}

package/src/middleware/paginateMiddleware.js

@@ -1,8 +1,7 @@
 import _ from 'lodash';
 
-
 function omitData(data) {
-    Object.keys(data).map(function(key, index) {
+    Object.keys(data).map(function (key, index) {
         let value = data[key];
         if (typeof value === 'string') {
             value = value.trim();
@@ -20,30 +19,24 @@ function omitData(data) {
     return data;
 }
 
-
-export default function(options = {}) {
+export default function (options = {}) {
     options = {
         limit: 20,
         searchFields: [],
-        sortFields: [
-            'created_at',
-            'modified_at',
-            'status'
-        ],
-        ...options
+        sortFields: ['created_at', 'modified_at', 'status'],
+        ...options,
     };
 
-    return async function(req, res, next) {
+    return async function (req, res, next) {
         req.query = omitData(req.query);
 
         res.resOptions = options;
         req.paginate = {
-            limit: options.limit
+            limit: options.limit,
         };
         if (req.query.limit) {
             req.paginate.limit = Number(req.query.limit);
             delete req.query.limit;
-
         }
 
         req.paginate.page = req.query.page ? Number(req.query.page) : 1;
@@ -51,10 +44,9 @@ export default function(options = {}) {
 
         delete req.query.page;
 
-
         if (req.query.sort_by && options.sortFields.includes(req.query.sort_by)) {
             req.paginate.sort = {
-                [req.query.sort_by]: req.query.sort_type === 'asc' ? 'asc' : 'desc'
+                [req.query.sort_by]: req.query.sort_type === 'asc' ? 'asc' : 'desc',
             };
 
             delete req.query.sort_by;
@@ -70,18 +62,17 @@ export default function(options = {}) {
 
                     req.query[newKey] = {
                         ...req.query[newKey],
-                        $gte: value
+                        $gte: value,
                     };
                 } else if (key.endsWith('_end')) {
                     const newKey = key.replace('_end', '');
 
                     req.query[newKey] = {
                         ...req.query[newKey],
-                        $lt: value
+                        $lt: value,
                     };
                 }
 
-
                 if (!options.searchFields.includes(key)) {
                     delete req.query[key];
                 }
@@ -96,8 +87,8 @@ export default function(options = {}) {
             req.query = {
                 ...req.query,
                 $text: {
-                    $search: keywords
-                }
+                    $search: keywords,
+                },
             };
         }
 

package/src/middleware/roleMiddleware.js

@@ -1,17 +1,16 @@
-import { ErrorException, UNAUTHORIZED, PERMISSION } from '@azteam/error';
+import {ErrorException, PERMISSION, UNAUTHORIZED} from '@azteam/error';
 
-
-export default function(roles = null, minLevel = 1) {
-    return async function(req, res, next) {
+export default function (roles = null, minLevel = 1) {
+    return async function (req, res, next) {
         if (!req.user) {
             return next(new ErrorException(UNAUTHORIZED));
         }
         if (req.user.level < minLevel) {
             return next(new ErrorException(PERMISSION));
         }
-        if (!roles || req.user.level === 100 || req.user.roles.some(r => roles.includes(r))) {
+        if (!roles || req.user.level === 100 || req.user.roles.some((r) => roles.includes(r))) {
             return next();
         }
         return next(new ErrorException(PERMISSION));
-    }
-}
+    };
+}

package/src/middleware/signMiddleware.js

@@ -1,11 +1,8 @@
-import { isValidSign } from '@azteam/crypto';
-import { ErrorException, SIGNATURE_FAILED } from '@azteam/error';
+import {isValidSign} from '@azteam/crypto';
+import {ErrorException, SIGNATURE_FAILED} from '@azteam/error';
 
-
-
-
-export default function(secretKey, mTimeout = 5) {
-    return async function(req, res, next) {
+export default function (secretKey, mTimeout = 5) {
+    return async function (req, res, next) {
         if (req.query.sign) {
             let url = `${req.protocol}://${req.hostname}${req.originalUrl}`;
             if (isValidSign(url, secretKey, mTimeout)) {
@@ -13,5 +10,5 @@ export default function(secretKey, mTimeout = 5) {
             }
         }
         return next(new ErrorException(SIGNATURE_FAILED));
-    }
-}
+    };
+}

package/src/middleware/validateMiddleware.js

@@ -1,31 +1,29 @@
-import { ErrorException, VALIDATE } from '@azteam/error';
+import {ErrorException, VALIDATE} from '@azteam/error';
 import Validator from 'fastest-validator';
 
-
 const v = new Validator({
     messages: {
-        jsonString: "The '{field}' field must be an json string! Actual: {actual}"
-    }
+        jsonString: "The '{field}' field must be an json string! Actual: {actual}",
+    },
 });
 
-v.add("json", function({ schema, messages }, path, context) {
+v.add('json', function ({schema, messages}, path, context) {
     return {
         source: `
             try {
                 JSON.parse(value);
             } catch (e) {
-                ${this.makeError({ type: "jsonString",  actual: "value", messages })}
+                ${this.makeError({type: 'jsonString', actual: 'value', messages})}
                 return;
             }
             return value; 
-        `
+        `,
     };
 });
 
-
 /* remove empty field or not have validate field */
 function omitData(data, inKeys = []) {
-    Object.keys(data).map(function(key, index) {
+    Object.keys(data).map(function (key, index) {
         if (inKeys.includes(key)) {
             let value = data[key];
             if (typeof value === 'string') {
@@ -47,8 +45,8 @@ function omitData(data, inKeys = []) {
     return data;
 }
 
-export default function(type, rules) {
-    return async function(req, res, next) {
+export default function (type, rules) {
+    return async function (req, res, next) {
         const reqData = omitData(req[type], Object.keys(rules));
 
         /* validate field */
@@ -58,5 +56,5 @@ export default function(type, rules) {
             return next(new ErrorException(VALIDATE, errors));
         }
         return next();
-    }
-}
+    };
+}

package/src/validate.js

@@ -106,7 +106,6 @@ export const schemaObject = (props = {}, optional = false) => ({
     optional,
 });
 
-
 /* rules */
 
 export const rulesID = {