@azteam/express 1.2.496 → 1.2.498

package/lib/Server.js

@@ -17,7 +17,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 +48,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] : {};
@@ -409,7 +405,7 @@ var Server = /*#__PURE__*/function () {
       this.socketEvents.push({
         name: name,
         version: version,
-        SocketEvent: event
+        event: event
       });
       return this;
     }
@@ -447,7 +443,11 @@ 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));
@@ -456,18 +456,17 @@ var Server = /*#__PURE__*/function () {
         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;
             if (type === 'listen') {
-              listenEventList.push(obj[name]);
+              listenEventList.push(event[name]);
             } else if (type === 'schedule') {
-              scheduleEventList.push(obj[name]);
+              scheduleEventList.push(event[name]);
             }
             msg.push({
               name: eventName,
@@ -478,12 +477,12 @@ var Server = /*#__PURE__*/function () {
           });
         });
         console.table(msg);
-        _lodash["default"].map(scheduleEventList, function (func) {
-          func();
+        _lodash["default"].map(scheduleEventList, function (event) {
+          event(io);
         });
         io.on('connection', function (socket) {
-          _lodash["default"].map(listenEventList, function (func) {
-            func(socket);
+          _lodash["default"].map(listenEventList, function (event) {
+            event(io, socket);
           });
         });
         return io;

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); } }
@@ -11,9 +13,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",
@@ -39,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.496",
+    "version": "1.2.498",
     "license": "MIT",
     "author": "toda <sp.azsolution.net@gmail.com>",
     "main": "./lib/index.js",

package/src/Server.js

@@ -11,7 +11,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 +24,6 @@ const RES_TYPE = {
     DOCS: 'DOCS',
 };
 
-function compressJson(message) {
-    return pako.deflate(JSON.stringify(message));
-}
-
 class Server {
     constructor(options = {}, errorCallback = () => {}) {
         this.options = {
@@ -389,7 +384,7 @@ class Server {
         this.socketEvents.push({
             name,
             version,
-            SocketEvent: event,
+            event,
         });
         return this;
     }
@@ -428,7 +423,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', () => {
@@ -440,18 +439,17 @@ class Server {
             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;
                     if (type === 'listen') {
-                        listenEventList.push(obj[name]);
+                        listenEventList.push(event[name]);
                     } else if (type === 'schedule') {
-                        scheduleEventList.push(obj[name]);
+                        scheduleEventList.push(event[name]);
                     }
                     msg.push({
                         name: eventName,
@@ -464,13 +462,13 @@ class Server {
 
             console.table(msg);
 
-            _.map(scheduleEventList, (func) => {
-                func();
+            _.map(scheduleEventList, (event) => {
+                event(io);
             });
 
             io.on('connection', (socket) => {
-                _.map(listenEventList, (func) => {
-                    func(socket);
+                _.map(listenEventList, (event) => {
+                    event(io, socket);
                 });
             });
 

package/src/controller/SocketEvent.js

@@ -1,8 +1,6 @@
-class SocketEvent {
-    constructor(io) {
-        this.io = io;
-    }
+import pako from 'pako';
 
+class SocketEvent {
     __getPublicEvents() {
         let child = this;
         const result = [];
@@ -26,6 +24,10 @@ class SocketEvent {
         }
         return result;
     }
+
+    compressJson(message) {
+        return pako.deflate(JSON.stringify(message));
+    }
 }
 
 export default SocketEvent;