@midwayjs/express 3.0.0-beta.7 → 3.0.1

package/dist/middlewareService.js

@@ -9,27 +9,43 @@ 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.pathMatching = exports.MidwayExpressMiddlewareService = void 0;
+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 (decorator_1.Types.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, name) {
+    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 (decorator_1.Types.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();
+                    fn = await classMiddleware.resolve(app);
+                    // wrap async middleware
+                    fn = wrapAsyncHandler(fn);
                     if (!classMiddleware.match && !classMiddleware.ignore) {
                         fn._name = classMiddleware.constructor.name;
                         // just got fn
@@ -38,7 +54,7 @@ let MidwayExpressMiddlewareService = class MidwayExpressMiddlewareService {
                     else {
                         // wrap ignore and match
                         const mw = fn;
-                        const match = pathMatching({
+                        const match = (0, core_1.pathMatching)({
                             match: classMiddleware.match,
                             ignore: classMiddleware.ignore,
                         });
@@ -56,16 +72,40 @@ let MidwayExpressMiddlewareService = class MidwayExpressMiddlewareService {
                 }
             }
             else {
+                // wrap async middleware
+                fn = wrapAsyncHandler(fn);
                 newMiddlewareArr.push(fn);
             }
         }
-        const composeFn = (req, res, next) => {
-            (function iter(i, max) {
-                if (i === max) {
-                    return next();
+        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 {
+                    Promise.resolve(handler(req, res, next)).then(result => {
+                        if (result) {
+                            (0, util_1.sendData)(res, result);
+                        }
+                    });
                 }
-                newMiddlewareArr[i](req, res, iter.bind(this, i + 1, max));
-            })(0, newMiddlewareArr.length);
+                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;
@@ -79,41 +119,21 @@ MidwayExpressMiddlewareService = __decorate([
     __metadata("design:paramtypes", [Object])
 ], MidwayExpressMiddlewareService);
 exports.MidwayExpressMiddlewareService = MidwayExpressMiddlewareService;
-function pathMatching(options) {
-    options = options || {};
-    if (options.match && options.ignore)
-        throw new core_1.MidwayCommonError('options.match and options.ignore can not both present');
+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 () => true;
-    const matchFn = options.match
-        ? toPathMatch(options.match)
-        : toPathMatch(options.ignore);
-    return function pathMatch(ctx) {
-        const matched = matchFn(ctx);
-        return options.match ? matched : !matched;
+        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.pathMatching = pathMatching;
-function toPathMatch(pattern) {
-    if (typeof pattern === 'string') {
-        const reg = (0, core_1.pathToRegexp)(pattern, [], { end: false });
-        if (reg.global)
-            reg.lastIndex = 0;
-        return ctx => reg.test(ctx.path);
-    }
-    if (pattern instanceof RegExp) {
-        return ctx => {
-            if (pattern.global)
-                pattern.lastIndex = 0;
-            return pattern.test(ctx.path);
-        };
-    }
-    if (typeof pattern === 'function')
-        return pattern;
-    if (Array.isArray(pattern)) {
-        const matchs = pattern.map(item => toPathMatch(item));
-        return ctx => matchs.some(match => match(ctx));
-    }
-    throw new core_1.MidwayCommonError('match/ignore pattern must be RegExp, Array or String, but got ' + pattern);
-}
+exports.wrapMiddleware = wrapMiddleware;
 //# sourceMappingURL=middlewareService.js.map

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,13 +1,13 @@
 {
   "name": "@midwayjs/express",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.1",
   "description": "Midway Web Framework for Express",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
     "ci": "npm run test"
   },
   "keywords": [
@@ -23,15 +23,19 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.7",
-    "@midwayjs/mock": "^3.0.0-beta.7",
-    "@types/express": "^4.17.8",
-    "fs-extra": "^8.0.1"
+    "@midwayjs/decorator": "^3.0.0",
+    "@midwayjs/logger": "^2.14.0",
+    "@midwayjs/mock": "^3.0.1",
+    "@types/body-parser": "1.19.2",
+    "@types/express": "4.17.13",
+    "fs-extra": "10.0.0"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.0.0-beta.7",
-    "@midwayjs/logger": "^3.0.0-beta.7",
-    "express": "^4.17.1"
+    "@midwayjs/core": "^3.0.1",
+    "@midwayjs/express-session": "^3.0.1",
+    "body-parser": "1.19.1",
+    "cookie-parser": "^1.4.6",
+    "express": "4.17.2"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -41,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "24590729121d9110e2d960db5b5e587cf55a1efc"
+  "gitHead": "f345b4ed0392e5c3b9e815438ef0a377ad6da076"
 }