andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

rollback AsyncWS fix #2752

Browse Source
This commit is contained in:
proddy
2025-11-29 15:35:57 +01:00
parent 0a36f1df7a
commit da7a06646a
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/web/WebAPIService.cpp
View File

@@ -144,6 +144,8 @@ void WebAPIService::parse(AsyncWebServerRequest * request, JsonObject input) {
return; return;
} }
api_count_++;
// send the json that came back from the command call // send the json that came back from the command call
// sequence matches CommandRet in command.h (FAIL, OK, NOT_FOUND, ERROR, NOT_ALLOWED, INVALID, NO_VALUE) // sequence matches CommandRet in command.h (FAIL, OK, NOT_FOUND, ERROR, NOT_ALLOWED, INVALID, NO_VALUE)
// 400 (bad request) // 400 (bad request)
@@ -153,16 +155,24 @@ void WebAPIService::parse(AsyncWebServerRequest * request, JsonObject input) {
// 400 (invalid) // 400 (invalid)
int ret_codes[7] = {400, 200, 404, 400, 401, 400, 404}; int ret_codes[7] = {400, 200, 404, 400, 401, 400, 404};
response->setCode(ret_codes[return_code]);
response->setLength();
response->setContentType("application/json; charset=utf-8");
request->send(response);
// serialize JSON to string to ensure correct content-length and avoid HTTP parsing errors (issue #2752) // serialize JSON to string to ensure correct content-length and avoid HTTP parsing errors (issue #2752)
std::string output_str; // std::string output_str;
serializeJson(output, output_str); // serializeJson(output, output_str);
request->send(ret_codes[return_code], "application/json; charset=utf-8", output_str.c_str()); // request->send(ret_codes[return_code], "application/json; charset=utf-8", output_str.c_str());
// delete response;
#if defined(EMSESP_UNITY) #if defined(EMSESP_UNITY)
// store the result so we can test with Unity later // store the result so we can test with Unity later
storeResponse(output); storeResponse(output);
#endif #endif
#if defined(EMSESP_STANDALONE) && !defined(EMSESP_UNITY) #if defined(EMSESP_STANDALONE) && !defined(EMSESP_UNITY)
std::string output_str;
serializeJson(output, output_str);
Serial.printf("%sweb output: %s[%s] %s(%d)%s %s%s", Serial.printf("%sweb output: %s[%s] %s(%d)%s %s%s",
COLOR_WHITE, COLOR_WHITE,
COLOR_BRIGHT_CYAN, COLOR_BRIGHT_CYAN,
@@ -175,9 +185,6 @@ void WebAPIService::parse(AsyncWebServerRequest * request, JsonObject input) {
Serial.println(); Serial.println();
EMSESP::logger().debug("web output: %s %s", request->url().c_str(), output_str.c_str()); EMSESP::logger().debug("web output: %s %s", request->url().c_str(), output_str.c_str());
#endif #endif
api_count_++;
delete response;
} }
#if defined(EMSESP_UNITY) #if defined(EMSESP_UNITY)