From 493c4b433701eaabf4f9355c7d3b3e72f26d7bdf Mon Sep 17 00:00:00 2001
From: Gunnar Skjold <gunnar@origin.no>
Date: Sat, 3 Sep 2022 13:41:11 +0200
Subject: [PATCH] Moved Svelte UI to lib folder

---
 {ui/svelte => lib/SvelteUi/app}/.gitignore    |  0
 {ui/svelte => lib/SvelteUi/app}/index.html    |  0
 {ui/svelte => lib/SvelteUi/app}/jsconfig.json |  0
 .../SvelteUi/app}/package-lock.json           |  0
 {ui/svelte => lib/SvelteUi/app}/package.json  |  0
 .../SvelteUi/app}/postcss.config.cjs          |  0
 .../SvelteUi/app}/src/App.svelte              |  0
 .../SvelteUi/app}/src/app.postcss             |  0
 .../SvelteUi/app}/src/assets/github.svg       |  0
 .../app}/src/lib/AccountingData.svelte        |  0
 .../SvelteUi/app}/src/lib/AmpPlot.svelte      |  0
 .../SvelteUi/app}/src/lib/Badge.svelte        |  0
 .../SvelteUi/app}/src/lib/BarChart.svelte     |  4 -
 .../SvelteUi/app}/src/lib/Clock.svelte        |  0
 .../SvelteUi/app}/src/lib/Counter.svelte      |  0
 .../SvelteUi/app}/src/lib/Dashboard.svelte    |  0
 .../SvelteUi/app}/src/lib/DataStores.js       |  0
 .../SvelteUi/app}/src/lib/DayPlot.svelte      |  0
 .../SvelteUi/app}/src/lib/Header.svelte       |  0
 .../SvelteUi/app}/src/lib/Helpers.js          |  0
 .../SvelteUi/app}/src/lib/MonthPlot.svelte    |  0
 .../SvelteUi/app}/src/lib/PowerGauge.svelte   |  0
 .../app}/src/lib/PowerGaugeSvg.svelte         |  0
 .../SvelteUi/app}/src/lib/PricePlot.svelte    |  0
 .../SvelteUi/app}/src/lib/ReactiveData.svelte |  0
 .../app}/src/lib/TemperaturePlot.svelte       |  0
 .../SvelteUi/app}/src/lib/VoltPlot.svelte     |  0
 {ui/svelte => lib/SvelteUi/app}/src/main.js   |  0
 .../SvelteUi/app}/src/vite-env.d.ts           |  0
 .../SvelteUi/app}/svelte.config.js            |  0
 .../SvelteUi/app}/tailwind.config.cjs         |  0
 .../SvelteUi/app}/vite.config.js              | 11 +++
 lib/SvelteUi/include/.gitignore               |  1 +
 lib/SvelteUi/include/AmsWebServer.h           | 86 +++++++++++++++++++
 lib/SvelteUi/scripts/generate_includes.py     | 80 +++++++++++++++++
 lib/SvelteUi/src/AmsWebServer.cpp             | 16 ++++
 36 files changed, 194 insertions(+), 4 deletions(-)
 rename {ui/svelte => lib/SvelteUi/app}/.gitignore (100%)
 rename {ui/svelte => lib/SvelteUi/app}/index.html (100%)
 rename {ui/svelte => lib/SvelteUi/app}/jsconfig.json (100%)
 rename {ui/svelte => lib/SvelteUi/app}/package-lock.json (100%)
 rename {ui/svelte => lib/SvelteUi/app}/package.json (100%)
 rename {ui/svelte => lib/SvelteUi/app}/postcss.config.cjs (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/App.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/app.postcss (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/assets/github.svg (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/AccountingData.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/AmpPlot.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/Badge.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/BarChart.svelte (99%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/Clock.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/Counter.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/Dashboard.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/DataStores.js (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/DayPlot.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/Header.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/Helpers.js (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/MonthPlot.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/PowerGauge.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/PowerGaugeSvg.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/PricePlot.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/ReactiveData.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/TemperaturePlot.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/lib/VoltPlot.svelte (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/main.js (100%)
 rename {ui/svelte => lib/SvelteUi/app}/src/vite-env.d.ts (100%)
 rename {ui/svelte => lib/SvelteUi/app}/svelte.config.js (100%)
 rename {ui/svelte => lib/SvelteUi/app}/tailwind.config.cjs (100%)
 rename {ui/svelte => lib/SvelteUi/app}/vite.config.js (67%)
 create mode 100644 lib/SvelteUi/include/.gitignore
 create mode 100644 lib/SvelteUi/include/AmsWebServer.h
 create mode 100644 lib/SvelteUi/scripts/generate_includes.py
 create mode 100644 lib/SvelteUi/src/AmsWebServer.cpp

diff --git a/ui/svelte/.gitignore b/lib/SvelteUi/app/.gitignore
similarity index 100%
rename from ui/svelte/.gitignore
rename to lib/SvelteUi/app/.gitignore
diff --git a/ui/svelte/index.html b/lib/SvelteUi/app/index.html
similarity index 100%
rename from ui/svelte/index.html
rename to lib/SvelteUi/app/index.html
diff --git a/ui/svelte/jsconfig.json b/lib/SvelteUi/app/jsconfig.json
similarity index 100%
rename from ui/svelte/jsconfig.json
rename to lib/SvelteUi/app/jsconfig.json
diff --git a/ui/svelte/package-lock.json b/lib/SvelteUi/app/package-lock.json
similarity index 100%
rename from ui/svelte/package-lock.json
rename to lib/SvelteUi/app/package-lock.json
diff --git a/ui/svelte/package.json b/lib/SvelteUi/app/package.json
similarity index 100%
rename from ui/svelte/package.json
rename to lib/SvelteUi/app/package.json
diff --git a/ui/svelte/postcss.config.cjs b/lib/SvelteUi/app/postcss.config.cjs
similarity index 100%
rename from ui/svelte/postcss.config.cjs
rename to lib/SvelteUi/app/postcss.config.cjs
diff --git a/ui/svelte/src/App.svelte b/lib/SvelteUi/app/src/App.svelte
similarity index 100%
rename from ui/svelte/src/App.svelte
rename to lib/SvelteUi/app/src/App.svelte
diff --git a/ui/svelte/src/app.postcss b/lib/SvelteUi/app/src/app.postcss
similarity index 100%
rename from ui/svelte/src/app.postcss
rename to lib/SvelteUi/app/src/app.postcss
diff --git a/ui/svelte/src/assets/github.svg b/lib/SvelteUi/app/src/assets/github.svg
similarity index 100%
rename from ui/svelte/src/assets/github.svg
rename to lib/SvelteUi/app/src/assets/github.svg
diff --git a/ui/svelte/src/lib/AccountingData.svelte b/lib/SvelteUi/app/src/lib/AccountingData.svelte
similarity index 100%
rename from ui/svelte/src/lib/AccountingData.svelte
rename to lib/SvelteUi/app/src/lib/AccountingData.svelte
diff --git a/ui/svelte/src/lib/AmpPlot.svelte b/lib/SvelteUi/app/src/lib/AmpPlot.svelte
similarity index 100%
rename from ui/svelte/src/lib/AmpPlot.svelte
rename to lib/SvelteUi/app/src/lib/AmpPlot.svelte
diff --git a/ui/svelte/src/lib/Badge.svelte b/lib/SvelteUi/app/src/lib/Badge.svelte
similarity index 100%
rename from ui/svelte/src/lib/Badge.svelte
rename to lib/SvelteUi/app/src/lib/Badge.svelte
diff --git a/ui/svelte/src/lib/BarChart.svelte b/lib/SvelteUi/app/src/lib/BarChart.svelte
similarity index 99%
rename from ui/svelte/src/lib/BarChart.svelte
rename to lib/SvelteUi/app/src/lib/BarChart.svelte
index 764822e8..fb5f5c74 100644
--- a/ui/svelte/src/lib/BarChart.svelte
+++ b/lib/SvelteUi/app/src/lib/BarChart.svelte
@@ -68,10 +68,6 @@
 </div>
 
 <style>
-	h2 {
-		text-align: center;
-	}
-
 	.chart {
 		width: 100%;
 		margin: 0 auto;
diff --git a/ui/svelte/src/lib/Clock.svelte b/lib/SvelteUi/app/src/lib/Clock.svelte
similarity index 100%
rename from ui/svelte/src/lib/Clock.svelte
rename to lib/SvelteUi/app/src/lib/Clock.svelte
diff --git a/ui/svelte/src/lib/Counter.svelte b/lib/SvelteUi/app/src/lib/Counter.svelte
similarity index 100%
rename from ui/svelte/src/lib/Counter.svelte
rename to lib/SvelteUi/app/src/lib/Counter.svelte
diff --git a/ui/svelte/src/lib/Dashboard.svelte b/lib/SvelteUi/app/src/lib/Dashboard.svelte
similarity index 100%
rename from ui/svelte/src/lib/Dashboard.svelte
rename to lib/SvelteUi/app/src/lib/Dashboard.svelte
diff --git a/ui/svelte/src/lib/DataStores.js b/lib/SvelteUi/app/src/lib/DataStores.js
similarity index 100%
rename from ui/svelte/src/lib/DataStores.js
rename to lib/SvelteUi/app/src/lib/DataStores.js
diff --git a/ui/svelte/src/lib/DayPlot.svelte b/lib/SvelteUi/app/src/lib/DayPlot.svelte
similarity index 100%
rename from ui/svelte/src/lib/DayPlot.svelte
rename to lib/SvelteUi/app/src/lib/DayPlot.svelte
diff --git a/ui/svelte/src/lib/Header.svelte b/lib/SvelteUi/app/src/lib/Header.svelte
similarity index 100%
rename from ui/svelte/src/lib/Header.svelte
rename to lib/SvelteUi/app/src/lib/Header.svelte
diff --git a/ui/svelte/src/lib/Helpers.js b/lib/SvelteUi/app/src/lib/Helpers.js
similarity index 100%
rename from ui/svelte/src/lib/Helpers.js
rename to lib/SvelteUi/app/src/lib/Helpers.js
diff --git a/ui/svelte/src/lib/MonthPlot.svelte b/lib/SvelteUi/app/src/lib/MonthPlot.svelte
similarity index 100%
rename from ui/svelte/src/lib/MonthPlot.svelte
rename to lib/SvelteUi/app/src/lib/MonthPlot.svelte
diff --git a/ui/svelte/src/lib/PowerGauge.svelte b/lib/SvelteUi/app/src/lib/PowerGauge.svelte
similarity index 100%
rename from ui/svelte/src/lib/PowerGauge.svelte
rename to lib/SvelteUi/app/src/lib/PowerGauge.svelte
diff --git a/ui/svelte/src/lib/PowerGaugeSvg.svelte b/lib/SvelteUi/app/src/lib/PowerGaugeSvg.svelte
similarity index 100%
rename from ui/svelte/src/lib/PowerGaugeSvg.svelte
rename to lib/SvelteUi/app/src/lib/PowerGaugeSvg.svelte
diff --git a/ui/svelte/src/lib/PricePlot.svelte b/lib/SvelteUi/app/src/lib/PricePlot.svelte
similarity index 100%
rename from ui/svelte/src/lib/PricePlot.svelte
rename to lib/SvelteUi/app/src/lib/PricePlot.svelte
diff --git a/ui/svelte/src/lib/ReactiveData.svelte b/lib/SvelteUi/app/src/lib/ReactiveData.svelte
similarity index 100%
rename from ui/svelte/src/lib/ReactiveData.svelte
rename to lib/SvelteUi/app/src/lib/ReactiveData.svelte
diff --git a/ui/svelte/src/lib/TemperaturePlot.svelte b/lib/SvelteUi/app/src/lib/TemperaturePlot.svelte
similarity index 100%
rename from ui/svelte/src/lib/TemperaturePlot.svelte
rename to lib/SvelteUi/app/src/lib/TemperaturePlot.svelte
diff --git a/ui/svelte/src/lib/VoltPlot.svelte b/lib/SvelteUi/app/src/lib/VoltPlot.svelte
similarity index 100%
rename from ui/svelte/src/lib/VoltPlot.svelte
rename to lib/SvelteUi/app/src/lib/VoltPlot.svelte
diff --git a/ui/svelte/src/main.js b/lib/SvelteUi/app/src/main.js
similarity index 100%
rename from ui/svelte/src/main.js
rename to lib/SvelteUi/app/src/main.js
diff --git a/ui/svelte/src/vite-env.d.ts b/lib/SvelteUi/app/src/vite-env.d.ts
similarity index 100%
rename from ui/svelte/src/vite-env.d.ts
rename to lib/SvelteUi/app/src/vite-env.d.ts
diff --git a/ui/svelte/svelte.config.js b/lib/SvelteUi/app/svelte.config.js
similarity index 100%
rename from ui/svelte/svelte.config.js
rename to lib/SvelteUi/app/svelte.config.js
diff --git a/ui/svelte/tailwind.config.cjs b/lib/SvelteUi/app/tailwind.config.cjs
similarity index 100%
rename from ui/svelte/tailwind.config.cjs
rename to lib/SvelteUi/app/tailwind.config.cjs
diff --git a/ui/svelte/vite.config.js b/lib/SvelteUi/app/vite.config.js
similarity index 67%
rename from ui/svelte/vite.config.js
rename to lib/SvelteUi/app/vite.config.js
index b4e3acb4..70a1cfdf 100644
--- a/ui/svelte/vite.config.js
+++ b/lib/SvelteUi/app/vite.config.js
@@ -3,6 +3,17 @@ import { svelte } from '@sveltejs/vite-plugin-svelte'
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  build: {
+    outDir: 'dist',
+    assetsDir: '.',
+    rollupOptions: {
+      output: {
+        assetFileNames: '[name][extname]',
+        chunkFileNames: '[name].js',
+        entryFileNames: '[name].js'
+      }
+    }
+  },
   plugins: [svelte()],
   server: {
     proxy: {
diff --git a/lib/SvelteUi/include/.gitignore b/lib/SvelteUi/include/.gitignore
new file mode 100644
index 00000000..bf7da504
--- /dev/null
+++ b/lib/SvelteUi/include/.gitignore
@@ -0,0 +1 @@
+html/*.h
diff --git a/lib/SvelteUi/include/AmsWebServer.h b/lib/SvelteUi/include/AmsWebServer.h
new file mode 100644
index 00000000..b2649cec
--- /dev/null
+++ b/lib/SvelteUi/include/AmsWebServer.h
@@ -0,0 +1,86 @@
+#ifndef _AMSWEBSERVER_h
+#define _AMSWEBSERVER_h
+
+#include "Arduino.h"
+#include <MQTT.h>
+#include "AmsConfiguration.h"
+#include "HwTools.h"
+#include "AmsData.h"
+#include "AmsStorage.h"
+#include "AmsDataStorage.h"
+#include "EnergyAccounting.h"
+#include "Uptime.h"
+#include "RemoteDebug.h"
+#include "EntsoeApi.h"
+
+#if defined(ESP8266)
+	#include <ESP8266WiFi.h>
+	#include <ESP8266WebServer.h>
+	#include <ESP8266HTTPClient.h>
+	#include <ESP8266httpUpdate.h>
+#elif defined(ESP32) // ARDUINO_ARCH_ESP32
+	#include <WiFi.h>
+	#include <WebServer.h>
+	#include <HTTPClient.h>
+	#include <HTTPUpdate.h>
+#else
+	#warning "Unsupported board type"
+#endif
+
+#include "LittleFS.h"
+
+class AmsWebServer {
+public:
+	AmsWebServer(uint8_t* buf, RemoteDebug* Debug, HwTools* hw);
+    void setup(AmsConfiguration*, GpioConfig*, MeterConfig*, AmsData*, AmsDataStorage*, EnergyAccounting*);
+    void loop();
+	void setMqtt(MQTTClient* mqtt);
+	void setTimezone(Timezone* tz);
+	void setMqttEnabled(bool);
+	void setEntsoeApi(EntsoeApi* eapi);
+
+private:
+	RemoteDebug* debugger;
+	bool mqttEnabled = false;
+	int maxPwr = 0;
+	HwTools* hw;
+	Timezone* tz;
+	EntsoeApi* eapi = NULL;
+	AmsConfiguration* config;
+	GpioConfig* gpioConfig;
+	MeterConfig* meterConfig;
+	WebConfig webConfig;
+	AmsData* meterState;
+	AmsDataStorage* ds;
+    EnergyAccounting* ea = NULL;
+	MQTTClient* mqtt = NULL;
+	bool uploading = false;
+	File file;
+	bool performRestart = false;
+	bool performUpgrade = false;
+	bool rebootForUpgrade = false;
+
+    static const uint16_t BufferSize = 2048;
+    char* buf;
+
+#if defined(ESP8266)
+	ESP8266WebServer server;
+#elif defined(ESP32)
+	WebServer server;
+#endif
+
+	bool checkSecurity(byte level);
+
+	void indexHtml();
+	void indexJs();
+	void indexCss();
+	void githubSvg();
+
+    void dataJson();
+	void dayplotJson();
+	void monthplotJson();
+	void energyPriceJson();
+	void temperatureJson();
+};
+
+#endif
diff --git a/lib/SvelteUi/scripts/generate_includes.py b/lib/SvelteUi/scripts/generate_includes.py
new file mode 100644
index 00000000..a8a81ebc
--- /dev/null
+++ b/lib/SvelteUi/scripts/generate_includes.py
@@ -0,0 +1,80 @@
+import os
+import re
+import shutil
+import subprocess
+
+try:
+    from css_html_js_minify import html_minify, js_minify, css_minify
+except:
+    from SCons.Script import (
+        ARGUMENTS,
+        COMMAND_LINE_TARGETS,
+        DefaultEnvironment,
+    )
+    env = DefaultEnvironment()
+
+    env.Execute(
+        env.VerboseAction(
+            '$PYTHONEXE -m pip install "css_html_js_minify" ',
+            "Installing Python dependencies",
+        )
+    )
+    try:
+        from css_html_js_minify import html_minify, js_minify, css_minify
+    except:
+        print("WARN: Unable to load minifier")
+
+
+webroot = "lib/SvelteUi/app/dist"
+srcroot = "lib/SvelteUi/include/html"
+
+version = os.environ.get('GITHUB_TAG')
+if version == None:
+    try:
+      result = subprocess.run(['git','rev-parse','--short','HEAD'], capture_output=True, check=False)
+      if result.returncode == 0:
+        version = result.stdout.decode('utf-8').strip()
+      else:
+        version = "SNAPSHOT"
+    except:
+      version = "SNAPSHOT"
+
+if os.path.exists(srcroot):
+    shutil.rmtree(srcroot)
+    os.mkdir(srcroot)
+else:
+    os.mkdir(srcroot)
+
+for filename in os.listdir(webroot):
+    basename = re.sub("[^0-9a-zA-Z]+", "_", filename)
+
+    srcfile = webroot + "/" + filename
+    dstfile = srcroot + "/" + basename + ".h"
+
+    varname = basename.upper()
+
+    with open(srcfile, encoding="utf-8") as f:
+        content = f.read().replace("${version}", version)
+
+    try:    
+        if filename.endswith(".html"):
+            content = html_minify(content)
+        elif filename.endswith(".css"):
+            content = css_minify(content)
+        elif (filename.endswith(".js") and filename != 'gaugemeter.js') or filename.endswith(".json"):
+            content = js_minify(content)
+    except:
+        print("WARN: Unable to minify")
+
+    with open(dstfile, "w") as dst:
+        dst.write("static const char ")
+        dst.write(varname)
+        dst.write("[] PROGMEM = R\"==\"==(")
+        dst.write(content)
+        dst.write(")==\"==\";\n")
+        dst.write("const int ");
+        dst.write(varname)
+        dst.write("_LEN PROGMEM = ");
+        dst.write(str(len(content)))
+        dst.write(";");
+        
\ No newline at end of file
diff --git a/lib/SvelteUi/src/AmsWebServer.cpp b/lib/SvelteUi/src/AmsWebServer.cpp
new file mode 100644
index 00000000..bf7f1239
--- /dev/null
+++ b/lib/SvelteUi/src/AmsWebServer.cpp
@@ -0,0 +1,16 @@
+#include "AmsWebServer.h"
+
+AmsWebServer::AmsWebServer(uint8_t* buf, RemoteDebug* Debug, HwTools* hw) {
+	this->debugger = Debug;
+	this->hw = hw;
+	this->buf = (char*) buf;
+}
+
+void AmsWebServer::setup(AmsConfiguration* config, GpioConfig* gpioConfig, MeterConfig* meterConfig, AmsData* meterState, AmsDataStorage* ds, EnergyAccounting* ea) {
+    this->config = config;
+	this->gpioConfig = gpioConfig;
+	this->meterConfig = meterConfig;
+	this->meterState = meterState;
+	this->ds = ds;
+	this->ea = ea;
+}
\ No newline at end of file