topbit 2.0.0 → 3.0.1

package/src/lib/npargv.js

@@ -0,0 +1,354 @@
+'use strict'
+
+/**
+ * {
+ *    '-a' : {
+ *      name: 'a',
+ *      type: 'number|string|int|float|bool',
+ *      min: 0,
+ *      max: 100,
+ *      match: RegExp,
+ *      default : any
+ *    },
+ *    
+ *    '$2': {
+ * 
+ *    },
+ *    {
+ *      '--port=' : {
+ *        name : 'port',
+ *        type : 'int',
+ *        min: 2000,
+ *        max: 5000,
+ *        default: 3456
+ *      }
+ *    }
+ * }
+ * 
+ */
+
+function setVal (a, ainfo, obj, next) {
+
+  if (ainfo.type && ['int', 'float', 'number'].indexOf(ainfo.type) >= 0) {
+      if (isNaN(next)) {
+        return {
+          ok: false,
+          message: `${a} 类型错误，要求参数必须是数字类型：${next}`
+        }
+      }
+
+      if (ainfo.type === 'int' || ainfo.type === 'number') {
+        next = parseInt(next)
+      } else {
+        next = parseFloat(next)
+      }
+  }
+
+  if (ainfo.min !== undefined) {
+    if (next < ainfo.min) {
+      return {
+        ok: false,
+        message: `${a} 数值不能低于 ${ainfo.min}`
+      }
+    }
+  }
+
+  if (ainfo.max !== undefined) {
+    if (next > ainfo.max) {
+      return {
+        ok: false,
+        message: `${a} 数值不能大于 ${ainfo.max}`
+      }
+    }
+  }
+
+  if (ainfo.match && ainfo.match instanceof RegExp) {
+    if (!ainfo.match.test(next)) {
+      return {
+        ok: false,
+        message: `${a} 数值无法匹配 ${next}`
+      }
+    }
+  }
+
+  let val = next
+
+  if (ainfo.callback && typeof ainfo.callback === 'function') {
+    val = ainfo.callback(next)
+    if (val === undefined) val = next
+  }
+
+  obj[ ainfo.name || a ] = val
+
+  return {
+    ok: true,
+    message: ''
+  }
+
+}
+
+function checkAndSet (a, ainfo, obj, next) {
+
+  if (typeof ainfo === 'boolean') {
+    obj[a] = true
+    return {
+      ok: true,
+      message: '',
+      op: 'none'
+    }
+  }
+
+  if (ainfo.type === 'bool' || ainfo.type === 'boolean') {
+    obj[ ainfo.name || a ] = true
+
+    return {
+      ok: true,
+      message: '',
+      op: 'none'
+    }
+  }
+
+  if (next === null) {
+    return {
+      ok: false,
+      message: `${a} 必须携带参数。`
+    }
+  }
+
+  let r = setVal(a, ainfo, obj, next)
+
+  if (!r.ok && ainfo.default !== undefined) {
+    r.ok = true
+  }
+
+  if (r.ok) {
+    r.op = 'next'
+
+    if (a[a.length - 1] === '=') {
+      r.op = 'none'
+    }
+  }
+
+  return r
+}
+
+function setAutoDefault (opts, k) {
+  switch (opts[k].type) {
+    case 'number':
+    case 'int':
+    case 'float':
+      opts[k].default = 0
+      if (opts[k].min)
+        opts[k].default = opts[k].min;
+      break
+
+    case 'string':
+      opts[k].default = ''
+      break
+
+    case 'bool':
+    case 'boolean':
+      opts[k].default = false
+      break
+  }
+}
+
+/*
+ * opts['@autoDefault'] = true 表示自动设定默认值
+ *
+ * */
+
+function parseArgv (options = null, obj = null) {
+  if (!options) options = {}
+
+  if (obj === null) obj = {}
+
+  let opts = {}
+
+  for (let k in options) {
+    opts[k] = options[k]
+  }
+
+  let autoDefault = false
+
+  if (opts['@autoDefault'] === undefined) opts['@autoDefault'] = true;
+
+  if (opts['@autoDefault'] !== undefined) {
+    autoDefault = !!opts['@autoDefault']
+    delete opts['@autoDefault']
+  }
+
+  let commands = []
+  if (opts['@command'] !== undefined) {
+    if (typeof opts['@command'] === 'string') {
+      opts['@command'].split(' ').filter(p => p.length > 0).forEach(a => {
+        commands.push(a.trim())
+      })
+    } else if (Array.isArray(opts['@command'])) {
+      commands = opts['@command'];
+    }
+    delete opts['@command'];
+  }
+
+  let defaultCommand = ''
+  if (opts['@defaultCommand'] !== undefined && commands.indexOf(opts['@defaultCommand']) >= 0) {
+    defaultCommand = opts['@defaultCommand'];
+    delete opts['@defaultCommand'];
+  }
+
+  let userCommand = null
+  let commandFromInput = false
+  if (commands.length > 0) {
+    if (process.argv.length < 3) {
+      if (defaultCommand) userCommand = defaultCommand;
+      else {
+        return {
+          ok: false,
+          message: '请使用子命令：' + commands.join('|'),
+          args: obj
+        }
+      }
+    } else if  (commands.indexOf(process.argv[2]) < 0) {
+      if (defaultCommand) userCommand = defaultCommand;
+      else {
+        return {
+          ok: false,
+          message: '不支持的子命令',
+          args: obj
+        }
+      }
+    } else {
+      commandFromInput = true
+      userCommand = process.argv[2]
+    }
+  }
+
+  let tmp_val
+
+  for (let k in opts) {
+    if (typeof opts[k] === 'string' && opts[k].trim().length > 0) {
+      opts[k] = {
+        name: opts[k].trim(),
+        type: 'boolean',
+        default: false
+      }
+    }
+
+    if (typeof opts[k] !== 'object' || opts[k].toString() !== '[object Object]') {
+
+      opts[k] = {
+        type : 'boolean',
+        name : k,
+        default: false
+      }
+
+    } else if (opts[k].type === undefined) {
+
+      if (k.indexOf('=') > 0) {
+        opts[k].type = 'string'
+      } else if (opts[k].match || opts[k].callback) {
+        opts[k].type = 'string'
+      } else {
+          if (opts[k].min !== undefined || opts[k].max !== undefined) {
+            opts[k].type = 'int'
+          } else if (opts[k].default !== undefined) {
+            tmp_val = typeof opts[k].default
+            if (tmp_val === 'number' || tmp_val === 'boolean' || tmp_val === 'string') {
+              opts[k].type = tmp_val
+            } else {
+              opts[k].type = 'string'
+            }
+          } else {
+            opts[k].type = 'bool'
+          }
+      }
+
+    }
+
+    autoDefault && opts[k].default === undefined && setAutoDefault(opts, k)
+
+    if (opts[k].type === 'bool' || opts[k].type === 'boolean') {
+      obj[ opts[k].name || k ] = false
+    } else if (opts[k].default !== undefined) {
+      obj[ opts[k].name || k ] = opts[k].default
+    }
+
+  }
+
+  for (let k in opts) {
+    if (opts[k].alias && typeof opts[k].alias === 'string' && opts[k].alias !== k) {
+      opts[opts[k].alias] = opts[k]
+    }
+  }
+
+  let a
+  let next
+  let next_end = process.argv.length - 1
+  let r = ''
+  let i = 2
+  let offset = 1
+  if (commands.length > 0 && commandFromInput) {
+    i++
+    offset = 2
+  }
+
+  let ind = 0
+  let pos_key = ''
+  let aList = []
+
+  while (i < process.argv.length) {
+
+    //先检测是否存在对位置的引用
+    pos_key = '$' + `${i-offset}`
+    if (opts[pos_key]) {
+      r = checkAndSet(pos_key, opts[pos_key], obj, process.argv[i])
+      if (!r.ok) {
+        r.args = obj
+        return r
+      }
+      i++
+      continue
+    }
+
+    a = process.argv[i]
+    
+    next = i < next_end ? process.argv[i+1] : null
+
+    ind = a.indexOf('=')
+
+    if (ind > 0) {
+      a = a.substring(0, ind+1)
+      next = process.argv[i].substring(ind+1)
+    }
+
+    if (opts[a]) {
+      r = checkAndSet(a, opts[a], obj, next)
+      if (!r.ok) {
+        r.args = obj
+        return r
+      }
+
+      if (r.op === 'next') {
+        i += 2
+        continue
+      }
+
+    } else {
+      if (a[0] !== '-') {
+        a[0] !== '\\' ? aList.push(a) : aList.push(a.substring(1))
+      }
+    }
+
+    i++
+  }
+
+  return {
+    ok: true,
+    message: '',
+    args: obj,
+    list: aList,
+    command: userCommand
+  }
+}
+
+module.exports = parseArgv

package/src/lib/zipdata.js

@@ -0,0 +1,45 @@
+'use strict'
+
+const zlib = require('zlib')
+const fs = require('fs')
+
+const fsp = fs.promises
+
+let zipdata = async (pathfile, isData=false) => {
+  let d
+
+  if (isData) {
+    d = pathfile
+  } else {
+    d = await fsp.readFile(pathfile)
+  }
+
+  return await new Promise((rv, rj) => {
+      zlib.gzip(d, (err, zipdata) => {
+        if (err) {
+          rj (err)
+        }
+
+        rv(zipdata)
+      })
+  })
+}
+
+zipdata.unzip = async (pathfile, isData = false) => {
+  let d
+  if (isData) {
+    d = pathfile
+  } else {
+    d = await fsp.readFile(pathfile)
+  }
+
+  return new Promise((rv, rj) => {
+    zlib.unzip(d, (err, data) => {
+      if (err) rj(err)
+
+      rv(data)
+    })
+  })
+}
+
+module.exports = zipdata

package/src/middleware1.js

@@ -16,18 +16,18 @@ class Middleware extends MidCore {
       await this.exec(ctx, ctx.group);
     } catch (err) {
       
-      this.errorHandle(err, '--ERR-RESPONSE--');
+      this.errorHandle(err, '--ERR-res--');
 
       try {
-        if (ctx.response && !ctx.response.writableEnded) {
-          ctx.response.statusCode = 500;
-          ctx.response.end();
+        if (ctx.res && !ctx.res.writableEnded) {
+          ctx.res.statusCode = 500;
+          ctx.res.end();
         }
       } catch (err) {}
 
     } finally {
-      ctx.request = null;
-      ctx.response = null;
+      ctx.req = null;
+      ctx.res = null;
       ctx.data = null;
       ctx.box = null;
       ctx.service = null;
@@ -37,7 +37,6 @@ class Middleware extends MidCore {
       ctx.rawBody = null;
       ctx.files = null;
       ctx.param = null;
-      ctx.reply = null;
       ctx.user = null;
       ctx = null;
     }
@@ -51,9 +50,9 @@ class Middleware extends MidCore {
    */
   addFinal() {
     let fr = async (ctx, next) => {
-      await next();
+      await next(ctx);
 
-      if (!ctx.response || ctx.response.writableEnded || !ctx.response.writable || ctx.response.destroyed) {
+      if (!ctx.res || ctx.res.writableEnded || !ctx.res.writable || ctx.res.destroyed) {
         return;
       }
 
@@ -63,10 +62,10 @@ class Middleware extends MidCore {
       let content_type = 'text/plain;charset=utf-8';
       let datatype = typeof ctx.data;
 
-      if (!(ctx.response.headersSent || ctx.response.hasHeader('content-type')) )
+      if (!(ctx.res.headersSent || ctx.res.hasHeader('content-type')) )
       {
         if (datatype === 'object') {
-          ctx.response.setHeader('content-type','application/json;charset=utf-8');
+          ctx.res.setHeader('content-type','application/json;charset=utf-8');
         }
         else if (datatype === 'string' && ctx.data.length > 1) {
           switch (ctx.data[0]) {
@@ -80,18 +79,18 @@ class Middleware extends MidCore {
               break;
             default:;
           }
-          ctx.response.setHeader('content-type', content_type);
+          ctx.res.setHeader('content-type', content_type);
         }
       }
 
       if (!ctx.data) {
-        ctx.response.end()
+        ctx.res.end()
       } else if (ctx.data instanceof Buffer || datatype === 'string') {
-        ctx.response.end(ctx.data, ctx.dataEncoding)
+        ctx.res.end(ctx.data, ctx.dataEncoding)
       } else if (datatype === 'number') {
-        ctx.response.end(`${ctx.data}`)
+        ctx.res.end(`${ctx.data}`)
       } else {
-        ctx.response.end(JSON.stringify(ctx.data))
+        ctx.res.end(JSON.stringify(ctx.data))
       }
 
     }

package/src/middleware2.js

@@ -34,7 +34,8 @@ class Middleware extends MidCore {
       ctx.data = null;
       ctx.dataHeaders = null;
       ctx.stream = null;
-      ctx.request = null;
+      ctx.req = null;
+      ctx.res = null;
       ctx.service = null;
       ctx.box = null;
       ctx.requestCall = null;
@@ -43,7 +44,6 @@ class Middleware extends MidCore {
       ctx.rawBody = null;
       ctx.files = null;
       ctx.param = null;
-      ctx.reply = null;
       ctx.user = null;
       ctx = null;
     }
@@ -53,14 +53,9 @@ class Middleware extends MidCore {
   /** 这是最终添加的请求中间件。基于洋葱模型，这个中间件最先执行，所以最后会返回响应结果。 */
   addFinal() {
     let fr = async (ctx, next) => {
-      
-      await next();
+      await next(ctx);
 
-      if(!ctx.stream
-        || ctx.stream.closed 
-        || ctx.stream.destroyed
-        || !ctx.stream.writable)
-      {
+      if(!ctx.stream || ctx.stream.closed || ctx.stream.destroyed || !ctx.stream.writable) {
         return ;
       }
 

package/src/token/token.js

@@ -436,13 +436,13 @@ class TopbitToken {
       let token = c.headers.authorization
 
       if (!token) {
-        return c.status(self.failedCode).send('!token')
+        return c.status(self.failedCode).to('!token')
       }
 
-      let uinfo = self.verify(token)
+      let uinfo = self.verifyAccessToken(token)
 
       if (!uinfo.ok) {
-        return c.status(self.failedCode).send(uinfo.errcode)
+        return c.status(self.failedCode).to(uinfo.errcode)
       }
 
       c.box.user = uinfo
@@ -452,11 +452,10 @@ class TopbitToken {
         c.setHeader('x-refresh-token', new_token)
       }
 
-      await next()
+      await next(c)
     }
   }
 
 }
 
 module.exports = TopbitToken
-

package/src/topbit.js

@@ -31,6 +31,9 @@ const Context2 = require('./context2.js');
 const ext = require('./ext.js');
 const TopbitLoader = require('./loader/loader.js')
 const TopbitToken = require('./token/token.js')
+const TopbitExtends = require('./_loadExtends.js')
+const npargv = require('./lib/npargv.js')
+const zipdata = require('./lib/zipdata.js')
 
 let __instance__ = 0;
 
@@ -47,7 +50,7 @@ let _topbit_home_page = `<!DOCTYPE html><html>
       <br>
       <p>功能强大、简洁高效的Web开发框架。</p>
       <p>文档 & 仓库：
-        <a style="text-decoration:none;color:#345689;" href="https://gitee.com/daoio/topbit" target=_blank>
+        <a style="text-decoration:none;color:#345689;" href="https://github.com/master-genius/topbit" target=_blank>
           topbit</a></p>
     </div>
   </div>
@@ -213,7 +216,7 @@ class Topbit {
       notFound  : 'not found',
       badRequest : 'bad request',
       //展示负载信息，必须使用daemon接口
-      showLoadInfo  : true,
+      loadMonitor  : true,
       loadInfoType  : 'text', // text | json | orgjson | --null
       loadInfoFile  : '',
   
@@ -234,7 +237,7 @@ class Topbit {
   
       maxUrlLength: 1152,
   
-      maxpool : 4096,
+      maxpool : 8192,
   
       //子进程汇报资源信息的定时器毫秒数。
       monitorTimeSlice: 500,
@@ -266,7 +269,7 @@ class Topbit {
       //-1表示使用timeout的设置。
       streamTimeout: -1,
   
-      requestTimeout: 100000,
+      requestTimeout: 65_000,
   
       maxLoadRate: 75
     };
@@ -279,7 +282,7 @@ class Topbit {
       deny_type     : 's',
       //每秒单个IP可以进行请求次数的上限，0表示不限制。
       maxIPRequest  : 0,
-      unitTime      : 60_000,
+      unitTime      : 30_000,
       maxIPCache    : 10_0000,
       allow         : null,
       allow_type    : 's',
@@ -370,10 +373,6 @@ class Topbit {
           break;
   
         case 'loadMonitor':
-          this.config.showLoadInfo = !!options[k];
-          break;
-  
-        case 'showLoadInfo':
         case 'daemon':
         case 'debug':
         case 'globalLog':
@@ -580,7 +579,7 @@ class Topbit {
       }
     }
   
-    if (this.config.showLoadInfo) {
+    if (this.config.loadMonitor) {
       this.monitor = new Monitor({
         config : this.config,
         secure : this.secure,
@@ -1262,7 +1261,7 @@ class Topbit {
 
     } else if (cluster.isWorker) {
 
-      if (this.config.showLoadInfo) {
+      if (this.config.loadMonitor) {
         this.monitor.workerSend();
       }
 
@@ -1287,5 +1286,8 @@ class Topbit {
 
 Topbit.Loader = TopbitLoader;
 Topbit.Token = TopbitToken;
+Topbit.npargv = npargv;
+Topbit.zipdata = zipdata;
+Topbit.extensions = TopbitExtends;
 
 module.exports = Topbit;

package/test/{test-helper.js → test-ext.js}

@@ -1,6 +1,6 @@
 'use strict'
 
-const helper = require('../lib/helper.js')
+const helper = require('../src/ext.js')
 
 let key = '123456789012345678900987654321qw'
 

package/test/test-route.js

@@ -1,4 +1,4 @@
-const titbit = require('../lib/titbit.js');
+const titbit = require('../src/topbit.js');
 
 var app = new titbit();