@azteam/express 1.2.494 → 1.2.496

package/lib/Server.js

@@ -425,8 +425,8 @@ 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
-              var event = require("".concat(socketDir, "/").concat(dirName, "/").concat(versionName, "/controller"))["default"];
+              // 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,7 +452,8 @@ 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;
@@ -463,7 +464,11 @@ var Server = /*#__PURE__*/function () {
           _lodash["default"].map(listPublicEvent, function (method) {
             var name = method.name,
               type = method.type;
-            eventList.push(obj[name]);
+            if (type === 'listen') {
+              listenEventList.push(obj[name]);
+            } else if (type === 'schedule') {
+              scheduleEventList.push(obj[name]);
+            }
             msg.push({
               name: eventName,
               version: eventVersion,
@@ -473,8 +478,11 @@ var Server = /*#__PURE__*/function () {
           });
         });
         console.table(msg);
+        _lodash["default"].map(scheduleEventList, function (func) {
+          func();
+        });
         io.on('connection', function (socket) {
-          _lodash["default"].map(eventList, function (func) {
+          _lodash["default"].map(listenEventList, function (func) {
             func(socket);
           });
         });

package/package.json

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

package/src/Server.js

@@ -407,8 +407,8 @@ 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
-                        const event = require(`${socketDir}/${dirName}/${versionName}/controller`).default;
+                        // eslint-disable-next-line global-require,import/no-dynamic-require
+                        const event = require(`${socketDir}/${dirName}/${versionName}/event`).default;
                         this.addSocketEvent(dirName, versionName, event);
                     }
                 }
@@ -435,7 +435,8 @@ class Server {
                 console.log('listening', `ServerIO start at http://localhost:${httpServer.address().port}`);
             });
 
-            const eventList = [];
+            const listenEventList = [];
+            const scheduleEventList = [];
             const msg = [];
 
             _.map(socketEvents, (data) => {
@@ -447,8 +448,11 @@ class Server {
 
                 _.map(listPublicEvent, (method) => {
                     const {name, type} = method;
-                    eventList.push(obj[name]);
-
+                    if (type === 'listen') {
+                        listenEventList.push(obj[name]);
+                    } else if (type === 'schedule') {
+                        scheduleEventList.push(obj[name]);
+                    }
                     msg.push({
                         name: eventName,
                         version: eventVersion,
@@ -460,8 +464,12 @@ class Server {
 
             console.table(msg);
 
+            _.map(scheduleEventList, (func) => {
+                func();
+            });
+
             io.on('connection', (socket) => {
-                _.map(eventList, (func) => {
+                _.map(listenEventList, (func) => {
                     func(socket);
                 });
             });