e771ab134a
* Use text formatting for default factory values to produce dynamic names. Header files contains duplicates of factory values defined in factory_settings.ini Removed them to simplify the code. * Use text formatting for default factory values to produce dynamic names. Header files contains duplicates of factory values defined in factory_settings.ini Removed them to simplify the code. * Configured the WiFi host name to contain the device id by default * Removed possibility to use placeholders for FACTORY_WIFI_SSID factory setting. * Update README.md Updated documentation * Use text formatting for default factory values to produce dynamic names. Header files contains duplicates of factory values defined in factory_settings.ini Removed them to simplify the code. * Configured the WiFi host name to contain the device id by default * Removed possibility to use placeholders for FACTORY_WIFI_SSID factory setting. * Added a space to the end of the file to comply project code style * fix typos clang formatting use 2 spaces in ini files use ${platform}-${chip_id} for hostname put chip id in brackets in AP SSID * restore (and update) factory setting ifndefs - this is so src can be built without an exaustive set build-time defines - standardize ordering of defines: factory settings, paths, config * format and modify comment * escape spaces in pio defines experiment with removing $'s from our format strings (they are being substituted with empty values by pio) * fix formatting in readme rename FactoryValue to SettingValue, put in own header give example of direct usage of FactorySetting::format in README.md * auto format * use hash to delimit placeholders * fix factory_settings.ini * remove flash string helpers * format ini file * use MAC address instead of chip id for properly unique identifier * use lower case hex encoding for unique id use chip id and unique id for more secure secret * fix comment * Use random values for JWT secret Arduino uses the ESP random number generator for "true random" numbers on both esp32 and esp8266 This makes a better JWT secret and may be useful for other factory defaults too In addition a modification has been made to force the FSPersistance to save the file if applying defaults * Don't use spaces in default AP SSID * restore helpful comment in factory_settings.ini fix default defines Co-authored-by: kasedy <kasedy@gmail.com>
101 lines
3.1 KiB
C++
101 lines
3.1 KiB
C++
#ifndef FSPersistence_h
|
|
#define FSPersistence_h
|
|
|
|
#include <StatefulService.h>
|
|
#include <FS.h>
|
|
|
|
template <class T>
|
|
class FSPersistence {
|
|
public:
|
|
FSPersistence(JsonStateReader<T> stateReader,
|
|
JsonStateUpdater<T> stateUpdater,
|
|
StatefulService<T>* statefulService,
|
|
FS* fs,
|
|
const char* filePath,
|
|
size_t bufferSize = DEFAULT_BUFFER_SIZE) :
|
|
_stateReader(stateReader),
|
|
_stateUpdater(stateUpdater),
|
|
_statefulService(statefulService),
|
|
_fs(fs),
|
|
_filePath(filePath),
|
|
_bufferSize(bufferSize),
|
|
_updateHandlerId(0) {
|
|
enableUpdateHandler();
|
|
}
|
|
|
|
void readFromFS() {
|
|
File settingsFile = _fs->open(_filePath, "r");
|
|
|
|
if (settingsFile) {
|
|
DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
|
|
DeserializationError error = deserializeJson(jsonDocument, settingsFile);
|
|
if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>()) {
|
|
JsonObject jsonObject = jsonDocument.as<JsonObject>();
|
|
_statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
|
|
settingsFile.close();
|
|
return;
|
|
}
|
|
settingsFile.close();
|
|
}
|
|
|
|
// If we reach here we have not been successful in loading the config and hard-coded defaults are now applied.
|
|
// The settings are then written back to the file system so the defaults persist between resets. This last step is
|
|
// required as in some cases defaults contain randomly generated values which would otherwise be modified on reset.
|
|
applyDefaults();
|
|
writeToFS();
|
|
}
|
|
|
|
bool writeToFS() {
|
|
// create and populate a new json object
|
|
DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
|
|
JsonObject jsonObject = jsonDocument.to<JsonObject>();
|
|
_statefulService->read(jsonObject, _stateReader);
|
|
|
|
// serialize it to filesystem
|
|
File settingsFile = _fs->open(_filePath, "w");
|
|
|
|
// failed to open file, return false
|
|
if (!settingsFile) {
|
|
return false;
|
|
}
|
|
|
|
// serialize the data to the file
|
|
serializeJson(jsonDocument, settingsFile);
|
|
settingsFile.close();
|
|
return true;
|
|
}
|
|
|
|
void disableUpdateHandler() {
|
|
if (_updateHandlerId) {
|
|
_statefulService->removeUpdateHandler(_updateHandlerId);
|
|
_updateHandlerId = 0;
|
|
}
|
|
}
|
|
|
|
void enableUpdateHandler() {
|
|
if (!_updateHandlerId) {
|
|
_updateHandlerId = _statefulService->addUpdateHandler([&](const String& originId) { writeToFS(); });
|
|
}
|
|
}
|
|
|
|
private:
|
|
JsonStateReader<T> _stateReader;
|
|
JsonStateUpdater<T> _stateUpdater;
|
|
StatefulService<T>* _statefulService;
|
|
FS* _fs;
|
|
const char* _filePath;
|
|
size_t _bufferSize;
|
|
update_handler_id_t _updateHandlerId;
|
|
|
|
protected:
|
|
// We assume the updater supplies sensible defaults if an empty object
|
|
// is supplied, this virtual function allows that to be changed.
|
|
virtual void applyDefaults() {
|
|
DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
|
|
JsonObject jsonObject = jsonDocument.as<JsonObject>();
|
|
_statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
|
|
}
|
|
};
|
|
|
|
#endif // end FSPersistence
|