feat: PMD-83 & PMD-84 & PMD-85 (#725)

Author: Bas950

master/pnpm-lock.yaml

@@ -9,10 +9,10 @@
 		"build": "tsc && devScript --copyOnly"
 	},
 	"dependencies": {
+		"@keyv/redis": "^2.5.1",
 		"@sentry/node": "^6.19.2",
 		"@sentry/tracing": "^6.19.2",
 		"apollo-datasource": "^3.3.1",
-		"apollo-mongodb-datasource": "^1.3.3",
 		"apollo-server-cache-redis": "^3.3.1",
 		"apollo-server-caching": "^3.3.0",
 		"apollo-server-core": "^3.6.6",
@@ -27,6 +27,7 @@
 		"language-flag-colors": "^2.1.1",
 		"lodash": "^4.17.21",
 		"mongodb": "^4.4.1",
+		"mongodb-caching": "^1.1.0",
 		"p-event": "^4.2.0",
 		"source-map-support": "^0.5.21",
 		"validator": "^13.7.0"

pnpm-lock.yaml

@@ -1,10 +1,10 @@
-import MongoDataSource from "apollo-mongodb-datasource";
 import { RouteGenericInterface, RouteHandlerMethod } from "fastify/types/route";
 import { IncomingMessage, Server, ServerResponse } from "http";
+import MongoDBCaching from "mongodb-caching";
 
 import { dSources } from "../util/dataSources";
 
-export class FFUpdates extends MongoDataSource {
+export class FFUpdates extends MongoDBCaching {
 	getAll() {
 		return this.find();
 	}
@@ -19,6 +19,7 @@ const handler: RouteHandlerMethod<
 > = async (req, res) => {
 	const updates = await dSources.ffUpdates.getAll();
 
+	//@ts-ignore
 	for (const u of updates) delete u._id;
 
 	return res.send({

worker/package.json

@@ -81,12 +81,14 @@ async function run() {
 		]
 	};
 
+	//@ts-ignore
 	v3Server = new ApolloServer({
 		...apolloGenericSettings,
 		typeDefs: await v3TypeDefs,
 		resolvers: await v3Resolvers
 	});
 
+	//@ts-ignore
 	v4Server = new ApolloServer({
 		...apolloGenericSettings,
 		typeDefs: await v4TypeDefs,

worker/pnpm-lock.yaml

@@ -1,6 +1,6 @@
 import { Db } from "mongodb";
 
-import { baseRedisCache, mongodb } from "..";
+import { mongodb } from "..";
 import { FFUpdates } from "../generic/ffUpdates";
 import { Benefits } from "../v3/fields/benefits";
 import { BetaUsers } from "../v3/fields/betaUsers";
@@ -21,25 +21,72 @@ export let pmdDb: Db, dSources: ReturnType<typeof dataSources>;
 export default function dataSources() {
 	pmdDb = mongodb.db("PreMiD");
 
+	const keyvDefaultOptions = {
+		uri: process.env.REDIS_URL || "redis://localhost:6379",
+		ttl: 60 * 1000
+	};
+
 	const sources = {
-		usage: new Usage(pmdDb.collection("science"), baseRedisCache),
-		presences: new Presences(pmdDb.collection("presences"), baseRedisCache),
-		versions: new Versions(pmdDb.collection("versions"), baseRedisCache),
-		discordUsers: new DiscordUsers(
-			pmdDb.collection("discordUsers"),
-			baseRedisCache
-		),
-		langFiles: new LangFiles(pmdDb.collection("langFiles"), baseRedisCache),
-		strings: new Strings(pmdDb.collection("strings"), baseRedisCache),
-		sponsors: new Sponsors(pmdDb.collection("sponsors"), baseRedisCache),
-		partners: new Partners(pmdDb.collection("partners"), baseRedisCache),
-		jobs: new Jobs(pmdDb.collection("jobs"), baseRedisCache),
-		downloads: new Downloads(pmdDb.collection("downloads"), baseRedisCache),
-		alphaUsers: new AlphaUsers(pmdDb.collection("alphaUsers"), baseRedisCache),
-		betaUsers: new BetaUsers(pmdDb.collection("betaUsers"), baseRedisCache),
-		credits: new Credits(pmdDb.collection("credits"), baseRedisCache),
-		benefits: new Benefits(pmdDb.collection("benefits"), baseRedisCache),
-		ffUpdates: new FFUpdates(pmdDb.collection("ffUpdates"), baseRedisCache)
+		usage: new Usage(pmdDb.collection("science"), {
+			...keyvDefaultOptions,
+			namespace: "science"
+		}),
+		presences: new Presences(pmdDb.collection("presences"), {
+			...keyvDefaultOptions,
+			namespace: "presences"
+		}),
+		versions: new Versions(pmdDb.collection("versions"), {
+			...keyvDefaultOptions,
+			namespace: "versions"
+		}),
+		discordUsers: new DiscordUsers(pmdDb.collection("discordUsers"), {
+			...keyvDefaultOptions,
+			namespace: "discordUsers"
+		}),
+		langFiles: new LangFiles(pmdDb.collection("langFiles"), {
+			...keyvDefaultOptions,
+			namespace: "langFiles"
+		}),
+		strings: new Strings(pmdDb.collection("strings"), {
+			...keyvDefaultOptions,
+			namespace: "strings"
+		}),
+		sponsors: new Sponsors(pmdDb.collection("sponsors"), {
+			...keyvDefaultOptions,
+			namespace: "sponsors"
+		}),
+		partners: new Partners(pmdDb.collection("partners"), {
+			...keyvDefaultOptions,
+			namespace: "partners"
+		}),
+		jobs: new Jobs(pmdDb.collection("jobs"), {
+			...keyvDefaultOptions,
+			namespace: "jobs"
+		}),
+		downloads: new Downloads(pmdDb.collection("downloads"), {
+			...keyvDefaultOptions,
+			namespace: "downloads"
+		}),
+		alphaUsers: new AlphaUsers(pmdDb.collection("alphaUsers"), {
+			...keyvDefaultOptions,
+			namespace: "alphaUsers"
+		}),
+		betaUsers: new BetaUsers(pmdDb.collection("betaUsers"), {
+			...keyvDefaultOptions,
+			namespace: "betaUsers"
+		}),
+		credits: new Credits(pmdDb.collection("credits"), {
+			...keyvDefaultOptions,
+			namespace: "credits"
+		}),
+		benefits: new Benefits(pmdDb.collection("benefits"), {
+			...keyvDefaultOptions,
+			namespace: "benefits"
+		}),
+		ffUpdates: new FFUpdates(pmdDb.collection("ffUpdates"), {
+			...keyvDefaultOptions,
+			namespace: "ffUpdates"
+		})
 	};
 
 	dSources = sources;

worker/src/generic/ffUpdates.ts

@@ -41,7 +41,8 @@ export async function resolver(
 		}
 
 		if (
-			(await betaUsers.count()) > Math.floor((await discordUsers.count()) * 1)
+			(await betaUsers.countDocuments()) >
+			Math.floor((await discordUsers.countDocuments()) * 1)
 		) {
 			res.message = "error.noslots";
 			return res;
@@ -53,7 +54,9 @@ export async function resolver(
 		}
 
 		await betaUsers.add(user.id);
-		await betaUsers.delete("findOne", { userId: user.id });
+		await betaUsers.keyv.delete(
+			"findOne-" + betaUsers.getCacheKey({ userId: user.id }, undefined)
+		);
 
 		res.success = true;
 		res.message = "User recieved beta access.";

worker/src/index.ts

@@ -1,5 +1,5 @@
-import MongoDataSource from "apollo-mongodb-datasource";
 import { gql } from "apollo-server-core";
+import MongoDBCaching from "mongodb-caching";
 
 export const schema = gql`
 	type Query {
@@ -13,7 +13,7 @@ export const schema = gql`
 	}
 `;
 
-export class Benefits extends MongoDataSource {
+export class Benefits extends MongoDBCaching {
 	getAll() {
 		return this.find();
 	}

worker/src/util/dataSources.ts

@@ -1,5 +1,5 @@
-import MongoDataSource from "apollo-mongodb-datasource";
 import { gql } from "apollo-server-core";
+import MongoDBCaching from "mongodb-caching";
 
 import { pmdDb } from "../../util/dataSources";
 
@@ -13,7 +13,7 @@ export const schema = gql`
 	}
 `;
 
-export class BetaUsers extends MongoDataSource {
+export class BetaUsers extends MongoDBCaching {
 	async has(userId: string) {
 		return (await this.findOne({ userId })) !== null;
 	}
@@ -29,5 +29,5 @@ export function resolver(
 	_1: any,
 	{ dataSources: { betaUsers } }: { dataSources: { betaUsers: BetaUsers } }
 ) {
-	return { number: betaUsers.count() };
+	return { number: betaUsers.countDocuments() };
 }