ESP32Async/ESPAsyncWebServer @ 3.9.2

platformio.ini

@@ -49,8 +49,8 @@ build_unflags =
     -std=gnu++11
 
 lib_deps =
-    ESP32Async/ESPAsyncWebServer @ 3.8.0
-    ESP32Async/AsyncTCP @ 3.4.7
+    ESP32Async/ESPAsyncWebServer @ 3.9.2
+    ESP32Async/AsyncTCP @ 3.4.9
     bblanchon/ArduinoJson @ 7.4.2
     https://github.com/bertmelis/espMqttClient.git#v1.7.0
     nrf24/RF24 @ 1.4.11

src/WebApi_device.cpp

@@ -16,8 +16,8 @@ void WebApiDeviceClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/device/config", HTTP_GET, std::bind(&WebApiDeviceClass::onDeviceAdminGet, this, _1));
-    server.on("/api/device/config", HTTP_POST, std::bind(&WebApiDeviceClass::onDeviceAdminPost, this, _1));
+    server.on("/api/device/config", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiDeviceClass::onDeviceAdminGet, this, _1)));
+    server.on("/api/device/config", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiDeviceClass::onDeviceAdminPost, this, _1)));
 }
 
 void WebApiDeviceClass::onDeviceAdminGet(AsyncWebServerRequest* request)

src/WebApi_devinfo.cpp

@@ -12,7 +12,7 @@ void WebApiDevInfoClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/devinfo/status", HTTP_GET, std::bind(&WebApiDevInfoClass::onDevInfoStatus, this, _1));
+    server.on("/api/devinfo/status", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiDevInfoClass::onDevInfoStatus, this, _1)));
 }
 
 void WebApiDevInfoClass::onDevInfoStatus(AsyncWebServerRequest* request)

src/WebApi_dtu.cpp

@@ -18,8 +18,8 @@ void WebApiDtuClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/dtu/config", HTTP_GET, std::bind(&WebApiDtuClass::onDtuAdminGet, this, _1));
-    server.on("/api/dtu/config", HTTP_POST, std::bind(&WebApiDtuClass::onDtuAdminPost, this, _1));
+    server.on("/api/dtu/config", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiDtuClass::onDtuAdminGet, this, _1)));
+    server.on("/api/dtu/config", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiDtuClass::onDtuAdminPost, this, _1)));
 
     scheduler.addTask(_applyDataTask);
 }

src/WebApi_eventlog.cpp

@@ -11,7 +11,7 @@ void WebApiEventlogClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/eventlog/status", HTTP_GET, std::bind(&WebApiEventlogClass::onEventlogStatus, this, _1));
+    server.on("/api/eventlog/status", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiEventlogClass::onEventlogStatus, this, _1)));
 }
 
 void WebApiEventlogClass::onEventlogStatus(AsyncWebServerRequest* request)

src/WebApi_file.cpp

@@ -20,10 +20,10 @@ void WebApiFileClass::init(AsyncWebServer& server, Scheduler& scheduler)
     using std::placeholders::_5;
     using std::placeholders::_6;
 
-    server.on("/api/file/get", HTTP_GET, std::bind(&WebApiFileClass::onFileGet, this, _1));
-    server.on("/api/file/delete", HTTP_POST, std::bind(&WebApiFileClass::onFileDelete, this, _1));
-    server.on("/api/file/delete_all", HTTP_POST, std::bind(&WebApiFileClass::onFileDeleteAll, this, _1));
-    server.on("/api/file/list", HTTP_GET, std::bind(&WebApiFileClass::onFileListGet, this, _1));
+    server.on("/api/file/get", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiFileClass::onFileGet, this, _1)));
+    server.on("/api/file/delete", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiFileClass::onFileDelete, this, _1)));
+    server.on("/api/file/delete_all", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiFileClass::onFileDeleteAll, this, _1)));
+    server.on("/api/file/list", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiFileClass::onFileListGet, this, _1)));
     server.on("/api/file/upload", HTTP_POST,
         std::bind(&WebApiFileClass::onFileUploadFinish, this, _1),
         std::bind(&WebApiFileClass::onFileUpload, this, _1, _2, _3, _4, _5, _6));

src/WebApi_gridprofile.cpp

@@ -11,8 +11,8 @@ void WebApiGridProfileClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/gridprofile/status", HTTP_GET, std::bind(&WebApiGridProfileClass::onGridProfileStatus, this, _1));
-    server.on("/api/gridprofile/rawdata", HTTP_GET, std::bind(&WebApiGridProfileClass::onGridProfileRawdata, this, _1));
+    server.on("/api/gridprofile/status", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiGridProfileClass::onGridProfileStatus, this, _1)));
+    server.on("/api/gridprofile/rawdata", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiGridProfileClass::onGridProfileRawdata, this, _1)));
 }
 
 void WebApiGridProfileClass::onGridProfileStatus(AsyncWebServerRequest* request)

src/WebApi_i18n.cpp

@@ -13,8 +13,8 @@ void WebApiI18nClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/i18n/languages", HTTP_GET, std::bind(&WebApiI18nClass::onI18nLanguages, this, _1));
-    server.on("/api/i18n/language", HTTP_GET, std::bind(&WebApiI18nClass::onI18nLanguage, this, _1));
+    server.on("/api/i18n/languages", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiI18nClass::onI18nLanguages, this, _1)));
+    server.on("/api/i18n/language", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiI18nClass::onI18nLanguage, this, _1)));
 }
 
 void WebApiI18nClass::onI18nLanguages(AsyncWebServerRequest* request)

src/WebApi_inverter.cpp

@@ -16,12 +16,12 @@ void WebApiInverterClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/inverter/list", HTTP_GET, std::bind(&WebApiInverterClass::onInverterList, this, _1));
-    server.on("/api/inverter/add", HTTP_POST, std::bind(&WebApiInverterClass::onInverterAdd, this, _1));
-    server.on("/api/inverter/edit", HTTP_POST, std::bind(&WebApiInverterClass::onInverterEdit, this, _1));
-    server.on("/api/inverter/del", HTTP_POST, std::bind(&WebApiInverterClass::onInverterDelete, this, _1));
-    server.on("/api/inverter/order", HTTP_POST, std::bind(&WebApiInverterClass::onInverterOrder, this, _1));
-    server.on("/api/inverter/stats_reset", HTTP_GET, std::bind(&WebApiInverterClass::onInverterStatReset, this, _1));
+    server.on("/api/inverter/list", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiInverterClass::onInverterList, this, _1)));
+    server.on("/api/inverter/add", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiInverterClass::onInverterAdd, this, _1)));
+    server.on("/api/inverter/edit", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiInverterClass::onInverterEdit, this, _1)));
+    server.on("/api/inverter/del", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiInverterClass::onInverterDelete, this, _1)));
+    server.on("/api/inverter/order", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiInverterClass::onInverterOrder, this, _1)));
+    server.on("/api/inverter/stats_reset", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiInverterClass::onInverterStatReset, this, _1)));
 }
 
 void WebApiInverterClass::onInverterList(AsyncWebServerRequest* request)

src/WebApi_limit.cpp

@@ -14,8 +14,8 @@ void WebApiLimitClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/limit/status", HTTP_GET, std::bind(&WebApiLimitClass::onLimitStatus, this, _1));
-    server.on("/api/limit/config", HTTP_POST, std::bind(&WebApiLimitClass::onLimitPost, this, _1));
+    server.on("/api/limit/status", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiLimitClass::onLimitStatus, this, _1)));
+    server.on("/api/limit/config", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiLimitClass::onLimitPost, this, _1)));
 }
 
 void WebApiLimitClass::onLimitStatus(AsyncWebServerRequest* request)

src/WebApi_logging.cpp

@@ -16,8 +16,8 @@ void WebApiLoggingClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/logging/config", HTTP_GET, std::bind(&WebApiLoggingClass::onLoggingAdminGet, this, _1));
-    server.on("/api/logging/config", HTTP_POST, std::bind(&WebApiLoggingClass::onLoggingAdminPost, this, _1));
+    server.on("/api/logging/config", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiLoggingClass::onLoggingAdminGet, this, _1)));
+    server.on("/api/logging/config", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiLoggingClass::onLoggingAdminPost, this, _1)));
 }
 
 void WebApiLoggingClass::onLoggingAdminGet(AsyncWebServerRequest* request)

src/WebApi_maintenance.cpp

@@ -13,7 +13,7 @@ void WebApiMaintenanceClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/maintenance/reboot", HTTP_POST, std::bind(&WebApiMaintenanceClass::onRebootPost, this, _1));
+    server.on("/api/maintenance/reboot", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiMaintenanceClass::onRebootPost, this, _1)));
 }
 
 void WebApiMaintenanceClass::onRebootPost(AsyncWebServerRequest* request)

src/WebApi_mqtt.cpp

@@ -16,9 +16,9 @@ void WebApiMqttClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/mqtt/status", HTTP_GET, std::bind(&WebApiMqttClass::onMqttStatus, this, _1));
-    server.on("/api/mqtt/config", HTTP_GET, std::bind(&WebApiMqttClass::onMqttAdminGet, this, _1));
-    server.on("/api/mqtt/config", HTTP_POST, std::bind(&WebApiMqttClass::onMqttAdminPost, this, _1));
+    server.on("/api/mqtt/status", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiMqttClass::onMqttStatus, this, _1)));
+    server.on("/api/mqtt/config", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiMqttClass::onMqttAdminGet, this, _1)));
+    server.on("/api/mqtt/config", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiMqttClass::onMqttAdminPost, this, _1)));
 }
 
 void WebApiMqttClass::onMqttStatus(AsyncWebServerRequest* request)

src/WebApi_network.cpp

@@ -19,9 +19,9 @@ void WebApiNetworkClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/network/status", HTTP_GET, std::bind(&WebApiNetworkClass::onNetworkStatus, this, _1));
-    server.on("/api/network/config", HTTP_GET, std::bind(&WebApiNetworkClass::onNetworkAdminGet, this, _1));
-    server.on("/api/network/config", HTTP_POST, std::bind(&WebApiNetworkClass::onNetworkAdminPost, this, _1));
+    server.on("/api/network/status", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiNetworkClass::onNetworkStatus, this, _1)));
+    server.on("/api/network/config", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiNetworkClass::onNetworkAdminGet, this, _1)));
+    server.on("/api/network/config", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiNetworkClass::onNetworkAdminPost, this, _1)));
 
     scheduler.addTask(_applyDataTask);
 }

src/WebApi_ntp.cpp

@@ -15,11 +15,11 @@ void WebApiNtpClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/ntp/status", HTTP_GET, std::bind(&WebApiNtpClass::onNtpStatus, this, _1));
-    server.on("/api/ntp/config", HTTP_GET, std::bind(&WebApiNtpClass::onNtpAdminGet, this, _1));
-    server.on("/api/ntp/config", HTTP_POST, std::bind(&WebApiNtpClass::onNtpAdminPost, this, _1));
-    server.on("/api/ntp/time", HTTP_GET, std::bind(&WebApiNtpClass::onNtpTimeGet, this, _1));
-    server.on("/api/ntp/time", HTTP_POST, std::bind(&WebApiNtpClass::onNtpTimePost, this, _1));
+    server.on("/api/ntp/status", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiNtpClass::onNtpStatus, this, _1)));
+    server.on("/api/ntp/config", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiNtpClass::onNtpAdminGet, this, _1)));
+    server.on("/api/ntp/config", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiNtpClass::onNtpAdminPost, this, _1)));
+    server.on("/api/ntp/time", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiNtpClass::onNtpTimeGet, this, _1)));
+    server.on("/api/ntp/time", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiNtpClass::onNtpTimePost, this, _1)));
 }
 
 void WebApiNtpClass::onNtpStatus(AsyncWebServerRequest* request)

src/WebApi_power.cpp

@@ -12,8 +12,8 @@ void WebApiPowerClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/power/status", HTTP_GET, std::bind(&WebApiPowerClass::onPowerStatus, this, _1));
-    server.on("/api/power/config", HTTP_POST, std::bind(&WebApiPowerClass::onPowerPost, this, _1));
+    server.on("/api/power/status", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiPowerClass::onPowerStatus, this, _1)));
+    server.on("/api/power/config", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiPowerClass::onPowerPost, this, _1)));
 }
 
 void WebApiPowerClass::onPowerStatus(AsyncWebServerRequest* request)

src/WebApi_prometheus.cpp

@@ -17,7 +17,7 @@ void WebApiPrometheusClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/prometheus/metrics", HTTP_GET, std::bind(&WebApiPrometheusClass::onPrometheusMetricsGet, this, _1));
+    server.on("/api/prometheus/metrics", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiPrometheusClass::onPrometheusMetricsGet, this, _1)));
 }
 
 void WebApiPrometheusClass::onPrometheusMetricsGet(AsyncWebServerRequest* request)

src/WebApi_security.cpp

@@ -13,9 +13,9 @@ void WebApiSecurityClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/security/config", HTTP_GET, std::bind(&WebApiSecurityClass::onSecurityGet, this, _1));
-    server.on("/api/security/config", HTTP_POST, std::bind(&WebApiSecurityClass::onSecurityPost, this, _1));
-    server.on("/api/security/authenticate", HTTP_GET, std::bind(&WebApiSecurityClass::onAuthenticateGet, this, _1));
+    server.on("/api/security/config", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiSecurityClass::onSecurityGet, this, _1)));
+    server.on("/api/security/config", HTTP_POST, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiSecurityClass::onSecurityPost, this, _1)));
+    server.on("/api/security/authenticate", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiSecurityClass::onAuthenticateGet, this, _1)));
 }
 
 void WebApiSecurityClass::onSecurityGet(AsyncWebServerRequest* request)

src/WebApi_sysstatus.cpp

@@ -18,7 +18,7 @@ void WebApiSysstatusClass::init(AsyncWebServer& server, Scheduler& scheduler)
 {
     using std::placeholders::_1;
 
-    server.on("/api/system/status", HTTP_GET, std::bind(&WebApiSysstatusClass::onSystemStatus, this, _1));
+    server.on("/api/system/status", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiSysstatusClass::onSystemStatus, this, _1)));
 }
 
 void WebApiSysstatusClass::onSystemStatus(AsyncWebServerRequest* request)

src/WebApi_ws_live.cpp

@@ -32,7 +32,7 @@ void WebApiWsLiveClass::init(AsyncWebServer& server, Scheduler& scheduler)
     using std::placeholders::_5;
     using std::placeholders::_6;
 
-    server.on("/api/livedata/status", HTTP_GET, std::bind(&WebApiWsLiveClass::onLivedataStatus, this, _1));
+    server.on("/api/livedata/status", HTTP_GET, static_cast<ArRequestHandlerFunction>(std::bind(&WebApiWsLiveClass::onLivedataStatus, this, _1)));
 
     server.addHandler(&_ws);
     _ws.onEvent(std::bind(&WebApiWsLiveClass::onWebsocketEvent, this, _1, _2, _3, _4, _5, _6));