jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-19 08:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3591 from WoodyLetsCode/caching

Browse Source 
Fix ETag caching
This commit is contained in:
Blaž Kristan 2023-12-16 13:31:07 +01:00 committed by GitHub
commit 8522760c70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
wled00/wled_server.cpp
View File

@ -146,19 +146,17 @@ void initServer()
request->send(response); request->send(response);
}); });
server.on("/favicon.ico", HTTP_GET, [](AsyncWebServerRequest *request) {
if (handleFileRead(request, "/favicon.ico")) return;
request->send_P(200, "image/x-icon", favicon, 156);
});
server.on("/skin.css", HTTP_GET, [](AsyncWebServerRequest *request) { server.on("/skin.css", HTTP_GET, [](AsyncWebServerRequest *request) {
if (handleFileRead(request, "/skin.css")) return; if (handleFileRead(request, "/skin.css")) return;
AsyncWebServerResponse *response = request->beginResponse(200, "text/css"); AsyncWebServerResponse *response = request->beginResponse(200, "text/css");
request->send(response); request->send(response);
}); });
server.on("/favicon.ico", HTTP_GET, [](AsyncWebServerRequest *request){
if(!handleFileRead(request, "/favicon.ico"))
{
request->send_P(200, "image/x-icon", favicon, 156);
}
});
server.on("/welcome", HTTP_GET, [](AsyncWebServerRequest *request){ server.on("/welcome", HTTP_GET, [](AsyncWebServerRequest *request){
serveSettings(request); serveSettings(request);
}); });
@ -257,6 +255,7 @@ void initServer()
); );
server.on("/iro.js", HTTP_GET, [](AsyncWebServerRequest *request){ server.on("/iro.js", HTTP_GET, [](AsyncWebServerRequest *request){
if (handleIfNoneMatchCacheHeader(request)) return;
AsyncWebServerResponse *response = request->beginResponse_P(200, "application/javascript", iroJs, iroJs_length); AsyncWebServerResponse *response = request->beginResponse_P(200, "application/javascript", iroJs, iroJs_length);
response->addHeader(FPSTR(s_content_enc),"gzip"); response->addHeader(FPSTR(s_content_enc),"gzip");
setStaticContentCacheHeaders(response); setStaticContentCacheHeaders(response);
@ -264,6 +263,7 @@ void initServer()
}); });
server.on("/rangetouch.js", HTTP_GET, [](AsyncWebServerRequest *request){ server.on("/rangetouch.js", HTTP_GET, [](AsyncWebServerRequest *request){
if (handleIfNoneMatchCacheHeader(request)) return;
AsyncWebServerResponse *response = request->beginResponse_P(200, "application/javascript", rangetouchJs, rangetouchJs_length); AsyncWebServerResponse *response = request->beginResponse_P(200, "application/javascript", rangetouchJs, rangetouchJs_length);
response->addHeader(FPSTR(s_content_enc),"gzip"); response->addHeader(FPSTR(s_content_enc),"gzip");
setStaticContentCacheHeaders(response); setStaticContentCacheHeaders(response);
@ -412,29 +412,29 @@ void initServer()
}); });
} }
bool handleIfNoneMatchCacheHeader(AsyncWebServerRequest* request) bool handleIfNoneMatchCacheHeader(AsyncWebServerRequest *request) {
{ AsyncWebHeader *header = request->getHeader("If-None-Match");
AsyncWebHeader* header = request->getHeader("If-None-Match"); char etag[11];
if (header && header->value() == String(VERSION)) { sprintf_P(etag, PSTR("%7d-%02x"), VERSION, cacheInvalidate);
if (header && header->value() == etag) {
request->send(304); request->send(304);
return true; return true;
} }
return false; return false;
} }
void setStaticContentCacheHeaders(AsyncWebServerResponse *response) void setStaticContentCacheHeaders(AsyncWebServerResponse *response) {
{
char tmp[12];
// https://medium.com/@codebyamir/a-web-developers-guide-to-browser-caching-cc41f3b73e7c // https://medium.com/@codebyamir/a-web-developers-guide-to-browser-caching-cc41f3b73e7c
#ifndef WLED_DEBUG #ifndef WLED_DEBUG
//this header name is misleading, "no-cache" will not disable cache, // this header name is misleading, "no-cache" will not disable cache,
//it just revalidates on every load using the "If-None-Match" header with the last ETag value // it just revalidates on every load using the "If-None-Match" header with the last ETag value
response->addHeader(F("Cache-Control"),"no-cache"); response->addHeader(F("Cache-Control"), "no-cache");
#else #else
response->addHeader(F("Cache-Control"),"no-store,max-age=0"); // prevent caching if debug build response->addHeader(F("Cache-Control"), "no-store,max-age=0"); // prevent caching if debug build
#endif #endif
sprintf_P(tmp, PSTR("%8d-%02x"), VERSION, cacheInvalidate); char etag[11];
response->addHeader(F("ETag"), tmp); sprintf_P(etag, PSTR("%7d-%02x"), VERSION, cacheInvalidate);
response->addHeader(F("ETag"), etag);
} }
void serveIndex(AsyncWebServerRequest* request) void serveIndex(AsyncWebServerRequest* request)