Merge pull request #1654 from proddy/dev

cleanup and making asyncWS cleaner
emsesp · Mar 10, 2024 · 7fc7c24 · 7fc7c24
2 parents c5f2dba + c1ae0e7
commit 7fc7c24
Show file tree

Hide file tree

Showing 29 changed files with 2,215 additions and 1,998 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,5 @@
 # vscode
-.vscode/c_cpp_properties.json
-.vscode/extensions.json
-.vscode/launch.json
-.vscode/settings.json
+.vscode/*
 
 # c++ compiling
 .clang_complete
@@ -60,3 +57,4 @@ bw-output/
 
 # testing
 emsesp
+
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -2,8 +2,6 @@
     // See http://go.microsoft.com/fwlink/?LinkId=827846
     // for the documentation about the extensions.json format
     "recommendations": [
-        "dbaeumer.vscode-eslint",
-        "esbenp.prettier-vscode",
         "platformio.platformio-ide"
     ],
     "unwantedRecommendations": [

diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/lib/ESPAsyncWebServer/src/AsyncJson.h b/lib/ESPAsyncWebServer/src/AsyncJson.h
@@ -63,7 +63,7 @@ class AsyncJsonResponse : public AsyncAbstractResponse {
 
     ~AsyncJsonResponse() {
     }
-    JsonVariant & getRoot() {
+    JsonVariant getRoot() {
         return _root;
     }
     bool _sourceValid() const {
@@ -108,7 +108,7 @@ class PrettyAsyncJsonResponse : public AsyncJsonResponse {
     }
 };
 
-typedef std::function<void(AsyncWebServerRequest * request, JsonVariant & json)> ArJsonRequestHandlerFunction;
+typedef std::function<void(AsyncWebServerRequest * request, JsonVariant json)> ArJsonRequestHandlerFunction;
 
 class AsyncCallbackJsonWebHandler : public AsyncWebHandler {
   private:
@@ -142,32 +142,39 @@ class AsyncCallbackJsonWebHandler : public AsyncWebHandler {
         if (!_onRequest)
             return false;
 
-        if (!(_method & request->method()))
+        WebRequestMethodComposite request_method = request->method();
+
+        if (!(_method & request_method))
             return false;
 
         if (_uri.length() && (_uri != request->url() && !request->url().startsWith(_uri + "/")))
             return false;
 
-        if (!request->contentType().equalsIgnoreCase(JSON_MIMETYPE))
+        if (request_method != HTTP_GET && !request->contentType().equalsIgnoreCase(JSON_MIMETYPE))
             return false;
 
         request->addInterestingHeader("ANY");
         return true;
     }
 
     virtual void handleRequest(AsyncWebServerRequest * request) override final {
+        if ((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str()))
+            return request->requestAuthentication();
         if (_onRequest) {
-            JsonVariant json; // empty variant
-            if (request->_tempObject != NULL) {
+            if (request->method() == HTTP_GET) {
+                JsonVariant json;
+                _onRequest(request, json);
+                return;
+            } else if (request->_tempObject != NULL) {
                 JsonDocument         jsonBuffer;
                 DeserializationError error = deserializeJson(jsonBuffer, (uint8_t *)(request->_tempObject));
                 if (!error) {
-                    json = jsonBuffer.as<JsonVariant>();
+                    JsonVariant json = jsonBuffer.as<JsonVariant>();
                     _onRequest(request, json);
                     return;
                 }
             }
-            _onRequest(request, json);
+            request->send(_contentLength > _maxContentLength ? 413 : 400);
         } else {
             request->send(500);
         }