chore: release v0.0.13

apps/api-master/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@premid/api-master",
 	"type": "module",
-	"version": "0.0.4",
+	"version": "0.0.13",
 	"private": true,
 	"description": "PreMiD's api master",
 	"license": "MPL-2.0",
@@ -16,6 +16,9 @@
 	"dependencies": {
 		"@discordjs/rest": "^2.3.0",
 		"@envelop/sentry": "^9.0.0",
+		"@opentelemetry/api": "^1.9.0",
+		"@opentelemetry/exporter-prometheus": "^0.52.1",
+		"@opentelemetry/node": "^0.24.0",
 		"@sentry/node": "^8.17.0",
 		"cron": "^3.1.7",
 		"debug": "^4.3.6",

apps/api-master/src/functions/clearOldSessions.ts

@@ -1,48 +1,84 @@
 import { REST } from "@discordjs/rest";
 import { mainLog, redis } from "../index.js";
 
+let inProgress = false;
 export async function clearOldSessions() {
-	const sessionKeys = await redis.keys("pmd:session:*");
-	const now = Math.floor(Date.now() / 1000);
-
-	if (sessionKeys.length === 0) {
-		mainLog("No sessions to clear");
+	if (inProgress) {
+		mainLog("Session cleanup already in progress");
 		return;
 	}
 
-	mainLog(`Checking ${sessionKeys.length} sessions`);
-
+	inProgress = true;
+	const now = Date.now();
+	let cursor = "0";
+	let totalSessions = 0;
 	let cleared = 0;
-	for (const key of sessionKeys) {
-		const session = await redis.hgetall(key);
+	const batchSize = 100;
+	let keysToDelete = [];
 
-		if (!session.t || !session.u) {
-			await redis.del(key);
+	mainLog("Starting session cleanup");
+
+	do {
+		//* Use hscan to iterate through sessions
+		const [nextCursor, result] = await redis.hscan("pmd-api.sessions", cursor, "COUNT", batchSize);
+		cursor = nextCursor;
+		totalSessions += result.length / 2;
+
+		for (let i = 0; i < result.length; i += 2) {
+			const key = result[i];
+			const value = result[i + 1];
+
+			if (!key || !value) {
+				continue;
+			}
+
+			const session = JSON.parse(value) as {
+				token: string;
+				session: string;
+				lastUpdated: number;
+			};
+
+			//* If the session is younger than 30 seconds, skip it
+			if (now - session.lastUpdated < 30000)
+				continue;
+
+			//* Mark the session for deletion
+			try {
+				const discord = new REST({ version: "10", authPrefix: "Bearer" });
+				discord.setToken(session.token);
+				await discord.post("/users/@me/headless-sessions/delete", {
+					signal: AbortSignal.timeout(10000),
+					body: {
+						token: session.session,
+					},
+				});
+			}
+			catch (error) {
+				mainLog(`Failed to delete session: %O`, (typeof error === "object" && error && "message" in error ? error.message : error));
+			}
+
+			keysToDelete.push(key);
 			cleared++;
-			continue;
-		}
 
-		//* If the session is younger than 30 seconds, skip it
-		if (now - Number(session.u) < 30)
-			continue;
-
-		//* Delete the session
-		try {
-			const discord = new REST({ version: "10", authPrefix: "Bearer" });
-			discord.setToken(session.t);
-			await discord.post("/users/@me/headless-sessions/delete", {
-				body: {
-					token: key.split(":")[2], // Extract session token from key
-				},
-			});
-		}
-		catch (error) {
-			mainLog(`Failed to delete session: %O`, error);
+			//* Delete in batches to avoid memory bloat
+			if (keysToDelete.length >= batchSize) {
+				await redis.hdel("pmd-api.sessions", ...keysToDelete);
+				keysToDelete = [];
+			}
 		}
+	} while (cursor !== "0");
 
-		cleared++;
-		await redis.del(key);
+	//* Delete any remaining keys
+	if (keysToDelete.length > 0) {
+		await redis.hdel("pmd-api.sessions", ...keysToDelete);
 	}
 
-	mainLog(`Cleared ${cleared} sessions`);
+	if (totalSessions === 0) {
+		mainLog("No sessions to clear");
+	}
+	else {
+		mainLog(`Checked ${totalSessions} sessions, cleared ${cleared}`);
+	}
+
+	inProgress = false;
 }

apps/api-master/src/functions/setCounter.ts

@@ -0,0 +1,13 @@
+import { redis } from "../index.js";
+import { counter } from "../tracing.js";
+
+let activeActivities = 0;
+counter.add(0);
+export async function setCounter() {
+	const length = await redis.hlen("pmd-api.sessions");
+	if (length === activeActivities)
+		return;
+	const diff = length - activeActivities;
+	activeActivities = length;
+	counter.add(diff);
+}

apps/api-master/src/index.ts

@@ -3,6 +3,8 @@ import { CronJob } from "cron";
 import debug from "debug";
 import { clearOldSessions } from "./functions/clearOldSessions.js";
 import createRedis from "./functions/createRedis.js";
+import { setCounter } from "./functions/setCounter.js";
+import "./tracing.js";
 
 export const redis = createRedis();
 
@@ -13,9 +15,19 @@ debug("Starting cron job to clear old sessions");
 void new CronJob(
 	// Every 5 seconds
 	"*/5 * * * * *",
-	async () => {
+	() => {
 		clearOldSessions();
 	},
 	undefined,
 	true,
 );
+
+void new CronJob(
+	// Every second
+	"* * * * * *",
+	() => {
+		setCounter();
+	},
+	undefined,
+	true,
+);

apps/api-master/src/tracing.ts

@@ -0,0 +1,18 @@
+import { ValueType } from "@opentelemetry/api";
+import { PrometheusExporter } from "@opentelemetry/exporter-prometheus";
+import { MeterProvider } from "@opentelemetry/sdk-metrics";
+
+const prometheusExporter = new PrometheusExporter();
+
+const provider = new MeterProvider({
+	readers: [prometheusExporter],
+});
+
+const meter = provider.getMeter("nice");
+
+export const counter = meter.createUpDownCounter("active_activites", {
+	description: "Number of active activities",
+	valueType: ValueType.INT,
+});
+
+prometheusExporter.startServer();

apps/api-worker/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@premid/api-worker",
 	"type": "module",
-	"version": "0.0.6",
+	"version": "0.0.8",
 	"private": true,
 	"description": "PreMiD's api",
 	"license": "MPL-2.0",

apps/api-worker/src/classes/Socket.ts

@@ -54,7 +54,7 @@ export class Socket {
 					break;
 				}
 				case "session": {
-					await redis.del(`pmd:session:${out.token}`);
+					await redis.hdel("pmd-api.sessions", out.token);
 					this.currentSession = out;
 					break;
 				}
@@ -72,17 +72,15 @@ export class Socket {
 		if (!this.currentToken || !this.currentSession)
 			return;
 
-		const now = Math.floor(Date.now() / 1000);
-
-		await redis.hmset(
-			`pmd:session:${this.currentSession.token}`,
-			{
-				t: this.currentToken.token,
-				u: now,
-			},
+		await redis.hset(
+			"pmd-api.sessions",
+			this.currentSession.token,
+			JSON.stringify({
+				session: this.currentSession.token,
+				token: this.currentToken.token,
+				lastUpdated: Date.now(),
+			}),
 		);
-
-		await redis.expire(`pmd:session:${this.currentSession.token}`, 60); // Expire after 1 minute
 	}
 
 	async isTokenValid(token: typeof schema.token.infer) {

apps/api-worker/src/graphql/resolvers/v5/Mutation/index.ts

@@ -1,6 +1,6 @@
+import type { MutationResolvers } from "../../../../generated/graphql-v5.js";
 import addScience from "./addScience.js";
 import heartbeat from "./heartbeat.js";
-import type { MutationResolvers } from "../../../../generated/graphql-v5.js";
 
 export const Mutation: MutationResolvers = {
 	addScience,

apps/api-worker/src/graphql/resolvers/v5/Query/index.ts

@@ -1,5 +1,5 @@
-import presences from "./presences.js";
 import type { QueryResolvers } from "../../../../generated/graphql-v5.js";
+import presences from "./presences.js";
 
 export const Query: QueryResolvers = {
 	presences,

apps/api-worker/src/graphql/resolvers/v5/index.ts

@@ -1,6 +1,6 @@
+import type { Resolvers } from "../../../generated/graphql-v5.js";
 import { Mutation } from "./Mutation/index.js";
 import { Query } from "./Query/index.js";
-import type { Resolvers } from "../../../generated/graphql-v5.js";
 
 export const resolvers: Resolvers = {
 	Query,

apps/api-worker/src/routes/sessionKeepAlive.ts

@@ -23,19 +23,16 @@ export async function sessionKeepAlive(request: FastifyRequest, reply: FastifyRe
 	if (!await isTokenValid(out.token))
 		return reply.status(400).send({ code: "INVALID_TOKEN", message: "The token is invalid" });
 
-	const now = Math.floor(Date.now() / 1000); // Unix timestamp in seconds
-
-	await redis.hmset(
-		`pmd:session:${out.session}`,
-		{
-			t: out.token,
-			u: now,
-		},
+	await redis.hset(
+		"pmd-api.sessions",
+		out.token,
+		JSON.stringify({
+			session: out.session,
+			token: out.token,
+			lastUpdated: Date.now(),
+		}),
 	);
 
-	// Set expiration for the hash
-	await redis.expire(`pmd:session:${out.session}`, 60); // Expire after 1 minute
-
 	const interval = Number.parseInt(process.env.SESSION_KEEP_ALIVE_INTERVAL ?? "5000");
 
 	return reply.status(200).send({

apps/pd/src/functions/createKeyv.ts

@@ -1,12 +1,11 @@
 import process from "node:process";
 import KeyvRedis from "@keyv/redis";
 import Keyv from "keyv";
-import type { KeyvOptions } from "keyv";
 
 import redis from "../redis.js";
 
 export default function createKeyv() {
-	let options: KeyvOptions | undefined;
+	let options: Keyv.Options<string> | undefined;
 
 	/* c8 ignore next 8 */
 	if (process.env.REDIS_SENTINELS) {
@@ -16,7 +15,7 @@ export default function createKeyv() {
 		};
 	}
 
-	const keyv = new Keyv(
+	const keyv = new Keyv<string>(
 		options,
 	);
 

apps/pd/src/routes/createFromImage.test.ts

@@ -1,9 +1,9 @@
 import { Buffer } from "node:buffer";
 import { readFile } from "node:fs/promises";
-import { afterAll, beforeAll, describe, it } from "vitest";
 
 import type { RequestOptions } from "node:http";
 import type { AddressInfo } from "node:net";
+import { afterAll, beforeAll, describe, it } from "vitest";
 
 import { createServer } from "../functions/createServer.js";
 

apps/pd/src/routes/createShortenedLink.ts

@@ -20,7 +20,7 @@ const handler: RouteHandlerMethod = async (request, reply) => {
 		return reply.status(400).send("Invalid URL");
 
 	const hash = crypto.createHash("sha256").update(url).digest("hex");
-	const existingShortenedUrl = await keyv.get<string>(hash);
+	const existingShortenedUrl = await keyv.get(hash);
 
 	void reply.header("Cache-control", "public, max-age=1800");
 

apps/pd/src/routes/getFullLink.ts

@@ -25,7 +25,7 @@ const handler: RouteHandlerMethod = async (request, reply) => {
 	if (id.split(".")[0]?.length !== 10)
 		return reply.code(404).send("Invalid ID");
 
-	const url = await keyv.get<string>(id);
+	const url = await keyv.get(id);
 	if (!url)
 		return reply.code(404).send("Unknown ID");
 

apps/website/server/api/getStaffData.ts

@@ -1,4 +1,4 @@
-import { ActivityType, flagsToBadges, PresenceUpdateStatus } from "@discord-user-card/vue";
+import { ActivityType, PresenceUpdateStatus, flagsToBadges } from "@discord-user-card/vue";
 import { REST } from "@discordjs/rest";
 import { Routes } from "discord-api-types/v10";
 import type { DiscordUserCardActivity, DiscordUserCardUser } from "@discord-user-card/vue";