@midwayjs/ws 3.0.0-alpha.9 → 3.0.0-beta.4

package/CHANGELOG.md

@@ -3,6 +3,47 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24)
+
+
+### Features
+
+* add i18n ([#1375](https://github.com/midwayjs/midway/issues/1375)) ([bffefe0](https://github.com/midwayjs/midway/commit/bffefe07afe45777d49b5a76b9ab17fc2b9d9a55))
+
+
+
+
+
+# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18)
+
+
+### Features
+
+* add component and framework config definition ([#1367](https://github.com/midwayjs/midway/issues/1367)) ([b2fe615](https://github.com/midwayjs/midway/commit/b2fe6157f99659471ff1333eca0b86bb889f61a3))
+
+
+
+
+
+# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16)
+
+**Note:** Version bump only for package @midwayjs/ws
+
+
+
+
+
+# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14)
+
+
+### Bug Fixes
+
+* correct aspect chain bug ([#1204](https://github.com/midwayjs/midway/issues/1204)) ([5de5284](https://github.com/midwayjs/midway/commit/5de5284c70b44acc73eaaad651fd2edc72d54f28))
+
+
+
+
+
 ## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09)
 
 

package/dist/configuration.d.ts

@@ -0,0 +1,3 @@
+export declare class WebSocketConfiguration {
+}
+//# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -0,0 +1,26 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebSocketConfiguration = void 0;
+const decorator_1 = require("@midwayjs/decorator");
+let WebSocketConfiguration = class WebSocketConfiguration {
+};
+WebSocketConfiguration = __decorate([
+    (0, decorator_1.Configuration)({
+        namespace: 'webSocket',
+        importConfigs: [
+            {
+                default: {
+                    webSocket: {},
+                },
+            },
+        ],
+    })
+], WebSocketConfiguration);
+exports.WebSocketConfiguration = WebSocketConfiguration;
+//# sourceMappingURL=configuration.js.map

package/dist/framework.d.ts

@@ -4,6 +4,7 @@ import * as http from 'http';
 import { IMidwayWSApplication, IMidwayWSConfigurationOptions, IMidwayWSContext } from './interface';
 export declare class MidwayWSFramework extends BaseFramework<IMidwayWSApplication, IMidwayWSContext, IMidwayWSConfigurationOptions> {
     server: http.Server;
+    configure(): IMidwayWSConfigurationOptions;
     applicationInitialize(options: IMidwayBootstrapOptions): void;
     app: IMidwayWSApplication;
     protected afterContainerReady(options: Partial<IMidwayBootstrapOptions>): Promise<void>;

package/dist/framework.js

@@ -1,13 +1,22 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayWSFramework = void 0;
 const core_1 = require("@midwayjs/core");
 const http = require("http");
 const util_1 = require("util");
-const debug = util_1.debuglog('midway:ws');
+const debug = (0, util_1.debuglog)('midway:ws');
 const WebSocket = require("ws");
 const decorator_1 = require("@midwayjs/decorator");
-class MidwayWSFramework extends core_1.BaseFramework {
+let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
+    configure() {
+        return this.configService.getConfiguration('webSocket');
+    }
     applicationInitialize(options) {
         this.configurationOptions.noServer = true;
         const opts = Object.assign({}, this.configurationOptions, { port: null });
@@ -55,25 +64,25 @@ class MidwayWSFramework extends core_1.BaseFramework {
     }
     async loadMidwayController() {
         // create room
-        const controllerModules = core_1.listModule(decorator_1.WS_CONTROLLER_KEY);
+        const controllerModules = (0, decorator_1.listModule)(decorator_1.WS_CONTROLLER_KEY);
         if (controllerModules.length > 0) {
             // ws just one namespace
-            await this.addNamespace(controllerModules[0], core_1.getProviderId(controllerModules[0]));
+            await this.addNamespace(controllerModules[0]);
         }
     }
-    async addNamespace(target, controllerId) {
+    async addNamespace(target) {
         this.app.on('connection', async (socket, request) => {
             // create request context
             this.app.createAnonymousContext(socket);
             socket.requestContext.registerObject('socket', socket);
             socket.app = this.app;
-            const wsEventInfos = core_1.getClassMetadata(decorator_1.WS_EVENT_KEY, target);
+            const wsEventInfos = (0, decorator_1.getClassMetadata)(decorator_1.WS_EVENT_KEY, target);
             // 存储方法对应的响应处理
             const methodMap = {};
             if (wsEventInfos.length) {
                 for (const wsEventInfo of wsEventInfos) {
                     methodMap[wsEventInfo.propertyName] = methodMap[wsEventInfo.propertyName] || { responseEvents: [] };
-                    const controller = await socket.requestContext.getAsync(controllerId);
+                    const controller = await socket.requestContext.getAsync(target);
                     // on connection
                     if (wsEventInfo.eventType === decorator_1.WSEventTypeEnum.ON_CONNECTION) {
                         try {
@@ -88,14 +97,22 @@ class MidwayWSFramework extends core_1.BaseFramework {
                         // on user custom event
                         socket.on(wsEventInfo.messageEventName, async (...args) => {
                             debug('got message', wsEventInfo.messageEventName, args);
-                            try {
+                            const { result, error } = await (await this.getMiddleware(async (ctx, next) => {
                                 // eslint-disable-next-line prefer-spread
-                                const result = await controller[wsEventInfo.propertyName].apply(controller, args);
-                                // emit
-                                await this.bindSocketResponse(result, socket, wsEventInfo.propertyName, methodMap);
+                                return controller[wsEventInfo.propertyName].apply(controller, args);
+                            }))(socket);
+                            if (error) {
+                                this.logger.error(error);
                             }
-                            catch (err) {
-                                this.logger.error(err);
+                            else {
+                                if (typeof args[args.length - 1] === 'function') {
+                                    // ack
+                                    args[args.length - 1](result);
+                                }
+                                else {
+                                    // emit
+                                    await this.bindSocketResponse(result, socket, wsEventInfo.propertyName, methodMap);
+                                }
                             }
                         });
                     }
@@ -154,9 +171,12 @@ class MidwayWSFramework extends core_1.BaseFramework {
     getFrameworkName() {
         return 'midway:ws';
     }
-}
+};
+MidwayWSFramework = __decorate([
+    (0, decorator_1.Framework)()
+], MidwayWSFramework);
 exports.MidwayWSFramework = MidwayWSFramework;
 function formatResult(result) {
-    return decorator_1.isObject(result) ? JSON.stringify(result) : result;
+    return (0, decorator_1.isObject)(result) ? JSON.stringify(result) : result;
 }
 //# sourceMappingURL=framework.js.map

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export { MidwayWSFramework as Framework } from './framework';
 export * from './interface';
+export { WebSocketConfiguration as Configuration } from './configuration';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -10,8 +10,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Framework = void 0;
+exports.Configuration = exports.Framework = void 0;
 var framework_1 = require("./framework");
 Object.defineProperty(exports, "Framework", { enumerable: true, get: function () { return framework_1.MidwayWSFramework; } });
 __exportStar(require("./interface"), exports);
+var configuration_1 = require("./configuration");
+Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.WebSocketConfiguration; } });
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -1,8 +1,7 @@
 import * as WebSocket from 'ws';
-import { IConfigurationOptions, IMidwayApplication, IMidwayContext } from '@midwayjs/core';
+import { IConfigurationOptions, IMidwayApplication, IMidwayContext, NextFunction as BaseNextFunction } from '@midwayjs/core';
 export declare type IMidwayWSApplication = IMidwayApplication<IMidwayWSContext> & WebSocket.Server;
 export declare type IMidwayWSConfigurationOptions = {
-    port?: number;
     pubClient?: any;
     subClient?: any;
 } & Partial<WebSocket.ServerOptions> & IConfigurationOptions;
@@ -10,6 +9,12 @@ export declare type IMidwayWSContext = IMidwayContext<WebSocket & {
     app: IMidwayWSApplication;
 }>;
 export declare type Application = IMidwayWSApplication;
+export declare type NextFunction = BaseNextFunction;
 export interface Context extends IMidwayWSContext {
 }
+declare module '@midwayjs/core/dist/interface' {
+    interface MidwayConfig {
+        webSocket?: IMidwayWSConfigurationOptions;
+    }
+}
 //# sourceMappingURL=interface.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/ws",
-  "version": "3.0.0-alpha.9+d5acc750",
+  "version": "3.0.0-beta.4",
   "description": "Midway Web Framework for ws",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -22,14 +22,14 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-alpha.2",
-    "@midwayjs/mock": "^3.0.0-alpha.9+d5acc750",
+    "@midwayjs/decorator": "^3.0.0-beta.4",
+    "@midwayjs/mock": "^3.0.0-beta.4",
     "@types/ws": "^7.4.4",
     "fs-extra": "^8.0.1"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.0.0-alpha.9+d5acc750",
-    "@midwayjs/logger": "^2.11.3",
+    "@midwayjs/core": "^3.0.0-beta.4",
+    "@midwayjs/logger": "^3.0.0-beta.4",
     "ws": "^7.4.5"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
@@ -37,5 +37,8 @@
     "type": "git",
     "url": "http://github.com/midwayjs/midway.git"
   },
-  "gitHead": "d5acc7505275ea9d566edd38e5e0377141e0abc1"
+  "engines": {
+    "node": ">=12"
+  },
+  "gitHead": "02e2144e302f807770b512b0d89da3145b1cbf2e"
 }