remove custom work-around for missing arduinojson6 support - it has since been added to async esp core

Author: rjwats

lib/framework/APStatus.cpp

@@ -7,7 +7,7 @@ APStatus::APStatus(AsyncWebServer* server, SecurityManager* securityManager) {
 }
 
 void APStatus::apStatus(AsyncWebServerRequest *request) {
-  AsyncJsonResponse * response = new AsyncJsonResponse(MAX_AP_STATUS_SIZE);
+  AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_AP_STATUS_SIZE);
   JsonObject root = response->getRoot();
 
   WiFiMode_t currentWiFiMode = WiFi.getMode();

lib/framework/APStatus.h

@@ -11,7 +11,7 @@
 
 #include <ESPAsyncWebServer.h>
 #include <ArduinoJson.h>
-#include <AsyncArduinoJson6.h>
+#include <AsyncJson.h>
 #include <IPAddress.h>
 #include <SecurityManager.h>
 

lib/framework/AsyncArduinoJson6.h

@@ -0,0 +1,31 @@
+#ifndef _AsyncJsonCallbackResponse_H_
+#define _AsyncJsonCallbackResponse_H_
+
+#include <ESPAsyncWebServer.h>
+#include <AsyncJson.h>
+
+/*
+* Listens for a response being destroyed and calls a callback during said distruction.
+* used so we can take action after the response has been rendered to the client.
+*
+* Avoids having to fork ESPAsyncWebServer with a callback feature, but not nice!
+*/
+
+typedef std::function<void()> AsyncJsonCallback;
+
+class AsyncJsonCallbackResponse : public AsyncJsonResponse
+{
+
+private:
+    AsyncJsonCallback _callback;
+
+public:
+    AsyncJsonCallbackResponse(AsyncJsonCallback callback, bool isArray = false, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE)
+        : AsyncJsonResponse(isArray, maxJsonBufferSize), _callback{callback} {}
+    ~AsyncJsonCallbackResponse()
+    {
+        _callback();
+    }
+};
+
+#endif // end _AsyncJsonCallbackResponse_H_

lib/framework/AsyncJsonCallbackResponse.h

@@ -30,7 +30,7 @@ void AuthenticationService::signIn(AsyncWebServerRequest *request, JsonDocument
     Authentication authentication = _securityManager->authenticate(username, password);
     if (authentication.isAuthenticated()) {
       User* user = authentication.getUser();      
-      AsyncJsonResponse * response = new AsyncJsonResponse(MAX_AUTHENTICATION_SIZE);
+      AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_AUTHENTICATION_SIZE);
       JsonObject jsonObject = response->getRoot();
       jsonObject["access_token"] = _securityManager->generateJWT(user);
       response->setLength();

lib/framework/AuthenticationService.cpp

@@ -4,7 +4,7 @@
 #include <SecurityManager.h>
 #include <ESPAsyncWebServer.h>
 #include <AsyncJsonWebHandler.h>
-#include <AsyncArduinoJson6.h>
+#include <AsyncJson.h>
 
 #define VERIFY_AUTHORIZATION_PATH "/rest/verifyAuthorization"
 #define SIGN_IN_PATH "/rest/signIn"

lib/framework/AuthenticationService.h

@@ -7,7 +7,7 @@ NTPStatus::NTPStatus(AsyncWebServer* server, SecurityManager* securityManager) {
 }
 
 void NTPStatus::ntpStatus(AsyncWebServerRequest *request) {
-  AsyncJsonResponse * response = new AsyncJsonResponse(MAX_NTP_STATUS_SIZE);
+  AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_NTP_STATUS_SIZE);
   JsonObject root = response->getRoot();
 
   // request time now first, this can sometimes force a sync

lib/framework/NTPStatus.cpp

@@ -11,7 +11,7 @@
 
 #include <ESPAsyncWebServer.h>
 #include <ArduinoJson.h>
-#include <AsyncArduinoJson6.h>
+#include <AsyncJson.h>
 #include <TimeLib.h>
 #include <NtpClientLib.h>
 #include <SecurityManager.h>

lib/framework/NTPStatus.h

@@ -5,7 +5,7 @@
 #include <FS.h>
 #include <ArduinoJson.h>
 #include <AsyncJsonWebHandler.h>
-#include <AsyncArduinoJson6.h>
+#include <AsyncJson.h>
 
 /**
 * At the moment, not expecting settings service to have to deal with large JSON

lib/framework/SettingsPersistence.h

@@ -2,78 +2,85 @@
 #define SettingsService_h
 
 #if defined(ESP8266)
-  #include <ESP8266WiFi.h>
-  #include <ESPAsyncTCP.h>
+#include <ESP8266WiFi.h>
+#include <ESPAsyncTCP.h>
 #elif defined(ESP_PLATFORM)
-  #include <WiFi.h>
-  #include <AsyncTCP.h>
+#include <WiFi.h>
+#include <AsyncTCP.h>
 #endif
 
 #include <SecurityManager.h>
 #include <SettingsPersistence.h>
 #include <ESPAsyncWebServer.h>
 #include <ArduinoJson.h>
 #include <AsyncJsonWebHandler.h>
-#include <AsyncArduinoJson6.h>
+#include <AsyncJson.h>
+#include <AsyncJsonCallbackResponse.h>
 
 /*
 * Abstraction of a service which stores it's settings as JSON in a file system.
 */
-class SettingsService : public SettingsPersistence {
+class SettingsService : public SettingsPersistence
+{
 
-  public:
+public:
+  SettingsService(AsyncWebServer *server, FS *fs, char const *servicePath, char const *filePath) : SettingsPersistence(fs, filePath), _servicePath(servicePath)
+  {
+    server->on(_servicePath, HTTP_GET, std::bind(&SettingsService::fetchConfig, this, std::placeholders::_1));
 
-    SettingsService(AsyncWebServer* server, FS* fs, char const* servicePath, char const* filePath): SettingsPersistence(fs, filePath), _servicePath(servicePath) {
-      server->on(_servicePath, HTTP_GET, std::bind(&SettingsService::fetchConfig, this, std::placeholders::_1));    
-
-      _updateHandler.setUri(servicePath);
-      _updateHandler.setMethod(HTTP_POST);
-      _updateHandler.setMaxContentLength(MAX_SETTINGS_SIZE);
-      _updateHandler.onRequest(std::bind(&SettingsService::updateConfig, this, std::placeholders::_1, std::placeholders::_2));
-      server->addHandler(&_updateHandler);     
-    }
+    _updateHandler.setUri(servicePath);
+    _updateHandler.setMethod(HTTP_POST);
+    _updateHandler.setMaxContentLength(MAX_SETTINGS_SIZE);
+    _updateHandler.onRequest(std::bind(&SettingsService::updateConfig, this, std::placeholders::_1, std::placeholders::_2));
+    server->addHandler(&_updateHandler);
+  }
 
-    virtual ~SettingsService() {}
+  virtual ~SettingsService() {}
 
-    void begin() {
-      // read the initial data from the file system
-      readFromFS();
-    }
+  void begin()
+  {
+    // read the initial data from the file system
+    readFromFS();
+  }
 
 protected:
-  char const* _servicePath;
+  char const *_servicePath;
   AsyncJsonWebHandler _updateHandler;
 
-  virtual void fetchConfig(AsyncWebServerRequest *request) {
+  virtual void fetchConfig(AsyncWebServerRequest *request)
+  {
     // handle the request
-    AsyncJsonResponse * response = new AsyncJsonResponse(MAX_SETTINGS_SIZE);
-    JsonObject jsonObject = response->getRoot();  
+    AsyncJsonResponse *response = new AsyncJsonResponse(false, MAX_SETTINGS_SIZE);
+    JsonObject jsonObject = response->getRoot();
     writeToJsonObject(jsonObject);
     response->setLength();
     request->send(response);
   }
 
-  virtual void updateConfig(AsyncWebServerRequest *request, JsonDocument &jsonDocument) {
+  virtual void updateConfig(AsyncWebServerRequest *request, JsonDocument &jsonDocument)
+  {
     // handle the request
-    if (jsonDocument.is<JsonObject>()){
+    if (jsonDocument.is<JsonObject>())
+    {
       JsonObject newConfig = jsonDocument.as<JsonObject>();
       readFromJsonObject(newConfig);
       writeToFS();
 
       // write settings back with a callback to reconfigure the wifi
-      AsyncJsonCallbackResponse * response = new AsyncJsonCallbackResponse([this] () {onConfigUpdated();}, MAX_SETTINGS_SIZE);
-      JsonObject jsonObject = response->getRoot();   
+      AsyncJsonCallbackResponse *response = new AsyncJsonCallbackResponse([this]() { onConfigUpdated(); }, false, MAX_SETTINGS_SIZE);
+      JsonObject jsonObject = response->getRoot();
       writeToJsonObject(jsonObject);
       response->setLength();
       request->send(response);
-    } else {
+    }
+    else
+    {
       request->send(400);
     }
   }
 
   // implement to perform action when config has been updated
-  virtual void onConfigUpdated(){}
-
+  virtual void onConfigUpdated() {}
 };
 
 #endif // end SettingsService