Cleanup the destruction flow

src/ksf/comp/ksDevicePortal.h

@@ -198,6 +198,11 @@ namespace ksf::comps
 			*/
 			ksDevicePortal();
 
+			/*!
+				@brief Destructs the Device Portal component.
+			*/
+			virtual ~ksDevicePortal();
+
 			/*!
 				@brief Constructs the Device Portal component with custom password.
 
@@ -225,10 +230,5 @@ namespace ksf::comps
 				@return True on success, false otherwise.
 			*/
 			bool loop(ksApplication* app) override;
-
-			/*!
-				@brief Destructs the Device Portal component.
-			*/
-			virtual ~ksDevicePortal();
 	};
 }

src/ksf/comp/ksLed.cpp

@@ -21,6 +21,11 @@ namespace ksf::comps
 		bitflags.driveAsPushPull = driveAsPushPull;
 	}
 
+	ksLed::~ksLed()
+	{
+		pinMode(pin, INPUT);
+	}
+
 	bool ksLed::init(ksApplication* owner)
 	{
 		if (!bitflags.driveAsPushPull)
@@ -85,9 +90,4 @@ namespace ksf::comps
 		else
 			digitalWrite(pin, (bitflags.activeLow ? !enabled : enabled) ? HIGH : LOW);
 	}
-
-	ksLed::~ksLed()
-	{
-		pinMode(pin, INPUT);
-	}
 }

src/ksf/comp/ksLed.h

@@ -46,6 +46,11 @@ namespace ksf::comps
 			*/
 			ksLed(uint8_t pin, bool activeLow = false, bool driveAsPushPull = false);
 
+			/*!
+				@brief Destructs the component and restores INPUT mode on the assigned pin.
+			*/
+			virtual ~ksLed();
+
 			/*!
 				@brief Initializes the LED component.
 				@param owner Pointer to parent ksApplication object.
@@ -95,10 +100,5 @@ namespace ksf::comps
 				@return Pin number assigned to LED.
 			*/
 			uint8_t getPin() const { return pin; }
-
-			/*!
-				@brief Destructs the component and restores INPUT mode on the assigned pin.
-			*/
-			virtual ~ksLed();
 	};
 }

src/ksf/comp/ksMqttConnector.cpp

@@ -39,6 +39,8 @@ namespace ksf::comps
 		bitflags.usePersistentSession = usePersistentSession;
 	}
 
+	ksMqttConnector::~ksMqttConnector() = default;
+
 	bool ksMqttConnector::init(ksApplication* app)
 	{
 		ksMqttConfigProvider cfgProvider;

src/ksf/comp/ksMqttConnector.h

@@ -120,6 +120,11 @@ namespace ksf::comps
 			*/
 			ksMqttConnector(bool sendConnectionStatus = true, bool usePersistentSession = false);
 
+			/*!
+				@brief Destructs ksMqttConnector object.
+			*/
+			virtual ~ksMqttConnector();
+
 			/*!
 				@brief Instantiates the MQTT connector component.
 

src/ksf/comp/ksWifiConfigurator.cpp

@@ -38,11 +38,6 @@ namespace ksf::comps
 		deviceName += ksf::getDeviceUuidHex();
 	}
 
-	ksWifiConfigurator::~ksWifiConfigurator()
-	{
-		WiFi.softAPdisconnect(true);
-	}
-
 	bool ksWifiConfigurator::init(ksApplication* app)
 	{
 		WiFi.softAP(deviceName.c_str());
@@ -75,4 +70,9 @@ namespace ksf::comps
 
 		return !configTimeout.triggered();
 	}
+
+	ksWifiConfigurator::~ksWifiConfigurator()
+	{
+		WiFi.softAPdisconnect(true);
+	}
 }

src/ksf/misc/ksCertUtils.cpp

@@ -7,9 +7,10 @@
  *	https://github.com/cziter15/ksIotFrameworkLib/blob/master/LICENSE
  */
 
+#include <WiFiClientSecure.h>
+
 #include "ksCertUtils.h"
 #include "../ksConstants.h"
-
 namespace ksf::misc
 {
 	/*
@@ -30,6 +31,7 @@ namespace ksf::misc
 		return 255;
 	}
 
+	ksCertFingerprint::ksCertFingerprint() = default;
 	ksCertFingerprint::~ksCertFingerprint() = default;
 
 	bool ksCertFingerprint::fingerprintToBytes(const std::string& fingerprint, uint8_t * bytes, uint8_t bytesLen) const
@@ -52,7 +54,7 @@ namespace ksf::misc
 	}
 
 #ifdef ESP32
-	bool ksCertFingerprintESP32::setup(WiFiClientSecure* clientSecure, const std::string& fingerprint)
+	bool ksCertFingerprintESP32::setup(ksCertUtilsNetCLientSecure_t* clientSecure, const std::string& fingerprint)
 	{
 		if (fingerprintToBytes(fingerprint, fingerprintBytes, sizeof(fingerprintBytes)))
 		{
@@ -64,7 +66,7 @@ namespace ksf::misc
 		return false;
 	}
 
-	bool ksCertFingerprintESP32::verify(WiFiClientSecure* client) const
+	bool ksCertFingerprintESP32::verify(ksCertUtilsNetCLientSecure_t* client) const
 	{
 		static const char characters[] {"0123456789ABCDEF"};
 
@@ -82,7 +84,7 @@ namespace ksf::misc
 #endif
 
 #ifdef ESP8266
-	bool ksCertFingerprintESP8266::setup(WiFiClientSecure* clientSecure, const std::string& fingerprint)
+	bool ksCertFingerprintESP8266::setup(ksCertUtilsNetCLientSecure_t* clientSecure, const std::string& fingerprint)
 	{
 		uint8_t fingerprintBytes[20];
 		if (fingerprintToBytes(fingerprint, fingerprintBytes, sizeof(fingerprintBytes)))
@@ -94,7 +96,7 @@ namespace ksf::misc
 		return false;
 	}
 
-	bool ksCertFingerprintESP8266::verify(WiFiClientSecure* client) const
+	bool ksCertFingerprintESP8266::verify(ksCertUtilsNetCLientSecure_t* client) const
 	{
 		return true;
 	}

src/ksf/misc/ksCertUtils.h

@@ -11,7 +11,14 @@
 
 #include <string>
 #include <stdint.h>
-#include <WiFiClientSecure.h>
+
+#if (defined(ESP32) && ESP_ARDUINO_VERSION_MAJOR >= 3)
+	#define ksCertUtilsNetCLientSecure_t NetworkClientSecure
+#else
+	#define ksCertUtilsNetCLientSecure_t WiFiClientSecure
+#endif
+
+class ksCertUtilsNetCLientSecure_t;
 
 namespace ksf::misc
 {
@@ -34,25 +41,30 @@ namespace ksf::misc
 			bool fingerprintToBytes(const std::string& fingerprint, uint8_t* bytes, uint8_t bytesLen) const;
 
 		public:
+			/*!
+				@brief Constructor.
+			*/
+			ksCertFingerprint();
+
 			/*!
 				@brief Destructor.
 			*/
 			virtual ~ksCertFingerprint();
 
 			/*!
 				@brief Performs certificate fingerprint setup (platform dependent).
-				@param client Pointer of WiFiClientSecure
+				@param client Pointer of ksCertUtilsNetCLientSecure_t
 				@param fingerprint Fingerprint string
 				@return True if setup has been successfull, otherwise false.
 			*/
-			virtual bool setup(WiFiClientSecure* client, const std::string& fingerprint);
+			virtual bool setup(ksCertUtilsNetCLientSecure_t* client, const std::string& fingerprint) = 0;
 
 			/*!
 				@brief Performs certificate fingerprint validation (platform dependent).
-				@param client Pointer of WiFiClientSecure
+				@param client Pointer of ksCertUtilsNetCLientSecure_t
 				@return True on verification pass, otherwise false.
 			*/
-			virtual bool verify(WiFiClientSecure* client) const;
+			virtual bool verify(ksCertUtilsNetCLientSecure_t* client) const = 0;
 	};
 
 #ifdef ESP32
@@ -67,18 +79,18 @@ namespace ksf::misc
 				
 				On ESP32 it will copy fingerprint into fingerprintBytes.
 				
-				@param client Pointer to WiFiClientSecure
+				@param client Pointer to ksCertUtilsNetCLientSecure_t
 				@param fingerprint Fingerprint string
 				@return True if setup passed, otherwise false.
 			*/
-			bool setup(WiFiClientSecure* client, const std::string& fingerprint) override;
+			bool setup(ksCertUtilsNetCLientSecure_t* client, const std::string& fingerprint) override;
 
 			/*!
 				@brief Converts bytes into a string and performs fingerprint validation.
-				@param client Pointer to WiFiClientSecure
+				@param client Pointer to ksCertUtilsNetCLientSecure_t
 				@return True if verification passed, otherwise false.
 			*/
-			bool verify(WiFiClientSecure* client) const override;
+			bool verify(ksCertUtilsNetCLientSecure_t* client) const override;
 	};
 
 	using ksCertFingerprintHolder = ksCertFingerprintESP32;
@@ -90,21 +102,21 @@ namespace ksf::misc
 		public:
 			/*!
 				@brief Performs fingerprint setup (platform dependent).
-				@param client Pointer of WiFiClientSecure.
+				@param client Pointer of ksCertUtilsNetCLientSecure_t.
 				@param fingerprint Fingerprint string.
 				@return True if setup passed, otherwise false.
 			*/
-			bool setup(WiFiClientSecure* client, const std::string& fingerprint) override;
+			bool setup(ksCertUtilsNetCLientSecure_t* client, const std::string& fingerprint) override;
 
 			/*!
 				@brief Converts bytes into a string and performs fingerprint validation.
 
 				Always returns true on ESP8266 as this functionality is handled under the hood.
 
-				@param client Pointer to WiFiClientSecure
+				@param client Pointer to ksCertUtilsNetCLientSecure_t
 				@return Always true in case of ESP8266.
 			*/
-			bool verify(WiFiClientSecure* client) const override;
+			bool verify(ksCertUtilsNetCLientSecure_t* client) const override;
 	};
 
 	using ksCertFingerprintHolder = ksCertFingerprintESP8266;

src/ksf/misc/ksConfig.cpp

@@ -53,23 +53,6 @@ namespace ksf::misc
 		}
 	}
 
-	void ksConfig::setParam(const std::string& paramName, std::string paramValue)
-	{
-		isDirty = true;
-		configParams.insert_or_assign(paramName, std::move(paramValue));
-	}
-
-	const std::string& ksConfig::getParam(const std::string& paramName, const std::string& defaultValue) const
-	{
-		const auto& found{configParams.find(paramName)};
-		return found == configParams.end() ? defaultValue : found->second;
-	}
-
-	ksConfig::operator bool() const
-	{
-		return !configPath.empty();
-	}
-
 	ksConfig::~ksConfig()
 	{
 		if (!isDirty)
@@ -87,4 +70,21 @@ namespace ksf::misc
 		}
 		fileWriter.close();
 	}
+
+	void ksConfig::setParam(const std::string& paramName, std::string paramValue)
+	{
+		isDirty = true;
+		configParams.insert_or_assign(paramName, std::move(paramValue));
+	}
+
+	const std::string& ksConfig::getParam(const std::string& paramName, const std::string& defaultValue) const
+	{
+		const auto& found{configParams.find(paramName)};
+		return found == configParams.end() ? defaultValue : found->second;
+	}
+
+	ksConfig::operator bool() const
+	{
+		return !configPath.empty();
+	}
 }

src/ksf/misc/ksConfig.h

@@ -41,6 +41,12 @@ namespace ksf::misc
 			*/
 			ksConfig(const std::string& fileName);
 
+			/*!
+				@brief Saves config content on the device filesystem.
+				In case there is no modification, nothing should actually happen.
+			*/
+			virtual ~ksConfig();
+
 			/*!
 				@brief Sets parameter value (creates new parameter if it does not exist).
 				@param paramName Parameter name.
@@ -61,12 +67,6 @@ namespace ksf::misc
 				@return True if configFilename is not empty, otherwise false.
 			*/
 			operator bool() const;
-
-			/*!
-				@brief Saves config content on the device filesystem.
-				In case there is no modification, nothing should actually happen.
-			*/
-			virtual ~ksConfig();
 	};
 }
 

src/ksf/misc/ksDomainQuery.cpp

@@ -26,7 +26,7 @@ namespace ksf::misc
 		udp->write(static_cast<uint8_t>(value & 0xFF));
 	}
 
-	ksDomainQuery::~ksDomainQuery() = default;
+
 
 	ksDomainQuery::ksDomainQuery() : ksDomainQuery(KSF_DOMAIN_QUERY_DNS_SERVER) {}
 
@@ -37,6 +37,8 @@ namespace ksf::misc
 		udp->begin(0);
 	}
 
+	ksDomainQuery::~ksDomainQuery() = default;
+
 	void ksDomainQuery::invalidate()
 	{
 		resolvedIP = IPAddress(0, 0, 0, 0);