@midwayjs/web 3.3.6 → 3.4.0-beta.2

package/dist/framework/web.d.ts

@@ -1,22 +1,16 @@
-import { BaseFramework, IMidwayBootstrapOptions, RouterInfo, WebControllerGenerator } from '@midwayjs/core';
+import { BaseFramework, IMidwayBootstrapOptions } from '@midwayjs/core';
 import { MidwayFrameworkType } from '@midwayjs/decorator';
 import { IMidwayWebConfigurationOptions, Application, Context } from '../interface';
-import { EggRouter } from '@eggjs/router';
 import { EggLogger } from 'egg';
-declare class EggControllerGenerator extends WebControllerGenerator<EggRouter> {
-    readonly app: any;
-    constructor(app: any);
-    createRouter(routerOptions: any): EggRouter;
-    generateController(routeInfo: RouterInfo): (ctx: any, next: any) => Promise<void>;
-}
 export declare class MidwayWebFramework extends BaseFramework<Application, Context, IMidwayWebConfigurationOptions> {
     protected loggers: {
         [name: string]: EggLogger;
     };
-    generator: EggControllerGenerator;
+    private generator;
     private server;
     private agent;
     private isClusterMode;
+    private webRouterService;
     appDir: any;
     configure(): any;
     initSingleProcessEgg(): Promise<void>;
@@ -31,5 +25,4 @@ export declare class MidwayWebFramework extends BaseFramework<Application, Conte
     beforeStop(): Promise<void>;
     setServer(server: any): void;
 }
-export {};
 //# sourceMappingURL=web.d.ts.map

package/dist/framework/web.js

@@ -18,9 +18,10 @@ const path_1 = require("path");
 const util_1 = require("util");
 const debug = (0, util_1.debuglog)('midway:debug');
 class EggControllerGenerator extends core_1.WebControllerGenerator {
-    constructor(app) {
-        super(app);
+    constructor(app, webRouterService) {
+        super(app, webRouterService);
         this.app = app;
+        this.webRouterService = webRouterService;
     }
     createRouter(routerOptions) {
         const router = new router_1.EggRouter(routerOptions, this.app);
@@ -73,19 +74,39 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
             this.app = options['application'];
         }
         // not found middleware
-        const notFound = async (ctx, next) => {
+        const midwayRouterNotFound = async (ctx, next) => {
             await next();
             if (!ctx._matchedRoute && ctx.body === undefined) {
                 throw new core_1.httpError.NotFoundError(`${ctx.path} Not Found`);
             }
         };
+        const bodyPatch = async (ctx, next) => {
+            await next();
+            if (ctx.body === undefined &&
+                !ctx.response._explicitStatus &&
+                ctx._matchedRoute) {
+                // 如果进了路由，重新赋值，防止 404
+                ctx.body = undefined;
+            }
+            if (ctx.response._midwayControllerNullBody &&
+                ctx.body &&
+                ctx.status === 204) {
+                ctx.status = 200;
+            }
+        };
         // insert error handler
         const midwayRootMiddleware = async (ctx, next) => {
             // this.app.createAnonymousContext(ctx);
-            await (await this.applyMiddleware(notFound))(ctx, next);
+            this.middlewareManager.insertAfter(bodyPatch, 'notfound');
+            await (await this.applyMiddleware(midwayRouterNotFound))(ctx, next);
         };
         this.app.use(midwayRootMiddleware);
-        this.generator = new EggControllerGenerator(this.app);
+        this.webRouterService = await this.applicationContext.getAsync(core_1.MidwayWebRouterService, [
+            {
+                globalPrefix: this.configurationOptions.globalPrefix,
+            },
+        ]);
+        this.generator = new EggControllerGenerator(this.app, this.webRouterService);
         this.overwriteApplication('app');
         this.app.loader.loadOrigin();
         // 这里拦截 app.use 方法，让他可以加到 midway 的 middlewareManager 中
@@ -149,7 +170,7 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
     async loadMidwayController() {
         // move egg router to last
         this.app.getMiddleware().findAndInsertLast('eggRouterMiddleware');
-        await this.generator.loadMidwayController(this.configurationOptions.globalPrefix, newRouter => {
+        await this.generator.loadMidwayController(newRouter => {
             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) || '/'})`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.3.6",
+  "version": "3.4.0-beta.2",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index",
   "typings": "index.d.ts",
@@ -28,13 +28,13 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.3.4",
+    "@midwayjs/decorator": "^3.4.0-beta.2",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/mock": "^3.3.5",
+    "@midwayjs/mock": "^3.4.0-beta.2",
     "axios": "0.26.1",
     "dayjs": "1.10.8",
     "egg-logger": "2.7.1",
-    "egg-mock": "4.2.0",
+    "egg-mock": "4.2.1",
     "egg-scripts": "2.15.3",
     "egg-socket.io": "4.1.6",
     "egg-view-nunjucks": "2.3.0",
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^3.3.5",
+    "@midwayjs/core": "^3.4.0-beta.2",
     "egg": "^2.28.0",
     "egg-cluster": "^1.27.1",
     "find-up": "5.0.0",
@@ -61,5 +61,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "cede47c56635e5f687528f6c8ed77d49ce9842a7"
+  "gitHead": "a61721d3946b30fd4cac183265edcd99b31ac72b"
 }