@midwayjs/ws 3.0.0-beta.1 → 3.0.0-beta.13

package/CHANGELOG.md

@@ -3,6 +3,123 @@
 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.13](https://github.com/midwayjs/midway/compare/v3.0.0-beta.12...v3.0.0-beta.13) (2021-12-30)
+
+
+### Features
+
+* 404 error ([#1465](https://github.com/midwayjs/midway/issues/1465)) ([e7e8a9d](https://github.com/midwayjs/midway/commit/e7e8a9dedfa7198ac05b161b41024c2871f93965))
+
+
+
+
+
+# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28)
+
+
+### Features
+
+* support throw err status ([#1440](https://github.com/midwayjs/midway/issues/1440)) ([7b98110](https://github.com/midwayjs/midway/commit/7b98110d65c5287a8fcb3eb5356dea2d7a32cee9))
+
+
+
+
+
+# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21)
+
+**Note:** Version bump only for package @midwayjs/ws
+
+
+
+
+
+# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20)
+
+
+### Features
+
+* implement i18n for validate ([#1426](https://github.com/midwayjs/midway/issues/1426)) ([4c7ed2f](https://github.com/midwayjs/midway/commit/4c7ed2ff2e7ccf10f88f62abad230f92f5e76b97))
+
+
+
+
+
+# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09)
+
+**Note:** Version bump only for package @midwayjs/ws
+
+
+
+
+
+# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08)
+
+
+### Bug Fixes
+
+* express routing middleware takes effect at the controller level ([#1364](https://github.com/midwayjs/midway/issues/1364)) ([b9272e0](https://github.com/midwayjs/midway/commit/b9272e0971003443304b0c53815be31a0061b4bd))
+
+
+
+
+
+# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03)
+
+
+### Bug Fixes
+
+* middleware with ctx.body ([#1389](https://github.com/midwayjs/midway/issues/1389)) ([77af5c0](https://github.com/midwayjs/midway/commit/77af5c0b456f1843f4dcfd3dbfd2c0aa244c51bd))
+
+
+
+
+
+# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
+
+**Note:** Version bump only for package @midwayjs/ws
+
+
+
+
+
+# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25)
+
+**Note:** Version bump only for package @midwayjs/ws
+
+
+
+
+
+# [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)
 
 

package/README.md

@@ -1,11 +1,11 @@
-# midway framework for socket.io
+# midway framework for WebSocket
 
 [![Package Quality](http://npm.packagequality.com/shield/midway-web.svg)](http://packagequality.com/#?package=midway-web)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/midwayjs/midway/pulls)
 
 this is a sub package for midway.
 
-Document: [https://midwayjs.org/midway](https://midwayjs.org/midway)
+Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 

package/dist/configuration.d.ts

@@ -1,7 +1,3 @@
-import { MidwayWSFramework } from './framework';
 export declare class WebSocketConfiguration {
-    framework: MidwayWSFramework;
-    onReady(): Promise<void>;
-    onServerReady(): Promise<void>;
 }
 //# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -5,23 +5,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketConfiguration = void 0;
 const decorator_1 = require("@midwayjs/decorator");
-const framework_1 = require("./framework");
 let WebSocketConfiguration = class WebSocketConfiguration {
-    async onReady() { }
-    async onServerReady() {
-        await this.framework.run();
-    }
 };
-__decorate([
-    (0, decorator_1.Inject)(),
-    __metadata("design:type", framework_1.MidwayWSFramework)
-], WebSocketConfiguration.prototype, "framework", void 0);
 WebSocketConfiguration = __decorate([
     (0, decorator_1.Configuration)({
         namespace: 'webSocket',

package/dist/framework.js

@@ -10,7 +10,7 @@ exports.MidwayWSFramework = void 0;
 const core_1 = require("@midwayjs/core");
 const http = require("http");
 const util_1 = require("util");
-const debug = (0, util_1.debuglog)('midway:ws');
+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 {
@@ -96,15 +96,12 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
                     else if (wsEventInfo.eventType === decorator_1.WSEventTypeEnum.ON_MESSAGE) {
                         // on user custom event
                         socket.on(wsEventInfo.messageEventName, async (...args) => {
-                            debug('got message', wsEventInfo.messageEventName, args);
-                            const { result, error } = await (await this.getMiddleware(async (ctx, next) => {
-                                // eslint-disable-next-line prefer-spread
-                                return controller[wsEventInfo.propertyName].apply(controller, args);
-                            }))(socket);
-                            if (error) {
-                                this.logger.error(error);
-                            }
-                            else {
+                            debug('[ws]: got message', wsEventInfo.messageEventName, args);
+                            try {
+                                const result = await (await this.applyMiddleware(async (ctx, next) => {
+                                    // eslint-disable-next-line prefer-spread
+                                    return controller[wsEventInfo.propertyName].apply(controller, args);
+                                }))(socket);
                                 if (typeof args[args.length - 1] === 'function') {
                                     // ack
                                     args[args.length - 1](result);
@@ -114,6 +111,9 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
                                     await this.bindSocketResponse(result, socket, wsEventInfo.propertyName, methodMap);
                                 }
                             }
+                            catch (error) {
+                                this.logger.error(error);
+                            }
                         });
                     }
                     else if (wsEventInfo.eventType === decorator_1.WSEventTypeEnum.ON_DISCONNECTION) {

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-beta.1",
+  "version": "3.0.0-beta.13",
   "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-beta.1",
-    "@midwayjs/mock": "^3.0.0-beta.1",
+    "@midwayjs/decorator": "^3.0.0-beta.13",
+    "@midwayjs/mock": "^3.0.0-beta.13",
     "@types/ws": "^7.4.4",
     "fs-extra": "^8.0.1"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.0.0-beta.1",
-    "@midwayjs/logger": "^3.0.0-beta.1",
+    "@midwayjs/core": "^3.0.0-beta.13",
+    "@midwayjs/logger": "^3.0.0-beta.13",
     "ws": "^7.4.5"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
@@ -40,5 +40,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "72e4d20c678e65a5440c4e9a6d3b70046daa497c"
+  "gitHead": "d3c47770fee9dce33a8d148882173fd7782864ad"
 }