@azteam/express 1.2.285 → 1.2.287

package/lib/Server.js

@@ -61,6 +61,7 @@ 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.options = _objectSpread({
       redis: null,
@@ -84,15 +85,9 @@ var Server = /*#__PURE__*/function () {
     this.middlewares = [];
     this.controllers = [];
     this.initController(currentDir);
+    this.callbackError = errorCallback;
   }
   _createClass(Server, [{
-    key: "setCallbackError",
-    value: function setCallbackError() {
-      var callback = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-      this.callbackError = callback;
-      return this;
-    }
-  }, {
     key: "addController",
     value: function addController(name, version, controller) {
       this.controllers.push({

package/lib/SocketServer.js

@@ -10,7 +10,7 @@ var _express = _interopRequireDefault(require("express"));
 var _socket = _interopRequireDefault(require("socket.io"));
 var _bodyParser = _interopRequireDefault(require("body-parser"));
 var _cookieParser = _interopRequireDefault(require("cookie-parser"));
-var _socket2 = _interopRequireDefault(require("socket.io-redis"));
+var _redisAdapter = require("@socket.io/redis-adapter");
 var _lodash = _interopRequireDefault(require("lodash"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -142,7 +142,7 @@ var SocketServer = /*#__PURE__*/function () {
           }
         });
         if (this.options.redisConfig) {
-          io.adapter((0, _socket2["default"])(this.options.redisConfig));
+          io.adapter((0, _redisAdapter.createAdapter)(this.options.redisConfig));
         }
         var msg = [];
         _lodash["default"].map(this.controllers, function (obj) {

package/lib/index.js

@@ -47,18 +47,6 @@ Object.keys(_constant).forEach(function (key) {
     }
   });
 });
-var _validate = require("./validate");
-Object.keys(_validate).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _validate[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _validate[key];
-    }
-  });
-});
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 var _default = _Server["default"];
 exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.285",
+    "version": "1.2.287",
     "main": "./lib/index.js",
     "module": "./src/index.js",
     "scripts": {
@@ -22,7 +22,6 @@
         "express": "4.17.1",
         "express-async-errors": "3.1.1",
         "express-rate-limit": "5.1.3",
-        "fastest-validator": "1.8.0",
         "helmet": "3.21.2",
         "jsonwebtoken": "8.2.1",
         "lodash": "4.17.21",
@@ -30,6 +29,6 @@
         "morgan": "1.10.0",
         "psl": "1.8.0",
         "socket.io": "4.4.1",
-        "socket.io-redis": "6.1.0"
+        "@socket.io/redis-adapter": "6.1.0"
     }
 }

package/src/Server.js

@@ -40,7 +40,7 @@ function omitItem(item, guard, allow) {
 }
 
 class Server {
-    constructor(currentDir = '', options = {}) {
+    constructor(currentDir = '', options = {}, errorCallback = null) {
         this.options = {
             redis: null,
             isAllowEmptyOrigin: true,
@@ -69,11 +69,8 @@ class Server {
         this.controllers = [];
 
         this.initController(currentDir);
-    }
 
-    setCallbackError(callback = null) {
-        this.callbackError = callback;
-        return this;
+        this.callbackError = errorCallback;
     }
 
     addController(name, version, controller) {

package/src/SocketServer.js

@@ -4,7 +4,7 @@ import express from 'express';
 import socketIO from 'socket.io';
 import bodyParser from 'body-parser';
 import cookieParser from 'cookie-parser';
-import redisAdapter from 'socket.io-redis';
+import {createAdapter} from '@socket.io/redis-adapter';
 import _ from 'lodash';
 
 const wrap = (middleware) => (socket, next) => middleware(socket.request, {}, next);
@@ -95,7 +95,7 @@ class SocketServer {
             });
 
             if (this.options.redisConfig) {
-                io.adapter(redisAdapter(this.options.redisConfig));
+                io.adapter(createAdapter(this.options.redisConfig));
             }
 
             const msg = [];

package/src/index.js

@@ -5,7 +5,6 @@ import AdminController from './AdminController';
 
 export * from './middleware';
 export * from './constant';
-export * from './validate';
 
 export {Controller, AdminController};
 

package/src/validate.js

@@ -1,161 +0,0 @@
-export const schemaId = (optional = false) => ({
-    type: 'string',
-    length: 24,
-    pattern: /^[A-Fa-f0-9]{24}$/,
-    optional,
-});
-
-export const schemaEmail = (optional = false) => ({
-    type: 'email',
-    optional,
-});
-
-export const schemaUrl = (optional = false) => ({
-    type: 'url',
-    optional,
-});
-
-export const schemaBoolean = (optional = false) => ({
-    type: 'boolean',
-    convert: true,
-    optional,
-});
-
-export const schemaDate = (optional = false) => ({
-    type: 'number',
-    convert: true,
-    integer: true,
-    optional,
-});
-
-export const schemaNumber = (optional = false) => ({
-    type: 'number',
-    convert: true,
-    optional,
-});
-export const schemaInteger = (min = 0, max = 999999999, optional = false) => ({
-    type: 'number',
-    integer: true,
-    convert: true,
-    min,
-    max,
-    optional,
-});
-
-export const schemaString = (min = 1, max = 255, optional = false) => ({
-    type: 'string',
-    convert: true,
-    trim: true,
-    min,
-    max,
-    optional,
-});
-export const schemaPassword = (optional = false) => ({
-    type: 'string',
-    convert: true,
-    min: 6,
-    max: 32,
-    optional,
-});
-export const schemaOTP = (optional = false) => ({
-    type: 'string',
-    length: 6,
-    pattern: /\d+/,
-    optional,
-});
-export const schemaIPv4 = (optional = false) => ({
-    type: 'string',
-    pattern: /^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)(\.(?!$)|$)){4}$/,
-    optional,
-});
-
-export const schemaImage = (optional = false) => ({
-    type: 'string',
-    max: 255,
-    optional,
-});
-export const schemaVideo = (optional = false) => ({
-    type: 'string',
-    max: 255,
-    optional,
-});
-export const schemaPhoneNumber = (optional = false) => ({
-    type: 'string',
-    length: 10,
-    pattern: /^((09|03|07|08|05)+([0-9]{8})\b)$/,
-    optional,
-});
-export const schemaSlug = (optional = false) => ({
-    type: 'string',
-    convert: true,
-    pattern: /[A-Za-z0-9_-]+/,
-    lowercase: true,
-    max: 300,
-    optional,
-});
-
-export const schemaKey = (optional = false) => ({
-    type: 'string',
-    convert: true,
-    pattern: /[A-Za-z0-9_-]+/,
-    uppercase: true,
-    max: 300,
-    optional,
-});
-
-export const schemaVersion = (optional = false) => ({
-    type: 'string',
-    pattern: /^(\d+)\.(\d+)\.(\d+)$/,
-    max: 300,
-    optional,
-});
-export const schemaArray = (items, optional = false) => ({
-    type: 'array',
-    items,
-    default: [],
-    optional,
-});
-export const schemaJSON = (optional = false) => ({
-    type: 'json',
-    optional,
-});
-
-export const schemaGallery = (optional = false) => ({
-    type: 'array',
-    items: schemaImage(),
-    optional,
-});
-
-export const schemaObject = (props = {}, optional = false) => ({
-    type: 'object',
-    strict: 'remove',
-    props,
-    optional,
-});
-
-export const schemaEnum = (values, optional = false) => ({
-    type: 'enum',
-    values,
-    optional,
-});
-
-/* rules */
-export const rulesId = {
-    id: schemaId(),
-};
-export const rulesSlug = {
-    slug: schemaSlug(),
-};
-export const rulesKey = {
-    key: schemaKey(),
-};
-
-export const rulesMetadata = {
-    metadata_disable: schemaBoolean(true),
-    metadata_title: schemaString(0, 255, true),
-    metadata_title_og: schemaString(0, 255, true),
-    metadata_description: schemaString(0, 255, true),
-    metadata_description_og: schemaString(0, 255, true),
-    metadata_keywords: schemaString(0, 255, true),
-    metadata_image_url: schemaImage(true),
-};