chore: release v0.0.9

apps/api-master/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@premid/api-master",
 	"type": "module",
-	"version": "0.0.8",
+	"version": "0.0.20",
 	"private": true,
 	"description": "PreMiD's api master",
 	"license": "MPL-2.0",
@@ -22,7 +22,8 @@
 		"@sentry/node": "^8.17.0",
 		"cron": "^3.1.7",
 		"debug": "^4.3.6",
-		"ioredis": "^5.3.2"
+		"ioredis": "^5.3.2",
+		"p-limit": "^6.1.0"
 	},
 	"devDependencies": {
 		"@types/debug": "^4.1.12"

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

@@ -1,46 +1,117 @@
 import { REST } from "@discordjs/rest";
+import pLimit from "p-limit";
 import { mainLog, redis } from "../index.js";
 
+let inProgress = false;
 export async function clearOldSessions() {
-	const sessions = await redis.hgetall("pmd-api.sessions");
-	const now = Date.now();
-
-	if (Object.keys(sessions).length === 0) {
-		mainLog("No sessions to clear");
+	if (inProgress) {
+		mainLog("Session cleanup already in progress");
 		return;
 	}
 
-	mainLog(`Checking ${Object.keys(sessions).length} sessions`);
-
+	inProgress = true;
+	const now = Date.now();
+	let cursor = "0";
+	let totalSessions = 0;
 	let cleared = 0;
-	for (const [key, value] of Object.entries(sessions)) {
-		const session = JSON.parse(value) as {
-			token: string;
-			session: string;
-			lastUpdated: number;
-		};
+	const batchSize = 100;
+	let keysToDelete: string[] = [];
 
-		// ? If the session is younger than 30seconds, skip it
-		if (now - session.lastUpdated < 30000)
-			continue;
+	mainLog("Starting session cleanup");
 
-		//* Delete the session
-		try {
-			const discord = new REST({ version: "10", authPrefix: "Bearer" });
-			discord.setToken(session.token);
-			await discord.post("/users/@me/headless-sessions/delete", {
-				body: {
-					token: session.session,
-				},
-			});
-		}
-		catch (error) {
-			mainLog(`Failed to delete session: %O`, error);
+	const limit = pLimit(100); // Create a limit of 100 concurrent operations
+
+	do {
+		const [nextCursor, result] = await redis.hscan("pmd-api.sessions", cursor, "COUNT", batchSize);
+		cursor = nextCursor;
+		totalSessions += result.length / 2;
+
+		const deletePromises = [];
+
+		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 (now - session.lastUpdated < 30000)
+				continue;
+
+			deletePromises.push(limit(() => deleteSession(session, key)));
 		}
 
-		cleared++;
-		await redis.hdel("pmd-api.sessions", key);
+		const results = await Promise.allSettled(deletePromises);
+		results.forEach((result) => {
+			if (result.status === "fulfilled" && result.value) {
+				keysToDelete.push(result.value);
+				cleared++;
+			}
+		});
+
+		if (keysToDelete.length >= batchSize) {
+			await redis.hdel("pmd-api.sessions", ...keysToDelete);
+			keysToDelete = [];
+		}
+	} while (cursor !== "0");
+
+	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;
+}
+
+async function deleteSession(session: { token: string; session: string }, key: string): Promise<string> {
+	const abortController = new AbortController();
+	const timeoutId = setTimeout(() => abortController.abort("Timeout"), 5000); //* 5 second timeout
+
+	try {
+		const discord = new REST({ version: "10", authPrefix: "Bearer" });
+		discord.setToken(session.token);
+
+		await discord.post("/users/@me/headless-sessions/delete", {
+			signal: abortController.signal,
+			body: {
+				token: session.session,
+			},
+		});
+
+		clearTimeout(timeoutId);
+		return key;
+	}
+	catch (error) {
+		clearTimeout(timeoutId);
+		//* Log detailed error information
+		mainLog(`Delete session error for key ${key}:`, {
+			errorName: error instanceof Error ? error.name : "Unknown",
+			errorMessage: error instanceof Error ? error.message : String(error),
+			errorStack: error instanceof Error ? error.stack : "No stack trace",
+		});
+
+		if (error instanceof Error && error.name === "AbortError") {
+			mainLog(`Session deletion aborted due to timeout for key ${key}`);
+		}
+		else if (error instanceof Error) {
+			mainLog(`Failed to delete session for key ${key}: ${error.message}`);
+		}
+		else {
+			mainLog(`Failed to delete session for key ${key}: Unknown error`);
+		}
+		return key;
+	}
 }

apps/api-worker/package.json

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

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

@@ -8,13 +8,17 @@ import { redis } from "../functions/createServer.js";
 const schema = type({
 	token: "string.trim",
 	session: "string.trim",
+	version: "string.semver & string.trim",
+	scienceId: "string.trim",
 });
 
 export async function sessionKeepAlive(request: FastifyRequest, reply: FastifyReply) {
-	//* Get the 2 headers
+	//* Get the headers
 	const out = schema({
 		token: request.headers["x-token"],
 		session: request.headers["x-session"],
+		version: request.headers["x-version"] ?? "2.6.8",
+		scienceId: request.headers["x-science-id"] ?? request.headers["x-token"],
 	});
 
 	if (out instanceof type.errors)
@@ -25,7 +29,7 @@ export async function sessionKeepAlive(request: FastifyRequest, reply: FastifyRe
 
 	await redis.hset(
 		"pmd-api.sessions",
-		out.token,
+		out.scienceId,
 		JSON.stringify({
 			session: out.session,
 			token: out.token,

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/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";

pnpm-lock.yaml

@@ -80,6 +80,9 @@ importers:
       ioredis:
         specifier: ^5.3.2
         version: 5.4.1
+      p-limit:
+        specifier: ^6.1.0
+        version: 6.1.0
     devDependencies:
       '@types/debug':
         specifier: ^4.1.12
@@ -2956,6 +2959,7 @@ packages:
 
   '@rollup/rollup-linux-arm64-gnu@4.21.2':
     resolution: {integrity: sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==}
+    cpu: [arm64]
     os: [linux]
 
   '@rollup/rollup-linux-arm64-musl@4.18.1':
@@ -6855,6 +6859,10 @@ packages:
     resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
+  p-limit@6.1.0:
+    resolution: {integrity: sha512-H0jc0q1vOzlEk0TqAKXKZxdl7kX3OFUzCnNVUnq5Pc3DGo0kpeaMuPqxQn235HibwBEb0/pm9dgKTjXy66fBkg==}
+    engines: {node: '>=18'}
+
   p-locate@4.1.0:
     resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
     engines: {node: '>=8'}
@@ -13506,7 +13514,7 @@ snapshots:
       pathe: 1.1.2
       sirv: 2.0.4
       tinyrainbow: 1.2.0
-      vitest: 2.0.5(@types/node@22.5.4)(@vitest/ui@2.0.5)(happy-dom@15.0.0)(sass@1.78.0)(terser@5.32.0)
+      vitest: 2.0.5(@types/node@20.16.5)(@vitest/ui@2.0.5)(happy-dom@15.7.4)(sass@1.78.0)(terser@5.32.0)
 
   '@vitest/utils@2.0.5':
     dependencies:
@@ -17895,6 +17903,10 @@ snapshots:
     dependencies:
       yocto-queue: 1.1.1
 
+  p-limit@6.1.0:
+    dependencies:
+      yocto-queue: 1.1.1
+
   p-locate@4.1.0:
     dependencies:
       p-limit: 2.3.0