Skip to content

Commit 4ebbd86

Browse files
committed
Use Aircoookie/ESPAsyncWebServer v2.4.2 instead of softhack007 fork
- Upgrade to newer ESPAsyncWebServer that has deferResponse() and queue features - Remove deferResponse() wrapper function from fcn_declare.h - Remove AsyncWebServer constructor conditional from wled.h - Revert json.cpp, set.cpp, wled_server.cpp to use native deferResponse() This addresses @willmmiles feedback to use the proper library instead of workarounds.
1 parent d2c1313 commit 4ebbd86

File tree

5 files changed

+3
-19
lines changed

5 files changed

+3
-19
lines changed

wled00/fcn_declare.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -553,17 +553,6 @@ void serveJsonError(AsyncWebServerRequest* request, uint16_t code, uint16_t erro
553553
void serveSettings(AsyncWebServerRequest* request, bool post = false);
554554
void serveSettingsJS(AsyncWebServerRequest* request);
555555

556-
// ESP32-C6 compatibility: deferResponse not available in patched ESPAsyncWebServer fork
557-
// Use this inline function which falls back to sending a 503 error
558-
inline void deferResponse(AsyncWebServerRequest* request) {
559-
#if defined(CONFIG_IDF_TARGET_ESP32C6)
560-
// deferResponse not available, send 503 Service Unavailable instead
561-
request->send(503, F("text/plain"), F("Server busy, try again"));
562-
#else
563-
request->deferResponse();
564-
#endif
565-
}
566-
567556
//ws.cpp
568557
void handleWs();
569558
void wsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len);

wled00/json.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1135,7 +1135,7 @@ void serveJson(AsyncWebServerRequest* request)
11351135
}
11361136

11371137
if (!requestJSONBufferLock(17)) {
1138-
deferResponse(request);
1138+
request->deferResponse();
11391139
return;
11401140
}
11411141
// releaseJSONBufferLock() will be called when "response" is destroyed (from AsyncWebServer)

wled00/set.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
655655
if (subPage == SUBPAGE_UM)
656656
{
657657
if (!requestJSONBufferLock(5)) {
658-
deferResponse(request);
658+
request->deferResponse();
659659
return;
660660
}
661661

wled00/wled.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -921,12 +921,7 @@ WLED_GLOBAL bool ledStatusState _INIT(false); // the current LED state
921921
#endif
922922

923923
// server library objects
924-
#if defined(CONFIG_IDF_TARGET_ESP32C6)
925-
// ESP32-C6 uses patched ESPAsyncWebServer fork with simpler constructor
926-
WLED_GLOBAL AsyncWebServer server _INIT_N(((80)));
927-
#else
928924
WLED_GLOBAL AsyncWebServer server _INIT_N(((80, {0, WLED_REQUEST_MAX_QUEUE, WLED_REQUEST_MIN_HEAP, WLED_REQUEST_HEAP_USAGE})));
929-
#endif
930925
#ifdef WLED_ENABLE_WEBSOCKETS
931926
WLED_GLOBAL AsyncWebSocket ws _INIT_N((("/ws")));
932927
#endif

wled00/wled_server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ void initServer()
393393
bool isConfig = false;
394394

395395
if (!requestJSONBufferLock(14)) {
396-
deferResponse(request);
396+
request->deferResponse();
397397
return;
398398
}
399399

0 commit comments

Comments
 (0)