svelteesp32 1.9.2 → 1.9.3

package/README.md

@@ -175,7 +175,7 @@ const char * etag_assets_index_Soe6cpLA_css = "d4f23bc45ef67890ab12...";
 void initSvelteStaticFiles(PsychicHttpServer * server) {
   server->on("/assets/index-KwubEIf-.js", HTTP_GET, [](PsychicRequest * request) {
     if (request->hasHeader("If-None-Match") &&
-        request->header("If-None-Match") == String(etag_assets_index_KwubEIf__js)) {
+        request->header("If-None-Match").equals(etag_assets_index_KwubEIf__js)) {
       PsychicResponse response304(request);
       response304.setCode(304);
       return response304.send();
@@ -192,7 +192,7 @@ void initSvelteStaticFiles(PsychicHttpServer * server) {
 
   server->on("/assets/index-Soe6cpLA.css", HTTP_GET, [](PsychicRequest * request) {
     if (request->hasHeader("If-None-Match") &&
-        request->header("If-None-Match") == String(etag_assets_index_Soe6cpLA_css)) {
+        request->header("If-None-Match").equals(etag_assets_index_Soe6cpLA_css)) {
       PsychicResponse response304(request);
       response304.setCode(304);
       return response304.send();
@@ -242,6 +242,8 @@ Since microcontroller data traffic is moderately expensive, it is an individual
 
 The use of ETag is **not enabled by default**, this can be achieved with the `--etag=true` switch.
 
+All four engines (psychic, psychic2, async, espidf) fully support ETag validation with HTTP 304 Not Modified responses, reducing bandwidth usage when clients have valid cached content.
+
 > This setting has three states: yes, no, and compiler mode is available. In compiler mode, you can disable/enable ETag by setting the `SVELTEESP32_ENABLE_ETAG` c++ compiler directive. For example, if using platformio, just type `-D SVELTEESP32_ENABLE_ETAG`.
 
 ### Cache-control

package/dist/cppCode.js

@@ -126,7 +126,7 @@ void {{methodName}}(PsychicHttpServer * server) {
 
 {{#switch ../etag}}
 {{#case "true"}}
-    if (request->hasHeader("If-None-Match") && request->header("If-None-Match") == String(etag_{{this.dataname}})) {
+    if (request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag_{{this.dataname}})) {
       PsychicResponse response304(request);
       response304.setCode(304);
       return response304.send();
@@ -134,12 +134,12 @@ void {{methodName}}(PsychicHttpServer * server) {
 {{/case}}
 {{#case "compiler"}}
   #ifdef {{../definePrefix}}_ENABLE_ETAG
-    if (request->hasHeader("If-None-Match") && request->header("If-None-Match") == String(etag_{{this.dataname}})) {
+    if (request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag_{{this.dataname}})) {
       PsychicResponse response304(request);
       response304.setCode(304);
       return response304.send();
     }
-  #endif 
+  #endif
 {{/case}}
 {{/switch}}
 
@@ -235,18 +235,18 @@ void {{methodName}}(PsychicHttpServer * server) {
 
 {{#switch ../etag}}
 {{#case "true"}}
-    if (request->hasHeader("If-None-Match") && request->header("If-None-Match") == String(etag_{{this.dataname}})) {
+    if (request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag_{{this.dataname}})) {
       response->setCode(304);
       return response->send();
     }
 {{/case}}
 {{#case "compiler"}}
   #ifdef {{../definePrefix}}_ENABLE_ETAG
-    if (request->hasHeader("If-None-Match") && request->header("If-None-Match") == String(etag_{{this.dataname}})) {
+    if (request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag_{{this.dataname}})) {
       response->setCode(304);
       return response->send();
     }
-  #endif 
+  #endif
 {{/case}}
 {{/switch}}
 
@@ -336,22 +336,24 @@ void {{methodName}}(AsyncWebServer * server) {
 {{#each sources}}
 //
 // {{this.filename}}
-  ArRequestHandlerFunction func_{{this.dataname}} = [](AsyncWebServerRequest * request) {
+  server->on("/{{this.filename}}", HTTP_GET, [](AsyncWebServerRequest * request) {
 
 {{#switch ../etag}}
 {{#case "true"}}
-    if (request->hasHeader("If-None-Match") && request->getHeader("If-None-Match")->value() == String(etag_{{this.dataname}})) {
+    const AsyncWebHeader* h = request->getHeader("If-None-Match");
+    if (h && h->value().equals(etag_{{this.dataname}})) {
       request->send(304);
       return;
     }
 {{/case}}
 {{#case "compiler"}}
   #ifdef {{../definePrefix}}_ENABLE_ETAG
-    if (request->hasHeader("If-None-Match") && request->getHeader("If-None-Match")->value() == String(etag_{{this.dataname}})) {
+    const AsyncWebHeader* h = request->getHeader("If-None-Match");
+    if (h && h->value().equals(etag_{{this.dataname}})) {
       request->send(304);
       return;
     }
-  #endif 
+  #endif
 {{/case}}
 {{/switch}}
 
@@ -373,7 +375,7 @@ void {{methodName}}(AsyncWebServer * server) {
     {{/if}}
   #else
     AsyncWebServerResponse *response = request->beginResponse(200, "{{this.mime}}", data_{{this.dataname}}, {{this.length}});
-  #endif 
+  #endif
 {{/case}}
 {{/switch}}
 
@@ -396,15 +398,81 @@ void {{methodName}}(AsyncWebServer * server) {
     response->addHeader("Cache-Control", "no-cache");
 {{/../cacheTime}}
     response->addHeader("ETag", etag_{{this.dataname}});
-  #endif 
+  #endif
 {{/case}}
 {{/switch}}
 
     request->send(response);
-  };
-  server->on("/{{this.filename}}", HTTP_GET, func_{{this.dataname}});
+  });
   {{#if this.isDefault}}
-  server->on("/", HTTP_GET, func_{{this.dataname}});
+  server->on("/", HTTP_GET, [](AsyncWebServerRequest * request) {
+
+{{#switch ../etag}}
+{{#case "true"}}
+    const AsyncWebHeader* h = request->getHeader("If-None-Match");
+    if (h && h->value().equals(etag_{{this.dataname}})) {
+      request->send(304);
+      return;
+    }
+{{/case}}
+{{#case "compiler"}}
+  #ifdef {{../definePrefix}}_ENABLE_ETAG
+    const AsyncWebHeader* h = request->getHeader("If-None-Match");
+    if (h && h->value().equals(etag_{{this.dataname}})) {
+      request->send(304);
+      return;
+    }
+  #endif
+{{/case}}
+{{/switch}}
+
+{{#switch ../gzip}}
+{{#case "true"}}
+    AsyncWebServerResponse *response = request->beginResponse(200, "{{this.mime}}", datagzip_{{this.dataname}}, {{this.lengthGzip}});
+    {{#if this.isGzip}}
+    response->addHeader("Content-Encoding", "gzip");
+    {{/if}}
+{{/case}}
+{{#case "false"}}
+    AsyncWebServerResponse *response = request->beginResponse(200, "{{this.mime}}", data_{{this.dataname}}, {{this.length}});
+{{/case}}
+{{#case "compiler"}}
+  #ifdef {{../definePrefix}}_ENABLE_GZIP
+    AsyncWebServerResponse *response = request->beginResponse(200, "{{this.mime}}", datagzip_{{this.dataname}}, {{this.lengthGzip}});
+    {{#if this.isGzip}}
+    response->addHeader("Content-Encoding", "gzip");
+    {{/if}}
+  #else
+    AsyncWebServerResponse *response = request->beginResponse(200, "{{this.mime}}", data_{{this.dataname}}, {{this.length}});
+  #endif
+{{/case}}
+{{/switch}}
+
+{{#switch ../etag}}
+{{#case "true"}}
+{{#../cacheTime}}
+    response->addHeader("Cache-Control", "max-age={{value}}");
+{{/../cacheTime}}
+{{^../cacheTime}}
+    response->addHeader("Cache-Control", "no-cache");
+{{/../cacheTime}}
+    response->addHeader("ETag", etag_{{this.dataname}});
+{{/case}}
+{{#case "compiler"}}
+  #ifdef {{../definePrefix}}_ENABLE_ETAG
+{{#../cacheTime}}
+    response->addHeader("Cache-Control", "max-age={{value}}");
+{{/../cacheTime}}
+{{^../cacheTime}}
+    response->addHeader("Cache-Control", "no-cache");
+{{/../cacheTime}}
+    response->addHeader("ETag", etag_{{this.dataname}});
+  #endif
+{{/case}}
+{{/switch}}
+
+    request->send(response);
+  });
   {{/if}}
 
 {{/each}}

package/dist/cppCodeEspIdf.d.ts

@@ -1 +1 @@
-export declare const espidfTemplate = "\n//engine:   espidf\n//cmdline:  {{{commandLine}}}\n{{#if created }}\n//created:  {{now}}\n{{/if}}\n//\n\n{{#switch etag}}\n{{#case \"true\"}}\n#ifdef {{definePrefix}}_ENABLE_ETAG\n#warning {{definePrefix}}_ENABLE_ETAG has no effect because it is permanently switched ON\n#endif\n{{/case}}\n{{#case \"false\"}}\n#ifdef {{definePrefix}}_ENABLE_ETAG\n#warning {{definePrefix}}_ENABLE_ETAG has no effect because it is permanently switched OFF\n#endif\n{{/case}}\n{{/switch}}\n\n{{#switch gzip}}\n{{#case \"true\"}}\n#ifdef {{definePrefix}}_ENABLE_GZIP\n#warning {{definePrefix}}_ENABLE_GZIP has no effect because it is permanently switched ON\n#endif\n{{/case}}\n{{#case \"false\"}}\n#ifdef {{definePrefix}}_ENABLE_GZIP\n#warning {{definePrefix}}_ENABLE_GZIP has no effect because it is permanently switched OFF\n#endif\n{{/case}}\n{{/switch}}\n\n//\n{{#if version }}\n#define {{definePrefix}}_VERSION \"{{version}}\"\n{{/if}}\n#define {{definePrefix}}_COUNT {{fileCount}}\n#define {{definePrefix}}_SIZE {{fileSize}}\n#define {{definePrefix}}_SIZE_GZIP {{fileGzipSize}}\n\n//\n{{#each sources}}\n#define {{../definePrefix}}_FILE_{{this.datanameUpperCase}}\n{{/each}}\n\n//\n{{#each filesByExtension}}\n#define {{../definePrefix}}_{{this.extension}}_FILES {{this.count}}\n{{/each}}\n\n#include <stdint.h>\n#include <esp_err.h>\n#include <esp_http_server.h>\n\n//\n{{#switch gzip}}\n{{#case \"true\"}}\n  {{#each sources}}\nconst char datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };\n  {{/each}}\n{{/case}}\n{{#case \"false\"}}\n  {{#each sources}}\nconst char data_{{this.dataname}}[{{this.length}}] = { {{this.bytes}} };\n  {{/each}}\n{{/case}}\n{{#case \"compiler\"}}\n#ifdef {{definePrefix}}_ENABLE_GZIP\n  {{#each sources}}\nconst char datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };\n  {{/each}}\n#else\n  {{#each sources}}\nconst char data_{{this.dataname}}[{{this.length}}] = { {{this.bytes}} };\n  {{/each}}\n#endif \n{{/case}}\n{{/switch}}\n\n//\n{{#switch etag}}\n{{#case \"true\"}}\n  {{#each sources}}\nconst char * etag_{{this.dataname}} = \"{{this.md5}}\";\n  {{/each}}\n{{/case}}\n{{#case \"false\"}}\n{{/case}}\n{{#case \"compiler\"}}\n#ifdef {{definePrefix}}_ENABLE_ETAG\n  {{#each sources}}\nconst char * etag_{{this.dataname}} = \"{{this.md5}}\";\n  {{/each}}\n#endif \n{{/case}}\n{{/switch}}\n\n{{#each sources}}\n\nstatic esp_err_t file_handler_{{this.datanameUpperCase}} (httpd_req_t *req)\n{\n    httpd_resp_set_type(req, \"{{this.mime}}\");\n{{#switch ../gzip}}\n{{#case \"true\"}}\n{{#if this.isGzip}}\n    httpd_resp_set_hdr(req, \"Content-Encoding\", \"gzip\");\n{{/if}}\n{{/case}}\n{{#case \"compiler\"}}\n  {{#if this.isGzip}}\n  #ifdef {{../definePrefix}}_ENABLE_GZIP\n    httpd_resp_set_hdr(req, \"Content-Encoding\", \"gzip\");\n  #endif \n  {{/if}}\n{{/case}}\n{{/switch}}\n\n{{#switch ../etag}}\n{{#case \"true\"}}\n{{#../cacheTime}}\n    httpd_resp_set_hdr(req, \"Cache-Control\", \"max-age={{value}}\");\n{{/../cacheTime}}\n{{^../cacheTime}}\n    httpd_resp_set_hdr(req, \"Cache-Control\", \"no-cache\");\n{{/../cacheTime}}\n    httpd_resp_set_hdr(req, \"ETag\", etag_{{this.dataname}});\n{{/case}}\n{{#case \"compiler\"}}\n  #ifdef {{../definePrefix}}_ENABLE_ETAG\n{{#../cacheTime}}\n    httpd_resp_set_hdr(req, \"Cache-Control\", \"max-age={{value}}\");\n{{/../cacheTime}}\n{{^../cacheTime}}\n    httpd_resp_set_hdr(req, \"Cache-Control\", \"no-cache\");\n{{/../cacheTime}}\n    httpd_resp_set_hdr(req, \"ETag\", etag_{{this.dataname}});\n  #endif \n{{/case}}\n{{/switch}}\n\n{{#switch ../gzip}}\n{{#case \"true\"}}\n    httpd_resp_send(req, datagzip_{{this.dataname}}, {{this.lengthGzip}});\n{{/case}}\n{{#case \"false\"}}\n    httpd_resp_send(req, data_{{this.dataname}}, {{this.length}});\n{{/case}}\n{{#case \"compiler\"}}\n  #ifdef {{../definePrefix}}_ENABLE_GZIP\n    httpd_resp_send(req, datagzip_{{this.dataname}}, {{this.lengthGzip}});\n  #else\n    httpd_resp_send(req, data_{{this.dataname}}, {{this.length}});\n  #endif \n{{/case}}\n{{/switch}}\n    return ESP_OK;\n}\n\n{{#if this.isDefault}}\nstatic const httpd_uri_t route_def_{{this.datanameUpperCase}} = {\n    .uri = \"/\",\n    .method = HTTP_GET,\n    .handler = file_handler_{{this.datanameUpperCase}},\n};\n{{/if}}\n\nstatic const httpd_uri_t route_{{this.datanameUpperCase}} = {\n    .uri = \"/{{this.filename}}\",\n    .method = HTTP_GET,\n    .handler = file_handler_{{this.datanameUpperCase}},\n};\n\n{{/each}}\n\n\n\nstatic inline void {{methodName}}(httpd_handle_t server) {\n{{#each sources}}\n{{#if this.isDefault}}\n    httpd_register_uri_handler(server, &route_def_{{this.datanameUpperCase}});\n{{/if}}\n    httpd_register_uri_handler(server, &route_{{this.datanameUpperCase}});\n{{/each}}\n\n}";
+export declare const espidfTemplate = "\n//engine:   espidf\n//cmdline:  {{{commandLine}}}\n{{#if created }}\n//created:  {{now}}\n{{/if}}\n//\n\n{{#switch etag}}\n{{#case \"true\"}}\n#ifdef {{definePrefix}}_ENABLE_ETAG\n#warning {{definePrefix}}_ENABLE_ETAG has no effect because it is permanently switched ON\n#endif\n{{/case}}\n{{#case \"false\"}}\n#ifdef {{definePrefix}}_ENABLE_ETAG\n#warning {{definePrefix}}_ENABLE_ETAG has no effect because it is permanently switched OFF\n#endif\n{{/case}}\n{{/switch}}\n\n{{#switch gzip}}\n{{#case \"true\"}}\n#ifdef {{definePrefix}}_ENABLE_GZIP\n#warning {{definePrefix}}_ENABLE_GZIP has no effect because it is permanently switched ON\n#endif\n{{/case}}\n{{#case \"false\"}}\n#ifdef {{definePrefix}}_ENABLE_GZIP\n#warning {{definePrefix}}_ENABLE_GZIP has no effect because it is permanently switched OFF\n#endif\n{{/case}}\n{{/switch}}\n\n//\n{{#if version }}\n#define {{definePrefix}}_VERSION \"{{version}}\"\n{{/if}}\n#define {{definePrefix}}_COUNT {{fileCount}}\n#define {{definePrefix}}_SIZE {{fileSize}}\n#define {{definePrefix}}_SIZE_GZIP {{fileGzipSize}}\n\n//\n{{#each sources}}\n#define {{../definePrefix}}_FILE_{{this.datanameUpperCase}}\n{{/each}}\n\n//\n{{#each filesByExtension}}\n#define {{../definePrefix}}_{{this.extension}}_FILES {{this.count}}\n{{/each}}\n\n#include <stdint.h>\n#include <string.h>\n#include <stdlib.h>\n#include <esp_err.h>\n#include <esp_http_server.h>\n\n//\n{{#switch gzip}}\n{{#case \"true\"}}\n  {{#each sources}}\nconst char datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };\n  {{/each}}\n{{/case}}\n{{#case \"false\"}}\n  {{#each sources}}\nconst char data_{{this.dataname}}[{{this.length}}] = { {{this.bytes}} };\n  {{/each}}\n{{/case}}\n{{#case \"compiler\"}}\n#ifdef {{definePrefix}}_ENABLE_GZIP\n  {{#each sources}}\nconst char datagzip_{{this.dataname}}[{{this.lengthGzip}}] = { {{this.bytesGzip}} };\n  {{/each}}\n#else\n  {{#each sources}}\nconst char data_{{this.dataname}}[{{this.length}}] = { {{this.bytes}} };\n  {{/each}}\n#endif \n{{/case}}\n{{/switch}}\n\n//\n{{#switch etag}}\n{{#case \"true\"}}\n  {{#each sources}}\nconst char * etag_{{this.dataname}} = \"{{this.md5}}\";\n  {{/each}}\n{{/case}}\n{{#case \"false\"}}\n{{/case}}\n{{#case \"compiler\"}}\n#ifdef {{definePrefix}}_ENABLE_ETAG\n  {{#each sources}}\nconst char * etag_{{this.dataname}} = \"{{this.md5}}\";\n  {{/each}}\n#endif \n{{/case}}\n{{/switch}}\n\n{{#each sources}}\n\nstatic esp_err_t file_handler_{{this.datanameUpperCase}} (httpd_req_t *req)\n{\n{{#switch ../etag}}\n{{#case \"true\"}}\n    size_t hdr_len = httpd_req_get_hdr_value_len(req, \"If-None-Match\");\n    if (hdr_len > 0) {\n        char* hdr_value = malloc(hdr_len + 1);\n        if (httpd_req_get_hdr_value_str(req, \"If-None-Match\", hdr_value, hdr_len + 1) == ESP_OK) {\n            if (strcmp(hdr_value, etag_{{this.dataname}}) == 0) {\n                free(hdr_value);\n                httpd_resp_set_status(req, \"304 Not Modified\");\n                httpd_resp_send(req, NULL, 0);\n                return ESP_OK;\n            }\n        }\n        free(hdr_value);\n    }\n{{/case}}\n{{#case \"compiler\"}}\n  #ifdef {{../definePrefix}}_ENABLE_ETAG\n    size_t hdr_len = httpd_req_get_hdr_value_len(req, \"If-None-Match\");\n    if (hdr_len > 0) {\n        char* hdr_value = malloc(hdr_len + 1);\n        if (httpd_req_get_hdr_value_str(req, \"If-None-Match\", hdr_value, hdr_len + 1) == ESP_OK) {\n            if (strcmp(hdr_value, etag_{{this.dataname}}) == 0) {\n                free(hdr_value);\n                httpd_resp_set_status(req, \"304 Not Modified\");\n                httpd_resp_send(req, NULL, 0);\n                return ESP_OK;\n            }\n        }\n        free(hdr_value);\n    }\n  #endif\n{{/case}}\n{{/switch}}\n    httpd_resp_set_type(req, \"{{this.mime}}\");\n{{#switch ../gzip}}\n{{#case \"true\"}}\n{{#if this.isGzip}}\n    httpd_resp_set_hdr(req, \"Content-Encoding\", \"gzip\");\n{{/if}}\n{{/case}}\n{{#case \"compiler\"}}\n  {{#if this.isGzip}}\n  #ifdef {{../definePrefix}}_ENABLE_GZIP\n    httpd_resp_set_hdr(req, \"Content-Encoding\", \"gzip\");\n  #endif \n  {{/if}}\n{{/case}}\n{{/switch}}\n\n{{#switch ../etag}}\n{{#case \"true\"}}\n{{#../cacheTime}}\n    httpd_resp_set_hdr(req, \"Cache-Control\", \"max-age={{value}}\");\n{{/../cacheTime}}\n{{^../cacheTime}}\n    httpd_resp_set_hdr(req, \"Cache-Control\", \"no-cache\");\n{{/../cacheTime}}\n    httpd_resp_set_hdr(req, \"ETag\", etag_{{this.dataname}});\n{{/case}}\n{{#case \"compiler\"}}\n  #ifdef {{../definePrefix}}_ENABLE_ETAG\n{{#../cacheTime}}\n    httpd_resp_set_hdr(req, \"Cache-Control\", \"max-age={{value}}\");\n{{/../cacheTime}}\n{{^../cacheTime}}\n    httpd_resp_set_hdr(req, \"Cache-Control\", \"no-cache\");\n{{/../cacheTime}}\n    httpd_resp_set_hdr(req, \"ETag\", etag_{{this.dataname}});\n  #endif \n{{/case}}\n{{/switch}}\n\n{{#switch ../gzip}}\n{{#case \"true\"}}\n    httpd_resp_send(req, datagzip_{{this.dataname}}, {{this.lengthGzip}});\n{{/case}}\n{{#case \"false\"}}\n    httpd_resp_send(req, data_{{this.dataname}}, {{this.length}});\n{{/case}}\n{{#case \"compiler\"}}\n  #ifdef {{../definePrefix}}_ENABLE_GZIP\n    httpd_resp_send(req, datagzip_{{this.dataname}}, {{this.lengthGzip}});\n  #else\n    httpd_resp_send(req, data_{{this.dataname}}, {{this.length}});\n  #endif \n{{/case}}\n{{/switch}}\n    return ESP_OK;\n}\n\n{{#if this.isDefault}}\nstatic const httpd_uri_t route_def_{{this.datanameUpperCase}} = {\n    .uri = \"/\",\n    .method = HTTP_GET,\n    .handler = file_handler_{{this.datanameUpperCase}},\n};\n{{/if}}\n\nstatic const httpd_uri_t route_{{this.datanameUpperCase}} = {\n    .uri = \"/{{this.filename}}\",\n    .method = HTTP_GET,\n    .handler = file_handler_{{this.datanameUpperCase}},\n};\n\n{{/each}}\n\n\n\nstatic inline void {{methodName}}(httpd_handle_t server) {\n{{#each sources}}\n{{#if this.isDefault}}\n    httpd_register_uri_handler(server, &route_def_{{this.datanameUpperCase}});\n{{/if}}\n    httpd_register_uri_handler(server, &route_{{this.datanameUpperCase}});\n{{/each}}\n\n}";

package/dist/cppCodeEspIdf.js

@@ -54,6 +54,8 @@ exports.espidfTemplate = `
 {{/each}}
 
 #include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
 #include <esp_err.h>
 #include <esp_http_server.h>
 
@@ -104,6 +106,40 @@ const char * etag_{{this.dataname}} = "{{this.md5}}";
 
 static esp_err_t file_handler_{{this.datanameUpperCase}} (httpd_req_t *req)
 {
+{{#switch ../etag}}
+{{#case "true"}}
+    size_t hdr_len = httpd_req_get_hdr_value_len(req, "If-None-Match");
+    if (hdr_len > 0) {
+        char* hdr_value = malloc(hdr_len + 1);
+        if (httpd_req_get_hdr_value_str(req, "If-None-Match", hdr_value, hdr_len + 1) == ESP_OK) {
+            if (strcmp(hdr_value, etag_{{this.dataname}}) == 0) {
+                free(hdr_value);
+                httpd_resp_set_status(req, "304 Not Modified");
+                httpd_resp_send(req, NULL, 0);
+                return ESP_OK;
+            }
+        }
+        free(hdr_value);
+    }
+{{/case}}
+{{#case "compiler"}}
+  #ifdef {{../definePrefix}}_ENABLE_ETAG
+    size_t hdr_len = httpd_req_get_hdr_value_len(req, "If-None-Match");
+    if (hdr_len > 0) {
+        char* hdr_value = malloc(hdr_len + 1);
+        if (httpd_req_get_hdr_value_str(req, "If-None-Match", hdr_value, hdr_len + 1) == ESP_OK) {
+            if (strcmp(hdr_value, etag_{{this.dataname}}) == 0) {
+                free(hdr_value);
+                httpd_resp_set_status(req, "304 Not Modified");
+                httpd_resp_send(req, NULL, 0);
+                return ESP_OK;
+            }
+        }
+        free(hdr_value);
+    }
+  #endif
+{{/case}}
+{{/switch}}
     httpd_resp_set_type(req, "{{this.mime}}");
 {{#switch ../gzip}}
 {{#case "true"}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelteesp32",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "Convert Svelte (or any frontend) JS application to serve it from ESP32 webserver (PsychicHttp)",
   "author": "BCsabaEngine",
   "license": "ISC",
@@ -33,14 +33,15 @@
     "dev:psychic2": "nodemon src/index.ts -- -e psychic2 -s ./demo/svelte/dist -o ./demo/esp32/include/svelteesp32.h --etag=false --gzip=false --version=v$npm_package_version",
     "test:esp32": "./package.script && ~/.platformio/penv/bin/pio run -d ./demo/esp32",
     "test:esp32idf": "./package.script && ~/.platformio/penv/bin/pio run -d ./demo/esp32idf",
-    "test:all": "npm run test:esp32 && npm run test:esp32idf",
+    "test:all": "node --run test:esp32 && node --run test:esp32idf",
     "clean": "tsc --build --clean",
     "build": "tsc --build --clean && tsc --build --force",
     "format:check": "prettier --check .",
-    "format:fix": "prettier --write .",
+    "format:fix": "prettier --write . | grep -v 'unchanged' | sed G",
     "lint:check": "eslint .",
     "lint:fix": "eslint --fix .",
-    "fix": "npm run format:fix && npm run lint:fix && npm run format:fix",
+    "fix": "node --run format:fix && node --run lint:fix && node --run format:fix",
+    "all": "node --run fix && node --run build",
     "npm:reinstall": "rm -rf ./node_modules && rm -f ./package-lock.json && npm i && npm i"
   },
   "keywords": [
@@ -57,13 +58,13 @@
   ],
   "devDependencies": {
     "@types/mime-types": "^3.0.1",
-    "@types/node": "^24.8.1",
-    "@typescript-eslint/eslint-plugin": "^8.46.1",
-    "@typescript-eslint/parser": "^8.46.1",
-    "eslint": "^9.38.0",
+    "@types/node": "^24.9.2",
+    "@typescript-eslint/eslint-plugin": "^8.46.2",
+    "@typescript-eslint/parser": "^8.46.2",
+    "eslint": "^9.39.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "eslint-plugin-unicorn": "^61.0.2",
+    "eslint-plugin-unicorn": "^62.0.0",
     "nodemon": "^3.1.10",
     "prettier": "^3.6.2",
     "ts-node": "^10.9.2",