topbit 2.0.0 → 3.0.1

package/tmp/router-rule.js

@@ -1,559 +0,0 @@
-'use strict';
-
-let RULE_REGEXP = 1
-let RULE_ARRAY = 2
-
-class router {
-
-  constructor (options = {}) {
-    this.ignoreSlash = true;
-
-    this.maxPath = 1024;
-
-    this.count = 0;
-
-    this.apiTable = {
-      GET     : {},
-      POST    : {},
-      PUT     : {},
-      DELETE  : {},
-      OPTIONS : {},
-      HEAD    : {},
-      PATCH   : {},
-      TRACE   : {}
-    };
-
-    /**
-     * 2020.7.31 优化方案：
-     *  通过数组记录每个类型带参数请求的路由，这样可以直接遍历。
-     * */
-    this.argsRoute = {
-      GET     : [],
-      POST    : [],
-      PUT     : [],
-      DELETE  : [],
-      OPTIONS : [],
-      HEAD    : [],
-      PATCH   : [],
-      TRACE   : []
-    };
-
-    this.methods = Object.keys(this.apiTable);
-
-    //记录api的分组，只有在分组内的路径才会去处理，
-    //这是为了避免不是通过分组添加但是仍然使用和分组相同前缀的路由也被当作分组内路由处理。
-    this.apiGroup = {};
-
-    this.nameTable = {};
-
-    if (options.ignoreSlash !== undefined) {
-      this.ignoreSlash = options.ignoreSlash;
-    }
-
-    this.path_preg = /^[a-z0-9_\-\/\:\*\.\@]{1,500}$/i;
-  }
-
-  fmtArgsString (p) {
-    let arr = [];
-    let count = 1;
-    for (let a of p.routeArr) {
-      if (a[0] === ':') {
-        arr.push(':x' + count);
-        count++;
-      } else {
-        arr.push(a);
-      }
-    }
-    return arr.join('/');
-  }
-
-  compareArgsPath(a, b) {
-    return this.fmtArgsString(a) === this.fmtArgsString(b);
-  }
-
-  conflictCheck (p, path, method) {
-    let routes = this.apiTable[method];
-    if (routes.length === 0 || !p.isArgs) return true;
-
-    let r
-    for (let k in routes) {
-      r = routes[k]
-      if (!r.isArgs || r.routeArr.length !== p.routeArr.length) continue;
-
-      if (this.compareArgsPath(r, p)) {
-        console.error(`\x1b[7;31;47mError: ${method} ${path} 和已有路由 ${k} 模式冲突。 \x1b[0m\n`);
-        throw new Error(`${path} 和 ${k}模式一致，存在冲突。`);
-      }
-    }
-
-    return true;
-  }
-
-  //检查路由参数的规则限制
-  checkRule(p) {
-    if (!p.rule) return true
-    if (typeof p.rule !== 'object') {
-      p.rule = null
-      return false
-    }
-
-    if (p.isArgs) {
-      for (let a of p.routePath) {
-        if (!a.isArgs) continue
-
-        if (!p.rule[a.name]) continue
-
-        if (p.rule[a.name] instanceof RegExp) {
-          a.hasRule = true
-          a.ruleType = RULE_REGEXP
-        }
-        else if (Array.isArray(p.rule[a.name])) {
-          a.hasRule = true
-          a.ruleType = RULE_ARRAY
-          p.rule[a.name].__htable__ = {}
-          for (let k of p.rule[a.name]) {
-            p.rule[a.name].__htable__[k] = true
-          }
-        }
-      }
-    } else {
-      //*路由只有一个参数，所以直接验证数据类型即可 
-      p.ruleType = null
-      p.hasRule = false
-      if (p.rule instanceof RegExp) {
-        p.hasRule = true
-        p.ruleType = RULE_REGEXP
-      } else if (Array.isArray(p.rule)) {
-        p.hasRule = true
-        p.ruleType = RULE_ARRAY
-        p.__htable__ = {}
-        for (let k of p.rule) {
-          p.__htable__[k] = true
-        }
-      }
-
-    }
-
-    return true
-  }
-
-  //预解析路由参数并记录，保证查找的性能
-  parsePathParam (p, path, method) {
-    if (p.isArgs) {
-      //记录参数名称映射，不必在匹配时进行substring
-      for (let i = 0; i < p.routeArr.length; i++) {
-        p.routePath.push({
-          path: p.routeArr[i],
-          isArgs: p.routeArr[i][0] === ':',
-          name: p.routeArr[i][0] === ':' ? p.routeArr[i].substring(1) : p.routeArr[i],
-          hasRule: false
-        });
-
-        if (p.routeArr[i][0] != ':') {
-          continue;
-        }
-
-        if (p.routeArr[i].length < 2) {
-          throw new Error(`${path} : 参数不能没有名称，请在:后添加名称`);
-        }
-      }
-      this.conflictCheck(p, path, method);
-    } else {
-      let starCount = 0;
-      for (let i = 0; i < path.length; i++) {
-        if (path[i] == '*') {
-          starCount += 1;
-        }
-      }
-      if (starCount > 1) {
-        throw new Error(`${path} : 多个 * 导致冲突`);
-      }
-      p.starPrePath = path.substring(0, path.length - 1);
-      p.starLength = p.starPrePath.length;
-      for (let i = 0; i < p.routeArr.length; i++) {
-        p.routePath.push({path: p.routeArr[i], isStar: p.routeArr[i] === '*'})
-      }
-    }
-
-    this.checkRule(p);
-  }
-
-  /*
-    由于在路由匹配时会使用/分割路径，所以在添加路由时先处理好。
-    允许:表示变量，*表示任何路由，但是二者不能共存，因为无法知道后面的是变量还是路由。
-    比如：/static/*可以作为静态文件所在目录，但是后面的就直接作为*表示的路径，
-    并不进行参数解析。
-  */
-  /**
-   * @param {string} path 路由字符串
-   * @param {string} method 请求方法类型
-   * @param {function} callback 执行请求的回调函数
-   * @param {string} name 请求名称，可以不填写
-   * @param {string|bool} group 路由归为哪一组，可以是字符串，
-   *              或者是bool值true表示使用/分割的第一个字符串。
-   */
-  addPath (path, method, callback, name = '') {
-    if (typeof callback !== 'function' || callback.constructor.name !== 'AsyncFunction')
-    {
-      throw new Error(`${method} ${path}: 回调函数必须使用async声明`);
-    }
-
-    let api_path = path.trim()
-    if (api_path === '') {
-      api_path = '/';
-    }
-
-    if (!this.path_preg.test(api_path)) {
-      throw new Error(`路由字符串 ${path} 存在非法字符，路由字符串允许 字母 数字 - _ : * /\n`);
-    }
-    
-    if (api_path[0] !== '/') { api_path = `/${api_path}`; }
-
-    if (api_path.length > 1 && api_path[api_path.length-1] == '/' && this.ignoreSlash) {
-      api_path = api_path.substring(0, api_path.length-1);
-    }
-
-    let group = '';
-    let rule = null;
-    if (typeof name === 'object') {
-      if (name.rule !== undefined) rule = name.rule;
-      
-      if (name.group !==undefined) {
-        group = name.group;
-      }
-      if (name.name !== undefined) {
-        name = name.name;
-      } else {
-        name = '';
-      }
-
-    } else if (typeof name === 'string') {
-      if (name.length > 1 && name[0] == '@') {
-        group = name.substring(1);
-        name = '';
-      }
-    } else {
-      name = '';
-    }
-
-    let add_req = {
-        isArgs:  false,
-        isStar:  false,
-        routeArr: [],
-        routePath: [],
-        starPrePath : '',
-        starLength : 0,
-        reqCall: callback,
-        name : name,
-        group : '',
-        path: api_path,
-        rule: rule
-      };
-
-    if (api_path.indexOf(':') >= 0) {
-      add_req.isArgs = true;
-    }
-
-    if (api_path.indexOf('*') >= 0) {
-      add_req.isStar = true;
-      if (api_path[api_path.length - 1] != '*') {
-        throw new Error(`${api_path} : 任意匹配参数 * 只能出现在最后`);
-      }
-    }
-
-    if (add_req.isStar && add_req.isArgs) {
-      console.error(`\x1b[7;31;47mError: path中 : 和 * 不能同时出现 \x1b[0m\n`);
-      throw new Error(`${api_path} 参数 : 和 * 不能同时出现`);
-    }
-
-    if (name !== '' && this.nameTable[name]) {
-      throw new Error(`路由命名${name} 已经存在。`);
-    }
-
-    add_req.routeArr = api_path.split('/').filter(p => p.length > 0);
-    if(typeof group === 'string' && group.length > 0) {
-      add_req.group = group;
-    }
-
-    if (add_req.isArgs || add_req.isStar) {
-      this.parsePathParam(add_req, api_path, method);
-    }
-
-    if (add_req.group !== '') {
-      if (this.apiGroup[add_req.group] === undefined) {
-        this.apiGroup[add_req.group] = [];
-      }
-      this.apiGroup[add_req.group].push({
-        method: method,
-        path: api_path
-      });
-    }
-
-    if (this.methods.indexOf(method) >= 0) {
-      if (this.apiTable[method][api_path]) {
-        throw new Error(`${api_path}冲突，多次添加`);
-      }
-      
-      this.count += 1;
-
-      this.apiTable[method][api_path] = add_req;
-      if (name.length > 0) {
-        this.nameTable[name] = api_path;
-      }
-      //记录带参数路由
-      if (add_req.isArgs || add_req.isStar) {
-        this.argsRoute[method].push(add_req);
-      }
-    }
-  }
-
-  get (api_path, callback, name='') {
-    this.addPath(api_path, 'GET', callback, name);
-  }
-
-  post (api_path, callback, name='') {
-    this.addPath(api_path, 'POST', callback, name);
-  }
-
-  put (api_path, callback, name='') {
-    this.addPath(api_path, 'PUT', callback, name);
-  }
-
-  delete (api_path, callback, name='') {
-    this.addPath(api_path, 'DELETE', callback, name);
-  }
-
-  options (api_path, callback, name = '') {
-    this.addPath(api_path, 'OPTIONS', callback, name);
-  }
-  
-  patch (api_path, callback, name = '') {
-    this.addPath(api_path, 'PATCH', callback, name);
-  }
-
-  head (api_path, callback, name = '') {
-    this.addPath(api_path, 'HEAD', callback, name);
-  }
-
-  trace (api_path, callback, name = '') {
-    this.addPath(api_path, 'TRACE', callback, name);
-  }
-
-  /**
-   * @param [array] marr method数组，示例['GET','HEAD']。
-   * @param {string} api_path 路由字符串。
-   * @param {function} callback 请求处理回调函数，必须是async声明。
-   * @param {string} name 请求命名，默认为空字符串，可以不写。
-   * */
-  map (marr, api_path, callback, name='') {
-    for(let i = 0; i < marr.length; i++) {
-      this.addPath(api_path, marr[i], callback, name);
-    }
-  }
-  
-  any (api_path, callback, name='') {
-    this.map(this.methods, api_path, callback, name);
-  }
-
-  group () {
-    return this.apiGroup;
-  }
-
-  routeTable () {
-    return this.apiTable;
-  }
-
-  /** 清理路由表等 */
-  clear() {
-    for(let k in this.apiTable) {
-      this.apiTable[k] = {};
-      this.argsRoute[k] = [];
-    }
-    this.apiGroup = {};
-    this.nameTable = {};
-  }
-
-  /** 
-   * 输出路由表
-  */
-  printTable() {
-    console.log(this.getTable());
-  }
-
-  getTable () {
-    let rtext = '';
-    let ptmp = '';
-
-    for (let k in this.apiTable) {
-      for (let p in this.apiTable[k]) {
-        ptmp = `${k}          `;
-        rtext += `${ptmp.substring(0,8)} ----  ${p}\n`;
-      }
-    }
-    return rtext;
-  }
-
-  /**
-   * findPath只是用来查找带参数的路由。
-   * @param {string} path 路由字符串。
-   * @param {string} method 请求类型。
-   */
-  findPath (path, method) {
-    if (!this.apiTable[method]) {
-      return null;
-    }
-
-    let path_split = path.split('/').filter(p => p.length > 0);
-    if (path_split.length > 9) {
-      return null;
-    }
-
-    let next = 0;
-    let args = {};
-    let r = null;
-    let margs = this.argsRoute[method];
-    let alength = margs.length;
-    let cur_path;
-
-    for (let i=0; i < alength; i++) {
-      r = margs[i];
-
-      if ( (r.routePath.length !== path_split.length && r.isStar === false)
-        || (r.isStar && r.routePath.length > path_split.length+1) )
-      {
-        continue;
-      }
-
-      next = false;
-      
-      if (r.isStar) {
-        for (let i = 0; i < r.routePath.length; i++) {
-          cur_path = r.routePath[i];
-          if(!cur_path.isStar && cur_path.path !== path_split[i]) {
-            next = true;
-            break;
-          }
-        }
-
-        if (!next) {
-          args.starPath = path.substring(r.starLength);
-
-          if (r.hasRule) {
-            if (r.ruleType === RULE_ARRAY) {
-              if (!r.__htable__[args.starPath]) {
-                next = true;
-                break;
-              }
-            } else {
-              if (!r.rule.test(args.starPath)) {
-                next = true;
-                break;
-              }
-            }
-          }
-        }
-
-      } else {
-        for (let i=0; i < r.routePath.length; i++) {
-          cur_path = r.routePath[i];
-          if (!cur_path.isArgs && cur_path.path !== path_split[i]) {
-            next = true;
-            break;
-          }
-        }
-        //如果next为false，则表示匹配成功，此时解析出所有的参数。
-        if (!next) {
-          for (let i=0; i < r.routePath.length; i++) {
-            cur_path = r.routePath[i];
-            if (cur_path.isArgs) {
-              if (cur_path.hasRule) {
-                //console.log('check rule: ', cur_path.name)
-                if (cur_path.ruleType === RULE_ARRAY) {
-                  if (!r.rule[cur_path.name].__htable__[path_split[i]]) {
-                    next = true;
-                    break;
-                  }
-                } else {
-                  if (!r.rule[cur_path.name].test(path_split[i])) {
-                    next = true;
-                    break;
-                  }
-                }
-              }
-              //console.log('--ok')
-              args[ cur_path.name ] = path_split[i];
-            }
-          }
-        }
-
-      } // end else
-
-      if (next) continue;
-
-      return {key: r.path, args: args};
-    }
-    return null;
-  }
-
-  /**
-   * 
-   * @param {string} path 
-   * @param {string} method 
-   */
-  findRealPath (path, method) {
-
-    if (path.length > this.maxPath) {
-      return null;
-    }
-
-    if (this.apiTable[method] === undefined) {
-      return null;
-    }
-
-    let route_path = null;
-
-    if (this.ignoreSlash && path.length > 1 && path[path.length-1] === '/') {
-      path = path.substring(0, path.length-1);
-    }
-
-    let mp = this.apiTable[method][path];
-
-    if (mp !== undefined) {
-      route_path = path;
-    }
-
-    if (route_path && (mp.isArgs || mp.isStar) ) {
-      route_path = null;
-    }
-    
-    let parg = null;
-    if (route_path === null) {
-      parg = this.findPath(path, method);
-    } else {
-      parg = {args : {}, key: route_path};
-    }
-
-    if (parg !== null) {
-      parg.reqcall = this.apiTable[method][parg.key];
-    }
-    
-    return parg;
-  }
-
-}
-
-module.exports = router;
-
-/* setPre(pre) {
-    if (pre.trim().length > 0 && pre != '/') {
-      pre = pre.trim();
-      if (pre[0] != '/') {
-        pre = `/${pre}`;
-      }
-      if (pre[ pre.length-1 ] == '/') {
-        pre = pre.substring(0, pre.length-1);
-      }
-      
-      this.pre = pre;
-    }
-  } */

package/tmp/test-cdps.js

@@ -1,122 +0,0 @@
-'use strict'
-let flength = 'form-data'.length
-
-function parse_cdps(cdps) {
-  let rk = flength
-  if (cdps.substring(0, rk) !== 'form-data') return false;
-  while (cdps[rk] === ';' || cdps[rk] === ' ')rk++
-    let cdpobj = {};
-    let statestr = cdps.substring(rk)
-    let cstart=0, i,k,q='';
-    let cindex = 0;
-
-    let state_length = statestr.length
-
-    while(cindex < state_length) {
-        cindex = statestr.indexOf('=', cindex)
-        if (cindex < 0) break
-
-        i = cindex + 1
-        while (statestr[i] === ' ') i++
-
-        q = statestr[i]
-
-        if (q === ';') {
-          k = i
-          //name= 说明没有数据的值
-          cdpobj[statestr.substring(cstart, cindex)] = ''
-          k++
-        } else if (q) {
-            if (q === '"' || q === "'") {
-              i++
-            } else {q = ''}
-            k = i
-            while (k < state_length) {
-              if (statestr[k] === '\\') k+=2
-
-              if ((!q && statestr[k] === ';') || (q && statestr[k] === q)) {
-                cdpobj[statestr.substring(cstart, cindex)] = statestr.substring(i, k)
-                k++
-                break
-              }
-              k++
-            }
-            if (k === state_length){
-              cdpobj[statestr.substring(cstart, cindex)] = statestr.substring(i, k)
-            }
-        } else if (!q) break
-
-        cindex = k
-        while (cindex < state_length && (statestr[cindex] === ' ' || statestr[cindex] === ';')) {  
-          cindex++
-        }
-
-        cstart = cindex
-    }
-
-    return cdpobj
-}
-
-let bodyparser = require('../lib/bodyparser')
-
-let bp = new bodyparser()
-
-let arr = [
-  'form-data; name="image"; filename="oko.jpg"',
-  'form-data; name="file;image";   filename="ako.jpg;a.jpg"',
-  `form-data; name="file;image";   filename='ako.jpg;a.jpg'`,
-  'form-data name="file;image"; filename="ako.jpg;a.jpg"',
-  'form-data; name=file;image; filename="ako.jpg;a.jpg',
-  'form-data; name=file;image;    filename="ako.jpg;a.jpg";',
-  'form-data; name="file;image";;; filename="ako.jpg;a.jpg"=;;   = 123',
-  'form-data;;; name=file;image  =  ;;;; filename = "ako.jpg;a.jpg',
-  'form-data;;; name=file;image  =  ;;;; filename  == =  "ako.jpg;a.jpg',
-  `form-data;;; name="^**&**)\\""""""'''""";filename = "ako.jpg;a.jpg`,
-  `form-data;;;;    dsdsf;df;ew;few;few;fewf;ewf=11;filename=`,
-  `form-data;;;;    name="filename=%22"; filename="name=;;;;;(()((*&(*^&^&^\\\\'"`,
-  `form-data;;;;    name='''''''''';;;;`,
-  `form-data;;;;;;;   a=12     ;;;wqwqr;; xxx =====1`,
-  `form-data;  ======;=123=;=;=;\"qwdqwd""="qqf";\"fqwf=qd';=;=;;;;====123;23;1232`,
-  `form-data;  ======;a"===";x;"y;y   z   "     = "123"`,
-  `form-data;  ======''''''s;;;sd;f;ef;w;;12;1e21-e12e==q;dqw;e`,
-  `form-data; fhiefhewiufiuewfoiuewfoewjfoiewfjoi;;;;;name=''''';;;;filename=ffff''`,
-  `form-data; - = 123; = = =; =  123; wefwe=f`
-]
-
-arr.forEach(x => {
-  console.log(x)
-  console.log(bp.parseFormData(x), '\n')
-})
-
-for (let i = 0; i < 15; i++) {
-  arr = arr.concat(arr)
-}
-
-console.log(arr.length)
-console.log(bp.parseFormData('form-data; name=\'file;image;\' filename="ako.jpg;a.jpg";'))
-
-let oo = 0
-
-console.time('cdps')
-arr.forEach(x => {
-  oo = bp.parseFormData(x)
-})
-console.timeEnd('cdps')
-
-console.time('cdpss')
-arr.forEach(x => {
-  let dlist = x.split(';')
-  let ind = 0
-  let curobj = {}
-  let cstr
-  for (let a of dlist) {
-    ind = a.indexOf('=')
-    if (ind < 0) continue
-    cstr =  a.substring(ind+1).trim()
-    curobj[a.substring(0, ind).trim()] = cstr.substring(1, cstr.length-1)
-  }
-  /* console.log(x, '\n')
-  console.log(parse_cdps(x))
-  console.log('\n\n') */
-})
-console.timeEnd('cdpss')