From 67c653fa8b124b8f9e9bd112f18182387bd3db83 Mon Sep 17 00:00:00 2001 From: Empire Date: Thu, 20 Mar 2025 22:47:01 +0100 Subject: [PATCH] log webview --- rust/src_webpack/src/api.ts | 18 ++++++++ rust/src_webpack/src/main.html | 4 ++ rust/src_webpack/src/main.ts | 82 ++++++++++++++++++++++++++-------- 3 files changed, 85 insertions(+), 19 deletions(-) diff --git a/rust/src_webpack/src/api.ts b/rust/src_webpack/src/api.ts index 7f1491e..b4f0066 100644 --- a/rust/src_webpack/src/api.ts +++ b/rust/src_webpack/src/api.ts @@ -1,3 +1,21 @@ +interface LogArray extends Array{} + +interface LogEntry { + timestamp: string, + message_id: number, + a: number, + b: number, + txt_short: string, + txt_long: string +} + +interface LogLocalisation extends Array{} + +interface LogLocalisationEntry { + msg_type: string, + message: string +} + interface BackupHeader { timestamp: string, size: number diff --git a/rust/src_webpack/src/main.html b/rust/src_webpack/src/main.html index 0008a24..91b8b92 100644 --- a/rust/src_webpack/src/main.html +++ b/rust/src_webpack/src/main.html @@ -171,6 +171,10 @@ +
+
+
+ diff --git a/rust/src_webpack/src/main.ts b/rust/src_webpack/src/main.ts index 2bd2ef3..5f0e180 100644 --- a/rust/src_webpack/src/main.ts +++ b/rust/src_webpack/src/main.ts @@ -17,10 +17,33 @@ import { ProgressView } from "./progress"; import { OTAView } from "./ota"; import { BatteryView } from "./batteryview"; import { FileView } from './fileview'; +import { LogView } from './log'; export class Controller { - getBackupInfo() { - fetch(PUBLIC_URL + "/backup_info") + loadLogLocaleConfig() { + return fetch(PUBLIC_URL + "/log_localization") + .then(response => response.json()) + .then(json => json as LogLocalisation) + .then(loglocale => { + controller.logView.setLogLocalisation(loglocale) + }) + .catch(error => { + console.log(error); + }); + } + loadLog() { + return fetch(PUBLIC_URL + "/log") + .then(response => response.json()) + .then(json => json as LogArray) + .then(logs => { + controller.logView.setLog(logs) + }) + .catch(error => { + console.log(error); + }); + } + getBackupInfo() : Promise { + return fetch(PUBLIC_URL + "/backup_info") .then(response => response.json()) .then(json => json as BackupHeader) .then(header => { @@ -30,8 +53,8 @@ export class Controller { console.log(error); }); } - updateFileList() { - fetch(PUBLIC_URL + "/files") + updateFileList() : Promise { + return fetch(PUBLIC_URL + "/files") .then(response => response.json()) .then(json => json as FileList) .then(filelist => { @@ -90,8 +113,8 @@ export class Controller { controller.updateFileList() } - updateRTCData() { - fetch(PUBLIC_URL + "/time") + updateRTCData() : Promise { + return fetch(PUBLIC_URL + "/time") .then(response => response.json()) .then(json => json as GetTime) .then(time => { @@ -102,8 +125,8 @@ export class Controller { console.log(error); }); } - updateBatteryData() { - fetch(PUBLIC_URL + "/battery") + updateBatteryData(): Promise { + return fetch(PUBLIC_URL + "/battery") .then(response => response.json()) .then(json => json as BatteryState) .then(battery => { @@ -112,7 +135,7 @@ export class Controller { .catch(error => { controller.batteryView.update(null) console.log(error); - }); + }) } uploadNewFirmware(file: File) { var current = 0; @@ -139,9 +162,9 @@ export class Controller { ajax.open("POST", PUBLIC_URL + "/ota"); ajax.send(file); } - version() { + version() : Promise { controller.progressview.addIndeterminate("version", "Getting buildVersion") - fetch(PUBLIC_URL + "/version") + return fetch(PUBLIC_URL + "/version") .then(response => response.json()) .then(json => json as VersionInfo) .then(versionInfo => { @@ -160,9 +183,9 @@ export class Controller { }) } - downloadConfig() { + downloadConfig() :Promise { controller.progressview.addIndeterminate("get_config", "Downloading Config") - fetch(PUBLIC_URL + "/get_config") + return fetch(PUBLIC_URL + "/get_config") .then(response => response.json()) .then(loaded => { var currentConfig = loaded as PlantControllerConfig; @@ -399,6 +422,7 @@ export class Controller { readonly progressview: ProgressView; readonly batteryView: BatteryView; readonly fileview: FileView; + readonly logView: LogView constructor() { this.timeView = new TimeView(this) this.plantViews = new PlantViews(this) @@ -410,6 +434,7 @@ export class Controller { this.firmWareView = new OTAView(this) this.progressview = new ProgressView(this) this.fileview = new FileView(this) + this.logView = new LogView(this) this.rebootBtn = document.getElementById("reboot") as HTMLButtonElement this.rebootBtn.onclick = () => { controller.reboot(); @@ -421,12 +446,31 @@ export class Controller { } } const controller = new Controller(); -controller.updateRTCData(); -controller.updateBatteryData(); -controller.downloadConfig(); +controller.progressview.removeProgress("rebooting"); +controller.progressview.addProgress("initial", 0, "read rtc"); +controller.updateRTCData().then(_ => { + controller.progressview.addProgress("initial", 20, "read battery"); + controller.updateBatteryData().then(_ => { + controller.progressview.addProgress("initial", 40, "read config"); + controller.downloadConfig().then(_ => { + controller.progressview.addProgress("initial", 50, "read version"); + controller.version().then(_ => { + controller.progressview.addProgress("initial", 70, "read filelist"); + controller.updateFileList().then(_ => { + controller.progressview.addProgress("initial", 90, "read backupinfo"); + controller.getBackupInfo().then(_ => { + controller.progressview.removeProgress("initial"); + }) + }) + }) + }); + }) +}) +; + //controller.measure_moisture(); -controller.version(); -controller.updateFileList(); -controller.getBackupInfo(); + + + controller.progressview.removeProgress("rebooting");