[WIP] New Vue Web UI

.gitignore

@@ -15,3 +15,4 @@ custom.h
 .env
 .DS_Store
 .vscode
+.idea

code/espurna/alexa.ino

@@ -28,8 +28,9 @@ bool _alexaWebSocketOnKeyCheck(const char * key, JsonVariant& value) {
 }
 
 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() {

code/espurna/api.ino

@@ -27,10 +27,11 @@ bool _apiWebSocketOnKeyCheck(const char * key, JsonVariant& value) {
 }
 
 void _apiWebSocketOnConnected(JsonObject& root) {
-    root["apiEnabled"] = getSetting("apiEnabled", API_ENABLED).toInt() == 1;
-    root["apiKey"] = getSetting("apiKey");
-    root["apiRealTime"] = getSetting("apiRealTime", API_REAL_TIME_VALUES).toInt() == 1;
-    root["apiRestFul"] = getSetting("apiRestFul", API_RESTFUL).toInt() == 1;
+    JsonObject& api = root.createNestedObject("api");
+    api["enabled"] = getSetting("apiEnabled", API_ENABLED).toInt() == 1;
+    api["key"] = getSetting("apiKey");
+    api["realTime"] = getSetting("apiRealTime", API_REAL_TIME_VALUES).toInt() == 1;
+    api["restFul"] = getSetting("apiRestFul", API_RESTFUL).toInt() == 1;
 }
 
 void _apiConfigure() {

code/espurna/config/general.h

@@ -625,7 +625,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/domoticz.ino

@@ -188,18 +188,19 @@ void _domoticzWebSocketOnVisible(JsonObject& root) {
 }
 
 void _domoticzWebSocketOnConnected(JsonObject& root) {
+    JsonObject& dcz = root.createNestedObject("dcz");
 
-    root["dczEnabled"] = getSetting("dczEnabled", DOMOTICZ_ENABLED).toInt() == 1;
-    root["dczTopicIn"] = getSetting("dczTopicIn", DOMOTICZ_IN_TOPIC);
-    root["dczTopicOut"] = getSetting("dczTopicOut", DOMOTICZ_OUT_TOPIC);
+    dcz["enabled"] = getSetting("dczEnabled", DOMOTICZ_ENABLED).toInt() == 1;
+    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));
     }
 
     #if SENSOR_SUPPORT
-        _sensorWebSocketMagnitudes(root, "dcz");
+        _sensorWebSocketMagnitudes(dcz);
     #endif
 
 }

code/espurna/homeassistant.ino

@@ -96,7 +96,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 _haSendMagnitudes(ha_config_t& config) {
@@ -328,8 +328,10 @@ void _haWebSocketOnVisible(JsonObject& root) {
 }
 
 void _haWebSocketOnConnected(JsonObject& root) {
-    root["haPrefix"] = getSetting("haPrefix", HOMEASSISTANT_PREFIX);
-    root["haEnabled"] = getSetting("haEnabled", HOMEASSISTANT_ENABLED).toInt() == 1;
+    JsonObject& ha = root.createNestedObject("ha");
+
+    ha["enabled"] = getSetting("haEnabled", HOMEASSISTANT_ENABLED).toInt() == 1;
+    ha["prefix"] = getSetting("haPrefix", HOMEASSISTANT_PREFIX);
 }
 
 void _haWebSocketOnAction(uint32_t client_id, const char * action, JsonObject& data) {

code/espurna/influxdb.ino

@@ -26,12 +26,14 @@ void _idbWebSocketOnVisible(JsonObject& root) {
 }
 
 void _idbWebSocketOnConnected(JsonObject& root) {
-    root["idbEnabled"] = getSetting("idbEnabled", INFLUXDB_ENABLED).toInt() == 1;
-    root["idbHost"] = getSetting("idbHost", INFLUXDB_HOST);
-    root["idbPort"] = getSetting("idbPort", INFLUXDB_PORT).toInt();
-    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", INFLUXDB_ENABLED).toInt() == 1;
+    idb["host"] = getSetting("idbHost", INFLUXDB_HOST);
+    idb["port"] = getSetting("idbPort", INFLUXDB_PORT).toInt();
+    idb["database"] = getSetting("idbDatabase", INFLUXDB_DATABASE);
+    idb["username"] = getSetting("idbUsername", INFLUXDB_USERNAME);
+    idb["password"] = getSetting("idbPassword", INFLUXDB_PASSWORD);
 }
 
 void _idbConfigure() {

code/espurna/led.ino

@@ -81,7 +81,7 @@ void _ledWebSocketOnVisible(JsonObject& root) {
 
 void _ledWebSocketOnConnected(JsonObject& root) {
     if (_ledCount() == 0) return;
-    JsonArray& leds = root.createNestedArray("ledConfig");
+    JsonArray& leds = root.createNestedArray("leds");
     for (byte i=0; i<_ledCount(); i++) {
         JsonObject& led = leds.createNestedObject();
         led["mode"] = getSetting("ledMode", i, "").toInt();

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

@@ -438,21 +438,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", MQTT_SSL_ENABLED).toInt() == 1;
-        root["mqttFP"] = getSetting("mqttFP", MQTT_SSL_FINGERPRINT);
+        mqtt["useSSL"] = getSetting("mqttUseSSL", MQTT_SSL_ENABLED).toInt() == 1;
+        mqtt["FP"] = getSetting("mqttFP", MQTT_SSL_FINGERPRINT);
     #endif
-    root["mqttTopic"] = getSetting("mqttTopic", MQTT_TOPIC);
-    root["mqttUseJson"] = getSetting("mqttUseJson", MQTT_USE_JSON).toInt() == 1;
+    mqtt["topic"] = getSetting("mqttTopic", MQTT_TOPIC);
+    mqtt["useJson"] = getSetting("mqttUseJson", MQTT_USE_JSON).toInt() == 1;
 }
 
 #endif

code/espurna/nofuss.ino

@@ -29,8 +29,10 @@ void _nofussWebSocketOnVisible(JsonObject& root) {
 }
 
 void _nofussWebSocketOnConnected(JsonObject& root) {
-    root["nofussEnabled"] = getSetting("nofussEnabled", NOFUSS_ENABLED).toInt() == 1;
-    root["nofussServer"] = getSetting("nofussServer", NOFUSS_SERVER);
+    JsonObject& nofuss = root.createNestedObject("nofuss");
+
+    nofuss["enabled"] = getSetting("nofussEnabled", NOFUSS_ENABLED).toInt() == 1;
+    nofuss["server"] = getSetting("nofussServer", NOFUSS_SERVER);
 }
 
 #endif

code/espurna/ntp.ino

@@ -39,10 +39,12 @@ void _ntpWebSocketOnData(JsonObject& root) {
 }
 
 void _ntpWebSocketOnConnected(JsonObject& root) {
-    root["ntpServer"] = getSetting("ntpServer", NTP_SERVER);
-    root["ntpOffset"] = getSetting("ntpOffset", NTP_TIME_OFFSET).toInt();
-    root["ntpDST"] = getSetting("ntpDST", NTP_DAY_LIGHT).toInt() == 1;
-    root["ntpRegion"] = getSetting("ntpRegion", NTP_DST_REGION).toInt();
+    JsonObject& ntp = root.createNestedObject("ntp");
+
+    ntp["server"] = getSetting("ntpServer", NTP_SERVER);
+    ntp["offset"] = getSetting("ntpOffset", NTP_TIME_OFFSET).toInt();
+    ntp["DST"] = getSetting("ntpDST", NTP_DAY_LIGHT).toInt() == 1;
+    ntp["region"] = getSetting("ntpRegion", NTP_DST_REGION).toInt();
 }
 
 #endif

code/espurna/relay.ino

@@ -719,39 +719,23 @@ String _relayFriendlyName(unsigned char i) {
     return res;
 }
 
-void _relayWebSocketSendRelays(JsonObject& root) {
-    JsonObject& relays = root.createNestedObject("relayConfig");
-
-    relays["size"] = relayCount();
-    relays["start"] = 0;
 
-    JsonArray& gpio = relays.createNestedArray("gpio");
-    JsonArray& type = relays.createNestedArray("type");
-    JsonArray& reset = relays.createNestedArray("reset");
-    JsonArray& boot = relays.createNestedArray("boot");
-    JsonArray& pulse = relays.createNestedArray("pulse");
-    JsonArray& pulse_time = relays.createNestedArray("pulse_time");
-
-    #if MQTT_SUPPORT
-        JsonArray& group = relays.createNestedArray("group");
-        JsonArray& group_sync = relays.createNestedArray("group_sync");
-        JsonArray& on_disconnect = relays.createNestedArray("on_disc");
-    #endif
+void _relayWebSocketSendRelays(JsonObject& root) {
+    JsonArray& relays = root.createNestedArray("relays");
 
     for (unsigned char i=0; i<relayCount(); i++) {
-        gpio.add(_relayFriendlyName(i));
-
-        type.add(_relays[i].type);
-        reset.add(_relays[i].reset_pin);
-        boot.add(getSetting("relayBoot", i, RELAY_BOOT_MODE).toInt());
-
-        pulse.add(_relays[i].pulse);
-        pulse_time.add(_relays[i].pulse_ms / 1000.0);
+        JsonObject& relay = relays.createNestedObject()
+        relay["gpio"] = _relayFriendlyName(i);
+        relay["type"] = _relays[i].type;
+        relay["reset"] = _relays[i].reset_pin;
+        relay["boot"] = getSetting("relayBoot", i, RELAY_BOOT_MODE).toInt();
+        relay["pulse"] = _relays[i].pulse;
+        relay["pulse_time"] = _relays[i].pulse_ms / 1000.0;
 
         #if MQTT_SUPPORT
-            group.add(getSetting("mqttGroup", i, ""));
-            group_sync.add(getSetting("mqttGroupSync", i, 0).toInt());
-            on_disconnect.add(getSetting("relayOnDisc", i, 0).toInt());
+            relay["group"] = getSetting("mqttGroup", i, "");
+            relay["group_sync"] = getSetting("mqttGroupSync", i, 0).toInt();
+            relay["on_disc"] = getSetting("relayOnDisc", i, 0).toInt();
         #endif
     }
 }

code/espurna/rfbridge.ino

@@ -104,12 +104,14 @@ void _rfbWebSocketOnVisible(JsonObject& root) {
 }
 
 void _rfbWebSocketOnConnected(JsonObject& root) {
-    root["rfbRepeat"] = getSetting("rfbRepeat", RF_SEND_TIMES).toInt();
-    root["rfbCount"] = relayCount();
+    JsonObject& rfb = root.createNestedObject("rfb");
+
+    rfb["repeat"] = getSetting("rfbRepeat", RF_SEND_TIMES).toInt();
+    rfb["count"] = relayCount();
     #if RFB_DIRECT
-        root["rfbdirectVisible"] = 1;
-        root["rfbRX"] = getSetting("rfbRX", RFB_RX_PIN).toInt();
-        root["rfbTX"] = getSetting("rfbTX", RFB_TX_PIN).toInt();
+        rfb["directVisible"] = 1;
+        rfb["RX"] = getSetting("rfbRX", RFB_RX_PIN).toInt();
+        rfb["TX"] = getSetting("rfbTX", RFB_TX_PIN).toInt();
     #endif
 }
 

code/espurna/rfm69.ino

@@ -36,12 +36,13 @@ unsigned long _rfm69_packet_count;
 #if WEB_SUPPORT
 
 void _rfm69WebSocketOnConnected(JsonObject& root) {
+    JsonObject& rfm69 = root.createNestedObject("rfm69");
 
-    root["rfm69Visible"] = 1;
-    root["rfm69Topic"] = getSetting("rfm69Topic", RFM69_DEFAULT_TOPIC);
-    root["packetCount"] = _rfm69_packet_count;
-    root["nodeCount"] = _rfm69_node_count;
-    JsonArray& mappings = root.createNestedArray("mapping");
+    rfm69["visible"] = 1;
+    rfm69["topic"] = getSetting("rfm69Topic", RFM69_DEFAULT_TOPIC);
+    rfm69["packetCount"] = _rfm69_packet_count;
+    rfm69["nodeCount"] = _rfm69_node_count;
+    JsonArray& mappings = rfm69.createNestedArray("mapping");
     for (unsigned char i=0; i<RFM69_MAX_TOPICS; i++) {
         unsigned char node = getSetting("node", i, 0).toInt();
         if (0 == node) break;

code/espurna/scheduler.ino

@@ -25,41 +25,30 @@ void _schWebSocketOnVisible(JsonObject& root) {
 }
 
 void _schWebSocketOnConnected(JsonObject &root){
-
     if (!relayCount()) return;
 
+    JsonArray& schedules = root.createNestedArray("schedules");
+
     root["maxSchedules"] = SCHEDULER_MAX_SCHEDULES;
 
-    JsonObject &schedules = root.createNestedObject("schedules");
     uint8_t size = 0;
 
-    JsonArray& enabled = schedules.createNestedArray("schEnabled");
-    JsonArray& switch_ = schedules.createNestedArray("schSwitch");
-    JsonArray& action = schedules.createNestedArray("schAction");
-    JsonArray& type = schedules.createNestedArray("schType");
-    JsonArray& hour = schedules.createNestedArray("schHour");
-    JsonArray& minute = schedules.createNestedArray("schMinute");
-    JsonArray& utc = schedules.createNestedArray("schUTC");
-    JsonArray& weekdays = schedules.createNestedArray("schWDs");
 
     for (byte i = 0; i < SCHEDULER_MAX_SCHEDULES; i++) {
         if (!hasSetting("schSwitch", i)) break;
         ++size;
-
-        enabled.add<uint8_t>(getSetting("schEnabled", i, 1).toInt() == 1);
-        utc.add<uint8_t>(getSetting("schUTC", i, 0).toInt() == 1);
-
-        switch_.add(getSetting("schSwitch", i, 0).toInt());
-        action.add(getSetting("schAction", i, 0).toInt());
-        type.add(getSetting("schType", i, 0).toInt());
-        hour.add(getSetting("schHour", i, 0).toInt());
-        minute.add(getSetting("schMinute", i, 0).toInt());
-        weekdays.add(getSetting("schWDs", i, ""));
+
+        JsonObject& schedule = schedules.createNestedObject();
+
+        schedule["enabled"] = getSetting("schEnabled", i, 1).toInt() == 1;
+        schedule["UTC"] = getSetting("schUTC", i, 0).toInt() == 1;
+        schedule["switch"] = getSetting("schSwitch", i, 0).toInt();
+        schedule["action"] = getSetting("schAction", i, 0).toInt();
+        schedule["type"] = getSetting("schType", i, 0).toInt();
+        schedule["hour"] = getSetting("schHour", i, 0).toInt();
+        schedule["minute"] = getSetting("schMinute", i, 0).toInt();
+        schedule["weekdays"] = getSetting("schWDs", i, "");
     }
-
-    schedules["size"] = size;
-    schedules["start"] = 0;
-
 }
 
 #endif // WEB_SUPPORT