@midwayjs/socketio 3.5.3 → 3.6.0

package/dist/configuration.js

@@ -7,11 +7,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SocketIOConfiguration = void 0;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 let SocketIOConfiguration = class SocketIOConfiguration {
 };
 SocketIOConfiguration = __decorate([
-    (0, decorator_1.Configuration)({
+    (0, core_1.Configuration)({
         namespace: 'socketIO',
     })
 ], SocketIOConfiguration);

package/dist/framework.js

@@ -11,7 +11,7 @@ const core_1 = require("@midwayjs/core");
 const util_1 = require("util");
 const debug = (0, util_1.debuglog)('midway:socket.io');
 const socket_io_1 = require("socket.io");
-const decorator_1 = require("@midwayjs/decorator");
+const core_2 = require("@midwayjs/core");
 let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseFramework {
     constructor() {
         super(...arguments);
@@ -62,14 +62,14 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
     }
     async loadMidwayController() {
         // create room
-        const controllerModules = (0, decorator_1.listModule)(decorator_1.WS_CONTROLLER_KEY);
+        const controllerModules = (0, core_2.listModule)(core_2.WS_CONTROLLER_KEY);
         for (const module of controllerModules) {
             await this.addNamespace(module);
         }
     }
     async addNamespace(target) {
         var _a, _b;
-        const controllerOption = (0, decorator_1.getClassMetadata)(decorator_1.WS_CONTROLLER_KEY, target);
+        const controllerOption = (0, core_2.getClassMetadata)(core_2.WS_CONTROLLER_KEY, target);
         const nsp = this.app.of(controllerOption.namespace);
         this.namespaceList.push(controllerOption.namespace);
         const controllerMiddleware = (_a = controllerOption.routerOptions.middleware) !== null && _a !== void 0 ? _a : [];
@@ -88,7 +88,7 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
                 ...controllerConnectionMiddleware,
             ], this.app);
             await connectFn(socket);
-            const wsEventInfos = (0, decorator_1.getClassMetadata)(decorator_1.WS_EVENT_KEY, target);
+            const wsEventInfos = (0, core_2.getClassMetadata)(core_2.WS_EVENT_KEY, target);
             // 存储方法对应的响应处理
             const methodMap = {};
             if (wsEventInfos.length) {
@@ -96,7 +96,7 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
                     methodMap[wsEventInfo.propertyName] = methodMap[wsEventInfo.propertyName] || { responseEvents: [] };
                     const controller = await socket.requestContext.getAsync(target);
                     // on connection
-                    if (wsEventInfo.eventType === decorator_1.WSEventTypeEnum.ON_CONNECTION) {
+                    if (wsEventInfo.eventType === core_2.WSEventTypeEnum.ON_CONNECTION) {
                         try {
                             const fn = await this.middlewareService.compose([
                                 ...(((_a = wsEventInfo === null || wsEventInfo === void 0 ? void 0 : wsEventInfo.eventOptions) === null || _a === void 0 ? void 0 : _a.middleware) || []),
@@ -112,7 +112,7 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
                             this.logger.error(err);
                         }
                     }
-                    else if (wsEventInfo.eventType === decorator_1.WSEventTypeEnum.ON_MESSAGE) {
+                    else if (wsEventInfo.eventType === core_2.WSEventTypeEnum.ON_MESSAGE) {
                         // on user custom event
                         socket.on(wsEventInfo.messageEventName, async (...args) => {
                             debug('got message', wsEventInfo.messageEventName, args);
@@ -124,6 +124,12 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
                                         ...controllerMiddleware,
                                         ...(((_a = wsEventInfo === null || wsEventInfo === void 0 ? void 0 : wsEventInfo.eventOptions) === null || _a === void 0 ? void 0 : _a.middleware) || []),
                                         async (ctx, next) => {
+                                            const isPassed = await this.app
+                                                .getFramework()
+                                                .runGuard(ctx, target, wsEventInfo.propertyName);
+                                            if (!isPassed) {
+                                                throw new core_1.MidwayInvokeForbiddenError(wsEventInfo.propertyName, target);
+                                            }
                                             // eslint-disable-next-line prefer-spread
                                             return controller[wsEventInfo.propertyName].apply(controller, args);
                                         },
@@ -144,7 +150,7 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
                             }
                         });
                     }
-                    else if (wsEventInfo.eventType === decorator_1.WSEventTypeEnum.ON_DISCONNECTION) {
+                    else if (wsEventInfo.eventType === core_2.WSEventTypeEnum.ON_DISCONNECTION) {
                         // on socket disconnect
                         socket.on('disconnect', async (reason) => {
                             try {
@@ -172,7 +178,7 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
     async bindSocketResponse(result, socket, propertyName, methodMap) {
         if (result && methodMap[propertyName]) {
             for (const wsEventInfo of methodMap[propertyName].responseEvents) {
-                if (wsEventInfo.eventType === decorator_1.WSEventTypeEnum.EMIT) {
+                if (wsEventInfo.eventType === core_2.WSEventTypeEnum.EMIT) {
                     if (wsEventInfo.roomName.length) {
                         socket = wsEventInfo.roomName.reduce((socket, name) => {
                             return socket.to(name);
@@ -181,7 +187,7 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
                     // eslint-disable-next-line prefer-spread
                     socket.emit.apply(socket, [wsEventInfo.messageEventName].concat(result));
                 }
-                else if (wsEventInfo.eventType === decorator_1.WSEventTypeEnum.BROADCAST) {
+                else if (wsEventInfo.eventType === core_2.WSEventTypeEnum.BROADCAST) {
                     // eslint-disable-next-line prefer-spread
                     socket.nsp.emit.apply(socket.nsp, [].concat(result));
                 }
@@ -199,7 +205,7 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
     }
 };
 MidwaySocketIOFramework = __decorate([
-    (0, decorator_1.Framework)()
+    (0, core_2.Framework)()
 ], MidwaySocketIOFramework);
 exports.MidwaySocketIOFramework = MidwaySocketIOFramework;
 //# sourceMappingURL=framework.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/socketio",
-  "version": "3.5.3",
+  "version": "3.6.0",
   "description": "Midway Web Framework for socket.io",
   "main": "dist/index",
   "typings": "index.d.ts",
@@ -24,13 +24,12 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.4.11",
-    "@midwayjs/mock": "^3.5.3",
+    "@midwayjs/mock": "^3.6.0",
     "fs-extra": "10.0.1",
     "socket.io-client": "4.5.2"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.5.3",
+    "@midwayjs/core": "^3.6.0",
     "@midwayjs/logger": "^2.15.0",
     "socket.io": "4.5.2",
     "socket.io-redis": "^6.1.0"
@@ -43,5 +42,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "32356484664846984f6d3d65a3a75dea015e8dcc"
+  "gitHead": "22643b0e8519766bb7c68b975930199fc136336e"
 }