Merge pull request #1 from RaBa64/Database

Added database feature.

include/WebApi.h

@@ -20,6 +20,7 @@
 #include "WebApi_webapp.h"
 #include "WebApi_ws_console.h"
 #include "WebApi_ws_live.h"
+#include "WebApi_database.h"
 #include <ESPAsyncWebServer.h>
 
 class WebApiClass {
@@ -56,6 +57,7 @@ private:
     WebApiWebappClass _webApiWebapp;
     WebApiWsConsoleClass _webApiWsConsole;
     WebApiWsLiveClass _webApiWsLive;
+    WebApiDatabaseClass _webApiWsDatabase;
 };
 
 extern WebApiClass WebApi;

include/WebApi_database.h

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <Arduino.h>
+#include <ESPAsyncWebServer.h>
+
+#define DATABASE_FILENAME "/database.bin"
+
+class WebApiDatabaseClass {
+public:
+    void init(AsyncWebServer* server);
+    void loop();
+    bool write(float energy);
+
+    struct Data {
+        uint8_t	tm_year;
+        uint8_t tm_mon;
+        uint8_t tm_mday;
+        uint8_t tm_hour;
+        float   energy;
+    };
+
+private:
+    void onDatabase(AsyncWebServerRequest* request);
+
+    AsyncWebServer* _server;
+};

src/MqttHandleInverterTotal.cpp

@@ -6,8 +6,10 @@
 #include "Configuration.h"
 #include "MqttSettings.h"
 #include <Hoymiles.h>
+#include "WebApi_database.h"
 
 MqttHandleInverterTotalClass MqttHandleInverterTotal;
+WebApiDatabaseClass database;
 
 void MqttHandleInverterTotalClass::init()
 {
@@ -73,5 +75,7 @@ void MqttHandleInverterTotalClass::loop()
         MqttSettings.publish("dc/is_valid", String(totalReachable));
 
         _lastPublish.set(Configuration.get().Mqtt_PublishInterval * 1000);
+
+        database.write(totalAcYieldTotal);      // write value to database
     }
 }

src/WebApi.cpp

@@ -36,6 +36,7 @@ void WebApiClass::init()
     _webApiWebapp.init(&_server);
     _webApiWsConsole.init(&_server);
     _webApiWsLive.init(&_server);
+    _webApiWsDatabase.init(&_server);
 
     _server.begin();
 }
@@ -60,6 +61,7 @@ void WebApiClass::loop()
     _webApiWebapp.loop();
     _webApiWsConsole.loop();
     _webApiWsLive.loop();
+    _webApiWsDatabase.loop();
 }
 
 bool WebApiClass::checkCredentials(AsyncWebServerRequest* request)

src/WebApi_database.cpp

@@ -0,0 +1,153 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2023 Ralf Bauer and others
+ */
+
+#include "WebApi_database.h"
+#include "MessageOutput.h"
+#include "WebApi.h"
+#include "defaults.h"
+#include <AsyncJson.h>
+#include <LittleFS.h>
+
+void WebApiDatabaseClass::init(AsyncWebServer* server)
+{
+    using std::placeholders::_1;
+
+    _server = server;
+    _server->on("/api/database", HTTP_GET, std::bind(&WebApiDatabaseClass::onDatabase, this, _1));
+}
+
+void WebApiDatabaseClass::loop()
+{
+}
+
+bool WebApiDatabaseClass::write(float energy)
+{
+    static uint8_t old_hour = 255;
+    static float old_energy = 0.0;
+
+    // LittleFS.remove(DATABASE_FILENAME);
+
+    struct tm timeinfo;
+    if (!getLocalTime(&timeinfo, 5)) // get cuurent time
+        return (false);
+    if (timeinfo.tm_hour == old_hour) // must be new hour
+        return (false);
+    if (old_hour == 255) { // don't write to database after reboot
+        old_hour = timeinfo.tm_hour;
+        return (false);
+    }
+    if (energy <= old_energy) // enery must have increased
+        return (false);
+
+    struct Data d;
+    d.tm_hour = old_hour;
+    old_hour = timeinfo.tm_hour;
+    d.tm_year = timeinfo.tm_year - 100; // year counting from 2000
+    d.tm_mon = timeinfo.tm_mon + 1;
+    d.tm_mday = timeinfo.tm_mday;
+    d.energy = old_energy = energy;
+
+    File f = LittleFS.open(DATABASE_FILENAME, "a");
+    if (!f) {
+        return (false);
+    }
+    f.write((const uint8_t*)&d, sizeof(Data));
+    f.close();
+    return (true);
+}
+
+void WebApiDatabaseClass::onDatabase(AsyncWebServerRequest* request)
+{
+    if (!WebApi.checkCredentialsReadonly(request)) {
+        return;
+    }
+
+    try {
+        File f = LittleFS.open(DATABASE_FILENAME, "r", false);
+        if (!f) {
+            return;
+        }
+
+        struct Data d;
+
+        AsyncJsonResponse* response = new AsyncJsonResponse(true, 40000U);
+        JsonArray root = response->getRoot();
+
+        while (f.read((uint8_t*)&d, sizeof(Data))) { // read from database
+            JsonArray nested = root.createNestedArray(); // create new nested array and copy data to array
+            nested.add(d.tm_year);
+            nested.add(d.tm_mon);
+            nested.add(d.tm_mday);
+            nested.add(d.tm_hour);
+            nested.add(d.energy);
+        }
+        f.close();
+        response->setLength();
+        request->send(response);
+    } catch (std::bad_alloc& bad_alloc) {
+        MessageOutput.printf("Call to /api/database temporarely out of resources. Reason: \"%s\".\r\n", bad_alloc.what());
+        WebApi.sendTooManyRequests(request);
+    }
+}
+
+
+
+/*  JS
+const energy = JSON.parse('[[23,5,19,6,175.4089966],[23,5,19,10,175.7649994],[23,5,19,10,175.8939972],[23,5,19,10,175.904007],[23,5,19,10,175.9149933],[23,5,19,11,175.9669952],[23,5,19,11,175.973999],[23,5,19,12,176.1159973],[23,5,19,13,176.2900085],[23,5,19,14,176.4179993],[23,5,19,15,176.5429993],[23,5,19,16,176.6100006],[23,5,19,17,176.7269897],[23,5,19,18,176.8370056],[23,5,19,19,176.9060059],[23,5,19,20,176.9360046],[23,5,19,21,176.9459991],[23,5,20,5,176.9459991],[23,5,20,6,176.9470062],[23,5,20,7,176.9629974],[23,5,20,8,177.0270081],[23,5,20,9,177.0899963],[23,5,20,10,177.2389984],[23,5,20,11,177.4759979],[23,5,20,12,177.7310028],[23,5,20,13,178.0749817],[23,5,20,14,178.3970032],[23,5,20,15,178.7460022],[23,5,20,16,179.0829926],[23,5,20,17,179.3110046],[23,5,20,18,179.4849854],[23,5,20,19,179.5549927],[23,5,20,20,179.5899963]]')
+
+var end = new Date()
+var start = new Date()
+var interval = 1
+start.setDate(end.getDate() - interval)
+start.setHours(start.getHours() - 1)
+console.log(start.toLocaleString())
+console.log(end.toLocaleString())
+
+google.charts.load('current', {
+  packages: ['corechart', 'bar']
+});
+google.charts.setOnLoadCallback(drawBasic);
+
+function drawBasic() {
+  var data = new google.visualization.DataTable();
+  data.addColumn('datetime', 'Time');
+  data.addColumn('number', 'Energy');
+  var old_energy = energy[0][4]
+  energy.forEach((x) => {
+    var d = new Date(x[0] + 2000, x[1] - 1, x[2], x[3])
+    if ((d >= start) && (d <= end)) {
+      data.addRow([d, (x[4] - old_energy) * 1000])
+    }
+    old_energy = x[4]
+  })
+
+  var date_formatter = new google.visualization.DateFormat({
+    pattern: "dd.MM.YY HH:mm"
+  });
+  date_formatter.format(data, 0);
+
+  var options = {
+    height: 500,
+    legend: {
+      position: 'none'
+    },
+    hAxis: {
+      format: 'dd.MM.YY HH:mm',
+      slantedText: true
+    },
+    vAxis: {
+      format: '# Wh'
+    }
+  }
+
+  var chart = new google.visualization.ColumnChart(document.getElementById('chart_div'));
+  chart.draw(data, options);
+}
+*/
+
+/* HTML
+  <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
+  <div id="chart_div"></div>
+*/