Stop sending full defences on low levels

backend/src/controller/defenceController.ts

@@ -7,7 +7,7 @@ import {
 	resetDefenceConfig,
 } from '@src/defence';
 import { DefenceActivateRequest } from '@src/models/api/DefenceActivateRequest';
-import { DefenceConfigResetRequest } from '@src/models/api/DefenceConfigResetRequest';
+import { DefenceConfigItemResetRequest } from '@src/models/api/DefenceConfigResetRequest';
 import { DefenceConfigureRequest } from '@src/models/api/DefenceConfigureRequest';
 import { DefenceStatusRequest } from '@src/models/api/DefenceStatusRequest';
 import { DefenceConfigItem } from '@src/models/defence';
@@ -25,8 +25,7 @@ function configValueExceedsCharacterLimit(config: DefenceConfigItem[]) {
 }
 
 function handleDefenceActivation(req: DefenceActivateRequest, res: Response) {
-	const defenceId = req.body.defenceId;
-	const level = req.body.level;
+	const { defenceId, level } = req.body;
 
 	if (!defenceId) {
 		sendErrorResponse(res, 400, 'Missing defenceId');
@@ -43,7 +42,9 @@ function handleDefenceActivation(req: DefenceActivateRequest, res: Response) {
 		return;
 	}
 
-	if (req.session.levelState[level].defences === undefined) {
+	const currentDefences = req.session.levelState[level].defences;
+
+	if (currentDefences === undefined) {
 		sendErrorResponse(
 			res,
 			400,
@@ -52,18 +53,22 @@ function handleDefenceActivation(req: DefenceActivateRequest, res: Response) {
 		return;
 	}
 
-	if (req.session.levelState[3].defences === undefined) return; // this dumb type guard is needed, because we are accessing the array via enum, and so typescript doesn't account for the above type guards. This will be solved with #842. The below array indices won't need to be hardcoded either.
+	const defence = currentDefences.find((defence) => defence.id === defenceId);
+
+	if (defence === undefined) {
+		sendErrorResponse(res, 400, `Defence with id ${defenceId} not found`);
+		return;
+	}
 
-	req.session.levelState[3].defences = activateDefence(
+	req.session.levelState[level].defences = activateDefence(
 		defenceId,
-		req.session.levelState[3].defences
+		currentDefences
 	);
 	res.status(200).send();
 }
 
 function handleDefenceDeactivation(req: DefenceActivateRequest, res: Response) {
-	const defenceId = req.body.defenceId;
-	const level = req.body.level;
+	const { defenceId, level } = req.body;
 
 	if (!defenceId) {
 		sendErrorResponse(res, 400, 'Missing defenceId');
@@ -80,7 +85,9 @@ function handleDefenceDeactivation(req: DefenceActivateRequest, res: Response) {
 		return;
 	}
 
-	if (req.session.levelState[level].defences === undefined) {
+	const currentDefences = req.session.levelState[level].defences;
+
+	if (currentDefences === undefined) {
 		sendErrorResponse(
 			res,
 			400,
@@ -89,23 +96,40 @@ function handleDefenceDeactivation(req: DefenceActivateRequest, res: Response) {
 		return;
 	}
 
-	if (req.session.levelState[3].defences === undefined) return; // this dumb type guard is needed, because we are accessing the array via enum, and so typescript doesn't account for the above type guards. This will be solved with #842. The below array indices won't need to be hardcoded either.
+	const defence = currentDefences.find((defence) => defence.id === defenceId);
+
+	if (defence === undefined) {
+		sendErrorResponse(res, 400, `Defence with id ${defenceId} not found`);
+		return;
+	}
 
-	req.session.levelState[3].defences = deactivateDefence(
+	req.session.levelState[level].defences = deactivateDefence(
 		defenceId,
-		req.session.levelState[3].defences
+		currentDefences
 	);
 	res.status(200).send();
 }
 
 function handleConfigureDefence(req: DefenceConfigureRequest, res: Response) {
-	// id of the defence
-	const defenceId = req.body.defenceId;
-	const config = req.body.config;
-	const level = req.body.level;
+	const { defenceId, level, config } = req.body;
+
+	if (defenceId === undefined) {
+		sendErrorResponse(res, 400, 'Missing defenceId');
+		return;
+	}
+
+	if (level === undefined) {
+		sendErrorResponse(res, 400, 'Missing level');
+		return;
+	}
+
+	if (level < LEVEL_NAMES.LEVEL_1 || level > LEVEL_NAMES.SANDBOX) {
+		sendErrorResponse(res, 400, 'Invalid level');
+		return;
+	}
 
-	if (!defenceId || !config || level === undefined) {
-		sendErrorResponse(res, 400, 'Missing defenceId, config or level');
+	if (config === undefined) {
+		sendErrorResponse(res, 400, 'Missing config');
 		return;
 	}
 
@@ -114,7 +138,9 @@ function handleConfigureDefence(req: DefenceConfigureRequest, res: Response) {
 		return;
 	}
 
-	if (req.session.levelState[level].defences === undefined) {
+	const currentDefences = req.session.levelState[level].defences;
+
+	if (currentDefences === undefined) {
 		sendErrorResponse(
 			res,
 			400,
@@ -123,77 +149,116 @@ function handleConfigureDefence(req: DefenceConfigureRequest, res: Response) {
 		return;
 	}
 
-	if (req.session.levelState[3].defences === undefined) return; // this dumb type guard is needed, because we are accessing the array via enum, and so typescript doesn't account for the above type guards. This will be solved with #842. The below array indices won't need to be hardcoded either.
+	const defence = currentDefences.find((defence) => defence.id === defenceId);
+
+	if (defence === undefined) {
+		sendErrorResponse(res, 400, `Defence with id ${defenceId} not found`);
+		return;
+	}
 
-	req.session.levelState[3].defences = configureDefence(
+	req.session.levelState[level].defences = configureDefence(
 		defenceId,
-		req.session.levelState[3].defences,
+		currentDefences,
 		config
 	);
 	res.send();
 }
 
-function handleResetSingleDefence(
-	req: DefenceConfigResetRequest,
+function handleResetDefenceConfigItem(
+	req: DefenceConfigItemResetRequest,
 	res: Response
 ) {
-	const defenceId = req.body.defenceId;
-	const configId = req.body.configId;
-	const level = LEVEL_NAMES.SANDBOX; //configuration only available in sandbox (interesting that we force that here, but not in the above endpoints)
+	const { defenceId, configItemId, level } = req.body;
 
 	if (!defenceId) {
 		sendErrorResponse(res, 400, 'Missing defenceId');
 		return;
 	}
 
-	if (!configId) {
+	if (!configItemId) {
 		sendErrorResponse(res, 400, 'Missing configId');
 		return;
 	}
 
-	if (req.session.levelState[level].defences === undefined) {
+	if (level === undefined) {
+		sendErrorResponse(res, 400, 'Missing level');
+		return;
+	}
+
+	if (level < LEVEL_NAMES.LEVEL_1 || level > LEVEL_NAMES.SANDBOX) {
+		sendErrorResponse(res, 400, 'Invalid level');
+		return;
+	}
+
+	const currentDefences = req.session.levelState[level].defences;
+
+	if (currentDefences === undefined) {
+		sendErrorResponse(
+			res,
+			400,
+			'You cannot reset defence config items on this level, because it uses the default defences'
+		);
+		return;
+	}
+
+	const defence = currentDefences.find((defence) => defence.id === defenceId);
+
+	if (defence === undefined) {
+		sendErrorResponse(res, 400, `Defence with id ${defenceId} not found`);
+		return;
+	}
+
+	const configItem = defence.config.find(
+		(configItem) => configItem.id === configItemId
+	);
+
+	if (configItem === undefined) {
 		sendErrorResponse(
 			res,
 			400,
-			'You cannot reset defences on this level, because it uses the default defences'
+			`Config item with id ${configItemId} not found for defence with id ${defenceId}`
 		);
 		return;
 	}
 
 	req.session.levelState[level].defences = resetDefenceConfig(
 		defenceId,
-		configId,
-		req.session.levelState[level].defences
+		configItemId,
+		currentDefences
 	);
-	const updatedDefenceConfig: DefenceConfigItem | undefined =
-		req.session.levelState[level].defences
-			.find((defence) => defence.id === defenceId)
-			?.config.find((config) => config.id === configId);
-
-	if (updatedDefenceConfig) {
-		res.send(updatedDefenceConfig);
-	} else {
-		res.status(400);
-		res.send(
-			"something went wrong while resetting the defence's config. Check the defenceId and configId."
-		);
+
+	const updatedDefences = req.session.levelState[level].defences;
+	if (updatedDefences === undefined) {
+		sendErrorResponse(res, 500, 'Something went whacky');
+		return;
 	}
+	const updatedDefenceConfig = updatedDefences
+		.find((defence) => defence.id === defenceId)
+		?.config.find((config) => config.id === configItemId);
+
+	res.send(updatedDefenceConfig);
 }
 
 function handleGetDefenceStatus(req: DefenceStatusRequest, res: Response) {
-	const level: number | undefined = req.query.level as number | undefined;
-	if (level !== undefined) {
-		res.send(req.session.levelState[level].defences);
-	} else {
-		res.status(400);
-		res.send('Missing level');
+	const level = req.query.level;
+
+	if (level === undefined) {
+		sendErrorResponse(res, 400, 'Missing level');
+		return;
+	}
+
+	if (level < LEVEL_NAMES.LEVEL_1 || level > LEVEL_NAMES.SANDBOX) {
+		sendErrorResponse(res, 400, 'Invalid level');
+		return;
 	}
+
+	res.send(req.session.levelState[level].defences);
 }
 
 export {
 	handleDefenceActivation,
 	handleDefenceDeactivation,
 	handleConfigureDefence,
-	handleResetSingleDefence,
+	handleResetDefenceConfigItem,
 	handleGetDefenceStatus,
 };

backend/src/models/api/DefenceConfigResetRequest.ts

@@ -5,13 +5,15 @@ import {
 	DEFENCE_ID,
 	DefenceConfigItem,
 } from '@src/models/defence';
+import { LEVEL_NAMES } from '@src/models/level';
 
-export type DefenceConfigResetRequest = Request<
+export type DefenceConfigItemResetRequest = Request<
 	never,
 	DefenceConfigItem,
 	{
 		defenceId?: DEFENCE_ID;
-		configId?: DEFENCE_CONFIG_ITEM_ID;
+		configItemId?: DEFENCE_CONFIG_ITEM_ID;
+		level?: LEVEL_NAMES;
 	},
 	never
 >;

backend/src/models/api/DefenceStatusRequest.ts

@@ -1,12 +1,13 @@
 import { Request } from 'express';
 
 import { Defence } from '@src/models/defence';
+import { LEVEL_NAMES } from '@src/models/level';
 
 export type DefenceStatusRequest = Request<
 	never,
 	Defence[] | string,
 	never,
 	{
-		level?: string;
+		level?: LEVEL_NAMES;
 	}
 >;

backend/src/models/level.ts

@@ -21,19 +21,22 @@ interface LevelState {
 }
 
 function getInitialLevelStates() {
-	return Object.values(LEVEL_NAMES)
-		.filter((value) => Number.isNaN(Number(value)))
-		.map((value) => {
-			return {
-				level: value as LEVEL_NAMES,
+	const levelsWithDefences: number[] = [
+		LEVEL_NAMES.LEVEL_3,
+		LEVEL_NAMES.SANDBOX,
+	];
+
+	return Object.values(LEVEL_NAMES).map(
+		(level) =>
+			({
+				level,
 				chatHistory: [],
-				defences:
-					value === 'LEVEL_1' || value === 'LEVEL_2'
-						? undefined
-						: defaultDefences,
+				defences: levelsWithDefences.includes(level)
+					? defaultDefences
+					: undefined,
 				sentEmails: [],
-			} as LevelState;
-		});
+			} as LevelState)
+	);
 }
 
 export { getInitialLevelStates, LEVEL_NAMES };

backend/src/server.ts

@@ -24,8 +24,7 @@ app.listen(port, () => {
 			console.debug('Document vector store initialized');
 		})
 		.catch((err) => {
-			//throw new Error(`Error initializing document vectors: ${err}`);
-			console.log('ERROR SWALLOWED :D', err);
+			throw new Error(`Error initializing document vectors: ${err}`);
 		});
 
 	Promise.all([modelsPromise, vectorsPromise])

backend/src/sessionRoutes.ts

@@ -14,7 +14,7 @@ import {
 	handleDefenceActivation,
 	handleDefenceDeactivation,
 	handleGetDefenceStatus,
-	handleResetSingleDefence,
+	handleResetDefenceConfigItem,
 } from './controller/defenceController';
 import {
 	handleClearEmails,
@@ -102,7 +102,7 @@ router.get('/defence/status', handleGetDefenceStatus);
 router.post('/defence/activate', handleDefenceActivation);
 router.post('/defence/deactivate', handleDefenceDeactivation);
 router.post('/defence/configure', handleConfigureDefence);
-router.post('/defence/resetConfig', handleResetSingleDefence);
+router.post('/defence/resetConfig', handleResetDefenceConfigItem);
 
 // emails
 router.get('/email/get', handleGetEmails);