@azteam/express 1.2.498 → 1.2.500

package/lib/Server.js

@@ -22,6 +22,7 @@ var _psl = _interopRequireDefault(require("psl"));
 var _socket = require("socket.io");
 var _error = require("@azteam/error");
 var _util = require("@azteam/util");
+var _controller = require("./controller");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -453,7 +454,7 @@ var Server = /*#__PURE__*/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,23 @@ 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) {
+          console.log('connected', socket.id);
+          socket.emit('ping', _controller.SocketEvent.compressJson({
+            ts: Date.now()
+          }));
+          var interval = (0, _util.setIntervalImmediately)(function () {
+            socket.emit('ping', _controller.SocketEvent.compressJson({
+              ts: Date.now()
+            }));
+          }, 30000);
+          socket.on('disconnect', function () {
+            console.log('disconnected', socket.id);
+            clearInterval(interval);
+          });
           _lodash["default"].map(listenEventList, function (event) {
             event(io, socket);
           });

package/lib/controller/SocketEvent.js

@@ -26,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],
@@ -40,7 +40,7 @@ var SocketEvent = /*#__PURE__*/function () {
       }
       return result;
     }
-  }, {
+  }], [{
     key: "compressJson",
     value: function compressJson(message) {
       return _pako["default"].deflate(JSON.stringify(message));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.498",
+    "version": "1.2.500",
     "license": "MIT",
     "author": "toda <sp.azsolution.net@gmail.com>",
     "main": "./lib/index.js",
@@ -13,7 +13,7 @@
         "@azteam/crypto": "1.0.42",
         "@azteam/error": "1.0.40",
         "@azteam/http-client": "1.0.209",
-        "@azteam/util": "1.0.59",
+        "@azteam/util": "1.0.60",
         "@azteam/validator": "1.0.30",
         "@grpc/grpc-js": "1.6.7",
         "@grpc/proto-loader": "0.6.12",
@@ -34,10 +34,10 @@
         "method-override": "3.0.0",
         "morgan": "1.10.0",
         "multer": "1.4.5-lts.1",
+        "pako": "2.0.4",
         "pluralize": "8.0.0",
         "psl": "1.8.0",
         "socket.io": "4.4.1",
-        "ua-parser-js": "1.0.32",
-        "pako": "2.0.4"
+        "ua-parser-js": "1.0.32"
     }
 }

package/src/Server.js

@@ -16,7 +16,9 @@ import psl from 'psl';
 import {Server as SocketIO} from 'socket.io';
 
 import {CORS, ErrorException, NOT_FOUND, UNKNOWN, errorCatch} from '@azteam/error';
-import {omitArrayItem, omitItem} from '@azteam/util';
+import {omitArrayItem, omitItem, setIntervalImmediately} from '@azteam/util';
+
+import {SocketEvent} from './controller';
 
 const RES_TYPE = {
     ARRAY: 'ARRAY',
@@ -435,7 +437,7 @@ class Server {
             });
 
             const listenEventList = [];
-            const scheduleEventList = [];
+            const staticEventList = [];
             const msg = [];
 
             _.map(socketEvents, (data) => {
@@ -448,8 +450,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,
@@ -462,11 +464,31 @@ class Server {
 
             console.table(msg);
 
-            _.map(scheduleEventList, (event) => {
+            _.map(staticEventList, (event) => {
                 event(io);
             });
 
             io.on('connection', (socket) => {
+                console.log('connected', socket.id);
+                socket.emit(
+                    'ping',
+                    SocketEvent.compressJson({
+                        ts: Date.now(),
+                    })
+                );
+                const interval = setIntervalImmediately(function () {
+                    socket.emit(
+                        'ping',
+                        SocketEvent.compressJson({
+                            ts: Date.now(),
+                        })
+                    );
+                }, 30000);
+                socket.on('disconnect', function () {
+                    console.log('disconnected', socket.id);
+                    clearInterval(interval);
+                });
+
                 _.map(listenEventList, (event) => {
                     event(io, socket);
                 });

package/src/controller/SocketEvent.js

@@ -10,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],
@@ -25,7 +25,7 @@ class SocketEvent {
         return result;
     }
 
-    compressJson(message) {
+    static compressJson(message) {
         return pako.deflate(JSON.stringify(message));
     }
 }