feat: Use addnonce over addjson

Author: PartMan7

src/cache/index.ts

@@ -21,6 +21,7 @@ export const PSCronJobs: { manager: PSCronJobManager | null } = { manager: null
 export const PSNoPrefixHelp: { [key: string]: Date } = {};
 export const PSQuoteRoomPrefs: { [key: string]: { room: string; at: Date } } = {};
 export const PSKuncInProgress: { [key: string]: boolean } = {};
+export const PSPointsNonce: { [key: string]: Record<string, Record<string, number>> | null } = {};
 
 // Games
 export const PSGames: { [key in keyof Games]?: Record<string, CommonGame> } = {};

src/ps/commands/points.tsx

@@ -1,7 +1,6 @@
-import assert from 'node:assert';
 import { uploadToPastie } from 'ps-client/tools';
 
-import { PSRoomConfigs } from '@/cache';
+import { PSPointsNonce, PSRoomConfigs } from '@/cache';
 import {
 	type BulkPointsDataInput,
 	type Model as PointsModel,
@@ -137,9 +136,9 @@ export const command: PSCommand[] = [
 		},
 	},
 	{
-		name: 'addjson',
+		name: 'addnonce',
 		help: null,
-		syntax: 'CMD [json data]',
+		syntax: 'CMD [nonce]',
 		perms: 'driver',
 		flags: { conceal: true, noDisplay: true, routePMs: true },
 		categories: ['points'],
@@ -149,39 +148,27 @@ export const command: PSCommand[] = [
 			const roomConfig = PSRoomConfigs[message.target.id];
 			if (!roomConfig.points) throw new ChatError($T('COMMANDS.POINTS.ROOM_NO_POINTS', { room: message.target.title }));
 
-			let json;
-			try {
-				json = JSON.parse(arg);
-			} catch {
-				throw new ChatError('Invalid JSON.' as ToTranslate);
-			}
-			try {
-				// TODO: Maybe use zod here?
-				assert.equal(typeof json, 'object');
-				assert.equal(Array.isArray(json), false);
-				Object.entries(json).forEach(([user, value]) => {
-					assert.ok(toId(user));
-					assert.equal(typeof value, 'object');
-					assert.equal(Array.isArray(value), false);
-					Object.entries(value!).forEach(([type, amount]) => {
-						assert(roomConfig.points?.types[type]);
-						assert.equal(typeof amount, 'number');
-						assert.equal(Math.round(amount), amount);
-					});
-				});
-			} catch {
-				throw new ChatError($T('INVALID_ARGUMENTS'));
-			}
+			const nonce = arg.trim();
+			if (!nonce) throw new ChatError('Nonce not provided.' as ToTranslate);
+			const data = PSPointsNonce[nonce];
+
+			if (data === null) throw new ChatError(`Already added points for ${nonce}!` as ToTranslate);
+			if (!data) throw new ChatError(`Invalid nonce ${nonce}.` as ToTranslate);
 
-			const data: Record<string, Record<string, number>> = json;
 			const pointsData: BulkPointsDataInput = Object.fromEntries(
 				Object.entries(data).map(([name, points]) => {
 					const id = toId(name);
 					return [id, { id, name, points }];
 				})
 			);
 
-			await bulkAddPoints(pointsData, message.target.id);
+			PSPointsNonce[nonce] = null;
+			try {
+				await bulkAddPoints(pointsData, message.target.id);
+			} catch (err) {
+				PSPointsNonce[nonce] = data;
+				throw err;
+			}
 			broadcast('Added points!' as ToTranslate);
 		},
 	},

src/ps/handlers/tours.tsx

@@ -1,14 +1,15 @@
 import { Temporal } from '@js-temporal/polyfill';
 
-import { PSRoomConfigs } from '@/cache';
+import { PSPointsNonce, PSRoomConfigs } from '@/cache';
 import { prefix } from '@/config/ps';
 import { bulkAddPoints } from '@/database/points';
 import { TimeZone } from '@/ps/handlers/cron/constants';
 import getSecretFunction from '@/secrets/functions';
-import { Button } from '@/utils/components/ps';
+import { Button, Form } from '@/utils/components/ps';
 import { errorLog } from '@/utils/logger';
 
 import type { Client } from 'ps-client';
+import { randomString } from '@/utils/random';
 
 export type BracketNode = {
 	team: string;
@@ -146,9 +147,12 @@ export function tourHandler(this: Client, roomId: string, line: string, isIntro?
 						return;
 					}
 
-					const jsonData: Record<string, Record<string, number>> = Object.fromEntries(
+					const nonce = randomString();
+					// TODO: Add mapValues
+					PSPointsNonce[nonce] = Object.fromEntries(
 						Object.entries(pointsToAdd).map(([user, amount]) => [user, { [pointsType.id]: amount }])
 					);
+
 					room.sendHTML(
 						<div className="infobox">
 							<p>
@@ -158,9 +162,9 @@ export function tourHandler(this: Client, roomId: string, line: string, isIntro?
 									.join(', ')}
 							</p>
 							<p>
-								<Button name="send" value={`/botmsg ${this.status.username},${prefix}@${roomId} addjson ${JSON.stringify(jsonData)}`}>
-									Add Points!
-								</Button>
+								<Form value={`/botmsg ${this.status.username},${prefix}@${roomId} addnonce ${nonce}`}>
+									<button>Add Points!</button>
+								</Form>
 							</p>
 						</div>
 					);

src/utils/random.ts

@@ -46,3 +46,9 @@ function sample(input: null | number | [number, number] | Record<string, number>
 }
 
 export { sample };
+
+export function randomString(length = 16, rng?: RNGSource): string {
+	const RNG = useRNG(rng);
+	const validChars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'.split('');
+	return Array.from({ length }, () => validChars.random(RNG)).join('');
+}