ESP-MQTT

2024-08-29 23:27:56 +02:00
parent 52bd4f74c1
commit 25076e6e7e
102 changed files with 262 additions and 11599 deletions
--- a/src/networkDevices/EthernetDevice.cpp
+++ b/src/networkDevices/EthernetDevice.cpp
@@ -1,10 +1,6 @@
 #include "EthernetDevice.h"
 #include "../PreferencesKeys.h"
 #include "../Logger.h"
-#ifndef NUKI_HUB_UPDATER
-#include "../MqttTopics.h"
-#include "espMqttClient.h"
-#endif
 #include "../RestartReason.h"

 EthernetDevice::EthernetDevice(const String& hostname, Preferences* preferences, const IPConfiguration* ipConfiguration, const std::string& deviceName, uint8_t phy_addr, int power, int mdc, int mdio, eth_phy_type_t ethtype, eth_clock_mode_t clock_mode)
@@ -50,54 +46,6 @@ EthernetDevice::EthernetDevice(const String &hostname,
    init();
 }

-void EthernetDevice::init()
-{
-#ifndef NUKI_HUB_UPDATER
-    size_t caLength = _preferences->getString(preference_mqtt_ca, _ca, TLS_CA_MAX_SIZE);
-    size_t crtLength = _preferences->getString(preference_mqtt_crt, _cert, TLS_CERT_MAX_SIZE);
-    size_t keyLength = _preferences->getString(preference_mqtt_key, _key, TLS_KEY_MAX_SIZE);
-
-    _useEncryption = caLength > 1;  // length is 1 when empty
-
-    if(_useEncryption)
-    {
-        Log->println(F("MQTT over TLS."));
-        Log->println(_ca);
-        _mqttClientSecure = new espMqttClientSecure(espMqttClientTypes::UseInternalTask::NO);
-        _mqttClientSecure->setCACert(_ca);
-        if(crtLength > 1 && keyLength > 1) // length is 1 when empty
-        {
-            Log->println(F("MQTT with client certificate."));
-            Log->println(_cert);
-            Log->println(_key);
-            _mqttClientSecure->setCertificate(_cert);
-            _mqttClientSecure->setPrivateKey(_key);
-        }
-    } else
-    {
-        Log->println(F("MQTT without TLS."));
-        _mqttClient = new espMqttClient(espMqttClientTypes::UseInternalTask::NO);
-    }
-
-    if(_preferences->getBool(preference_mqtt_log_enabled, false) || _preferences->getBool(preference_webserial_enabled, false))
-    {
-        MqttLoggerMode mode;
-
-        if(_preferences->getBool(preference_mqtt_log_enabled, false) && _preferences->getBool(preference_webserial_enabled, false)) mode = MqttLoggerMode::MqttAndSerialAndWeb;
-        else if (_preferences->getBool(preference_webserial_enabled, false)) mode = MqttLoggerMode::SerialAndWeb;
-        else mode = MqttLoggerMode::MqttAndSerial;
-
-        _path = new char[200];
-        memset(_path, 0, sizeof(_path));
-
-        String pathStr = _preferences->getString(preference_mqtt_lock_path);
-        pathStr.concat(mqtt_topic_log);
-        strcpy(_path, pathStr.c_str());
-        Log = new MqttLogger(*getMqttClient(), _path, mode);
-    }
-#endif
-}
-
 const String EthernetDevice::deviceName() const
 {
    return _deviceName.c_str();
@@ -149,8 +97,6 @@ void EthernetDevice::initialize()

 void EthernetDevice::update()
 {
-    NetworkDevice::update();
-
    if(_checkIpTs != -1)
    {
        if(_ipConfiguration->ipAddress() != ETH.localIP())
@@ -221,19 +167,12 @@ void EthernetDevice::onNetworkEvent(arduino_event_id_t event, arduino_event_info
    }
 }

-
-
 void EthernetDevice::reconfigure()
 {
    delay(200);
    restartEsp(RestartReason::ReconfigureETH);
 }

-bool EthernetDevice::supportsEncryption()
-{
-    return true;
-}
-
 bool EthernetDevice::isConnected()
 {
    return _connected;
--- a/src/networkDevices/EthernetDevice.h
+++ b/src/networkDevices/EthernetDevice.h
@@ -11,9 +11,6 @@
 #include <NetworkClientSecure.h>
 #include <Preferences.h>
 #include "NetworkDevice.h"
-#ifndef NUKI_HUB_UPDATER
-#include "espMqttClient.h"
-#endif

 class EthernetDevice : public NetworkDevice
 {
@@ -50,7 +47,6 @@ public:
    virtual void update();

    virtual ReconnectStatus reconnect(bool force = false);
-    bool supportsEncryption() override;

    virtual bool isConnected();

@@ -62,12 +58,10 @@ public:
 private:
    Preferences* _preferences;
    
-    void init();
    void onDisconnected();
    void onNetworkEvent(arduino_event_id_t event, arduino_event_info_t info);

    bool _connected = false;
-    char* _path;
    bool _hardwareInitialized = false;

    const std::string _deviceName;
@@ -91,10 +85,4 @@ private:
    eth_phy_type_t _type;
    eth_clock_mode_t _clock_mode;
    bool _useSpi = false;
-
-    #ifndef NUKI_HUB_UPDATER
-    char _ca[TLS_CA_MAX_SIZE] = {0};
-    char _cert[TLS_CERT_MAX_SIZE] = {0};
-    char _key[TLS_KEY_MAX_SIZE] = {0};
-    #endif
 };
--- a/src/networkDevices/NetworkDevice.cpp
+++ b/src/networkDevices/NetworkDevice.cpp
@@ -1,179 +1,6 @@
 #include <Arduino.h>
 #include "NetworkDevice.h"
-#include "../Logger.h"

-void NetworkDevice::printError()
-{
-    Log->print(F("Free Heap: "));
-    Log->println(ESP.getFreeHeap());
-}
-
-#ifndef NUKI_HUB_UPDATER
 void NetworkDevice::update()
 {
-    if (_mqttEnabled)
-    {
-        getMqttClient()->loop();
-    }
-}
-
-void NetworkDevice::mqttSetClientId(const char *clientId)
-{
-    if (_useEncryption)
-    {
-        _mqttClientSecure->setClientId(clientId);
-    }
-    else
-    {
-        _mqttClient->setClientId(clientId);
-    }
-}
-
-void NetworkDevice::mqttSetCleanSession(bool cleanSession)
-{
-    if (_useEncryption)
-    {
-        _mqttClientSecure->setCleanSession(cleanSession);
-    }
-    else
-    {
-        _mqttClient->setCleanSession(cleanSession);
-    }
-}
-
-void NetworkDevice::mqttSetKeepAlive(uint16_t keepAlive)
-{
-    if (_useEncryption)
-    {
-        _mqttClientSecure->setKeepAlive(keepAlive);
-    }
-    else
-    {
-        _mqttClient->setKeepAlive(keepAlive);
-    }
-}
-
-uint16_t NetworkDevice::mqttPublish(const char *topic, uint8_t qos, bool retain, const char *payload)
-{
-    return getMqttClient()->publish(topic, qos, retain, payload);
-}
-
-uint16_t NetworkDevice::mqttPublish(const char *topic, uint8_t qos, bool retain, const uint8_t *payload, size_t length)
-{
-    return getMqttClient()->publish(topic, qos, retain, payload, length);
-}
-
-bool NetworkDevice::mqttConnected() const
-{
-    return getMqttClient()->connected();
-}
-
-void NetworkDevice::mqttSetServer(const char *host, uint16_t port)
-{
-    if (_useEncryption)
-    {
-        _mqttClientSecure->setServer(host, port);
-    }
-    else
-    {
-        _mqttClient->setServer(host, port);
-    }
-}
-
-bool NetworkDevice::mqttConnect()
-{
-    return getMqttClient()->connect();
-}
-
-bool NetworkDevice::mqttDisconnect(bool force)
-{
-    return getMqttClient()->disconnect(force);
-}
-
-void NetworkDevice::setWill(const char *topic, uint8_t qos, bool retain, const char *payload)
-{
-    if (_useEncryption)
-    {
-        _mqttClientSecure->setWill(topic, qos, retain, payload);
-    }
-    else
-    {
-        _mqttClient->setWill(topic, qos, retain, payload);
-    }
-}
-
-void NetworkDevice::mqttSetCredentials(const char *username, const char *password)
-{
-    if (_useEncryption)
-    {
-        _mqttClientSecure->setCredentials(username, password);
-    }
-    else
-    {
-        _mqttClient->setCredentials(username, password);
-    }
-}
-
-void NetworkDevice::mqttOnMessage(espMqttClientTypes::OnMessageCallback callback)
-{
-    if (_useEncryption)
-    {
-        _mqttClientSecure->onMessage(callback);
-    }
-    else
-    {
-        _mqttClient->onMessage(callback);
-    }
-}
-
-void NetworkDevice::mqttOnConnect(espMqttClientTypes::OnConnectCallback callback)
-{
-    if(_useEncryption)
-    {
-        _mqttClientSecure->onConnect(callback);
-    }
-    else
-    {
-        _mqttClient->onConnect(callback);
-    }
-}
-
-void NetworkDevice::mqttOnDisconnect(espMqttClientTypes::OnDisconnectCallback callback)
-{
-    if (_useEncryption)
-    {
-        _mqttClientSecure->onDisconnect(callback);
-    }
-    else
-    {
-        _mqttClient->onDisconnect(callback);
-    }
-}
-
-uint16_t NetworkDevice::mqttSubscribe(const char *topic, uint8_t qos)
-{
-    return getMqttClient()->subscribe(topic, qos);
-}
-
-void NetworkDevice::disableMqtt()
-{
-    getMqttClient()->disconnect();
-    _mqttEnabled = false;
-}
-
-MqttClient *NetworkDevice::getMqttClient() const
-{
-    if (_useEncryption)
-    {
-        return _mqttClientSecure;
-    }
-    else
-    {
-        return _mqttClient;
-    }
-}
-#else
-void NetworkDevice::update()
-{
-}
-#endif
+}
--- a/src/networkDevices/NetworkDevice.h
+++ b/src/networkDevices/NetworkDevice.h
@@ -1,9 +1,4 @@
 #pragma once
-
-#ifndef NUKI_HUB_UPDATER
-#include "espMqttClient.h"
-#include "MqttClientSetup.h"
-#endif
 #include "IPConfiguration.h"

 enum class ReconnectStatus
@@ -26,9 +21,6 @@ public:
    virtual void initialize() = 0;
    virtual ReconnectStatus reconnect(bool force = false) = 0;
    virtual void reconfigure() = 0;
-    virtual void printError();
-    virtual bool supportsEncryption() = 0;
-
    virtual void update();

    virtual bool isConnected() = 0;
@@ -36,38 +28,7 @@ public:

    virtual String localIP() = 0;
    virtual String BSSIDstr() = 0;
-
-    #ifndef NUKI_HUB_UPDATER
-    virtual void mqttSetClientId(const char* clientId);
-    virtual void mqttSetCleanSession(bool cleanSession);
-    virtual void mqttSetKeepAlive(uint16_t keepAlive);
-    virtual uint16_t mqttPublish(const char* topic, uint8_t qos, bool retain, const char* payload);
-    virtual uint16_t mqttPublish(const char* topic, uint8_t qos, bool retain, const uint8_t* payload, size_t length);
-    virtual bool mqttConnected() const;
-    virtual void mqttSetServer(const char* host, uint16_t port);
-    virtual bool mqttConnect();
-    virtual bool mqttDisconnect(bool force);
-    virtual void setWill(const char* topic, uint8_t qos, bool retain, const char* payload);
-    virtual void mqttSetCredentials(const char* username, const char* password);
-    virtual void mqttOnMessage(espMqttClientTypes::OnMessageCallback callback);
-    virtual void mqttOnConnect(espMqttClientTypes::OnConnectCallback callback);
-    virtual void mqttOnDisconnect(espMqttClientTypes::OnDisconnectCallback callback);
-    virtual void disableMqtt();
-
-    virtual uint16_t mqttSubscribe(const char* topic, uint8_t qos);
-    #endif
-
-protected:
-    #ifndef NUKI_HUB_UPDATER
-    espMqttClient *_mqttClient = nullptr;
-    espMqttClientSecure *_mqttClientSecure = nullptr;
-
-    bool _useEncryption = false;
-    bool _mqttEnabled = true;
-    
-    MqttClient *getMqttClient() const;
-    #endif
-    
+protected:    
    const String _hostname;
    const IPConfiguration* _ipConfiguration = nullptr;
 };
--- a/src/networkDevices/WifiDevice.cpp
+++ b/src/networkDevices/WifiDevice.cpp
@@ -2,10 +2,6 @@
 #include "WifiDevice.h"
 #include "../PreferencesKeys.h"
 #include "../Logger.h"
-#ifndef NUKI_HUB_UPDATER
-#include "../MqttTopics.h"
-#include "espMqttClient.h"
-#endif
 #include "../RestartReason.h"

 RTC_NOINIT_ATTR char WiFiDevice_reconfdetect[17];
@@ -16,51 +12,6 @@ WifiDevice::WifiDevice(const String& hostname, Preferences* preferences, const I
  _wm(preferences->getString(preference_cred_user, "").c_str(), preferences->getString(preference_cred_password, "").c_str())
 {
    _startAp = strcmp(WiFiDevice_reconfdetect, "reconfigure_wifi") == 0;
-
-    #ifndef NUKI_HUB_UPDATER
-    size_t caLength = preferences->getString(preference_mqtt_ca, _ca, TLS_CA_MAX_SIZE);
-    size_t crtLength = preferences->getString(preference_mqtt_crt, _cert, TLS_CERT_MAX_SIZE);
-    size_t keyLength = preferences->getString(preference_mqtt_key, _key, TLS_KEY_MAX_SIZE);
-
-    _useEncryption = caLength > 1;  // length is 1 when empty
-
-    if(_useEncryption)
-    {
-        Log->println(F("MQTT over TLS."));
-        Log->println(_ca);
-        _mqttClientSecure = new espMqttClientSecure(espMqttClientTypes::UseInternalTask::NO);
-        _mqttClientSecure->setCACert(_ca);
-        if(crtLength > 1 && keyLength > 1) // length is 1 when empty
-        {
-            Log->println(F("MQTT with client certificate."));
-            Log->println(_cert);
-            Log->println(_key);
-            _mqttClientSecure->setCertificate(_cert);
-            _mqttClientSecure->setPrivateKey(_key);
-        }
-    } else
-    {
-        Log->println(F("MQTT without TLS."));
-        _mqttClient = new espMqttClient(espMqttClientTypes::UseInternalTask::NO);
-    }
-
-    if(preferences->getBool(preference_mqtt_log_enabled, false) || preferences->getBool(preference_webserial_enabled, false))
-    {
-        MqttLoggerMode mode;
-
-        if(preferences->getBool(preference_mqtt_log_enabled, false) && preferences->getBool(preference_webserial_enabled, false)) mode = MqttLoggerMode::MqttAndSerialAndWeb;
-        else if (preferences->getBool(preference_webserial_enabled, false)) mode = MqttLoggerMode::SerialAndWeb;
-        else mode = MqttLoggerMode::MqttAndSerial;
-
-        _path = new char[200];
-        memset(_path, 0, sizeof(_path));
-
-        String pathStr = preferences->getString(preference_mqtt_lock_path);
-        pathStr.concat(mqtt_topic_log);
-        strcpy(_path, pathStr.c_str());
-        Log = new MqttLogger(*getMqttClient(), _path, mode);
-    }
-    #endif
 }

 const String WifiDevice::deviceName() const
@@ -145,11 +96,6 @@ void WifiDevice::reconfigure()
    restartEsp(RestartReason::ReconfigureWifi);
 }

-bool WifiDevice::supportsEncryption()
-{
-    return true;
-}
-
 bool WifiDevice::isConnected()
 {
    return WiFi.isConnected();
@@ -212,4 +158,4 @@ String WifiDevice::BSSIDstr()
 void WifiDevice::clearRtcInitVar(WiFiManager *)
 {
    memset(WiFiDevice_reconfdetect, 0, sizeof WiFiDevice_reconfdetect);
-}
+}
--- a/src/networkDevices/WifiDevice.h
+++ b/src/networkDevices/WifiDevice.h
@@ -5,9 +5,6 @@
 #include <Preferences.h>
 #include "NetworkDevice.h"
 #include "WiFiManager.h"
-#ifndef NUKI_HUB_UPDATER
-#include "espMqttClient.h"
-#endif
 #include "IPConfiguration.h"

 class WifiDevice : public NetworkDevice
@@ -20,7 +17,6 @@ public:
    virtual void initialize();
    virtual void reconfigure();
    virtual ReconnectStatus reconnect(bool force = false);
-    bool supportsEncryption() override;

    virtual bool isConnected();

@@ -40,12 +36,5 @@ private:

    bool _startAp = false;
    bool _isReconnecting = false;
-    char* _path;
    int64_t _disconnectTs = 0;
-
-    #ifndef NUKI_HUB_UPDATER
-    char _ca[TLS_CA_MAX_SIZE] = {0};
-    char _cert[TLS_CERT_MAX_SIZE] = {0};
-    char _key[TLS_KEY_MAX_SIZE] = {0};
-    #endif
 };