jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tighten up mqtt commands

Browse Source
This commit is contained in:
fvanroie 2021-01-14 20:42:51 +01:00
parent 7d4e04560a
commit d206ba15a4
1 changed files with 63 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
src/svc/hasp_mqtt.cpp
View File

@ -44,14 +44,6 @@ EthernetClient mqttNetworkClient;
#include "user_config_override.h" #include "user_config_override.h"
#endif #endif
/*
String mqttGetSubtopic; // MQTT subtopic for incoming commands requesting .val
String mqttGetSubtopicJSON; // MQTT object buffer for JSON status when requesting .val
String mqttStateTopic; // MQTT topic for outgoing panel interactions
String mqttStateJSONTopic; // MQTT topic for outgoing panel interactions in JSON format
String mqttCommandTopic; // MQTT topic for incoming panel commands
*/
// String mqttClientId((char *)0); // Auto-generated MQTT ClientID // String mqttClientId((char *)0); // Auto-generated MQTT ClientID
// String mqttNodeTopic((char *)0); // String mqttNodeTopic((char *)0);
// String mqttGroupTopic((char *)0); // String mqttGroupTopic((char *)0);
@ -62,64 +54,58 @@ bool mqttHAautodiscover = true;
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// These defaults may be overwritten with values saved by the web interface // These defaults may be overwritten with values saved by the web interface
#ifdef MQTT_HOST #ifndef MQTT_HOST
char mqttServer[16] = MQTT_HOST; #define MQTT_HOST "";
#else
char mqttServer[16] = "";
#endif #endif
#ifdef MQTT_PORT
uint16_t mqttPort = MQTT_PORT; #ifndef MQTT_PORT
#else #define MQTT_PORT 1883;
uint16_t mqttPort = 1883;
#endif #endif
#ifdef MQTT_USER
char mqttUser[23] = MQTT_USER; #ifndef MQTT_USER
#else #define MQTT_USER "";
char mqttUser[23] = "";
#endif #endif
#ifdef MQTT_PASSW
char mqttPassword[32] = MQTT_PASSW; #ifndef MQTT_PASSW
#else #define MQTT_PASSW "";
char mqttPassword[32] = "";
#endif #endif
#ifdef MQTT_NODENAME #ifndef MQTT_NODENAME
char mqttNodeName[16] = MQTT_NODENAME; #define MQTT_NODENAME "";
#else
char mqttNodeName[16] = "";
#endif #endif
#ifdef MQTT_GROUPNAME #ifndef MQTT_GROUPNAME
char mqttGroupName[16] = MQTT_GROUPNAME; #define MQTT_GROUPNAME "";
#else
char mqttGroupName[16] = "";
#endif #endif
#ifndef MQTT_PREFIX #ifndef MQTT_PREFIX
#define MQTT_PREFIX "hasp" #define MQTT_PREFIX "hasp"
#endif #endif
char mqttServer[16] = MQTT_HOST;
char mqttUser[23] = MQTT_USER;
char mqttPassword[32] = MQTT_PASSW;
char mqttNodeName[16] = MQTT_NODENAME;
char mqttGroupName[16] = MQTT_GROUPNAME;
uint16_t mqttPort = MQTT_PORT;
PubSubClient mqttClient(mqttNetworkClient); PubSubClient mqttClient(mqttNetworkClient);
static void mqttResult(bool result, const char * topic, const char * payload) static bool mqttPublish(const char * topic, const char * payload, size_t len, bool retain = false)
{
if(result) {
Log.notice(TAG_MQTT_PUB, F("%s => %s"), topic, payload);
} else {
Log.error(TAG_MQTT_PUB, F("Failed : %s => %s"), topic, payload);
}
}
static bool mqttPublish(const char * topic, const char * payload, size_t len)
{ {
if(mqttIsConnected()) { if(mqttIsConnected()) {
return mqttClient.publish(topic, (uint8_t *)payload, len, false); if(mqttClient.publish(topic, (uint8_t *)payload, len, retain)) {
Log.notice(TAG_MQTT_PUB, F("%s => %s"), topic, payload);
return true;
} else {
Log.error(TAG_MQTT_PUB, F("Failed : %s => %s"), topic, payload);
}
} else {
Log.error(TAG_MQTT, F("Not connected"));
} }
Log.error(TAG_MQTT, F("Not connected"));
return false; return false;
} }
static bool mqttPublish(const char * topic, const char * payload) static bool mqttPublish(const char * topic, const char * payload, bool retain = false)
{ {
return mqttPublish(topic, payload, strlen(payload)); return mqttPublish(topic, payload, strlen(payload), retain);
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -130,12 +116,23 @@ bool IRAM_ATTR mqttIsConnected()
return mqttEnabled && mqttClient.connected(); return mqttEnabled && mqttClient.connected();
} }
void mqtt_send_lwt(bool online)
{
char tmp_payload[8];
char tmp_topic[strlen(mqttNodeTopic) + 4];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sLWT"), mqttNodeTopic);
size_t len = snprintf_P(tmp_payload, sizeof(tmp_payload), online ? PSTR("online") : PSTR("offline"));
bool res = mqttPublish(tmp_topic, tmp_payload, len, true);
// mqttResult(res, tmp_topic, tmp_payload);
}
void IRAM_ATTR mqtt_send_state_str(char * subtopic, char * payload) void IRAM_ATTR mqtt_send_state_str(char * subtopic, char * payload)
{ {
char tmp_topic[strlen(mqttNodeTopic) + 20]; char tmp_topic[strlen(mqttNodeTopic) + 20];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/%s"), mqttNodeTopic, subtopic); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/%s"), mqttNodeTopic, subtopic);
bool res = mqttPublish(tmp_topic, payload); bool res = mqttPublish(tmp_topic, payload);
mqttResult(res, tmp_topic, payload); // mqttResult(res, tmp_topic, payload);
} }
void IRAM_ATTR mqtt_send_state(const __FlashStringHelper * subtopic, const char * payload) void IRAM_ATTR mqtt_send_state(const __FlashStringHelper * subtopic, const char * payload)
@ -143,7 +140,7 @@ void IRAM_ATTR mqtt_send_state(const __FlashStringHelper * subtopic, const char
char tmp_topic[strlen(mqttNodeTopic) + 20]; char tmp_topic[strlen(mqttNodeTopic) + 20];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/%s"), mqttNodeTopic, subtopic); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/%s"), mqttNodeTopic, subtopic);
bool res = mqttPublish(tmp_topic, payload); bool res = mqttPublish(tmp_topic, payload);
mqttResult(res, tmp_topic, payload); // mqttResult(res, tmp_topic, payload);
} }
void IRAM_ATTR mqtt_send_obj_attribute_str(uint8_t pageid, uint8_t btnid, const char * attribute, const char * data) void IRAM_ATTR mqtt_send_obj_attribute_str(uint8_t pageid, uint8_t btnid, const char * attribute, const char * data)
@ -155,11 +152,11 @@ void IRAM_ATTR mqtt_send_obj_attribute_str(uint8_t pageid, uint8_t btnid, const
// snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/json"), mqttNodeTopic); // snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/json"), mqttNodeTopic);
// unsigned int len = // unsigned int len =
// snprintf_P(payload, sizeof(payload), PSTR("{\"p[%u].b[%u].%s\":\"%s\"}"), pageid, btnid, attribute, data); // snprintf_P(payload, sizeof(payload), PSTR("{\"p[%u].b[%u].%s\":\"%s\"}"), pageid, btnid, attribute, data);
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/p%ub%u"), mqttNodeTopic, pageid, btnid); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/p%u/b%u"), mqttNodeTopic, pageid, btnid);
unsigned int len = snprintf_P(payload, sizeof(payload), PSTR("{\"%s\":\"%s\"}"), attribute, data); unsigned int len = snprintf_P(payload, sizeof(payload), PSTR("{\"%s\":\"%s\"}"), attribute, data);
bool res = mqttPublish(tmp_topic, payload, len); //, false); bool res = mqttPublish(tmp_topic, payload, len); //, false);
mqttResult(res, tmp_topic, payload); // mqttResult(res, tmp_topic, payload);
// } else { // } else {
// return mqtt_log_no_connection(); // return mqtt_log_no_connection();
@ -245,7 +242,7 @@ void mqttStart()
char mqttClientId[64]; char mqttClientId[64];
char lastWillPayload[8]; char lastWillPayload[8];
static uint8_t mqttReconnectCount = 0; static uint8_t mqttReconnectCount = 0;
bool mqttFirstConnect = true; // bool mqttFirstConnect = true;
mqttClient.setServer(mqttServer, 1883); mqttClient.setServer(mqttServer, 1883);
// mqttClient.setSocketTimeout(10); //in seconds // mqttClient.setSocketTimeout(10); //in seconds
@ -265,40 +262,39 @@ void mqttStart()
haspProgressMsg(F("Connecting MQTT...")); haspProgressMsg(F("Connecting MQTT..."));
haspProgressVal(mqttReconnectCount * 5); haspProgressVal(mqttReconnectCount * 5);
if(!mqttClient.connect(mqttClientId, mqttUser, mqttPassword, buffer, 2, false, lastWillPayload, true)) { if(!mqttClient.connect(mqttClientId, mqttUser, mqttPassword, buffer, 0, true, lastWillPayload, true)) {
// Retry until we give up and restart after connectTimeout seconds // Retry until we give up and restart after connectTimeout seconds
mqttReconnectCount++; mqttReconnectCount++;
switch(mqttClient.state()) { switch(mqttClient.state()) {
case MQTT_CONNECTION_TIMEOUT: case MQTT_CONNECTION_TIMEOUT:
snprintf_P(buffer, sizeof(buffer), PSTR("Server didn't respond within the keepalive time")); snprintf_P(buffer, sizeof(buffer), PSTR("Network connection timeout"));
break; break;
case MQTT_CONNECTION_LOST: case MQTT_CONNECTION_LOST:
snprintf_P(buffer, sizeof(buffer), PSTR("Network connection was broken")); snprintf_P(buffer, sizeof(buffer), PSTR("Network connection lost"));
break; break;
case MQTT_CONNECT_FAILED: case MQTT_CONNECT_FAILED:
snprintf_P(buffer, sizeof(buffer), PSTR("Network connection failed")); snprintf_P(buffer, sizeof(buffer), PSTR("Network connection failed"));
break; break;
case MQTT_DISCONNECTED: case MQTT_DISCONNECTED:
snprintf_P(buffer, sizeof(buffer), PSTR("Client is disconnected cleanly")); snprintf_P(buffer, sizeof(buffer), PSTR("Disconnected"));
break; break;
case MQTT_CONNECTED: case MQTT_CONNECTED:
snprintf_P(buffer, sizeof(buffer), PSTR("(Client is connected"));
break; break;
case MQTT_CONNECT_BAD_PROTOCOL: case MQTT_CONNECT_BAD_PROTOCOL:
snprintf_P(buffer, sizeof(buffer), PSTR("Server doesn't support the requested version of MQTT")); snprintf_P(buffer, sizeof(buffer), PSTR("Server doesn't support the requested version of MQTT"));
break; break;
case MQTT_CONNECT_BAD_CLIENT_ID: case MQTT_CONNECT_BAD_CLIENT_ID:
snprintf_P(buffer, sizeof(buffer), PSTR("Server rejected the client identifier")); snprintf_P(buffer, sizeof(buffer), PSTR("Server rejected the client ID"));
break; break;
case MQTT_CONNECT_UNAVAILABLE: case MQTT_CONNECT_UNAVAILABLE:
snprintf_P(buffer, sizeof(buffer), PSTR("Server was unable to accept the connection")); snprintf_P(buffer, sizeof(buffer), PSTR("Server unavailable"));
break; break;
case MQTT_CONNECT_BAD_CREDENTIALS: case MQTT_CONNECT_BAD_CREDENTIALS:
snprintf_P(buffer, sizeof(buffer), PSTR("Username or Password rejected")); snprintf_P(buffer, sizeof(buffer), PSTR("Bad credentials"));
break; break;
case MQTT_CONNECT_UNAUTHORIZED: case MQTT_CONNECT_UNAUTHORIZED:
snprintf_P(buffer, sizeof(buffer), PSTR("Client was not authorized to connect")); snprintf_P(buffer, sizeof(buffer), PSTR("Unauthorized"));
break; break;
default: default:
snprintf_P(buffer, sizeof(buffer), PSTR("Unknown failure")); snprintf_P(buffer, sizeof(buffer), PSTR("Unknown failure"));
@ -314,19 +310,6 @@ void mqttStart()
Log.trace(TAG_MQTT, F("Connected to broker %s as clientID %s"), mqttServer, mqttClientId); Log.trace(TAG_MQTT, F("Connected to broker %s as clientID %s"), mqttServer, mqttClientId);
/*
// MQTT topic string definitions
mqttStateTopic = prefix + F("/state");
mqttStateJSONTopic = prefix + F("/state/json");
mqttCommandTopic = prefix + F("/page");
mqttGroupCommandTopic = "hasp/" + mqttGroupName + "/page";
mqttLightCommandTopic = prefix + F("/light/switch");
mqttLightStateTopic = prefix + F("/light/state");
mqttLightBrightCommandTopic = prefix + F("/brightness/set");
mqttLightBrightStateTopic = prefix + F("/brightness/state");
*/
// Subscribe to our incoming topics // Subscribe to our incoming topics
mqttSubscribeTo(PSTR("%scommand/#"), mqttGroupTopic); mqttSubscribeTo(PSTR("%scommand/#"), mqttGroupTopic);
mqttSubscribeTo(PSTR("%scommand/#"), mqttNodeTopic); mqttSubscribeTo(PSTR("%scommand/#"), mqttNodeTopic);
@ -334,7 +317,7 @@ void mqttStart()
mqttSubscribeTo(PSTR("%sconfig/#"), mqttNodeTopic); mqttSubscribeTo(PSTR("%sconfig/#"), mqttNodeTopic);
mqttSubscribeTo(PSTR("%slight/#"), mqttNodeTopic); mqttSubscribeTo(PSTR("%slight/#"), mqttNodeTopic);
mqttSubscribeTo(PSTR("%sbrightness/#"), mqttNodeTopic); mqttSubscribeTo(PSTR("%sbrightness/#"), mqttNodeTopic);
mqttSubscribeTo(PSTR("%sLWT"), mqttNodeTopic); // mqttSubscribeTo(PSTR("%sLWT"), mqttNodeTopic);
mqttSubscribeTo(PSTR("hass/status"), ""); mqttSubscribeTo(PSTR("hass/status"), "");
/* Home Assistant auto-configuration */ /* Home Assistant auto-configuration */
@ -343,15 +326,9 @@ void mqttStart()
// Force any subscribed clients to toggle offline/online when we first connect to // Force any subscribed clients to toggle offline/online when we first connect to
// make sure we get a full panel refresh at power on. Sending offline, // make sure we get a full panel refresh at power on. Sending offline,
// "online" will be sent by the mqttStatusTopic subscription action. // "online" will be sent by the mqttStatusTopic subscription action.
snprintf_P(buffer, sizeof(buffer), PSTR("%sLWT"), mqttNodeTopic); mqtt_send_lwt(true);
{
snprintf_P(lastWillPayload, sizeof(lastWillPayload), mqttFirstConnect ? PSTR("offline") : PSTR("online"));
mqttClient.publish(buffer, lastWillPayload, true); // mqttFirstConnect = false;
Log.notice(TAG_MQTT, F("%s = %s"), buffer, lastWillPayload);
}
mqttFirstConnect = false;
mqttReconnectCount = 0; mqttReconnectCount = 0;
haspReconnect(); haspReconnect();
@ -398,17 +375,10 @@ String mqttGetNodename()
void mqttStop() void mqttStop()
{ {
if(mqttEnabled && mqttClient.connected()) { if(mqttEnabled && mqttClient.connected()) {
char tmp_topic[strlen(mqttNodeTopic) + 8]; Log.notice(TAG_MQTT, F("Disconnecting..."));
char tmp_payload[32]; mqtt_send_lwt(false);
Log.notice(TAG_MQTT, F("Disconnecting from broker..."));
size_t len;
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sLWT"), mqttNodeTopic);
len = snprintf_P(tmp_payload, sizeof(tmp_payload), PSTR("offline"));
mqttPublish(tmp_topic, tmp_payload, len);
mqttClient.disconnect(); mqttClient.disconnect();
Log.trace(TAG_MQTT, F("Disconnected from broker")); Log.trace(TAG_MQTT, F("Disconnected"));
} }
} }