refactor(server): update to koa2

Author: chuangker

.eslintrc.js

@@ -4,7 +4,8 @@ module.exports = {
   "parser": "babel-eslint",
   "env": {
     "browser": true,
-    "mocha": true
+    "jest": true,
+    "node": true
   },
   "plugins": [
     "html"

README.md

@@ -1,7 +1,7 @@
 <p align="center"><a href="https://easy-mock.com" target="_blank"><img width="100"src="http://img.souche.com/20170509/png/fff9d8506199c4bf8cc53bad9d849215.png"></a></p>
 
 <p align="center">
-  <a href="https://nodejs.org"><img src="https://img.shields.io/badge/node-%3E%3D7.4.0-green.svg?style=flat" alt="Node.js Version"></a>
+  <a href="https://nodejs.org"><img src="https://img.shields.io/badge/node-%3E%3D8.9.1-green.svg?style=flat" alt="Node.js Version"></a>
   <a href="https://www.mongodb.com"><img src="https://img.shields.io/badge/mongo-%3E%3D3.4.1-green.svg?style=flat" alt="MongoDB Version"></a>
   <a href="https://circleci.com/gh/easy-mock/easy-mock/tree/dev"><img src="https://img.shields.io/circleci/project/easy-mock/easy-mock/dev.svg" alt="Build Status"></a>
   <a href="https://codecov.io/github/easy-mock/easy-mock?branch=dev"><img src="https://img.shields.io/codecov/c/github/easy-mock/easy-mock/dev.svg" alt="Coverage Status"></a>
@@ -58,7 +58,7 @@ visualization view.
 ## Quick Start
 
 > Before starting, we assume that you're already have installed
-> [Node.js](https://nodejs.org) (>= v7.4) and [MongoDB](https://www.mongodb.com)
+> [Node.js](https://nodejs.org) (>= v8.9) and [MongoDB](https://www.mongodb.com)
 > (>= v3.4).
 
 ### Installation

README.zh-CN.md

@@ -1,7 +1,7 @@
 <p align="center"><a href="https://easy-mock.com" target="_blank"><img width="100"src="http://img.souche.com/20170509/png/fff9d8506199c4bf8cc53bad9d849215.png"></a></p>
 
 <p align="center">
-  <a href="https://nodejs.org"><img src="https://img.shields.io/badge/node-%3E%3D7.4.0-green.svg?style=flat" alt="Node.js Version"></a>
+  <a href="https://nodejs.org"><img src="https://img.shields.io/badge/node-%3E%3D8.9.1-green.svg?style=flat" alt="Node.js Version"></a>
   <a href="https://www.mongodb.com"><img src="https://img.shields.io/badge/mongo-%3E%3D3.4.1-green.svg?style=flat" alt="MongoDB Version"></a>
   <a href="https://circleci.com/gh/easy-mock/easy-mock/tree/dev"><img src="https://img.shields.io/circleci/project/easy-mock/easy-mock/dev.svg" alt="Build Status"></a>
   <a href="https://codecov.io/github/easy-mock/easy-mock?branch=dev"><img src="https://img.shields.io/codecov/c/github/easy-mock/easy-mock/dev.svg" alt="Coverage Status"></a>
@@ -53,7 +53,7 @@ Easy Mock 是一个可视化，并且能快速生成**模拟数据**的持久化
 
 ## 快速开始
 
-> 在开始之前，假设你已经成功安装了 [Node.js](https://nodejs.org)（**v7.4** 以上）和 [MongoDB](https://www.mongodb.com)（**v3.4** 以上）。
+> 在开始之前，假设你已经成功安装了 [Node.js](https://nodejs.org)（**v8.9** 以上）和 [MongoDB](https://www.mongodb.com)（**v3.4** 以上）。
 
 ### 安装
 

app.js

@@ -1,85 +1,64 @@
 'use strict'
 
-const _ = require('lodash')
-const koa = require('koa')
+const Koa = require('koa')
 const path = require('path')
-const cors = require('koa-cors')
 const config = require('config')
-const error = require('koa-error')
+const koaJwt = require('koa-jwt')
+const cors = require('@koa/cors')
+const koaBody = require('koa-body')
+const onerror = require('koa-onerror')
 const favicon = require('koa-favicon')
 const validate = require('koa-validate')
-const jwtMongo = require('koa-jwt-mongo')
-const bodyParser = require('koa-bodyparser')
-const pathToRegexp = require('path-to-regexp')
 const staticCache = require('koa-static-cache')
-const koaBunyanLogger = require('koa-bunyan-logger')
 
 const util = require('./util')
-const logger = require('./util/log')
+const logger = require('./util/logger')
 const middleware = require('./middlewares')
 const routerConfig = require('./router-config')
 
-const app = module.exports = koa()
-const resolve = file => path.resolve(__dirname, file)
-const isProd = process.env.NODE_ENV === 'production'
-
-const serve = (pf, filePath, cache) => staticCache(resolve(filePath), {
-  prefix: pf,
-  gzip: true,
-  dynamic: true,
-  maxAge: cache && isProd ? 60 * 60 * 24 * 30 : 0
-})
+const app = module.exports = new Koa()
+const uploadConf = config.get('upload')
+const jwtSecret = config.get('jwt.secret')
 
 util.dropFileSchedule()
+onerror(app)
 validate(app)
 
-const requestLogger = isProd
-  ? koaBunyanLogger.requestLogger()
-  : function * (next) {
-    yield next
-  }
-
-app.proxy = config.get('proxy')
 app
   .use(favicon(path.join(__dirname, '/public/images/icon.png')))
   .use(serve('/dist', './dist'))
   .use(serve('/public', './public'))
-  .use(serve('/upload', path.resolve(__dirname, 'config', config.get('upload').dir)))
-  .use(koaBunyanLogger(logger))
-  .use(koaBunyanLogger.requestIdContext())
-  .use(requestLogger)
-  .use(cors({
-    methods: 'GET,HEAD,PUT,POST,DELETE,PATCH',
-    credentials: true,
-    maxAge: 2592000
-  }))
-  .use(error())
-  .use(bodyParser())
-  .use(middleware.common)
-  .use(middleware.error)
-  .use(jwtMongo({
-    uri: config.get('db'),
-    jwtExp: config.get('jwt.expire'),
-    collection: config.get('jwt.collection'),
-    jwtOptions: {
-      secret: config.get('jwt.secret'),
-      key: config.get('jwt.key')
-    },
-    jwtUnless () {
-      const path = this.path
-      const prefix = `/${path.split('/')[1]}`
-      return !(new RegExp(config.get('routerPrefix.api'))).test(prefix)
-        ? true : _.some(config.get('publicAPIs').map(
-          o => pathToRegexp(o).test(this.path)
-        ), Boolean)
-    }
+  .use(serve('/upload', path.resolve(__dirname, 'config', uploadConf.dir)))
+  .use(logger)
+  .use(koaJwt({ secret: jwtSecret }).unless({
+    path: [
+      /^\/(public|dist|upload|mock)\//,
+      '/api/u/login',
+      '/api/u/register',
+      '/api/mock/by_projects',
+      '/api/mock/export',
+      '/api/wallpaper'
+    ]
   }))
+  .use(cors({ credentials: true, maxAge: 2592000 }))
+  .use(koaBody({ multipart: true }))
+  .use(middleware.util)
   .use(routerConfig.mock.routes())
   .use(routerConfig.mock.allowedMethods())
   .use(routerConfig.api.routes())
   .use(routerConfig.api.allowedMethods())
-  .use(middleware.view(app))
+  // .use(middleware.view(app))
+
+app.proxy = config.get('proxy')
+
+/* istanbul ignore if */
+if (!module.parent) app.listen(config.get('port'))
 
-if (!module.parent) {
-  app.listen(config.get('port'))
+function serve (prefix, filePath) {
+  return staticCache(path.resolve(__dirname, filePath), {
+    prefix: prefix,
+    gzip: true,
+    dynamic: true,
+    maxAge: 60 * 60 * 24 * 30
+  })
 }

circle.yml

@@ -1,6 +1,6 @@
 machine:
   node:
-    version: 7.4.0
+    version: 8.9.1
 
 test:
   override:

config/default.json

@@ -1,25 +1,10 @@
 {
   "port": 7300,
   "pageSize": 30,
-  "routerPrefix": {
-    "mock": "/mock",
-    "api": "/api"
-  },
   "db": "",
   "unsplashClientId": "",
-  "gravatar": [
-    "//img.souche.com/20161230/png/58f22ad636a0f33bad8762688f78d425.png",
-    "//img.souche.com/20161230/png/6cdcda90c2f86ba1f45393cf5b26e324.png",
-    "//img.souche.com/20161230/png/f9d10bb683d940dd14dc1b1344e89568.png",
-    "//img.souche.com/20161230/png/8bb4f0fd45ed6ae26533eadd85f0f7ea.png",
-    "//img.souche.com/20161230/png/0795744371fd5869af6cab796bdacb95.png",
-    "//img.souche.com/20161230/png/bc836261fbb654dda6b653e428014279.png",
-    "//img.souche.com/20161230/png/fd9f8aecab317e177655049a49b64d02.png"
-  ],
   "jwt": {
-    "key": "user",
     "expire": "14 days",
-    "collection": "tokens",
     "secret": "shared-secret"
   },
   "proxy": false,
@@ -32,45 +17,6 @@
       "day": -1
     }
   },
-  "publicAPIs": [
-    "/api/proxy",
-    "/api/u/login",
-    "/api/u/register",
-    "/api/mock/by_projects",
-    "/api/mock/export",
-    "/api/wallpaper"
-  ],
-  "mockExample": {
-    "common": {
-      "success": true,
-      "data": [{
-        "user": {
-          "name": "演示用"
-        }
-      }]
-    },
-    "getFunction": "{ success :true, data: { default: \"hah\", _req: function({ _req }) { return _req }, name: function({ _req }) { return _req.query.name || this.default }}}",
-    "postFunction": "{ data: { img: function({ _req, Mock }) { return _req.body.fileName + '_' + Mock.mock('@image') }}}",
-    "random": {
-      "success": true,
-      "data": {
-        "projects|3-10": [{
-          "name": "演示用",
-          "url": "@url",
-          "email": "@email",
-          "address": "@county(true)",
-          "string|1-10": "★",
-          "number|1-100": 100,
-          "boolean|1-2": true,
-          "object|2": {
-            "310000": "上海市",
-            "320000": "江苏省",
-            "330000": "浙江省"
-          }
-        }]
-      }
-    }
-  },
   "fe": {
     "copyright": "",
     "storageNamespace": "easy-mock_",

controllers/dashboard.js

@@ -0,0 +1,67 @@
+'use strict'
+
+const moment = require('moment')
+const LRU = require('lru-cache')
+
+const { Project, Mock, MockCount, User } = require('../models')
+
+const cache = LRU({ max: 1, maxAge: 1000 * 60 * 60 })
+
+/**
+ * 获取 Mock 使用次数
+ */
+
+function getUseTotalCount (query = {}) {
+  return MockCount.aggregate(
+    { $match: query },
+    { $group: { _id: null, total: { $sum: '$count' } } }
+  ).then(data => data[0] ? /* istanbul ignore next */ data[0].total : 0)
+}
+
+module.exports = class DashboardController {
+  /**
+   * 仪表板
+   * @param Object ctx
+   */
+
+  static async list (ctx) {
+    let result = cache.get('list')
+    const query = {
+      create_at: {
+        '$gte': new Date(moment().format('YYYY-MM-DD'))
+      }
+    }
+
+    if (!result) {
+      const data = await Promise.all([
+        User.count(),
+        Mock.count(),
+        Project.count(),
+        getUseTotalCount(),
+        User.count(query),
+        Mock.count(query),
+        Project.count(query),
+        getUseTotalCount(query)
+      ])
+
+      result = {
+        total: {
+          userCount: data[0],
+          mockCount: data[1],
+          projectCount: data[2],
+          mockUseCount: data[3]
+        },
+        today: {
+          userCount: data[4],
+          mockCount: data[5],
+          projectCount: data[6],
+          mockUseCount: data[7]
+        }
+      }
+
+      cache.set('list', result)
+    }
+
+    ctx.body = ctx.util.resuccess(result)
+  }
+}