@midwayjs/express 3.0.2 → 3.0.6

package/dist/config/config.default.d.ts

@@ -1,5 +1,8 @@
 import { Options, OptionsJson, OptionsText, OptionsUrlencoded } from 'body-parser';
 import { CookieOptions } from 'express';
+export declare const express: {
+    contextLoggerFormat: (info: any) => string;
+};
 export declare const cookieParser: {
     secret?: string | string[];
     options?: CookieOptions;

package/dist/config/config.default.js

@@ -1,6 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bodyParser = exports.cookieParser = void 0;
+exports.bodyParser = exports.cookieParser = exports.express = void 0;
+exports.express = {
+    contextLoggerFormat: info => {
+        var _a;
+        const req = info.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 = '-';
+        const use = Date.now() - info.ctx.startTime;
+        const label = userId +
+            '/' +
+            req.ip +
+            '/' +
+            traceId +
+            '/' +
+            use +
+            'ms ' +
+            req.method +
+            ' ' +
+            req.url;
+        return `${info.timestamp} ${info.LEVEL} ${info.pid} [${label}] ${info.message}`;
+    },
+};
 exports.cookieParser = {};
 exports.bodyParser = {
     enable: true,

package/dist/framework.d.ts

@@ -3,7 +3,6 @@ import { BaseFramework, IMidwayBootstrapOptions, MiddlewareRespond, MidwayFramew
 import { IMidwayExpressApplication, IMidwayExpressConfigurationOptions, Context } from './interface';
 import type { IRouter, IRouterHandler, Response, NextFunction } from 'express';
 import { Server } from 'net';
-import { MidwayExpressContextLogger } from './logger';
 export declare class MidwayExpressFramework extends BaseFramework<IMidwayExpressApplication, Context, IMidwayExpressConfigurationOptions, Response, NextFunction> {
     app: IMidwayExpressApplication;
     private server;
@@ -31,6 +30,5 @@ export declare class MidwayExpressFramework extends BaseFramework<IMidwayExpress
     getServer(): Server;
     getPort(): string;
     getFrameworkName(): string;
-    getDefaultContextLoggerClass(): typeof MidwayExpressContextLogger;
 }
 //# sourceMappingURL=framework.d.ts.map

package/dist/framework.js

@@ -10,7 +10,6 @@ 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");
 const middlewareService_1 = require("./middlewareService");
 const util_1 = require("util");
 const util_2 = require("./util");
@@ -57,7 +56,7 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
         debug('[express]: use 404 not found middleware');
         // eslint-disable-next-line
         this.app.use(function notFound(req, res, next) {
-            next(new core_1.httpError.NotFoundError());
+            next(new core_1.httpError.NotFoundError(`${req.path} Not Found`));
         });
         debug('[express]: use global error handler middleware');
         // use global error handler
@@ -246,9 +245,6 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
     getFrameworkName() {
         return 'midway:express';
     }
-    getDefaultContextLoggerClass() {
-        return logger_1.MidwayExpressContextLogger;
-    }
 };
 MidwayExpressFramework = __decorate([
     (0, decorator_1.Framework)()

package/dist/index.d.ts

@@ -2,5 +2,4 @@ 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

@@ -17,5 +17,4 @@ Object.defineProperty(exports, "Framework", { enumerable: true, get: function ()
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/express",
-  "version": "3.0.2",
+  "version": "3.0.6",
   "description": "Midway Web Framework for Express",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -19,21 +19,20 @@
   ],
   "files": [
     "dist/**/*.js",
-    "dist/**/*.d.ts",
-    "dist/**/*.js.map"
+    "dist/**/*.d.ts"
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.2",
-    "@midwayjs/logger": "^2.14.0",
-    "@midwayjs/mock": "^3.0.2",
+    "@midwayjs/decorator": "^3.0.6",
+    "@midwayjs/logger": "^2.15.0",
+    "@midwayjs/mock": "^3.0.6",
     "@types/body-parser": "1.19.2",
     "@types/express": "4.17.13",
     "fs-extra": "10.0.0"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.0.2",
-    "@midwayjs/express-session": "^3.0.2",
+    "@midwayjs/core": "^3.0.6",
+    "@midwayjs/express-session": "^3.0.6",
     "body-parser": "1.19.1",
     "cookie-parser": "^1.4.6",
     "express": "4.17.2"
@@ -46,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "ca77247d229978a736e79bb208579c014ed226fc"
+  "gitHead": "afaa5b59a2be85e915233a9268c0e05965dd5c61"
 }

package/dist/config/config.default.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.default.js","sourceRoot":"","sources":["../../src/config/config.default.ts"],"names":[],"mappings":";;;AAQa,QAAA,YAAY,GAGrB,EAAE,CAAC;AAEM,QAAA,UAAU,GAcnB;IACF,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE;QACJ,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,IAAI;KACb;IACD,GAAG,EAAE;QACH,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,KAAK;KACb;IACD,IAAI,EAAE;QACJ,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,KAAK;KACb;IACD,UAAU,EAAE;QACV,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE,KAAK;QACZ,cAAc,EAAE,IAAI;KACrB;CACF,CAAC","sourcesContent":["import {\n  Options,\n  OptionsJson,\n  OptionsText,\n  OptionsUrlencoded,\n} from 'body-parser';\nimport { CookieOptions } from 'express';\n\nexport const cookieParser: {\n  secret?: string | string[];\n  options?: CookieOptions;\n} = {};\n\nexport const bodyParser: {\n  enable?: boolean;\n  json?: OptionsJson & {\n    enable?: boolean;\n  };\n  raw?: Options & {\n    enable?: boolean;\n  };\n  text?: OptionsText & {\n    enable?: boolean;\n  };\n  urlencoded?: OptionsUrlencoded & {\n    enable?: boolean;\n  };\n} = {\n  enable: true,\n  json: {\n    enable: true,\n    limit: '1mb',\n    strict: true,\n  },\n  raw: {\n    enable: false,\n    limit: '1mb',\n  },\n  text: {\n    enable: true,\n    limit: '1mb',\n  },\n  urlencoded: {\n    enable: true,\n    extended: false,\n    limit: '1mb',\n    parameterLimit: 1000,\n  },\n};\n"]}

package/dist/configuration.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../src/configuration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAK6B;AAC7B,yCAIwB;AACxB,qDAAqD;AACrD,2CAAqD;AACrD,0CAA0C;AAC1C,8CAA8C;AAC9C,yDAAyD;AAWzD,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAW/B,IAAI;QACF,IAAI,CAAC,gBAAgB,CAAC,wBAAwB,CAC5C,gCAAoB,EACpB,OAAO,CAAC,EAAE;YACR,OAAO,IAAA,8BAAuB,EAC5B,OAAO,CAAC,QAAQ,CAAC,IAAI,EACrB,OAAO,CAAC,QAAQ,CAAC,YAAY,EAC7B,OAAO,CAAC,eAAe,CACxB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACzE,CAAC,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO;;QACX,MAAM,IAAI,GACR,MAAA,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,cAAc,CAAC,mCACnD,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC9C,MAAM,kBAAkB,GACtB,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;QACtD,+BAA+B;QAC/B,IAAI,CAAC,gBAAgB;aAClB,aAAa,EAAE;aACf,WAAW,CACV,YAAY,CACV,MAAA,kBAAkB,CAAC,MAAM,mCAAI,IAAI,EACjC,kBAAkB,CAAC,OAAO,CAC3B,CACF,CAAC;QACJ,kBAAkB;QAClB,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAC3E,IAAI,gBAAgB,CAAC,MAAM,EAAE;YAC3B,iCAAiC;YACjC,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE;gBAChC,IAAI,CAAC,gBAAgB,CAAC,aAAa,CACjC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CACvC,CAAC;aACH;YACD,IAAI,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE;gBAC/B,IAAI,CAAC,gBAAgB,CAAC,aAAa,CACjC,UAAU,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CACrC,CAAC;aACH;YACD,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE;gBAChC,IAAI,CAAC,gBAAgB,CAAC,aAAa,CACjC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CACvC,CAAC;aACH;YACD,kDAAkD;YAClD,IAAI,gBAAgB,CAAC,UAAU,CAAC,MAAM,EAAE;gBACtC,IAAI,CAAC,gBAAgB,CAAC,aAAa,CACjC,UAAU,CAAC,UAAU,CAAC,gBAAgB,CAAC,UAAU,CAAC,CACnD,CAAC;aACH;SACF;IACH,CAAC;CACF,CAAA;AAhEC;IADC,IAAA,kBAAM,GAAE;8BACS,6BAAsB;8DAAC;AAGzC;IADC,IAAA,kBAAM,GAAE;8BACS,kCAAsB;8DAAC;AAGzC;IADC,IAAA,kBAAM,GAAE;8BACM,0BAAmB;2DAAC;AAGnC;IADC,IAAA,gBAAI,GAAE;;;;gDAYN;AAtBU,oBAAoB;IAThC,IAAA,yBAAa,EAAC;QACb,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,CAAC,OAAO,CAAC;QAClB,aAAa,EAAE;YACb;gBACE,OAAO,EAAE,aAAa;aACvB;SACF;KACF,CAAC;GACW,oBAAoB,CAkEhC;AAlEY,oDAAoB","sourcesContent":["import {\n  Configuration,\n  Init,\n  Inject,\n  WEB_ROUTER_PARAM_KEY,\n} from '@midwayjs/decorator';\nimport {\n  extractExpressLikeValue,\n  MidwayConfigService,\n  MidwayDecoratorService,\n} from '@midwayjs/core';\nimport * as session from '@midwayjs/express-session';\nimport { MidwayExpressFramework } from './framework';\nimport * as bodyParser from 'body-parser';\nimport * as cookieParser from 'cookie-parser';\nimport * as DefaultConfig from './config/config.default';\n\n@Configuration({\n  namespace: 'express',\n  imports: [session],\n  importConfigs: [\n    {\n      default: DefaultConfig,\n    },\n  ],\n})\nexport class ExpressConfiguration {\n  @Inject()\n  decoratorService: MidwayDecoratorService;\n\n  @Inject()\n  expressFramework: MidwayExpressFramework;\n\n  @Inject()\n  configService: MidwayConfigService;\n\n  @Init()\n  init() {\n    this.decoratorService.registerParameterHandler(\n      WEB_ROUTER_PARAM_KEY,\n      options => {\n        return extractExpressLikeValue(\n          options.metadata.type,\n          options.metadata.propertyData,\n          options.originParamType\n        )(options.originArgs[0], options.originArgs[1], options.originArgs[2]);\n      }\n    );\n  }\n\n  async onReady() {\n    const keys =\n      this.configService.getConfiguration('express.keys') ??\n      this.configService.getConfiguration('keys');\n    const cookieParserConfig =\n      this.configService.getConfiguration('cookieParser');\n    // add cookie parser middleware\n    this.expressFramework\n      .getMiddleware()\n      .insertFirst(\n        cookieParser(\n          cookieParserConfig.secret ?? keys,\n          cookieParserConfig.options\n        )\n      );\n    // add body parser\n    const bodyparserConfig = this.configService.getConfiguration('bodyParser');\n    if (bodyparserConfig.enable) {\n      // create application/json parser\n      if (bodyparserConfig.json.enable) {\n        this.expressFramework.useMiddleware(\n          bodyParser.json(bodyparserConfig.json)\n        );\n      }\n      if (bodyparserConfig.raw.enable) {\n        this.expressFramework.useMiddleware(\n          bodyParser.raw(bodyparserConfig.raw)\n        );\n      }\n      if (bodyparserConfig.text.enable) {\n        this.expressFramework.useMiddleware(\n          bodyParser.text(bodyparserConfig.text)\n        );\n      }\n      // create application/x-www-form-urlencoded parser\n      if (bodyparserConfig.urlencoded.enable) {\n        this.expressFramework.useMiddleware(\n          bodyParser.urlencoded(bodyparserConfig.urlencoded)\n        );\n      }\n    }\n  }\n}\n"]}

package/dist/framework.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"framework.js","sourceRoot":"","sources":["../src/framework.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  BaseFramework,\n  HTTP_SERVER_KEY,\n  IMidwayBootstrapOptions,\n  MiddlewareRespond,\n  MidwayFrameworkType,\n  PathFileUtil,\n  WebRouterCollector,\n  RouterInfo,\n  httpError,\n} from '@midwayjs/core';\n\nimport {\n  Framework,\n  WEB_RESPONSE_CONTENT_TYPE,\n  WEB_RESPONSE_HEADER,\n  WEB_RESPONSE_HTTP_CODE,\n  WEB_RESPONSE_REDIRECT,\n} from '@midwayjs/decorator';\nimport {\n  IMidwayExpressApplication,\n  IMidwayExpressConfigurationOptions,\n  Context,\n} from './interface';\nimport type { IRouter, IRouterHandler, Response, NextFunction } from 'express';\nimport * as express from 'express';\nimport { Server } from 'net';\nimport { MidwayExpressContextLogger } from './logger';\nimport {\n  wrapAsyncHandler,\n  MidwayExpressMiddlewareService,\n} from './middlewareService';\nimport { debuglog } from 'util';\nimport { sendData } from './util';\nconst debug = debuglog('midway:debug');\n\n@Framework()\nexport class MidwayExpressFramework extends BaseFramework<\n  IMidwayExpressApplication,\n  Context,\n  IMidwayExpressConfigurationOptions,\n  Response,\n  NextFunction\n> {\n  public app: IMidwayExpressApplication;\n  private server: Server;\n  private expressMiddlewareService: MidwayExpressMiddlewareService;\n\n  configure(): IMidwayExpressConfigurationOptions {\n    return this.configService.getConfiguration('express');\n  }\n\n  async applicationInitialize(options: Partial<IMidwayBootstrapOptions>) {\n    this.expressMiddlewareService = await this.applicationContext.getAsync(\n      MidwayExpressMiddlewareService,\n      [this.applicationContext]\n    );\n    debug('[express]: create express app');\n    this.app = express() as unknown as IMidwayExpressApplication;\n    debug('[express]: use root middleware');\n    // use root middleware\n    this.app.use((req, res, next) => {\n      const ctx = req as Context;\n      this.app.createAnonymousContext(ctx);\n      (req as any).requestContext = ctx.requestContext;\n      ctx.requestContext.registerObject('req', req);\n      ctx.requestContext.registerObject('res', res);\n      next();\n    });\n\n    this.defineApplicationProperties();\n\n    // hack use method\n    (this.app as any).originUse = this.app.use;\n    this.app.use = this.app.useMiddleware as any;\n  }\n\n  public async run(): Promise<void> {\n    debug(`[express]: use middlewares = \"${this.getMiddleware().getNames()}\"`);\n    // restore use method\n    this.app.use = (this.app as any).originUse;\n\n    debug('[express]: use user router middleware');\n    // load controller，must apply router filter here\n    const routerMiddlewares = await this.loadMidwayController();\n\n    // use global middleware\n    const globalMiddleware = await this.applyMiddleware();\n    debug('[express]: use and apply all framework and global middleware');\n    this.app.use(globalMiddleware as any);\n\n    // load router after global middleware\n    for (const info of routerMiddlewares) {\n      this.app.use(info.prefix, info.middleware);\n    }\n\n    debug('[express]: use 404 not found middleware');\n    // eslint-disable-next-line\n    this.app.use(function notFound(req, res, next) {\n      next(new httpError.NotFoundError());\n    });\n\n    debug('[express]: use global error handler middleware');\n    // use global error handler\n    this.app.use((err, req, res, next) => {\n      this.filterManager\n        .runErrorFilter(err, req, res, next)\n        .then(data => {\n          const { result, error } = data;\n          if (error) {\n            const status = error.status ?? res.statusCode ?? 500;\n            // 5xx\n            if (status >= 500) {\n              try {\n                req.logger.error(err);\n              } catch (ex) {\n                this.logger.error(err);\n                this.logger.error(ex);\n              }\n              return;\n            }\n\n            // 4xx\n            try {\n              req.logger.warn(err);\n            } catch (ex) {\n              this.logger.warn(err);\n              this.logger.error(ex);\n            }\n\n            res.status(status);\n            next(error);\n          } else {\n            sendData(res, result);\n          }\n        })\n        .catch(err => {\n          next(err);\n        });\n    });\n\n    // https config\n    if (this.configurationOptions.key && this.configurationOptions.cert) {\n      this.configurationOptions.key = PathFileUtil.getFileContentSync(\n        this.configurationOptions.key\n      );\n      this.configurationOptions.cert = PathFileUtil.getFileContentSync(\n        this.configurationOptions.cert\n      );\n      this.configurationOptions.ca = PathFileUtil.getFileContentSync(\n        this.configurationOptions.ca\n      );\n\n      if (this.configurationOptions.http2) {\n        this.server = require('http2').createSecureServer(\n          this.configurationOptions,\n          this.app\n        );\n      } else {\n        this.server = require('https').createServer(\n          this.configurationOptions,\n          this.app\n        );\n      }\n    } else {\n      if (this.configurationOptions.http2) {\n        this.server = require('http2').createServer(this.app);\n      } else {\n        this.server = require('http').createServer(this.app);\n      }\n    }\n    // register httpServer to applicationContext\n    this.applicationContext.registerObject(HTTP_SERVER_KEY, this.server);\n\n    const customPort =\n      process.env.MIDWAY_HTTP_PORT ?? this.configurationOptions.port;\n    if (customPort) {\n      new Promise<void>(resolve => {\n        const args: any[] = [customPort];\n        if (this.configurationOptions.hostname) {\n          args.push(this.configurationOptions.hostname);\n        }\n        args.push(() => {\n          resolve();\n        });\n\n        this.server.listen(...args);\n        process.env.MIDWAY_HTTP_PORT = String(customPort);\n      });\n    }\n  }\n\n  public getFrameworkType(): MidwayFrameworkType {\n    return MidwayFrameworkType.WEB_EXPRESS;\n  }\n\n  /**\n   * wrap controller string to middleware function\n   */\n  protected generateController(routeInfo: RouterInfo): IRouterHandler<any> {\n    return wrapAsyncHandler(async (req, res, next) => {\n      const controller = await req.requestContext.getAsync(routeInfo.id);\n\n      const result = await controller[routeInfo.method].call(\n        controller,\n        req,\n        res,\n        next\n      );\n\n      if (res.headersSent) {\n        // return when response send\n        return;\n      }\n\n      if (res.statusCode === 200 && (result === null || result === undefined)) {\n        res.status(204);\n      }\n      // implement response decorator\n      if (\n        Array.isArray(routeInfo.responseMetadata) &&\n        routeInfo.responseMetadata.length\n      ) {\n        for (const routerRes of routeInfo.responseMetadata) {\n          switch (routerRes.type) {\n            case WEB_RESPONSE_HTTP_CODE:\n              res.status(routerRes.code);\n              break;\n            case WEB_RESPONSE_HEADER:\n              res.set(routerRes.setHeaders);\n              break;\n            case WEB_RESPONSE_CONTENT_TYPE:\n              res.type(routerRes.contentType);\n              break;\n            case WEB_RESPONSE_REDIRECT:\n              res.redirect(routerRes.code, routerRes.url);\n              return;\n          }\n        }\n      }\n\n      const { result: returnValue, error } =\n        await this.filterManager.runResultFilter(result, req, res, next);\n\n      if (error) {\n        throw error;\n      }\n\n      sendData(res, returnValue);\n    });\n  }\n\n  public async loadMidwayController(): Promise<\n    Array<{\n      prefix: string;\n      middleware: any;\n    }>\n  > {\n    const collector = new WebRouterCollector('', {\n      globalPrefix: this.configurationOptions.globalPrefix,\n    });\n    const routerTable = await collector.getRouterTable();\n    const routerList = await collector.getRoutePriorityList();\n    const routerMiddlewares = [];\n\n    for (const routerInfo of routerList) {\n      // bind controller first\n      this.getApplicationContext().bindClass(routerInfo.routerModule);\n\n      this.logger.debug(\n        `Load Controller \"${routerInfo.controllerId}\", prefix=${routerInfo.prefix}`\n      );\n\n      // new router\n      const newRouter = this.createRouter(routerInfo.routerOptions);\n\n      routerInfo.middleware = routerInfo.middleware ?? [];\n      // add router middleware\n      if (routerInfo.middleware.length) {\n        const routerMiddlewareFn = await this.expressMiddlewareService.compose(\n          routerInfo.middleware,\n          this.app\n        );\n        newRouter.use(routerMiddlewareFn);\n      }\n\n      // add route\n      const routes = routerTable.get(routerInfo.prefix);\n      for (const routeInfo of routes) {\n        const routeMiddlewareList = [];\n        // routeInfo middleware\n        routeInfo.middleware = routeInfo.middleware ?? [];\n        if (routeInfo.middleware.length) {\n          const routeMiddlewareFn = await this.expressMiddlewareService.compose(\n            routeInfo.middleware,\n            this.app\n          );\n          routeMiddlewareList.push(routeMiddlewareFn);\n        }\n\n        this.logger.debug(\n          `Load Router \"${routeInfo.requestMethod.toUpperCase()} ${\n            routeInfo.url\n          }\"`\n        );\n\n        // apply controller from request context\n        newRouter[routeInfo.requestMethod].call(\n          newRouter,\n          routeInfo.url,\n          ...routeMiddlewareList,\n          this.generateController(routeInfo)\n        );\n      }\n\n      routerMiddlewares.push({\n        prefix: routerInfo.prefix,\n        middleware: newRouter,\n      });\n    }\n    return routerMiddlewares;\n  }\n\n  /**\n   * @param routerOptions\n   */\n  protected createRouter(routerOptions: { sensitive }): IRouter {\n    return express.Router({ caseSensitive: routerOptions.sensitive });\n  }\n\n  public async applyMiddleware<Response, NextFunction>(): Promise<\n    MiddlewareRespond<Context, Response, NextFunction>\n  > {\n    if (!this.composeMiddleware) {\n      this.composeMiddleware = await this.expressMiddlewareService.compose(\n        this.middlewareManager,\n        this.app\n      );\n      await this.filterManager.init(this.applicationContext);\n    }\n    return this.composeMiddleware;\n  }\n\n  public async beforeStop() {\n    this.server.close();\n  }\n\n  public getServer() {\n    return this.server;\n  }\n\n  public getPort() {\n    return process.env.MIDWAY_HTTP_PORT;\n  }\n\n  public getFrameworkName() {\n    return 'midway:express';\n  }\n\n  public getDefaultContextLoggerClass() {\n    return MidwayExpressContextLogger;\n  }\n}\n"]}

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,yCAAkE;AAAzD,sGAAA,sBAAsB,OAAa;AAC5C,iDAAwE;AAA/D,8GAAA,oBAAoB,OAAiB;AAC9C,sDAAoC;AACpC,2CAAyB","sourcesContent":["export * from './interface';\nexport { MidwayExpressFramework as Framework } from './framework';\nexport { ExpressConfiguration as Configuration } from './configuration';\nexport * from './middlewareService';\nexport * from './logger';\n"]}

package/dist/interface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"interface.js","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"","sourcesContent":["import {\n  CommonMiddlewareUnion,\n  ContextMiddlewareManager,\n  IConfigurationOptions,\n  IMiddleware,\n  IMidwayApplication,\n  IMidwayContext\n} from '@midwayjs/core';\nimport { Application as ExpressApplication, NextFunction as ExpressNextFunction, Request as ExpressRequest, Response as ExpressResponse } from 'express';\nimport { Options, OptionsJson, OptionsText, OptionsUrlencoded } from 'body-parser';\n\ntype Request = IMidwayContext<ExpressRequest>;\nexport type Response = ExpressResponse;\nexport type NextFunction = ExpressNextFunction;\nexport interface Context extends Request {}\n\n/**\n * @deprecated use Context\n */\nexport type IMidwayExpressRequest = Context;\n/**\n * @deprecated use Context\n */\nexport type IMidwayExpressContext = Context;\nexport type IMidwayExpressMiddleware = IMiddleware<Context, ExpressResponse, ExpressNextFunction>;\nexport interface IMidwayExpressApplication extends IMidwayApplication<Context, ExpressApplication> {\n  /**\n   * add global middleware to app\n   * @param Middleware\n   */\n  useMiddleware<Response, NextFunction>(Middleware: CommonMiddlewareUnion<Context, Response, NextFunction>): void;\n\n  /**\n   * get global middleware\n   */\n  getMiddleware<Response, NextFunction>(): ContextMiddlewareManager<Context, Response, NextFunction>;\n}\n\nexport interface IMidwayExpressConfigurationOptions extends IConfigurationOptions {\n  /**\n   * session or cookie secret key\n   */\n  keys?: string | string[];\n  /**\n   * application http port\n   */\n  port?: number;\n  /**\n   * application hostname, 127.0.0.1 as default\n   */\n  hostname?: string;\n  /**\n   * https key\n   */\n  key?: string | Buffer | Array<Buffer | Object>;\n  /**\n   * https cert\n   */\n  cert?: string | Buffer | Array<string | Buffer>;\n  /**\n   * https ca\n   */\n  ca?: string | Buffer | Array<string | Buffer>;\n  /**\n   * http2 support\n   */\n  http2?: boolean;\n  /**\n   * http global prefix\n   */\n  globalPrefix?: string;\n}\n\nexport type Application = IMidwayExpressApplication;\n\ndeclare module '@midwayjs/core/dist/interface' {\n  interface MidwayConfig {\n    express?: IMidwayExpressConfigurationOptions;\n    bodyParser?: {\n      enable?: boolean;\n      json?: OptionsJson & {\n        enable?: boolean;\n      };\n      raw?: Options & {\n        enable?: boolean;\n      };\n      text?: OptionsText & {\n        enable?: boolean;\n      };\n      urlencoded?: OptionsUrlencoded & {\n        enable?: boolean;\n      };\n    }\n  }\n}\n"]}

package/dist/logger.d.ts

@@ -1,6 +0,0 @@
-import { MidwayContextLogger } from '@midwayjs/logger';
-import { Context } from './interface';
-export declare class MidwayExpressContextLogger extends MidwayContextLogger<Context> {
-    formatContextLabel(): string;
-}
-//# sourceMappingURL=logger.d.ts.map

package/dist/logger.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayExpressContextLogger = void 0;
-const logger_1 = require("@midwayjs/logger");
-class MidwayExpressContextLogger extends logger_1.MidwayContextLogger {
-    formatContextLabel() {
-        var _a;
-        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 = '-';
-        const use = Date.now() - this.ctx.startTime;
-        return (userId +
-            '/' +
-            req.ip +
-            '/' +
-            traceId +
-            '/' +
-            use +
-            'ms ' +
-            req.method +
-            ' ' +
-            req.url);
-    }
-}
-exports.MidwayExpressContextLogger = MidwayExpressContextLogger;
-//# sourceMappingURL=logger.js.map

package/dist/logger.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;AAAA,6CAAuD;AAGvD,MAAa,0BAA2B,SAAQ,4BAA4B;IAC1E,kBAAkB;;QAChB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,wDAAwD;QACxD,MAAM,MAAM,GAAG,CAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAG,SAAS,CAAC,0CAAG,QAAQ,CAAC,KAAI,GAAG,CAAC;QACnD,MAAM,OAAO,GAAG,GAAG,CAAC;QACpB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC;QAC5C,OAAO,CACL,MAAM;YACN,GAAG;YACH,GAAG,CAAC,EAAE;YACN,GAAG;YACH,OAAO;YACP,GAAG;YACH,GAAG;YACH,KAAK;YACL,GAAG,CAAC,MAAM;YACV,GAAG;YACH,GAAG,CAAC,GAAG,CACR,CAAC;IACJ,CAAC;CACF;AArBD,gEAqBC","sourcesContent":["import { MidwayContextLogger } from '@midwayjs/logger';\nimport { Context } from './interface';\n\nexport class MidwayExpressContextLogger extends MidwayContextLogger<Context> {\n  formatContextLabel() {\n    const req = this.ctx;\n    // format: '[$userId/$ip/$traceId/$use_ms $method $url]'\n    const userId = req?.['session']?.['userId'] || '-';\n    const traceId = '-';\n    const use = Date.now() - this.ctx.startTime;\n    return (\n      userId +\n      '/' +\n      req.ip +\n      '/' +\n      traceId +\n      '/' +\n      use +\n      'ms ' +\n      req.method +\n      ' ' +\n      req.url\n    );\n  }\n}\n"]}

package/dist/middlewareService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"middlewareService.js","sourceRoot":"","sources":["../src/middlewareService.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAuE;AACvE,yCAMwB;AAGxB,iCAAkC;AAElC,SAAgB,gBAAgB,CAAC,EAAE;IACjC,IAAI,iBAAK,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE;QAC7B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACxB,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBACpC,IAAI,CAAC,GAAG,CAAC,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;KACH;SAAM;QACL,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAVD,4CAUC;AAID,IAAa,8BAA8B,GAA3C,MAAa,8BAA8B;IACzC,YAAqB,kBAAoC;QAApC,uBAAkB,GAAlB,kBAAkB,CAAkB;IAAG,CAAC;IAE7D,KAAK,CAAC,OAAO,CACX,UAEC,EACD,GAAgB,EAChB,IAAa;QAEb,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC9B,MAAM,IAAI,wBAAiB,CAAC,mCAAmC,CAAC,CAAC;SAClE;QAED,MAAM,gBAAgB,GAAG,EAAE,CAAC;QAE5B,KAAK,IAAI,EAAE,IAAI,UAAU,EAAE;YACzB,IAAI,iBAAK,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;gBAC/C,IACE,OAAO,EAAE,KAAK,QAAQ;oBACtB,CAAC,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,EAAE,CAAC,EAC1C;oBACA,MAAM,IAAI,wBAAiB,CACzB,qDAAqD,CACtD,CAAC;iBACH;gBACD,MAAM,eAAe,GACnB,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CACpC,EAAS,CACV,CAAC;gBACJ,IAAI,eAAe,EAAE;oBACnB,EAAE,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;oBACxC,wBAAwB;oBACxB,EAAE,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAC;oBAC1B,IAAI,CAAC,eAAe,CAAC,KAAK,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE;wBACpD,EAAU,CAAC,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC;wBACrD,cAAc;wBACd,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;qBAC3B;yBAAM;wBACL,wBAAwB;wBACxB,MAAM,EAAE,GAAG,EAAS,CAAC;wBACrB,MAAM,KAAK,GAAG,IAAA,mBAAY,EAAC;4BACzB,KAAK,EAAE,eAAe,CAAC,KAAK;4BAC5B,MAAM,EAAE,eAAe,CAAC,MAAM;yBAC/B,CAAC,CAAC;wBACH,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;4BACtB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;gCAAE,OAAO,IAAI,EAAE,CAAC;4BAC/B,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;wBAC5B,CAAC,CAAC;wBACD,EAAU,CAAC,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC;wBACrD,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;qBAC3B;iBACF;qBAAM;oBACL,MAAM,IAAI,wBAAiB,CAAC,sCAAsC,CAAC,CAAC;iBACrE;aACF;iBAAM;gBACL,wBAAwB;gBACxB,EAAE,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAC;gBAC1B,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAC3B;SACF;QAED,MAAM,SAAS,GAAG,CAChB,GAAY,EACZ,GAAa,EACb,YAA0B,EAC1B,EAAE;YACF,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;YACf,SAAS,QAAQ,CAAC,GAAW,EAAE,GAAkB;gBAC/C,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;gBACtC,KAAK,GAAG,GAAG,CAAC;gBACZ,IAAI,GAAG,IAAI,KAAK,KAAK,gBAAgB,CAAC,MAAM,EAAE;oBAC5C,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;iBAC1B;gBAED,SAAS,IAAI,CAAC,GAAkB;oBAC9B,IAAI,GAAG,GAAG,KAAK,EAAE;wBACf,MAAM,IAAI,SAAS,CAAC,gCAAgC,CAAC,CAAC;qBACvD;oBACD,OAAO,QAAQ,CAAC,GAAG,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;gBAChC,CAAC;gBAED,IAAI;oBACF,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;wBACrD,IAAI,MAAM,EAAE;4BACV,IAAA,eAAQ,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;yBACvB;oBACH,CAAC,CAAC,CAAC;iBACJ;gBAAC,OAAO,GAAG,EAAE;oBACZ,0DAA0D;oBAC1D,IAAI,KAAK,GAAG,GAAG;wBAAE,MAAM,GAAG,CAAC;oBAC3B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;iBAClB;YACH,CAAC;YACD,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;QACrB,CAAC,CAAC;QACF,IAAI,IAAI,EAAE;YACR,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC;SACxB;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF,CAAA;AArGY,8BAA8B;IAF1C,IAAA,mBAAO,GAAE;IACT,IAAA,iBAAK,EAAC,qBAAS,CAAC,SAAS,CAAC;;GACd,8BAA8B,CAqG1C;AArGY,wEAA8B;AAuG3C,SAAgB,cAAc,CAAC,EAAqC,EAAE,OAAO;IAC3E,yBAAyB;IACzB,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK;QAAE,OAAO,IAAI,CAAC;IAE1C,2CAA2C;IAC3C,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IACjD,MAAM,KAAK,GAAG,IAAA,mBAAY,EAAC,OAAO,CAAC,CAAC;IAEpC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,EAAE,CAAC;QAC/B,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;IACF,EAAE,CAAC,KAAK,GAAI,EAAU,CAAC,KAAK,GAAG,mBAAmB,CAAC;IACnD,OAAO,EAAE,CAAC;AACZ,CAAC;AAdD,wCAcC","sourcesContent":["import { Types, Provide, Scope, ScopeEnum } from '@midwayjs/decorator';\nimport {\n  IMidwayContainer,\n  MidwayCommonError,\n  CommonMiddleware,\n  FunctionMiddleware,\n  pathMatching,\n} from '@midwayjs/core';\nimport { Context, IMidwayExpressMiddleware, Application } from './interface';\nimport { NextFunction, Response } from 'express';\nimport { sendData } from './util';\n\nexport function wrapAsyncHandler(fn): any {\n  if (Types.isAsyncFunction(fn)) {\n    return (req, res, next) => {\n      return fn(req, res, next).catch(err => {\n        next(err);\n      });\n    };\n  } else {\n    return fn;\n  }\n}\n\n@Provide()\n@Scope(ScopeEnum.Singleton)\nexport class MidwayExpressMiddlewareService {\n  constructor(readonly applicationContext: IMidwayContainer) {}\n\n  async compose(\n    middleware: Array<\n      CommonMiddleware<Context, Response, NextFunction> | string\n    >,\n    app: Application,\n    name?: string\n  ) {\n    if (!Array.isArray(middleware)) {\n      throw new MidwayCommonError('Middleware stack must be an array');\n    }\n\n    const newMiddlewareArr = [];\n\n    for (let fn of middleware) {\n      if (Types.isClass(fn) || typeof fn === 'string') {\n        if (\n          typeof fn === 'string' &&\n          !this.applicationContext.hasDefinition(fn)\n        ) {\n          throw new MidwayCommonError(\n            'Middleware definition not found in midway container'\n          );\n        }\n        const classMiddleware =\n          await this.applicationContext.getAsync<IMidwayExpressMiddleware>(\n            fn as any\n          );\n        if (classMiddleware) {\n          fn = await classMiddleware.resolve(app);\n          // wrap async middleware\n          fn = wrapAsyncHandler(fn);\n          if (!classMiddleware.match && !classMiddleware.ignore) {\n            (fn as any)._name = classMiddleware.constructor.name;\n            // just got fn\n            newMiddlewareArr.push(fn);\n          } else {\n            // wrap ignore and match\n            const mw = fn as any;\n            const match = pathMatching({\n              match: classMiddleware.match,\n              ignore: classMiddleware.ignore,\n            });\n            fn = (req, res, next) => {\n              if (!match(req)) return next();\n              return mw(req, res, next);\n            };\n            (fn as any)._name = classMiddleware.constructor.name;\n            newMiddlewareArr.push(fn);\n          }\n        } else {\n          throw new MidwayCommonError('Middleware must have resolve method!');\n        }\n      } else {\n        // wrap async middleware\n        fn = wrapAsyncHandler(fn);\n        newMiddlewareArr.push(fn);\n      }\n    }\n\n    const composeFn = (\n      req: Context,\n      res: Response,\n      nextFunction: NextFunction\n    ) => {\n      let index = -1;\n      function dispatch(pos: number, err?: Error | null) {\n        const handler = newMiddlewareArr[pos];\n        index = pos;\n        if (err || index === newMiddlewareArr.length) {\n          return nextFunction(err);\n        }\n\n        function next(err?: Error | null) {\n          if (pos < index) {\n            throw new TypeError('`next()` called multiple times');\n          }\n          return dispatch(pos + 1, err);\n        }\n\n        try {\n          Promise.resolve(handler(req, res, next)).then(result => {\n            if (result) {\n              sendData(res, result);\n            }\n          });\n        } catch (err) {\n          // Avoid future errors that could diverge stack execution.\n          if (index > pos) throw err;\n          return next(err);\n        }\n      }\n      return dispatch(0);\n    };\n    if (name) {\n      composeFn._name = name;\n    }\n    return composeFn;\n  }\n}\n\nexport function wrapMiddleware(mw: FunctionMiddleware<any, any, any>, options) {\n  // support options.enable\n  if (options.enable === false) return null;\n\n  // support options.match and options.ignore\n  if (!options.match && !options.ignore) return mw;\n  const match = pathMatching(options);\n\n  const fn = (req, res, next) => {\n    if (!match(req)) return next();\n    return mw(req, res, next);\n  };\n  fn._name = (mw as any)._name + 'middlewareWrapper';\n  return fn;\n}\n"]}

package/dist/util.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;AAAA,SAAgB,QAAQ,CAAC,GAAG,EAAE,IAAI;IAChC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;KAC5C;SAAM;QACL,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACvC;AACH,CAAC;AAND,4BAMC","sourcesContent":["export function sendData(res, data) {\n  if (typeof data === 'number') {\n    res.status(res.statusCode).send('' + data);\n  } else {\n    res.status(res.statusCode).send(data);\n  }\n}\n"]}