topbit 3.1.3 → 3.1.4

package/demo/controller/__mid.js

@@ -3,7 +3,7 @@
 module.exports = [
   {
     middleware: async (ctx, next) => {
-      console.log(`global ${ctx.path} start`)
+      console.log(`global group:${ctx.group} path:${ctx.path} start`)
       await next(ctx)
       console.log(`global ${ctx.path} end`)
     }

package/demo/controller/api/test.js

@@ -11,6 +11,14 @@ class Test {
     ])
   }
 
+  async post(ctx) {
+    ctx.ok(ctx.body)
+  }
+
+  async list(ctx) {
+    ctx.ok(ctx.query)
+  }
+
   __mid() {
     return [
       {
@@ -19,7 +27,44 @@ class Test {
           await next(ctx)
           console.log(`test ${ctx.method} end`)
         }
-      }
+      },
+
+      {
+        middleware: async (ctx, next) => {
+          console.log('use for get list method')
+          await next(ctx)
+          console.log('end for get list method')
+        },
+
+        handler: [
+          'get', 'list'
+        ]
+      },
+
+      {
+        middleware: async (ctx, next) => {
+          console.log('use for get method', (new Date).toLocaleString())
+          await next(ctx)
+          console.log('end for get method', (new Date).toLocaleString())
+        },
+
+        handler: [
+          'get'
+        ]
+      },
+
+      {
+        middleware: async (ctx, next) => {
+          console.log(' -- use for post method', (new Date).toLocaleString())
+          ctx.body.tag = Math.random()
+          await next(ctx)
+          console.log(' -- end for post method', (new Date).toLocaleString())
+        },
+
+        handler: [
+          'post'
+        ]
+      },
     ]
   }
 }

package/demo/loader.js

@@ -27,3 +27,4 @@ app.autoWorker(12)
 app.daemon(1234, 5)
 
 //console.log(app.midware.midGroup)
+//console.log({...app.router})

package/docs/en/topbit-loader.md

@@ -206,10 +206,12 @@ module.exports = [
 
 ```js
 // Inside any controller file
-static __mid() {
+__mid() {
   return [
     { name: '@vip-auth', pre: true },
-    { name: 'log', method: 'POST' }
+    { name: 'log', method: 'POST' },
+    //use for controller method: get list
+    { name: 'check', handler: ['get', 'list'] }
   ]
 }
 ```

package/docs/topbit-loader.md

@@ -205,10 +205,13 @@ module.exports = [
 
 ```js
 // 在 controller/user.js 中
-static __mid() {
+// 只在本文件生效
+__mid() {
   return [
-    { name: '@vip-auth', pre: true },     // 只在本文件生效
-    { name: 'log', method: 'POST' }
+    { name: '@vip-auth', pre: true },
+    { name: 'log', method: 'POST' },
+    //只对控制器方法get list 启用中间件
+    { name: 'check', handler: ['get', 'list'] }
   ]
 }
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "topbit",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "description": "A Server-side web framework support http/1.1 and http/2",
   "main": "src/topbit.js",
   "directories": {

package/src/loader/loader.js

@@ -56,7 +56,7 @@ class TopbitLoader {
       multi: false,
       optionsRoute: true,
       fileAsGroup: true,
-      
+
       beforeController: null,
       afterController: null,
 
@@ -566,22 +566,22 @@ class TopbitLoader {
     let opts = { group };
     f = `${this.config.prePath}${f}`;
 
-    if (!this.fileAsGroup && m.path === undefined) {
-      m.path = [
+    if (!this.config.fileAsGroup && m.handler === undefined) {
+      m.handler = [
         'get', 'list', 'post', 'put', 'delete',
         'options', 'patch', 'head', 'trace'
       ];
     }
 
-    if (m.path && typeof m.path === 'string') m.path = [ m.path ];
+    if (m.handler && typeof m.handler === 'string') m.handler = [ m.handler ];
 
-    if (m.path && Array.isArray(m.path)) {
+    if (m.handler && Array.isArray(m.handler)) {
       opts.name = [];
-      let path_num;
-      for (let p of m.path) {
-        path_num = this.methodNumber[p.toLowerCase()];
-        if (path_num === undefined) continue;
-        opts.name.push(`${f}/${path_num}`);
+      let handler_num;
+      for (let p of m.handler) {
+        handler_num = this.methodNumber[p.toLowerCase()];
+        if (handler_num === undefined) continue;
+        opts.name.push(`${f}/${handler_num}`);
       }
     }