fix #1

.env.example

@@ -1,4 +1,3 @@
 APP_PORT=1406
-APP_URL=
-APP_CACHE=1000
+APP_CACHE=
 GITHUB_TOKEN=PersonalAccessToken

README.md

@@ -48,11 +48,8 @@ Configurations are defined in `.env` file.
 # Application port
 APP_PORT=1406
 
-# Where static files are hosted
-APP_URL=
-
-# Cache. Leave it null or 0 to disable (null: APP_CACHE=)
-APP_CACHE=1000
+# Cache expiration in ms. Leave it null to disable
+APP_CACHE=
 
 # GitHub personal access token. See https://github.com/settings/tokens
 GITHUB_TOKEN=PersonalAccessToken

package.json

@@ -22,7 +22,7 @@
     "dotenv": "^2.0.0",
     "koa": "^1.2.1",
     "koa-route": "^2.4.2",
-    "koa-static": "^2.0.0",
+    "koa-send": "^3.2.0",
     "memoizee": "^0.4.1",
     "octokat": "^0.4.18"
   },

src/Badge.js

@@ -10,9 +10,6 @@ let Badge = function (app, env) {
 }
 
 Badge.prototype.draw = function (src) {
-  if (this.$env.APP_URL) {
-    return this.$env.APP_URL + '/' + src
-  }
   return '/' + src
 }
 

src/index.js

@@ -1,12 +1,11 @@
 require('dotenv').config()
 
 import {version} from '../package.json'
-import path from 'path'
 import crypto from 'crypto'
 
 import Koa from 'koa'
 import Route from 'koa-route'
-import Serve from 'koa-static'
+import Send from 'koa-send'
 
 import Octokat from 'octokat'
 import Badge from './Badge'
@@ -19,11 +18,6 @@ app.context.github = new Octokat({
 
 const badge = new Badge(app.context, process.env)
 
-app.use(Serve(path.join(__dirname, '../public'), {
-  gzip: true,
-  maxage: 0
-}))
-
 app.use(Route.get('/', function * () {
   this.body = 'Hireable v' + version
 }))
@@ -33,13 +27,13 @@ app.use(Route.get('/p/:user', function * (user) {
 }))
 
 app.use(Route.get('/:user/:repo?', function * show (id, repo) {
+  let source
   yield badge.show(id, repo).then(src => {
-    this.body = null
-    this.response.etag = crypto.createHash('md5').update(src).digest('hex')
-    this.set('Cache-Control', 'no-cache, no-store, must-revalidate')
-    this.redirect(src)
-    this.status = 301
+    this.set('etag', crypto.createHash('md5').update(src).digest('hex'))
+    this.set('Cache-Control', 'private')
+    source = src
   })
+  yield Send(this, './public/' + source)
 }))
 
 app.listen(process.env.APP_PORT)