Separate out cache + data servers

server/AuthAPI.js

@@ -1,7 +1,7 @@
 const crypto = require("crypto");
 const jwt = require("jsonwebtoken");
 
-const db = require("./utils/redis");
+const db = require("./utils/data");
 const secretKey = require("./secretKey");
 
 function getCurrentSeconds() {

server/BlacklistAPI.js

@@ -1,4 +1,4 @@
-const db = require("./utils/redis");
+const db = require("./utils/data");
 
 const blacklistSet = "blacklisted-packages";
 

server/StatsAPI.js

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

server/ingestLogs.js

@@ -3,7 +3,7 @@ const startOfDay = require("date-fns/start_of_day");
 const startOfMinute = require("date-fns/start_of_minute");
 const addDays = require("date-fns/add_days");
 
-const db = require("./utils/redis");
+const db = require("./utils/data");
 const isValidPackageName = require("./utils/isValidPackageName");
 const parsePackageURL = require("./utils/parsePackageURL");
 

server/utils/cache.js

@@ -0,0 +1,9 @@
+const redis = require("redis");
+
+redis.debug_mode = process.env.DEBUG_REDIS != null;
+
+const client = redis.createClient(
+  process.env.CACHE_URL || process.env.OPENREDIS_URL || "redis://localhost:6379"
+);
+
+module.exports = client;

server/utils/createCache.js

@@ -1,4 +1,4 @@
-const db = require("./redis");
+const db = require("./cache");
 
 /**
  * A persistent cache for JSON values, using Redis.

server/utils/data.js

@@ -0,0 +1,9 @@
+const redis = require("redis");
+
+redis.debug_mode = process.env.DEBUG_REDIS != null;
+
+const client = redis.createClient(
+  process.env.DATA_URL || process.env.OPENREDIS_URL || "redis://localhost:6379"
+);
+
+module.exports = client;

server/utils/incrementCounter.js

@@ -1,4 +1,4 @@
-const db = require("./redis");
+const db = require("./data");
 
 function incrementCounter(counter, key, by = 1) {
   return new Promise((resolve, reject) => {

server/utils/redis.js

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