Skip to content

Commit

Permalink
more websocket refresh improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@IgorYbema
IgorYbema committed Jan 18, 2025
1 parent ad0952f commit 09a7424
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 10 deletions.
26 changes: 26 additions & 0 deletions HeishaMon/HeishaMon.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1748,6 +1748,32 @@ void loop() {
sprintf_P(mqtt_topic, PSTR("%s/stats"), heishamonSettings.mqtt_topic_base);
mqtt_client.publish(mqtt_topic, stats.c_str(), MQTT_RETAIN_VALUES);

//websocket stats
#ifdef ESP32
String ethernetStat;
if (ETH.phyAddr() != 0) {
if (ETH.connected()) {
if (ETH.hasIP()) {
ethernetStat = F("connected - IP: ");
ethernetStat += ETH.localIP().toString();
ethernetStat += F(")");
} else {
ethernetStat = F("connected - no IP");
}
}
else {
ethernetStat = F("not connected");
}
} else {
ethernetStat = F("not installed");
}
sprintf_P(log_msg, PSTR("{\"data\": {\"stats\": {\"wifi\": %d, \"ethernet\": \"%s\", \"memory\": %d, \"correct\": %.0f,\"mqtt\": %d,\"uptime\": \"%s\"}}}"), getWifiQuality(), ethernetStat.c_str(), getFreeMemory(), readpercentage, mqttReconnects, getUptime());
#else
sprintf_P(log_msg, PSTR("{\"data\": {\"stats\": {\"wifi\": %d, \"memory\": %d, \"correct\": %.0f,\"mqtt\": %d,\"uptime\": \"%s\"}}}"), getWifiQuality(), getFreeMemory(), readpercentage, mqttReconnects, getUptime());
#endif

websocket_write_all(log_msg, strlen(log_msg));

//get new data
if (!heishamonSettings.listenonly) send_panasonic_query();

Expand Down
65 changes: 55 additions & 10 deletions HeishaMon/htmlcode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,22 @@ static const char menuJS[] PROGMEM =
static const char websocketJS[] PROGMEM =
"<script>"
" var bConnected = false;"
" var inactivityTimeout = 5000;"
" var lastActivityTime = Date.now();"
" function monitorWebSocket() {"
" setInterval(() => {"
" if (Date.now() - lastActivityTime > inactivityTimeout && oWebsocket.readyState === WebSocket.OPEN) {"
" console.log('Detected inactivity, reconnecting...');"
" oWebsocket.close();"
" }"
" }, inactivityTimeout);"
" } "
" function attemptReconnect() {"
" if (!bConnected) {"
" console.log('Attempting to reconnect... ');"
" startWebsockets();"
" }"
" }"
" function startWebsockets() {"
" if(typeof MozWebSocket != \"undefined\") {"
" oWebsocket = new MozWebSocket(\"ws://\" + location.host + \":80\");"
Expand All @@ -41,14 +57,16 @@ static const char websocketJS[] PROGMEM =
" };"
""
" oWebsocket.onclose = function(evt) {"
" console.log('onclose: ' + evt);"
" bConnected = false;"
" attemptReconnect();"
" };"
""
" oWebsocket.onerror = function(evt) {"
" console.log('onerror: ' + evt);"
" };"
""
" oWebsocket.onmessage = function(evt) {"
" lastActivityTime = Date.now();"
" if (evt.data.startsWith('{')) {"
" const jsonObject = JSON.parse(evt.data);"
" if (jsonObject.hasOwnProperty('logMsg')) {"
Expand All @@ -59,7 +77,32 @@ static const char websocketJS[] PROGMEM =
" obj.scrollTop = obj.scrollHeight;"
" }"
" } else if (jsonObject.hasOwnProperty('data')) {"
" if (jsonObject.data.hasOwnProperty('heishavalues')) {"
" if (jsonObject.data.hasOwnProperty('stats')) {"
" const elementwifi = document.getElementById(`wifi`);"
" if (elementwifi) {"
" elementwifi.textContent = jsonObject.data.stats.wifi;"
" }"
" const elementeth = document.getElementById(`ethernet`);"
" if (elementeth) {"
" elementeth.textContent = jsonObject.data.stats.ethernet;"
" }"
" const elementmemory = document.getElementById(`memory`);"
" if (elementmemory) {"
" elementmemory.textContent = jsonObject.data.stats.memory;"
" }"
" const elementcorrect = document.getElementById(`correct`);"
" if (elementcorrect) {"
" elementcorrect.textContent = jsonObject.data.stats.correct;"
" }"
" const elementmqtt = document.getElementById(`mqtt`);"
" if (elementmqtt) {"
" elementmqtt.textContent = jsonObject.data.stats.mqtt;"
" }"
" const elementuptime = document.getElementById(`uptime`);"
" if (elementuptime) {"
" elementuptime.textContent = jsonObject.data.stats.uptime;"
" }"
" } else if (jsonObject.data.hasOwnProperty('heishavalues')) {"
" const valueelement = document.getElementById(`${jsonObject.data.heishavalues.topic}-Value`);"
" if ((valueelement) && (valueelement.textContent !== jsonObject.data.heishavalues.value)) {"
" valueelement.classList.remove(\"update-effect\");"
Expand Down Expand Up @@ -135,6 +178,7 @@ static const char refreshJS[] PROGMEM =
" openTable('Heatpump');"
" document.getElementById(\"cli\").value = \"\";"
" startWebsockets();"
" monitorWebSocket();"
" refreshTable();"
" };"
" var dallasAliasEdit = function() {"
Expand Down Expand Up @@ -361,17 +405,18 @@ static const char webBodyRootConsoleTab[] PROGMEM = "<button class=\"w3-bar-item

static const char webBodyEndDiv[] PROGMEM = "</div>";

static const char webBodyRootStatusWifi[] PROGMEM = "<div class=\"w3-container w3-left\"><br>Wifi signal: ";
static const char webBodyRootStatusWifi[] PROGMEM = "<div class=\"w3-container w3-left\"><br>Wifi signal: <span id=\"wifi\">";
#ifdef ESP8266
static const char webBodyRootStatusMemory[] PROGMEM = "%<br>Memory free: ";
static const char webBodyRootStatusMemory[] PROGMEM = "</span>%<br>Memory free: <span id=\"memory\">";
#else
static const char webBodyRootStatusEthernet[] PROGMEM = "%<br>Ethernet status: ";
static const char webBodyRootStatusMemory[] PROGMEM = "<br>Memory free: ";
static const char webBodyRootStatusEthernet[] PROGMEM = "</span>%<br>Ethernet status: <span id=\"ethernet\">";
static const char webBodyRootStatusMemory[] PROGMEM = "</span><br>Memory free: <span id=\"memory\">";
#endif
static const char webBodyRootStatusReceived[] PROGMEM = "%<br>Correct received data: ";
static const char webBodyRootStatusReconnects[] PROGMEM = "%<br>MQTT reconnects: ";
static const char webBodyRootStatusUptime[] PROGMEM = "<br>Uptime: ";
static const char webBodyRootStatusListenOnly[] PROGMEM = "<br><b>Listen only mode active</b>";
static const char webBodyRootStatusReceived[] PROGMEM = "</span>%<br>Correct received data: <span id=\"correct\">";
static const char webBodyRootStatusReconnects[] PROGMEM = "</span>%<br>MQTT reconnects: <span id=\"mqtt\">";
static const char webBodyRootStatusUptime[] PROGMEM = "</span><br>Uptime: <span id=\"uptime\">";
static const char webBodyRootStatusEndSpan[] PROGMEM = "</span>";
static const char webBodyRootStatusListenOnly[] PROGMEM = "</span><br><b>Listen only mode active</b>";

static const char webBodyRootHeatpumpValues[] PROGMEM =
"<div id=\"Heatpump\" class=\"w3-container w3-center heishatable\">"
Expand Down

0 comments on commit 09a7424

Please sign in to comment.