@midwayjs/express 3.0.0-beta.14 → 3.0.0-beta.15

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 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.15](https://github.com/midwayjs/midway/compare/v3.0.0-beta.14...v3.0.0-beta.15) (2022-01-07)
+
+
+### Bug Fixes
+
+* serverless app run ([#1523](https://github.com/midwayjs/midway/issues/1523)) ([5a25eb7](https://github.com/midwayjs/midway/commit/5a25eb7ebb17bf9b0e2ba4feee5bc1649f70d56f))
+
+
+### Features
+
+* add info middleware ([#1530](https://github.com/midwayjs/midway/issues/1530)) ([7077f1d](https://github.com/midwayjs/midway/commit/7077f1d84355633a1c2fced35bfcc2152f42a7ac))
+* add secret filter ([#1531](https://github.com/midwayjs/midway/issues/1531)) ([ce77e48](https://github.com/midwayjs/midway/commit/ce77e4804aaffc18a0a091d3726e36d7ec1514b2))
+
+
+
+
+
 # [3.0.0-beta.14](https://github.com/midwayjs/midway/compare/v3.0.0-beta.13...v3.0.0-beta.14) (2022-01-04)
 
 

package/README.md

@@ -1,6 +1,6 @@
-# midway-web
+# midway for express
 
-[![Package Quality](http://npm.packagequality.com/shield/midway-web.svg)](http://packagequality.com/#?package=midway-web)
+[![Package Quality](http://npm.packagequality.com/shield/@midwayjs/express.svg)](http://packagequality.com/#?package=@midwayjs/express)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/midwayjs/midway/pulls)
 
 this is a sub package for midway.

package/dist/framework.d.ts

@@ -16,7 +16,10 @@ export declare class MidwayExpressFramework extends BaseFramework<IMidwayExpress
      * wrap controller string to middleware function
      */
     protected generateController(routeInfo: RouterInfo): IRouterHandler<any>;
-    loadMidwayController(): Promise<void>;
+    loadMidwayController(): Promise<Array<{
+        prefix: string;
+        middleware: any;
+    }>>;
     /**
      * @param routerOptions
      */
@@ -28,6 +31,5 @@ export declare class MidwayExpressFramework extends BaseFramework<IMidwayExpress
     getServer(): Server;
     getFrameworkName(): string;
     getDefaultContextLoggerClass(): typeof MidwayExpressContextLogger;
-    protected sendData(res: any, data: any): void;
 }
 //# sourceMappingURL=framework.d.ts.map

package/dist/framework.js

@@ -13,6 +13,7 @@ const express = require("express");
 const logger_1 = require("./logger");
 const middlewareService_1 = require("./middlewareService");
 const util_1 = require("util");
+const util_2 = require("./util");
 const debug = (0, util_1.debuglog)('midway:debug');
 let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFramework {
     configure() {
@@ -42,13 +43,17 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
         debug(`[express]: use middlewares = "${this.getMiddleware().getNames()}"`);
         // restore use method
         this.app.use = this.app.originUse;
+        debug('[express]: use user router middleware');
+        // load controller，must apply router filter here
+        const routerMiddlewares = await this.loadMidwayController();
         // 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();
+        // load router after global middleware
+        for (const info of routerMiddlewares) {
+            this.app.use(info.prefix, info.middleware);
+        }
         debug('[express]: use 404 not found middleware');
         // eslint-disable-next-line
         this.app.use(function notFound(req, res, next) {
@@ -87,7 +92,7 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
                     next(error);
                 }
                 else {
-                    this.sendData(res, result);
+                    (0, util_2.sendData)(res, result);
                 }
             })
                 .catch(err => {
@@ -172,7 +177,7 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
             if (error) {
                 throw error;
             }
-            this.sendData(res, returnValue);
+            (0, util_2.sendData)(res, returnValue);
         });
     }
     async loadMidwayController() {
@@ -182,6 +187,7 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
         });
         const routerTable = await collector.getRouterTable();
         const routerList = await collector.getRoutePriorityList();
+        const routerMiddlewares = [];
         for (const routerInfo of routerList) {
             // bind controller first
             this.getApplicationContext().bindClass(routerInfo.routerModule);
@@ -208,8 +214,12 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
                 // apply controller from request context
                 newRouter[routeInfo.requestMethod].call(newRouter, routeInfo.url, ...routeMiddlewareList, this.generateController(routeInfo));
             }
-            this.app.use(routerInfo.prefix, newRouter);
+            routerMiddlewares.push({
+                prefix: routerInfo.prefix,
+                middleware: newRouter,
+            });
         }
+        return routerMiddlewares;
     }
     /**
      * @param routerOptions
@@ -236,14 +246,6 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
     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)()

package/dist/middlewareService.js

@@ -12,6 +12,7 @@ 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");
+const util_1 = require("./util");
 function wrapAsyncHandler(fn) {
     if ((0, decorator_1.isAsyncFunction)(fn)) {
         return (req, res, next) => {
@@ -91,7 +92,11 @@ let MidwayExpressMiddlewareService = class MidwayExpressMiddlewareService {
                     return dispatch(pos + 1, err);
                 }
                 try {
-                    return handler(req, res, next);
+                    Promise.resolve(handler(req, res, next)).then(result => {
+                        if (result) {
+                            (0, util_1.sendData)(res, result);
+                        }
+                    });
                 }
                 catch (err) {
                     // Avoid future errors that could diverge stack execution.

package/dist/util.d.ts

@@ -0,0 +1,2 @@
+export declare function sendData(res: any, data: any): void;
+//# sourceMappingURL=util.d.ts.map

package/dist/util.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sendData = void 0;
+function sendData(res, data) {
+    if (typeof data === 'number') {
+        res.status(res.statusCode).send('' + data);
+    }
+    else {
+        res.status(res.statusCode).send(data);
+    }
+}
+exports.sendData = sendData;
+//# sourceMappingURL=util.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/express",
-  "version": "3.0.0-beta.14",
+  "version": "3.0.0-beta.15",
   "description": "Midway Web Framework for Express",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -23,16 +23,16 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.14",
+    "@midwayjs/decorator": "^3.0.0-beta.15",
     "@midwayjs/logger": "2.14.0",
-    "@midwayjs/mock": "^3.0.0-beta.14",
+    "@midwayjs/mock": "^3.0.0-beta.15",
     "@types/body-parser": "1.19.2",
     "@types/express": "4.17.13",
     "fs-extra": "10.0.0"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.0.0-beta.14",
-    "@midwayjs/express-session": "^3.0.0-beta.14",
+    "@midwayjs/core": "^3.0.0-beta.15",
+    "@midwayjs/express-session": "^3.0.0-beta.15",
     "body-parser": "1.19.1",
     "cookie-parser": "^1.4.6",
     "express": "4.17.2"
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "95695ada36190cf376e93a1a8866b3fb6dde06bc"
+  "gitHead": "6b9778557289d9e8b562c7ce6127736db1248973"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.