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

Small tweaks

Browse Source
This commit is contained in:
Michael Jackson
2018-05-21 13:35:14 -07:00
parent c792515d01
commit ba14f9197f
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/CloudflareAPI.js
View File

@ -3,7 +3,7 @@ const invariant = require("invariant");
const gunzip = require("gunzip-maybe"); const gunzip = require("gunzip-maybe");
const ndjson = require("ndjson"); const ndjson = require("ndjson");
const cloudflareAPIURL = "https://api.cloudflare.com"; const cloudflareURL = "https://api.cloudflare.com";
const cloudflareEmail = process.env.CLOUDFLARE_EMAIL; const cloudflareEmail = process.env.CLOUDFLARE_EMAIL;
const cloudflareKey = process.env.CLOUDFLARE_KEY; const cloudflareKey = process.env.CLOUDFLARE_KEY;
@ -15,7 +15,7 @@ invariant(
invariant(cloudflareKey, "Missing the $CLOUDFLARE_KEY environment variable"); invariant(cloudflareKey, "Missing the $CLOUDFLARE_KEY environment variable");
function get(path, headers) { function get(path, headers) {
return fetch(`${cloudflareAPIURL}/client/v4${path}`, { return fetch(`${cloudflareURL}/client/v4${path}`, {
headers: Object.assign({}, headers, { headers: Object.assign({}, headers, {
"X-Auth-Email": cloudflareEmail, "X-Auth-Email": cloudflareEmail,
"X-Auth-Key": cloudflareKey "X-Auth-Key": cloudflareKey
@ -41,14 +41,10 @@ function getJSON(path, headers) {
function getZones(domains) { function getZones(domains) {
return Promise.all( return Promise.all(
(Array.isArray(domains) ? domains : [domains]).map(domain => { (Array.isArray(domains) ? domains : [domains]).map(domain =>
return getJSON(`/zones?name=${domain}`); getJSON(`/zones?name=${domain}`)
}) )
).then(results => { ).then(results => results.reduce((memo, zones) => memo.concat(zones)));
return results.reduce((memo, zones) => {
return memo.concat(zones);
});
});
} }
function reduceResults(target, values) { function reduceResults(target, values) {
@ -74,9 +70,7 @@ function getZoneAnalyticsDashboard(zones, since, until) {
}/analytics/dashboard?since=${since.toISOString()}&until=${until.toISOString()}` }/analytics/dashboard?since=${since.toISOString()}&until=${until.toISOString()}`
); );
}) })
).then(results => { ).then(results => results.reduce(reduceResults));
return results.reduce(reduceResults);
});
} }
function getJSONStream(path, headers) { function getJSONStream(path, headers) {
@ -85,12 +79,8 @@ function getJSONStream(path, headers) {
}); });
return get(path, acceptGzipHeaders) return get(path, acceptGzipHeaders)
.then(res => { .then(res => res.body.pipe(gunzip()))
return res.body.pipe(gunzip()); .then(stream => stream.pipe(ndjson.parse()));
})
.then(stream => {
return stream.pipe(ndjson.parse());
});
} }
function getLogs(zoneId, startTime, endTime) { function getLogs(zoneId, startTime, endTime) {