@midwayjs/ws 3.5.1 → 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.WebSocketConfiguration = void 0;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 let WebSocketConfiguration = class WebSocketConfiguration {
 };
 WebSocketConfiguration = __decorate([
-    (0, decorator_1.Configuration)({
+    (0, core_1.Configuration)({
         namespace: 'webSocket',
         importConfigs: [
             {

package/dist/framework.js

@@ -12,7 +12,6 @@ const http = require("http");
 const util_1 = require("util");
 const debug = (0, util_1.debuglog)('midway:debug');
 const WebSocket = require("ws");
-const decorator_1 = require("@midwayjs/decorator");
 let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
     constructor() {
         super(...arguments);
@@ -77,7 +76,7 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
     }
     async loadMidwayController() {
         // create room
-        const controllerModules = (0, decorator_1.listModule)(decorator_1.WS_CONTROLLER_KEY);
+        const controllerModules = (0, core_1.listModule)(core_1.WS_CONTROLLER_KEY);
         if (controllerModules.length > 0) {
             // ws just one namespace
             await this.addNamespace(controllerModules[0]);
@@ -85,7 +84,7 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
     }
     async addNamespace(target) {
         var _a, _b;
-        const controllerOption = (0, decorator_1.getClassMetadata)(decorator_1.WS_CONTROLLER_KEY, target);
+        const controllerOption = (0, core_1.getClassMetadata)(core_1.WS_CONTROLLER_KEY, target);
         const controllerMiddleware = (_a = controllerOption.routerOptions.middleware) !== null && _a !== void 0 ? _a : [];
         const controllerConnectionMiddleware = (_b = controllerOption.routerOptions.connectionMiddleware) !== null && _b !== void 0 ? _b : [];
         this.app.on('connection', async (socket, request) => {
@@ -100,7 +99,7 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
                 ...controllerConnectionMiddleware,
             ], this.app);
             await connectFn(socket);
-            const wsEventInfos = (0, decorator_1.getClassMetadata)(decorator_1.WS_EVENT_KEY, target);
+            const wsEventInfos = (0, core_1.getClassMetadata)(core_1.WS_EVENT_KEY, target);
             // 存储方法对应的响应处理
             const methodMap = {};
             if (wsEventInfos.length) {
@@ -108,11 +107,17 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
                     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_1.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) || []),
                                 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, [socket, request]);
                                 },
@@ -124,7 +129,7 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
                             this.logger.error(err);
                         }
                     }
-                    else if (wsEventInfo.eventType === decorator_1.WSEventTypeEnum.ON_MESSAGE) {
+                    else if (wsEventInfo.eventType === core_1.WSEventTypeEnum.ON_MESSAGE) {
                         // on user custom event
                         socket.on(wsEventInfo.messageEventName, async (...args) => {
                             debug('[ws]: got message', wsEventInfo.messageEventName, args);
@@ -156,7 +161,7 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
                             }
                         });
                     }
-                    else if (wsEventInfo.eventType === decorator_1.WSEventTypeEnum.ON_DISCONNECTION) {
+                    else if (wsEventInfo.eventType === core_1.WSEventTypeEnum.ON_DISCONNECTION) {
                         // on socket disconnect
                         socket.on('close', async (reason) => {
                             try {
@@ -187,10 +192,10 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
             return;
         if (methodMap[propertyName]) {
             for (const wsEventInfo of methodMap[propertyName].responseEvents) {
-                if (wsEventInfo.eventType === decorator_1.WSEventTypeEnum.EMIT) {
+                if (wsEventInfo.eventType === core_1.WSEventTypeEnum.EMIT) {
                     socket.send(formatResult(result));
                 }
-                else if (wsEventInfo.eventType === decorator_1.WSEventTypeEnum.BROADCAST) {
+                else if (wsEventInfo.eventType === core_1.WSEventTypeEnum.BROADCAST) {
                     this.app.clients.forEach(client => {
                         if (client.readyState === WebSocket.OPEN) {
                             client.send(formatResult(result));
@@ -219,10 +224,10 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
     }
 };
 MidwayWSFramework = __decorate([
-    (0, decorator_1.Framework)()
+    (0, core_1.Framework)()
 ], MidwayWSFramework);
 exports.MidwayWSFramework = MidwayWSFramework;
 function formatResult(result) {
-    return decorator_1.Types.isObject(result) ? JSON.stringify(result) : result;
+    return core_1.Types.isObject(result) ? JSON.stringify(result) : result;
 }
 //# sourceMappingURL=framework.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/ws",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "description": "Midway Web Framework for ws",
   "main": "dist/index",
   "typings": "index.d.ts",
@@ -23,15 +23,14 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.4.11",
-    "@midwayjs/mock": "^3.5.1",
+    "@midwayjs/mock": "^3.6.0",
     "@types/ws": "8.5.3",
     "fs-extra": "10.0.1"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.5.1",
+    "@midwayjs/core": "^3.6.0",
     "@midwayjs/logger": "^2.15.0",
-    "ws": "8.8.1"
+    "ws": "8.9.0"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -41,5 +40,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "3b63fc768617037644602dd5ad66d3734ce01b16"
+  "gitHead": "22643b0e8519766bb7c68b975930199fc136336e"
 }