+
Saved Networks
{#await getWifiSettings()}
@@ -609,13 +611,13 @@
>
Static IP Config?
+
diff --git a/lib/framework/APSettingsService.cpp b/lib/framework/APSettingsService.cpp
index 9f6b0e55..0478dd71 100644
--- a/lib/framework/APSettingsService.cpp
+++ b/lib/framework/APSettingsService.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/APSettingsService.h b/lib/framework/APSettingsService.h
index 0e342d35..3f91c678 100644
--- a/lib/framework/APSettingsService.h
+++ b/lib/framework/APSettingsService.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/APStatus.cpp b/lib/framework/APStatus.cpp
index d6d65641..cb8b70a2 100644
--- a/lib/framework/APStatus.cpp
+++ b/lib/framework/APStatus.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -33,7 +33,7 @@ void APStatus::begin()
esp_err_t APStatus::apStatus(PsychicRequest *request)
{
- PsychicJsonResponse response = PsychicJsonResponse(request, false, MAX_AP_STATUS_SIZE);
+ PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject root = response.getRoot();
root["status"] = _apSettingsService->getAPNetworkStatus();
diff --git a/lib/framework/APStatus.h b/lib/framework/APStatus.h
index 55b2357f..25b62f72 100644
--- a/lib/framework/APStatus.h
+++ b/lib/framework/APStatus.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -23,7 +23,6 @@
#include
#include
-#define MAX_AP_STATUS_SIZE 1024
#define AP_STATUS_SERVICE_PATH "/rest/apStatus"
class APStatus
diff --git a/lib/framework/AnalyticsService.h b/lib/framework/AnalyticsService.h
index 3aaa15e3..f699d3ce 100644
--- a/lib/framework/AnalyticsService.h
+++ b/lib/framework/AnalyticsService.h
@@ -7,7 +7,7 @@
* with responsive Sveltekit front-end built with TailwindCSS and DaisyUI.
* https://github.com/theelims/ESP32-sveltekit
*
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -49,11 +49,9 @@ class AnalyticsService
void _loop()
{
TickType_t xLastWakeTime = xTaskGetTickCount();
- StaticJsonDocument doc;
- char message[MAX_ESP_ANALYTICS_SIZE];
+ JsonDocument doc;
while (1)
{
- doc.clear();
doc["uptime"] = millis() / 1000;
doc["free_heap"] = ESP.getFreeHeap();
doc["total_heap"] = ESP.getHeapSize();
@@ -63,8 +61,8 @@ class AnalyticsService
doc["fs_total"] = ESPFS.totalBytes();
doc["core_temp"] = temperatureRead();
- serializeJson(doc, message);
- _socket->emit(EVENT_ANALYTICS, message);
+ JsonObject jsonObject = doc.as();
+ _socket->emitEvent(EVENT_ANALYTICS, jsonObject);
vTaskDelayUntil(&xLastWakeTime, ANALYTICS_INTERVAL / portTICK_PERIOD_MS);
}
diff --git a/lib/framework/ArduinoJsonJWT.cpp b/lib/framework/ArduinoJsonJWT.cpp
index 1489ecb9..0a2691d4 100644
--- a/lib/framework/ArduinoJsonJWT.cpp
+++ b/lib/framework/ArduinoJsonJWT.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/ArduinoJsonJWT.h b/lib/framework/ArduinoJsonJWT.h
index 38abcf20..b6ad8a1b 100644
--- a/lib/framework/ArduinoJsonJWT.h
+++ b/lib/framework/ArduinoJsonJWT.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/AuthenticationService.cpp b/lib/framework/AuthenticationService.cpp
index c7f808d5..0aa1c8f6 100644
--- a/lib/framework/AuthenticationService.cpp
+++ b/lib/framework/AuthenticationService.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -27,13 +27,13 @@ void AuthenticationService::begin()
_server->on(SIGN_IN_PATH, HTTP_POST, [this](PsychicRequest *request, JsonVariant &json)
{
if (json.is()) {
- String username = json["username"];
- String password = json["password"];
+ String username = json["username"];
+ String password = json["password"];
Authentication authentication = _securityManager->authenticate(username, password);
if (authentication.authenticated) {
- PsychicJsonResponse response = PsychicJsonResponse(request, false, 256);
- JsonObject root = response.getRoot();
- root["access_token"] = _securityManager->generateJWT(authentication.user);
+ PsychicJsonResponse response = PsychicJsonResponse(request, false);
+ JsonObject root = response.getRoot();
+ root["access_token"] = _securityManager->generateJWT(authentication.user);
return response.send();
}
}
diff --git a/lib/framework/AuthenticationService.h b/lib/framework/AuthenticationService.h
index 1cc02ba5..9308e377 100644
--- a/lib/framework/AuthenticationService.h
+++ b/lib/framework/AuthenticationService.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -22,8 +22,6 @@
#define VERIFY_AUTHORIZATION_PATH "/rest/verifyAuthorization"
#define SIGN_IN_PATH "/rest/signIn"
-#define MAX_AUTHENTICATION_SIZE 256
-
#if FT_ENABLED(FT_SECURITY)
class AuthenticationService
diff --git a/lib/framework/BatteryService.cpp b/lib/framework/BatteryService.cpp
index 808bdc51..001f0a1e 100644
--- a/lib/framework/BatteryService.cpp
+++ b/lib/framework/BatteryService.cpp
@@ -5,7 +5,7 @@
* with responsive Sveltekit front-end built with TailwindCSS and DaisyUI.
* https://github.com/theelims/ESP32-sveltekit
*
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -24,10 +24,9 @@ void BatteryService::begin()
void BatteryService::batteryEvent()
{
- StaticJsonDocument<32> doc;
- char message[32];
+ JsonDocument doc;
doc["soc"] = _lastSOC;
doc["charging"] = _isCharging;
- serializeJson(doc, message);
- _socket->emit(EVENT_BATTERY, message);
+ JsonObject jsonObject = doc.as();
+ _socket->emitEvent(EVENT_BATTERY, jsonObject);
}
diff --git a/lib/framework/BatteryService.h b/lib/framework/BatteryService.h
index 2496a2a1..e785f539 100644
--- a/lib/framework/BatteryService.h
+++ b/lib/framework/BatteryService.h
@@ -7,7 +7,7 @@
* with responsive Sveltekit front-end built with TailwindCSS and DaisyUI.
* https://github.com/theelims/ESP32-sveltekit
*
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/DownloadFirmwareService.cpp b/lib/framework/DownloadFirmwareService.cpp
index 07a09ede..acdf98c0 100644
--- a/lib/framework/DownloadFirmwareService.cpp
+++ b/lib/framework/DownloadFirmwareService.cpp
@@ -5,7 +5,7 @@
* with responsive Sveltekit front-end built with TailwindCSS and DaisyUI.
* https://github.com/theelims/ESP32-sveltekit
*
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -17,25 +17,25 @@ extern const uint8_t rootca_crt_bundle_start[] asm("_binary_src_certs_x509_crt_b
static EventSocket *_socket = nullptr;
static int previousProgress = 0;
-StaticJsonDocument<128> doc;
+JsonDocument doc;
void update_started()
{
String output;
doc["status"] = "preparing";
- serializeJson(doc, output);
- _socket->emit(EVENT_DOWNLOAD_OTA, output.c_str());
+ JsonObject jsonObject = doc.as();
+ _socket->emitEvent(EVENT_DOWNLOAD_OTA, jsonObject);
}
void update_progress(int currentBytes, int totalBytes)
{
- String output;
doc["status"] = "progress";
int progress = ((currentBytes * 100) / totalBytes);
if (progress > previousProgress)
{
doc["progress"] = progress;
- _socket->emit(EVENT_DOWNLOAD_OTA, output.c_str());
+ JsonObject jsonObject = doc.as();
+ _socket->emitEvent(EVENT_DOWNLOAD_OTA, jsonObject);
ESP_LOGV("Download OTA", "HTTP update process at %d of %d bytes... (%d %%)", currentBytes, totalBytes, progress);
}
previousProgress = progress;
@@ -43,10 +43,9 @@ void update_progress(int currentBytes, int totalBytes)
void update_finished()
{
- String output;
doc["status"] = "finished";
- serializeJson(doc, output);
- _socket->emit(EVENT_DOWNLOAD_OTA, output.c_str());
+ JsonObject jsonObject = doc.as();
+ _socket->emitEvent(EVENT_DOWNLOAD_OTA, jsonObject);
// delay to allow the event to be sent out
vTaskDelay(100 / portTICK_PERIOD_MS);
@@ -68,6 +67,7 @@ void updateTask(void *param)
// httpUpdate.onEnd(update_finished);
t_httpUpdate_return ret = httpUpdate.update(client, url.c_str());
+ JsonObject jsonObject;
switch (ret)
{
@@ -75,8 +75,8 @@ void updateTask(void *param)
doc["status"] = "error";
doc["error"] = httpUpdate.getLastErrorString().c_str();
- serializeJson(doc, output);
- _socket->emit(EVENT_DOWNLOAD_OTA, output.c_str());
+ jsonObject = doc.as();
+ _socket->emitEvent(EVENT_DOWNLOAD_OTA, jsonObject);
ESP_LOGE("Download OTA", "HTTP Update failed with error (%d): %s", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str());
#ifdef SERIAL_INFO
@@ -87,8 +87,8 @@ void updateTask(void *param)
doc["status"] = "error";
doc["error"] = "Update failed, has same firmware version";
- serializeJson(doc, output);
- _socket->emit(EVENT_DOWNLOAD_OTA, output.c_str());
+ jsonObject = doc.as();
+ _socket->emitEvent(EVENT_DOWNLOAD_OTA, jsonObject);
ESP_LOGE("Download OTA", "HTTP Update failed, has same firmware version");
#ifdef SERIAL_INFO
@@ -143,10 +143,8 @@ esp_err_t DownloadFirmwareService::downloadUpdate(PsychicRequest *request, JsonV
doc["progress"] = 0;
doc["error"] = "";
- String output;
- serializeJson(doc, output);
-
- _socket->emit(EVENT_DOWNLOAD_OTA, output.c_str());
+ JsonObject jsonObject = doc.as();
+ _socket->emitEvent(EVENT_DOWNLOAD_OTA, jsonObject);
if (xTaskCreatePinnedToCore(
&updateTask, // Function that should be called
diff --git a/lib/framework/DownloadFirmwareService.h b/lib/framework/DownloadFirmwareService.h
index e9b6869c..96fcb35f 100644
--- a/lib/framework/DownloadFirmwareService.h
+++ b/lib/framework/DownloadFirmwareService.h
@@ -8,7 +8,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/ESP32SvelteKit.cpp b/lib/framework/ESP32SvelteKit.cpp
index 1648455c..ec8e68dd 100644
--- a/lib/framework/ESP32SvelteKit.cpp
+++ b/lib/framework/ESP32SvelteKit.cpp
@@ -24,6 +24,7 @@ ESP32SvelteKit::ESP32SvelteKit(PsychicHttpServer *server, unsigned int numberEnd
_apSettingsService(server, &ESPFS, &_securitySettingsService),
_apStatus(server, &_securitySettingsService, &_apSettingsService),
_socket(server, &_securitySettingsService, AuthenticationPredicates::IS_AUTHENTICATED),
+ _notificationService(&_socket),
#if FT_ENABLED(FT_NTP)
_ntpSettingsService(server, &ESPFS, &_securitySettingsService),
_ntpStatus(server, &_securitySettingsService),
@@ -137,6 +138,7 @@ void ESP32SvelteKit::begin()
// Start the services
_apStatus.begin();
_socket.begin();
+ _notificationService.begin();
_apSettingsService.begin();
_factoryResetService.begin();
_featureService.begin();
diff --git a/lib/framework/ESP32SvelteKit.h b/lib/framework/ESP32SvelteKit.h
index 6f41932f..6bd02c79 100644
--- a/lib/framework/ESP32SvelteKit.h
+++ b/lib/framework/ESP32SvelteKit.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -107,6 +108,11 @@ class ESP32SvelteKit
return &_apSettingsService;
}
+ NotificationService *getNotificationService()
+ {
+ return &_notificationService;
+ }
+
#if FT_ENABLED(FT_NTP)
StatefulService *getNTPSettingsService()
{
@@ -171,6 +177,7 @@ class ESP32SvelteKit
APSettingsService _apSettingsService;
APStatus _apStatus;
EventSocket _socket;
+ NotificationService _notificationService;
#if FT_ENABLED(FT_NTP)
NTPSettingsService _ntpSettingsService;
NTPStatus _ntpStatus;
diff --git a/lib/framework/ESPFS.h b/lib/framework/ESPFS.h
index 3ec3a6cd..5cb0dd48 100644
--- a/lib/framework/ESPFS.h
+++ b/lib/framework/ESPFS.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/EventEndpoint.h b/lib/framework/EventEndpoint.h
index c5041675..86ff45cf 100644
--- a/lib/framework/EventEndpoint.h
+++ b/lib/framework/EventEndpoint.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -27,13 +27,11 @@ class EventEndpoint
EventEndpoint(JsonStateReader stateReader,
JsonStateUpdater stateUpdater,
StatefulService *statefulService,
- EventSocket *socket, const char *event,
- size_t bufferSize = DEFAULT_BUFFER_SIZE) : _stateReader(stateReader),
- _stateUpdater(stateUpdater),
- _statefulService(statefulService),
- _socket(socket),
- _bufferSize(bufferSize),
- _event(event)
+ EventSocket *socket, const char *event) : _stateReader(stateReader),
+ _stateUpdater(stateUpdater),
+ _statefulService(statefulService),
+ _socket(socket),
+ _event(event)
{
_statefulService->addUpdateHandler([&](const String &originId)
{ syncState(originId); },
@@ -44,7 +42,8 @@ class EventEndpoint
{
_socket->registerEvent(_event);
_socket->onEvent(_event, std::bind(&EventEndpoint::updateState, this, std::placeholders::_1, std::placeholders::_2));
- _socket->onSubscribe(_event, std::bind(&EventEndpoint::syncState, this, std::placeholders::_1, std::placeholders::_2));
+ _socket->onSubscribe(_event, [&](const String &originId)
+ { syncState(originId, true); });
}
private:
@@ -53,7 +52,6 @@ class EventEndpoint
StatefulService *_statefulService;
EventSocket *_socket;
const char *_event;
- size_t _bufferSize;
void updateState(JsonObject &root, int originId)
{
@@ -62,13 +60,11 @@ class EventEndpoint
void syncState(const String &originId, bool sync = false)
{
- DynamicJsonDocument jsonDocument{_bufferSize};
+ JsonDocument jsonDocument;
JsonObject root = jsonDocument.to();
- String output;
_statefulService->read(root, _stateReader);
- serializeJson(root, output);
- ESP_LOGV("EventEndpoint", "Syncing state: %s", output.c_str());
- _socket->emit(_event, output.c_str(), originId.c_str(), sync);
+ JsonObject jsonObject = jsonDocument.as();
+ _socket->emitEvent(_event, jsonObject, originId.c_str(), sync);
}
};
diff --git a/lib/framework/EventSocket.cpp b/lib/framework/EventSocket.cpp
index 17c49400..e6be158d 100644
--- a/lib/framework/EventSocket.cpp
+++ b/lib/framework/EventSocket.cpp
@@ -6,8 +6,7 @@ EventSocket::EventSocket(PsychicHttpServer *server,
SecurityManager *securityManager,
AuthenticationPredicate authenticationPredicate) : _server(server),
_securityManager(securityManager),
- _authenticationPredicate(authenticationPredicate),
- _bufferSize(1024)
+ _authenticationPredicate(authenticationPredicate)
{
}
@@ -19,11 +18,6 @@ void EventSocket::begin()
_socket.onFrame(std::bind(&EventSocket::onFrame, this, std::placeholders::_1, std::placeholders::_2));
_server->on(EVENT_SERVICE_PATH, &_socket);
- registerEvent("errorToast");
- registerEvent("warningToast");
- registerEvent("infoToast");
- registerEvent("successToast");
-
ESP_LOGV("EventSocket", "Registered event socket endpoint: %s", EVENT_SERVICE_PATH);
}
@@ -59,13 +53,22 @@ esp_err_t EventSocket::onFrame(PsychicWebSocketRequest *request, httpd_ws_frame
ESP_LOGV("EventSocket", "ws[%s][%u] opcode[%d]", request->client()->remoteIP().toString().c_str(),
request->client()->socket(), frame->type);
+ JsonDocument doc;
+#if FT_ENABLED(EVENT_USE_JSON)
if (frame->type == HTTPD_WS_TYPE_TEXT)
{
ESP_LOGV("EventSocket", "ws[%s][%u] request: %s", request->client()->remoteIP().toString().c_str(),
request->client()->socket(), (char *)frame->payload);
- DynamicJsonDocument doc = DynamicJsonDocument(_bufferSize);
DeserializationError error = deserializeJson(doc, (char *)frame->payload, frame->len);
+#else
+ if (frame->type == HTTPD_WS_TYPE_BINARY)
+ {
+ ESP_LOGV("EventSocket", "ws[%s][%u] request: %s", request->client()->remoteIP().toString().c_str(),
+ request->client()->socket(), (char *)frame->payload);
+
+ DeserializationError error = deserializeMsgPack(doc, (char *)frame->payload, frame->len);
+#endif
if (!error && doc.is())
{
@@ -94,21 +97,12 @@ esp_err_t EventSocket::onFrame(PsychicWebSocketRequest *request, httpd_ws_frame
}
return ESP_OK;
}
+ ESP_LOGW("EventSocket", "Error[%d] parsing JSON: %s", error, (char *)frame->payload);
}
return ESP_OK;
}
-void EventSocket::emit(String event, String payload)
-{
- emit(event.c_str(), payload.c_str(), "");
-}
-
-void EventSocket::emit(const char *event, const char *payload)
-{
- emit(event, payload, "");
-}
-
-void EventSocket::emit(const char *event, const char *payload, const char *originId, bool onlyToSameOrigin)
+void EventSocket::emitEvent(String event, JsonObject &jsonObject, const char *originId, bool onlyToSameOrigin)
{
// Only process valid events
if (!isEventValid(String(event)))
@@ -125,7 +119,27 @@ void EventSocket::emit(const char *event, const char *payload, const char *origi
xSemaphoreGive(clientSubscriptionsMutex);
return;
}
- String msg = "[\"" + String(event) + "\"," + String(payload) + "]";
+
+ JsonDocument doc;
+ doc["event"] = event;
+ doc["data"] = jsonObject;
+
+#if FT_ENABLED(EVENT_USE_JSON)
+ size_t len = measureJson(doc);
+#else
+ size_t len = measureMsgPack(doc);
+#endif
+
+ char *output = new char[len + 1];
+
+#if FT_ENABLED(EVENT_USE_JSON)
+ serializeJson(doc, output, len + 1);
+#else
+ serializeMsgPack(doc, output, len);
+#endif
+
+ // null terminate the string
+ output[len] = '\0';
// if onlyToSameOrigin == true, send the message back to the origin
if (onlyToSameOrigin && originSubscriptionId > 0)
@@ -133,9 +147,12 @@ void EventSocket::emit(const char *event, const char *payload, const char *origi
auto *client = _socket.getClient(originSubscriptionId);
if (client)
{
- ESP_LOGV("EventSocket", "Emitting event: %s to %s, Message: %s", event, client->remoteIP().toString().c_str(),
- msg.c_str());
- client->sendMessage(msg.c_str());
+ ESP_LOGV("EventSocket", "Emitting event: %s to %s, Message[%d]: %s", event, client->remoteIP().toString().c_str(), len, output);
+#if FT_ENABLED(EVENT_USE_JSON)
+ client->sendMessage(HTTPD_WS_TYPE_TEXT, output, len);
+#else
+ client->sendMessage(HTTPD_WS_TYPE_BINARY, output, len);
+#endif
}
}
else
@@ -151,36 +168,17 @@ void EventSocket::emit(const char *event, const char *payload, const char *origi
subscriptions.remove(subscription);
continue;
}
- ESP_LOGV("EventSocket", "Emitting event: %s to %s, Message: %s", event, client->remoteIP().toString().c_str(),
- msg.c_str());
- client->sendMessage(msg.c_str());
+ ESP_LOGV("EventSocket", "Emitting event: %s to %s, Message[%d]: %s", event, client->remoteIP().toString().c_str(), len, output);
+#if FT_ENABLED(EVENT_USE_JSON)
+ client->sendMessage(HTTPD_WS_TYPE_TEXT, output, len);
+#else
+ client->sendMessage(HTTPD_WS_TYPE_BINARY, output, len);
+#endif
}
}
- xSemaphoreGive(clientSubscriptionsMutex);
-}
-void EventSocket::pushNotification(String message, pushEvent event)
-{
- String eventType;
- switch (event)
- {
- case (PUSHERROR):
- eventType = "errorToast";
- break;
- case (PUSHWARNING):
- eventType = "warningToast";
- break;
- case (PUSHINFO):
- eventType = "infoToast";
- break;
- case (PUSHSUCCESS):
- eventType = "successToast";
- break;
- default:
- ESP_LOGW("EventSocket", "Client tried invalid push notification: %s", event);
- return;
- }
- emit(eventType.c_str(), message.c_str());
+ delete[] output;
+ xSemaphoreGive(clientSubscriptionsMutex);
}
void EventSocket::handleEventCallbacks(String event, JsonObject &jsonObject, int originId)
@@ -195,7 +193,7 @@ void EventSocket::handleSubscribeCallbacks(String event, const String &originId)
{
for (auto &callback : subscribe_callbacks[event])
{
- callback(originId, true);
+ callback(originId);
}
}
diff --git a/lib/framework/EventSocket.h b/lib/framework/EventSocket.h
index 84b52c2b..d10f66d2 100644
--- a/lib/framework/EventSocket.h
+++ b/lib/framework/EventSocket.h
@@ -1,6 +1,20 @@
#ifndef Socket_h
#define Socket_h
+/**
+ * ESP32 SvelteKit
+ *
+ * A simple, secure and extensible framework for IoT projects for ESP32 platforms
+ * with responsive Sveltekit front-end built with TailwindCSS and DaisyUI.
+ * https://github.com/theelims/ESP32-sveltekit
+ *
+ * Copyright (C) 2018 - 2023 rjwats
+ * Copyright (C) 2023 - 2024 theelims
+ *
+ * All Rights Reserved. This software may be modified and distributed under
+ * the terms of the LGPL v3 license. See the LICENSE file for details.
+ **/
+
#include
#include
#include
@@ -11,15 +25,7 @@
#define EVENT_SERVICE_PATH "/ws/events"
typedef std::function EventCallback;
-typedef std::function SubscribeCallback;
-
-enum pushEvent
-{
- PUSHERROR,
- PUSHWARNING,
- PUSHINFO,
- PUSHSUCCESS
-};
+typedef std::function SubscribeCallback;
class EventSocket
{
@@ -34,15 +40,9 @@ class EventSocket
void onSubscribe(String event, SubscribeCallback callback);
- void emit(String event, String payload);
-
- void emit(const char *event, const char *payload);
-
- void emit(const char *event, const char *payload, const char *originId, bool onlyToSameOrigin = false);
+ void emitEvent(String event, JsonObject &jsonObject, const char *originId = "", bool onlyToSameOrigin = false);
// if onlyToSameOrigin == true, the message will be sent to the originId only, otherwise it will be broadcasted to all clients except the originId
- void pushNotification(String message, pushEvent event);
-
private:
PsychicHttpServer *_server;
PsychicWebSocketHandler _socket;
@@ -58,7 +58,6 @@ class EventSocket
bool isEventValid(String event);
- size_t _bufferSize;
void onWSOpen(PsychicWebSocketClient *client);
void onWSClose(PsychicWebSocketClient *client);
esp_err_t onFrame(PsychicWebSocketRequest *request, httpd_ws_frame *frame);
diff --git a/lib/framework/FSPersistence.h b/lib/framework/FSPersistence.h
index a1de7c32..729ce081 100644
--- a/lib/framework/FSPersistence.h
+++ b/lib/framework/FSPersistence.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -26,14 +26,12 @@ class FSPersistence
JsonStateUpdater stateUpdater,
StatefulService *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)
+ const char *filePath) : _stateReader(stateReader),
+ _stateUpdater(stateUpdater),
+ _statefulService(statefulService),
+ _fs(fs),
+ _filePath(filePath),
+ _updateHandlerId(0)
{
enableUpdateHandler();
}
@@ -44,7 +42,7 @@ class FSPersistence
if (settingsFile)
{
- DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
+ JsonDocument jsonDocument;
DeserializationError error = deserializeJson(jsonDocument, settingsFile);
if (error == DeserializationError::Ok && jsonDocument.is())
{
@@ -66,7 +64,7 @@ class FSPersistence
bool writeToFS()
{
// create and populate a new json object
- DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
+ JsonDocument jsonDocument;
JsonObject jsonObject = jsonDocument.to();
_statefulService->read(jsonObject, _stateReader);
@@ -112,7 +110,6 @@ class FSPersistence
StatefulService *_statefulService;
FS *_fs;
const char *_filePath;
- size_t _bufferSize;
update_handler_id_t _updateHandlerId;
// We assume we have a _filePath with format "/directory1/directory2/filename"
@@ -136,7 +133,7 @@ class FSPersistence
// is supplied, this virtual function allows that to be changed.
virtual void applyDefaults()
{
- DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
+ JsonDocument jsonDocument;
JsonObject jsonObject = jsonDocument.as();
_statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
}
diff --git a/lib/framework/FactoryResetService.cpp b/lib/framework/FactoryResetService.cpp
index e7bb6448..a16a00e6 100644
--- a/lib/framework/FactoryResetService.cpp
+++ b/lib/framework/FactoryResetService.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/FactoryResetService.h b/lib/framework/FactoryResetService.h
index 9299cb69..71873c25 100644
--- a/lib/framework/FactoryResetService.h
+++ b/lib/framework/FactoryResetService.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/Features.h b/lib/framework/Features.h
index 60957cf4..ce4c5188 100644
--- a/lib/framework/Features.h
+++ b/lib/framework/Features.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -57,4 +57,9 @@
#define FT_ANALYTICS 1
#endif
+// Use JSON for events. Default, use MessagePack for events
+#ifndef EVENT_USE_JSON
+#define EVENT_USE_JSON 0
+#endif
+
#endif
diff --git a/lib/framework/FeaturesService.cpp b/lib/framework/FeaturesService.cpp
index 2c05ae90..18853fab 100644
--- a/lib/framework/FeaturesService.cpp
+++ b/lib/framework/FeaturesService.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -22,7 +22,7 @@ void FeaturesService::begin()
{
_server->on(FEATURES_SERVICE_PATH, HTTP_GET, [&](PsychicRequest *request)
{
- PsychicJsonResponse response = PsychicJsonResponse(request, false, MAX_FEATURES_SIZE);
+ PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject root = response.getRoot();
#if FT_ENABLED(FT_SECURITY)
@@ -65,6 +65,13 @@ void FeaturesService::begin()
#else
root["analytics"] = false;
#endif
+
+#if FT_ENABLED(EVENT_USE_JSON)
+ root["event_use_json"] = true;
+#else
+ root["event_use_json"] = false;
+#endif
+
root["firmware_version"] = APP_VERSION;
root["firmware_name"] = APP_NAME;
root["firmware_built_target"] = BUILD_TARGET;
diff --git a/lib/framework/FeaturesService.h b/lib/framework/FeaturesService.h
index 7f524bd6..f132c900 100644
--- a/lib/framework/FeaturesService.h
+++ b/lib/framework/FeaturesService.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -22,7 +22,6 @@
#include
#include
-#define MAX_FEATURES_SIZE 256
#define FEATURES_SERVICE_PATH "/rest/features"
typedef struct
diff --git a/lib/framework/HttpEndpoint.h b/lib/framework/HttpEndpoint.h
index 0397a48a..4232c3e4 100644
--- a/lib/framework/HttpEndpoint.h
+++ b/lib/framework/HttpEndpoint.h
@@ -20,7 +20,6 @@ class HttpEndpoint
JsonStateReader _stateReader;
JsonStateUpdater _stateUpdater;
StatefulService *_statefulService;
- size_t _bufferSize;
SecurityManager *_securityManager;
AuthenticationPredicate _authenticationPredicate;
PsychicHttpServer *_server;
@@ -33,9 +32,13 @@ class HttpEndpoint
PsychicHttpServer *server,
const char *servicePath,
SecurityManager *securityManager,
- AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
- size_t bufferSize = DEFAULT_BUFFER_SIZE)
- : _stateReader(stateReader), _stateUpdater(stateUpdater), _statefulService(statefulService), _server(server), _servicePath(servicePath), _securityManager(securityManager), _authenticationPredicate(authenticationPredicate), _bufferSize(bufferSize)
+ AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN) : _stateReader(stateReader),
+ _stateUpdater(stateUpdater),
+ _statefulService(statefulService),
+ _server(server),
+ _servicePath(servicePath),
+ _securityManager(securityManager),
+ _authenticationPredicate(authenticationPredicate)
{
}
@@ -61,7 +64,7 @@ class HttpEndpoint
_securityManager->wrapRequest(
[this](PsychicRequest *request)
{
- PsychicJsonResponse response = PsychicJsonResponse(request, false, _bufferSize);
+ PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject jsonObject = response.getRoot();
_statefulService->read(jsonObject, _stateReader);
return response.send();
@@ -93,7 +96,7 @@ class HttpEndpoint
_statefulService->callUpdateHandlers(HTTP_ENDPOINT_ORIGIN_ID);
}
- PsychicJsonResponse response = PsychicJsonResponse(request, false, _bufferSize);
+ PsychicJsonResponse response = PsychicJsonResponse(request, false);
jsonObject = response.getRoot();
_statefulService->read(jsonObject, _stateReader);
diff --git a/lib/framework/IPUtils.h b/lib/framework/IPUtils.h
index c2e548b3..ba69f9dc 100644
--- a/lib/framework/IPUtils.h
+++ b/lib/framework/IPUtils.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/JsonUtils.h b/lib/framework/JsonUtils.h
index 067adae9..e3f94656 100644
--- a/lib/framework/JsonUtils.h
+++ b/lib/framework/JsonUtils.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/MqttEndpoint.h b/lib/framework/MqttEndpoint.h
index b97087e7..c8bf64c2 100644
--- a/lib/framework/MqttEndpoint.h
+++ b/lib/framework/MqttEndpoint.h
@@ -30,15 +30,13 @@ class MqttEndpoint
PsychicMqttClient *mqttClient,
const String &pubTopic = "",
const String &subTopic = "",
- bool retain = false,
- size_t bufferSize = DEFAULT_BUFFER_SIZE) : _stateReader(stateReader),
- _stateUpdater(stateUpdater),
- _statefulService(statefulService),
- _mqttClient(mqttClient),
- _pubTopic(pubTopic),
- _subTopic(subTopic),
- _retain(retain),
- _bufferSize(bufferSize)
+ bool retain = false) : _stateReader(stateReader),
+ _stateUpdater(stateUpdater),
+ _statefulService(statefulService),
+ _mqttClient(mqttClient),
+ _pubTopic(pubTopic),
+ _subTopic(subTopic),
+ _retain(retain)
{
_statefulService->addUpdateHandler([&](const String &originId)
@@ -95,7 +93,7 @@ class MqttEndpoint
if (_pubTopic.length() > 0 && _mqttClient->connected())
{
// serialize to json doc
- DynamicJsonDocument json(_bufferSize);
+ JsonDocument json;
JsonObject jsonObject = json.to();
_statefulService->read(jsonObject, _stateReader);
@@ -116,7 +114,6 @@ class MqttEndpoint
protected:
StatefulService *_statefulService;
PsychicMqttClient *_mqttClient;
- int _bufferSize;
JsonStateUpdater _stateUpdater;
JsonStateReader _stateReader;
String _subTopic;
@@ -136,7 +133,7 @@ class MqttEndpoint
}
// deserialize from string
- DynamicJsonDocument json(_bufferSize);
+ JsonDocument json;
DeserializationError error = deserializeJson(json, payload);
if (!error && json.is())
{
diff --git a/lib/framework/MqttSettingsService.cpp b/lib/framework/MqttSettingsService.cpp
index 881e2777..97216221 100644
--- a/lib/framework/MqttSettingsService.cpp
+++ b/lib/framework/MqttSettingsService.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/MqttSettingsService.h b/lib/framework/MqttSettingsService.h
index 8624b874..d45f3199 100644
--- a/lib/framework/MqttSettingsService.h
+++ b/lib/framework/MqttSettingsService.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/MqttStatus.cpp b/lib/framework/MqttStatus.cpp
index 8a56feb8..85235d6f 100644
--- a/lib/framework/MqttStatus.cpp
+++ b/lib/framework/MqttStatus.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -34,7 +34,7 @@ void MqttStatus::begin()
esp_err_t MqttStatus::mqttStatus(PsychicRequest *request)
{
- PsychicJsonResponse response = PsychicJsonResponse(request, false, MAX_MQTT_STATUS_SIZE);
+ PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject root = response.getRoot();
root["enabled"] = _mqttSettingsService->isEnabled();
diff --git a/lib/framework/MqttStatus.h b/lib/framework/MqttStatus.h
index 4ec80fef..364b100c 100644
--- a/lib/framework/MqttStatus.h
+++ b/lib/framework/MqttStatus.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -22,7 +22,6 @@
#include
#include
-#define MAX_MQTT_STATUS_SIZE 1024
#define MQTT_STATUS_SERVICE_PATH "/rest/mqttStatus"
class MqttStatus
diff --git a/lib/framework/NTPSettingsService.cpp b/lib/framework/NTPSettingsService.cpp
index 0e0ffe5d..c5b37efb 100644
--- a/lib/framework/NTPSettingsService.cpp
+++ b/lib/framework/NTPSettingsService.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/NTPSettingsService.h b/lib/framework/NTPSettingsService.h
index 1b511501..0ec7fa29 100644
--- a/lib/framework/NTPSettingsService.h
+++ b/lib/framework/NTPSettingsService.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -41,7 +41,6 @@
#define NTP_SETTINGS_FILE "/config/ntpSettings.json"
#define NTP_SETTINGS_SERVICE_PATH "/rest/ntpSettings"
-#define MAX_TIME_SIZE 256
#define TIME_PATH "/rest/time"
class NTPSettings
diff --git a/lib/framework/NTPStatus.cpp b/lib/framework/NTPStatus.cpp
index 27a9a5c9..90d3b060 100644
--- a/lib/framework/NTPStatus.cpp
+++ b/lib/framework/NTPStatus.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -53,7 +53,7 @@ String toLocalTimeString(tm *time)
esp_err_t NTPStatus::ntpStatus(PsychicRequest *request)
{
- PsychicJsonResponse response = PsychicJsonResponse(request, false, MAX_NTP_STATUS_SIZE);
+ PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject root = response.getRoot();
// grab the current instant in unix seconds
diff --git a/lib/framework/NTPStatus.h b/lib/framework/NTPStatus.h
index f9baeef3..2ae9d2fd 100644
--- a/lib/framework/NTPStatus.h
+++ b/lib/framework/NTPStatus.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -23,7 +23,6 @@
#include
#include
-#define MAX_NTP_STATUS_SIZE 1024
#define NTP_STATUS_SERVICE_PATH "/rest/ntpStatus"
class NTPStatus
diff --git a/lib/framework/NotificationService.cpp b/lib/framework/NotificationService.cpp
new file mode 100644
index 00000000..2940cc8c
--- /dev/null
+++ b/lib/framework/NotificationService.cpp
@@ -0,0 +1,22 @@
+#include
+
+// array translating pushType into strings
+const char *pushTypeStrings[] = {"error", "warning", "info", "success"};
+
+NotificationService::NotificationService(EventSocket *eventSocket) : _eventSocket(eventSocket)
+{
+}
+
+void NotificationService::begin()
+{
+ _eventSocket->registerEvent(NOTIFICATION_EVENT);
+}
+
+void NotificationService::pushNotification(String message, pushType event)
+{
+ JsonDocument doc;
+ doc["type"] = pushTypeStrings[event];
+ doc["message"] = message;
+ JsonObject jsonObject = doc.as();
+ _eventSocket->emitEvent(NOTIFICATION_EVENT, jsonObject);
+}
diff --git a/lib/framework/NotificationService.h b/lib/framework/NotificationService.h
new file mode 100644
index 00000000..aee238c2
--- /dev/null
+++ b/lib/framework/NotificationService.h
@@ -0,0 +1,43 @@
+#ifndef NotificationService_h
+#define NotificationService_h
+
+/**
+ * ESP32 SvelteKit
+ *
+ * A simple, secure and extensible framework for IoT projects for ESP32 platforms
+ * with responsive Sveltekit front-end built with TailwindCSS and DaisyUI.
+ * https://github.com/theelims/ESP32-sveltekit
+ *
+ * Copyright (C) 2018 - 2023 rjwats
+ * Copyright (C) 2023 - 2024 theelims
+ *
+ * All Rights Reserved. This software may be modified and distributed under
+ * the terms of the LGPL v3 license. See the LICENSE file for details.
+ **/
+
+#include
+
+#define NOTIFICATION_EVENT "notification"
+
+enum pushType
+{
+ PUSHERROR,
+ PUSHWARNING,
+ PUSHINFO,
+ PUSHSUCCESS
+};
+
+class NotificationService
+{
+public:
+ NotificationService(EventSocket *eventSocket);
+
+ void begin();
+
+ void pushNotification(String message, pushType event);
+
+private:
+ EventSocket *_eventSocket;
+};
+
+#endif // NotificationService_h
\ No newline at end of file
diff --git a/lib/framework/RestartService.cpp b/lib/framework/RestartService.cpp
index 6a918148..6e7a5cdc 100644
--- a/lib/framework/RestartService.cpp
+++ b/lib/framework/RestartService.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/RestartService.h b/lib/framework/RestartService.h
index 56f16840..a3b7b893 100644
--- a/lib/framework/RestartService.h
+++ b/lib/framework/RestartService.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/SecurityManager.h b/lib/framework/SecurityManager.h
index 4224c0e1..5aef1f46 100644
--- a/lib/framework/SecurityManager.h
+++ b/lib/framework/SecurityManager.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -26,8 +26,6 @@
#define AUTHORIZATION_HEADER_PREFIX "Bearer "
#define AUTHORIZATION_HEADER_PREFIX_LEN 7
-#define MAX_JWT_SIZE 128
-
class User
{
public:
diff --git a/lib/framework/SecuritySettingsService.cpp b/lib/framework/SecuritySettingsService.cpp
index 4acdbc79..37eb09b5 100644
--- a/lib/framework/SecuritySettingsService.cpp
+++ b/lib/framework/SecuritySettingsService.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -69,7 +69,7 @@ void SecuritySettingsService::configureJWTHandler()
Authentication SecuritySettingsService::authenticateJWT(String &jwt)
{
- DynamicJsonDocument payloadDocument(MAX_JWT_SIZE);
+ JsonDocument payloadDocument;
_jwtHandler.parseJWT(jwt, payloadDocument);
if (payloadDocument.is())
{
@@ -106,7 +106,7 @@ inline void populateJWTPayload(JsonObject &payload, User *user)
boolean SecuritySettingsService::validatePayload(JsonObject &parsedPayload, User *user)
{
- DynamicJsonDocument jsonDocument(MAX_JWT_SIZE);
+ JsonDocument jsonDocument;
JsonObject payload = jsonDocument.to();
populateJWTPayload(payload, user);
return payload == parsedPayload;
@@ -114,7 +114,7 @@ boolean SecuritySettingsService::validatePayload(JsonObject &parsedPayload, User
String SecuritySettingsService::generateJWT(User *user)
{
- DynamicJsonDocument jsonDocument(MAX_JWT_SIZE);
+ JsonDocument jsonDocument;
JsonObject payload = jsonDocument.to();
populateJWTPayload(payload, user);
return _jwtHandler.buildJWT(payload);
@@ -179,7 +179,7 @@ esp_err_t SecuritySettingsService::generateToken(PsychicRequest *request)
{
if (_user.username == usernameParam)
{
- PsychicJsonResponse response = PsychicJsonResponse(request, false, GENERATE_TOKEN_SIZE);
+ PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject root = response.getRoot();
root["token"] = generateJWT(&_user);
return response.send();
diff --git a/lib/framework/SecuritySettingsService.h b/lib/framework/SecuritySettingsService.h
index ce6de701..d68953e6 100644
--- a/lib/framework/SecuritySettingsService.h
+++ b/lib/framework/SecuritySettingsService.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -44,7 +44,6 @@
#define SECURITY_SETTINGS_FILE "/config/securitySettings.json"
#define SECURITY_SETTINGS_PATH "/rest/securitySettings"
-#define GENERATE_TOKEN_SIZE 512
#define GENERATE_TOKEN_PATH "/rest/generateToken"
#if FT_ENABLED(FT_SECURITY)
@@ -61,10 +60,10 @@ class SecuritySettings
root["jwt_secret"] = settings.jwtSecret;
// users
- JsonArray users = root.createNestedArray("users");
+ JsonArray users = root["users"].to();
for (User user : settings.users)
{
- JsonObject userRoot = users.createNestedObject();
+ JsonObject userRoot = users.add();
userRoot["username"] = user.username;
userRoot["password"] = user.password;
userRoot["admin"] = user.admin;
diff --git a/lib/framework/SettingValue.cpp b/lib/framework/SettingValue.cpp
index 9ebba8e2..8eff5802 100644
--- a/lib/framework/SettingValue.cpp
+++ b/lib/framework/SettingValue.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/SettingValue.h b/lib/framework/SettingValue.h
index d0aee406..46e79ab9 100644
--- a/lib/framework/SettingValue.h
+++ b/lib/framework/SettingValue.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/SleepService.cpp b/lib/framework/SleepService.cpp
index 633d675f..15e12b3d 100644
--- a/lib/framework/SleepService.cpp
+++ b/lib/framework/SleepService.cpp
@@ -5,7 +5,7 @@
* with responsive Sveltekit front-end built with TailwindCSS and DaisyUI.
* https://github.com/theelims/ESP32-sveltekit
*
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/SleepService.h b/lib/framework/SleepService.h
index 2524e2da..ffa09618 100644
--- a/lib/framework/SleepService.h
+++ b/lib/framework/SleepService.h
@@ -7,7 +7,7 @@
* with responsive Sveltekit front-end built with TailwindCSS and DaisyUI.
* https://github.com/theelims/ESP32-sveltekit
*
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/StatefulService.cpp b/lib/framework/StatefulService.cpp
index e3599074..297f74d8 100644
--- a/lib/framework/StatefulService.cpp
+++ b/lib/framework/StatefulService.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/StatefulService.h b/lib/framework/StatefulService.h
index 530ecef6..32893c17 100644
--- a/lib/framework/StatefulService.h
+++ b/lib/framework/StatefulService.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -23,10 +23,6 @@
#include
#include
-#ifndef DEFAULT_BUFFER_SIZE
-#define DEFAULT_BUFFER_SIZE 1024
-#endif
-
enum class StateUpdateResult
{
CHANGED = 0, // The update changed the state and propagation should take place if required
diff --git a/lib/framework/SystemStatus.cpp b/lib/framework/SystemStatus.cpp
index f41848ed..7e0700f2 100644
--- a/lib/framework/SystemStatus.cpp
+++ b/lib/framework/SystemStatus.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -111,7 +111,7 @@ void SystemStatus::begin()
esp_err_t SystemStatus::systemStatus(PsychicRequest *request)
{
- PsychicJsonResponse response = PsychicJsonResponse(request, false, MAX_ESP_STATUS_SIZE);
+ PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject root = response.getRoot();
root["esp_platform"] = ESP_PLATFORM;
diff --git a/lib/framework/SystemStatus.h b/lib/framework/SystemStatus.h
index 139d6de2..87367c4a 100644
--- a/lib/framework/SystemStatus.h
+++ b/lib/framework/SystemStatus.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -22,7 +22,6 @@
#include
#include
-#define MAX_ESP_STATUS_SIZE 1024
#define SYSTEM_STATUS_SERVICE_PATH "/rest/systemStatus"
class SystemStatus
diff --git a/lib/framework/UploadFirmwareService.cpp b/lib/framework/UploadFirmwareService.cpp
index 1466c5c1..bf9f7a51 100644
--- a/lib/framework/UploadFirmwareService.cpp
+++ b/lib/framework/UploadFirmwareService.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -152,7 +152,7 @@ esp_err_t UploadFirmwareService::uploadComplete(PsychicRequest *request)
{
if (strlen(md5) == 32)
{
- PsychicJsonResponse response = PsychicJsonResponse(request, false, 256);
+ PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject root = response.getRoot();
root["md5"] = md5;
return response.send();
diff --git a/lib/framework/UploadFirmwareService.h b/lib/framework/UploadFirmwareService.h
index 1e9d4344..0ea5771e 100644
--- a/lib/framework/UploadFirmwareService.h
+++ b/lib/framework/UploadFirmwareService.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/lib/framework/WebSocketClient.bak b/lib/framework/WebSocketClient.bak
index 1d5b9d30..4a88dc4b 100644
--- a/lib/framework/WebSocketClient.bak
+++ b/lib/framework/WebSocketClient.bak
@@ -6,7 +6,7 @@
* with responsive Sveltekit front-end built with TailwindCSS and DaisyUI.
* https://github.com/theelims/ESP32-sveltekit
*
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -63,8 +63,7 @@ public:
WebSocketClient(JsonStateReader stateReader,
JsonStateUpdater stateUpdater,
StatefulService *statefulService,
- const char *webSocketUri,
- size_t bufferSize = DEFAULT_BUFFER_SIZE) : _stateReader(stateReader),
+ const char *webSocketUri) : _stateReader(stateReader),
_stateUpdater(stateUpdater),
_statefulService(statefulService),
_bufferSize(bufferSize)
@@ -194,7 +193,7 @@ protected:
payload[data->data_len] = '\0';
ESP_LOGV(wsTAG, "Payload=%s", payload);
- // DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
+ // JsonDocument jsonDocument;
// DeserializationError error = deserializeJson(jsonDocument, payload);
// ESP_LOGE(wsTAG, "deserializeJson() status: %s", error.c_str());
@@ -232,7 +231,7 @@ protected:
void transmitData(const String &originId)
{
- DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
+ JsonDocument jsonDocument;
JsonObject payload = jsonDocument.to();
_statefulService->read(payload, _stateReader);
String json_string;
diff --git a/lib/framework/WebSocketServer.h b/lib/framework/WebSocketServer.h
index 1a325a5b..99f9f536 100644
--- a/lib/framework/WebSocketServer.h
+++ b/lib/framework/WebSocketServer.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -19,8 +19,6 @@
#include
#include
-#define WEB_SOCKET_CLIENT_ID_MSG_SIZE 128
-
#define WEB_SOCKET_ORIGIN "wsserver"
#define WEB_SOCKET_ORIGIN_CLIENT_ID_PREFIX "wsserver:"
@@ -34,15 +32,13 @@ class WebSocketServer
PsychicHttpServer *server,
const char *webSocketPath,
SecurityManager *securityManager,
- AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
- size_t bufferSize = DEFAULT_BUFFER_SIZE) : _stateReader(stateReader),
- _stateUpdater(stateUpdater),
- _statefulService(statefulService),
- _server(server),
- _bufferSize(bufferSize),
- _webSocketPath(webSocketPath),
- _authenticationPredicate(authenticationPredicate),
- _securityManager(securityManager)
+ AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN) : _stateReader(stateReader),
+ _stateUpdater(stateUpdater),
+ _statefulService(statefulService),
+ _server(server),
+ _webSocketPath(webSocketPath),
+ _authenticationPredicate(authenticationPredicate),
+ _securityManager(securityManager)
{
_statefulService->addUpdateHandler(
[&](const String &originId)
@@ -90,7 +86,7 @@ class WebSocketServer
{
ESP_LOGV("WebSocketServer", "ws[%s][%u] request: %s", request->client()->remoteIP().toString().c_str(), request->client()->socket(), (char *)frame->payload);
- DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
+ JsonDocument jsonDocument;
DeserializationError error = deserializeJson(jsonDocument, (char *)frame->payload, frame->len);
if (!error && jsonDocument.is())
@@ -117,11 +113,10 @@ class WebSocketServer
PsychicHttpServer *_server;
PsychicWebSocketHandler _webSocket;
String _webSocketPath;
- size_t _bufferSize;
void transmitId(PsychicWebSocketClient *client)
{
- DynamicJsonDocument jsonDocument = DynamicJsonDocument(WEB_SOCKET_CLIENT_ID_MSG_SIZE);
+ JsonDocument jsonDocument;
JsonObject root = jsonDocument.to();
root["type"] = "id";
root["id"] = clientId(client);
@@ -141,7 +136,7 @@ class WebSocketServer
*/
void transmitData(PsychicWebSocketClient *client, const String &originId)
{
- DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
+ JsonDocument jsonDocument;
JsonObject root = jsonDocument.to();
String buffer;
diff --git a/lib/framework/WiFiScanner.cpp b/lib/framework/WiFiScanner.cpp
index 2f1f8384..39be4a1f 100644
--- a/lib/framework/WiFiScanner.cpp
+++ b/lib/framework/WiFiScanner.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -52,12 +52,12 @@ esp_err_t WiFiScanner::listNetworks(PsychicRequest *request)
int numNetworks = WiFi.scanComplete();
if (numNetworks > -1)
{
- PsychicJsonResponse response = PsychicJsonResponse(request, false, MAX_WIFI_SCANNER_SIZE);
+ PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject root = response.getRoot();
- JsonArray networks = root.createNestedArray("networks");
+ JsonArray networks = root["networks"].to();
for (int i = 0; i < numNetworks; i++)
{
- JsonObject network = networks.createNestedObject();
+ JsonObject network = networks.add();
network["rssi"] = WiFi.RSSI(i);
network["ssid"] = WiFi.SSID(i);
network["bssid"] = WiFi.BSSIDstr(i);
diff --git a/lib/framework/WiFiScanner.h b/lib/framework/WiFiScanner.h
index e963b67a..a846bf6c 100644
--- a/lib/framework/WiFiScanner.h
+++ b/lib/framework/WiFiScanner.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -24,8 +24,6 @@
#define SCAN_NETWORKS_SERVICE_PATH "/rest/scanNetworks"
#define LIST_NETWORKS_SERVICE_PATH "/rest/listNetworks"
-#define MAX_WIFI_SCANNER_SIZE 1024
-
class WiFiScanner
{
public:
diff --git a/lib/framework/WiFiSettingsService.cpp b/lib/framework/WiFiSettingsService.cpp
index 4c510fce..80626c3f 100644
--- a/lib/framework/WiFiSettingsService.cpp
+++ b/lib/framework/WiFiSettingsService.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -20,7 +20,7 @@ WiFiSettingsService::WiFiSettingsService(PsychicHttpServer *server,
EventSocket *socket) : _server(server),
_securityManager(securityManager),
_httpEndpoint(WiFiSettings::read, WiFiSettings::update, this, server, WIFI_SETTINGS_SERVICE_PATH, securityManager,
- AuthenticationPredicates::IS_ADMIN, WIFI_SETTINGS_BUFFER_SIZE),
+ AuthenticationPredicates::IS_ADMIN),
_fsPersistence(WiFiSettings::read, WiFiSettings::update, this, fs, WIFI_SETTINGS_FILE), _lastConnectionAttempt(0),
_socket(socket)
{
@@ -140,7 +140,7 @@ void WiFiSettingsService::connectToWiFi()
int32_t chan_scan;
WiFi.getNetworkInfo(i, ssid_scan, sec_scan, rssi_scan, BSSID_scan, chan_scan);
- ESP_LOGV("WiFiSettingsService", "SSID: %s, RSSI: %d dbm", ssid_scan.c_str(), rssi_scan);
+ ESP_LOGV("WiFiSettingsService", "SSID: %s, BSSID: " MACSTR ", RSSI: %d dbm, Channel: %d", ssid_scan.c_str(), MAC2STR(BSSID_scan), rssi_scan, chan_scan);
for (auto &network : _state.wifiSettings)
{
@@ -149,12 +149,17 @@ void WiFiSettingsService::connectToWiFi()
if (rssi_scan > bestNetworkDb)
{ // best network
bestNetworkDb = rssi_scan;
- bestNetwork = &network;
+ ESP_LOGV("WiFiSettingsService", "--> New best network SSID: %s, BSSID: " MACSTR "", ssid_scan.c_str(), MAC2STR(BSSID_scan));
network.available = true;
+ network.channel = chan_scan;
+ memcpy(network.bssid, BSSID_scan, 6);
+ bestNetwork = &network;
}
- else if (rssi_scan >= FACTORY_WIFI_RSSI_THRESHOLD)
+ else if (rssi_scan >= FACTORY_WIFI_RSSI_THRESHOLD && network.available == false)
{ // available network
network.available = true;
+ network.channel = chan_scan;
+ memcpy(network.bssid, BSSID_scan, 6);
}
}
break;
@@ -176,9 +181,8 @@ void WiFiSettingsService::connectToWiFi()
}
else if (_state.priorityBySignalStrength == true && bestNetwork)
{
- ESP_LOGI("WiFiSettingsService", "Connecting to strongest network: %s", bestNetwork->ssid.c_str());
+ ESP_LOGI("WiFiSettingsService", "Connecting to strongest network: %s, BSSID: " MACSTR " ", bestNetwork->ssid.c_str(), MAC2STR(bestNetwork->bssid));
configureNetwork(*bestNetwork);
- WiFi.begin(bestNetwork->ssid.c_str(), bestNetwork->password.c_str());
}
else // no suitable network to connect
{
@@ -205,7 +209,8 @@ void WiFiSettingsService::configureNetwork(wifi_settings_t &network)
WiFi.setHostname(_state.hostname.c_str());
// attempt to connect to the network
- WiFi.begin(network.ssid.c_str(), network.password.c_str());
+ WiFi.begin(network.ssid.c_str(), network.password.c_str(), network.channel, network.bssid);
+ // WiFi.begin(network.ssid.c_str(), network.password.c_str());
#if CONFIG_IDF_TARGET_ESP32C3
WiFi.setTxPower(WIFI_POWER_8_5dBm); // https://www.wemos.cc/en/latest/c3/c3_mini_1_0_0.html#about-wifi
@@ -214,9 +219,11 @@ void WiFiSettingsService::configureNetwork(wifi_settings_t &network)
void WiFiSettingsService::updateRSSI()
{
- char buffer[16];
- snprintf(buffer, sizeof(buffer), WiFi.isConnected() ? "%d" : "disconnected", WiFi.RSSI());
- _socket->emit(EVENT_RSSI, buffer);
+ JsonDocument doc;
+ doc["rssi"] = WiFi.RSSI();
+ doc["ssid"] = WiFi.isConnected() ? WiFi.SSID() : "disconnected";
+ JsonObject jsonObject = doc.as();
+ _socket->emitEvent(EVENT_RSSI, jsonObject);
}
void WiFiSettingsService::onStationModeDisconnected(WiFiEvent_t event, WiFiEventInfo_t info)
diff --git a/lib/framework/WiFiSettingsService.h b/lib/framework/WiFiSettingsService.h
index 986ef667..f636857a 100644
--- a/lib/framework/WiFiSettingsService.h
+++ b/lib/framework/WiFiSettingsService.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -47,9 +47,7 @@
#define WIFI_SETTINGS_SERVICE_PATH "/rest/wifiSettings"
#define WIFI_RECONNECTION_DELAY 1000 * 30
-#define RSSI_EVENT_DELAY 200
-
-#define WIFI_SETTINGS_BUFFER_SIZE 2048
+#define RSSI_EVENT_DELAY 500
#define EVENT_RSSI "rssi"
@@ -57,6 +55,8 @@
typedef struct
{
String ssid;
+ uint8_t bssid[6];
+ int32_t channel;
String password;
bool staticIPConfig;
IPAddress localIP;
@@ -81,13 +81,13 @@ class WiFiSettings
root["priority_RSSI"] = settings.priorityBySignalStrength;
// create JSON array from root
- JsonArray wifiNetworks = root.createNestedArray("wifi_networks");
+ JsonArray wifiNetworks = root["wifi_networks"].to();
// iterate over the wifiSettings
for (auto &wifi : settings.wifiSettings)
{
// create JSON object for each wifi network
- JsonObject wifiNetwork = wifiNetworks.createNestedObject();
+ JsonObject wifiNetwork = wifiNetworks.add();
// add the ssid and password to the JSON object
wifiNetwork["ssid"] = wifi.ssid;
diff --git a/lib/framework/WiFiStatus.cpp b/lib/framework/WiFiStatus.cpp
index 539499dc..41348626 100644
--- a/lib/framework/WiFiStatus.cpp
+++ b/lib/framework/WiFiStatus.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -63,7 +63,7 @@ void WiFiStatus::onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info)
esp_err_t WiFiStatus::wifiStatus(PsychicRequest *request)
{
- PsychicJsonResponse response = PsychicJsonResponse(request, false, MAX_WIFI_STATUS_SIZE);
+ PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject root = response.getRoot();
wl_status_t status = WiFi.status();
root["status"] = (uint8_t)status;
diff --git a/lib/framework/WiFiStatus.h b/lib/framework/WiFiStatus.h
index 3b761c6d..e7c03ba5 100644
--- a/lib/framework/WiFiStatus.h
+++ b/lib/framework/WiFiStatus.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -22,7 +22,6 @@
#include
#include
-#define MAX_WIFI_STATUS_SIZE 1024
#define WIFI_STATUS_SERVICE_PATH "/rest/wifiStatus"
class WiFiStatus
diff --git a/platformio.ini b/platformio.ini
index 6226862f..81886251 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -24,21 +24,34 @@ build_flags =
${features.build_flags}
-D BUILD_TARGET=\"$PIOENV\"
-D APP_NAME=\"ESP32-Sveltekit\" ; Must only contain characters from [a-zA-Z0-9-_] as this is converted into a filename
- -D APP_VERSION=\"0.4.0\" ; semver compatible version string
- ; Uncomment to receive log messages from the ESP Arduino Core
- -D CORE_DEBUG_LEVEL=4
+ -D APP_VERSION=\"0.5.0\" ; semver compatible version string
+
; Move all networking stuff to the protocol core 0 and leave business logic on application core 1
-D ESP32SVELTEKIT_RUNNING_CORE=0
+
; Uncomment EMBED_WWW to embed the WWW data in the firmware binary
-D EMBED_WWW
+
; Uncomment to configure Cross-Origin Resource Sharing
; -D ENABLE_CORS
; -D CORS_ORIGIN=\"*\"
- ; Serve config files from flash
- ;-D SERVE_CONFIG_FILES
+
; Uncomment to enable informations from ESP32-Sveltekit in Serial Monitor
-D SERIAL_INFO
+ ; D E B U G B U I L D F L A G S
+ ; ===============================
+ ; These build flags are only for debugging purposes and should not be used in production
+
+ ; Uncomment to show log messages from the ESP Arduino Core and ESP32-SvelteKit
+ -D CORE_DEBUG_LEVEL=4
+
+ ; Serve config files from flash and access at /config/filename.json
+ ;-D SERVE_CONFIG_FILES
+
+ ; Uncomment to use JSON instead of MessagePack for event messages. Default is MessagePack.
+ ; -D EVENT_USE_JSON=1
+
lib_compat_mode = strict
; Uncomment to include the a Root CA SSL Certificate Bundle for all SSL needs
@@ -61,7 +74,7 @@ extra_scripts =
pre:scripts/generate_cert_bundle.py
scripts/rename_fw.py
lib_deps =
- ArduinoJson@>=6.0.0,<7.0.0
+ ArduinoJson@>=7.0.0
https://github.com/theelims/PsychicMqttClient.git#0.1.1
[env:esp32-c3-devkitm-1]
diff --git a/scripts/build_interface.py b/scripts/build_interface.py
index af5ce3d4..2229ee94 100644
--- a/scripts/build_interface.py
+++ b/scripts/build_interface.py
@@ -5,7 +5,7 @@
# https://github.com/theelims/ESP32-sveltekit
#
# Copyright (C) 2018 - 2023 rjwats
-# Copyright (C) 2023 theelims
+# Copyright (C) 2023 - 2024 theelims
# Copyright (C) 2023 Maxtrium B.V. [ code available under dual license ]
# Copyright (C) 2024 runeharlyk
#
diff --git a/src/LightMqttSettingsService.cpp b/src/LightMqttSettingsService.cpp
index 8ff2d04a..82bb2c52 100644
--- a/src/LightMqttSettingsService.cpp
+++ b/src/LightMqttSettingsService.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/src/LightMqttSettingsService.h b/src/LightMqttSettingsService.h
index ec539093..61ff4c63 100644
--- a/src/LightMqttSettingsService.h
+++ b/src/LightMqttSettingsService.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
diff --git a/src/LightStateService.cpp b/src/LightStateService.cpp
index 629888d0..b9f1a9eb 100644
--- a/src/LightStateService.cpp
+++ b/src/LightStateService.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -29,8 +29,7 @@ LightStateService::LightStateService(PsychicHttpServer *server,
LightState::update,
this,
socket,
- LIGHT_SETTINGS_EVENT,
- LIGHT_SETTINGS_MAX_BUFFER_SIZE),
+ LIGHT_SETTINGS_EVENT),
_mqttEndpoint(LightState::homeAssistRead,
LightState::homeAssistUpdate,
this,
@@ -85,7 +84,7 @@ void LightStateService::registerConfig()
String subTopic;
String pubTopic;
- DynamicJsonDocument doc(256);
+ JsonDocument doc;
_lightMqttSettingsService->read([&](LightMqttSettings &settings)
{
configTopic = settings.mqttPath + "/config";
diff --git a/src/LightStateService.h b/src/LightStateService.h
index 15365816..8e08b22e 100644
--- a/src/LightStateService.h
+++ b/src/LightStateService.h
@@ -9,7 +9,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.
@@ -30,7 +30,6 @@
#define LIGHT_SETTINGS_ENDPOINT_PATH "/rest/lightState"
#define LIGHT_SETTINGS_SOCKET_PATH "/ws/lightState"
#define LIGHT_SETTINGS_EVENT "led"
-#define LIGHT_SETTINGS_MAX_BUFFER_SIZE 256
class LightState
{
diff --git a/src/main.cpp b/src/main.cpp
index f35fa5e7..694885ff 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,7 +6,7 @@
* https://github.com/theelims/ESP32-sveltekit
*
* Copyright (C) 2018 - 2023 rjwats
- * Copyright (C) 2023 theelims
+ * Copyright (C) 2023 - 2024 theelims
*
* All Rights Reserved. This software may be modified and distributed under
* the terms of the LGPL v3 license. See the LICENSE file for details.