824 streamline frontend change level network calls

backend/src/controller/chatController.ts

@@ -8,7 +8,6 @@ import {
 import { OpenAiAddInfoToChatHistoryRequest } from '@src/models/api/OpenAiAddInfoToChatHistoryRequest';
 import { OpenAiChatRequest } from '@src/models/api/OpenAiChatRequest';
 import { OpenAiClearRequest } from '@src/models/api/OpenAiClearRequest';
-import { OpenAiGetHistoryRequest } from '@src/models/api/OpenAiGetHistoryRequest';
 import {
 	DefenceReport,
 	ChatHttpResponse,
@@ -359,16 +358,6 @@ function addErrorToChatHistory(
 	});
 }
 
-function handleGetChatHistory(req: OpenAiGetHistoryRequest, res: Response) {
-	const level: number | undefined = req.query.level as number | undefined;
-	if (level !== undefined) {
-		res.send(req.session.levelState[level].chatHistory);
-	} else {
-		res.status(400);
-		res.send('Missing level');
-	}
-}
-
 function handleAddInfoToChatHistory(
 	req: OpenAiAddInfoToChatHistoryRequest,
 	res: Response
@@ -407,9 +396,4 @@ function handleClearChatHistory(req: OpenAiClearRequest, res: Response) {
 	}
 }
 
-export {
-	handleChatToGPT,
-	handleGetChatHistory,
-	handleAddInfoToChatHistory as handleAddInfoToChatHistory,
-	handleClearChatHistory,
-};
+export { handleChatToGPT, handleAddInfoToChatHistory, handleClearChatHistory };

backend/src/controller/defenceController.ts

@@ -9,7 +9,6 @@ import {
 import { DefenceActivateRequest } from '@src/models/api/DefenceActivateRequest';
 import { DefenceConfigResetRequest } 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';
 import { LEVEL_NAMES } from '@src/models/level';
 
@@ -112,20 +111,9 @@ function handleResetSingleDefence(
 	}
 }
 
-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');
-	}
-}
-
 export {
 	handleDefenceActivation,
 	handleDefenceDeactivation,
 	handleConfigureDefence,
 	handleResetSingleDefence,
-	handleGetDefenceStatus,
 };

backend/src/controller/emailController.ts

@@ -1,19 +1,8 @@
 import { Response } from 'express';
 
 import { EmailClearRequest } from '@src/models/api/EmailClearRequest';
-import { EmailGetRequest } from '@src/models/api/EmailGetRequest';
 import { LEVEL_NAMES } from '@src/models/level';
 
-function handleGetEmails(req: EmailGetRequest, res: Response) {
-	const level: number | undefined = req.query.level as number | undefined;
-	if (level !== undefined) {
-		res.send(req.session.levelState[level].sentEmails);
-	} else {
-		res.status(400);
-		res.send('Missing level');
-	}
-}
-
 function handleClearEmails(req: EmailClearRequest, res: Response) {
 	const level = req.body.level;
 	if (level !== undefined && level >= LEVEL_NAMES.LEVEL_1) {
@@ -26,4 +15,4 @@ function handleClearEmails(req: EmailClearRequest, res: Response) {
 	}
 }
 
-export { handleGetEmails, handleClearEmails };
+export { handleClearEmails };

backend/src/controller/levelController.ts

@@ -0,0 +1,15 @@
+import { Response } from 'express';
+
+import { LevelGetRequest } from '@src/models/api/LevelGetRequest';
+
+function handleLoadLevel(req: LevelGetRequest, res: Response) {
+	const { level } = req.query;
+
+	res.send({
+		emails: req.session.levelState[level].sentEmails,
+		chatHistory: req.session.levelState[level].chatHistory,
+		defences: req.session.levelState[level].defences,
+	});
+}
+
+export { handleLoadLevel };

backend/src/controller/startController.ts

@@ -1,6 +1,6 @@
 import { Response } from 'express';
 
-import { GetStartRequest } from '@src/models/api/getStartRequest';
+import { StartGetRequest } from '@src/models/api/StartGetRequest';
 import { LEVEL_NAMES } from '@src/models/level';
 import { getValidOpenAIModels } from '@src/openai';
 import {
@@ -9,7 +9,7 @@ import {
 	systemRoleLevel3,
 } from '@src/promptTemplates';
 
-function handleStart(req: GetStartRequest, res: Response) {
+function handleStart(req: StartGetRequest, res: Response) {
 	const { level } = req.query;
 
 	const systemRoles = [

backend/src/models/api/LevelGetRequest.ts

@@ -0,0 +1,19 @@
+import { Request } from 'express';
+
+import { ChatMessage } from '@src/models/chatMessage';
+import { Defence } from '@src/models/defence';
+import { EmailInfo } from '@src/models/email';
+import { LEVEL_NAMES } from '@src/models/level';
+
+export type LevelGetRequest = Request<
+	never,
+	{
+		emails: EmailInfo[];
+		chatHistory: ChatMessage[];
+		defences: Defence[];
+	},
+	never,
+	{
+		level: LEVEL_NAMES;
+	}
+>;

backend/src/models/api/getStartRequest.ts → backend/src/models/api/StartGetRequest.ts

@@ -5,7 +5,7 @@ import { Defence } from '@src/models/defence';
 import { EmailInfo } from '@src/models/email';
 import { LEVEL_NAMES } from '@src/models/level';
 
-export type GetStartRequest = Request<
+export type StartGetRequest = Request<
 	never,
 	{
 		emails: EmailInfo[];

backend/src/sessionRoutes.ts

@@ -5,21 +5,17 @@ import memoryStoreFactory from 'memorystore';
 
 import {
 	handleChatToGPT,
-	handleGetChatHistory,
 	handleAddInfoToChatHistory,
 	handleClearChatHistory,
 } from './controller/chatController';
 import {
 	handleConfigureDefence,
 	handleDefenceActivation,
 	handleDefenceDeactivation,
-	handleGetDefenceStatus,
 	handleResetSingleDefence,
 } from './controller/defenceController';
-import {
-	handleClearEmails,
-	handleGetEmails,
-} from './controller/emailController';
+import { handleClearEmails } from './controller/emailController';
+import { handleLoadLevel } from './controller/levelController';
 import {
 	handleConfigureModel,
 	handleGetModel,
@@ -97,19 +93,18 @@ router.use((req, _res, next) => {
 // handshake
 router.get('/start', handleStart);
 
+router.get('/level', handleLoadLevel);
+
 // defences
-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);
 
 // emails
-router.get('/email/get', handleGetEmails);
 router.post('/email/clear', handleClearEmails);
 
 // chat
-router.get('/openai/history', handleGetChatHistory);
 router.post('/openai/chat', handleChatToGPT);
 router.post('/openai/addInfoToHistory', handleAddInfoToChatHistory);
 router.post('/openai/clear', handleClearChatHistory);

frontend/src/App.tsx

@@ -7,7 +7,7 @@ import MissionInformation from './components/Overlay/MissionInformation';
 import OverlayWelcome from './components/Overlay/OverlayWelcome';
 import ResetProgressOverlay from './components/Overlay/ResetProgress';
 import { LEVEL_NAMES } from './models/level';
-import { levelService } from './service';
+import { resetService } from './service';
 
 import './App.css';
 import './Theme.css';
@@ -205,7 +205,7 @@ function App() {
 		console.log('resetting progress for all levels');
 
 		// reset on the backend
-		await levelService.resetAllLevelProgress();
+		await resetService.resetAllLevelProgress();
 
 		localStorage.setItem('numCompletedLevels', '0');
 		setNumCompletedLevels(0);

frontend/src/components/MainComponent/MainComponent.tsx

@@ -12,6 +12,7 @@ import {
 	chatService,
 	defenceService,
 	emailService,
+	levelService,
 	startService,
 } from '@src/service';
 
@@ -66,10 +67,6 @@ function MainComponent({
 
 	// facilitate level change
 	useEffect(() => {
-		console.log(
-			'useEffect currentLevel. isFirstRender.current:',
-			isFirstRender.current
-		);
 		if (!isFirstRender.current) {
 			console.log('Loading backend data for level', currentLevel);
 			void setNewLevel(currentLevel);
@@ -79,11 +76,11 @@ function MainComponent({
 
 	async function loadBackendData() {
 		try {
-			const { availableModels, defences, emails, history, systemRoles } =
+			const { availableModels, defences, emails, chatHistory, systemRoles } =
 				await startService.start(currentLevel);
 			setChatModels(availableModels);
 			setSystemRoles(systemRoles);
-			processBackendLevelData(currentLevel, emails, history, defences);
+			processBackendLevelData(currentLevel, emails, chatHistory, defences);
 		} catch (err) {
 			console.warn(err);
 			setMessages([
@@ -150,9 +147,9 @@ function MainComponent({
 
 	// for going switching level without clearing progress
 	async function setNewLevel(newLevel: LEVEL_NAMES) {
-		const emails = await emailService.getSentEmails(newLevel);
-		const chatHistory = await chatService.getChatHistory(newLevel);
-		const defences = await defenceService.getDefences(newLevel);
+		const { emails, chatHistory, defences } = await levelService.loadLevel(
+			newLevel
+		);
 		processBackendLevelData(newLevel, emails, chatHistory, defences);
 	}
 

frontend/src/models/combined.ts

@@ -11,4 +11,10 @@ type StartReponse = {
 	systemRoles: LevelSystemRole[];
 };
 
-export type { StartReponse };
+type LoadLevelResponse = {
+	emails: EmailInfo[];
+	chatHistory: ChatMessageDTO[];
+	defences: DefenceDTO[];
+};
+
+export type { StartReponse, LoadLevelResponse };

frontend/src/service/chatService.ts

@@ -60,15 +60,6 @@ function chatMessageDTOIsConvertible(chatMessageDTO: ChatMessageDTO) {
 	);
 }
 
-async function getChatHistory(level: number): Promise<ChatMessage[]> {
-	const response = await sendRequest(`${PATH}history?level=${level}`, {
-		method: 'GET',
-	});
-	const chatMessageDTOs = (await response.json()) as ChatMessageDTO[];
-
-	return getChatMessagesFromDTOResponse(chatMessageDTOs);
-}
-
 function getChatMessagesFromDTOResponse(chatMessageDTOs: ChatMessageDTO[]) {
 	return chatMessageDTOs
 		.filter(chatMessageDTOIsConvertible)
@@ -124,7 +115,6 @@ export {
 	configureGptModel,
 	getGptModel,
 	setGptModel,
-	getChatHistory,
 	addInfoMessageToChatHistory,
 	getChatMessagesFromDTOResponse,
 };

frontend/src/service/defenceService.ts

@@ -10,14 +10,6 @@ import { sendRequest } from './backendService';
 
 const PATH = 'defence/';
 
-async function getDefences(level: number) {
-	const response = await sendRequest(`${PATH}status?level=${level}`, {
-		method: 'GET',
-	});
-	const defenceDTOs = (await response.json()) as DefenceDTO[];
-	return getDefencesFromDTOs(defenceDTOs);
-}
-
 function getDefencesFromDTOs(defenceDTOs: DefenceDTO[]) {
 	return DEFAULT_DEFENCES.map((defence) => {
 		const defenceDTO = defenceDTOs.find(
@@ -122,7 +114,6 @@ function validateDefence(
 }
 
 export {
-	getDefences,
 	toggleDefence,
 	configureDefence,
 	resetDefenceConfig,

frontend/src/service/emailService.ts

@@ -1,5 +1,3 @@
-import { EmailInfo } from '@src/models/email';
-
 import { sendRequest } from './backendService';
 
 const PATH = 'email/';
@@ -15,11 +13,4 @@ async function clearEmails(level: number): Promise<boolean> {
 	return response.status === 200;
 }
 
-async function getSentEmails(level: number) {
-	const response = await sendRequest(`${PATH}get?level=${level}`, {
-		method: 'GET',
-	});
-	return (await response.json()) as EmailInfo[];
-}
-
-export { clearEmails, getSentEmails };
+export { clearEmails };

frontend/src/service/index.ts

@@ -3,13 +3,15 @@ import * as defenceService from './defenceService';
 import * as documentService from './documentService';
 import * as emailService from './emailService';
 import * as levelService from './levelService';
+import * as resetService from './resetService';
 import * as startService from './startService';
 
 export {
 	chatService,
 	defenceService,
 	documentService,
 	emailService,
-	levelService,
+	resetService,
 	startService,
+	levelService,
 };