@midwayjs/express 3.0.0-alpha.9 → 3.0.0-beta.12

package/CHANGELOG.md

@@ -3,6 +3,128 @@
 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.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28)
+
+
+### Features
+
+* custom error code & add @Files/@Fields ([#1438](https://github.com/midwayjs/midway/issues/1438)) ([b0032af](https://github.com/midwayjs/midway/commit/b0032afd2fa9ea0416fe69f4bd0c1a58bea5314e))
+* 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/express
+
+
+
+
+
+# [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
+
+* default add session  & bodyparser support for koa/express/faas ([#1420](https://github.com/midwayjs/midway/issues/1420)) ([cdaff31](https://github.com/midwayjs/midway/commit/cdaff317c3e862a95494a167995a28280af639bf))
+* 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/express
+
+
+
+
+
+# [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))
+* typeorm EntityView missing connectionName ([#1403](https://github.com/midwayjs/midway/issues/1403)) ([30b2b37](https://github.com/midwayjs/midway/commit/30b2b3711db485cb85d825d56aeabf53b1374cae))
+
+
+
+
+
+# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03)
+
+**Note:** Version bump only for package @midwayjs/express
+
+
+
+
+
+# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
+
+
+### Bug Fixes
+
+* class transformer method missing ([#1387](https://github.com/midwayjs/midway/issues/1387)) ([074e839](https://github.com/midwayjs/midway/commit/074e8393598dc95e2742f735df75a2191c5fe25d))
+
+
+
+
+
+# [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/express
+
+
+
+
+
+# [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))
+* auto transform args to type ([#1372](https://github.com/midwayjs/midway/issues/1372)) ([bb3f7d2](https://github.com/midwayjs/midway/commit/bb3f7d2028a034e1926d9df554849332354c3762))
+* support global prefix url ([#1371](https://github.com/midwayjs/midway/issues/1371)) ([cc5fe44](https://github.com/midwayjs/midway/commit/cc5fe44e1d221590562dc71e1f33ae96093e0da7))
+
+
+
+
+
+# [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/express
+
+
+
+
+
+# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14)
+
+
+### Features
+
+* add http2 support ([#1242](https://github.com/midwayjs/midway/issues/1242)) ([6cda27e](https://github.com/midwayjs/midway/commit/6cda27e9e22689e46ace543326b43ae21b134911))
+
+
+
+
+
 ## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09)
 
 **Note:** Version bump only for package @midwayjs/express

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/dist/config/config.default.d.ts

@@ -0,0 +1,22 @@
+import { Options, OptionsJson, OptionsText, OptionsUrlencoded } from 'body-parser';
+import { CookieOptions } from 'express';
+export declare const cookieParser: {
+    secret?: string | string[];
+    options?: CookieOptions;
+};
+export declare const bodyParser: {
+    enable?: boolean;
+    json?: OptionsJson & {
+        enable?: boolean;
+    };
+    raw?: Options & {
+        enable?: boolean;
+    };
+    text?: OptionsText & {
+        enable?: boolean;
+    };
+    urlencoded?: OptionsUrlencoded & {
+        enable?: boolean;
+    };
+};
+//# sourceMappingURL=config.default.d.ts.map

package/dist/config/config.default.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bodyParser = exports.cookieParser = void 0;
+exports.cookieParser = {};
+exports.bodyParser = {
+    enable: true,
+    json: {
+        enable: true,
+        limit: '1mb',
+        strict: true,
+    },
+    raw: {
+        enable: false,
+        limit: '1mb',
+    },
+    text: {
+        enable: true,
+        limit: '1mb',
+    },
+    urlencoded: {
+        enable: true,
+        extended: false,
+        limit: '1mb',
+        parameterLimit: 1000,
+    },
+};
+//# sourceMappingURL=config.default.js.map

package/dist/configuration.d.ts

@@ -0,0 +1,10 @@
+import { MidwayConfigService, MidwayDecoratorService } from '@midwayjs/core';
+import { MidwayExpressFramework } from './framework';
+export declare class ExpressConfiguration {
+    decoratorService: MidwayDecoratorService;
+    expressFramework: MidwayExpressFramework;
+    configService: MidwayConfigService;
+    init(): void;
+    onReady(): Promise<void>;
+}
+//# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -0,0 +1,84 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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.ExpressConfiguration = void 0;
+const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
+const session = require("@midwayjs/express-session");
+const framework_1 = require("./framework");
+const bodyParser = require("body-parser");
+const cookieParser = require("cookie-parser");
+const DefaultConfig = require("./config/config.default");
+let ExpressConfiguration = class ExpressConfiguration {
+    init() {
+        this.decoratorService.registerParameterHandler(decorator_1.WEB_ROUTER_PARAM_KEY, options => {
+            return (0, core_1.extractExpressLikeValue)(options.metadata.type, options.metadata.propertyData, options.originParamType)(options.originArgs[0], options.originArgs[1], options.originArgs[2]);
+        });
+    }
+    async onReady() {
+        var _a, _b;
+        const keys = (_a = this.configService.getConfiguration('express.keys')) !== null && _a !== void 0 ? _a : this.configService.getConfiguration('keys');
+        const cookieParserConfig = this.configService.getConfiguration('cookieParser');
+        // add cookie parser middleware
+        this.expressFramework
+            .getMiddleware()
+            .insertFirst(cookieParser((_b = cookieParserConfig.secret) !== null && _b !== void 0 ? _b : keys, cookieParserConfig.options));
+        // add body parser
+        const bodyparserConfig = this.configService.getConfiguration('bodyParser');
+        if (bodyparserConfig.enable) {
+            // create application/json parser
+            if (bodyparserConfig.json.enable) {
+                this.expressFramework.useMiddleware(bodyParser.json(bodyparserConfig.json));
+            }
+            if (bodyparserConfig.raw.enable) {
+                this.expressFramework.useMiddleware(bodyParser.raw(bodyparserConfig.raw));
+            }
+            if (bodyparserConfig.text.enable) {
+                this.expressFramework.useMiddleware(bodyParser.text(bodyparserConfig.text));
+            }
+            // create application/x-www-form-urlencoded parser
+            if (bodyparserConfig.urlencoded.enable) {
+                this.expressFramework.useMiddleware(bodyParser.urlencoded(bodyparserConfig.urlencoded));
+            }
+        }
+    }
+};
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", core_1.MidwayDecoratorService)
+], ExpressConfiguration.prototype, "decoratorService", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", framework_1.MidwayExpressFramework)
+], ExpressConfiguration.prototype, "expressFramework", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", core_1.MidwayConfigService)
+], ExpressConfiguration.prototype, "configService", void 0);
+__decorate([
+    (0, decorator_1.Init)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ExpressConfiguration.prototype, "init", null);
+ExpressConfiguration = __decorate([
+    (0, decorator_1.Configuration)({
+        namespace: 'express',
+        imports: [session],
+        importConfigs: [
+            {
+                default: DefaultConfig,
+            },
+        ],
+    })
+], ExpressConfiguration);
+exports.ExpressConfiguration = ExpressConfiguration;
+//# sourceMappingURL=configuration.js.map

package/dist/framework.d.ts

@@ -1,42 +1,33 @@
 /// <reference types="node" />
-import { BaseFramework, IMidwayBootstrapOptions, MidwayFrameworkType } from '@midwayjs/core';
-import { RouterParamValue } from '@midwayjs/decorator';
+import { BaseFramework, IMidwayBootstrapOptions, MiddlewareRespond, MidwayFrameworkType, RouterInfo } from '@midwayjs/core';
 import { IMidwayExpressApplication, IMidwayExpressConfigurationOptions, IMidwayExpressContext } from './interface';
-import type { IRouter, IRouterHandler } from 'express';
+import type { IRouter, IRouterHandler, Response, NextFunction } from 'express';
 import { Server } from 'net';
 import { MidwayExpressContextLogger } from './logger';
-export declare class MidwayExpressFramework extends BaseFramework<IMidwayExpressApplication, IMidwayExpressContext, IMidwayExpressConfigurationOptions> {
+export declare class MidwayExpressFramework extends BaseFramework<IMidwayExpressApplication, IMidwayExpressContext, IMidwayExpressConfigurationOptions, Response, NextFunction> {
     app: IMidwayExpressApplication;
-    private controllerIds;
-    prioritySortRouters: Array<{
-        priority: number;
-        router: IRouter;
-        prefix: string;
-    }>;
     private server;
+    private expressMiddlewareService;
+    configure(): IMidwayExpressConfigurationOptions;
     applicationInitialize(options: Partial<IMidwayBootstrapOptions>): Promise<void>;
-    protected afterContainerReady(options: Partial<IMidwayBootstrapOptions>): Promise<void>;
     run(): Promise<void>;
     getFrameworkType(): MidwayFrameworkType;
     /**
      * wrap controller string to middleware function
-     * @param controllerMapping like FooController.index
-     * @param routeArgsInfo
-     * @param routerResponseData
      */
-    generateController(controllerMapping: string, routeArgsInfo?: RouterParamValue[], routerResponseData?: any[]): IRouterHandler<any>;
+    protected generateController(routeInfo: RouterInfo): IRouterHandler<any>;
     loadMidwayController(): Promise<void>;
-    generateMiddleware(middlewareId: string): Promise<import("./interface").Middleware>;
     /**
-     * @param controllerOption
+     * @param routerOptions
      */
     protected createRouter(routerOptions: {
         sensitive: any;
     }): IRouter;
-    private handlerWebMiddleware;
+    applyMiddleware<Response, NextFunction>(): Promise<MiddlewareRespond<IMidwayExpressContext, Response, NextFunction>>;
     beforeStop(): Promise<void>;
     getServer(): Server;
     getFrameworkName(): string;
     getDefaultContextLoggerClass(): typeof MidwayExpressContextLogger;
+    protected sendData(res: any, data: any): void;
 }
 //# sourceMappingURL=framework.d.ts.map

package/dist/framework.js

@@ -1,54 +1,120 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayExpressFramework = void 0;
 const core_1 = require("@midwayjs/core");
 const decorator_1 = require("@midwayjs/decorator");
 const express = require("express");
 const logger_1 = require("./logger");
-class MidwayExpressFramework extends core_1.BaseFramework {
-    constructor() {
-        super(...arguments);
-        this.controllerIds = [];
-        this.prioritySortRouters = [];
+const middlewareService_1 = require("./middlewareService");
+const util_1 = require("util");
+const debug = (0, util_1.debuglog)('midway:debug');
+let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFramework {
+    configure() {
+        return this.configService.getConfiguration('express');
     }
     async applicationInitialize(options) {
+        this.expressMiddlewareService = await this.applicationContext.getAsync(middlewareService_1.MidwayExpressMiddlewareService, [this.applicationContext]);
+        debug('[express]: create express app');
         this.app = express();
-        this.defineApplicationProperties({
-            generateController: (controllerMapping) => {
-                return this.generateController(controllerMapping);
-            },
-            generateMiddleware: async (middlewareId) => {
-                return this.generateMiddleware(middlewareId);
-            },
-        });
+        debug('[express]: use root middleware');
+        // use root middleware
         this.app.use((req, res, next) => {
-            const ctx = { req, res };
+            const ctx = req;
             this.app.createAnonymousContext(ctx);
             req.requestContext = ctx.requestContext;
             ctx.requestContext.registerObject('req', req);
             ctx.requestContext.registerObject('res', res);
             next();
         });
+        this.defineApplicationProperties();
+        // hack use method
+        this.app.originUse = this.app.use;
+        this.app.use = this.app.useMiddleware;
+    }
+    async run() {
+        var _a;
+        debug(`[express]: use middlewares = "${this.getMiddleware().getNames()}"`);
+        // restore use method
+        this.app.use = this.app.originUse;
+        // use global middleware
+        const globalMiddleware = await this.applyMiddleware();
+        debug('[express]: use and apply all framework and global middleware');
+        this.app.use(globalMiddleware);
+        debug('[express]: use user router middleware');
+        // load controller
+        await this.loadMidwayController();
+        debug('[express]: use global error handler middleware');
+        // use global error handler
+        this.app.use((err, req, res, next) => {
+            this.filterManager
+                .runErrorFilter(err, req, res, next)
+                .then(data => {
+                var _a, _b;
+                const { result, error } = data;
+                if (error) {
+                    const status = (_b = (_a = error.status) !== null && _a !== void 0 ? _a : res.statusCode) !== null && _b !== void 0 ? _b : 500;
+                    // 5xx
+                    if (status >= 500) {
+                        try {
+                            req.logger.error(err);
+                        }
+                        catch (ex) {
+                            this.logger.error(err);
+                            this.logger.error(ex);
+                        }
+                        return;
+                    }
+                    // 4xx
+                    try {
+                        req.logger.warn(err);
+                    }
+                    catch (ex) {
+                        this.logger.warn(err);
+                        this.logger.error(ex);
+                    }
+                    res.status(status);
+                    next(error);
+                }
+                else {
+                    this.sendData(res, result);
+                }
+            })
+                .catch(err => {
+                next(err);
+            });
+        });
         // https config
         if (this.configurationOptions.key && this.configurationOptions.cert) {
             this.configurationOptions.key = core_1.PathFileUtil.getFileContentSync(this.configurationOptions.key);
             this.configurationOptions.cert = core_1.PathFileUtil.getFileContentSync(this.configurationOptions.cert);
             this.configurationOptions.ca = core_1.PathFileUtil.getFileContentSync(this.configurationOptions.ca);
-            this.server = require('https').createServer(this.configurationOptions, this.app);
+            if (this.configurationOptions.http2) {
+                this.server = require('http2').createSecureServer(this.configurationOptions, this.app);
+            }
+            else {
+                this.server = require('https').createServer(this.configurationOptions, this.app);
+            }
         }
         else {
-            this.server = require('http').createServer(this.app);
+            if (this.configurationOptions.http2) {
+                this.server = require('http2').createServer(this.app);
+            }
+            else {
+                this.server = require('http').createServer(this.app);
+            }
         }
         // register httpServer to applicationContext
         this.applicationContext.registerObject(core_1.HTTP_SERVER_KEY, this.server);
-    }
-    async afterContainerReady(options) {
-        await this.loadMidwayController();
-    }
-    async run() {
-        if (this.configurationOptions.port) {
+        const customPort = (_a = process.env.MIDWAY_HTTP_PORT) !== null && _a !== void 0 ? _a : this.configurationOptions.port;
+        if (customPort) {
             new Promise(resolve => {
-                const args = [this.configurationOptions.port];
+                const args = [customPort];
                 if (this.configurationOptions.hostname) {
                     args.push(this.configurationOptions.hostname);
                 }
@@ -56,6 +122,7 @@ class MidwayExpressFramework extends core_1.BaseFramework {
                     resolve();
                 });
                 this.server.listen(...args);
+                process.env.MIDWAY_HTTP_PORT = String(customPort);
             });
         }
     }
@@ -64,22 +131,11 @@ class MidwayExpressFramework extends core_1.BaseFramework {
     }
     /**
      * wrap controller string to middleware function
-     * @param controllerMapping like FooController.index
-     * @param routeArgsInfo
-     * @param routerResponseData
      */
-    generateController(controllerMapping, routeArgsInfo, routerResponseData) {
-        const [controllerId, methodName] = controllerMapping.split('.');
-        return async (req, res, next) => {
-            const args = [req, res, next];
-            if (Array.isArray(routeArgsInfo)) {
-                await Promise.all(routeArgsInfo.map(async ({ index, type, propertyData }) => {
-                    args[index] = await core_1.extractExpressLikeValue(type, propertyData)(req, res, next);
-                }));
-            }
-            const controller = await req.requestContext.getAsync(controllerId);
-            // eslint-disable-next-line prefer-spread
-            const result = await controller[methodName].apply(controller, args);
+    generateController(routeInfo) {
+        return (0, middlewareService_1.wrapAsyncHandler)(async (req, res, next) => {
+            const controller = await req.requestContext.getAsync(routeInfo.id);
+            const result = await controller[routeInfo.method].call(controller, req, res, next);
             if (res.headersSent) {
                 // return when response send
                 return;
@@ -88,8 +144,9 @@ class MidwayExpressFramework extends core_1.BaseFramework {
                 res.status(204);
             }
             // implement response decorator
-            if (Array.isArray(routerResponseData) && routerResponseData.length) {
-                for (const routerRes of routerResponseData) {
+            if (Array.isArray(routeInfo.responseMetadata) &&
+                routeInfo.responseMetadata.length) {
+                for (const routerRes of routeInfo.responseMetadata) {
                     switch (routerRes.type) {
                         case decorator_1.WEB_RESPONSE_HTTP_CODE:
                             res.status(routerRes.code);
@@ -106,66 +163,61 @@ class MidwayExpressFramework extends core_1.BaseFramework {
                     }
                 }
             }
-            res.send(result);
-        };
+            const { result: returnValue, error } = await this.filterManager.runResultFilter(result, req, res, next);
+            if (error) {
+                throw error;
+            }
+            this.sendData(res, returnValue);
+        });
     }
     async loadMidwayController() {
-        const collector = new core_1.WebRouterCollector();
+        var _a, _b;
+        const collector = new core_1.WebRouterCollector('', {
+            globalPrefix: this.configurationOptions.globalPrefix,
+        });
         const routerTable = await collector.getRouterTable();
         const routerList = await collector.getRoutePriorityList();
         for (const routerInfo of routerList) {
-            const providerId = routerInfo.controllerId;
-            // controller id check
-            if (this.controllerIds.indexOf(providerId) > -1) {
-                throw new Error(`Controller identifier [${providerId}] already exists!`);
-            }
-            this.controllerIds.push(providerId);
-            this.logger.debug(`Load Controller "${providerId}", prefix=${routerInfo.prefix}`);
+            // bind controller first
+            this.getApplicationContext().bindClass(routerInfo.routerModule);
+            this.logger.debug(`Load Controller "${routerInfo.controllerId}", prefix=${routerInfo.prefix}`);
             // new router
             const newRouter = this.createRouter(routerInfo.routerOptions);
+            routerInfo.middleware = (_a = routerInfo.middleware) !== null && _a !== void 0 ? _a : [];
             // add router middleware
-            await this.handlerWebMiddleware(routerInfo.middleware, (middlewareImpl) => {
-                newRouter.use(middlewareImpl);
-            });
+            if (routerInfo.middleware.length) {
+                const routerMiddlewareFn = await this.expressMiddlewareService.compose(routerInfo.middleware, this.app);
+                newRouter.use(routerMiddlewareFn);
+            }
             // add route
             const routes = routerTable.get(routerInfo.prefix);
             for (const routeInfo of routes) {
-                // router middleware
-                await this.handlerWebMiddleware(routeInfo.middleware, (middlewareImpl) => {
-                    newRouter.use(middlewareImpl);
-                });
+                const routeMiddlewareList = [];
+                // routeInfo middleware
+                routeInfo.middleware = (_b = routeInfo.middleware) !== null && _b !== void 0 ? _b : [];
+                if (routeInfo.middleware.length) {
+                    const routeMiddlewareFn = await this.expressMiddlewareService.compose(routeInfo.middleware, this.app);
+                    routeMiddlewareList.push(routeMiddlewareFn);
+                }
                 this.logger.debug(`Load Router "${routeInfo.requestMethod.toUpperCase()} ${routeInfo.url}"`);
                 // apply controller from request context
-                newRouter[routeInfo.requestMethod].call(newRouter, routeInfo.url, this.generateController(routeInfo.handlerName, routeInfo.requestMetadata, routeInfo.responseMetadata));
+                newRouter[routeInfo.requestMethod].call(newRouter, routeInfo.url, ...routeMiddlewareList, this.generateController(routeInfo));
             }
             this.app.use(routerInfo.prefix, newRouter);
         }
     }
-    async generateMiddleware(middlewareId) {
-        const mwIns = await this.getApplicationContext().getAsync(middlewareId);
-        return mwIns.resolve();
-    }
     /**
-     * @param controllerOption
+     * @param routerOptions
      */
     createRouter(routerOptions) {
         return express.Router({ caseSensitive: routerOptions.sensitive });
     }
-    async handlerWebMiddleware(middlewares, handlerCallback) {
-        if (middlewares && middlewares.length) {
-            for (const middleware of middlewares) {
-                if (typeof middleware === 'function') {
-                    // web function middleware
-                    handlerCallback(middleware);
-                }
-                else {
-                    const middlewareImpl = await this.getApplicationContext().getAsync(middleware);
-                    if (middlewareImpl && typeof middlewareImpl.resolve === 'function') {
-                        handlerCallback(middlewareImpl.resolve());
-                    }
-                }
-            }
+    async applyMiddleware() {
+        if (!this.composeMiddleware) {
+            this.composeMiddleware = await this.expressMiddlewareService.compose(this.middlewareManager, this.app);
+            await this.filterManager.init(this.applicationContext);
         }
+        return this.composeMiddleware;
     }
     async beforeStop() {
         this.server.close();
@@ -179,6 +231,17 @@ class MidwayExpressFramework extends core_1.BaseFramework {
     getDefaultContextLoggerClass() {
         return logger_1.MidwayExpressContextLogger;
     }
-}
+    sendData(res, data) {
+        if (typeof data === 'number') {
+            res.status(res.statusCode).send('' + data);
+        }
+        else {
+            res.status(res.statusCode).send(data);
+        }
+    }
+};
+MidwayExpressFramework = __decorate([
+    (0, decorator_1.Framework)()
+], MidwayExpressFramework);
 exports.MidwayExpressFramework = MidwayExpressFramework;
 //# sourceMappingURL=framework.js.map

package/dist/index.d.ts

@@ -1,3 +1,6 @@
 export * from './interface';
 export { MidwayExpressFramework as Framework } from './framework';
+export { ExpressConfiguration as Configuration } from './configuration';
+export * from './middlewareService';
+export * from './logger';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -10,8 +10,12 @@ 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.Framework = void 0;
+exports.Configuration = exports.Framework = void 0;
 __exportStar(require("./interface"), exports);
 var framework_1 = require("./framework");
 Object.defineProperty(exports, "Framework", { enumerable: true, get: function () { return framework_1.MidwayExpressFramework; } });
+var configuration_1 = require("./configuration");
+Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.ExpressConfiguration; } });
+__exportStar(require("./middlewareService"), exports);
+__exportStar(require("./logger"), exports);
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -1,28 +1,29 @@
 /// <reference types="node" />
-import { IConfigurationOptions, IMidwayApplication, IMidwayContext } from '@midwayjs/core';
-import { Application as ExpressApplication, Request, Response, RequestHandler, NextFunction } from 'express';
-import { RouterParamValue } from "@midwayjs/decorator";
+import { CommonMiddlewareUnion, ContextMiddlewareManager, IConfigurationOptions, IMiddleware, IMidwayApplication, IMidwayContext } from '@midwayjs/core';
+import { Application as ExpressApplication, NextFunction as ExpressNextFunction, Request, Response } from 'express';
+import { Options, OptionsJson, OptionsText, OptionsUrlencoded } from 'body-parser';
+export declare type IMidwayExpressContext = IMidwayContext<Request>;
 /**
- * @deprecated use Request from express
+ * @deprecated use IMidwayExpressContext
  */
-export declare type IMidwayExpressRequest = Request;
-/**
- * @deprecated use Response from express
- */
-export declare type IMidwayExpressResponse = Response;
-/**
- * @deprecated use NextFunction from express
- */
-export declare type IMidwayExpressNext = NextFunction;
-export declare type IMidwayExpressContext = IMidwayContext<{
-    req: Request;
-    res: Response;
-}>;
-export declare type IMidwayExpressApplication = IMidwayApplication<IMidwayExpressContext, ExpressApplication & {
-    generateController(controllerMapping: string, routeArgsInfo?: RouterParamValue[], routerResponseData?: any[]): Middleware;
-    generateMiddleware(middlewareId: string): Promise<Middleware>;
-}>;
+export declare type IMidwayExpressRequest = IMidwayExpressContext;
+export declare type IMidwayExpressMiddleware = IMiddleware<IMidwayExpressContext, Response, ExpressNextFunction>;
+export interface IMidwayExpressApplication extends IMidwayApplication<IMidwayExpressContext, ExpressApplication> {
+    /**
+     * add global middleware to app
+     * @param Middleware
+     */
+    useMiddleware<Response, NextFunction>(Middleware: CommonMiddlewareUnion<IMidwayExpressContext, Response, NextFunction>): void;
+    /**
+     * get global middleware
+     */
+    getMiddleware<Response, NextFunction>(): ContextMiddlewareManager<IMidwayExpressContext, Response, NextFunction>;
+}
 export interface IMidwayExpressConfigurationOptions extends IConfigurationOptions {
+    /**
+     * session or cookie secret key
+     */
+    keys?: string | string[];
     /**
      * application http port
      */
@@ -43,13 +44,37 @@ export interface IMidwayExpressConfigurationOptions extends IConfigurationOption
      * https ca
      */
     ca?: string | Buffer | Array<string | Buffer>;
-}
-export declare type MiddlewareParamArray = RequestHandler[];
-export declare type Middleware = RequestHandler;
-export interface IWebMiddleware {
-    resolve(): Middleware;
+    /**
+     * http2 support
+     */
+    http2?: boolean;
+    /**
+     * http global prefix
+     */
+    globalPrefix?: string;
 }
 export declare type Application = IMidwayExpressApplication;
+export declare type NextFunction = ExpressNextFunction;
 export interface Context extends IMidwayExpressContext {
 }
+declare module '@midwayjs/core/dist/interface' {
+    interface MidwayConfig {
+        express?: IMidwayExpressConfigurationOptions;
+        bodyParser?: {
+            enable?: boolean;
+            json?: OptionsJson & {
+                enable?: boolean;
+            };
+            raw?: Options & {
+                enable?: boolean;
+            };
+            text?: OptionsText & {
+                enable?: boolean;
+            };
+            urlencoded?: OptionsUrlencoded & {
+                enable?: boolean;
+            };
+        };
+    }
+}
 //# sourceMappingURL=interface.d.ts.map

package/dist/logger.js

@@ -5,7 +5,7 @@ const logger_1 = require("@midwayjs/logger");
 class MidwayExpressContextLogger extends logger_1.MidwayContextLogger {
     formatContextLabel() {
         var _a;
-        const req = this.ctx.req;
+        const req = this.ctx;
         // format: '[$userId/$ip/$traceId/$use_ms $method $url]'
         const userId = ((_a = req === null || req === void 0 ? void 0 : req['session']) === null || _a === void 0 ? void 0 : _a['userId']) || '-';
         const traceId = '-';

package/dist/middlewareService.d.ts

@@ -0,0 +1,14 @@
+import { IMidwayContainer, CommonMiddleware, FunctionMiddleware } from '@midwayjs/core';
+import { IMidwayExpressContext, Application } from './interface';
+import { NextFunction, Response } from 'express';
+export declare function wrapAsyncHandler(fn: any): any;
+export declare class MidwayExpressMiddlewareService {
+    readonly applicationContext: IMidwayContainer;
+    constructor(applicationContext: IMidwayContainer);
+    compose(middleware: Array<CommonMiddleware<IMidwayExpressContext, Response, NextFunction> | string>, app: Application, name?: string): Promise<{
+        (req: IMidwayExpressContext, res: Response, nextFunction: NextFunction): any;
+        _name: string;
+    }>;
+}
+export declare function wrapMiddleware(mw: FunctionMiddleware<any, any, any>, options: any): (context: any, next: any, options?: any) => any;
+//# sourceMappingURL=middlewareService.d.ts.map

package/dist/middlewareService.js

@@ -0,0 +1,134 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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.wrapMiddleware = exports.MidwayExpressMiddlewareService = exports.wrapAsyncHandler = void 0;
+const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
+function wrapAsyncHandler(fn) {
+    if ((0, decorator_1.isAsyncFunction)(fn)) {
+        return (req, res, next) => {
+            return fn(req, res, next).catch(err => {
+                next(err);
+            });
+        };
+    }
+    else {
+        return fn;
+    }
+}
+exports.wrapAsyncHandler = wrapAsyncHandler;
+let MidwayExpressMiddlewareService = class MidwayExpressMiddlewareService {
+    constructor(applicationContext) {
+        this.applicationContext = applicationContext;
+    }
+    async compose(middleware, app, name) {
+        if (!Array.isArray(middleware)) {
+            throw new core_1.MidwayCommonError('Middleware stack must be an array');
+        }
+        const newMiddlewareArr = [];
+        for (let fn of middleware) {
+            if ((0, decorator_1.isClass)(fn) || typeof fn === 'string') {
+                if (typeof fn === 'string' &&
+                    !this.applicationContext.hasDefinition(fn)) {
+                    throw new core_1.MidwayCommonError('Middleware definition not found in midway container');
+                }
+                const classMiddleware = await this.applicationContext.getAsync(fn);
+                if (classMiddleware) {
+                    fn = classMiddleware.resolve(app);
+                    // wrap async middleware
+                    fn = wrapAsyncHandler(fn);
+                    if (!classMiddleware.match && !classMiddleware.ignore) {
+                        fn._name = classMiddleware.constructor.name;
+                        // just got fn
+                        newMiddlewareArr.push(fn);
+                    }
+                    else {
+                        // wrap ignore and match
+                        const mw = fn;
+                        const match = (0, core_1.pathMatching)({
+                            match: classMiddleware.match,
+                            ignore: classMiddleware.ignore,
+                        });
+                        fn = (req, res, next) => {
+                            if (!match(req))
+                                return next();
+                            return mw(req, res, next);
+                        };
+                        fn._name = classMiddleware.constructor.name;
+                        newMiddlewareArr.push(fn);
+                    }
+                }
+                else {
+                    throw new core_1.MidwayCommonError('Middleware must have resolve method!');
+                }
+            }
+            else {
+                // wrap async middleware
+                fn = wrapAsyncHandler(fn);
+                newMiddlewareArr.push(fn);
+            }
+        }
+        const composeFn = (req, res, nextFunction) => {
+            let index = -1;
+            function dispatch(pos, err) {
+                const handler = newMiddlewareArr[pos];
+                index = pos;
+                if (err || index === newMiddlewareArr.length) {
+                    return nextFunction(err);
+                }
+                function next(err) {
+                    if (pos < index) {
+                        throw new TypeError('`next()` called multiple times');
+                    }
+                    return dispatch(pos + 1, err);
+                }
+                try {
+                    return handler(req, res, next);
+                }
+                catch (err) {
+                    // Avoid future errors that could diverge stack execution.
+                    if (index > pos)
+                        throw err;
+                    return next(err);
+                }
+            }
+            return dispatch(0);
+        };
+        if (name) {
+            composeFn._name = name;
+        }
+        return composeFn;
+    }
+};
+MidwayExpressMiddlewareService = __decorate([
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton),
+    __metadata("design:paramtypes", [Object])
+], MidwayExpressMiddlewareService);
+exports.MidwayExpressMiddlewareService = MidwayExpressMiddlewareService;
+function wrapMiddleware(mw, options) {
+    // support options.enable
+    if (options.enable === false)
+        return null;
+    // support options.match and options.ignore
+    if (!options.match && !options.ignore)
+        return mw;
+    const match = (0, core_1.pathMatching)(options);
+    const fn = (req, res, next) => {
+        if (!match(req))
+            return next();
+        return mw(req, res, next);
+    };
+    fn._name = mw._name + 'middlewareWrapper';
+    return fn;
+}
+exports.wrapMiddleware = wrapMiddleware;
+//# sourceMappingURL=middlewareService.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/express",
-  "version": "3.0.0-alpha.9+d5acc750",
+  "version": "3.0.0-beta.12",
   "description": "Midway Web Framework for Express",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -23,14 +23,18 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-alpha.2",
-    "@midwayjs/mock": "^3.0.0-alpha.9+d5acc750",
+    "@midwayjs/decorator": "^3.0.0-beta.12",
+    "@midwayjs/logger": "^3.0.0-beta.12",
+    "@midwayjs/mock": "^3.0.0-beta.12",
+    "@types/body-parser": "^1.19.2",
     "@types/express": "^4.17.8",
     "fs-extra": "^8.0.1"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.0.0-alpha.9+d5acc750",
-    "@midwayjs/logger": "^2.11.3",
+    "@midwayjs/core": "^3.0.0-beta.12",
+    "@midwayjs/express-session": "^3.0.0-beta.12",
+    "body-parser": "^1.19.0",
+    "cookie-parser": "^1.4.6",
     "express": "^4.17.1"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
@@ -38,5 +42,8 @@
     "type": "git",
     "url": "http://github.com/midwayjs/midway.git"
   },
-  "gitHead": "d5acc7505275ea9d566edd38e5e0377141e0abc1"
+  "engines": {
+    "node": ">=12"
+  },
+  "gitHead": "1c46e53eb934248007eeb7fe3920f5ac24e272c6"
 }