chore: release v0.0.11

apps/api-master/package.json

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

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

@@ -1,17 +1,26 @@
 import { REST } from "@discordjs/rest";
 import { mainLog, redis } from "../index.js";
 
+let inProgress = false;
 export async function clearOldSessions() {
+	if (inProgress) {
+		mainLog("Session cleanup already in progress");
+		return;
+	}
+
+	inProgress = true;
 	const now = Date.now();
 	let cursor = "0";
 	let totalSessions = 0;
 	let cleared = 0;
+	const batchSize = 100;
+	let keysToDelete = [];
 
 	mainLog("Starting session cleanup");
 
 	do {
 		//* Use hscan to iterate through sessions
-		const [nextCursor, result] = await redis.hscan("pmd-api.sessions", cursor, "COUNT", "100");
+		const [nextCursor, result] = await redis.hscan("pmd-api.sessions", cursor, "COUNT", batchSize);
 		cursor = nextCursor;
 		totalSessions += result.length / 2;
 
@@ -33,7 +42,7 @@ export async function clearOldSessions() {
 			if (now - session.lastUpdated < 30000)
 				continue;
 
-			//* Delete the session
+			//* Mark the session for deletion
 			try {
 				const discord = new REST({ version: "10", authPrefix: "Bearer" });
 				discord.setToken(session.token);
@@ -43,19 +52,32 @@ export async function clearOldSessions() {
 					},
 				});
 
-				await redis.hdel("pmd-api.sessions", key);
+				keysToDelete.push(key);
 				cleared++;
+
+				//* Delete in batches to avoid memory bloat
+				if (keysToDelete.length >= batchSize) {
+					await redis.hdel("pmd-api.sessions", ...keysToDelete);
+					keysToDelete = [];
+				}
 			}
 			catch (error) {
-				mainLog(`Failed to delete session: %O`, error);
+				mainLog(`Failed to delete session: %O`, (typeof error === "object" && error && "message" in error ? error.message : error));
 			}
 		}
 	} while (cursor !== "0");
 
+	//* Delete any remaining keys
+	if (keysToDelete.length > 0) {
+		await redis.hdel("pmd-api.sessions", ...keysToDelete);
+	}
+
 	if (totalSessions === 0) {
 		mainLog("No sessions to clear");
 	}
 	else {
 		mainLog(`Checked ${totalSessions} sessions, cleared ${cleared}`);
 	}
+
+	inProgress = false;
 }

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