@midwayjs/express 3.4.0-beta.1 → 3.4.0-beta.12

package/LICENSE

@@ -0,0 +1,21 @@
+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.

package/dist/framework.d.ts

@@ -7,6 +7,7 @@ export declare class MidwayExpressFramework extends BaseFramework<IMidwayExpress
     app: IMidwayExpressApplication;
     private server;
     private expressMiddlewareService;
+    private webRouterService;
     configure(): IMidwayExpressConfigurationOptions;
     applicationInitialize(options: Partial<IMidwayBootstrapOptions>): Promise<void>;
     run(): Promise<void>;

package/dist/framework.js

@@ -160,8 +160,14 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
      */
     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);
+            let result;
+            if (typeof routeInfo.method !== 'string') {
+                result = await routeInfo.method(req, res, next);
+            }
+            else {
+                const controller = await req.requestContext.getAsync(routeInfo.id);
+                result = await controller[routeInfo.method].call(controller, req, res, next);
+            }
             if (res.headersSent) {
                 // return when response send
                 return;
@@ -198,11 +204,13 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
     }
     async loadMidwayController() {
         var _a, _b;
-        const collector = new core_1.WebRouterCollector('', {
-            globalPrefix: this.configurationOptions.globalPrefix,
-        });
-        const routerTable = await collector.getRouterTable();
-        const routerList = await collector.getRoutePriorityList();
+        this.webRouterService = await this.applicationContext.getAsync(core_1.MidwayWebRouterService, [
+            {
+                globalPrefix: this.configurationOptions.globalPrefix,
+            },
+        ]);
+        const routerTable = await this.webRouterService.getRouterTable();
+        const routerList = await this.webRouterService.getRoutePriorityList();
         const routerMiddlewares = [];
         for (const routerInfo of routerList) {
             // bind controller first
@@ -254,7 +262,11 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
         return this.composeMiddleware;
     }
     async beforeStop() {
-        this.server.close();
+        if (this.server) {
+            new Promise(resolve => {
+                this.server.close(resolve);
+            });
+        }
     }
     getServer() {
         return this.server;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/express",
-  "version": "3.4.0-beta.1",
+  "version": "3.4.0-beta.12",
   "description": "Midway Web Framework for Express",
   "main": "dist/index",
   "typings": "index.d.ts",
@@ -24,19 +24,19 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.4.0-beta.1",
+    "@midwayjs/decorator": "^3.4.0-beta.12",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/mock": "^3.4.0-beta.1",
+    "@midwayjs/mock": "^3.4.0-beta.12",
     "@types/body-parser": "1.19.2",
     "@types/express": "4.17.13",
     "fs-extra": "10.0.1"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.4.0-beta.1",
-    "@midwayjs/express-session": "^3.4.0-beta.1",
-    "body-parser": "1.19.2",
+    "@midwayjs/core": "^3.4.0-beta.12",
+    "@midwayjs/express-session": "^3.4.0-beta.12",
+    "body-parser": "1.20.0",
     "cookie-parser": "^1.4.6",
-    "express": "4.17.3"
+    "express": "4.18.1"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -46,5 +46,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "a603d2348d6141f8f723901498f03a162a037708"
+  "gitHead": "cb639763ececfc7928221eaafbd515bfd93c6ca1"
 }