@midwayjs/socketio 3.19.2 → 4.0.0-alpha.1

package/dist/configuration.js

@@ -10,10 +10,10 @@ exports.SocketIOConfiguration = void 0;
 const core_1 = require("@midwayjs/core");
 let SocketIOConfiguration = class SocketIOConfiguration {
 };
-SocketIOConfiguration = __decorate([
+exports.SocketIOConfiguration = SocketIOConfiguration;
+exports.SocketIOConfiguration = SocketIOConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'socketIO',
     })
 ], SocketIOConfiguration);
-exports.SocketIOConfiguration = SocketIOConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/framework.d.ts

@@ -1,14 +1,13 @@
-import { BaseFramework, CommonMiddlewareUnion, ContextMiddlewareManager, MidwayFrameworkType } from '@midwayjs/core';
+import { BaseFramework, CommonMiddlewareUnion, ContextMiddlewareManager } from '@midwayjs/core';
 import { Application, IMidwaySocketIOOptions, Context, NextFunction } from './interface';
 export declare class MidwaySocketIOFramework extends BaseFramework<Application, Context, IMidwaySocketIOOptions> {
     private namespaceList;
     app: Application;
     protected connectionMiddlewareManager: ContextMiddlewareManager<Context, unknown, unknown>;
     configure(): IMidwaySocketIOOptions;
-    applicationInitialize(): void;
+    applicationInitialize(): Promise<void>;
     run(): Promise<void>;
     protected beforeStop(): Promise<void>;
-    getFrameworkType(): MidwayFrameworkType;
     private loadMidwayController;
     private addNamespace;
     private bindSocketResponse;

package/dist/framework.js

@@ -21,7 +21,7 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
     configure() {
         return this.configService.getConfiguration('socketIO');
     }
-    applicationInitialize() {
+    async applicationInitialize() {
         this.app = new socket_io_1.Server(this.configurationOptions);
         this.defineApplicationProperties({
             useConnectionMiddleware: (middleware) => {
@@ -57,23 +57,19 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
             });
         });
     }
-    getFrameworkType() {
-        return core_1.MidwayFrameworkType.WS_IO;
-    }
     async loadMidwayController() {
         // create room
-        const controllerModules = (0, core_2.listModule)(core_2.WS_CONTROLLER_KEY);
+        const controllerModules = core_1.DecoratorManager.listModule(core_2.WS_CONTROLLER_KEY);
         for (const module of controllerModules) {
             await this.addNamespace(module);
         }
     }
     async addNamespace(target) {
-        var _a, _b;
-        const controllerOption = (0, core_2.getClassMetadata)(core_2.WS_CONTROLLER_KEY, target);
+        const controllerOption = core_1.MetadataManager.getOwnMetadata(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 : [];
-        const controllerConnectionMiddleware = (_b = controllerOption.routerOptions.connectionMiddleware) !== null && _b !== void 0 ? _b : [];
+        const controllerMiddleware = controllerOption.routerOptions.middleware ?? [];
+        const controllerConnectionMiddleware = controllerOption.routerOptions.connectionMiddleware ?? [];
         nsp.use((socket, next) => {
             this.app.createAnonymousContext(socket);
             socket.requestContext.registerObject('socket', socket);
@@ -89,7 +85,7 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
                 ...controllerConnectionMiddleware,
             ], this.app)
                 .then(connectFn => connectFn(socket));
-            const wsEventInfos = (0, core_2.getClassMetadata)(core_2.WS_EVENT_KEY, target);
+            const wsEventInfos = core_1.MetadataManager.getMetadata(core_2.WS_EVENT_KEY, target);
             // 存储方法对应的响应处理
             const methodMap = {};
             // 优先处理`@OnWSConnection`
@@ -99,12 +95,11 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
                 connMiddlewarePromise = connMiddlewarePromise.then(() => 
                 // 可能存在多个`@OnWSConnection`，这时不保障它们的执行顺序
                 Promise.all(wsOnConnectionEventInfos.map(async (wsEventInfo) => {
-                    var _a;
                     methodMap[wsEventInfo.propertyName] = methodMap[wsEventInfo.propertyName] || { responseEvents: [] };
                     const controller = await socket.requestContext.getAsync(target);
                     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) => {
                                 // eslint-disable-next-line prefer-spread
                                 return controller[wsEventInfo.propertyName].apply(controller, [socket]);
@@ -132,11 +127,10 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
                             debug('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) => {
                                             const isPassed = await this.app
                                                 .getFramework()
@@ -213,7 +207,7 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
         }
     }
     getFrameworkName() {
-        return 'midway:socketIO';
+        return 'socketIO';
     }
     useConnectionMiddleware(middleware) {
         this.connectionMiddlewareManager.insertLast(middleware);
@@ -222,8 +216,8 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
         return this.connectionMiddlewareManager;
     }
 };
-MidwaySocketIOFramework = __decorate([
+exports.MidwaySocketIOFramework = MidwaySocketIOFramework;
+exports.MidwaySocketIOFramework = MidwaySocketIOFramework = __decorate([
     (0, core_2.Framework)()
 ], MidwaySocketIOFramework);
-exports.MidwaySocketIOFramework = MidwaySocketIOFramework;
 //# sourceMappingURL=framework.js.map

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 export { MidwaySocketIOFramework as Framework } from './framework';
-export { createRedisAdapter } from './util';
 export * from './interface';
 export { SocketIOConfiguration as Configuration } from './configuration';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -14,11 +14,9 @@ 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.Configuration = exports.createRedisAdapter = 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.MidwaySocketIOFramework; } });
-var util_1 = require("./util");
-Object.defineProperty(exports, "createRedisAdapter", { enumerable: true, get: function () { return util_1.createRedisAdapter; } });
 __exportStar(require("./interface"), exports);
 var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.SocketIOConfiguration; } });

package/dist/interface.d.ts

@@ -14,9 +14,4 @@ export type Context = IMidwayContext<SocketIO.Socket & {
     app: Application;
 }>;
 export type NextFunction = BaseNextFunction;
-declare module '@midwayjs/core/dist/interface' {
-    interface MidwayConfig {
-        socketIO?: IMidwaySocketIOOptions;
-    }
-}
 //# sourceMappingURL=interface.d.ts.map

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/socketio",
-  "version": "3.19.2",
+  "version": "4.0.0-alpha.1",
   "description": "Midway Web Framework for socket.io",
   "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": [
@@ -24,14 +24,12 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/mock": "^3.19.2",
+    "@midwayjs/core": "^4.0.0-alpha.1",
     "fs-extra": "11.2.0",
     "socket.io-client": "4.8.1"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.19.0",
-    "socket.io": "4.8.1",
-    "socket.io-redis": "^6.1.0"
+    "socket.io": "4.8.1"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -41,5 +39,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "57fd034be94897fb819b0d9ef776de0b9923ab0f"
+  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
 }

package/dist/util.d.ts

@@ -1,7 +0,0 @@
-import { RedisAdapterOptions } from 'socket.io-redis';
-export declare function createRedisAdapter(options: {
-    host: string;
-    port: number;
-} & Partial<RedisAdapterOptions>): any;
-export declare function createRedisAdapter(options: Partial<RedisAdapterOptions>): any;
-//# sourceMappingURL=util.d.ts.map

package/dist/util.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRedisAdapter = void 0;
-const socket_io_redis_1 = require("socket.io-redis");
-function createRedisAdapter(options) {
-    if (options.host && options.port) {
-        return (0, socket_io_redis_1.createAdapter)('redis://' + options.host + ':' + options.port, options);
-    }
-    if (options.pubClient && options.subClient) {
-        return (0, socket_io_redis_1.createAdapter)(options);
-    }
-    throw new Error('error socket adapter options');
-}
-exports.createRedisAdapter = createRedisAdapter;
-//# sourceMappingURL=util.js.map