@azteam/express 1.2.497 → 1.2.499

package/lib/Server.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _SocketEvent = _interopRequireDefault(require("backend/express-server/src/controller/SocketEvent"));
 var _bodyParser = _interopRequireDefault(require("body-parser"));
 var _compression = _interopRequireDefault(require("compression"));
 var _cookieParser = _interopRequireDefault(require("cookie-parser"));
@@ -17,7 +18,6 @@ var _http = _interopRequireWildcard(require("http"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _methodOverride = _interopRequireDefault(require("method-override"));
 var _morgan = _interopRequireDefault(require("morgan"));
-var _pako = _interopRequireDefault(require("pako"));
 var _path = _interopRequireDefault(require("path"));
 var _psl = _interopRequireDefault(require("psl"));
 var _socket = require("socket.io");
@@ -49,9 +49,6 @@ var RES_TYPE = {
   OBJECT: 'OBJECT',
   DOCS: 'DOCS'
 };
-function compressJson(message) {
-  return _pako["default"].deflate(JSON.stringify(message));
-}
 var Server = /*#__PURE__*/function () {
   function Server() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -447,13 +444,17 @@ var Server = /*#__PURE__*/function () {
         var httpServer = (0, _http.createServer)();
         var app = this.createExpressApp();
         httpServer.on('request', app);
-        var io = new _socket.Server(httpServer);
+        var io = new _socket.Server(httpServer, {
+          cors: {
+            origin: '*'
+          }
+        });
         httpServer.listen(port);
         httpServer.on('listening', function () {
           console.log('listening', "ServerIO start at http://localhost:".concat(httpServer.address().port));
         });
         var listenEventList = [];
-        var scheduleEventList = [];
+        var staticEventList = [];
         var msg = [];
         _lodash["default"].map(socketEvents, function (data) {
           var event = data.event;
@@ -465,8 +466,8 @@ var Server = /*#__PURE__*/function () {
               type = method.type;
             if (type === 'listen') {
               listenEventList.push(event[name]);
-            } else if (type === 'schedule') {
-              scheduleEventList.push(event[name]);
+            } else if (type === 'static') {
+              staticEventList.push(event[name]);
             }
             msg.push({
               name: eventName,
@@ -477,10 +478,13 @@ var Server = /*#__PURE__*/function () {
           });
         });
         console.table(msg);
-        _lodash["default"].map(scheduleEventList, function (event) {
+        _lodash["default"].map(staticEventList, function (event) {
           event(io);
         });
         io.on('connection', function (socket) {
+          socket.emit('ping', _SocketEvent["default"].compressJson({
+            ts: Date.now()
+          }));
           _lodash["default"].map(listenEventList, function (event) {
             event(io, socket);
           });

package/lib/controller/SocketEvent.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _pako = _interopRequireDefault(require("pako"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
@@ -24,7 +26,7 @@ var SocketEvent = /*#__PURE__*/function () {
       while (Object.getPrototypeOf(child.__proto__)) {
         var data = Object.getOwnPropertyNames(Object.getPrototypeOf(child));
         data.map(function (methodName) {
-          var matches = methodName.match(/^(schedule|listen)/);
+          var matches = methodName.match(/^(listen|static)/);
           if (matches) {
             result.push({
               type: matches[0],
@@ -38,6 +40,11 @@ var SocketEvent = /*#__PURE__*/function () {
       }
       return result;
     }
+  }], [{
+    key: "compressJson",
+    value: function compressJson(message) {
+      return _pako["default"].deflate(JSON.stringify(message));
+    }
   }]);
   return SocketEvent;
 }();

package/package.json

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

package/src/Server.js

@@ -1,3 +1,4 @@
+import SocketEvent from 'backend/express-server/src/controller/SocketEvent';
 import bodyParser from 'body-parser';
 import compression from 'compression';
 import cookieParser from 'cookie-parser';
@@ -11,7 +12,6 @@ import http, {createServer} from 'http';
 import _ from 'lodash';
 import methodOverride from 'method-override';
 import morgan from 'morgan';
-import pako from 'pako';
 import path from 'path';
 import psl from 'psl';
 import {Server as SocketIO} from 'socket.io';
@@ -25,10 +25,6 @@ const RES_TYPE = {
     DOCS: 'DOCS',
 };
 
-function compressJson(message) {
-    return pako.deflate(JSON.stringify(message));
-}
-
 class Server {
     constructor(options = {}, errorCallback = () => {}) {
         this.options = {
@@ -428,7 +424,11 @@ class Server {
             const app = this.createExpressApp();
             httpServer.on('request', app);
 
-            const io = new SocketIO(httpServer);
+            const io = new SocketIO(httpServer, {
+                cors: {
+                    origin: '*',
+                },
+            });
             httpServer.listen(port);
 
             httpServer.on('listening', () => {
@@ -436,7 +436,7 @@ class Server {
             });
 
             const listenEventList = [];
-            const scheduleEventList = [];
+            const staticEventList = [];
             const msg = [];
 
             _.map(socketEvents, (data) => {
@@ -449,8 +449,8 @@ class Server {
                     const {name, type} = method;
                     if (type === 'listen') {
                         listenEventList.push(event[name]);
-                    } else if (type === 'schedule') {
-                        scheduleEventList.push(event[name]);
+                    } else if (type === 'static') {
+                        staticEventList.push(event[name]);
                     }
                     msg.push({
                         name: eventName,
@@ -463,11 +463,18 @@ class Server {
 
             console.table(msg);
 
-            _.map(scheduleEventList, (event) => {
+            _.map(staticEventList, (event) => {
                 event(io);
             });
 
             io.on('connection', (socket) => {
+                socket.emit(
+                    'ping',
+                    SocketEvent.compressJson({
+                        ts: Date.now(),
+                    })
+                );
+
                 _.map(listenEventList, (event) => {
                     event(io, socket);
                 });

package/src/controller/SocketEvent.js

@@ -1,3 +1,5 @@
+import pako from 'pako';
+
 class SocketEvent {
     __getPublicEvents() {
         let child = this;
@@ -8,7 +10,7 @@ class SocketEvent {
             const data = Object.getOwnPropertyNames(Object.getPrototypeOf(child));
 
             data.map(function (methodName) {
-                const matches = methodName.match(/^(schedule|listen)/);
+                const matches = methodName.match(/^(listen|static)/);
                 if (matches) {
                     result.push({
                         type: matches[0],
@@ -22,6 +24,10 @@ class SocketEvent {
         }
         return result;
     }
+
+    static compressJson(message) {
+        return pako.deflate(JSON.stringify(message));
+    }
 }
 
 export default SocketEvent;