@midwayjs/web 3.0.0-beta.7 → 3.0.0-beta.8

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 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.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)
 
 

package/README.md

@@ -5,7 +5,7 @@
 
 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/app.js

@@ -24,10 +24,9 @@ class AppBootHook {
   async didLoad() {
     debug('[egg lifecycle]: app didLoad');
     if (this.app.loader['useEggSocketIO']) {
-      // socketio 下会提前加入 session 中间件，这里删除，防止重复加载
-      if (this.app.middleware.length && this.app.middleware[this.app.middleware.length - 1]._name === 'session') {
-        this.app.middleware.pop();
-      }
+      // egg socket.io 需要这个中间件
+      // const session = this.app.getMiddleware().findItem('session');
+      // this.app.middleware.push(session);
     }
   }
 

package/dist/configuration.d.ts

@@ -6,7 +6,7 @@ export declare class EggConfiguration {
     app: IMidwayWebApplication;
     decoratorService: MidwayDecoratorService;
     init(): void;
-    onReady(container: any): Promise<void>;
+    onReady(): Promise<void>;
     onServerReady(): Promise<void>;
     onStop(): Promise<void>;
 }

package/dist/configuration.js

@@ -18,7 +18,11 @@ let EggConfiguration = class EggConfiguration {
             return (0, core_1.extractKoaLikeValue)(options.metadata.type, options.metadata.propertyData, options.originParamType)(options.originArgs[0], options.originArgs[1]);
         });
     }
-    async onReady(container) { }
+    async onReady() {
+        // ps: 本想在这里清理掉egg添加的中间件，但是这里的数组已经只有一个 midway root middleware，其他的 getter 都是 egg 加进去的，但是不会被中间件执行，所以不需要清理
+        // 去掉为了 egg-socket.io 报错扫进去的 session
+        this.app.middleware = this.app.middleware.slice(0);
+    }
     async onServerReady() {
         // trigger server didReady
         this.app.messenger.emit('egg-ready');

package/dist/framework/web.js

@@ -72,10 +72,11 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
             await this.initSingleProcessEgg();
         }
         // insert error handler
-        this.app.use(async (ctx, next) => {
+        const midwayRootMiddleware = async (ctx, next) => {
             // this.app.createAnonymousContext(ctx);
             await (await this.getMiddleware())(ctx, next);
-        });
+        };
+        this.app.use(midwayRootMiddleware);
         this.generator = new EggControllerGenerator(this.app, this.applicationContext, this.appLogger);
         this.overwriteApplication('app');
         await new Promise(resolve => {
@@ -84,7 +85,7 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
                 resolve();
             });
             this.app.loader.loadOrigin();
-            // hack use method
+            // 这里拦截 app.use 方法，让他可以加到 midway 的 middlewareManager 中
             this.app.originUse = this.app.use;
             this.app.use = this.app.useMiddleware;
             this.app.ready();
@@ -109,6 +110,13 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         });
         debug(`[egg]: overwrite properties to "${processType}"`);
         this.defineApplicationProperties({
+            generateController: (controllerMapping) => {
+                const [controllerId, methodName] = controllerMapping.split('.');
+                return this.generator.generateController({
+                    id: controllerId,
+                    method: methodName,
+                });
+            },
             generateMiddleware: async (middlewareId) => {
                 return this.generateMiddleware(middlewareId);
             },
@@ -128,7 +136,10 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
     }
     async loadMidwayController() {
         await this.generator.loadMidwayController(this.configurationOptions.globalPrefix, newRouter => {
-            this.app.use(newRouter.middleware());
+            var _a;
+            const dispatchFn = newRouter.middleware();
+            dispatchFn._name = `midwayController(${((_a = newRouter === null || newRouter === void 0 ? void 0 : newRouter.opts) === null || _a === void 0 ? void 0 : _a.prefix) || '/'})`;
+            this.app.useMiddleware(dispatchFn);
         });
     }
     getFrameworkType() {
@@ -136,10 +147,13 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
     }
     async run() {
         var _a;
+        // move egg router to last
+        this.app.getMiddleware().findAndInsertLast('eggRouterMiddleware');
         // load controller
         await this.loadMidwayController();
         // restore use method
         this.app.use = this.app.originUse;
+        debug(`[egg]: current middleware = ${this.middlewareManager.getNames()}`);
         if (!this.isClusterMode) {
             // https config
             if (this.configurationOptions.key && this.configurationOptions.cert) {
@@ -170,17 +184,19 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
             const eggConfig = this.configService.getConfiguration('egg');
             if (!this.isClusterMode && eggConfig) {
                 const customPort = (_a = process.env.MIDWAY_HTTP_PORT) !== null && _a !== void 0 ? _a : eggConfig.port;
-                new Promise(resolve => {
-                    const args = [customPort];
-                    if (eggConfig.hostname) {
-                        args.push(eggConfig.hostname);
-                    }
-                    args.push(() => {
-                        resolve();
+                if (customPort) {
+                    new Promise(resolve => {
+                        const args = [customPort];
+                        if (eggConfig.hostname) {
+                            args.push(eggConfig.hostname);
+                        }
+                        args.push(() => {
+                            resolve();
+                        });
+                        this.server.listen(...args);
+                        process.env.MIDWAY_HTTP_PORT = String(customPort);
                     });
-                    this.server.listen(...args);
-                    process.env.MIDWAY_HTTP_PORT = String(customPort);
-                });
+                }
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.8",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -27,8 +27,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.7",
-    "@midwayjs/mock": "^3.0.0-beta.7",
+    "@midwayjs/decorator": "^3.0.0-beta.8",
+    "@midwayjs/mock": "^3.0.0-beta.8",
     "dayjs": "^1.10.7",
     "egg-logger": "^2.4.2",
     "egg-mock": "^3.26.0",
@@ -43,8 +43,8 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^3.0.0-beta.7",
-    "@midwayjs/logger": "^3.0.0-beta.7",
+    "@midwayjs/core": "^3.0.0-beta.8",
+    "@midwayjs/logger": "^3.0.0-beta.8",
     "egg": "^2.28.0",
     "extend2": "^1.0.0",
     "find-up": "^5.0.0",
@@ -58,5 +58,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "24590729121d9110e2d960db5b5e587cf55a1efc"
+  "gitHead": "bfafbdf8798f48d4daac5dd88ad53c6b2f33c110"
 }