fix: Not creating a new database session per transaction unit.

package.json

@@ -3,7 +3,7 @@
   "name": "logos",
   "description": "A multi-purpose community bot built to cater to language-learning communities on Discord.",
   "license": "ISC",
-  "version": "3.26.3",
+  "version": "3.26.4",
   "type": "module",
   "keywords": [
     "discord",

src/lib/client.ts

@@ -95,10 +95,7 @@ type Client = {
 			warningsByTarget: Map<string, Map<string, Warning>>;
 		};
 	};
-	database: {
-		store: ravendb.IDocumentStore;
-		session: ravendb.IDocumentSession;
-	};
+	database: ravendb.IDocumentStore;
 	commands: {
 		commands: Record<keyof typeof commandTemplates, Command>;
 		showable: string[];
@@ -305,7 +302,7 @@ async function initialiseClient(
 	features: Client["features"],
 	localisations: Map<string, Map<LocalisationLanguage, string>>,
 ): Promise<void> {
-	const store = new ravendb.DocumentStore(
+	const database = new ravendb.DocumentStore(
 		environment.ravendbHost,
 		environment.ravendbDatabase,
 		environment.ravendbSecure
@@ -315,12 +312,10 @@ async function initialiseClient(
 			  }
 			: {},
 	).initialize();
-	const session = store.openSession();
-	const database: Client["database"] = { store, session };
 
 	const client = createClient(environment, features, database, localisations);
 
-	addCacheInterceptors(client, database.session);
+	addCacheInterceptors(client, database);
 
 	await prefetchDataFromDatabase(client);
 
@@ -458,21 +453,21 @@ async function initialiseClient(
 }
 
 async function prefetchDataFromDatabase(client: Client): Promise<void> {
-	const entryRequestDocuments = await client.database.session
-		.query<EntryRequest>({ collection: "EntryRequests" })
-		.all();
+	const session = client.database.openSession();
+
+	const entryRequestDocuments = await session.query<EntryRequest>({ collection: "EntryRequests" }).all();
 
 	for (const document of entryRequestDocuments) {
 		client.cache.documents.entryRequests.set(document.id, document);
 	}
 
-	const reportDocuments = await client.database.session.query<Report>({ collection: "Reports" }).all();
+	const reportDocuments = await session.query<Report>({ collection: "Reports" }).all();
 
 	for (const document of reportDocuments) {
 		client.cache.documents.reports.set(`${document.guildId}/${document.authorId}/${document.createdAt}`, document);
 	}
 
-	const suggestionDocuments = await client.database.session.query<Suggestion>({ collection: "Suggestions" }).all();
+	const suggestionDocuments = await session.query<Suggestion>({ collection: "Suggestions" }).all();
 
 	for (const document of suggestionDocuments) {
 		client.cache.documents.suggestions.set(`${document.guildId}/${document.authorId}/${document.createdAt}`, document);
@@ -488,9 +483,11 @@ export async function handleGuildCreate(
 		client.log.info(`Logos added to "${guild.name}" (ID ${guild.id}).`);
 	}
 
+	const session = client.database.openSession();
+
 	const guildDocument =
 		client.cache.documents.guilds.get(guild.id.toString()) ??
-		(await client.database.session.load<Guild>(`guilds/${guild.id}`).then((value) => value ?? undefined));
+		(await session.load<Guild>(`guilds/${guild.id}`).then((value) => value ?? undefined));
 	if (guildDocument === undefined) {
 		return;
 	}
@@ -751,8 +748,8 @@ async function handleInteractionCreate(
 	}
 }
 
-function addCacheInterceptors(client: Client, session: ravendb.IDocumentSession): void {
-	const { load, store } = session;
+function addCacheInterceptors(client: Client, database: ravendb.IDocumentStore): void {
+	const { openSession } = database;
 
 	// biome-ignore lint: Typing this out in TypeScript is a nonsense and I don't have time to do it right now.
 	function getCompositeId(collection: string, document: any): string {
@@ -845,24 +842,34 @@ function addCacheInterceptors(client: Client, session: ravendb.IDocumentSession)
 	}
 
 	// @ts-ignore
-	session.load = async (...args) => {
+	database.openSession = () => {
 		// @ts-ignore
-		const value = await load.call(session, ...args);
-		if (value === null) {
-			return value;
-		}
+		const session = openSession.call(database, { noTracking: true, noCaching: true });
 
-		saveValue(value);
+		const { load, store } = session;
 
-		return value;
-	};
+		// @ts-ignore
+		session.load = async (...args) => {
+			// @ts-ignore
+			const value = await load.call(session, ...args);
+			if (value === null) {
+				return value;
+			}
+
+			saveValue(value);
+
+			return value;
+		};
 
-	// @ts-ignore
-	session.store = async (value, ...args) => {
 		// @ts-ignore
-		await store.call(session, value, ...args);
+		session.store = async (value, ...args) => {
+			// @ts-ignore
+			await store.call(session, value, ...args);
+
+			saveValue(value);
+		};
 
-		saveValue(value);
+		return session;
 	};
 }
 

src/lib/commands/information/commands/information/guild.ts

@@ -28,9 +28,11 @@ async function handleDisplayGuildInformation(
 		return;
 	}
 
+	const session = client.database.openSession();
+
 	const guildDocument =
 		client.cache.documents.guilds.get(guildId.toString()) ??
-		(await client.database.session.load<Guild>(`guilds/${guildId}`).then((value) => value ?? undefined));
+		(await session.load<Guild>(`guilds/${guildId}`).then((value) => value ?? undefined));
 	if (guildDocument === undefined) {
 		return;
 	}

src/lib/commands/information/commands/list/warnings.ts

@@ -63,9 +63,11 @@ async function handleDisplayWarnings(
 
 	const isSelf = member.id === interaction.user.id;
 
+	const session = client.database.openSession();
+
 	const userDocument =
 		client.cache.documents.users.get(member.id.toString()) ??
-		(await client.database.session.load<User>(`users/${member.id}`).then((value) => value ?? undefined)) ??
+		(await session.load<User>(`users/${member.id}`).then((value) => value ?? undefined)) ??
 		(await (async () => {
 			const userDocument = {
 				...({
@@ -75,8 +77,8 @@ async function handleDisplayWarnings(
 				} satisfies User),
 				"@metadata": { "@collection": "Users" },
 			};
-			await client.database.session.store(userDocument);
-			await client.database.session.saveChanges();
+			await session.store(userDocument);
+			await session.saveChanges();
 
 			return userDocument as User;
 		})());
@@ -89,7 +91,7 @@ async function handleDisplayWarnings(
 	const warningDocuments =
 		warningDocumentsCached !== undefined
 			? Array.from(warningDocumentsCached.values())
-			: await client.database.session
+			: await session
 					.query<Warning>({ collection: "Warnings" })
 					.whereStartsWith("id", `warnings/${member.id}`)
 					.all()

src/lib/commands/language/commands/cefr.ts

@@ -52,9 +52,11 @@ async function handleDisplayCefrGuide(
 		return;
 	}
 
+	const session = client.database.openSession();
+
 	const guildDocument =
 		client.cache.documents.guilds.get(guildId.toString()) ??
-		(await client.database.session.load<Guild>(`guilds/${guildId}`).then((value) => value ?? undefined));
+		(await session.load<Guild>(`guilds/${guildId}`).then((value) => value ?? undefined));
 	if (guildDocument === undefined) {
 		return;
 	}

src/lib/commands/language/commands/resources.ts

@@ -30,9 +30,11 @@ async function handleDisplayResources(
 		return;
 	}
 
+	const session = client.database.openSession();
+
 	const guildDocument =
 		client.cache.documents.guilds.get(guildId.toString()) ??
-		(await client.database.session.load<Guild>(`guilds/${guildId}`).then((value) => value ?? undefined));
+		(await session.load<Guild>(`guilds/${guildId}`).then((value) => value ?? undefined));
 	if (guildDocument === undefined) {
 		return;
 	}

src/lib/commands/meta/commands/settings/language/clear.ts

@@ -18,10 +18,12 @@ async function handleClearLanguage(
 ): Promise<void> {
 	const locale = interaction.locale;
 
+	const session = client.database.openSession();
+
 	await postponeReply([client, bot], interaction);
 	const userDocument =
 		client.cache.documents.users.get(interaction.user.id.toString()) ??
-		(await client.database.session.load<User>(`users/${interaction.user.id}`).then((value) => value ?? undefined));
+		(await session.load<User>(`users/${interaction.user.id}`).then((value) => value ?? undefined));
 	if (userDocument === undefined) {
 		return;
 	}
@@ -45,7 +47,8 @@ async function handleClearLanguage(
 	}
 
 	userDocument.account.language = undefined;
-	await client.database.session.saveChanges();
+	await session.store(userDocument);
+	await session.saveChanges();
 
 	{
 		const strings = {

src/lib/commands/meta/commands/settings/language/set.ts

@@ -68,16 +68,19 @@ async function handleSetLanguage([client, bot]: [Client, Discord.Bot], interacti
 
 	const language = languageOrUndefined;
 
+	const session = client.database.openSession();
+
 	await postponeReply([client, bot], interaction);
 	const userDocument =
 		client.cache.documents.users.get(interaction.user.id.toString()) ??
-		(await client.database.session.load<User>(`users/${interaction.user.id}`).then((value) => value ?? undefined));
+		(await session.load<User>(`users/${interaction.user.id}`).then((value) => value ?? undefined));
 	if (userDocument === undefined) {
 		return;
 	}
 
 	userDocument.account.language = language;
-	await client.database.session.saveChanges();
+	await session.store(userDocument);
+	await session.saveChanges();
 
 	const locale = getLocaleByLocalisationLanguage(language);
 

src/lib/commands/meta/commands/settings/view.ts

@@ -20,9 +20,11 @@ async function handleDisplaySettings(
 ): Promise<void> {
 	const locale = interaction.locale;
 
+	const session = client.database.openSession();
+
 	const userDocument =
 		client.cache.documents.users.get(interaction.user.id.toString()) ??
-		(await client.database.session.load<User>(`users/${interaction.user.id}`).then((value) => value ?? undefined));
+		(await session.load<User>(`users/${interaction.user.id}`).then((value) => value ?? undefined));
 	if (userDocument === undefined) {
 		return;
 	}

src/lib/commands/moderation/commands/pardon.ts

@@ -41,9 +41,11 @@ async function handlePardonUserAutocomplete(
 		return;
 	}
 
+	const session = client.database.openSession();
+
 	const guildDocument =
 		client.cache.documents.guilds.get(guildId.toString()) ??
-		(await client.database.session.load<Guild>(`guilds/${guildId}`).then((value) => value ?? undefined));
+		(await session.load<Guild>(`guilds/${guildId}`).then((value) => value ?? undefined));
 	if (guildDocument === undefined) {
 		return;
 	}
@@ -117,9 +119,11 @@ async function handlePardonUser([client, bot]: [Client, Discord.Bot], interactio
 		return;
 	}
 
+	const session = client.database.openSession();
+
 	const guildDocument =
 		client.cache.documents.guilds.get(guildId.toString()) ??
-		(await client.database.session.load<Guild>(`guilds/${guildId}`).then((value) => value ?? undefined));
+		(await session.load<Guild>(`guilds/${guildId}`).then((value) => value ?? undefined));
 	if (guildDocument === undefined) {
 		return;
 	}
@@ -162,8 +166,8 @@ async function handlePardonUser([client, bot]: [Client, Discord.Bot], interactio
 		return;
 	}
 
-	await client.database.session.delete(warning.id);
-	await client.database.session.saveChanges();
+	await session.delete(warning.id);
+	await session.saveChanges();
 
 	client.cache.documents.warningsByTarget
 		.get(member.id.toString())
@@ -207,9 +211,11 @@ async function getRelevantWarnings(
 	member: Logos.Member,
 	expirationMilliseconds: number,
 ): Promise<Warning[] | undefined> {
+	const session = client.database.openSession();
+
 	const userDocument =
 		client.cache.documents.users.get(member.id.toString()) ??
-		(await client.database.session.load<User>(`users/${member.id}`).then((value) => value ?? undefined));
+		(await session.load<User>(`users/${member.id}`).then((value) => value ?? undefined));
 	if (userDocument === undefined) {
 		return undefined;
 	}
@@ -218,7 +224,7 @@ async function getRelevantWarnings(
 	const warningDocuments =
 		warningDocumentsCached !== undefined
 			? Array.from(warningDocumentsCached.values())
-			: await client.database.session
+			: await session
 					.query<Warning>({ collection: "Warnings" })
 					.whereStartsWith("id", `warnings/${member.id}`)
 					.all()

src/lib/commands/moderation/commands/policy.ts

@@ -27,9 +27,11 @@ async function handleDisplayModerationPolicy(
 		return;
 	}
 
+	const session = client.database.openSession();
+
 	const guildDocument =
 		client.cache.documents.guilds.get(guildId.toString()) ??
-		(await client.database.session.load<Guild>(`guilds/${guildId}`).then((value) => value ?? undefined));
+		(await session.load<Guild>(`guilds/${guildId}`).then((value) => value ?? undefined));
 	if (guildDocument === undefined) {
 		return;
 	}

src/lib/commands/moderation/commands/purge.ts

@@ -71,9 +71,11 @@ async function handlePurgeMessages(
 		return;
 	}
 
+	const session = client.database.openSession();
+
 	const guildDocument =
 		client.cache.documents.guilds.get(guildId.toString()) ??
-		(await client.database.session.load<Guild>(`guilds/${guildId}`).then((value) => value ?? undefined));
+		(await session.load<Guild>(`guilds/${guildId}`).then((value) => value ?? undefined));
 	if (guildDocument === undefined) {
 		return;
 	}