typify

evcc-io · Maschga · Jun 8, 2025 · Jun 8, 2025 · Jun 8, 2025 · Jun 8, 2025
commit beee2b02ae21f2f884f4eccd29d05080bc713227
diff --git a/assets/js/components/Footer/OfflineIndicator.stories.ts b/assets/js/components/Footer/OfflineIndicator.stories.ts
@@ -29,5 +29,7 @@ Fatal.args = {
 		error: `cannot create charger 'wallbox_cphl': cannot create charger type 'template': cannot create
 charger type 'hardybarth-ecbl: Post http://192.168.2.219/api/v1/chargecontrols/1/mode: context deadline exceeded (Client.Timeout
 exceeded while awaiting headers)`,
+		class: "",
+		device: "",
 	},
 };
diff --git a/assets/js/types/evcc.ts b/assets/js/types/evcc.ts
@@ -18,8 +18,9 @@ export interface Auth {
 export type VehicleLogins = Record<string, { authenticated: boolean; uri: string }>;
 
 export interface FatalError {
-	error: any;
-	class?: any;
+	error: string;
+	class: string;
+	device: string;
 }
 
 export interface State {
@@ -30,6 +31,96 @@ export interface State {
 	currency?: CURRENCY;
 	fatal?: FatalError;
 	auth?: Auth;
+	version?: string;
+	battery?: Battery[];
+	tariffGrid?: number;
+	tariffFeedIn?: number;
+	tariffCo2?: number;
+	tariffSolar?: number;
+	mqtt?: {
+		broker: string;
+		topic: string;
+	};
+	influx?: {
+		url: string;
+		database: any;
+		org: any;
+	};
+	hems?: {
+		type: any;
+	};
+	sponsor?: Sponsor;
+	eebus?: any;
+	modbusproxy?: [];
+	messaging?: any;
+	interval?: number;
+	circuits?: Record<string, Curcuit>;
+}
+
+export interface Config {
+	template?: string;
+	title?: string;
+	icon?: string;
+	[key: string]: number | string | undefined;
+}
+
+export interface Curcuit {
+	name: string;
+	maxPower: number;
+	power?: number;
+	maxCurrent: number;
+	current?: number;
+	config?: Config;
+}
+
+export interface Entity {
+	name: string;
+	type: string;
+	id: number;
+	config: Config;
+}
+
+export interface Meter extends Entity {
+	deviceTitle?: string;
+	deviceIcon?: string;
+}
+export type ConfigVehicle = Entity;
+export type Charger = Entity;
+
+export interface LoadpointThreshold {
+	delay: number;
+	threshold: number;
+}
+
+export interface Loadpoint {
+	id: number;
+	name: string;
+	charger: string;
+	meter: string;
+	vehicle: string;
+	title: string;
+	defaultMode: string;
+	priority: number;
+	phasesConfigured: number;
+	minCurrent: number;
+	maxCurrent: number;
+	smartCostLimit: number | null;
+	planEnergy: number;
+	planTime: string;
+	planPrecondition: number;
+	limitEnergy: number;
+	limitSoc: number;
+	thresholds: {
+		enable: LoadpointThreshold;
+		disable: LoadpointThreshold;
+	};
+	soc: {
+		poll: {
+			mode: string;
+			interval: number;
+		};
+		estimate: boolean;
+	};
 }
 
 export interface LoadpointCompact {

diff --git a/assets/js/views/App.vue b/assets/js/views/App.vue
@@ -12,7 +12,7 @@
 	</div>
 </template>
 
-<script>
+<script lang="ts">
 import store from "../store";
 import GlobalSettingsModal from "../components/GlobalSettings/GlobalSettingsModal.vue";
 import BatterySettingsModal from "../components/Battery/BatterySettingsModal.vue";
@@ -22,18 +22,19 @@ import PasswordModal from "../components/Auth/PasswordModal.vue";
 import LoginModal from "../components/Auth/LoginModal.vue";
 import HelpModal from "../components/HelpModal.vue";
 import collector from "../mixins/collector";
+import { defineComponent } from "vue";
 
 // assume offline if not data received for 5 minutes
 let lastDataReceived = new Date();
 const maxDataAge = 60 * 1000 * 5;
 setInterval(() => {
-	if (new Date() - lastDataReceived > maxDataAge) {
+	if (new Date().getTime() - lastDataReceived.getTime() > maxDataAge) {
 		console.log("no data received, assume we are offline");
 		window.app.setOffline();
 	}
 }, 1000);
 
-export default {
+export default defineComponent({
 	name: "App",
 	components: {
 		GlobalSettingsModal,
@@ -50,7 +51,11 @@ export default {
 		offline: Boolean,
 	},
 	data: () => {
-		return { reconnectTimeout: null, ws: null, authNotConfigured: false };
+		return {
+			reconnectTimeout: null as number | null,
+			ws: null as WebSocket | null,
+			authNotConfigured: false,
+		};
 	},
 	head() {
 		return { title: "...", titleTemplate: "%s | evcc" };
@@ -95,20 +100,25 @@ export default {
 	},
 	unmounted() {
 		this.disconnect();
-		window.clearTimeout(this.reconnectTimeout);
+		this.clearTimeout();
 		document.removeEventListener("visibilitychange", this.pageVisibilityChanged, false);
 	},
 	methods: {
+		clearTimeout() {
+			if (this.reconnectTimeout) {
+				window.clearTimeout(this.reconnectTimeout);
+			}
+		},
 		pageVisibilityChanged() {
 			if (document.hidden) {
-				window.clearTimeout(this.reconnectTimeout);
+				this.clearTimeout();
 				this.disconnect();
 			} else {
 				this.connect();
 			}
 		},
 		reconnect() {
-			window.clearTimeout(this.reconnectTimeout);
+			this.clearTimeout();
 			this.reconnectTimeout = window.setTimeout(() => {
 				this.disconnect();
 				this.connect();
@@ -152,7 +162,7 @@ export default {
 			this.ws = new WebSocket(uri);
 			this.ws.onerror = () => {
 				console.log({ message: "Websocket error. Trying to reconnect." });
-				this.ws.close();
+				this.ws?.close();
 			};
 			this.ws.onopen = () => {
 				console.log("websocket connected");
@@ -171,8 +181,9 @@ export default {
 					store.update(msg);
 					lastDataReceived = new Date();
 				} catch (error) {
+					const e = error as Error;
 					window.app.raise({
-						message: `Failed to parse web socket data: ${error.message} [${evt.data}]`,
+						message: `Failed to parse web socket data: ${e.message} [${evt.data}]`,
 					});
 				}
 			};
@@ -181,7 +192,7 @@ export default {
 			window.location.reload();
 		},
 	},
-};
+});
 </script>
 <style scoped>
 .app {