@midwayjs/ws 3.20.8 → 4.0.0-beta.1

package/dist/configuration.js

@@ -10,7 +10,8 @@ exports.WebSocketConfiguration = void 0;
 const core_1 = require("@midwayjs/core");
 let WebSocketConfiguration = class WebSocketConfiguration {
 };
-WebSocketConfiguration = __decorate([
+exports.WebSocketConfiguration = WebSocketConfiguration;
+exports.WebSocketConfiguration = WebSocketConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'webSocket',
         importConfigs: [
@@ -20,10 +21,16 @@ WebSocketConfiguration = __decorate([
                         enableServerHeartbeatCheck: false,
                         serverHeartbeatInterval: 30000,
                     },
+                    midwayLogger: {
+                        clients: {
+                            wsLogger: {
+                                fileLogName: 'midway-ws.log',
+                            },
+                        },
+                    },
                 },
             },
         ],
     })
 ], WebSocketConfiguration);
-exports.WebSocketConfiguration = WebSocketConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/framework.d.ts

@@ -1,19 +1,18 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { BaseFramework, CommonMiddlewareUnion, ContextMiddlewareManager, IMidwayBootstrapOptions, MidwayFrameworkType } from '@midwayjs/core';
+import { BaseFramework, CommonMiddlewareUnion, ContextMiddlewareManager, IMidwayBootstrapOptions } from '@midwayjs/core';
 import * as http from 'http';
 import { Application, Context, IMidwayWSApplication, IMidwayWSConfigurationOptions, NextFunction } from './interface';
 export declare class MidwayWSFramework extends BaseFramework<Application, Context, IMidwayWSConfigurationOptions> {
     server: http.Server;
     protected heartBeatInterval: NodeJS.Timeout;
     protected connectionMiddlewareManager: ContextMiddlewareManager<Context, unknown, unknown>;
+    protected frameworkLoggerName: string;
     configure(): IMidwayWSConfigurationOptions;
-    applicationInitialize(options: IMidwayBootstrapOptions): void;
+    applicationInitialize(options: IMidwayBootstrapOptions): Promise<void>;
     app: IMidwayWSApplication;
-    protected afterContainerReady(options: Partial<IMidwayBootstrapOptions>): Promise<void>;
     run(): Promise<void>;
     protected beforeStop(): Promise<void>;
-    getFrameworkType(): MidwayFrameworkType;
     private loadMidwayController;
     private addNamespace;
     private bindSocketResponse;

package/dist/framework.js

@@ -16,11 +16,12 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
     constructor() {
         super(...arguments);
         this.connectionMiddlewareManager = this.createMiddlewareManager();
+        this.frameworkLoggerName = 'wsLogger';
     }
     configure() {
         return this.configService.getConfiguration('webSocket');
     }
-    applicationInitialize(options) {
+    async applicationInitialize(options) {
         this.configurationOptions.noServer = true;
         const opts = Object.assign({}, this.configurationOptions, { port: null });
         this.app = new WebSocket.Server(opts);
@@ -32,19 +33,16 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
                 return this.getConnectionMiddleware();
             },
         });
-    }
-    async afterContainerReady(options) {
         await this.loadMidwayController();
     }
     async run() {
-        var _a;
         let server;
         if (!this.configurationOptions.port) {
             server = this.applicationContext.get(core_1.HTTP_SERVER_KEY);
             this.logger.info('[midway:ws] WebSocket server find shared http server and will be attach.');
         }
         else {
-            server = (_a = this.configurationOptions.server) !== null && _a !== void 0 ? _a : http.createServer();
+            server = this.configurationOptions.server ?? http.createServer();
         }
         server.on('upgrade', (request, socket, head) => {
             this.app.handleUpgrade(request, socket, head, ws => {
@@ -74,24 +72,19 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
             this.server.close();
         });
     }
-    getFrameworkType() {
-        return core_1.MidwayFrameworkType.WS;
-    }
     async loadMidwayController() {
         // create room
-        const controllerModules = (0, core_1.listModule)(core_1.WS_CONTROLLER_KEY);
+        const controllerModules = core_1.DecoratorManager.listModule(core_1.WS_CONTROLLER_KEY);
         if (controllerModules.length > 0) {
             // ws just one namespace
             await this.addNamespace(controllerModules[0]);
         }
     }
     async addNamespace(target) {
-        var _a, _b;
-        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 : [];
+        const controllerOption = core_1.MetadataManager.getOwnMetadata(core_1.WS_CONTROLLER_KEY, target);
+        const controllerMiddleware = controllerOption.routerOptions.middleware ?? [];
+        const controllerConnectionMiddleware = controllerOption.routerOptions.connectionMiddleware ?? [];
         this.app.on('connection', async (socket, request) => {
-            var _a;
             socket.isAlive = true;
             socket.on('error', error => {
                 this.logger.error(`socket got error: ${error}`);
@@ -102,7 +95,6 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
             // create request context
             this.app.createAnonymousContext(socket);
             socket.requestContext.registerObject('socket', socket);
-            socket.request = request;
             socket.app = this.app;
             // run connection middleware
             const connectFn = await this.middlewareService.compose([
@@ -110,7 +102,7 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
                 ...controllerConnectionMiddleware,
             ], this.app);
             await connectFn(socket);
-            const wsEventInfos = (0, core_1.getClassMetadata)(core_1.WS_EVENT_KEY, target);
+            const wsEventInfos = core_1.MetadataManager.getMetadata(core_1.WS_EVENT_KEY, target);
             // 存储方法对应的响应处理
             const methodMap = {};
             if (wsEventInfos.length) {
@@ -121,7 +113,7 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
                     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) || []),
+                                ...(wsEventInfo?.eventOptions?.middleware || []),
                                 async (ctx, next) => {
                                     const isPassed = await this.app
                                         .getFramework()
@@ -146,11 +138,10 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
                             debug('[ws]: got message', wsEventInfo.messageEventName, args);
                             try {
                                 const result = await (await this.applyMiddleware(async (ctx, next) => {
-                                    var _a;
                                     // add controller middleware
                                     const fn = await this.middlewareService.compose([
                                         ...controllerMiddleware,
-                                        ...(((_a = wsEventInfo === null || wsEventInfo === void 0 ? void 0 : wsEventInfo.eventOptions) === null || _a === void 0 ? void 0 : _a.middleware) || []),
+                                        ...(wsEventInfo?.eventOptions?.middleware || []),
                                         async (ctx, next) => {
                                             // eslint-disable-next-line prefer-spread
                                             return controller[wsEventInfo.propertyName].apply(controller, args);
@@ -228,7 +219,7 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
         }
     }
     getFrameworkName() {
-        return 'midway:ws';
+        return 'webSocket';
     }
     useConnectionMiddleware(middleware) {
         this.connectionMiddlewareManager.insertLast(middleware);
@@ -249,10 +240,10 @@ let MidwayWSFramework = class MidwayWSFramework extends core_1.BaseFramework {
         }, this.configurationOptions.serverHeartbeatInterval);
     }
 };
-MidwayWSFramework = __decorate([
+exports.MidwayWSFramework = MidwayWSFramework;
+exports.MidwayWSFramework = MidwayWSFramework = __decorate([
     (0, core_1.Framework)()
 ], MidwayWSFramework);
-exports.MidwayWSFramework = MidwayWSFramework;
 function formatResult(result) {
     return core_1.Types.isObject(result) ? JSON.stringify(result) : result;
 }

package/dist/interface.d.ts

@@ -1,7 +1,5 @@
-/// <reference types="node" />
 import * as WebSocket from 'ws';
 import { CommonMiddlewareUnion, ContextMiddlewareManager, IConfigurationOptions, IMidwayApplication, IMidwayContext, NextFunction as BaseNextFunction } from '@midwayjs/core';
-import type { IncomingMessage } from 'http';
 export type IMidwayWSApplication = IMidwayApplication<IMidwayWSContext, {
     useConnectionMiddleware: (middleware: CommonMiddlewareUnion<Context, NextFunction, undefined>) => void;
     getConnectionMiddleware: ContextMiddlewareManager<Context, NextFunction, undefined>;
@@ -21,7 +19,6 @@ export type IMidwayWSConfigurationOptions = {
 export type IMidwayWSContext = IMidwayContext<WebSocket & {
     app: IMidwayWSApplication;
     isAlive: boolean;
-    request: IncomingMessage;
 }>;
 export type Application = IMidwayWSApplication;
 export type NextFunction = BaseNextFunction;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/ws",
-  "version": "3.20.8",
+  "version": "4.0.0-beta.1",
   "description": "Midway Web Framework for ws",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit",
     "ci": "npm run test"
   },
   "keywords": [
@@ -23,8 +23,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.20.4",
-    "@midwayjs/mock": "^3.20.4",
+    "@midwayjs/core": "^4.0.0-beta.1",
+    "@midwayjs/mock": "^4.0.0-beta.1",
     "fs-extra": "11.3.0"
   },
   "dependencies": {
@@ -39,5 +39,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "561d0e178875f28fcb98efaf6570e981b17b3870"
+  "gitHead": "832961ec3aff123c033197d8c00cb2bc9bad7ff8"
 }