@less-is-more/less-js 1.4.5 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@less-is-more/less-js",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "Fast develop kit for nodejs",
   "main": "src/index.js",
   "scripts": {

package/src/router.js

@@ -10,7 +10,7 @@ module.exports = class Router {
 
   /**
    * 根据request路由
-   * @param {object} targets 路由表。支持before和after，如果提供了会在执行主方法前后执行。
+   * @param {object} targets 路由表。支持before和after，如果提供了会在执行主方法前后执行。需要async的方法。并且before返回值为Ret，如果不为true，会直接返回
    * @param {*} req 请求
    * @param {*} res 响应
    * @param {*} context 系统属性
@@ -32,7 +32,11 @@ module.exports = class Router {
           // before
           if (targets.before) {
             console.log("start before action");
-            await targets.before(req, res, context);
+            const beforeResult = await targets.before(req, res, context);
+            if (beforeResult && !beforeResult.success) {
+              this._handleReturn(beforeResult, startTime, req, res);
+              return;
+            }
           }
           console.log("start main action");
           // 需要直接调用，不能用中间变量
@@ -42,9 +46,8 @@ module.exports = class Router {
             console.log("start after action");
             await targets.after(req, res, context);
           }
-          const useTime = (new Date().getTime() - startTime) / 1000;
           // controller方法有返回值的自动send
-          this._handleReturn(result, useTime, req, res);
+          this._handleReturn(result, startTime, req, res);
         } catch (e) {
           console.log(e);
           return this._sendError(e.message ? e.message : "出错啦", res);
@@ -128,7 +131,8 @@ module.exports = class Router {
     });
   }
 
-  static _handleReturn(result, useTime, req, res) {
+  static _handleReturn(result, startTime, req, res) {
+    const useTime = (new Date().getTime() - startTime) / 1000;
     if (!Param.isBlank(result)) {
       let content;
       if (result instanceof Ret) {

package/test/test-router.js

@@ -212,4 +212,30 @@ describe("router.js", () => {
     };
     await Router.route(targets, req, res);
   });
+
+  it("before return false", async () => {
+    let targets = {
+      before: async () => {
+        return new Ret(false, "错误", Ret.CODE_LOGIC);
+      },
+      "/product": {
+        add: function (req, res) {
+          assert(req.params.a === 1);
+          return 1;
+        },
+      },
+    };
+    let req = {
+      method: "GET",
+      path: "/product/add",
+      query: { a: 1 },
+      headers: {},
+    };
+    let res = {
+      send: function (data) {
+        console.log("send: " + data);
+      },
+    };
+    await Router.route(targets, req, res);
+  });
 });