chore: sentinel

Author: Timeraa

apps/master/package.json

@@ -12,6 +12,7 @@
 		"@sentry/tracing": "^7.46.0",
 		"cron": "^2.3.0",
 		"debug": "^4.3.4",
+		"ioredis": "^5.3.2",
 		"mongodb": "^5.1.0",
 		"redis": "^4.6.12",
 		"source-map-support": "^0.5.21"

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,8 +23,13 @@ Sentry.init({
 	integrations: [new Integrations.Mongo()]
 });
 
-export const redis = createClient({
-		url: process.env.REDIS_URL || "redis://localhost:6379"
+export const redis = new Redis({
+		sentinels: process.env.REDIS_SENTINELS?.split(",")?.map(s => ({
+			host: s.split(":")[0],
+			port: 26379
+		})),
+		name: "mymaster",
+		lazyConnect: true
 	}),
 	mongo = new MongoClient(process.env.MONGO_URL!, {
 		appName: "PreMiD-API-Master"

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

@@ -19,14 +19,14 @@
 		"axios": "^0.27.0",
 		"fastify": "^3.27.4",
 		"graphql": "^16.3.0",
+		"ioredis": "^5.3.2",
 		"keyv": "^4.5.4",
 		"keyv-anyredis": "^3.3.0",
 		"language-flag-colors": "^2.1.1",
 		"lodash": "^4.17.21",
 		"mongodb": "^4.4.1",
 		"mongodb-caching": "^1.1.0",
 		"p-event": "^4.2.0",
-		"redis": "^4.6.12",
 		"source-map-support": "^0.5.21",
 		"validator": "^13.7.0"
 	},

apps/worker/src/index.ts

@@ -12,7 +12,7 @@ import {
 import { ApolloServer } from "apollo-server-fastify";
 import responseCachePlugin from "apollo-server-plugin-response-cache";
 import fastify, { FastifyContext, FastifyReply, FastifyRequest } from "fastify";
-import { createClient, createCluster } from "redis";
+import { Redis } from "ioredis";
 import { MongoClient } from "mongodb";
 
 import appUpdate from "./generic/appUpdate";
@@ -43,8 +43,13 @@ if (process.env.SENTRY_DSN)
 export const mongodb = new MongoClient(process.env.MONGO_URL!, {
 		appName: "PreMiD-API-Worker"
 	}),
-	redis = createClient({
-		url: process.env.REDIS_URL || "redis://localhost:6379"
+	redis = new Redis({
+		sentinels: process.env.REDIS_SENTINELS?.split(",")?.map(s => ({
+			host: s.split(":")[0],
+			port: 26379
+		})),
+		name: "mymaster",
+		lazyConnect: true
 	}),
 	baseRedisCache = new BaseRedisCache({
 		//@ts-ignore

apps/worker/src/util/keyv.ts

@@ -18,7 +18,7 @@ const handler: RouteHandlerMethod<
 	if (!validator.isUUID(params.identifier, "4"))
 		return res.status(400).send("identifier must be a UUID v4.");
 
-	await redis.HSET(
+	await redis.hset(
 		"pmd-api.scienceDeletes",
 		params.identifier,
 		params.identifier

apps/worker/src/v2/deleteScience.ts

@@ -37,7 +37,7 @@ export async function resolver(
 		}
 	};
 
-	await redis.HSET(
+	await redis.hset(
 		"pmd-api.scienceUpdates",
 		params.identifier,
 		JSON.stringify(data)

apps/worker/src/v3/fields/addScience.ts

@@ -18,7 +18,7 @@ export async function resolver(_: any, params: { identifier: string }) {
 	if (!validator.isUUID(params.identifier, "4"))
 		return new GraphQLError("identifier must be a UUID v4.");
 
-	await redis.HSET(
+	await redis.hset(
 		"pmd-api.scienceDeletes",
 		params.identifier,
 		params.identifier

apps/worker/src/v3/fields/deleteScience.ts

@@ -37,7 +37,7 @@ export async function resolver(
 		}
 	};
 
-	await redis.HSET(
+	await redis.hset(
 		"pmd-api.scienceUpdates",
 		params.identifier,
 		JSON.stringify(data)