@azteam/express 1.2.495 → 1.2.497

package/lib/Server.js

@@ -409,7 +409,7 @@ var Server = /*#__PURE__*/function () {
       this.socketEvents.push({
         name: name,
         version: version,
-        SocketEvent: event
+        event: event
       });
       return this;
     }
@@ -425,7 +425,7 @@ var Server = /*#__PURE__*/function () {
             var versionDirs = _lodash["default"].differenceWith(_fs["default"].readdirSync("".concat(socketDir, "/").concat(dirName)), excludeList);
             for (var j = 0; j < versionDirs.length; j += 1) {
               var versionName = versionDirs[j];
-              // eslint-disable-next-line global-require
+              // eslint-disable-next-line global-require,import/no-dynamic-require
               var event = require("".concat(socketDir, "/").concat(dirName, "/").concat(versionName, "/event"))["default"];
               this.addSocketEvent(dirName, versionName, event);
             }
@@ -452,18 +452,22 @@ var Server = /*#__PURE__*/function () {
         httpServer.on('listening', function () {
           console.log('listening', "ServerIO start at http://localhost:".concat(httpServer.address().port));
         });
-        var eventList = [];
+        var listenEventList = [];
+        var scheduleEventList = [];
         var msg = [];
         _lodash["default"].map(socketEvents, function (data) {
-          var SocketEvent = data.SocketEvent;
+          var event = data.event;
           var eventName = data.name;
           var eventVersion = data.version;
-          var obj = new SocketEvent(io);
-          var listPublicEvent = obj.__getPublicEvents(io);
+          var listPublicEvent = event.__getPublicEvents();
           _lodash["default"].map(listPublicEvent, function (method) {
             var name = method.name,
               type = method.type;
-            eventList.push(obj[name]);
+            if (type === 'listen') {
+              listenEventList.push(event[name]);
+            } else if (type === 'schedule') {
+              scheduleEventList.push(event[name]);
+            }
             msg.push({
               name: eventName,
               version: eventVersion,
@@ -473,9 +477,12 @@ var Server = /*#__PURE__*/function () {
           });
         });
         console.table(msg);
+        _lodash["default"].map(scheduleEventList, function (event) {
+          event(io);
+        });
         io.on('connection', function (socket) {
-          _lodash["default"].map(eventList, function (func) {
-            func(socket);
+          _lodash["default"].map(listenEventList, function (event) {
+            event(io, socket);
           });
         });
         return io;

package/lib/controller/SocketEvent.js

@@ -11,9 +11,8 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var SocketEvent = /*#__PURE__*/function () {
-  function SocketEvent(io) {
+  function SocketEvent() {
     _classCallCheck(this, SocketEvent);
-    this.io = io;
   }
   _createClass(SocketEvent, [{
     key: "__getPublicEvents",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.495",
+    "version": "1.2.497",
     "license": "MIT",
     "author": "toda <sp.azsolution.net@gmail.com>",
     "main": "./lib/index.js",

package/src/Server.js

@@ -389,7 +389,7 @@ class Server {
         this.socketEvents.push({
             name,
             version,
-            SocketEvent: event,
+            event,
         });
         return this;
     }
@@ -407,7 +407,7 @@ class Server {
                     const versionDirs = _.differenceWith(fs.readdirSync(`${socketDir}/${dirName}`), excludeList);
                     for (let j = 0; j < versionDirs.length; j += 1) {
                         const versionName = versionDirs[j];
-                        // eslint-disable-next-line global-require
+                        // eslint-disable-next-line global-require,import/no-dynamic-require
                         const event = require(`${socketDir}/${dirName}/${versionName}/event`).default;
                         this.addSocketEvent(dirName, versionName, event);
                     }
@@ -435,20 +435,23 @@ class Server {
                 console.log('listening', `ServerIO start at http://localhost:${httpServer.address().port}`);
             });
 
-            const eventList = [];
+            const listenEventList = [];
+            const scheduleEventList = [];
             const msg = [];
 
             _.map(socketEvents, (data) => {
-                const {SocketEvent} = data;
+                const {event} = data;
                 const eventName = data.name;
                 const eventVersion = data.version;
-                const obj = new SocketEvent(io);
-                const listPublicEvent = obj.__getPublicEvents(io);
+                const listPublicEvent = event.__getPublicEvents();
 
                 _.map(listPublicEvent, (method) => {
                     const {name, type} = method;
-                    eventList.push(obj[name]);
-
+                    if (type === 'listen') {
+                        listenEventList.push(event[name]);
+                    } else if (type === 'schedule') {
+                        scheduleEventList.push(event[name]);
+                    }
                     msg.push({
                         name: eventName,
                         version: eventVersion,
@@ -460,9 +463,13 @@ class Server {
 
             console.table(msg);
 
+            _.map(scheduleEventList, (event) => {
+                event(io);
+            });
+
             io.on('connection', (socket) => {
-                _.map(eventList, (func) => {
-                    func(socket);
+                _.map(listenEventList, (event) => {
+                    event(io, socket);
                 });
             });
 

package/src/controller/SocketEvent.js

@@ -1,8 +1,4 @@
 class SocketEvent {
-    constructor(io) {
-        this.io = io;
-    }
-
     __getPublicEvents() {
         let child = this;
         const result = [];