186526
/
unpkg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move some files around

This commit is contained in:
MICHAEL JACKSON 2017-09-13 08:06:50 -07:00
parent de1195d8e9
commit 293786d182
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server.js
View File

@ -1,11 +1,11 @@
const http = require('http') const http = require('http')
const throng = require('throng') const throng = require('throng')
const createApp = require('./server/createApp') const createServer = require('./server/createServer')
const port = parseInt(process.env.PORT, 10) || 5000 const port = parseInt(process.env.PORT, 10) || 5000
function startServer(id) { function startServer(id) {
const server = http.createServer(createApp()) const server = http.createServer(createServer())
// Heroku dynos automatically timeout after 30s. Set our // Heroku dynos automatically timeout after 30s. Set our
// own timeout here to force sockets to close before that. // own timeout here to force sockets to close before that.

5
server/createApp.js → server/createServer.js
View File

@ -8,9 +8,9 @@ const checkBlacklist = require('./middleware/checkBlacklist')
const packageURL = require('./middleware/packageURL') const packageURL = require('./middleware/packageURL')
const fetchFile = require('./middleware/fetchFile') const fetchFile = require('./middleware/fetchFile')
const serveFile = require('./middleware/serveFile') const serveFile = require('./middleware/serveFile')
const serveStats = require('./middleware/serveStats')
const createSearchServer = require('./createSearchServer') const createSearchServer = require('./createSearchServer')
const createStatsServer = require('./createStatsServer')
morgan.token('fwd', function (req) { morgan.token('fwd', function (req) {
return req.get('x-forwarded-for').replace(/\s/g, '') return req.get('x-forwarded-for').replace(/\s/g, '')
@ -48,9 +48,8 @@ function createApp() {
maxAge: '365d' maxAge: '365d'
})) }))
app.use('/_stats', serveStats())
app.use('/_search', createSearchServer()) app.use('/_search', createSearchServer())
app.use('/_stats', createStatsServer())
app.use('/', app.use('/',
packageURL, packageURL,

4
server/createApp.test.js → server/createServer.test.js
View File

@ -1,10 +1,10 @@
const request = require('supertest') const request = require('supertest')
const createApp = require('./createApp') const createServer = require('./createServer')
describe('The server app', function () { describe('The server app', function () {
let app let app
beforeEach(function () { beforeEach(function () {
app = createApp() app = createServer()
}) })
it('rejects invalid package names', function (done) { it('rejects invalid package names', function (done) {

6
server/middleware/serveStats.js → server/createStatsServer.js
View File

@ -2,7 +2,7 @@ const express = require('express')
const subDays = require('date-fns/sub_days') const subDays = require('date-fns/sub_days')
const startOfDay = require('date-fns/start_of_day') const startOfDay = require('date-fns/start_of_day')
const startOfSecond = require('date-fns/start_of_second') const startOfSecond = require('date-fns/start_of_second')
const StatsServer = require('../StatsServer') const StatsServer = require('./StatsServer')
function serveArbitraryStats(req, res) { function serveArbitraryStats(req, res) {
const now = startOfSecond(new Date) const now = startOfSecond(new Date)
@ -63,7 +63,7 @@ function serveLastDayStats(req, res) {
servePastDaysStats(1, req, res) servePastDaysStats(1, req, res)
} }
function serveStats() { function createStatsServer() {
const app = express.Router() const app = express.Router()
app.get('/', serveArbitraryStats) app.get('/', serveArbitraryStats)
@ -74,4 +74,4 @@ function serveStats() {
return app return app
} }
module.exports = serveStats module.exports = createStatsServer