Upgrades ArduinoJson from version 6 to 7
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -64,7 +58,7 @@ esp_err_t EventSocket::onFrame(PsychicWebSocketRequest *request, httpd_ws_frame
|
||||
ESP_LOGV("EventSocket", "ws[%s][%u] request: %s", request->client()->remoteIP().toString().c_str(),
|
||||
request->client()->socket(), (char *)frame->payload);
|
||||
|
||||
DynamicJsonDocument doc = DynamicJsonDocument(_bufferSize);
|
||||
JsonDocument doc;
|
||||
DeserializationError error = deserializeJson(doc, (char *)frame->payload, frame->len);
|
||||
|
||||
if (!error && doc.is<JsonObject>())
|
||||
@@ -159,30 +153,6 @@ void EventSocket::emit(const char *event, const char *payload, const char *origi
|
||||
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());
|
||||
}
|
||||
|
||||
void EventSocket::handleEventCallbacks(String event, JsonObject &jsonObject, int originId)
|
||||
{
|
||||
for (auto &callback : event_callbacks[event])
|
||||
|
||||
Reference in New Issue
Block a user