save

Author: xuewuli

.coveralls.yml

@@ -0,0 +1,2 @@
+service_name: travis-pro
+repo_token: QiuhMbOuEHYcMAJxzVIvCVjfwuI7dWGPc

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

.eslintignore

@@ -1,3 +1,4 @@
 .nyc_support
 coverage
+backup
 packages/**/node_modules

.travis.yml

@@ -0,0 +1,14 @@
+language: node_js
+node_js:
+  - 8
+  - 10
+  - 12
+os:
+  - linux
+
+script:
+  - "npm run lint"
+  - "npm run cover"
+
+after_success:
+  - if [[ $TRAVIS_NODE_VERSION == "12" ]]; then cat ./coverage/lcov.info | coveralls; fi

README.md

@@ -1 +1,28 @@
-# tiny.js
+# tiny.io
+[![Build Status](https://travis-ci.org/TinyIO/tiny.js.svg?branch=dev)](https://travis-ci.org/TinyIO/tiny.js)
+[![codebeat badge](https://codebeat.co/badges/79ae878a-275f-4b68-86f1-5b3c749a58b0)](https://codebeat.co/projects/github-com-tinyio-tiny-js-dev)
+[![Coverage Status](https://coveralls.io/repos/github/TinyIO/tiny.js/badge.svg?branch=dev)](https://coveralls.io/github/TinyIO/tiny.js?branch=dev)
+[![install size](https://packagephobia.now.sh/badge?p=tiny.io)](https://packagephobia.now.sh/result?p=tiny.io)
+[![Dependency Status](https://david-dm.org/TinyIO/tiny.js/status.svg)](https://david-dm.org/TinyIO/tiny.js)
+
+tiny.io 是一个精简的web开发框架,以兼容express的思路进行编写,可以直接使用大部分express的middleware
+
+和express [![install size](https://packagephobia.now.sh/badge?p=express)](https://packagephobia.now.sh/result?p=express)
+比它真的[![install size](https://packagephobia.now.sh/badge?p=tiny.io)](https://packagephobia.now.sh/result?p=tiny.io)很小,核心功能是路由和middleware结构, 将非核心功能从项目中剥离, 来保持一个简单、清晰、高效的内核.
+
+|            | Requests/s | Latency | Throughput/Mb |
+|------------|:----------:|--------:|-----:|
+| NativeHttp | 46524      | 10.53   | 4.58 |
+| Tiny       | 41200.81   | 11.82   | 4.05 |
+| Express    | 15666      | 29.96   | 1.55 |
+
+性能测试来看效率还不错(当然这并不意味你的应用真的能有这么大幅度的性能提升, 通常CURD才是性能杀手)
+
+# TODO
+
+- [ ] 说明文档补全
+  - [ ] API列表
+  - [ ] 和express的差异和注意事项
+- [ ] 测试用例补全
+  - [ ] 覆盖率达到100%
+- [ ] 编写若干和express常用middleware结合的例子

packages/tiny/static.js renamed to backup/static/index.js

@@ -34,7 +34,7 @@ module.exports = function(dir, opts = {}) {
   dir = resolve(dir || '.');
   const FILES = {};
   const find = (uri, extns) => {
-    if (!!~uri.lastIndexOf('.')) return FILES[uri];
+    if (~uri.lastIndexOf('.')) return FILES[uri];
     let i = 0;
     let data;
     const arr = toAssume(uri, extns);
@@ -76,8 +76,8 @@ module.exports = function(dir, opts = {}) {
       'last-modified': stats.mtime.toUTCString()
     };
     cc && (headers['cache-control'] = cc);
-    opts.etag && (headers['etag'] = toEtag(stats));
-    FILES['/' + str.replace(/\\+/g, '/')] = { abs, stats, headers };
+    opts.etag && (headers.etag = toEtag(stats));
+    FILES[`/${str.replace(/\\+/g, '/')}`] = { abs, stats, headers };
   });
 
   return (req, res, next) => {

package.json

@@ -15,30 +15,32 @@
   "scripts": {
     "test": "node test/index.js",
     "tape": "tape tests/*.js | tap-spec",
-    "cover": "istanbul cover test/index.js",
-    "eslint": "eslint --quiet --fix .",
+    "lint": "eslint --quiet --fix .",
+    "cover": "nyc --reporter=lcovonly --reporter=text --reporter=text-summary --exclude=tests tape tests/*.js | tap-spec",
     "bench": "node test/benchmarks"
   },
   "license": "MIT",
   "devDependencies": {
     "autocannon": "^2.4.1",
     "axios": "^0.18.0",
     "cli-table": "^0.3.1",
-    "eslint": "^5.12.0",
+    "coveralls": "^3.0.3",
+    "eslint": "^5.16.0",
     "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-config-prettier": "^3.4.0",
-    "eslint-plugin-import": "^2.14.0",
+    "eslint-config-prettier": "^3.6.0",
+    "eslint-plugin-import": "^2.17.2",
     "eslint-plugin-prettier": "^2.7.0",
-    "express": "^4.16.4",
+    "express": "^4.17.0",
     "kleur": "^2.0.2",
     "minimist": "^1.2.0",
-    "ora": "^3.0.0",
+    "nyc": "^14.1.1",
+    "ora": "^3.4.0",
     "pancho": "^1.0.2",
-    "polka": "^0.5.1",
-    "prettier": "^1.15.3",
-    "rayo": "^1.2.7",
+    "polka": "^0.5.2",
+    "prettier": "^1.17.1",
+    "rayo": "^1.3.2",
     "tap-spec": "^5.0.0",
-    "tape": "^4.9.2"
+    "tape": "^4.10.1"
   },
   "dependencies": {}
 }

packages/tiny/index.js

@@ -33,13 +33,7 @@ class Tiny extends Router {
   }
 
   mount(base, router) {
-    if (base instanceof Router) {
-      router = base;
-    }
-    if (router.basePath != null) {
-      throw new Error('');
-    }
-    router.basePath = base;
+    router.setBasePath(base);
     this.subRoutes.push(router);
     return this;
   }
@@ -55,6 +49,7 @@ class Tiny extends Router {
   }
 
   handler(req, res) {
+    req.originalUrl = req.originalUrl || req.url;
     const parsedUrl = parseurl(req);
     const params = {};
     const route = this.match(req.method, parsedUrl.pathname, params);

packages/tiny/package.json

@@ -1,8 +1,11 @@
 {
-  "name": "tiny",
-  "version": "0.0.1",
-  "description": "tiny, an micro-framework for Nodejs.",
+  "name": "tiny.io",
+  "version": "0.0.2",
+  "description": "tiny.io, a tiny-web-framework for Nodejs.",
   "main": "index.js",
+  "files": [
+    "*.js"
+  ],
   "engines": {
     "node": ">=8.11.4"
   },

packages/tiny/router.js

@@ -15,25 +15,38 @@ const NAME = Symbol('name');
 const TYPE = Symbol('type');
 const HANDLER = Symbol('handler');
 
+const lead = (x) => (x.charCodeAt(0) === 47 ? x : `/${x}`);
+
 const strip = (str) => {
   if (str === SEP) return str;
+  // eslint-disable-next-line no-unused-expressions
   str.charCodeAt(0) === SLASH && (str = str.substr(1));
   const len = str.length - 1;
   return str.charCodeAt(len) === SLASH ? str.substr(0, len) : str;
 };
 
+// eslint-disable-next-line no-cond-assign
 const split = (str) => ((str = strip(str)) === SEP ? EMPTY_ARRAY : str.split(SEP));
 
 module.exports = class Router {
   constructor(path = null) {
-    this.basePath = path;
+    this.basePath = path && lead(path);
+    const baseLen = path && this.basePath.length;
     this[WAY] = null;
     this.routes = {
       // FILTER(*) for through filter (aka use) handler
       [FILTER]: {
         [TYPE]: STYPE,
         [NAME]: SEP,
-        [HANDLER]: [],
+        [HANDLER]: path
+          ? [
+              (req, res, next) => {
+                req.url = req.url.substring(baseLen) || '/';
+                req.path = req.path.substring(baseLen) || '/';
+                next();
+              }
+            ]
+          : [],
         [PARAM]: null
       }
     };
@@ -53,12 +66,29 @@ module.exports = class Router {
     this.all = this.add.bind(this, ...bind);
   }
 
+  setBasePath(path) {
+    if (this.basePath) {
+      throw new Error('router may mounted?');
+    }
+    this.basePath = lead(path);
+    const baseLen = this.basePath.length;
+
+    const routes = this.routes[FILTER];
+    routes[HANDLER] = [
+      (req, res, next) => {
+        req.url = req.url.substring(baseLen) || '/';
+        next();
+      },
+      ...routes[HANDLER]
+    ];
+  }
+
   add(verb, path, ...handlers) {
     if (Array.isArray(path)) {
       path.forEach((url) => {
         this.add(verb, url, ...handlers);
       });
-      return;
+      return null;
     }
 
     handlers.forEach((handle) => {