fix(master): use ioredis and sentinels

Author: Bas950

apps/master/package.json

@@ -12,16 +12,17 @@
 		"@sentry/tracing": "^7.46.0",
 		"cron": "^2.3.0",
 		"debug": "^4.3.4",
+		"ioredis": "^5.0.1",
 		"mongodb": "^5.1.0",
-		"redis": "^4.6.5",
 		"source-map-support": "^0.5.21"
 	},
 	"devDependencies": {
 		"@types/cron": "^2.0.1",
 		"@types/debug": "^4.1.7",
+		"@types/ioredis": "^4.28.10",
 		"dotenv": "^16.0.3",
 		"ts-devscript": "^3.0.7",
 		"typescript": "^5.0.3"
 	},
-	"packageManager": "pnpm@8.1.0"
+	"packageManager": "pnpm@8.13.0"
 }

apps/master/src/index.ts

@@ -6,7 +6,7 @@ import * as Sentry from "@sentry/node";
 import { Integrations } from "@sentry/tracing";
 import debug from "debug";
 import { MongoClient } from "mongodb";
-import { createClient } from "redis";
+import { Redis } from "ioredis";
 
 import calculatePresenceUsage from "./util/calculatePresenceUsage.js";
 import updateScience from "./util/updateScience.js";
@@ -23,18 +23,20 @@ Sentry.init({
 	integrations: [new Integrations.Mongo()]
 });
 
-export const redis = createClient({
-		url: process.env.REDIS_URL || "redis://localhost:6379/"
+export const redis = new Redis({
+		sentinels: [
+			{
+				host: process.env.REDIS_HOST || "localhost",
+				port: parseInt(process.env.REDIS_PORT || "26379")
+			}
+		],
+		name: "mymaster"
 	}),
 	mongo = new MongoClient(process.env.MONGO_URL!, {
 		appName: "PreMiD-API-Master"
 	}),
 	mainLog = debug("API-Master");
 
-redis.on("error", err => {
-	throw err;
-});
-
 debug.enable("API-Master*");
 
 mainLog("Connecting to MongoDB...");

apps/master/src/util/updateScience.ts

@@ -5,7 +5,7 @@ export default async function () {
 		key = "pmd-api.scienceUpdates";
 
 	log("Updating...");
-	const scienceUpdates = await redis.hVals(key);
+	const scienceUpdates = await redis.hvals(key);
 
 	let invalidEntries: string[] = [],
 		entries: {
@@ -35,7 +35,7 @@ export default async function () {
 	}
 
 	if (invalidEntries.length) {
-		await redis.hDel(key, invalidEntries);
+		await redis.hdel(key, ...invalidEntries);
 		log("Deleted %n invalid entries", invalidEntries.length);
 	}
 
@@ -53,10 +53,7 @@ export default async function () {
 				}))
 			);
 
-		await redis.hDel(
-			key,
-			entries.map(e => e.identifier)
-		);
+		await redis.hdel(key, ...entries.map(e => e.identifier));
 
 		log(
 			"Inserted %s entries, Updated %s entries",
@@ -65,7 +62,7 @@ export default async function () {
 		);
 	} else log("No entries to update");
 
-	const delRedis = await redis.hVals("pmd-api.scienceDeletes");
+	const delRedis = await redis.hvals("pmd-api.scienceDeletes");
 
 	let orMatch: any[] = [
 		{
@@ -79,7 +76,7 @@ export default async function () {
 		$or: orMatch
 	});
 
-	if (delRedis.length) await redis.hDel("pmd-api.scienceDeletes", delRedis);
+	if (delRedis.length) await redis.hdel("pmd-api.scienceDeletes", ...delRedis);
 
 	if (delRes.deletedCount) log("Deleted %s entries", delRes.deletedCount);
 }

apps/worker/package.json

@@ -41,5 +41,5 @@
 		"ts-devscript": "^3.0.6",
 		"typescript": "^5.0.3"
 	},
-	"packageManager": "pnpm@7.32.5"
+	"packageManager": "pnpm@8.13.0"
 }

package.json

@@ -1,3 +1,3 @@
 {
-	"packageManager": "pnpm@8.5.1"
+	"packageManager": "pnpm@8.13.0"
 }