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

Small tweaks

This commit is contained in:
Michael Jackson 2018-04-03 22:32:32 -07:00
parent 7a9dfd2260
commit fac3f4c5be
9 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/AuthAPI.js
View File

@ -52,7 +52,7 @@ function createToken(scopes = {}) {
});
}
const RevokedTokensSet = "revoked-tokens";
const revokedTokensSet = "revoked-tokens";
function verifyToken(token) {
return new Promise((resolve, reject) => {
@ -63,7 +63,7 @@ function verifyToken(token) {
reject(error);
} else {
if (payload.jti) {
db.sismember(RevokedTokensSet, payload.jti, (error, value) => {
db.sismember(revokedTokensSet, payload.jti, (error, value) => {
if (error) {
reject(error);
} else {
@ -82,7 +82,7 @@ function revokeToken(token) {
return verifyToken(token).then(payload => {
if (payload) {
return new Promise((resolve, reject) => {
db.sadd(RevokedTokensSet, payload.jti, error => {
db.sadd(revokedTokensSet, payload.jti, error => {
if (error) {
reject(error);
} else {
@ -96,7 +96,7 @@ function revokeToken(token) {
function removeAllRevokedTokens() {
return new Promise((resolve, reject) => {
db.del(RevokedTokensSet, error => {
db.del(revokedTokensSet, error => {
if (error) {
reject(error);
} else {

12
server/BlacklistAPI.js
View File

@ -1,10 +1,10 @@
const db = require("./utils/redis");
const BlacklistSet = "blacklisted-packages";
const blacklistSet = "blacklisted-packages";
function addPackage(packageName) {
return new Promise((resolve, reject) => {
db.sadd(BlacklistSet, packageName, (error, value) => {
db.sadd(blacklistSet, packageName, (error, value) => {
if (error) {
reject(error);
} else {
@ -16,7 +16,7 @@ function addPackage(packageName) {
function removePackage(packageName) {
return new Promise((resolve, reject) => {
db.srem(BlacklistSet, packageName, (error, value) => {
db.srem(blacklistSet, packageName, (error, value) => {
if (error) {
reject(error);
} else {
@ -28,7 +28,7 @@ function removePackage(packageName) {
function removeAllPackages() {
return new Promise((resolve, reject) => {
db.del(BlacklistSet, error => {
db.del(blacklistSet, error => {
if (error) {
reject(error);
} else {
@ -40,7 +40,7 @@ function removeAllPackages() {
function getPackages() {
return new Promise((resolve, reject) => {
db.smembers(BlacklistSet, (error, value) => {
db.smembers(blacklistSet, (error, value) => {
if (error) {
reject(error);
} else {
@ -52,7 +52,7 @@ function getPackages() {
function includesPackage(packageName) {
return new Promise((resolve, reject) => {
db.sismember(BlacklistSet, packageName, (error, value) => {
db.sismember(blacklistSet, packageName, (error, value) => {
if (error) {
reject(error);
} else {

16
server/CloudflareAPI.js
View File

@ -3,22 +3,22 @@ const invariant = require("invariant");
const gunzip = require("gunzip-maybe");
const ndjson = require("ndjson");
const CloudflareAPIURL = "https://api.cloudflare.com";
const CloudflareEmail = process.env.CLOUDFLARE_EMAIL;
const CloudflareKey = process.env.CLOUDFLARE_KEY;
const cloudflareAPIURL = "https://api.cloudflare.com";
const cloudflareEmail = process.env.CLOUDFLARE_EMAIL;
const cloudflareKey = process.env.CLOUDFLARE_KEY;
invariant(
CloudflareEmail,
cloudflareEmail,
"Missing the $CLOUDFLARE_EMAIL environment variable"
);
invariant(CloudflareKey, "Missing the $CLOUDFLARE_KEY environment variable");
invariant(cloudflareKey, "Missing the $CLOUDFLARE_KEY environment variable");
function get(path, headers) {
return fetch(`${CloudflareAPIURL}/client/v4${path}`, {
return fetch(`${cloudflareAPIURL}/client/v4${path}`, {
headers: Object.assign({}, headers, {
"X-Auth-Email": CloudflareEmail,
"X-Auth-Key": CloudflareKey
"X-Auth-Email": cloudflareEmail,
"X-Auth-Key": cloudflareKey
})
});
}

1
server/StatsAPI.js
View File

@ -1,4 +1,5 @@
const db = require("./utils/redis");
const CloudflareAPI = require("./CloudflareAPI");
const BlacklistAPI = require("./BlacklistAPI");

15
server/ingestLogs.js
View File

@ -1,16 +1,17 @@
const parseURL = require("url").parse;
const startOfDay = require("date-fns/start_of_day");
const addDays = require("date-fns/add_days");
const parsePackageURL = require("./utils/parsePackageURL");
const CloudflareAPI = require("./CloudflareAPI");
const StatsAPI = require("./StatsAPI");
const db = require("./utils/redis");
const parsePackageURL = require("./utils/parsePackageURL");
const CloudflareAPI = require("./CloudflareAPI");
const StatsAPI = require("./StatsAPI");
/**
* Domains we want to analyze.
*/
const DomainNames = [
const domainNames = [
"unpkg.com"
//"npmcdn.com" // We don't have log data on npmcdn.com yet :/
];
@ -18,7 +19,7 @@ const DomainNames = [
/**
* The window of time to download in a single fetch.
*/
const LogWindowSeconds = 30;
const logWindowSeconds = 30;
function getSeconds(date) {
return Math.floor(date.getTime() / 1000);
@ -207,7 +208,7 @@ function startZone(zone) {
const maxSeconds = toSeconds(now - oneMinute * 30);
if (startSeconds < maxSeconds) {
const endSeconds = startSeconds + LogWindowSeconds;
const endSeconds = startSeconds + logWindowSeconds;
ingestLogs(zone, startSeconds, endSeconds).then(
function() {
@ -228,7 +229,7 @@ function startZone(zone) {
takeATurn();
}
Promise.all(DomainNames.map(CloudflareAPI.getZones)).then(results => {
Promise.all(domainNames.map(CloudflareAPI.getZones)).then(results => {
const zones = results.reduce((memo, zones) => {
return memo.concat(zones);
});

1
server/utils/getEntries.js
View File

@ -1,5 +1,6 @@
const fs = require("fs");
const path = require("path");
const getFileStats = require("./getFileStats");
function getEntries(dir) {

1
server/utils/getMetadata.js
View File

@ -1,6 +1,7 @@
const fs = require("fs");
const path = require("path");
const SRIToolbox = require("sri-toolbox");
const getFileContentType = require("./getFileContentType");
const getFileStats = require("./getFileStats");
const getFileType = require("./getFileType");

4
server/utils/redis.js
View File

@ -2,11 +2,11 @@ const redis = require("redis");
redis.debug_mode = process.env.DEBUG_REDIS != null;
const RedisURL =
const redisURL =
process.env.OPENREDIS_URL ||
process.env.REDIS_URL ||
"redis://localhost:6379";
const client = redis.createClient(RedisURL);
const client = redis.createClient(redisURL);
module.exports = client;

4
server/utils/unpkgRewriteBabelPlugin.js
View File

@ -1,7 +1,7 @@
const URL = require("whatwg-url");
const warning = require("warning");
const BareIdentifierFormat = /^((?:@[^\/]+\/)?[^\/]+)(\/.*)?$/;
const bareIdentifierFormat = /^((?:@[^\/]+\/)?[^\/]+)(\/.*)?$/;
function unpkgRewriteBabelPlugin(dependencies = {}) {
return {
@ -22,7 +22,7 @@ function unpkgRewriteBabelPlugin(dependencies = {}) {
path.node.source.value = `${path.node.source.value}?module`;
} else {
// "bare" identifier
const match = BareIdentifierFormat.exec(path.node.source.value);
const match = bareIdentifierFormat.exec(path.node.source.value);
const packageName = match[1];
const file = match[2] || "";