ebb225f6c0
with ESPAsyncWebServer 3.3.0, the setAuthentication() method became
deprecated and a replacement method was provided which acts as a shim
and uses the new middleware-based approach to setup authentication. in
order to eventually apply a changed "read-only access allowed" setting,
the setAuthentication() method was called periodically. the shim
implementation each time allocates a new AuthenticationMiddleware and
adds it to the chain of middlewares, eventually exhausting the memory.
we now use the new middleware-based approach ourselves and only add the
respective AuthenticatonMiddleware instance once to the respective
websocket server instance.
a regression where enabling unauthenticated read-only access is not
applied until reboot is also fixed. all the AuthenticationMiddleware
instances were never removed from the chain of middlewares when calling
setAuthentication("", "").
40 lines
1.4 KiB
C++
40 lines
1.4 KiB
C++
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
#pragma once
|
|
|
|
#include "Configuration.h"
|
|
#include <ArduinoJson.h>
|
|
#include <ESPAsyncWebServer.h>
|
|
#include <Hoymiles.h>
|
|
#include <TaskSchedulerDeclarations.h>
|
|
|
|
class WebApiWsLiveClass {
|
|
public:
|
|
WebApiWsLiveClass();
|
|
void init(AsyncWebServer& server, Scheduler& scheduler);
|
|
void reload();
|
|
|
|
private:
|
|
static void generateInverterCommonJsonResponse(JsonObject& root, std::shared_ptr<InverterAbstract> inv);
|
|
static void generateInverterChannelJsonResponse(JsonObject& root, std::shared_ptr<InverterAbstract> inv);
|
|
static void generateCommonJsonResponse(JsonVariant& root);
|
|
|
|
static void addField(JsonObject& root, std::shared_ptr<InverterAbstract> inv, const ChannelType_t type, const ChannelNum_t channel, const FieldId_t fieldId, String topic = "");
|
|
static void addTotalField(JsonObject& root, const String& name, const float value, const String& unit, const uint8_t digits);
|
|
|
|
void onLivedataStatus(AsyncWebServerRequest* request);
|
|
void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);
|
|
|
|
AsyncWebSocket _ws;
|
|
AuthenticationMiddleware _simpleDigestAuth;
|
|
|
|
uint32_t _lastPublishStats[INV_MAX_COUNT] = { 0 };
|
|
|
|
std::mutex _mutex;
|
|
|
|
Task _wsCleanupTask;
|
|
void wsCleanupTaskCb();
|
|
|
|
Task _sendDataTask;
|
|
void sendDataTaskCb();
|
|
};
|