perf: threads everywhere! (for encryption & decryption)

src/modals/feedback.js

@@ -1,7 +1,6 @@
 const { Modal } = require('@eartharoid/dbf');
 const ExtendedEmbedBuilder = require('../lib/embed');
-const Cryptr = require('cryptr');
-const { encrypt } = new Cryptr(process.env.ENCRYPTION_KEY);
+const { quick } = require('../lib/threads');
 
 module.exports = class FeedbackModal extends Modal {
 	constructor(client, options) {
@@ -26,7 +25,7 @@ module.exports = class FeedbackModal extends Modal {
 		rating = Math.min(Math.max(rating, 1), 5); // clamp between 1 and 5 (0 and null become 1, 6 becomes 5)
 
 		const data = {
-			comment: comment?.length > 0 ? encrypt(comment) : null,
+			comment: comment?.length > 0 ? await quick('crypto', worker => worker.encrypt(comment)) : null,
 			guild: { connect: { id: interaction.guild.id } },
 			rating,
 			user: { connect: { id: interaction.user.id } },
@@ -65,4 +64,4 @@ module.exports = class FeedbackModal extends Modal {
 			});
 		}
 	}
-};
+};

src/modals/questions.js

@@ -2,11 +2,8 @@ const { Modal } = require('@eartharoid/dbf');
 const { EmbedBuilder } = require('discord.js');
 const ExtendedEmbedBuilder = require('../lib/embed');
 const { logTicketEvent } = require('../lib/logging');
-const Cryptr = require('cryptr');
-const {
-	encrypt,
-	decrypt,
-} = new Cryptr(process.env.ENCRYPTION_KEY);
+const { reusable } = require('../lib/threads');
+
 
 module.exports = class QuestionsModal extends Modal {
 	constructor(client, options) {
@@ -26,101 +23,111 @@ module.exports = class QuestionsModal extends Modal {
 		const client = this.client;
 
 		if (id.edit) {
-			await interaction.deferReply({ ephemeral: true });
+			const worker = await reusable('crypto');
+			try {
+				await interaction.deferReply({ ephemeral: true });
 
-			const { category } = await client.prisma.ticket.findUnique({
-				select: { category: { select: { customTopic: true } } },
-				where: { id: interaction.channel.id },
-			});
-			const select = {
-				createdById: true,
-				guild: {
-					select: {
-						footer: true,
-						locale: true,
-						successColour: true,
-					},
-				},
-				id: true,
-				openingMessageId: true,
-				questionAnswers: { include: { question: true } },
-			};
-			const original = await client.prisma.ticket.findUnique({
-				select,
-				where: { id: interaction.channel.id },
-			});
-
-			let topic;
-			if (category.customTopic) {
-				const customTopicAnswer = original.questionAnswers.find(a => a.question.id === category.customTopic);
-				if (!customTopicAnswer) throw new Error('Custom topic answer not found');
-				topic = interaction.fields.getTextInputValue(String(customTopicAnswer.id));
-			}
-
-			const ticket = await client.prisma.ticket.update({
-				data: {
-					questionAnswers: {
-						update: interaction.fields.fields.map(f => ({
-							data: { value: f.value ? encrypt(f.value) : '' },
-							where: { id: Number(f.customId) },
-						})),
-					},
-					topic: topic ? encrypt(topic) : null,
-				},
-				select,
-				where: { id: interaction.channel.id },
-			});
-			const getMessage = client.i18n.getLocale(ticket.guild.locale);
-
-			if (topic) await interaction.channel.setTopic(`<@${ticket.createdById}> | ${topic}`);
-
-			const opening = await interaction.channel.messages.fetch(ticket.openingMessageId);
-			if (opening && opening.embeds.length >= 2) {
-				const embeds = [...opening.embeds];
-				embeds[1] = new EmbedBuilder(embeds[1].data)
-					.setFields(
-						ticket.questionAnswers
-							.map(a => ({
-								name: a.question.label,
-								value: a.value ? decrypt(a.value) : getMessage('ticket.answers.no_value'),
-							})),
-					);
-				await opening.edit({ embeds });
-			}
-
-			await interaction.editReply({
-				embeds: [
-					new ExtendedEmbedBuilder({
-						iconURL: interaction.guild.iconURL(),
-						text: ticket.guild.footer,
-					})
-						.setColor(ticket.guild.successColour)
-						.setTitle(getMessage('ticket.edited.title'))
-						.setDescription(getMessage('ticket.edited.description')),
-				],
-			});
-
-			/** @param {ticket} ticket */
-			const makeDiff = ticket => {
-				const diff = {};
-				ticket.questionAnswers.forEach(a => {
-					diff[a.question.label] = a.value ? decrypt(a.value) : getMessage('ticket.answers.no_value');
+				const { category } = await client.prisma.ticket.findUnique({
+					select: { category: { select: { customTopic: true } } },
+					where: { id: interaction.channel.id },
+				});
+				const select = {
+					createdById: true,
+					guild: {
+						select: {
+							footer: true,
+							locale: true,
+							successColour: true,
+						},
+					},
+					id: true,
+					openingMessageId: true,
+					questionAnswers: { include: { question: true } },
+				};
+				const original = await client.prisma.ticket.findUnique({
+					select,
+					where: { id: interaction.channel.id },
 				});
-				return diff;
-			};
 
-			logTicketEvent(this.client, {
-				action: 'update',
-				diff: {
-					original: makeDiff(original),
-					updated: makeDiff(ticket),
-				},
-				target: {
-					id: ticket.id,
-					name: `<#${ticket.id}>`,
-				},
-				userId: interaction.user.id,
-			});
+				let topic;
+				if (category.customTopic) {
+					const customTopicAnswer = original.questionAnswers.find(a => a.question.id === category.customTopic);
+					if (!customTopicAnswer) throw new Error('Custom topic answer not found');
+					topic = interaction.fields.getTextInputValue(String(customTopicAnswer.id));
+				}
+
+				const ticket = await client.prisma.ticket.update({
+					data: {
+						questionAnswers: {
+							update: await Promise.all(
+								interaction.fields.fields
+									.map(async f => ({
+										data: { value: f.value ? await worker.encrypt(f.value) : '' },
+										where: { id: Number(f.customId) },
+									})),
+							),
+						},
+						topic: topic ? await worker.encrypt(topic) : null,
+					},
+					select,
+					where: { id: interaction.channel.id },
+				});
+				const getMessage = client.i18n.getLocale(ticket.guild.locale);
+
+				if (topic) await interaction.channel.setTopic(`<@${ticket.createdById}> | ${topic}`);
+
+				const opening = await interaction.channel.messages.fetch(ticket.openingMessageId);
+				if (opening && opening.embeds.length >= 2) {
+					const embeds = [...opening.embeds];
+					embeds[1] = new EmbedBuilder(embeds[1].data)
+						.setFields(
+							await Promise.all(
+								ticket.questionAnswers
+									.map(async a => ({
+										name: a.question.label,
+										value: a.value ? await worker.decrypt(a.value) : getMessage('ticket.answers.no_value'),
+									})),
+							),
+						);
+					await opening.edit({ embeds });
+				}
+
+				await interaction.editReply({
+					embeds: [
+						new ExtendedEmbedBuilder({
+							iconURL: interaction.guild.iconURL(),
+							text: ticket.guild.footer,
+						})
+							.setColor(ticket.guild.successColour)
+							.setTitle(getMessage('ticket.edited.title'))
+							.setDescription(getMessage('ticket.edited.description')),
+					],
+				});
+
+				/** @param {ticket} ticket */
+				const makeDiff = async ticket => {
+					const diff = {};
+					for (const a of ticket.questionAnswers) {
+						diff[a.question.label] = a.value ? await worker.decrypt(a.value) : getMessage('ticket.answers.no_value');
+					}
+					return diff;
+				};
+
+				logTicketEvent(this.client, {
+					action: 'update',
+					diff: {
+						original: await makeDiff(original),
+						updated: await makeDiff(ticket),
+					},
+					target: {
+						id: ticket.id,
+						name: `<#${ticket.id}>`,
+					},
+					userId: interaction.user.id,
+				});
+			} finally {
+				await worker.terminate();
+			}
 		} else {
 			await this.client.tickets.postQuestions({
 				...id,

src/modals/topic.js

@@ -2,11 +2,7 @@ const { Modal } = require('@eartharoid/dbf');
 const { EmbedBuilder } = require('discord.js');
 const ExtendedEmbedBuilder = require('../lib/embed');
 const { logTicketEvent } = require('../lib/logging');
-const Cryptr = require('cryptr');
-const {
-	encrypt,
-	decrypt,
-} = new Cryptr(process.env.ENCRYPTION_KEY);
+const { reusable } = require('../lib/threads');
 
 module.exports = class TopicModal extends Modal {
 	constructor(client, options) {
@@ -21,76 +17,82 @@ module.exports = class TopicModal extends Modal {
 		const client = this.client;
 
 		if (id.edit) {
-			await interaction.deferReply({ ephemeral: true });
-			const topic = interaction.fields.getTextInputValue('topic');
-			const select = {
-				createdById: true,
-				guild: {
-					select: {
-						footer: true,
-						locale: true,
-						successColour: true,
+			const worker = await reusable('crypto');
+			try {
+				await interaction.deferReply({ ephemeral: true });
+				const topic = interaction.fields.getTextInputValue('topic');
+				const select = {
+					createdById: true,
+					guild: {
+						select: {
+							footer: true,
+							locale: true,
+							successColour: true,
+						},
 					},
-				},
-				id: true,
-				openingMessageId: true,
-				topic: true,
-			};
-			const original = await client.prisma.ticket.findUnique({
-				select,
-				where: { id: interaction.channel.id },
-			});
-			const ticket = await client.prisma.ticket.update({
-				data: { topic: topic ? encrypt(topic) : null },
-				select,
-				where: { id: interaction.channel.id },
-			});
-			const getMessage = client.i18n.getLocale(ticket.guild.locale);
+					id: true,
+					openingMessageId: true,
+					topic: true,
+				};
+				const original = await client.prisma.ticket.findUnique({
+					select,
+					where: { id: interaction.channel.id },
+				});
+				const ticket = await client.prisma.ticket.update({
+					data: { topic: topic ? await worker.encrypt(topic) : null },
+					select,
+					where: { id: interaction.channel.id },
+				});
+				const getMessage = client.i18n.getLocale(ticket.guild.locale);
 
-			if (topic) interaction.channel.setTopic(`<@${ticket.createdById}> | ${topic}`);
+				if (topic) interaction.channel.setTopic(`<@${ticket.createdById}> | ${topic}`);
 
-			const opening = await interaction.channel.messages.fetch(ticket.openingMessageId);
-			if (opening && opening.embeds.length >= 2) {
-				const embeds = [...opening.embeds];
-				embeds[1] = new EmbedBuilder(embeds[1].data)
-					.setFields({
-						name: getMessage('ticket.opening_message.fields.topic'),
-						value: topic,
-					});
-				await opening.edit({ embeds });
+				const opening = await interaction.channel.messages.fetch(ticket.openingMessageId);
+				if (opening && opening.embeds.length >= 2) {
+					const embeds = [...opening.embeds];
+					embeds[1] = new EmbedBuilder(embeds[1].data)
+						.setFields({
+							name: getMessage('ticket.opening_message.fields.topic'),
+							value: topic,
+						});
+					await opening.edit({ embeds });
+				}
+
+				await interaction.editReply({
+					embeds: [
+						new ExtendedEmbedBuilder({
+							iconURL: interaction.guild.iconURL(),
+							text: ticket.guild.footer,
+						})
+							.setColor(ticket.guild.successColour)
+							.setTitle(getMessage('ticket.edited.title'))
+							.setDescription(getMessage('ticket.edited.description')),
+					],
+				});
+
+				/** @param {ticket} ticket */
+				const makeDiff = async ticket => {
+					const diff = {};
+					diff[getMessage('ticket.opening_message.fields.topic')] = ticket.topic ? await worker.decrypt(ticket.topic) : ' ';
+					return diff;
+				};
+
+				logTicketEvent(this.client, {
+					action: 'update',
+					diff: {
+						original: await makeDiff(original),
+						updated: await makeDiff(ticket),
+					},
+					target: {
+						id: ticket.id,
+						name: `<#${ticket.id}>`,
+					},
+					userId: interaction.user.id,
+				});
+
+			} finally {
+				await worker.terminate();
 			}
-
-			await interaction.editReply({
-				embeds: [
-					new ExtendedEmbedBuilder({
-						iconURL: interaction.guild.iconURL(),
-						text: ticket.guild.footer,
-					})
-						.setColor(ticket.guild.successColour)
-						.setTitle(getMessage('ticket.edited.title'))
-						.setDescription(getMessage('ticket.edited.description')),
-				],
-			});
-
-			/** @param {ticket} ticket */
-			const makeDiff = ticket => {
-				const diff = {};
-				diff[getMessage('ticket.opening_message.fields.topic')] = ticket.topic ? decrypt(ticket.topic) : ' ';
-				return diff;
-			};
-
-			logTicketEvent(this.client, {
-				action: 'update',
-				diff: {
-					original: makeDiff(original),
-					updated: makeDiff(ticket),
-				},
-				target: {
-					id: ticket.id,
-					name: `<#${ticket.id}>`,
-				},
-				userId: interaction.user.id,
-			});
 		} else {
 			await this.client.tickets.postQuestions({
 				...id,
@@ -98,4 +100,4 @@ module.exports = class TopicModal extends Modal {
 			});
 		}
 	}
-};
+};