Compare commits
7 Commits
fix/wifi-m
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 614594a035 | |||
| dd881f79f3 | |||
| 980a42f98b | |||
| 69a2e04cd2 | |||
| 2506e3ce3e | |||
| 669ef89a66 | |||
| 0905aa4bf8 |
@ -17,6 +17,7 @@ MQTTBridge::MQTTBridge(INetworkManager* network, mesh::PacketManager* mgr, mesh:
|
|||||||
_last_status_publish(0),
|
_last_status_publish(0),
|
||||||
_last_stats_publish(0),
|
_last_stats_publish(0),
|
||||||
_connected_since(0),
|
_connected_since(0),
|
||||||
|
_current_backoff_ms(BACKOFF_MIN_MS),
|
||||||
_messages_sent(0),
|
_messages_sent(0),
|
||||||
_messages_received(0),
|
_messages_received(0),
|
||||||
_reconnect_count(0),
|
_reconnect_count(0),
|
||||||
@ -45,10 +46,11 @@ void MQTTBridge::begin(const MQTTConfig& config, const uint8_t* self_pubkey) {
|
|||||||
if (_config.use_tls) {
|
if (_config.use_tls) {
|
||||||
_wifi_client_secure.setInsecure(); // Skip cert verification
|
_wifi_client_secure.setInsecure(); // Skip cert verification
|
||||||
_mqtt_client.setClient(_wifi_client_secure);
|
_mqtt_client.setClient(_wifi_client_secure);
|
||||||
Serial.printf("[MQTT] TLS enabled\n");
|
Serial.println("[MQTT] TLS enabled");
|
||||||
|
Serial.println("[MQTT] WARNING: Certificate verification DISABLED - vulnerable to MITM attacks!");
|
||||||
} else {
|
} else {
|
||||||
_mqtt_client.setClient(_wifi_client);
|
_mqtt_client.setClient(_wifi_client);
|
||||||
Serial.printf("[MQTT] Plain TCP\n");
|
Serial.println("[MQTT] Plain TCP (no encryption)");
|
||||||
}
|
}
|
||||||
|
|
||||||
_mqtt_client.setServer(_config.broker, _config.port);
|
_mqtt_client.setServer(_config.broker, _config.port);
|
||||||
@ -73,14 +75,15 @@ void MQTTBridge::loop() {
|
|||||||
if (!_network->isConnected()) {
|
if (!_network->isConnected()) {
|
||||||
if (_state == MQTTState::CONNECTED) {
|
if (_state == MQTTState::CONNECTED) {
|
||||||
_state = MQTTState::DISCONNECTED;
|
_state = MQTTState::DISCONNECTED;
|
||||||
Serial.println("[MQTTS] WiFi lost, disconnected");
|
Serial.println("[MQTT] Network connection lost, disconnecting");
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (_state) {
|
switch (_state) {
|
||||||
case MQTTState::DISCONNECTED:
|
case MQTTState::DISCONNECTED:
|
||||||
if (millis() - _last_connect_attempt > 5000) {
|
// Use exponential backoff for reconnection attempts
|
||||||
|
if (millis() - _last_connect_attempt > _current_backoff_ms) {
|
||||||
attemptConnection();
|
attemptConnection();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -91,8 +94,9 @@ void MQTTBridge::loop() {
|
|||||||
case MQTTState::CONNECTED:
|
case MQTTState::CONNECTED:
|
||||||
if (!_mqtt_client.connected()) {
|
if (!_mqtt_client.connected()) {
|
||||||
_state = MQTTState::DISCONNECTED;
|
_state = MQTTState::DISCONNECTED;
|
||||||
Serial.println("[MQTTS] Connection lost");
|
Serial.println("[MQTT] Connection lost");
|
||||||
_last_connect_attempt = millis();
|
_last_connect_attempt = millis();
|
||||||
|
// Don't reset backoff on connection loss - broker might be down
|
||||||
} else {
|
} else {
|
||||||
_mqtt_client.loop();
|
_mqtt_client.loop();
|
||||||
|
|
||||||
@ -104,7 +108,8 @@ void MQTTBridge::loop() {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case MQTTState::ERROR:
|
case MQTTState::ERROR:
|
||||||
if (millis() - _last_connect_attempt > 30000) {
|
// Use backoff for error recovery too
|
||||||
|
if (millis() - _last_connect_attempt > _current_backoff_ms) {
|
||||||
_state = MQTTState::DISCONNECTED;
|
_state = MQTTState::DISCONNECTED;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -125,7 +130,7 @@ void MQTTBridge::end() {
|
|||||||
|
|
||||||
_state = MQTTState::DISCONNECTED;
|
_state = MQTTState::DISCONNECTED;
|
||||||
_initialized = false;
|
_initialized = false;
|
||||||
Serial.println("[MQTTS] Stopped");
|
Serial.println("[MQTT] Stopped");
|
||||||
}
|
}
|
||||||
|
|
||||||
void MQTTBridge::attemptConnection() {
|
void MQTTBridge::attemptConnection() {
|
||||||
@ -134,7 +139,8 @@ void MQTTBridge::attemptConnection() {
|
|||||||
_state = MQTTState::CONNECTING;
|
_state = MQTTState::CONNECTING;
|
||||||
_last_connect_attempt = millis();
|
_last_connect_attempt = millis();
|
||||||
|
|
||||||
Serial.printf("[MQTTS] Connecting to %s:%d...\n", _config.broker, _config.port);
|
Serial.printf("[MQTT] Connecting to %s:%d (backoff=%lums)...\n",
|
||||||
|
_config.broker, _config.port, _current_backoff_ms);
|
||||||
|
|
||||||
String client_id = String(_config.client_id);
|
String client_id = String(_config.client_id);
|
||||||
if (client_id.length() == 0) {
|
if (client_id.length() == 0) {
|
||||||
@ -157,15 +163,41 @@ void MQTTBridge::attemptConnection() {
|
|||||||
_state = MQTTState::CONNECTED;
|
_state = MQTTState::CONNECTED;
|
||||||
_connected_since = millis();
|
_connected_since = millis();
|
||||||
_reconnect_count++;
|
_reconnect_count++;
|
||||||
Serial.println("[MQTTS] Connected!");
|
// Reset backoff on successful connection
|
||||||
|
_current_backoff_ms = BACKOFF_MIN_MS;
|
||||||
|
Serial.println("[MQTT] Connected!");
|
||||||
|
|
||||||
subscribeToCommands();
|
subscribeToCommands();
|
||||||
publishStatus();
|
publishStatus();
|
||||||
_last_status_publish = millis();
|
_last_status_publish = millis();
|
||||||
} else {
|
} else {
|
||||||
int rc = _mqtt_client.state();
|
int rc = _mqtt_client.state();
|
||||||
Serial.printf("[MQTTS] Connection failed, rc=%d\n", rc);
|
const char* error_str = getMQTTErrorString(rc);
|
||||||
|
Serial.printf("[MQTT] Connection failed: %s (code %d)\n", error_str, rc);
|
||||||
|
Serial.printf("[MQTT] Broker: %s:%d, User: %s\n", _config.broker, _config.port,
|
||||||
|
strlen(_config.user) > 0 ? _config.user : "(none)");
|
||||||
_state = MQTTState::ERROR;
|
_state = MQTTState::ERROR;
|
||||||
|
|
||||||
|
// Exponential backoff: double the delay (up to max)
|
||||||
|
_current_backoff_ms = min(_current_backoff_ms * BACKOFF_MULTIPLIER, BACKOFF_MAX_MS);
|
||||||
|
Serial.printf("[MQTTS] Next retry in %lums\n", _current_backoff_ms);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const char* MQTTBridge::getMQTTErrorString(int rc) {
|
||||||
|
// PubSubClient state() return codes
|
||||||
|
switch (rc) {
|
||||||
|
case -4: return "Connection timeout";
|
||||||
|
case -3: return "Connection lost";
|
||||||
|
case -2: return "Connect failed (network)";
|
||||||
|
case -1: return "Disconnected cleanly";
|
||||||
|
case 0: return "Connected";
|
||||||
|
case 1: return "Bad protocol version";
|
||||||
|
case 2: return "Client ID rejected";
|
||||||
|
case 3: return "Server unavailable";
|
||||||
|
case 4: return "Bad credentials (check username/password)";
|
||||||
|
case 5: return "Not authorized";
|
||||||
|
default: return "Unknown error";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -188,7 +220,7 @@ void MQTTBridge::subscribeToCommands() {
|
|||||||
char topic[100];
|
char topic[100];
|
||||||
snprintf(topic, sizeof(topic), "%s#", _topic_cmd_prefix);
|
snprintf(topic, sizeof(topic), "%s#", _topic_cmd_prefix);
|
||||||
_mqtt_client.subscribe(topic);
|
_mqtt_client.subscribe(topic);
|
||||||
Serial.printf("[MQTTS] Subscribed to: %s\n", topic);
|
Serial.printf("[MQTT] Subscribed to: %s\n", topic);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MQTTBridge::updateConfig(const MQTTConfig& config) {
|
void MQTTBridge::updateConfig(const MQTTConfig& config) {
|
||||||
@ -333,7 +365,7 @@ void MQTTBridge::publishMessage(const char* topic, const char* payload, bool ret
|
|||||||
if (_mqtt_client.publish(topic, payload, retained)) {
|
if (_mqtt_client.publish(topic, payload, retained)) {
|
||||||
_messages_sent++;
|
_messages_sent++;
|
||||||
} else {
|
} else {
|
||||||
Serial.printf("[MQTTS] Publish failed to %s\n", topic);
|
Serial.printf("[MQTT] Publish failed to %s\n", topic);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -380,10 +412,10 @@ void MQTTBridge::handleMessage(char* topic, uint8_t* payload, unsigned int lengt
|
|||||||
|
|
||||||
if (strncmp(topic, _topic_cmd_prefix, strlen(_topic_cmd_prefix)) == 0) {
|
if (strncmp(topic, _topic_cmd_prefix, strlen(_topic_cmd_prefix)) == 0) {
|
||||||
const char* cmd = topic + strlen(_topic_cmd_prefix);
|
const char* cmd = topic + strlen(_topic_cmd_prefix);
|
||||||
Serial.printf("[MQTTS] Command received: %s\n", cmd);
|
Serial.printf("[MQTT] Command received: %s\n", cmd);
|
||||||
|
|
||||||
if (strcmp(cmd, "reboot") == 0) {
|
if (strcmp(cmd, "reboot") == 0) {
|
||||||
Serial.println("[MQTTS] Reboot requested");
|
Serial.println("[MQTT] Reboot requested");
|
||||||
publishStatus();
|
publishStatus();
|
||||||
delay(100);
|
delay(100);
|
||||||
ESP.restart();
|
ESP.restart();
|
||||||
|
|||||||
@ -85,6 +85,12 @@ private:
|
|||||||
unsigned long _last_stats_publish;
|
unsigned long _last_stats_publish;
|
||||||
unsigned long _connected_since;
|
unsigned long _connected_since;
|
||||||
|
|
||||||
|
// Exponential backoff for reconnection
|
||||||
|
static constexpr uint32_t BACKOFF_MIN_MS = 1000; // Start at 1 second
|
||||||
|
static constexpr uint32_t BACKOFF_MAX_MS = 60000; // Max 60 seconds
|
||||||
|
static constexpr uint32_t BACKOFF_MULTIPLIER = 2; // Double each attempt
|
||||||
|
uint32_t _current_backoff_ms;
|
||||||
|
|
||||||
uint32_t _messages_sent;
|
uint32_t _messages_sent;
|
||||||
uint32_t _messages_received;
|
uint32_t _messages_received;
|
||||||
uint32_t _reconnect_count;
|
uint32_t _reconnect_count;
|
||||||
@ -111,6 +117,9 @@ private:
|
|||||||
void publishMessage(const char* topic, const char* payload, bool retained = false);
|
void publishMessage(const char* topic, const char* payload, bool retained = false);
|
||||||
void publishJson(const char* topic, JsonDocument& doc, bool retained = false);
|
void publishJson(const char* topic, JsonDocument& doc, bool retained = false);
|
||||||
|
|
||||||
|
// Error code translation for better diagnostics
|
||||||
|
static const char* getMQTTErrorString(int rc);
|
||||||
|
|
||||||
static uint32_t fnv1a_hash(const uint8_t* data, size_t len);
|
static uint32_t fnv1a_hash(const uint8_t* data, size_t len);
|
||||||
bool isDuplicate(const uint8_t* data, size_t len);
|
bool isDuplicate(const uint8_t* data, size_t len);
|
||||||
|
|
||||||
|
|||||||
@ -733,6 +733,21 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
|
|||||||
_prefs.adc_multiplier = 0.0f; // 0.0f means use default board multiplier
|
_prefs.adc_multiplier = 0.0f; // 0.0f means use default board multiplier
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MyMesh::~MyMesh() {
|
||||||
|
// Clean up dynamically allocated resources
|
||||||
|
#ifdef WITH_MQTT
|
||||||
|
delete _web_config;
|
||||||
|
_web_config = nullptr;
|
||||||
|
delete _mqtt_bridge;
|
||||||
|
_mqtt_bridge = nullptr;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef WITH_ETHERNET
|
||||||
|
delete _mqtt_bridge;
|
||||||
|
_mqtt_bridge = nullptr;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
void MyMesh::begin(FILESYSTEM *fs) {
|
void MyMesh::begin(FILESYSTEM *fs) {
|
||||||
mesh::Mesh::begin();
|
mesh::Mesh::begin();
|
||||||
_fs = fs;
|
_fs = fs;
|
||||||
|
|||||||
11
src/MyMesh.h
11
src/MyMesh.h
@ -125,21 +125,21 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
|
|||||||
|
|
||||||
#ifdef WITH_MQTT
|
#ifdef WITH_MQTT
|
||||||
WiFiManager _wifi_mgr;
|
WiFiManager _wifi_mgr;
|
||||||
MQTTBridge* _mqtt_bridge;
|
MQTTBridge* _mqtt_bridge = nullptr;
|
||||||
WebConfig* _web_config;
|
WebConfig* _web_config = nullptr;
|
||||||
WiFiConfig _wifi_config;
|
WiFiConfig _wifi_config;
|
||||||
MQTTConfig _mqtt_config;
|
MQTTConfig _mqtt_config;
|
||||||
unsigned long _last_mqtt_stats;
|
unsigned long _last_mqtt_stats = 0;
|
||||||
|
|
||||||
void initMQTT();
|
void initMQTT();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WITH_ETHERNET
|
#ifdef WITH_ETHERNET
|
||||||
EthernetManager _eth_mgr;
|
EthernetManager _eth_mgr;
|
||||||
MQTTBridge* _mqtt_bridge;
|
MQTTBridge* _mqtt_bridge = nullptr;
|
||||||
MQTTConfig _mqtt_config;
|
MQTTConfig _mqtt_config;
|
||||||
EthernetConfig _eth_config;
|
EthernetConfig _eth_config;
|
||||||
unsigned long _last_mqtt_stats;
|
unsigned long _last_mqtt_stats = 0;
|
||||||
|
|
||||||
void initEthernet();
|
void initEthernet();
|
||||||
#endif
|
#endif
|
||||||
@ -196,6 +196,7 @@ protected:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
MyMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc, mesh::MeshTables& tables);
|
MyMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc, mesh::MeshTables& tables);
|
||||||
|
~MyMesh(); // Clean up dynamically allocated resources
|
||||||
|
|
||||||
void begin(FILESYSTEM* fs);
|
void begin(FILESYSTEM* fs);
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user