diff --git a/include/WebApi_config.h b/include/WebApi_config.h index 91243c18..f29dc8fc 100644 --- a/include/WebApi_config.h +++ b/include/WebApi_config.h @@ -14,6 +14,4 @@ private: void onConfigListGet(AsyncWebServerRequest* request); void onConfigUploadFinish(AsyncWebServerRequest* request); void onConfigUpload(AsyncWebServerRequest* request, String filename, size_t index, uint8_t* data, size_t len, bool final); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_device.h b/include/WebApi_device.h index f74315e3..48976bce 100644 --- a/include/WebApi_device.h +++ b/include/WebApi_device.h @@ -11,6 +11,4 @@ public: private: void onDeviceAdminGet(AsyncWebServerRequest* request); void onDeviceAdminPost(AsyncWebServerRequest* request); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_devinfo.h b/include/WebApi_devinfo.h index d1924ecc..e312ecdf 100644 --- a/include/WebApi_devinfo.h +++ b/include/WebApi_devinfo.h @@ -10,6 +10,4 @@ public: private: void onDevInfoStatus(AsyncWebServerRequest* request); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_dtu.h b/include/WebApi_dtu.h index 3acf4494..20f5274e 100644 --- a/include/WebApi_dtu.h +++ b/include/WebApi_dtu.h @@ -13,8 +13,6 @@ private: void onDtuAdminGet(AsyncWebServerRequest* request); void onDtuAdminPost(AsyncWebServerRequest* request); - AsyncWebServer* _server; - Task _applyDataTask; void applyDataTaskCb(); }; diff --git a/include/WebApi_eventlog.h b/include/WebApi_eventlog.h index 3cba7e5e..e7fe9874 100644 --- a/include/WebApi_eventlog.h +++ b/include/WebApi_eventlog.h @@ -10,6 +10,4 @@ public: private: void onEventlogStatus(AsyncWebServerRequest* request); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_firmware.h b/include/WebApi_firmware.h index fd9a9642..990a5e06 100644 --- a/include/WebApi_firmware.h +++ b/include/WebApi_firmware.h @@ -11,6 +11,4 @@ public: private: void onFirmwareUpdateFinish(AsyncWebServerRequest* request); void onFirmwareUpdateUpload(AsyncWebServerRequest* request, String filename, size_t index, uint8_t* data, size_t len, bool final); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_gridprofile.h b/include/WebApi_gridprofile.h index 73c15654..cff4ddb8 100644 --- a/include/WebApi_gridprofile.h +++ b/include/WebApi_gridprofile.h @@ -11,6 +11,4 @@ public: private: void onGridProfileStatus(AsyncWebServerRequest* request); void onGridProfileRawdata(AsyncWebServerRequest* request); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_inverter.h b/include/WebApi_inverter.h index b8f05425..c316622e 100644 --- a/include/WebApi_inverter.h +++ b/include/WebApi_inverter.h @@ -14,6 +14,4 @@ private: void onInverterEdit(AsyncWebServerRequest* request); void onInverterDelete(AsyncWebServerRequest* request); void onInverterOrder(AsyncWebServerRequest* request); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_limit.h b/include/WebApi_limit.h index 84d48d3a..285be27c 100644 --- a/include/WebApi_limit.h +++ b/include/WebApi_limit.h @@ -11,6 +11,4 @@ public: private: void onLimitStatus(AsyncWebServerRequest* request); void onLimitPost(AsyncWebServerRequest* request); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_maintenance.h b/include/WebApi_maintenance.h index 02dc4702..5a00bbab 100644 --- a/include/WebApi_maintenance.h +++ b/include/WebApi_maintenance.h @@ -10,6 +10,4 @@ public: private: void onRebootPost(AsyncWebServerRequest* request); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_mqtt.h b/include/WebApi_mqtt.h index 6ec971c9..b259752b 100644 --- a/include/WebApi_mqtt.h +++ b/include/WebApi_mqtt.h @@ -15,6 +15,4 @@ private: void onMqttAdminGet(AsyncWebServerRequest* request); void onMqttAdminPost(AsyncWebServerRequest* request); String getTlsCertInfo(const char* cert); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_network.h b/include/WebApi_network.h index 7587bbbd..179fa492 100644 --- a/include/WebApi_network.h +++ b/include/WebApi_network.h @@ -12,6 +12,4 @@ private: void onNetworkStatus(AsyncWebServerRequest* request); void onNetworkAdminGet(AsyncWebServerRequest* request); void onNetworkAdminPost(AsyncWebServerRequest* request); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_ntp.h b/include/WebApi_ntp.h index 75e02c54..5ce040ed 100644 --- a/include/WebApi_ntp.h +++ b/include/WebApi_ntp.h @@ -14,6 +14,4 @@ private: void onNtpAdminPost(AsyncWebServerRequest* request); void onNtpTimeGet(AsyncWebServerRequest* request); void onNtpTimePost(AsyncWebServerRequest* request); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_power.h b/include/WebApi_power.h index 7d186eb4..aed11b0e 100644 --- a/include/WebApi_power.h +++ b/include/WebApi_power.h @@ -11,6 +11,4 @@ public: private: void onPowerStatus(AsyncWebServerRequest* request); void onPowerPost(AsyncWebServerRequest* request); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_prometheus.h b/include/WebApi_prometheus.h index 08e2221d..b3ee6a18 100644 --- a/include/WebApi_prometheus.h +++ b/include/WebApi_prometheus.h @@ -17,8 +17,6 @@ private: void addPanelInfo(AsyncResponseStream* stream, const String& serial, const uint8_t idx, std::shared_ptr inv, const ChannelType_t type, const ChannelNum_t channel); - AsyncWebServer* _server; - enum MetricType_t { NONE = 0, GAUGE, diff --git a/include/WebApi_security.h b/include/WebApi_security.h index b5981e3d..ac76522a 100644 --- a/include/WebApi_security.h +++ b/include/WebApi_security.h @@ -13,6 +13,4 @@ private: void onSecurityPost(AsyncWebServerRequest* request); void onAuthenticateGet(AsyncWebServerRequest* request); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_sysstatus.h b/include/WebApi_sysstatus.h index 32bdc7e3..c754ac0d 100644 --- a/include/WebApi_sysstatus.h +++ b/include/WebApi_sysstatus.h @@ -10,6 +10,4 @@ public: private: void onSystemStatus(AsyncWebServerRequest* request); - - AsyncWebServer* _server; }; diff --git a/include/WebApi_webapp.h b/include/WebApi_webapp.h index 401408c6..abbff8b6 100644 --- a/include/WebApi_webapp.h +++ b/include/WebApi_webapp.h @@ -7,7 +7,4 @@ class WebApiWebappClass { public: void init(AsyncWebServer& server, Scheduler& scheduler); - -private: - AsyncWebServer* _server; }; diff --git a/include/WebApi_ws_console.h b/include/WebApi_ws_console.h index 4289afd0..cf7beecc 100644 --- a/include/WebApi_ws_console.h +++ b/include/WebApi_ws_console.h @@ -10,7 +10,6 @@ public: void init(AsyncWebServer& server, Scheduler& scheduler); private: - AsyncWebServer* _server; AsyncWebSocket _ws; Task _wsCleanupTask; diff --git a/include/WebApi_ws_live.h b/include/WebApi_ws_live.h index 392ca869..9adc848e 100644 --- a/include/WebApi_ws_live.h +++ b/include/WebApi_ws_live.h @@ -18,7 +18,6 @@ private: void onLivedataStatus(AsyncWebServerRequest* request); void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len); - AsyncWebServer* _server; AsyncWebSocket _ws; uint32_t _lastWsPublish = 0; diff --git a/src/WebApi_config.cpp b/src/WebApi_config.cpp index 3372e4f4..c275ffc7 100644 --- a/src/WebApi_config.cpp +++ b/src/WebApi_config.cpp @@ -19,12 +19,10 @@ void WebApiConfigClass::init(AsyncWebServer& server, Scheduler& scheduler) using std::placeholders::_5; using std::placeholders::_6; - _server = &server; - - _server->on("/api/config/get", HTTP_GET, std::bind(&WebApiConfigClass::onConfigGet, this, _1)); - _server->on("/api/config/delete", HTTP_POST, std::bind(&WebApiConfigClass::onConfigDelete, this, _1)); - _server->on("/api/config/list", HTTP_GET, std::bind(&WebApiConfigClass::onConfigListGet, this, _1)); - _server->on("/api/config/upload", HTTP_POST, + server.on("/api/config/get", HTTP_GET, std::bind(&WebApiConfigClass::onConfigGet, this, _1)); + server.on("/api/config/delete", HTTP_POST, std::bind(&WebApiConfigClass::onConfigDelete, this, _1)); + server.on("/api/config/list", HTTP_GET, std::bind(&WebApiConfigClass::onConfigListGet, this, _1)); + server.on("/api/config/upload", HTTP_POST, std::bind(&WebApiConfigClass::onConfigUploadFinish, this, _1), std::bind(&WebApiConfigClass::onConfigUpload, this, _1, _2, _3, _4, _5, _6)); } diff --git a/src/WebApi_device.cpp b/src/WebApi_device.cpp index 5f43b37d..b29f71db 100644 --- a/src/WebApi_device.cpp +++ b/src/WebApi_device.cpp @@ -16,10 +16,8 @@ void WebApiDeviceClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _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, std::bind(&WebApiDeviceClass::onDeviceAdminGet, this, _1)); + server.on("/api/device/config", HTTP_POST, std::bind(&WebApiDeviceClass::onDeviceAdminPost, this, _1)); } void WebApiDeviceClass::onDeviceAdminGet(AsyncWebServerRequest* request) diff --git a/src/WebApi_devinfo.cpp b/src/WebApi_devinfo.cpp index a27cb31e..212a7f7d 100644 --- a/src/WebApi_devinfo.cpp +++ b/src/WebApi_devinfo.cpp @@ -12,9 +12,7 @@ void WebApiDevInfoClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _server->on("/api/devinfo/status", HTTP_GET, std::bind(&WebApiDevInfoClass::onDevInfoStatus, this, _1)); + server.on("/api/devinfo/status", HTTP_GET, std::bind(&WebApiDevInfoClass::onDevInfoStatus, this, _1)); } void WebApiDevInfoClass::onDevInfoStatus(AsyncWebServerRequest* request) diff --git a/src/WebApi_dtu.cpp b/src/WebApi_dtu.cpp index 7886afce..aed09834 100644 --- a/src/WebApi_dtu.cpp +++ b/src/WebApi_dtu.cpp @@ -18,10 +18,8 @@ void WebApiDtuClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _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, std::bind(&WebApiDtuClass::onDtuAdminGet, this, _1)); + server.on("/api/dtu/config", HTTP_POST, std::bind(&WebApiDtuClass::onDtuAdminPost, this, _1)); scheduler.addTask(_applyDataTask); } diff --git a/src/WebApi_eventlog.cpp b/src/WebApi_eventlog.cpp index a92e515e..51e85aff 100644 --- a/src/WebApi_eventlog.cpp +++ b/src/WebApi_eventlog.cpp @@ -11,9 +11,7 @@ void WebApiEventlogClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _server->on("/api/eventlog/status", HTTP_GET, std::bind(&WebApiEventlogClass::onEventlogStatus, this, _1)); + server.on("/api/eventlog/status", HTTP_GET, std::bind(&WebApiEventlogClass::onEventlogStatus, this, _1)); } void WebApiEventlogClass::onEventlogStatus(AsyncWebServerRequest* request) diff --git a/src/WebApi_firmware.cpp b/src/WebApi_firmware.cpp index 617fca06..9491f935 100644 --- a/src/WebApi_firmware.cpp +++ b/src/WebApi_firmware.cpp @@ -19,9 +19,7 @@ void WebApiFirmwareClass::init(AsyncWebServer& server, Scheduler& scheduler) using std::placeholders::_5; using std::placeholders::_6; - _server = &server; - - _server->on("/api/firmware/update", HTTP_POST, + server.on("/api/firmware/update", HTTP_POST, std::bind(&WebApiFirmwareClass::onFirmwareUpdateFinish, this, _1), std::bind(&WebApiFirmwareClass::onFirmwareUpdateUpload, this, _1, _2, _3, _4, _5, _6)); } diff --git a/src/WebApi_gridprofile.cpp b/src/WebApi_gridprofile.cpp index 587f4640..60c340fa 100644 --- a/src/WebApi_gridprofile.cpp +++ b/src/WebApi_gridprofile.cpp @@ -11,10 +11,8 @@ void WebApiGridProfileClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _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, std::bind(&WebApiGridProfileClass::onGridProfileStatus, this, _1)); + server.on("/api/gridprofile/rawdata", HTTP_GET, std::bind(&WebApiGridProfileClass::onGridProfileRawdata, this, _1)); } void WebApiGridProfileClass::onGridProfileStatus(AsyncWebServerRequest* request) diff --git a/src/WebApi_inverter.cpp b/src/WebApi_inverter.cpp index f1bfc2aa..32a47235 100644 --- a/src/WebApi_inverter.cpp +++ b/src/WebApi_inverter.cpp @@ -16,13 +16,11 @@ void WebApiInverterClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _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/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)); } void WebApiInverterClass::onInverterList(AsyncWebServerRequest* request) diff --git a/src/WebApi_limit.cpp b/src/WebApi_limit.cpp index be8e1202..1d9c111a 100644 --- a/src/WebApi_limit.cpp +++ b/src/WebApi_limit.cpp @@ -14,10 +14,8 @@ void WebApiLimitClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _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, std::bind(&WebApiLimitClass::onLimitStatus, this, _1)); + server.on("/api/limit/config", HTTP_POST, std::bind(&WebApiLimitClass::onLimitPost, this, _1)); } void WebApiLimitClass::onLimitStatus(AsyncWebServerRequest* request) diff --git a/src/WebApi_maintenance.cpp b/src/WebApi_maintenance.cpp index 922b0ba0..ba257efa 100644 --- a/src/WebApi_maintenance.cpp +++ b/src/WebApi_maintenance.cpp @@ -13,9 +13,7 @@ void WebApiMaintenanceClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _server->on("/api/maintenance/reboot", HTTP_POST, std::bind(&WebApiMaintenanceClass::onRebootPost, this, _1)); + server.on("/api/maintenance/reboot", HTTP_POST, std::bind(&WebApiMaintenanceClass::onRebootPost, this, _1)); } void WebApiMaintenanceClass::onRebootPost(AsyncWebServerRequest* request) diff --git a/src/WebApi_mqtt.cpp b/src/WebApi_mqtt.cpp index 2361c44e..a10d0d0b 100644 --- a/src/WebApi_mqtt.cpp +++ b/src/WebApi_mqtt.cpp @@ -15,11 +15,9 @@ void WebApiMqttClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _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, 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)); } void WebApiMqttClass::onMqttStatus(AsyncWebServerRequest* request) diff --git a/src/WebApi_network.cpp b/src/WebApi_network.cpp index ba998053..12f637ad 100644 --- a/src/WebApi_network.cpp +++ b/src/WebApi_network.cpp @@ -14,11 +14,9 @@ void WebApiNetworkClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _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, 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)); } void WebApiNetworkClass::onNetworkStatus(AsyncWebServerRequest* request) diff --git a/src/WebApi_ntp.cpp b/src/WebApi_ntp.cpp index e0bcd699..02bbfb10 100644 --- a/src/WebApi_ntp.cpp +++ b/src/WebApi_ntp.cpp @@ -15,13 +15,11 @@ void WebApiNtpClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _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, 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)); } void WebApiNtpClass::onNtpStatus(AsyncWebServerRequest* request) diff --git a/src/WebApi_power.cpp b/src/WebApi_power.cpp index 54fc664e..b5196789 100644 --- a/src/WebApi_power.cpp +++ b/src/WebApi_power.cpp @@ -12,10 +12,8 @@ void WebApiPowerClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _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, std::bind(&WebApiPowerClass::onPowerStatus, this, _1)); + server.on("/api/power/config", HTTP_POST, std::bind(&WebApiPowerClass::onPowerPost, this, _1)); } void WebApiPowerClass::onPowerStatus(AsyncWebServerRequest* request) diff --git a/src/WebApi_prometheus.cpp b/src/WebApi_prometheus.cpp index 3204b62c..109e2fe0 100644 --- a/src/WebApi_prometheus.cpp +++ b/src/WebApi_prometheus.cpp @@ -14,9 +14,7 @@ void WebApiPrometheusClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _server->on("/api/prometheus/metrics", HTTP_GET, std::bind(&WebApiPrometheusClass::onPrometheusMetricsGet, this, _1)); + server.on("/api/prometheus/metrics", HTTP_GET, std::bind(&WebApiPrometheusClass::onPrometheusMetricsGet, this, _1)); } void WebApiPrometheusClass::onPrometheusMetricsGet(AsyncWebServerRequest* request) diff --git a/src/WebApi_security.cpp b/src/WebApi_security.cpp index 20519681..b95ebb29 100644 --- a/src/WebApi_security.cpp +++ b/src/WebApi_security.cpp @@ -13,11 +13,9 @@ void WebApiSecurityClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _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, 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)); } void WebApiSecurityClass::onSecurityGet(AsyncWebServerRequest* request) diff --git a/src/WebApi_sysstatus.cpp b/src/WebApi_sysstatus.cpp index 896e5d65..7bf2b73c 100644 --- a/src/WebApi_sysstatus.cpp +++ b/src/WebApi_sysstatus.cpp @@ -20,9 +20,7 @@ void WebApiSysstatusClass::init(AsyncWebServer& server, Scheduler& scheduler) { using std::placeholders::_1; - _server = &server; - - _server->on("/api/system/status", HTTP_GET, std::bind(&WebApiSysstatusClass::onSystemStatus, this, _1)); + server.on("/api/system/status", HTTP_GET, std::bind(&WebApiSysstatusClass::onSystemStatus, this, _1)); } void WebApiSysstatusClass::onSystemStatus(AsyncWebServerRequest* request) diff --git a/src/WebApi_webapp.cpp b/src/WebApi_webapp.cpp index 9203505b..db5cca43 100644 --- a/src/WebApi_webapp.cpp +++ b/src/WebApi_webapp.cpp @@ -24,48 +24,46 @@ extern const uint8_t file_site_webmanifest_end[] asm("_binary_webapp_dist_site_w void WebApiWebappClass::init(AsyncWebServer& server, Scheduler& scheduler) { - _server = &server; - - _server->on("/", HTTP_GET, [](AsyncWebServerRequest* request) { + server.on("/", HTTP_GET, [](AsyncWebServerRequest* request) { AsyncWebServerResponse* response = request->beginResponse_P(200, "text/html", file_index_html_start, file_index_html_end - file_index_html_start); response->addHeader("Content-Encoding", "gzip"); request->send(response); }); - _server->onNotFound([](AsyncWebServerRequest* request) { + server.onNotFound([](AsyncWebServerRequest* request) { AsyncWebServerResponse* response = request->beginResponse_P(200, "text/html", file_index_html_start, file_index_html_end - file_index_html_start); response->addHeader("Content-Encoding", "gzip"); request->send(response); }); - _server->on("/index.html", HTTP_GET, [](AsyncWebServerRequest* request) { + server.on("/index.html", HTTP_GET, [](AsyncWebServerRequest* request) { AsyncWebServerResponse* response = request->beginResponse_P(200, "text/html", file_index_html_start, file_index_html_end - file_index_html_start); response->addHeader("Content-Encoding", "gzip"); request->send(response); }); - _server->on("/favicon.ico", HTTP_GET, [](AsyncWebServerRequest* request) { + server.on("/favicon.ico", HTTP_GET, [](AsyncWebServerRequest* request) { AsyncWebServerResponse* response = request->beginResponse_P(200, "image/x-icon", file_favicon_ico_start, file_favicon_ico_end - file_favicon_ico_start); request->send(response); }); - _server->on("/favicon.png", HTTP_GET, [](AsyncWebServerRequest* request) { + server.on("/favicon.png", HTTP_GET, [](AsyncWebServerRequest* request) { AsyncWebServerResponse* response = request->beginResponse_P(200, "image/png", file_favicon_png_start, file_favicon_png_end - file_favicon_png_start); request->send(response); }); - _server->on("/zones.json", HTTP_GET, [](AsyncWebServerRequest* request) { + server.on("/zones.json", HTTP_GET, [](AsyncWebServerRequest* request) { AsyncWebServerResponse* response = request->beginResponse_P(200, "application/json", file_zones_json_start, file_zones_json_end - file_zones_json_start); response->addHeader("Content-Encoding", "gzip"); request->send(response); }); - _server->on("/site.webmanifest", HTTP_GET, [](AsyncWebServerRequest* request) { + server.on("/site.webmanifest", HTTP_GET, [](AsyncWebServerRequest* request) { AsyncWebServerResponse* response = request->beginResponse_P(200, "application/json", file_site_webmanifest_start, file_site_webmanifest_end - file_site_webmanifest_start); request->send(response); }); - _server->on("/js/app.js", HTTP_GET, [](AsyncWebServerRequest* request) { + server.on("/js/app.js", HTTP_GET, [](AsyncWebServerRequest* request) { #ifdef ETAG_HTTP_HEADER_VAL // check client If-None-Match header vs ETag/AUTO_GIT_HASH bool eTagMatch = false; diff --git a/src/WebApi_ws_console.cpp b/src/WebApi_ws_console.cpp index aaca6d89..1f1efcb2 100644 --- a/src/WebApi_ws_console.cpp +++ b/src/WebApi_ws_console.cpp @@ -16,8 +16,7 @@ WebApiWsConsoleClass::WebApiWsConsoleClass() void WebApiWsConsoleClass::init(AsyncWebServer& server, Scheduler& scheduler) { - _server = &server; - _server->addHandler(&_ws); + server.addHandler(&_ws); MessageOutput.register_ws_output(&_ws); scheduler.addTask(_wsCleanupTask); diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp index 6f4bd38b..8ac41901 100644 --- a/src/WebApi_ws_live.cpp +++ b/src/WebApi_ws_live.cpp @@ -27,10 +27,9 @@ void WebApiWsLiveClass::init(AsyncWebServer& server, Scheduler& scheduler) using std::placeholders::_5; using std::placeholders::_6; - _server = &server; - _server->on("/api/livedata/status", HTTP_GET, std::bind(&WebApiWsLiveClass::onLivedataStatus, this, _1)); + server.on("/api/livedata/status", HTTP_GET, std::bind(&WebApiWsLiveClass::onLivedataStatus, this, _1)); - _server->addHandler(&_ws); + server.addHandler(&_ws); _ws.onEvent(std::bind(&WebApiWsLiveClass::onWebsocketEvent, this, _1, _2, _3, _4, _5, _6)); scheduler.addTask(_wsCleanupTask);