topbit 3.1.5 → 3.1.7

package/README.cn.md

@@ -1411,7 +1411,7 @@ https_server.listen(2026)
 
 ## 请求限流
 
-框架层面提供的限流是基于IP地址的计算和过滤，避免同一个IP地址密集的发送请求。若使用HTTP/2协议，则需要配合使用topbit-toolkit扩展的http2limit模块。
+框架层面提供的限流是基于IP地址的计算和过滤，避免同一个IP地址密集的发送请求。若使用HTTP/2协议，则需要配合使用扩展http2limit模块。
 
 ```javascript
 'use strict';
@@ -2047,8 +2047,21 @@ app.use(pck, {method: 'GET'})
 let pmbody = new ParamCheck({
   key: 'body',
   rule: {
-    username: { must: true },
-    passwd: { must: true }
+    username: {
+      must: true,
+      //min length
+      min: 5,
+      //max length
+      max: 30
+    },
+    passwd: {
+      must: true,
+      min: 7,
+      max: 20
+    },
+    mobile: {
+      regex: /^(12|13|15|16|17|18|19)[0-9]{9}$/
+    }
   }
 })
 
@@ -2065,7 +2078,7 @@ JWT 协议的 Token 验证与签发。推荐使用 `Topbit.Token` 替代。
 const Topbit = require('topbit')
 const {JWT} = Topbit.extensions
 
-let j = new JWT({
+let j = new KWT({
   timeout: 7200000, // 超时时间
 })
 j.alg = 'hs512' // 设置算法

package/README.md

@@ -1999,8 +1999,21 @@ app.use(pck, {method: 'GET'})
 let pmbody = new ParamCheck({
   key: 'body',
   rule: {
-    username: { must: true },
-    passwd: { must: true }
+    username: {
+      must: true,
+      //min length
+      min: 5,
+      //max length
+      max: 30
+    },
+    passwd: {
+      must: true,
+      min: 7,
+      max: 20
+    },
+    mobile: {
+      regex: /^(12|13|15|16|17|18|19)[0-9]{9}$/
+    }
   }
 })
 

package/demo/rule.js

@@ -93,6 +93,23 @@ let pmbody = new ParamCheck({
     },
     passwd: {
       must: true
+    },
+
+    mobile: {
+      errorMessage: '手机号不符合要求',
+      regex: /^(12|13|14|15|16|17|18|19)[0-9]{9}$/,
+    },
+
+    detail: {
+      errorMessage: 'detail长度0～10',
+      min: 0,
+      max: 10
+    },
+
+    age: {
+      to: 'int',
+      min: 15,
+      max: 95
     }
   }
 })

package/docs/en/topbit-token.md

@@ -52,9 +52,8 @@ module.exports = token
 async post(c) {
   // After successful login
   const userinfo = { uid: 1, name: 'Alice', role: 'admin' }
-  const t = token.make(userinfo)
-  c.setHeader('authorization', t)
-  c.to({ok: true})
+  const t = token.makeToken(userinfo)
+  c.to({ok: true, token: t})
 }
 
 // All protected routes automatically use token.mid()

package/docs/topbit-token.md

@@ -59,9 +59,8 @@ class User {
       role  : 'admin',
       // expires 可单独设置更长时间
     }
-    let t = token.make(userinfo)      // 签发 Token
-    c.setHeader('authorization', t)
-    c.to({ok: true, msg: 'login success'})
+    let t = token.makeToken(userinfo)      // 签发 Token
+    c.to({ok: true, msg: 'login success', token: t})
   }
 }
 

package/package.json

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

package/src/extends/paramcheck.js

@@ -30,7 +30,7 @@ class ParamCheck {
 
         case 'rule':
           if (typeof options[k] === 'object') {
-            this.rule = options[k]
+            this.rule = {...options[k]}
           }
           break
 
@@ -51,17 +51,20 @@ class ParamCheck {
           this.deleteDeny = !!options[k]
           break
 
-        default: 
+        default:
           this[k] = options[k]
       }
     }
 
+    this.ruleKeys = Object.keys(this.rule)
+
     let data_type = ''
-    for (let k in this.rule) {
+    for (let k of this.ruleKeys) {
       data_type = typeof this.rule[k]
 
       if (data_type === 'string' || data_type === 'number') {
         this.rule[k] = {
+          __is_regex__: false,
           __is_value__: true,
           __value__: this.rule[k],
           __type__: data_type === 'string' ? TYPE_STRING : TYPE_NUMBER
@@ -70,6 +73,20 @@ class ParamCheck {
         continue
       }
 
+      if (this.rule[k] instanceof RegExp) {
+        this.rule[k] = {
+          __is_regex__: true,
+          __is_value__: false,
+          regex: this.rule[k]
+        }
+
+        continue
+      }
+
+      if (this.rule[k].regex && this.rule[k].regex instanceof RegExp) {
+        this.rule[k].__is_regex__ = true
+      }
+
       this.rule[k].__is_value__ = false
 
       if (this.rule[k].callback && typeof this.rule[k].callback === 'function') {
@@ -82,11 +99,11 @@ class ParamCheck {
   }
 
   /**
-   * 
+   *
    * @param {object} obj c.param or c.query
    * @param {*} k key name
    * @param {*} rule filter rule
-   * 
+   *
    * rule描述了如何进行数据的过滤，如果rule是字符串或数字则要求严格相等。
    * 否则rule应该是一个object，可以包括的属性如下：
    *    - callback  用于过滤的回调函数，在验证时，会传递数据，除此之外没有其他参数。
@@ -108,7 +125,7 @@ class ParamCheck {
             ost.ok = false
             return false
           }
-          
+
           if (rule.default !== undefined) {
             obj[k] = rule.default
             return true
@@ -117,49 +134,80 @@ class ParamCheck {
         } else {
           //数据初始必然是字符串，转换只能是整数或浮点数或boolean。
           if (rule.to) {
-            if (isNaN(obj[k])) {
+            let is_number = typeof obj[k] === 'number'
+
+            if (is_number) {
+              if (rule.to === 'int') {
+                obj[k] = Math.floor(obj[k])
+              } else if (rule.to === 'boolean' || rule.to === 'bool') {
+                obj[k] = !!obj[k]
+              }
+            } else {
+              switch(rule.to) {
+                case 'int':
+                  obj[k] = parseInt(obj[k])
+                  if (isNaN(obj[k])) {
+                    if (rule.default !== undefined) {
+                      obj[k] = rule.default
+                      return true
+                    }
+                    ost.ok = false
+                    return false
+                  }
+                  break
+
+                case 'float':
+                  obj[k] = parseFloat(obj[k])
+                  if (isNaN(obj[k])) {
+                    if (rule.default !== undefined) {
+                      obj[k] = rule.default
+                      return true
+                    }
+                    ost.ok = false
+                    return false
+                  }
+                  break
+
+                case 'boolean':
+                case 'bool':
+                  obj[k] = (obj[k] === 'true' || obj[k] === true || obj[k] == 1) ? true : false
+                  break
+              }
+            }
+
+            if (rule.min !== undefined && obj[k] < rule.min) {
               ost.ok = false
               return false
             }
 
-            switch(rule.to) {
-              case 'int':
-                obj[k] = parseInt(obj[k])
-                if (isNaN(obj[k])) {
-                  if (rule.default !== undefined) {
-                    obj[k] = rule.default
-                    return true
-                  }
-                  ost.ok = false
-                  return false
-                }
-                break
-
-              case 'float':
-                obj[k] = parseFloat(obj[k])
-                if (isNaN(obj[k])) {
-                  if (rule.default !== undefined) {
-                    obj[k] = rule.default
-                    return true
-                  }
-                  ost.ok = false
-                  return false
-                }
-                break
-              
-              case 'boolean':
-              case 'bool':
-                obj[k] = obj[k] === 'true' ? true : false
-                break
+            if (rule.max !== undefined && obj[k] > rule.max) {
+              ost.ok = false
+              return false
+            }
+          } else if (typeof obj[k] === 'string') {
+            //data is string min and max mean's length
+            if (rule.min !== undefined && obj[k].length < rule.min) {
+              ost.ok = false
+              return false
             }
-          }
 
-          if (rule.min !== undefined && obj[k] < rule.min) {
-            ost.ok = false
-            return false
+            if (rule.max !== undefined && obj[k].length > rule.max) {
+              ost.ok = false
+              return false
+            }
+          } else if (typeof obj[k] === 'number') {
+            if (rule.min !== undefined && obj[k] < rule.min) {
+                ost.ok = false
+                return false
+            }
+
+            if (rule.max !== undefined && obj[k] > rule.max) {
+                ost.ok = false
+                return false
+            }
           }
 
-          if (rule.max !== undefined && obj[k] > rule.max) {
+          if (rule.__is_regex__ && !rule.regex.test(obj[k])) {
             ost.ok = false
             return false
           }
@@ -170,10 +218,11 @@ class ParamCheck {
           if (rule.callback(obj, k, method) !== false) {
             return true
           }
+
           ost.ok = false
           return false
         }
-      
+
     } else if (rule.__type__ === TYPE_STRING) {
       if (obj[k] === undefined || obj[k] !== rule.__value__) {
         ost.ok = false
@@ -194,7 +243,7 @@ class ParamCheck {
     let ost = {ok: true, key: ''}
 
     if (this.key !== 'body' || (c.body !== c.rawBody && typeof c.body === 'object')) {
-      for (let k in this.rule) {
+      for (let k of this.ruleKeys) {
         if (!this.checkData(d, k, this.rule[k], c.method, ost)) {
           return ost
         }
@@ -248,7 +297,7 @@ class ParamCheck {
 
         await next(c)
       }
-      
+
     }
 
     return async (c, next) => {

package/src/token/token.js

@@ -426,7 +426,7 @@ class TopbitToken {
         return c.status(self.failedCode).to(uinfo.errcode)
       }
 
-      c.user = uinfo
+      c.user = uinfo.data
 
       if (uinfo.data.expires + uinfo.data.timestamp - uinfo.now < self.refresh) {
         let new_token = self.makeToken(uinfo.data, uinfo.data.__tokenId__)