[WIP] New Vue Web UI

.github/CODEOWNERS

@@ -0,0 +1,5 @@
+# Global owners
+* @xoseperez @mcspr
+
+# Vue ui codeowner
+/code/ui/ @tofandel

.gitignore

@@ -15,5 +15,6 @@ custom.h
 .env
 .DS_Store
 .vscode
+.idea
 _pycache_/
-*.py[cod]
+*.py[cod]

code/espurna/alexa.ino

@@ -27,9 +27,15 @@ bool _alexaWebSocketOnKeyCheck(const char * key, JsonVariant& value) {
     return (strncmp(key, "alexa", 5) == 0);
 }
 
+void _alexaWebSocketOnVisible(JsonObject& root) {
+    JsonObject& modules = root["modules"];
+    modules["alexa"] = 1;
+}
+
 void _alexaWebSocketOnConnected(JsonObject& root) {
-    root["alexaEnabled"] = alexaEnabled();
-    root["alexaName"] = getSetting("alexaName");
+    JsonObject& alexa = root.createNestedObject("alexa");
+    alexa["enabled"] = alexaEnabled();
+    alexa["name"] = getSetting("alexaName");
 }
 
 void _alexaConfigure() {
@@ -124,7 +130,7 @@ void alexaSetup() {
         webBodyRegister(_alexaBodyCallback);
         webRequestRegister(_alexaRequestCallback);
         wsRegister()
-            .onVisible([](JsonObject& root) { root["alexaVisible"] = 1; })
+            .onVisible(_alexaWebSocketOnVisible)
             .onConnected(_alexaWebSocketOnConnected)
             .onKeyCheck(_alexaWebSocketOnKeyCheck);
     #endif

code/espurna/api.ino

@@ -38,11 +38,17 @@ bool _apiWebSocketOnKeyCheck(const char * key, JsonVariant& value) {
     return (strncmp(key, "api", 3) == 0);
 }
 
+void _apiWebSocketOnVisible(JsonObject& root) {
+    JsonObject& modules = root["modules"];
+    modules["api"] = 1;
+}
+
 void _apiWebSocketOnConnected(JsonObject& root) {
-    root["apiEnabled"] = _apiEnabled();
-    root["apiKey"] = _apiKey();
-    root["apiRestFul"] = _apiRestFul();
-    root["apiRealTime"] = getSetting("apiRealTime", 1 == API_REAL_TIME_VALUES);
+    JsonObject& api = root.createNestedObject("api");
+    api["enabled"] = _apiEnabled();
+    api["key"] = _apiKey();
+    api["restFul"] = _apiRestFul();
+    api["realTime"] = getSetting("apiRealTime", 1 == API_REAL_TIME_VALUES);
 }
 
 void _apiConfigure() {
@@ -253,7 +259,7 @@ void apiRegister(const char * key, api_get_callback_f getFn, api_put_callback_f
 void apiSetup() {
     _apiConfigure();
     wsRegister()
-        .onVisible([](JsonObject& root) { root["apiVisible"] = 1; })
+        .onVisible(_apiWebSocketOnVisible)
         .onConnected(_apiWebSocketOnConnected)
         .onKeyCheck(_apiWebSocketOnKeyCheck);
     webRequestRegister(_apiRequestCallback);

code/espurna/button.ino

@@ -59,7 +59,8 @@ void buttonMQTT(unsigned char id, uint8_t event) {
 
 void _buttonWebSocketOnVisible(JsonObject& root) {
     if (buttonCount() > 0) {
-        root["btnVisible"] = 1;
+        JsonObject& modules = root["modules"];
+        modules["btn"] = 1;
     }
 }
 

code/espurna/config/general.h

@@ -689,7 +689,7 @@
 // there are no special requirements. Any static web server will do (NGinx, Apache, Lighttpd,...).
 // The only requirement is that the resource must be available under this domain.
 #ifndef WEB_REMOTE_DOMAIN
-#define WEB_REMOTE_DOMAIN           "http://espurna.io"
+#define WEB_REMOTE_DOMAIN           "*"
 #endif
 
 // -----------------------------------------------------------------------------

code/espurna/debug.ino

@@ -214,6 +214,12 @@ void _debugSendInternal(const char * message, bool add_timestamp) {
 
 #if DEBUG_WEB_SUPPORT
 
+void _debugWebSocketOnVisible(JsonObject& root) {
+    JsonObject& modules = root["modules"];
+
+    modules["dbg"] = 1;
+}
+
 void _debugWebSocketOnAction(uint32_t client_id, const char * action, JsonObject& data) {
 
         #if TERMINAL_SUPPORT
@@ -232,7 +238,7 @@ void _debugWebSocketOnAction(uint32_t client_id, const char * action, JsonObject
 void debugWebSetup() {
 
     wsRegister()
-        .onVisible([](JsonObject& root) { root["dbgVisible"] = 1; })
+        .onVisible(_debugWebSocketOnVisible)
         .onAction(_debugWebSocketOnAction);
 
     // TODO: if hostname string changes, need to update header too

code/espurna/domoticz.ino

@@ -199,24 +199,28 @@ bool _domoticzWebSocketOnKeyCheck(const char * key, JsonVariant& value) {
 }
 
 void _domoticzWebSocketOnVisible(JsonObject& root) {
-    root["dczVisible"] = static_cast<unsigned char>(haveRelaysOrSensors());
+    JsonObject& modules = root["modules"];
+    modules["dcz"] = static_cast<unsigned char>(haveRelaysOrSensors());
 }
 
 void _domoticzWebSocketOnConnected(JsonObject& root) {
+    JsonObject& dcz = root.createNestedObject("dcz");
 
-    root["dczEnabled"] = getSetting("dczEnabled", 1 == DOMOTICZ_ENABLED);
-    root["dczTopicIn"] = getSetting("dczTopicIn", DOMOTICZ_IN_TOPIC);
-    root["dczTopicOut"] = getSetting("dczTopicOut", DOMOTICZ_OUT_TOPIC);
+    dcz["enabled"] = getSetting("dczEnabled", 1 == DOMOTICZ_ENABLED);
+    dcz["topicIn"] = getSetting("dczTopicIn", DOMOTICZ_IN_TOPIC);
+    dcz["topicOut"] = getSetting("dczTopicOut", DOMOTICZ_OUT_TOPIC);
 
-    JsonArray& relays = root.createNestedArray("dczRelays");
+    JsonArray& relays = dcz.createNestedArray("relays");
     for (unsigned char i=0; i<relayCount(); i++) {
         relays.add(_domoticzIdx(i));
     }
 
+    //Is this really needed since already done in sensor
+    /*
     #if SENSOR_SUPPORT
-        _sensorWebSocketMagnitudes(root, "dcz");
+        _sensorWebSocketMagnitudesConfig(dcz);
     #endif
-
+    */
 }
 
 #endif // WEB_SUPPORT

code/espurna/homeassistant.ino

@@ -204,7 +204,7 @@ void _haSendMagnitude(unsigned char i, JsonObject& config) {
     unsigned char type = magnitudeType(i);
     config["name"] = _haFixName(getSetting("hostname") + String(" ") + magnitudeTopic(type));
     config["state_topic"] = mqttTopic(magnitudeTopicIndex(i).c_str(), false);
-    config["unit_of_measurement"] = magnitudeUnits(type);
+    config["unit_of_measurement"] = magnitudeUnit(type);
 }
 
 void ha_discovery_t::prepareMagnitudes(ha_config_t& config) {
@@ -456,12 +456,15 @@ bool _haWebSocketOnKeyCheck(const char * key, JsonVariant& value) {
 }
 
 void _haWebSocketOnVisible(JsonObject& root) {
-    root["haVisible"] = 1;
+    JsonObject& modules = root["modules"];
+    modules["ha"] = 1;
 }
 
 void _haWebSocketOnConnected(JsonObject& root) {
-    root["haPrefix"] = getSetting("haPrefix", HOMEASSISTANT_PREFIX);
-    root["haEnabled"] = getSetting("haEnabled", 1 == HOMEASSISTANT_ENABLED);
+    JsonObject& ha = root.createNestedObject("ha");
+
+    ha["enabled"] = getSetting("haEnabled", 1 == HOMEASSISTANT_ENABLED);
+    ha["prefix"] = getSetting("haPrefix", HOMEASSISTANT_PREFIX);
 }
 
 void _haWebSocketOnAction(uint32_t client_id, const char * action, JsonObject& data) {

code/espurna/influxdb.ino

@@ -114,16 +114,19 @@ bool _idbWebSocketOnKeyCheck(const char * key, JsonVariant& value) {
 }
 
 void _idbWebSocketOnVisible(JsonObject& root) {
-    root["idbVisible"] = 1;
+    JsonObject& modules = root["modules"];
+    modules["idb"] = 1;
 }
 
 void _idbWebSocketOnConnected(JsonObject& root) {
-    root["idbEnabled"] = getSetting("idbEnabled", 1 == INFLUXDB_ENABLED);
-    root["idbHost"] = getSetting("idbHost", INFLUXDB_HOST);
-    root["idbPort"] = getSetting("idbPort", INFLUXDB_PORT);
-    root["idbDatabase"] = getSetting("idbDatabase", INFLUXDB_DATABASE);
-    root["idbUsername"] = getSetting("idbUsername", INFLUXDB_USERNAME);
-    root["idbPassword"] = getSetting("idbPassword", INFLUXDB_PASSWORD);
+    JsonObject& idb = root.createNestedObject("idb");
+
+    idb["enabled"] = getSetting("idbEnabled", 1 == INFLUXDB_ENABLED);
+    idb["host"] = getSetting("idbHost", INFLUXDB_HOST);
+    idb["port"] = getSetting("idbPort", INFLUXDB_PORT);
+    idb["database"] = getSetting("idbDatabase", INFLUXDB_DATABASE);
+    idb["username"] = getSetting("idbUsername", INFLUXDB_USERNAME);
+    idb["password"] = getSetting("idbPassword", INFLUXDB_PASSWORD);
 }
 
 void _idbConfigure() {

code/espurna/led.ino

@@ -106,17 +106,25 @@ bool _ledWebSocketOnKeyCheck(const char * key, JsonVariant& value) {
 
 void _ledWebSocketOnVisible(JsonObject& root) {
     if (_ledCount() > 0) {
-        root["ledVisible"] = 1;
+        JsonObject& modules = root["modules"];
+        modules["led"] = 1;
     }
 }
 
 void _ledWebSocketOnConnected(JsonObject& root) {
     if (!_ledCount()) return;
-    JsonArray& leds = root.createNestedArray("ledConfig");
-    for (unsigned char id = 0; id < _ledCount(); ++id) {
-        JsonObject& led = leds.createNestedObject();
-        led["mode"] = getSetting({"ledMode", id}, _leds[id].mode);
-        led["relay"] = getSetting<unsigned char>({"ledRelay", id}, _leds[id].relayID);
+    JsonObject& led = root.createNestedObject("led");
+
+    JsonArray& schema = led.createNestedArray("schema");
+
+    schema.add("mode");
+    schema.add("relay");
+
+    JsonArray& leds = root.createNestedArray("list");
+    for (unsigned char id = 0; id <_ledCount(); ++id) {
+        JsonArray& led = leds.createNestedArray();
+        led.add(getSetting({"ledMode", id}, _leds[id].mode));
+        led.add(getSetting<unsigned char>({"ledRelay", id}, _leds[id].relayID));
     }
 }
 

code/espurna/light.ino

@@ -1042,7 +1042,8 @@ void _lightWebSocketStatus(JsonObject& root) {
 }
 
 void _lightWebSocketOnVisible(JsonObject& root) {
-    root["colorVisible"] = 1;
+    JsonObject& modules = root["modules"];
+    modules["color"] = 1;
 }
 
 void _lightWebSocketOnConnected(JsonObject& root) {

code/espurna/lightfox.ino

@@ -28,7 +28,7 @@ void lightfoxLearn() {
     Serial.write(LIGHTFOX_CODE_STOP);
     Serial.println();
     Serial.flush();
-    DEBUG_MSG_P(PSTR("[LIGHTFOX] Learn comman sent\n"));
+    DEBUG_MSG_P(PSTR("[LIGHTFOX] Learn command sent\n"));
 }
 
 void lightfoxClear() {
@@ -38,7 +38,7 @@ void lightfoxClear() {
     Serial.write(LIGHTFOX_CODE_STOP);
     Serial.println();
     Serial.flush();
-    DEBUG_MSG_P(PSTR("[LIGHTFOX] Clear comman sent\n"));
+    DEBUG_MSG_P(PSTR("[LIGHTFOX] Clear command sent\n"));
 }
 
 // -----------------------------------------------------------------------------
@@ -48,10 +48,12 @@ void lightfoxClear() {
 #if WEB_SUPPORT
 
 void _lightfoxWebSocketOnConnected(JsonObject& root) {
-    root["lightfoxVisible"] = 1;
+    JsonObject& lightfox = root.createNestedObject("lightfox");
+
+    lightfox["enabled"] = 1;
+
     uint8_t buttonsCount = _buttons.size();
-    root["lightfoxRelayCount"] = relayCount();
-    JsonArray& rfb = root.createNestedArray("lightfoxButtons");
+    JsonArray& rfb = root.createNestedArray("buttons");
     for (byte id=0; id<buttonsCount; id++) {
         JsonObject& node = rfb.createNestedObject();
         node["id"] = id;

code/espurna/mqtt.ino

@@ -446,9 +446,10 @@ bool _mqttWebSocketOnKeyCheck(const char * key, JsonVariant& value) {
 }
 
 void _mqttWebSocketOnVisible(JsonObject& root) {
-    root["mqttVisible"] = 1;
+    JsonObject& modules = root["modules"];
+    modules["mqtt"] = 1;
     #if ASYNC_TCP_SSL_ENABLED
-        root["mqttsslVisible"] = 1;
+        modules["mqttSSL"] = 1;
     #endif
 }
 
@@ -457,21 +458,23 @@ void _mqttWebSocketOnData(JsonObject& root) {
 }
 
 void _mqttWebSocketOnConnected(JsonObject& root) {
-    root["mqttEnabled"] = mqttEnabled();
-    root["mqttServer"] = getSetting("mqttServer", MQTT_SERVER);
-    root["mqttPort"] = getSetting("mqttPort", MQTT_PORT);
-    root["mqttUser"] = getSetting("mqttUser", MQTT_USER);
-    root["mqttClientID"] = getSetting("mqttClientID");
-    root["mqttPassword"] = getSetting("mqttPassword", MQTT_PASS);
-    root["mqttKeep"] = _mqtt_keepalive;
-    root["mqttRetain"] = _mqtt_retain;
-    root["mqttQoS"] = _mqtt_qos;
+    JsonObject& mqtt = root.createNestedObject("mqtt");
+
+    mqtt["enabled"] = mqttEnabled();
+    mqtt["server"] = getSetting("mqttServer", MQTT_SERVER);
+    mqtt["port"] = getSetting("mqttPort", MQTT_PORT);
+    mqtt["user"] = getSetting("mqttUser", MQTT_USER);
+    mqtt["clientID"] = getSetting("mqttClientID");
+    mqtt["password"] = getSetting("mqttPassword", MQTT_PASS);
+    mqtt["keep"] = _mqtt_keepalive;
+    mqtt["retain"] = _mqtt_retain;
+    mqtt["qoS"] = _mqtt_qos;
     #if SECURE_CLIENT != SECURE_CLIENT_NONE
-        root["mqttUseSSL"] = getSetting("mqttUseSSL", 1 == MQTT_SSL_ENABLED);
-        root["mqttFP"] = getSetting("mqttFP", MQTT_SSL_FINGERPRINT);
+        mqtt["useSSL"] = getSetting("mqttUseSSL", 1 == MQTT_SSL_ENABLED);
+        mqtt["FP"] = getSetting("mqttFP", MQTT_SSL_FINGERPRINT);
     #endif
-    root["mqttTopic"] = getSetting("mqttTopic", MQTT_TOPIC);
-    root["mqttUseJson"] = getSetting("mqttUseJson", 1 == MQTT_USE_JSON);
+    mqtt["topic"] = getSetting("mqttTopic", MQTT_TOPIC);
+    mqtt["useJson"] = getSetting("mqttUseJson", 1 == MQTT_USE_JSON);
 }
 
 #endif

code/espurna/nofuss.ino

@@ -26,12 +26,15 @@ bool _nofussWebSocketOnKeyCheck(const char * key, JsonVariant& value) {
 }
 
 void _nofussWebSocketOnVisible(JsonObject& root) {
-    root["nofussVisible"] = 1;
+    JsonObject& modules = root["modules"];
+    modules["nofuss"] = 1;
 }
 
 void _nofussWebSocketOnConnected(JsonObject& root) {
-    root["nofussEnabled"] = getSetting("nofussEnabled", 1 == NOFUSS_ENABLED);
-    root["nofussServer"] = getSetting("nofussServer", NOFUSS_SERVER);
+    JsonObject& nofuss = root.createNestedObject("nofuss");
+
+    nofuss["enabled"] = getSetting("nofussEnabled", 1 == NOFUSS_ENABLED);
+    nofuss["server"] = getSetting("nofussServer", NOFUSS_SERVER);
 }
 
 #endif

code/espurna/ntp.ino

@@ -47,6 +47,7 @@ uint32_t sntp_update_delay_MS_rfc_not_less_than_15000() {
 // We also must shim TimeLib functions until everything else is ported.
 // We can't sometimes avoid TimeLib as dependancy though, which would be really bad
 
+
 static Ticker _ntp_broker_timer;
 static bool _ntp_synced = false;
 
@@ -149,17 +150,20 @@ bool _ntpWebSocketOnKeyCheck(const char * key, JsonVariant& value) {
 }
 
 void _ntpWebSocketOnVisible(JsonObject& root) {
-    root["ntpVisible"] = 1;
-    root["ntplwipVisible"] = 1;
+    JsonObject& modules = root["modules"];
+    modules["ntp"] = 1;
+    modules["ntplwip"] = 1;
 }
 
 void _ntpWebSocketOnData(JsonObject& root) {
     root["ntpStatus"] = ntpSynced();
 }
 
 void _ntpWebSocketOnConnected(JsonObject& root) {
-    root["ntpServer"] = getSetting("ntpServer", F(NTP_SERVER));
-    root["ntpTZ"] = getSetting("ntpTZ", NTP_TIMEZONE);
+    JsonObject& ntp = root.createNestedObject("ntp");
+
+    ntp["server"] = getSetting("ntpServer", NTP_SERVER);
+    ntp["TZ"] = getSetting("ntpTZ", NTP_TIMEZONE);
 }
 
 #endif