Merge pull request #75 from davbauer/refactor-modes

Load live data instantly

backend/classes/WebSocketManager.ts

@@ -23,14 +23,6 @@ export default class WebSocketManager {
 
 			this.clients.push(clientWithID);
 			infoLog(`WS Client connection established (Id: ${clientWithID.id})`);
-			// Send initial data to the client immediately upon connection.
-			clientWithID.send(
-				JSON.stringify({
-					wsConnectionId: clientWithID.id ?? 'undefined',
-					event: 'liveDataUpdate',
-					data: LiveData.data
-				})
-			);
 
 			clientWithID.on('close', () => {
 				const index = this.clients.findIndex((client) => client.id === clientWithID.id);

src/lib/api/services/ServiceLiveData.ts

@@ -0,0 +1,8 @@
+import type LiveData from '$lib/models/LiveData';
+import ApiBase from './ApiBase';
+
+export default class extends ApiBase {
+	static async getLiveData(): Promise<LiveData> {
+		return this.get<LiveData>('livedata');
+	}
+}

src/routes/+layout.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import '../app.css';
-	import { appInfo, config, toasts } from '$lib/store';
+	import { appInfo, config, liveData, toasts } from '$lib/store';
 	import Toast from '$lib/components/Toast.svelte';
 	import { onMount } from 'svelte';
 	import ServiceAppInfo from '$lib/api/services/ServiceAppInfo';
@@ -10,20 +10,28 @@
 	import BackendTerminalWindow from '$lib/components/SectionBackendTerminal.svelte';
 	import SectionBackendTerminal from '$lib/components/SectionBackendTerminal.svelte';
 	import moment from 'moment';
+	import ServiceLiveData from '$lib/api/services/ServiceLiveData';
+	import { sendActivitySignal } from '$lib/utilities/UtilStoreActivityDot';
+	import { SignalStateType } from '$lib/models/SignalStateType';
 
 	let initApplication: 'ERROR' | 'SUCCESS' | 'LOADING' = 'LOADING';
 
 	onMount(() => {
-		Promise.all([ServiceAppInfo.getAppInfo(), ServiceConfig.getConfig()])
-			.then(([appInfoResponse, configResponse]) => {
+		Promise.all([
+			ServiceAppInfo.getAppInfo(),
+			ServiceConfig.getConfig(),
+			ServiceLiveData.getLiveData()
+		])
+			.then(([appInfoResponse, configResponse, liveDataResponse]) => {
 				appInfo.set(appInfoResponse);
-				console.log(JSON.stringify(configResponse, null, 2));
 				config.set(configResponse);
-				newSuccessToast('Loaded app info and config');
+				liveData.set(liveDataResponse);
+				sendActivitySignal(SignalStateType.LIVEDATA);
+				newSuccessToast('Loaded app info, config and liveData');
 				initApplication = 'SUCCESS';
 			})
 			.catch((_error) => {
-				newErrorToast('Error loading app info or config');
+				newErrorToast('Error loading app info, config and liveData');
 				initApplication = 'ERROR';
 			});
 	});