@azteam/express 1.2.499 → 1.2.501

package/lib/Server.js

@@ -4,7 +4,6 @@ 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"));
@@ -23,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 }; }
@@ -482,9 +482,16 @@ var Server = /*#__PURE__*/function () {
           event(io);
         });
         io.on('connection', function (socket) {
-          socket.emit('ping', _SocketEvent["default"].compressJson({
-            ts: Date.now()
-          }));
+          console.log('connected', socket.id);
+          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

@@ -45,6 +45,34 @@ var SocketEvent = /*#__PURE__*/function () {
     value: function compressJson(message) {
       return _pako["default"].deflate(JSON.stringify(message));
     }
+  }, {
+    key: "handleMessage",
+    value: function handleMessage(socket, arg, func) {
+      var message = arg.at(0);
+      var callback = arg.at(-1);
+      var data = message;
+      try {
+        if (message.body) {
+          data = JSON.parse(message.body);
+        }
+      } catch (err) {
+        callback(SocketEvent.compressJson({
+          status: 'error',
+          message: 'Incorrect JSON format'
+        }));
+      }
+      try {
+        func(data);
+      } catch (err) {
+        callback(SocketEvent.compressJson({
+          status: 'error',
+          message: err.toString()
+        }));
+      }
+      callback(SocketEvent.compressJson({
+        status: 'ok'
+      }));
+    }
   }]);
   return SocketEvent;
 }();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.499",
+    "version": "1.2.501",
     "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

@@ -1,4 +1,3 @@
-import SocketEvent from 'backend/express-server/src/controller/SocketEvent';
 import bodyParser from 'body-parser';
 import compression from 'compression';
 import cookieParser from 'cookie-parser';
@@ -17,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',
@@ -468,12 +469,19 @@ class Server {
             });
 
             io.on('connection', (socket) => {
-                socket.emit(
-                    'ping',
-                    SocketEvent.compressJson({
-                        ts: Date.now(),
-                    })
-                );
+                console.log('connected', socket.id);
+                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

@@ -28,6 +28,40 @@ class SocketEvent {
     static compressJson(message) {
         return pako.deflate(JSON.stringify(message));
     }
+
+    static handleMessage(socket, arg, func) {
+        const message = arg.at(0);
+        const callback = arg.at(-1);
+        let data = message;
+        try {
+            if (message.body) {
+                data = JSON.parse(message.body);
+            }
+        } catch (err) {
+            callback(
+                SocketEvent.compressJson({
+                    status: 'error',
+                    message: 'Incorrect JSON format',
+                })
+            );
+        }
+        try {
+            func(data);
+        } catch (err) {
+            callback(
+                SocketEvent.compressJson({
+                    status: 'error',
+                    message: err.toString(),
+                })
+            );
+        }
+
+        callback(
+            SocketEvent.compressJson({
+                status: 'ok',
+            })
+        );
+    }
 }
 
 export default SocketEvent;