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

Rename StatsServer => StatsAPI

Browse Source
This commit is contained in:
MICHAEL JACKSON
2017-11-08 11:07:48 -08:00
parent b614f8646d
commit a8ab15e49d
5 changed files with 66 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
server/StatsServer.js → server/StatsAPI.js
View File

18
server/createStatsServer.js
View File

@ -2,28 +2,32 @@ const express = require('express')
const subDays = require('date-fns/sub_days')
const startOfDay = require('date-fns/start_of_day')
const startOfSecond = require('date-fns/start_of_second')
const StatsServer = require('./StatsServer')
const StatsAPI = require('./StatsAPI')
function serveArbitraryStats(req, res) {
const now = startOfSecond(new Date())
const since = req.query.since ? new Date(req.query.since) : subDays(now, 30)
const until = req.query.until ? new Date(req.query.until) : now
if (isNaN(since.getTime()))
if (isNaN(since.getTime())) {
return res.status(403).send({ error: '?since is not a valid date' })
}
if (isNaN(until.getTime()))
if (isNaN(until.getTime())) {
return res.status(403).send({ error: '?until is not a valid date' })
}
if (until <= since)
if (until <= since) {
return res
.status(403)
.send({ error: '?until date must come after ?since date' })
}
if (until > now)
if (until > now) {
return res.status(403).send({ error: '?until must be a date in the past' })
}
StatsServer.getStats(since, until, function(error, stats) {
StatsAPI.getStats(since, until, (error, stats) => {
if (error) {
console.error(error)
res.status(500).send({ error: 'Unable to fetch stats' })
@ -42,7 +46,7 @@ function servePastDaysStats(days, req, res) {
const until = startOfDay(new Date())
const since = subDays(until, days)
StatsServer.getStats(since, until, function(error, stats) {
StatsAPI.getStats(since, until, (error, stats) => {
if (error) {
console.error(error)
res.status(500).send({ error: 'Unable to fetch stats' })

11
server/ingestLogs.js
View File

@ -3,9 +3,10 @@ const startOfDay = require('date-fns/start_of_day')
const addDays = require('date-fns/add_days')
const validateNPMPackageName = require('validate-npm-package-name')
const parsePackageURL = require('./utils/parsePackageURL')
const cf = require('./CloudflareAPI')
const CloudflareAPI = require('./CloudflareAPI')
const StatsAPI = require('./StatsAPI')
const db = require('./RedisClient')
const { createDayKey } = require('./StatsServer')
/**
* Domains we want to analyze.
@ -55,7 +56,7 @@ function computeCounters(stream) {
const nextDay = startOfDay(addDays(date, 1))
const sevenDaysLater = getSeconds(addDays(nextDay, 7))
const thirtyDaysLater = getSeconds(addDays(nextDay, 30))
const dayKey = createDayKey(date)
const dayKey = StatsAPI.createDayKey(date)
const clientRequest = entry.clientRequest
const edgeResponse = entry.edgeResponse
@ -138,7 +139,7 @@ function ingestLogs(zone, startSeconds, endSeconds) {
const startFetchTime = Date.now()
resolve(
cf.getLogs(zone.id, startSeconds, endSeconds).then(stream => {
CloudflareAPI.getLogs(zone.id, startSeconds, endSeconds).then(stream => {
const endFetchTime = Date.now()
console.log(
@ -226,7 +227,7 @@ function startZone(zone) {
takeATurn()
}
Promise.all(DomainNames.map(cf.getZones)).then(results => {
Promise.all(DomainNames.map(CloudflareAPI.getZones)).then(results => {
const zones = results.reduce((memo, zones) => {
return memo.concat(zones)
})