@midwayjs/express 3.0.0-beta.8 → 3.0.2

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.wrapMiddleware = 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
@@ -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);
                 }
-                newMiddlewareArr[i](req, res, iter.bind(this, i + 1, max));
-            })(0, newMiddlewareArr.length);
+                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);
+                        }
+                    });
+                }
+                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;

package/dist/middlewareService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"middlewareService.js","sourceRoot":"","sources":["../src/middlewareService.ts"],"names":[],"mappings":"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","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.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/dist/util.js.map

@@ -0,0 +1 @@
+{"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"]}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/express",
-  "version": "3.0.0-beta.8",
+  "version": "3.0.2",
   "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": [
@@ -19,19 +19,24 @@
   ],
   "files": [
     "dist/**/*.js",
-    "dist/**/*.d.ts"
+    "dist/**/*.d.ts",
+    "dist/**/*.js.map"
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.8",
-    "@midwayjs/mock": "^3.0.0-beta.8",
-    "@types/express": "^4.17.8",
-    "fs-extra": "^8.0.1"
+    "@midwayjs/decorator": "^3.0.2",
+    "@midwayjs/logger": "^2.14.0",
+    "@midwayjs/mock": "^3.0.2",
+    "@types/body-parser": "1.19.2",
+    "@types/express": "4.17.13",
+    "fs-extra": "10.0.0"
   },
   "dependencies": {
-    "@midwayjs/core": "^3.0.0-beta.8",
-    "@midwayjs/logger": "^3.0.0-beta.8",
-    "express": "^4.17.1"
+    "@midwayjs/core": "^3.0.2",
+    "@midwayjs/express-session": "^3.0.2",
+    "body-parser": "1.19.1",
+    "cookie-parser": "^1.4.6",
+    "express": "4.17.2"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -41,5 +46,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "bfafbdf8798f48d4daac5dd88ad53c6b2f33c110"
+  "gitHead": "ca77247d229978a736e79bb208579c014ed226fc"
 }